Merge pull request #482 from plotly/direct-property-access

Use direct property access instead of set/get methods for speed

Author: robertoffmoura

README.md

@@ -16,7 +16,7 @@ Version: 2.2.10
 
 The latest version of the wrapper can be downloaded [here](https://github.com/plotly/MATLAB-Online/archive/master.zip).
 
-Once downloaded, run `plotlysetup_offline()` to get started
+Once downloaded, run `plotlysetup_offline()` to get started.
 If you have a plotly bundle url of the form 'http://cdn.plot.ly/plotly-latest.min.js', then run instead
 `plotlysetup_offline('plotly_bundle_url')
 
@@ -48,8 +48,8 @@ Convert your MATLAB® figures into online [Plotly](https://plot.ly) graphs with
  title('Frequency Response');
 
  % Use the axis handles to set the labels of the y axes
- set(get(ax(1), 'Ylabel'), 'String', 'Low Frequency');
- set(get(ax(2), 'Ylabel'), 'String', 'High Frequency');
+ ax(1).YLabel.String = "Low Frequency";
+ ax(2).YLabel.String = "High Frequency";
 
  %--PLOTLY--%
  p = fig2plotly; % <-- converts the yy-plot to an interactive, online version.

plotly/plotlyfig.m

@@ -589,7 +589,7 @@ function validate(obj)
 
             % check if there is tiledlayout
             try
-                tiledLayoutStruct = get(obj.State.Figure.Handle.Children);
+                tiledLayoutStruct = obj.State.Figure.Handle.Children;
                 isTiledLayout = strcmp(tiledLayoutStruct.Type, 'tiledlayout');
             catch
                 isTiledLayout = false;
@@ -600,7 +600,7 @@ function validate(obj)
 
             if isempty(ax)
                 try
-                    ax = get(obj.State.Figure.Handle,'Children');
+                    ax = obj.State.Figure.Handle.Children;
                 catch
                     ax = gca;
                 end
@@ -648,7 +648,7 @@ function validate(obj)
 
                 % add title
                 try
-                    obj.State.Text(a).Handle = get(ax(axrev),'Title');
+                    obj.State.Text(a).Handle = ax(axrev).Title;
                     obj.State.Text(a).AssociatedAxis = handle(ax(axrev));
                     obj.State.Text(a).Title = true;
                 catch
@@ -884,12 +884,12 @@ function validate(obj)
         %----UPDATE FIGURE OPTIONS----%
         function obj = updateFigureVisible(obj,src,event)
             % update PlotOptions.Visible
-            obj.PlotOptions.Visible = get(obj.State.Figure.Handle,'Visible');
+            obj.PlotOptions.Visible = obj.State.Figure.Handle.Visible;
         end
 
         function obj = updateFigureName(obj,src,event)
             % update PlotOptions.Name
-            obj.PlotOptions.FileName = get(obj.State.Figure.Handle,'Name');
+            obj.PlotOptions.FileName = obj.State.Figure.Handle.Name;
         end
 
         %----UPDATE PLOT OPTIONS----%

plotly/plotlyfig_aux/core/updateAnnotation.m

@@ -38,13 +38,13 @@
 [xsource, ysource] = findSourceAxis(obj,axIndex);
 
 %-STANDARDIZE UNITS-%
-textunits = get(obj.State.Text(anIndex).Handle,'Units');
-fontunits = get(obj.State.Text(anIndex).Handle,'FontUnits');
+textunits = obj.State.Text(anIndex).Handle.Units;
+fontunits = obj.State.Text(anIndex).Handle.FontUnits;
 set(obj.State.Text(anIndex).Handle,'Units','data');
 set(obj.State.Text(anIndex).Handle,'FontUnits','points');
 
 %-TEXT DATA STRUCTURE-%
-text_data = get(obj.State.Text(anIndex).Handle);
+text_data = obj.State.Text(anIndex).Handle;
 
 %-------------------------------------------------------------------------%
 
@@ -216,4 +216,4 @@
 
 %-------------------------------------------------------------------------%
 
-end
+end

plotly/plotlyfig_aux/core/updateAxis.m

@@ -42,18 +42,18 @@
 % position:...[NOT SUPPORTED IN MATLAB]
 
 %-STANDARDIZE UNITS-%
-axisUnits = get(obj.State.Axis(axIndex).Handle,'Units');
+axisUnits = obj.State.Axis(axIndex).Handle.Units;
 set(obj.State.Axis(axIndex).Handle,'Units','normalized')
 
 try
-    fontUnits = get(obj.State.Axis(axIndex).Handle,'FontUnits');
+    fontUnits = obj.State.Axis(axIndex).Handle.FontUnits;
     set(obj.State.Axis(axIndex).Handle,'FontUnits','points')
 catch
     % TODO
 end
 
 %-AXIS DATA STRUCTURE-%
-axisData = get(obj.State.Axis(axIndex).Handle);
+axisData = obj.State.Axis(axIndex).Handle;
 
 %-------------------------------------------------------------------------%
 

plotly/plotlyfig_aux/core/updateAxisMultipleYAxes.m

@@ -3,18 +3,18 @@
 function obj = updateAxisMultipleYAxes(obj,axIndex,yaxIndex)
 
     %-STANDARDIZE UNITS-%
-    axisUnits = get(obj.State.Axis(axIndex).Handle,'Units');
+    axisUnits = obj.State.Axis(axIndex).Handle.Units;
     set(obj.State.Axis(axIndex).Handle,'Units','normalized')
 
     try
-        fontUnits = get(obj.State.Axis(axIndex).Handle,'FontUnits');
+        fontUnits = obj.State.Axis(axIndex).Handle.FontUnits;
         set(obj.State.Axis(axIndex).Handle,'FontUnits','points')
     catch
         % TODO
     end
 
     %-AXIS DATA STRUCTURE-%
-    axisData = get(obj.State.Axis(axIndex).Handle);
+    axisData = obj.State.Axis(axIndex).Handle;
 
     %-------------------------------------------------------------------------%
 

plotly/plotlyfig_aux/core/updateColorbar.m

@@ -33,11 +33,11 @@
     % ypad: ...[DONE]
 
     %-FIGURE STRUCTURE-%
-    figureData = get(obj.State.Figure.Handle);
+    figureData = obj.State.Figure.Handle;
 
     %-PLOT DATA STRUCTURE- %
     try
-        colorbarData = get(obj.State.Colorbar(colorbarIndex).Handle);
+        colorbarData = obj.State.Colorbar(colorbarIndex).Handle;
     catch
         disp('could not get colorbar data');
     end
@@ -100,16 +100,16 @@
     colorbarTitle = colorbarData.Label;
 
     if isHG2
-        colorbarTitleData = get(colorbarTitle);
+        colorbarTitleData = colorbarTitle;
         colorbarYLabel = colorbarTitle;
-        colorbarYLabelData = get(colorbarTitle);
+        colorbarYLabelData = colorbarTitle;
         colorbarXLabelData.String = [];
     else
-        colorbarTitleData = get(colorbarTitle);
+        colorbarTitleData = colorbarTitle;
         colorbarXLabel = colorbarData.XLabel;
-        colorbarXLabelData = get(colorbarXLabel);
+        colorbarXLabelData = colorbarXLabel;
         colorbarYLabel = colorbarData.YLabel;
-        colorbarYLabelData = get(colorbarYLabel);
+        colorbarYLabelData = colorbarYLabel;
     end
 
     %-------------------------------------------------------------------------%

plotly/plotlyfig_aux/core/updateData.m

@@ -207,7 +207,7 @@
     % check for xaxis categories
     if strcmpi(xaxis.type, 'category') && ...
             ~strcmp(obj.data{dataIndex}.type,'box')
-        obj.data{dataIndex}.x =  get(obj.State.Plot(dataIndex).AssociatedAxis,'XTickLabel');
+        obj.data{dataIndex}.x =  obj.State.Plot(dataIndex).AssociatedAxis.XTickLabel;
         eval(['obj.layout.xaxis' num2str(xsource) '.autotick=true;']);
     end
 
@@ -219,7 +219,7 @@
     % check for yaxis categories
     if strcmpi(yaxis.type, 'category') && ...
             ~strcmp(obj.data{dataIndex}.type,'box')
-        obj.data{dataIndex}.y =  get(obj.State.Plot(dataIndex).AssociatedAxis,'YTickLabel');
+        obj.data{dataIndex}.y =  obj.State.Plot(dataIndex).AssociatedAxis.YTickLabel;
         eval(['obj.layout.yaxis' num2str(xsource) '.autotick=true;']);
     end
 catch

plotly/plotlyfig_aux/core/updateFigure.m

@@ -33,11 +33,11 @@
 
 
 %-STANDARDIZE UNITS-%
-figunits = get(obj.State.Figure.Handle,'Units');
+figunits = obj.State.Figure.Handle.Units;
 set(obj.State.Figure.Handle,'Units','pixels');
 
 %-FIGURE DATA-%
-figure_data = get(obj.State.Figure.Handle);
+figure_data = obj.State.Figure.Handle;
 
 %-------------------------------------------------------------------------%
 

plotly/plotlyfig_aux/core/updateLegend.m

@@ -13,13 +13,13 @@
 % yanchor: ...[DONE]
 
 %-STANDARDIZE UNITS-%
-legendunits = get(obj.State.Legend(legIndex).Handle,'Units');
-fontunits = get(obj.State.Legend(legIndex).Handle,'FontUnits');
+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');
 
 %-LEGEND DATA STRUCTURE-%
-legend_data = get(obj.State.Legend(legIndex).Handle);
+legend_data = obj.State.Legend(legIndex).Handle;
 
 % only displays last legend as global Plotly legend
 obj.layout.legend = struct();
@@ -109,4 +109,4 @@
 set(obj.State.Legend(legIndex).Handle,'Units',legendunits);
 set(obj.State.Legend(legIndex).Handle,'FontUnits',fontunits);
 
-end
+end

plotly/plotlyfig_aux/core/updateLegendMultipleAxes.m

@@ -42,15 +42,15 @@
 %-------------------------------------------------------------------------%
 
 %-STANDARDIZE UNITS-%
-legendUnits = get(obj.State.Legend(legIndex).Handle,'Units');
-fontUnits = get(obj.State.Legend(legIndex).Handle,'FontUnits');
+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');
 
 %-------------------------------------------------------------------------%
 
 %-LEGEND DATA STRUCTURE-%
-legendData = get(obj.State.Legend(legIndex).Handle);
+legendData = obj.State.Legend(legIndex).Handle;
 
 % only displays last legend as global Plotly legend
 obj.layout.legend = struct();
@@ -124,4 +124,4 @@
 set(obj.State.Legend(legIndex).Handle,'Units',legendUnits);
 set(obj.State.Legend(legIndex).Handle,'FontUnits',fontUnits);
 
-end
+end