Merge pull request #483 from plotly/remove-primary-try-catchs

Remove primary try-catchs that just hide errors (and fix resulting bugs)

Author: robertoffmoura

plotly/plotlyfig.m

@@ -789,17 +789,16 @@ function validate(obj)
 
             % update axes
             for n = 1:obj.State.Figure.NumAxes
-                try
-                    if ~obj.PlotlyDefaults.isMultipleYAxes(n)
-                        updateAxis(obj,n);
+                if ismember(ax(n).Type,specialAxisPlots())
+                    continue
+                end
+                if ~obj.PlotlyDefaults.isMultipleYAxes(n)
+                    updateAxis(obj,n);
 
-                    else
-                        for yax = 1:2
-                            updateAxisMultipleYAxes(obj,n,yax);
-                        end
+                else
+                    for yax = 1:2
+                        updateAxisMultipleYAxes(obj,n,yax);
                     end
-                catch
-                    % TODO 
                 end
             end
 

plotly/plotlyfig_aux/core/updateAxis.m

@@ -58,8 +58,8 @@
 %-------------------------------------------------------------------------%
 
 %-check if headmap axis-%
-is_headmap_axis = isfield(axisData, 'XDisplayData');
-obj.PlotOptions.is_headmap_axis = is_headmap_axis;
+isHeatmapAxis = axisData.Type == "heatmap";
+obj.PlotOptions.is_headmap_axis = isHeatmapAxis;
 
 %-------------------------------------------------------------------------%
 
@@ -70,7 +70,7 @@
 %-------------------------------------------------------------------------%
 
 %-xaxis-%
-if is_headmap_axis
+if isHeatmapAxis
     xaxis = extractHeatmapAxisData(obj,axisData, 'X');
     xExponentFormat = 0;
 else
@@ -80,7 +80,7 @@
 %-------------------------------------------------------------------------%
 
 %-yaxis-%
-if is_headmap_axis
+if isHeatmapAxis
     yaxis = extractHeatmapAxisData(obj,axisData, 'Y');
     yExponentFormat = 0;
 else

plotly/plotlyfig_aux/core/updateData.m

@@ -2,8 +2,6 @@
 
 function obj = updateData(obj, dataIndex)
 
-try
-    
     %-update plot based on TreatAs PlotOpts-%
 
     if ismember('pie3', lower(obj.PlotOptions.TreatAs))
@@ -174,19 +172,15 @@
                 if isBoxplot(obj, dataIndex)
                     updateBoxplot(obj, dataIndex);
                 end
+            otherwise
+                error('Non-supported plot: %s',lower(obj.State.Plot(dataIndex).Class));
         end
     end
-    
-catch exception
-    if obj.UserData.Verbose
-        fprintf([exception.message '\nWe had trouble parsing the ' obj.State.Plot(dataIndex).Class ' object.\n',...
-                 'This trace might not render properly.\n\n']);
-    end
-end
 
 %------------------------AXIS/DATA CLEAN UP-------------------------------%
 
-try
+ax = obj.State.Plot(dataIndex).AssociatedAxis;
+if ~ismember(ax.Type,specialAxisPlots())
     %-AXIS INDEX-%
     axIndex = obj.getAxisIndex(obj.State.Plot(dataIndex).AssociatedAxis);
 
@@ -206,7 +200,7 @@
 
     % check for xaxis categories
     if strcmpi(xaxis.type, 'category') && ...
-            ~strcmp(obj.data{dataIndex}.type,'box')
+            ~any(strcmp(obj.data{dataIndex}.type,{'heatmap' 'box'}))
         obj.data{dataIndex}.x =  obj.State.Plot(dataIndex).AssociatedAxis.XTickLabel;
         eval(['obj.layout.xaxis' num2str(xsource) '.autotick=true;']);
     end
@@ -218,13 +212,10 @@
 
     % check for yaxis categories
     if strcmpi(yaxis.type, 'category') && ...
-            ~strcmp(obj.data{dataIndex}.type,'box')
+            ~any(strcmp(obj.data{dataIndex}.type,{'heatmap' 'box'}))
         obj.data{dataIndex}.y =  obj.State.Plot(dataIndex).AssociatedAxis.YTickLabel;
         eval(['obj.layout.yaxis' num2str(xsource) '.autotick=true;']);
     end
-catch
-    % TODO to the future
-    % disp('catch at line 157 in updateData.m file')
 end
 
 %-------------------------------------------------------------------------%

plotly/plotlyfig_aux/handlegraphics/updateArea.m

@@ -77,10 +77,6 @@ function updateArea(obj,areaIndex)
 %-CHECK FOR MULTIPLE AXES-%
 [xsource, ysource] = findSourceAxis(obj,axIndex);
 
-%-AXIS DATA-%
-eval(['xaxis = obj.layout.xaxis' num2str(xsource) ';']);
-eval(['yaxis = obj.layout.yaxis' num2str(ysource) ';']);
-
 %-------------------------------------------------------------------------%
 
 %-area xaxis-%

plotly/plotlyfig_aux/handlegraphics/updateBar.m

@@ -130,5 +130,3 @@
 
     %-------------------------------------------------------------------------%
 end
-
-

plotly/plotlyfig_aux/handlegraphics/updateContourgroup.m

@@ -28,8 +28,8 @@
 
     %-set trace-%
     obj.data{plotIndex}.type = 'contour';
-    obj.data{plotIndex}.xaxis = sprintf('x%s', xSource);
-    obj.data{plotIndex}.yaxis = sprintf('y%s', xSource);
+    obj.data{plotIndex}.xaxis = sprintf('x%d', xSource);
+    obj.data{plotIndex}.yaxis = sprintf('y%d', ySource);
     obj.data{plotIndex}.name = plotData.DisplayName;
     obj.data{plotIndex}.visible = strcmp(plotData.Visible,'on');
     obj.data{plotIndex}.xtype = 'array';

plotly/plotlyfig_aux/handlegraphics/updateHistogram.m

@@ -57,10 +57,6 @@
 %-CHECK FOR MULTIPLE AXES-%
 [xsource, ysource] = findSourceAxis(obj,axIndex);
 
-%-AXIS DATA-%
-eval(['xaxis = obj.layout.xaxis' num2str(xsource) ';']);
-eval(['yaxis = obj.layout.yaxis' num2str(ysource) ';']);
-
 %-------------------------------------------------------------------------%
 
 %-hist xaxis-%

plotly/plotlyfig_aux/handlegraphics/updateQuivergroup.m

@@ -6,7 +6,7 @@
 %------------------------------------------------------------------------%
 
 %-get children-%
-quiver_child = quiver_group .Children;
+quiver_child = quiver_group.Children;
 
 %------------------------------------------------------------------------%
 

plotly/plotlyfig_aux/handlegraphics/updateStairseries.m

@@ -6,7 +6,7 @@
 %------------------------------------------------------------------------%
 
 %-get children-%
-stair_child = stair_group .Children;
+stair_child = stair_group.Children;
 
 %------------------------------------------------------------------------%
 

plotly/plotlyfig_aux/handlegraphics/updateStemseries.m

@@ -4,7 +4,7 @@
 stem_group = obj.State.Plot(dataIndex).Handle;
 
 %-get children-%
-stem_child = stem_group .Children;
+stem_child = stem_group.Children;
 
 %------------------------------------------------------------------------%