Replace set() with direct property access

plotly · Aug 15, 2024 · ba4092d · ba4092d
1 parent 2ec8330
commit ba4092d
Show file tree

Hide file tree

Showing 9 changed files with 57 additions and 164 deletions.
diff --git a/plotly/plotlyfig_aux/core/updateAxis.m b/plotly/plotlyfig_aux/core/updateAxis.m
@@ -42,11 +42,11 @@
 
     %-STANDARDIZE UNITS-%
     axisUnits = obj.State.Axis(axIndex).Handle.Units;
-    set(obj.State.Axis(axIndex).Handle,'Units','normalized')
+    obj.State.Axis(axIndex).Handle.Units = 'normalized';
 
     try
         fontUnits = obj.State.Axis(axIndex).Handle.FontUnits;
-        set(obj.State.Axis(axIndex).Handle,'FontUnits','points')
+        obj.State.Axis(axIndex).Handle.FontUnits = 'points';
     catch
         % TODO
     end
@@ -172,10 +172,10 @@
     %---------------------------------------------------------------------%
 
     %-REVERT UNITS-%
-    set(obj.State.Axis(axIndex).Handle, 'Units', axisUnits);
+    obj.State.Axis(axIndex).Handle.Units = axisUnits;
 
     try
-        set(obj.State.Axis(axIndex).Handle, 'FontUnits', fontUnits);
+        obj.State.Axis(axIndex).Handle.FontUnits = fontUnits;
     catch
         % TODO
     end

diff --git a/plotly/plotlyfig_aux/core/updateAxisMultipleYAxes.m b/plotly/plotlyfig_aux/core/updateAxisMultipleYAxes.m
@@ -3,11 +3,11 @@
 
     %-STANDARDIZE UNITS-%
     axisUnits = obj.State.Axis(axIndex).Handle.Units;
-    set(obj.State.Axis(axIndex).Handle,'Units','normalized')
+    obj.State.Axis(axIndex).Handle.Units = 'normalized';
 
     try
         fontUnits = obj.State.Axis(axIndex).Handle.FontUnits;
-        set(obj.State.Axis(axIndex).Handle,'FontUnits','points')
+        obj.State.Axis(axIndex).Handle.FontUnits = 'points';
     catch
         % TODO
     end
@@ -73,10 +73,10 @@
     %---------------------------------------------------------------------%
 
     %-REVERT UNITS-%
-    set(obj.State.Axis(axIndex).Handle,'Units',axisUnits);
+    obj.State.Axis(axIndex).Handle.Units = axisUnits;
 
     try
-        set(obj.State.Axis(axIndex).Handle,'FontUnits',fontUnits);
+        obj.State.Axis(axIndex).Handle.FontUnits = fontUnits;
     catch
         % TODO
     end

diff --git a/plotly/plotlyfig_aux/core/updateColorbar.m b/plotly/plotlyfig_aux/core/updateColorbar.m
@@ -43,7 +43,7 @@
 
     %-STANDARDIZE UNITS-%
     colorbarUnits = colorbarData.Units;
-    set(obj.State.Colorbar(colorbarIndex).Handle, 'Units', 'normalized');
+    obj.State.Colorbar(colorbarIndex).Handle.Units = 'normalized';
 
     %---------------------------------------------------------------------%
 
@@ -120,15 +120,15 @@
     titlefontunits = colorbarTitleData.FontUnits;
     ylabelunits = colorbarYLabelData.Units;
     ylabelfontunits = colorbarYLabelData.FontUnits;
-    set(colorbarTitle,'Units', 'data');
-    set(colorbarYLabel,'Units', 'data');
-    set(colorbarYLabel,'FontUnits', 'points');
+    colorbarTitle.Units = 'data';
+    colorbarYLabel.Units = 'data';
+    colorbarYLabel.FontUnits = 'points';
     if ~isHG2
         xlabelunits = colorbarXLabelData.Units;
         xlabelfontunits = colorbarXLabelData.FontUnits;
-        set(colorbarTitle,'FontUnits', 'points');
-        set(colorbarXLabel,'Units', 'data');
-        set(colorbarXLabel,'FontUnits', 'points');
+        colorbarTitle.FontUnits = 'points';
+        colorbarXLabel.Units = 'data';
+        colorbarXLabel.FontUnits = 'points';
     end
 
     %---------------------------------------------------------------------%
@@ -150,7 +150,6 @@
         titleFontColor = sprintf("rgb(%d,%d,%d)", ...
                 round(255*colorbarTitleData.Color));
         titleFontFamily = matlab2plotlyfont(colorbarTitleData.FontName);
-
     elseif ~isempty(colorbarXLabelData.String)
         titleString = colorbarXLabelData.String;
         titleInterpreter = colorbarXLabelData.Interpreter;
@@ -160,7 +159,6 @@
         titleFontColor = sprintf("rgb(%d,%d,%d)", ...
                 round(255*colorbarXLabelData.Color));
         titleFontFamily = matlab2plotlyfont(colorbarXLabelData.FontName);
-
     elseif ~isempty(colorbarYLabelData.String)
         titleString = colorbarYLabelData.String;
         titleInterpreter = colorbarYLabelData.Interpreter;
@@ -170,7 +168,6 @@
         titleFontColor = sprintf("rgb(%d,%d,%d)", ...
                 round(255*colorbarYLabelData.Color));
         titleFontFamily = matlab2plotlyfont(colorbarYLabelData.FontName);
-
     else
         isTitle = false;
     end
@@ -186,14 +183,14 @@
     %---------------------------------------------------------------------%
 
     %-REVERT UNITS FOR TITLE-%
-    set(colorbarTitle,'Units', titleunits);
-    set(colorbarTitle,'FontUnits', titlefontunits);
-    set(colorbarYLabel,'Units', ylabelunits);
-    set(colorbarYLabel,'FontUnits', ylabelfontunits);
+    colorbarTitle.Units = titleunits;
+    colorbarTitle.FontUnits = titlefontunits;
+    colorbarYLabel.Units = ylabelunits;
+    colorbarYLabel.FontUnits = ylabelfontunits;
 
     if ~isHG2
-        set(colorbarXLabel,'Units', xlabelunits);
-        set(colorbarXLabel,'FontUnits', xlabelfontunits);
+        colorbarXLabel.Units = xlabelunits;
+        colorbarXLabel.FontUnits = xlabelfontunits;
     end
 
     %---------------------------------------------------------------------%
@@ -207,10 +204,8 @@
         if isempty(tickValues)
             showTickLabels = false;
             colorbar.ticks = '';
-
         elseif isempty(tickLabels)
             colorbar.tickvals = tickValues;
-
         else
             colorbar.tickvals = tickValues;
             colorbar.ticktext = tickLabels;
@@ -232,9 +227,7 @@
                 case 'out'
                     colorbar.ticks = 'outside';
             end
-
         end
-
     else
         colorbar = setTicksNotHG2(colorbar, colorbarData);
     end
@@ -268,7 +261,7 @@
     %---------------------------------------------------------------------%
 
     %-REVERT UNITS-%
-    set(obj.State.Colorbar(colorbarIndex).Handle, 'Units', colorbarUnits);
+    obj.State.Colorbar(colorbarIndex).Handle.Units = colorbarUnits;
 end
 
 function colorbar = setTicksNotHG2(colorbar, colorbarData)
@@ -288,7 +281,7 @@
                     colorbar.ticks = 'outside';
             end
 
-            if strcmp(colorbarData.YTickLabelMode,'auto')
+            if strcmp(colorbarData.YTickLabelMode, 'auto')
                 %-autotick-%
                 colorbar.autotick = true;
                 %-numticks-%
@@ -325,7 +318,7 @@
                     colorbar.ticks = 'outside';
             end
 
-            if strcmp(colorbarData.XTickLabelMode,'auto')
+            if strcmp(colorbarData.XTickLabelMode, 'auto')
                 %-autotick-%
                 colorbar.autotick = true;
                 %-numticks-%

diff --git a/plotly/plotlyfig_aux/core/updateFigure.m b/plotly/plotlyfig_aux/core/updateFigure.m
@@ -32,7 +32,7 @@
 
     %-STANDARDIZE UNITS-%
     figunits = obj.State.Figure.Handle.Units;
-    set(obj.State.Figure.Handle,'Units','pixels');
+    obj.State.Figure.Handle.Units = 'pixels';
 
     %-FIGURE DATA-%
     figure_data = obj.State.Figure.Handle;
@@ -73,5 +73,5 @@
     obj.layout.hovermode = 'closest';
 
     %-REVERT UNITS-%
-    set(obj.State.Figure.Handle,'Units',figunits);
+    obj.State.Figure.Handle.Units = figunits;
 end
diff --git a/plotly/plotlyfig_aux/core/updateLegend.m b/plotly/plotlyfig_aux/core/updateLegend.m
@@ -14,8 +14,8 @@
     %-STANDARDIZE UNITS-%
     legendunits = obj.State.Legend(legIndex).Handle.Units;
     fontunits = obj.State.Legend(legIndex).Handle.FontUnits;
-    set(obj.State.Legend(legIndex).Handle, 'Units', 'normalized');
-    set(obj.State.Legend(legIndex).Handle, 'FontUnits', 'points');
+    obj.State.Legend(legIndex).Handle.Units = 'normalized';
+    obj.State.Legend(legIndex).Handle.FontUnits = 'points';
 
     %-LEGEND DATA STRUCTURE-%
     legend_data = obj.State.Legend(legIndex).Handle;
@@ -51,6 +51,6 @@
     end
 
     %-REVERT UNITS-%
-    set(obj.State.Legend(legIndex).Handle,'Units',legendunits);
-    set(obj.State.Legend(legIndex).Handle,'FontUnits',fontunits);
+    obj.State.Legend(legIndex).Handle.Units = legendunits;
+    obj.State.Legend(legIndex).Handle.FontUnits = fontunits;
 end
diff --git a/plotly/plotlyfig_aux/core/updateLegendMultipleAxes.m b/plotly/plotlyfig_aux/core/updateLegendMultipleAxes.m
@@ -44,8 +44,8 @@
     %-STANDARDIZE UNITS-%
     legendUnits = obj.State.Legend(legIndex).Handle.Units;
     fontUnits = obj.State.Legend(legIndex).Handle.FontUnits;
-    set(obj.State.Legend(legIndex).Handle,'Units','normalized');
-    set(obj.State.Legend(legIndex).Handle,'FontUnits','points');
+    obj.State.Legend(legIndex).Handle.Units = 'normalized';
+    obj.State.Legend(legIndex).Handle.FontUnits = 'points';
 
     %---------------------------------------------------------------------%
 
@@ -83,6 +83,6 @@
     end
 
     %-REVERT UNITS-%
-    set(obj.State.Legend(legIndex).Handle,'Units', legendUnits);
-    set(obj.State.Legend(legIndex).Handle,'FontUnits', fontUnits);
+    obj.State.Legend(legIndex).Handle.Units = legendUnits;
+    obj.State.Legend(legIndex).Handle.FontUnits = fontUnits;
 end