Changeset 361 for trunk

Timestamp:

Jan 9, 2012, 8:26:06 AM (13 years ago)

Author:

sommeria

Message:

fill_GUI debugged: civ can open the xml file of a previous operation (instead of opening the saved GUI figure)

Location:

trunk/src

Files:

• fill_GUI.m (modified) (1 diff)
• series/aver_stat.m (modified) (8 diffs)
• series/check_data_files.m (modified) (2 diffs)

trunk/src/fill_GUI.m

@@ -7 +7 @@
 for ifield=1:numel(fields)
     if isstruct(Param.(fields{ifield}))
-        fields{ifield}
         if isfield(handles,fields{ifield})
-        errormsg=fill_GUI(Param.(fields{ifield}),get(handles.(fields{ifield}),'children'));
+            set(handles.(fields{ifield}),'Visible','on')
+            children=get(handles.(fields{ifield}),'children');
+            for ichild=1:numel(children)
+                hchild.(get(children(ichild),'tag'))=children(ichild);
+            end
+            errormsg=fill_GUI(Param.(fields{ifield}),hchild);
         end
     else
-        fields{ifield}
-        num2str(Param.(fields{ifield}))
-        if isnumeric(Param.(fields{ifield}))
-            if isfield(handles,['num_' fields{ifield}])
-            set(handles.(['num_' fields{ifield}]),'String',num2str(Param.(fields{ifield})))
+        hh=[];
+        if isfield(handles,fields{ifield})
+            hh=handles.(fields{ifield});
+            if strcmp(get(hh,'Type'),'uitable')
+                set(hh,'Data',input)
+                break
             end
-        else
-            if isfield(handles,fields{ifield})
-            set(handles.(fields{ifield}),'String',num2str(Param.(fields{ifield})))
+        elseif isnumeric(input) && isfield(handles,['num_' fields{ifield}])
+            hh=handles.(['num_' fields{ifield}]);
+        end
+        if ~isempty(hh)
+            set(hh,'Visible','on')
+            switch get(hh,'style')
+                case {'checkbox','pushbutton','radiobutton','togglebutton'}
+                    if isnumeric(input)
+                        set(hh,'Value',input)
+                    end
+                case 'edit'
+                    if isnumeric(input)
+                        input=num2str(input);
+                    end
+                    set(hh,'String',input)
+                case{'Listbox','popupmenu'}
+                    if isnumeric(input)
+                        input=num2str(input);
+                    end
+                    menu=get(hh,'String');
+                    iline=find(strcmp(input,menu));
+                    if isempty(iline)
+                        iline=numel(menu)+1;
+                        set(hh,'String',[menu;{input}])
+                    end
+                    set(hh,'Value',iline)
             end
         end

trunk/src/series/aver_stat.m

@@ -13 +13 @@
 %Series: Matlab structure containing information set by the series interface
 %
-function GUI_input=aver_stat(num_i1,num_i2,num_j1,num_j2,Series)
+function GUI_input=aver_stat(Param)
 %----------------------------------------------------------------------
 % --- make average on a series of files
@@ -25 +25 @@
 %  Series.Time: 
 %  Series.GeometryCalib:%requests for the visibility of input windows in the GUI series  (activated directly by the selection in the menu ACTION)
-if ~exist('num_i1','var')
+if ~exist('Param','var')
     GUI_input={'RootPath';'two';...%nbre of possible input series (options 'on'/'two'/'many', default:'one')
         'SubDir';'on';... % subdirectory of derived files (PIV fields), ('on' by default)
@@ -43 +43 @@
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-hseries=guidata(Series.hseries);%handles of the GUI series
-WaitbarPos=get(hseries.waitbar_frame,'Position');
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% Input parameters: read the xml file fior batch case
+if ischar(Param) && ~isempty(find(regexp('Param','.xml$')))
+    Param=xml2struct(Param);
+    else
+        hseries=guidata(Param.hseries);%handles of the GUI series
+    WaitbarPos=get(hseries.waitbar_frame,'Position');
+end
+Param
+Param.IndexRange
 
 %% projection object
@@ -60 +67 @@
 
 %% root input file and type
-if ~iscell(Series.RootPath)% case of a single input field series
-    num_i1={num_i1};num_j1={num_j1};num_i2={num_i2};num_j2={num_j2};
-    RootPath={Series.RootPath};
-    RootFile={Series.RootFile};
-    SubDir={Series.SubDir};
-    FileExt={Series.FileExt};
-    NomType={Series.NomType};
-else
-    RootPath=Series.RootPath;
-    RootFile=Series.RootFile;
-    SubDir=Series.SubDir;
-    NomType=Series.NomType;
-    FileExt=Series.FileExt;
-end   
+% if ~iscell(Series.RootPath)% case of a single input field series
+%     num_i1={num_i1};num_j1={num_j1};num_i2={num_i2};num_j2={num_j2};
+%     RootPath={Series.RootPath};
+%     RootFile={Series.RootFile};
+%     SubDir={Series.SubDir};
+%     FileExt={Series.FileExt};
+%     NomType={Series.NomType};
+% else
+%     RootPath=Series.RootPath;
+%     RootFile=Series.RootFile;
+%     SubDir=Series.SubDir;
+%     NomType=Series.NomType;
+%     FileExt=Series.FileExt;
+% end   
+    RootPath=Param.InputTable(:,1);
+    RootFile=Param.InputTable(:,3);
+    SubDir=Param.InputTable(:,2);
+    NomType=Param.InputTable(:,4);
+    FileExt=Param.InputTable(:,5);
 ext=FileExt{1};
 form=imformats(ext([2:end]));%test valid Matlab image formats
@@ -134 +146 @@
 
 %% number of slices
-NbSlice=Series.IndexRange.NbSlice;
+NbSlice=Param.IndexRange.NbSlice;
 NbSlice_name=num2str(NbSlice);
 
@@ -161 +173 @@
 %% get the velocity type
 testcivx=0;
-FileExt=get(hseries.FileExt,'String');
+% FileExt=get(hseries.FileExt,'String');
 if ~isequal(FieldName,{'get_field...'})
     testcivx=isequal(FileType{1},'netcdf');
@@ -297 +309 @@
 transform_fct=[];%default
 if isfield(Series,'transform_fct')
-    transform_fct=Series.transform_fct;
+    transform_fct=Param.transform_fct;
 end
 
@@ -456 +468 @@
         display([fileresult{i_slice} ' written']);
     else %case of netcdf input file , determine global attributes
-        DataMean.ListGlobalAttribute=[DataMean.ListGlobalAttribute {Series.Action}];
+        DataMean.ListGlobalAttribute=[DataMean.ListGlobalAttribute {Param.Action}];
         ActionKey='Action';
         while isfield(DataMean,ActionKey)
             ActionKey=[ActionKey '_1'];
         end
-        eval(['DataMean.' ActionKey '=Series.Action;'])
+        eval(['DataMean.' ActionKey '=Param.Action;'])
         DataMean.ListGlobalAttribute=[DataMean.ListGlobalAttribute {ActionKey}];
         if isfield(DataMean,'Time')

trunk/src/series/check_data_files.m

@@ -134 +134 @@
                     end
                     Tabchar(1,i_slice)={['slice #' num2str(i_slice)]};
-                    Tabchar(index+1,i_slice)={[file '   ' lastfield]};
+                    Tabchar(index+1,i_slice)={[file '...' lastfield]};
                 end
             end
@@ -165 +165 @@
     set(hfig,'name',['view= ' num2str(iview)])
    
-    h=uicontrol('Style','listbox', 'Position', [20 20 500 300], 'String', Tabchar, 'Callback', @ncbrowser_uvmat);
+    h=uicontrol('Style','listbox', 'Position', [20 20 500 300], 'String', Tabchar, 'Callback', {'open_uvmat'});
     hh=uicontrol('Style','listbox', 'Position', [20 340 500 40], 'String', message);
 end