Mercurial > octave

changeset 21773:45871845a93c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove gnuplot hidden-line-removal deactivation from patch code (bug #47974). * __gnuplot_draw_axes__.m (__gnuplot_draw_axes__): Do not set hidden_removal to false when patch facecolor is "none", but always set to true if the face color is not "none". Similarly, do not set hidden_removal to false when surface facecolor is "none". Remove the hopt method from the surface edge properties. Change the logic of hidden_removal test so that the default NAN case is 'unset hidden3d'.
author Daniel J Sebald <daniel.sebald@ieee.org>
date Mon, 23 May 2016 19:58:43 -0500
parents 72bf7fbc8210
children ca9e09417e1f
files scripts/plot/util/private/__gnuplot_draw_axes__.m
diffstat 1 files changed, 5 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/scripts/plot/util/private/__gnuplot_draw_axes__.m	Tue May 24 12:14:38 2016 -0700
+++ b/scripts/plot/util/private/__gnuplot_draw_axes__.m	Mon May 23 19:58:43 2016 -0500
@@ -659,13 +659,8 @@
 
          if (! isnan (xcol) && ! isnan (ycol))
            ## Is the patch closed or not
-           if (strcmp (obj.facecolor, "none"))
-             hidden_removal = false;
-           else
-
-             if (isnan (hidden_removal))
-               hidden_removal = true;
-             endif
+           if (! strcmp (obj.facecolor, "none"))
+             hidden_removal = true;
              if (nd == 3)
                if (numel (xcol) > 3)
                  error ("__gnuplot_draw_axes__: gnuplot (as of v4.2) only supports 3-D filled triangular patches");
@@ -1246,13 +1241,6 @@
 
           zz = zz.';
 
-          if (strcmp (obj.facecolor, "none"))
-            hopt = " nohidden3d";
-            hidden_removal = false;
-          else
-            hopt = "";
-          endif
-
           for i_stl = 1:length (style)
             if (flat_interp_edge)
               sopt = "";
@@ -1271,8 +1259,8 @@
             titlespec{data_idx} = tspec;
             usingclause{data_idx} = sprintf ("record=%dx%d using ($1):($2):($3)%s", ylen, xlen, ccol);
             data{data_idx} = zz;
-            withclause{data_idx} = sprintf ("with %s %s %s%s",
-                                             style{i_stl}, scmd, sopt, hopt);
+            withclause{data_idx} = sprintf ("with %s %s %s",
+                                             style{i_stl}, scmd, sopt);
           endfor
 
         endif
@@ -1363,7 +1351,7 @@
     fputs (plot_stream, "set pm3d explicit;\n");
   endif
 
-  if (isnan (hidden_removal) || hidden_removal)
+  if (! isnan (hidden_removal) && hidden_removal)
     fputs (plot_stream, "set hidden3d front nooffset;\n");
   else
     fputs (plot_stream, "unset hidden3d;\n");