Mercurial > octave

changeset 22561:202c6871f07d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use a common function for color scaling in gnuplot toolkit (bug #49130) * __gnuplot_draw_axes__.m: Remove code lines that set 'colormap', 'clim' and 'climmode' properties of graphics objects (post logical data bug fix). Replace all color data transformations and associated conditional code with a function call to mapcdata(). (mapcdata): Added. Pay careful attention to data class for proper scaling and clamping arithmetic under various scenarios. In true-color case, apply an inverse mapping of gnuplot's cbrange formula which also applies to RGB images (bug fix).
author Daniel J Sebald <daniel.sebald@ieee.org>
date Wed, 28 Sep 2016 15:57:05 -0500
parents 55dde71ee251
children cd2a8d0c0b56
files scripts/plot/util/private/__gnuplot_draw_axes__.m
diffstat 1 files changed, 29 insertions(+), 54 deletions(-) [+]
line wrap: on
line diff
--- a/scripts/plot/util/private/__gnuplot_draw_axes__.m	Fri Sep 30 13:21:42 2016 +0200
+++ b/scripts/plot/util/private/__gnuplot_draw_axes__.m	Wed Sep 28 15:57:05 2016 -0500
@@ -478,9 +478,6 @@
       switch (obj.type)
         case {"image"}
           if (isfield (obj, "cdata") && islogical (obj.cdata))
-            set (axis_obj.parent, "colormap", [0 0 0; 1 1 1]);
-            set (h, "clim", [0 1]);
-            set (h, "climmode", "manual");
             parent_figure_obj.colormap = [0 0 0; 1 1 1];
             axis_obj.clim = [0 1];
             axis_obj.climmode = "manual";
@@ -553,20 +550,10 @@
 
     switch (obj.type)
       case "image"
-        img_data = obj.cdata;
+        img_data = mapcdata (obj.cdata, obj.cdatamapping, clim, cmap_sz);
         img_xdata = obj.xdata;
         img_ydata = obj.ydata;
 
-        if (ndims (img_data) != 3)
-          if (islogical (img_data))
-            img_data += 1;
-          else
-            if (strcmp (obj.cdatamapping, "scaled"))
-              img_data = 1 + fix (cmap_sz*(img_data-clim(1))/(clim(2)-clim(1)));
-            endif
-            img_data = max (1, min (img_data, cmap_sz));
-          endif
-        endif
         data_idx += 1;
         is_image_data(data_idx) = true;
         parametric(data_idx) = false;
@@ -788,24 +775,14 @@
                     ccol = cdat;
                   endif
                   if (strcmp (obj.facecolor, "flat"))
+                    ccdat = mapcdata (ccol, obj.cdatamapping, clim, cmap_sz);
                     if (isequal (size (ccol), [1, 3]))
                       ## RGB Triplet
                       color = ccol;
                     elseif (nd == 3 && numel (xcol) == 3)
-                      if (strcmp (obj.cdatamapping, "scaled"))
-                        ccdat = 1 + fix (cmap_sz*(ccol-clim(1))/(clim(2)-clim(1)));
-                      else
-                        ccdat = ccol;
-                      endif
-                      ccdat = max (1, min (ccdat, cmap_sz));
+                      color = cmap(ccdat(1), :);
                     else
-                      if (strcmp (obj.cdatamapping, "direct"))
-                        r = round (ccol);
-                      else
-                        r = 1 + fix (cmap_sz*(ccol-clim(1))/(clim(2)-clim(1)));
-                      endif
-                      r = max (1, min (r, cmap_sz));
-                      color = cmap(r, :);
+                      color = cmap(ccdat, :);
                     endif
                   elseif (strcmp (obj.facecolor, "interp"))
                     if (nd == 3 && numel (xcol) == 3)
@@ -816,23 +793,13 @@
                         addedcmap = [addedcmap; ccdat];
                         ccdat = tmp(:);
                       else
-                        if (strcmp (obj.cdatamapping, "scaled"))
-                          ccdat = 1 + fix (cmap_sz*(ccdat(:)-clim(1))/(clim(2)-clim(1)));
-                        else
-                          ccdat = ccdat(:);
-                        endif
-                        ccdat = max (1, min (ccdat, cmap_sz));
+                        ccdat = mapcdata (ccdat(:), obj.cdatamapping, clim, cmap_sz);
                       endif
                     else
                       if (sum (diff (ccol)))
                         warning ("\"interp\" not supported, using 1st entry of cdata");
                       endif
-                      if (strcmp (obj.cdatamapping, "direct"))
-                        r = round (ccol);
-                      else
-                        r = 1 + fix (cmap_sz*(ccol-clim(1))/(clim(2)-clim(1)));
-                      endif
-                      r = max (1, min (r, cmap_sz));
+                      r = mapcdata (ccol, obj.cdatamapping, clim, cmap_sz);
                       color = cmap(r(1),:);
                     endif
                   endif
@@ -927,13 +894,10 @@
                   ccol = cdat;
                 endif
                 if (strcmp (ec, "flat"))
+                  ccol = mapcdata (ccol, obj.cdatamapping, clim, cmap_sz);
                   if (isequal (size (ccol), [1, 3]))
                     color = ccol;
                   else
-                    if (strcmp (obj.cdatamapping, "scaled"))
-                      ccol = 1 + fix (cmap_sz*(ccol-clim(1))/(clim(2)-clim(1)));
-                    endif
-                    ccol = max (1, min (ccol, cmap_sz));
                     if (isscalar (ccol))
                       ccol = repmat (ccol, numel (xcol), 1);
                     endif
@@ -951,12 +915,7 @@
                     color = "interp";
                     have_cdata(data_idx) = true;
                   endif
-                  if (strcmp (obj.cdatamapping, "direct"))
-                    ccol = round (ccol);
-                  else
-                    ccol = 1 + fix (cmap_sz*(ccol-clim(1))/(clim(2)-clim(1)));
-                  endif
-                  ccol = max (1, min (ccol, cmap_sz));
+                  ccol = mapcdata (ccol, obj.cdatamapping, clim, cmap_sz);
                 endif
               elseif (isnumeric (ec))
                 color = ec;
@@ -1202,11 +1161,7 @@
         xdat = obj.xdata;
         ydat = obj.ydata;
         zdat = obj.zdata;
-        cdat = obj.cdata;
-        if (strcmp (obj.cdatamapping, "scaled"))
-          cdat = 1 + fix (cmap_sz*(cdat-clim(1))/(clim(2)-clim(1)));
-        endif
-        cdat = max (1, min (cdat, cmap_sz));
+        cdat = mapcdata (obj.cdata, obj.cdatamapping, clim, cmap_sz);
         err = false;
         if (! size_equal (zdat, cdat))
           err = true;
@@ -2892,3 +2847,23 @@
 
 endfunction
 
+function retval = mapcdata (cdata, mode, clim, cmap_sz)
+  if (ndims (cdata) == 3)
+    # True color, clamp data to 8-bit
+    cdata = double (cdata);
+    cdata = uint8 (255*(cdata-clim(1))/(clim(2)-clim(1)));
+    # Scale using inverse of gnuplot's cbrange mapping
+    retval = 1 + double (cdata)*(cmap_sz-1)/255;
+  else
+    if (islogical (cdata))
+      cdata += 1;
+    elseif (strcmp (mode, "scaled"))
+      cdata = double (cdata);
+      clim = double (clim);
+      cdata = 1 + fix ((cmap_sz-1)*(cdata-clim(1))/(clim(2)-clim(1)));
+    else
+      cdata = round (cdata);
+    endif
+    retval = max (1, min (cdata, cmap_sz));
+  endif
+endfunction