Merged Fig <-> Nofig, now truely offline

Author: harshpurwar

plotly/plotly_aux/plotly.m

@@ -11,21 +11,19 @@
 % For full documentation and examples, see https://plot.ly/api
 origin = 'plot';
 offline_given = true;
-struct_provided = false;
 
 if isstruct(varargin{end})
     structargs = varargin{end};
     f = lower(fieldnames(structargs));
 
     if any(strcmp('offline', f))
-        offline = getfield(structargs, 'offline');
+        offline = structargs.offline;
         offline_given = offline;
     else
         offline = false;
         offline_given = offline;
     end
 
-
     if ~any(strcmp('filename',f))
         if offline
             structargs.filename = 'untitled';
@@ -36,33 +34,23 @@
     if ~any(strcmp('fileopt',f))
         structargs.fileopt = NaN;
     end
-    
-
-    struct_provided = true;
 
     args = varargin(1:(end-1));
 
 else
-    
     if offline_given
         structargs = struct('filename', 'untitled', 'fileopt', NaN);
     else
-        structargs = struct('filename', NaN,'fileopt',NaN);
+        structargs = struct('filename', NaN, 'fileopt', NaN);
     end
     args = varargin(1:end);
-    struct_provided = false;
 end
 
 if offline_given
-    if (struct_provided)
-        nofig_obj = plotlynofig(varargin{1:end-1}, structargs);
-    else
-        nofig_obj = plotlynofig(varargin{1:end}, structargs);
-    end
-    nofig_obj.layout.width = 840;
-    nofig_obj.layout.height = 630;
-    response = nofig_obj.plotly;
-    
+    obj = plotlyfig(args, structargs);
+    obj.layout.width = 840;
+    obj.layout.height = 630;
+    response = obj.plotly;
 else
     response = makecall(args, origin, structargs);
 end

plotly/plotly_offline_aux/plotlyoffline.m

@@ -85,6 +85,6 @@
     plotly_offline_file = strrep(plotly_offline_file, ' ', '%20'); 
 
     % return the local file url to be rendered in the browser
-    response = ['file://' plotly_offline_file]; 
+    response = ['file:///' plotly_offline_file]; 
 
 end

plotly/plotlyfig.m

@@ -31,7 +31,7 @@
 
         %----CONSTRUCTOR---%
         function obj = plotlyfig(varargin)
-            
+
             %-Core-%
             obj.data = {};
             obj.layout = struct();
@@ -73,7 +73,8 @@
                     obj.UserData.ApiKey,...
                     obj.UserData.PlotlyDomain] = signin;
             catch
-                if obj.PlotOptions.Offline
+                idx=find(cellfun(@(x) strcmpi(x,'offline'), varargin))+1;
+                if (nargin>1 && ~isempty(idx) && varargin{idx}) || (obj.PlotOptions.Offline)
                     obj.UserData.Username = 'offlineUser';
                     obj.UserData.ApiKey = '';
                     obj.UserData.PlotlyDomain = 'https://plot.ly';
@@ -127,6 +128,8 @@
             % initialize autoupdate key
             updatekey = false;
 
+            noFig = false;
+            
             % parse inputs
             switch nargin
 
@@ -152,6 +155,16 @@
                             updatekey = true;
                             parseinit = 2;
                         end
+                    elseif iscell(varargin{1}) && isstruct(varargin{2})
+                        obj.data = varargin{1}{:};
+                        structargs = varargin{2};
+                        ff=fieldnames(structargs);
+                        for i=1:length(ff)
+                            varargin{2*i-1}=ff{i};
+                            varargin{2*i}=structargs.(ff{i});
+                        end
+                        noFig=true;
+                        parseinit = 1;
                     else
                         parseinit = 1;
                     end
@@ -163,7 +176,7 @@
                     end
 
                     % parse property/values
-                    for a = parseinit:2:nargin
+                    for a = parseinit:2:length(varargin)
                         if(strcmpi(varargin{a},'filename'))
                             obj.PlotOptions.FileName = varargin{a+1};
                             % overwrite if filename provided
@@ -235,32 +248,36 @@
                     end
             end
 
-            % create figure/axes if empty
-            if isempty(fig_han)
-                fig_han = figure;
-                axes;
+            if ~noFig
+                % 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;
             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));
+            if ~noFig
+                % 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
         end
 
         %-------------------------USER METHODS----------------------------%
@@ -498,7 +515,7 @@ function validate(obj)
             %send to plotly
             if ~obj.PlotOptions.Offline
                 response = plotly(obj.data, args);
-            
+                
                 %update response
                 obj.url = response.url;
                 obj.error = response.error;