Added -norender flag option to plotlyfig

Tom Clark · Tom Clark · commit b7b19ef94463 · 2017-10-26T15:03:07.000+01:00
diff --git a/plotly/plotly_offline_aux/plotlyoffline.m b/plotly/plotly_offline_aux/plotlyoffline.m
@@ -55,7 +55,7 @@
                           'window.PLOTLYENV.BASE_URL="%s";', ...
                           'Plotly.LINKTEXT="%s";', ...
                           '</script>'], plotly_domain, link_text); 
-        
+    
     % template Plotly.plot   
     script = sprintf(['\n Plotly.plot("%s", %s, %s).then(function(){'...
                       '\n    $(".%s.loading").remove();' ...
diff --git a/plotly/plotlyfig.m b/plotly/plotlyfig.m
@@ -14,6 +14,7 @@
     properties (SetObservable)
         UserData;% credentials/configuration/verbose
         PlotOptions; % filename,fileopt,world_readable
+        RenderFig = true; % uses matlab figure rendering to allow use of the matlab API instead of direct creation using plotly native
     end
     
     properties (Hidden = true)
@@ -110,6 +111,9 @@
             % initialize autoupdate key
             updatekey = false;
             
+            % initialize render_fig flag
+            obj.RenderFig = true;
+            
             % parse inputs
             switch nargin
                 
@@ -121,6 +125,10 @@
                             fig_han = varargin{1};
                             updatekey = true;
                         end
+                    elseif ischar(varargin{1}) && strcmp(varargin{1},'-norender')
+                        obj.RenderFig = false;
+                        updatekey = false;
+                        parseinit = 2;
                     else
                         errkey = 'plotlyfigConstructor:invalidInputs';
                         error(errkey , plotlymsg(errkey));
@@ -135,6 +143,10 @@
                             updatekey = true;
                             parseinit = 2;
                         end
+                    elseif ischar(varargin{1}) && strcmp(varargin{1},'-norender')
+                        obj.RenderFig = false;
+                        updatekey = false;
+                        parseinit = 2;
                     else
                         parseinit = 1;
                     end
@@ -191,32 +203,35 @@
                     end
             end
             
-            % create figure/axes if empty
-            if isempty(fig_han)
-                fig_han = figure;
-                axes;
-            end
-            
-            % plotly figure default style
-            set(fig_han,'Name',obj.PlotOptions.FileName,'Color',[1 1 1],'NumberTitle','off', 'Visible', obj.PlotOptions.Visible);
-            
-            % figure state
-            obj.State.Figure.Handle = fig_han;
-            
-            % update
-            if updatekey
-                obj.update;
+            % Only init the figure renderer if the -norender flag is not passed
+            if obj.RenderFig
+                % create figure/axes if empty
+                if isempty(fig_han)
+                    fig_han = figure;
+                    axes;
+                end
+
+                % plotly figure default style
+                set(fig_han,'Name',obj.PlotOptions.FileName,'Color',[1 1 1],'NumberTitle','off', 'Visible', obj.PlotOptions.Visible);
+
+                % figure state
+                obj.State.Figure.Handle = fig_han;
+
+                % update
+                if updatekey
+                    obj.update;
+                end
+
+                % add figure listeners
+                addlistener(obj.State.Figure.Handle,'Visible','PostSet',@(src,event)updateFigureVisible(obj,src,event));
+                addlistener(obj.State.Figure.Handle,'Name','PostSet',@(src,event)updateFigureName(obj,src,event));
+
+                % add plot options listeners
+                addlistener(obj,'PlotOptions','PostSet',@(src,event)updatePlotOptions(obj,src,event));
+
+                % add user data listeners
+                addlistener(obj,'UserData','PostSet',@(src,event)updateUserData(obj,src,event));
             end
-            
-            % add figure listeners
-            addlistener(obj.State.Figure.Handle,'Visible','PostSet',@(src,event)updateFigureVisible(obj,src,event));
-            addlistener(obj.State.Figure.Handle,'Name','PostSet',@(src,event)updateFigureName(obj,src,event));
-            
-            % add plot options listeners
-            addlistener(obj,'PlotOptions','PostSet',@(src,event)updatePlotOptions(obj,src,event));
-            
-            % add user data listeners
-            addlistener(obj,'UserData','PostSet',@(src,event)updateUserData(obj,src,event));
         end
         
         %-------------------------USER METHODS----------------------------%
