Changeset 664 for trunk/src/series.m

Timestamp:

Jul 11, 2013, 11:56:47 PM (11 years ago)

Author:

sommeria

Message:

a few bugs corrected: import and retrival of parameters in series. mask in civ_series

File:

• trunk/src/series.m (modified) (1 diff)

trunk/src/series.m

@@ -2563 +2563 @@
 
 InputTable=get(handles.InputTable,'Data');
-[FileName, PathName] = uigetfile( ...
-       {'*.xml', ' (*.xml)';
-       '*.xml',  '.xml files '; ...
-        '*.*',  'All Files (*.*)'}, ...
-        'Pick a file',InputTable{1,1});
-filexml=[PathName FileName];%complete file name 
-if isempty(filexml),return;end %abandon if no file is introduced by the browser
-Param=xml2struct(filexml);
-fill_GUI(Param,handles.series)
+filexml=uigetfile_uvmat('pick a xml parameter file',InputTable{1,1},'.xml');
+% [FileName, PathName] = uigetfile( ...
+%        {'*.xml', ' (*.xml)';
+%        '*.xml',  '.xml files '; ...
+%         '*.*',  'All Files (*.*)'}, ...
+%         'Pick a file',InputTable{1,1});
+% filexml=[PathName FileName];%complete file name 
+if ~isempty(filexml)%abandon if no file is introduced by the browser
+    Param=xml2struct(filexml);
+    fill_GUI(Param,handles.series)
+    if isfield(Param,'ActionInput')
+            set(handles.ActionInput,'Visible','on')
+    set(handles.ActionInput_title,'Visible','on')
+    set(handles.ActionInputView,'Visible','on')
+    set(handles.ActionInputView,'Value',0)
+    %set(handles.ActionInput,'String',ActionName)
+%    ParamOut.ActionInput.Program=ActionName; % record the program in ActionInput
+    SeriesData=get(handles.series,'UserData');
+    SeriesData.ActionInput=Param.ActionInput;
+    set(handles.series,'UserData',SeriesData)
+    end
+    ActionName_Callback([],[],handles)
+end
 
 %------------------------------------------------------------------------