Changeset 711 for trunk/src

Timestamp:

Feb 18, 2014, 10:11:11 AM (11 years ago)

Author:

sommeria

Message:

various improvements

Location:

trunk/src

Files:

• read_GUI.m (modified) (1 diff)
• series.fig (modified) (previous)
• series.m (modified) (6 diffs)
• series/civ_input.m (modified) (2 diffs)
• series/civ_series.m (modified) (1 diff)

trunk/src/read_GUI.m

@@ -93 +93 @@
     List=fields(UserData);
     for ilist=1:numel(List)
-        if isstruct(UserData.(List{ilist})) 
+        if isstruct(UserData.(List{ilist}))% look for edit box with the tag UserData.(List{ilist})
             heditbox=findobj(handle,'Tag',List{ilist},'Style','edit','Visible','on');
             if isequal(numel(heditbox),1)
                 struct.(List{ilist})=UserData.(List{ilist});
+            else% look for pushbutton with the tag UserData.(List{ilist})
+                hpushbutton=findobj(handle,'Tag',List{ilist},'Style','pushbutton','Visible','on');
+                if isequal(numel(hpushbutton),1)
+                    struct.(List{ilist})=UserData.(List{ilist});
+                end
             end
         end

trunk/src/series.m

@@ -2055 +2055 @@
 end       
 
-%% Check whether alphabetical sorting of input Subdir is alowed by the Action fct  (for multiples series entries)
+%% Check whether alphabetical sorting of input Subdir is allowed by the Action fct  (for multiples series entries)
 if isfield(ParamOut,'AllowInputSort')&&isequal(ParamOut.AllowInputSort,'on')&& size(Param.InputTable,1)>1
     [tild,iview]=sort(InputTable(:,2)); %subdirectories sorted in alphabetical order
@@ -2192 +2192 @@
 OutputDirVisible='off';
 if isfield(ParamOut,'OutputDirExt')&&~isempty(ParamOut.OutputDirExt)
+    OutputSubDirMode='all';%default
+    if isfield(ParamOut,'OutputSubDirMode')
+        OutputSubDirMode=ParamOut.OutputSubDirMode;
+    end
     set(handles.OutputDirExt,'String',ParamOut.OutputDirExt)
     OutputDirVisible='on';
     SubDir=InputTable(1:end,2); %set of subdirectories sorted in alphabetical order
-    SubDirOut=SubDir{1};
-    if numel(SubDir)>1
-        for ilist=2:numel(SubDir)
-            SubDirOut=[SubDirOut '-' SubDir{ilist}];
+    if strcmp(OutputSubDirMode,'last')
+        SubDirOut=SubDir{end};
+    else
+        SubDirOut=SubDir{1};
+        if ~strcmp(OutputSubDirMode,'first')  && numel(SubDir)>1
+            for ilist=2:numel(SubDir)
+                SubDirOut=[SubDirOut '-' SubDir{ilist}];
+            end
         end
     end
@@ -2220 +2228 @@
 %% definition of an additional parameter set, determined by an ancillary GUI
 if isfield(ParamOut,'ActionInput')
+%     set(handles.ActionInput,'Visible','on')
+%     set(handles.ActionInput_title,'Visible','on')
     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)
+ %   set(handles.ActionInput,'Value',0)
+%     set(handles.ActionInput,'String',ActionName)
     ParamOut.ActionInput.Program=ActionName; % record the program in ActionInput
     SeriesData.ActionInput=ParamOut.ActionInput;
 else
+%     set(handles.ActionInput,'Visible','off')
+%     set(handles.ActionInput_title,'Visible','off')
     set(handles.ActionInput,'Visible','off')
-    set(handles.ActionInput_title,'Visible','off')
-    set(handles.ActionInputView,'Visible','off')
     if isfield(SeriesData,'ActionInput')
     SeriesData=rmfield(SeriesData,'ActionInput');
@@ -2239 +2247 @@
 
 %------------------------------------------------------------------------
-% --- Executes on button press in ActionInputView.
-function ActionInputView_Callback(hObject, eventdata, handles)
-%------------------------------------------------------------------------
-if get(handles.ActionInputView,'Value')
+% --- Executes on button press in ActionInput.
+function ActionInput_Callback(hObject, eventdata, handles)
+%------------------------------------------------------------------------
+if get(handles.ActionInput,'Value')
     ActionName_Callback(hObject, eventdata, handles)
 end
@@ -2705 +2713 @@
     Param.Action.RUN=0; %desactivate the input RUN=1
     fill_GUI(Param,handles.series)% fill the elements of the GUI series with the input parameters
+    SeriesData=get(handles.series,'UserData');
+    if isfield(Param,'ActionInput')%  introduce  parameters specific to an Action fct, for instance PIV parameters
+%         set(handles.ActionInput,'Visible','on')
+%         set(handles.ActionInput_title,'Visible','on')
+        set(handles.ActionInput,'Visible','on')
+        set(handles.ActionInput,'Value',0)
+        SeriesData.ActionInput=Param.ActionInput;
+    end
+    if isfield(Param,'ProjObject') %introduce projection object if relevant
+        SeriesData.ProjObject=Param.ProjObject;
+    end
+    set(handles.series,'UserData',SeriesData)
     if isfield(Param,'CheckObject') && isequal(Param.CheckObject,1)
         set(handles.ProjObject,'String',Param.ProjObject.Name)
@@ -2720 +2740 @@
     set(handles.REFRESH,'BackgroundColor',[1 0 1]); %paint REFRESH button in magenta to indicate that it should be activated
   %  REFRESH_Callback([],[],handles)% refresh data relative to the input files
-    SeriesData=get(handles.series,'UserData');
-    if isfield(Param,'ActionInput')%  introduce  parameters specific to an Action fct, for instance PIV parameters
-        set(handles.ActionInput,'Visible','on')
-        set(handles.ActionInput_title,'Visible','on')
-        set(handles.ActionInputView,'Visible','on')
-        set(handles.ActionInputView,'Value',0)
-        SeriesData.ActionInput=Param.ActionInput;
-    end
-    if isfield(Param,'ProjObject') %introduce projection object if relevant
-        SeriesData.ProjObject=Param.ProjObject;
-    end
-    set(handles.series,'UserData',SeriesData)
 end
 

trunk/src/series/civ_input.m

@@ -87 +87 @@
 NomTypeInput=Param.InputTable{1,4};
 FileExt=Param.InputTable{1,5};
-FileType=SeriesData.FileType{1};%type of the first input file series
-FileInfo=SeriesData.FileInfo{1};
+if isfield(SeriesData,'FileType')&&isfield(SeriesData,'FileInfo')
+    FileType=SeriesData.FileType{1};%type of the first input file series
+    FileInfo=SeriesData.FileInfo{1};
+else
+    msgbox_uvmat('ERROR','please refresh the input file series')
+    return
+end
 
 
@@ -333 +338 @@
 function errormsg=display_file_name(handles,fileinput)
 %------------------------------------------------------------------------
-
-
-%% enable OK, BATCH button and 'status' display
-% set(handles.OK, 'Enable','On')
-% set(handles.OK,'BackgroundColor',[1 0 0])%set RUN button to red color
-% if isfield(handles,'status')
-%     set(handles.status,'Value',0);       %suppress the 'status' display
-%     status_Callback([], [], handles)
-% end
-
-%% determine nomenclature types and extension of the input files
-% [RootPath,SubDir,Civ2_ImageB,i1,i2,j1,j2,ExtInput,NomTypeInput]=fileparts_uvmat(fileinput);
-% NomTypeNc='';%default
-
-
 
 %% scan the image file series

trunk/src/series/civ_series.m

@@ -58 +58 @@
     Data.Mask='off';%can use mask option   (option 'off'/'on', 'off' by default)
     Data.OutputDirExt='.civ';%set the output dir extension
+    Data.OutputSubDirMode='last'; %select the last subDir in the input table as root of the output subdir name (option 'all'/'first'/'last', 'all' by default)
     Data.OutputFileMode='NbInput_i';% one output file expected per value of i index (used for waitbar)
     filecell=get_file_series(Param);%check existence of the first input file