Changeset 711 for trunk/src/series

Timestamp:

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

Author:

sommeria

Message:

various improvements

Location:

trunk/src/series

Files:

• civ_input.m (modified) (2 diffs)
• civ_series.m (modified) (1 diff)

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