fix issues and awesome improvements in fsurf functionality

galvisgilberto · galvisgilberto · commit 9cc18d745a01 · 2021-09-13T16:34:01.000-04:00
diff --git a/plotly/plotlyfig.m b/plotly/plotlyfig.m
@@ -99,6 +99,7 @@
             obj.PlotlyDefaults.Bargap = 0;
             obj.PlotlyDefaults.CaptionMarginIncreaseFactor = 1.2; 
             obj.PlotlyDefaults.MinCaptionMargin = 80;
+            obj.PlotlyDefaults.IsLight = false;
             
             %-State-%
             obj.State.Figure = [];
@@ -622,12 +623,16 @@ function validate(obj)
                     
                     % reverse plots
                     nprev = length(plots) - np + 1;
-                    
+
                     % update the plot fields
-                    obj.State.Figure.NumPlots = obj.State.Figure.NumPlots + 1;
-                    obj.State.Plot(obj.State.Figure.NumPlots).Handle = handle(plots(nprev));
-                    obj.State.Plot(obj.State.Figure.NumPlots).AssociatedAxis = handle(ax(axrev));
-                    obj.State.Plot(obj.State.Figure.NumPlots).Class = getGraphClass(plots(nprev));
+                    if ~strcmpi(getGraphClass(plots(nprev)), 'light')
+                        obj.State.Figure.NumPlots = obj.State.Figure.NumPlots + 1;
+                        obj.State.Plot(obj.State.Figure.NumPlots).Handle = handle(plots(nprev));
+                        obj.State.Plot(obj.State.Figure.NumPlots).AssociatedAxis = handle(ax(axrev));
+                        obj.State.Plot(obj.State.Figure.NumPlots).Class = getGraphClass(plots(nprev));
+                    else
+                        obj.PlotlyDefaults.IsLight = true;
+                    end
                 end
 
                 % this works for pareto
diff --git a/plotly/plotlyfig_aux/core/updateData.m b/plotly/plotlyfig_aux/core/updateData.m
@@ -75,7 +75,7 @@
                 updateRectangle(obj,dataIndex);
             case 'surface'
                 updateSurfaceplot(obj,dataIndex);
-            case 'functionsurface'
+            case {'functionsurface', 'parameterizedfunctionsurface'}
                 updateFunctionSurface(obj,dataIndex);
             case 'implicitfunctionsurface'
                 updateImplicitFunctionSurface(obj,dataIndex);
diff --git a/plotly/plotlyfig_aux/handlegraphics/updateFmesh.m b/plotly/plotlyfig_aux/handlegraphics/updateFmesh.m
@@ -90,14 +90,16 @@
 end
 
 %-------------------------------------------------------------------------%
-
 %-get edge color-%
 if isnumeric(meshData.EdgeColor)
     cDataContour = sprintf('rgb(%f,%f,%f)', 255*meshData.EdgeColor);
 
 elseif strcmpi(meshData.EdgeColor, 'interp')
     cDataContour = zDataContour(:);
     obj.data{contourIndex}.line.colorscale = colorScale;
+elseif strcmpi(meshData.EdgeColor, 'none')
+    
+    cDataContour = 'rgba(0,0,0,0)';
 end
 
 %-set edge color-%
@@ -123,17 +125,50 @@
     obj.data{surfaceIndex}.cmin = 0;
     obj.data{surfaceIndex}.cmax = 255;
 
-elseif strcmpi(meshData.FaseColor, 'interp')
+elseif strcmpi(meshData.FaceColor, 'interp')
     cDataSurface = zDataSurface;
+
+    if surfaceIndex > xsource
+        cData = [];
+
+        for idx = xsource:surfaceIndex
+            cData = [cData; obj.data{idx}.z];
+        end
+
+        cMin = min(cData(:));
+        cMax = max(cData(:));
+
+        for idx = xsource:surfaceIndex
+            obj.data{idx}.cmin = cMin;
+            obj.data{idx}.cmax = cMax;
+        end
+    end
+    
 end
 
 %-set face color-%
 obj.data{surfaceIndex}.colorscale = colorScale;
 obj.data{surfaceIndex}.surfacecolor = cDataSurface;
 
 %-lighting settings-%
-obj.data{surfaceIndex}.lighting.diffuse = 0.5;%0.5;
-obj.data{surfaceIndex}.lighting.ambient = 0.725 + (1-meshData.FaceAlpha);%0.7;
+
+if isnumeric(meshData.FaceColor) && all(meshData.FaceColor == [1, 1, 1])
+    obj.data{surfaceIndex}.lighting.diffuse = 0.5;
+    obj.data{surfaceIndex}.lighting.ambient = 0.725;
+else
+    % obj.data{surfaceIndex}.lighting.diffuse = 1.0;
+    % obj.data{surfaceIndex}.lighting.ambient = 0.9;
+end
+
+if meshData.FaceAlpha ~= 1
+    obj.data{surfaceIndex}.lighting.diffuse = 0.5;
+    obj.data{surfaceIndex}.lighting.ambient = 0.725 + (1-meshData.FaceAlpha);
+end
+
+if obj.PlotlyDefaults.IsLight
+    obj.data{surfaceIndex}.lighting.diffuse = 1.0;
+    obj.data{surfaceIndex}.lighting.ambient = 0.3;
+end
 
 %-opacity-%
 obj.data{surfaceIndex}.opacity = meshData.FaceAlpha;
@@ -157,6 +192,32 @@
 
 %-------------------------------------------------------------------------%
 
+%-show contours-%
+
+if strcmpi(meshData.ShowContours, 'on')
+    obj.PlotOptions.nPlots = obj.PlotOptions.nPlots + 1;
+    projectionIndex = obj.PlotOptions.nPlots;
+
+    obj.data{projectionIndex}.type = 'surface';
+    obj.data{projectionIndex}.scene = sprintf('scene%d', xsource);
+
+    obj.data{projectionIndex}.x = xDataSurface;
+    obj.data{projectionIndex}.y = yDataSurface;
+    obj.data{projectionIndex}.z = zDataSurface;
+
+    obj.data{projectionIndex}.colorscale = colorScale;
+    obj.data{projectionIndex}.hidesurface = true;
+    obj.data{projectionIndex}.surfacecolor = zDataSurface;
+    obj.data{projectionIndex}.showscale = false;
+
+    obj.data{projectionIndex}.contours.z.show = true;
+    obj.data{projectionIndex}.contours.z.width = 15;
+    obj.data{projectionIndex}.contours.z.usecolormap = true;
+    obj.data{projectionIndex}.contours.z.project.z = true;
+end
+
+%-------------------------------------------------------------------------%
+
 %-SCENE CONFIGUTATION-%
 
 %-------------------------------------------------------------------------%
@@ -201,7 +262,7 @@
     %-define as default-%
     xey = - xyar; if xey>0 xfac = 0.0; else xfac = 0.0; end
     yey = - xyar; if yey>0 yfac = -0.3; else yfac = 0.3; end
-    if zar>0 zfac = 0.2; else zfac = -0.2; end
+    if zar>0 zfac = 0.1; else zfac = -0.1; end
     
     scene.camera.eye.x = xey + xfac*xey; 
     scene.camera.eye.y = yey + yfac*yey;
@@ -261,6 +322,7 @@
 %-------------------------------------------------------------------------%
 
 %-surface name-%
+obj.data{surfaceIndex}.name = meshData.DisplayName;
 obj.data{contourIndex}.name = meshData.DisplayName;
 
 %-------------------------------------------------------------------------%
@@ -272,6 +334,7 @@
 %-------------------------------------------------------------------------%
 
 %-surface visible-%
+obj.data{surfaceIndex}.visible = strcmp(meshData.Visible,'on');
 obj.data{contourIndex}.visible = strcmp(meshData.Visible,'on');
 
 %-------------------------------------------------------------------------%
@@ -286,7 +349,7 @@
         showleg = false;
 end
 
-obj.data{contourIndex}.showlegend = showleg;
+obj.data{surfaceIndex}.showlegend = showleg;
 
 %-------------------------------------------------------------------------%
 
diff --git a/plotly/plotlyfig_aux/handlegraphics/updateFunctionSurface.m b/plotly/plotlyfig_aux/handlegraphics/updateFunctionSurface.m
