Mercurial > octave-dspies

changeset 15708:916ef285522a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use the Qt gnuplot terminal only if available when using the GUI * octave-gui.cc (octave_start_gui): Do not set GNUTERM. * __gnuplot_drawnow__.m: Use the qt terminal only if gnuplot supports it and the GUI is running.
author Mike Miller <mtmiller@ieee.org>
date Fri, 30 Nov 2012 20:41:30 -0500
parents d803cd07f31a
children 9fee0b741de6
files libgui/src/octave-gui.cc scripts/plot/__gnuplot_drawnow__.m
diffstat 2 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/libgui/src/octave-gui.cc	Fri Nov 30 13:21:15 2012 -0800
+++ b/libgui/src/octave-gui.cc	Fri Nov 30 20:41:30 2012 -0500
@@ -83,8 +83,6 @@
 {
   dissociate_terminal ();
 
-  octave_env::putenv ("GNUTERM", "qt");
-
   QApplication application (argc, argv);
 
   while (true)
--- a/scripts/plot/__gnuplot_drawnow__.m	Fri Nov 30 13:21:15 2012 -0800
+++ b/scripts/plot/__gnuplot_drawnow__.m	Fri Nov 30 20:41:30 2012 -0500
@@ -333,7 +333,9 @@
   term = getenv ("GNUTERM");
   ## If not specified, guess the terminal type.
   if (isempty (term) || ! __gnuplot_has_terminal__ (term, plot_stream))
-    if (ismac ())
+    if (isguirunning () && __gnuplot_has_terminal__ ("qt", plot_stream))
+      term = "qt";
+    elseif (ismac ())
       term = "aqua";
     elseif (! isunix ())
       term = "windows";