fix issues with contour functions used in ssim_baselines/matlab/conto…

…ur-plots/
plotly · gilbertogalvis · Aug 23, 2021 · Aug 19, 2021 · Aug 19, 2021 · Aug 19, 2021
commit c617eae76518577a7cb0af1d893a77db695c2583
diff --git a/plotly/plotlyfig.m b/plotly/plotlyfig.m
@@ -1002,7 +1002,8 @@ function delete(obj)
                         ||  strcmpi(fieldname,'mesh3d') || strcmpi(fieldname,'bar') ...
                         ||  strcmpi(fieldname,'scatterpolar') || strcmpi(fieldname,'barpolar') ...
                         ||  strcmpi(fieldname,'scene') ||  strcmpi(fieldname,'layout') ...
-                        ||  strcmpi(fieldname,'heatmap') ...
+                        ||  strcmpi(fieldname,'heatmap') ||  strcmpi(fieldname,'xaxis') ...
+                        ||  strcmpi(fieldname,'yaxis') ...
                         )
                         fprintf(['\nWhoops! ' exception.message(1:end-1) ' in ' fieldname '\n\n']);
                     end

diff --git a/plotly/plotlyfig_aux/core/updateData.m b/plotly/plotlyfig_aux/core/updateData.m
@@ -150,6 +150,7 @@
     if strcmpi(xaxis.type, 'category') && ...
             ~strcmp(obj.data{dataIndex}.type,'box')
         obj.data{dataIndex}.x =  get(obj.State.Plot(dataIndex).AssociatedAxis,'XTickLabel');
+        eval(['obj.layout.xaxis' num2str(xsource) '.autotick=true;']);
     end
 
     % check for yaxis dates
@@ -161,6 +162,7 @@
     if strcmpi(yaxis.type, 'category') && ...
             ~strcmp(obj.data{dataIndex}.type,'box')
         obj.data{dataIndex}.y =  get(obj.State.Plot(dataIndex).AssociatedAxis,'YTickLabel');
+        eval(['obj.layout.yaxis' num2str(xsource) '.autotick=true;']);
     end
 catch
     % TODO to the future

diff --git a/plotly/plotlyfig_aux/handlegraphics/updateContour3.m b/plotly/plotlyfig_aux/handlegraphics/updateContour3.m
@@ -65,12 +65,12 @@
 
 %-setting for contour lines z-direction-%
 if length(contour_data.LevelList) > 1
-    zstart = contour_data.LevelList(1);
-    zend = contour_data.LevelList(end);
-    zsize = mean(diff(contour_data.LevelList));
+    zstart = contour_data.TextList(1);
+    zend = contour_data.TextList(end);
+    zsize = mean(diff(contour_data.TextList));
 else
-    zstart = contour_data.LevelList(1) - 1e-3;
-    zend = contour_data.LevelList(end) + 1e-3;
+    zstart = contour_data.TextList(1) - 1e-3;
+    zend = contour_data.TextList(end) + 1e-3;
     zsize = 2e-3;
 end
 
@@ -131,13 +131,13 @@
 else
 
     %-define as default-%
-    xey = min(xdata(:)); if xey>0 xfac = -0.2; else xfac = 0.2; end
-    yey = min(ydata(:)); if yey>0 yfac = -0.2; else yfac = 0.2; end
-    if zar>0 zfac = -0.15; else zfac = 0.15; end
-
-    obj.layout.scene.camera.eye.x = xey + xfac*xey;
+    xey = - xar; if xey>0 xfac = -0.2; else xfac = 0.2; end
+    yey = - yar; if yey>0 yfac = -0.2; else yfac = 0.2; end
+    if zar>0 zfac = 0.2; else zfac = -0.2; end
+    
+    obj.layout.scene.camera.eye.x = xey + xfac*xey; 
     obj.layout.scene.camera.eye.y = yey + yfac*yey;
-    obj.layout.scene.camera.eye.z = zar + yfac*zar;
+    obj.layout.scene.camera.eye.z = zar + zfac*zar;
 end
 
 %---------------------------------------------------------------------%

diff --git a/plotly/plotlyfig_aux/handlegraphics/updateContourgroup.m b/plotly/plotlyfig_aux/handlegraphics/updateContourgroup.m
@@ -143,7 +143,7 @@
 %---------------------------------------------------------------------%
 
 %-colorscale-%
-colormap = figure_data.Colormap;
+colormap = axis_data.Colormap;
 
 for c = 1:size((colormap),1)
     col =  255*(colormap(c,:));
@@ -166,12 +166,12 @@
 
 %-contour levels-%
 if length(contour_data.LevelList) > 1
-    cstart = contour_data.LevelList(1);
-    cend = contour_data.LevelList(end);
-    csize = mean(diff(contour_data.LevelList));
+    cstart = contour_data.TextList(1);
+    cend = contour_data.TextList(end);
+    csize = mean(diff(contour_data.TextList));
 else
-    cstart = contour_data.LevelList(1) - 1e-3;
-    cend = contour_data.LevelList(end) + 1e-3;
+    cstart = contour_data.TextList(1) - 1e-3;
+    cend = contour_data.TextList(end) + 1e-3;
     csize = 2e-3;
 end
 
@@ -239,7 +239,7 @@
 %-------------------------------------------------------------------------%
 
 %-contour showscale-%
-obj.data{contourIndex}.showscale = false;
+obj.data{contourIndex}.showscale = true;
 
 %-------------------------------------------------------------------------%
 

diff --git a/plotly/plotlyfig_aux/handlegraphics/updateFunctionContour.m b/plotly/plotlyfig_aux/handlegraphics/updateFunctionContour.m
@@ -133,14 +133,27 @@
         obj.data{contourIndex}.contours.coloring = 'fill';
 end
 
+%-------------------------------------------------------------------------%
+
+%-contour levels-%
+if length(contour_data.LevelList) > 1
+    cstart = contour_data.LevelList(1);
+    cend = contour_data.LevelList(end);
+    csize = mean(diff(contour_data.LevelList));
+else
+    cstart = contour_data.LevelList(1) - 1e-3;
+    cend = contour_data.LevelList(end) + 1e-3;
+    csize = 2e-3;
+end
+
 %-start-%
-obj.data{contourIndex}.contours.start = contour_data.LevelList(1);
+obj.data{contourIndex}.contours.start = cstart;
 
 %-end-%
-obj.data{contourIndex}.contours.end = contour_data.LevelList(end);
+obj.data{contourIndex}.contours.end = cend;
 
 %-step-%
-obj.data{contourIndex}.contours.size = contour_data.LevelStep;
+obj.data{contourIndex}.contours.size = csize;
 
 %-------------------------------------------------------------------------%
 
@@ -199,4 +212,18 @@
 
 %-------------------------------------------------------------------------%
 
+%-axis layout-%
+t = 'linear';
+eval(['obj.layout.xaxis' num2str(xsource) '.type=t;']);
+eval(['obj.layout.xaxis' num2str(xsource) '.autorange=true;']);
+eval(['obj.layout.xaxis' num2str(xsource) '.ticktext=axis_data.XTickLabel;']);
+eval(['obj.layout.xaxis' num2str(xsource) '.tickvals=axis_data.XTick;']);
+
+eval(['obj.layout.yaxis' num2str(xsource) '.type=t;']);
+eval(['obj.layout.yaxis' num2str(xsource) '.autorange=true;']);
+eval(['obj.layout.yaxis' num2str(xsource) '.ticktext=axis_data.YTickLabel;']);
+eval(['obj.layout.yaxis' num2str(xsource) '.tickvals=axis_data.YTick;']);
+
+%-------------------------------------------------------------------------%
+
 end
diff --git a/plotly/plotlyfig_aux/helpers/extractAxisData.m b/plotly/plotlyfig_aux/helpers/extractAxisData.m
@@ -223,7 +223,7 @@
                     %-range (overwrite)-%
                     axis.autorange = true;
                     %-axis autotick-%
-                    axis.autotick = true;
+                    % axis.autotick = true;
                 end
             end
         end

diff --git a/plotly/plotlyfig_aux/helpers/handleFileName.m b/plotly/plotlyfig_aux/helpers/handleFileName.m
@@ -7,6 +7,11 @@ function handleFileName(obj)
             str = get(obj.State.Text(t).Handle,'String');
             interp = get(obj.State.Text(t).Handle,'Interpreter');
             obj.PlotOptions.FileName = parseString(str,interp);
+
+            % untitle.html if \text exist (special chars)
+            if ~isempty(strfind(obj.PlotOptions.FileName, '\text'))
+                obj.PlotOptions.FileName = 'untitled';
+            end
         end
     end
 end