Mercurial > octave-libtiff

changeset 22570:17f6ed063c69

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: merge stable to default.
author Mike Miller <mtmiller@octave.org>
date Fri, 30 Sep 2016 17:45:22 -0700
parents 656f08c45b8e (current diff) d3adf6999939 (diff)
children 726f32d9fd92 cdbf931c2024
files
diffstat 2 files changed, 30 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/libgui/qterminal/libqterminal/unix/Vt102Emulation.cpp	Fri Sep 30 11:07:24 2016 -0700
+++ b/libgui/qterminal/libqterminal/unix/Vt102Emulation.cpp	Fri Sep 30 17:45:22 2016 -0700
@@ -979,6 +979,14 @@
         {
             textToSend += _codec->fromUnicode(entry.text(true,modifiers));
         }
+        else if (event->key() == Qt::Key_PageUp)
+        {
+            textToSend += "\033[5~";
+        }
+        else if (event->key() == Qt::Key_PageDown)
+        {
+            textToSend += "\033[6~";
+        }
         else
             textToSend += _codec->fromUnicode(event->text());
 
--- a/scripts/plot/util/private/__gnuplot_draw_axes__.m	Fri Sep 30 11:07:24 2016 -0700
+++ b/scripts/plot/util/private/__gnuplot_draw_axes__.m	Fri Sep 30 17:45:22 2016 -0700
@@ -1982,9 +1982,14 @@
         endif
         fprintf (plot_stream, "set style line %d default;\n", idx);
         fprintf (plot_stream, "set style line %d", idx);
-        if (isnumeric (obj.markeredgecolor))
+        if (isnumeric (obj.markeredgecolor) || strcmp (obj.markeredgecolor, "auto"))
+          if (isnumeric (obj.markeredgecolor))
+            edgecolor = obj.markeredgecolor;
+          else
+            edgecolor = obj.color;
+          end
           fprintf (plot_stream, " linecolor rgb \"#%02x%02x%02x\"",
-                   round (255*obj.markeredgecolor));
+                   round (255*edgecolor));
         else
           fprintf (plot_stream, " palette");
         endif
@@ -2850,18 +2855,29 @@
 function retval = mapcdata (cdata, mode, clim, cmap_sz)
   if (ndims (cdata) == 3)
     ## True Color, clamp data to 8-bit
+    clim = double (clim);
     cdata = double (cdata);
-    cdata = 255 * (cdata - clim(1)) / (clim(2)-clim(1));
-    cdata(cdata < 0) = 0;  cdata(cdata > 255) = 255;
+    clim_rng = clim(2) - clim(1);
+    if (clim_rng != 0)
+      cdata = 255 * (cdata - clim(1)) / clim_rng;
+      cdata(cdata < 0) = 0;  cdata(cdata > 255) = 255;
+    else
+      cdata(:) = 255;
+    endif
     ## Scale using inverse of gnuplot's cbrange mapping
     retval = 1 + cdata * (cmap_sz-1)/255;
   else
     if (islogical (cdata))
       cdata += 1;
     elseif (strcmp (mode, "scaled"))
+      clim = double (clim);
       cdata = double (cdata);
-      clim = double (clim);
-      cdata = 1 + fix (cmap_sz * (cdata - clim(1)) / (clim(2) - clim(1)));
+      clim_rng = clim(2) - clim(1);
+      if (clim_rng != 0)
+        cdata = 1 + fix (cmap_sz * (cdata - clim(1)) / clim_rng);
+      else
+        cdata(:) = cmap_sz;
+      endif
     else
       if (isinteger (cdata))
         cdata += 1;