Changeset 344 for trunk/src/civ.m

Timestamp:

Dec 21, 2011, 10:37:14 AM (12 years ago)

Author:

sommeria

Message:

small update in civ

File:

• trunk/src/civ.m (modified) (4 diffs)

trunk/src/civ.m

@@ -340 +340 @@
 set(handles.RootName,'String',RootName)
 set(handles.RootName,'BackgroundColor',[1 1 0])%paint RootName edit box in yellow to indicate that the file input is proceeding
+drawnow
 % i1=str2double(i1_str);
 % i2=str2double(i2_str);
@@ -587 +588 @@
 
 %%  set the menus of image pairs and default selection for civ   %%%%%%%%%%%%%%%%%%%
-check_letter=~isempty(regexp(nom_type_ima,'[a|A]$'));
-check_separator=~isempty(regexp(nom_type_ima,'_'));
 % test_ima_i=numel(nom_type_ima)>1 && isempty(regexp(nom_type_ima(2:end),'\D','once'))%=1 for images with single indexing
 % TODO: determine MaxIndex_i and MaxIndex_j using find_file_series (in the absence of xml file)
-if (~check_letter&&~check_separator)|| isequal(nom_type_nc,'_1-2')|| (exist('MaxIndex_j','var')&&(MaxIndex_j==1))
+try
+if (~check_letter&&~check_separator)|| isequal(nom_type_nc,'_1-2')|| (MaxIndex_j==1)
     set(handles.ListPairMode,'Value',1)
     set(handles.ListPairMode,'String',{'series(Di)'})   
@@ -604 +604 @@
         set(handles.ListPairMode,'Value',1)% advice 'pair j1-j2' except in MaxIndex_j is large
     end
+end
 end
 
@@ -653 +654 @@
 %% list the possible index pairs, depending on the option set in ListPairMode
 ListPairMode_Callback([], [], handles)
-'TESTin'
-browse=get(handles.RootName,'UserData')
+browse=get(handles.RootName,'UserData');
 
 %% store the root input filename for future opening