Changeset 120 for trunk/src

Timestamp:

Nov 9, 2010, 5:27:00 PM (14 years ago)

Author:

gostiaux

Message:

gedit

Location:

trunk/src

Files:

• civ.m (modified) (6 diffs)
• name2display.m (modified) (2 diffs)
• name_generator.m (modified) (1 diff)
• uvmat.m (modified) (2 diffs)

trunk/src/civ.m

@@ -657 +657 @@
     first_i=max(field_i,1);
     
-    if strcmp(nom_type_ima,'_i_j')
+     switch nom_type_ima
+        case {'_i_j','%01dA','%02dA','%03dA','%04dA'}
         field_i=field_count;
         field_j=1;
@@ -671 +672 @@
         end
         nb_field_j=field_j-1;% last detected field number
-    end
+     end
+
     
     
@@ -677 +679 @@
     %   dt=(1/1000)*str2num(get(handles.dt,'String'));
     time=(0:nb_field-1)';% time=file index -1  by default
-    if strcmp(nom_type_ima,'_i_j')
+
+    switch nom_type_ima
+        case {'_i_j','%01dA','%02dA','%03dA','%04dA'}
         % time=[0:nb_field-1]'*ones(1,nb_field_j);% time=file index -1  by default
-        time=[0:nb_field-1]'*[0:nb_field_j-1];% time=file index -1  by default
+        [x,y]=meshgrid([0:2-1],[0:152-1]);
+        time=x+y;
+%         time=[0:nb_field-1]'*[0:nb_field_j-1];% time=file index -1  by default
     end
     
@@ -691 +697 @@
 %   last_j=1;
 % end
+
 if exist('time','var')
     if size(time,1)+size(time,2)>=3 % if there are at least two time values to define dt
@@ -2732 +2739 @@
             %% to lauch the jobs locally :
             if(isunix)
-                eval(['!. ' filename_bat ' &']);
-                display(['!. ' filename_bat ' &'])
+                cmd_str=['!at -qb now -f ' filename_bat ' &']; %ou at -qb now -f
+                eval(cmd_str);
+                display(cmd_str);
             else
-                eval(['!' filename_bat ' &']);
-                display(['!' filename_bat ' &'])
+                cmd_str=['!' filename_bat ' &'];
+                eval(cmd_str);
+                display(cmd_str);
             end
         end
@@ -4891 +4900 @@
 fclose(fid);
 
-cmd_CIV1=[sparam.Civ1Bin ' -f ' filename '.cmx' ]; % redirect standard output to the log file
+cmd_CIV1=[sparam.Civ1Bin ' -f ' filename '.cmx >' filename '.log' ]; % redirect standard output to the log file
 cmd_CIV1=regexprep(cmd_CIV1,'\\','\\\\');
 namelog=regexprep(namelog,'\\','\\\\');

trunk/src/name2display.m

@@ -96 +96 @@
     str_a=last_str; %put appendix a,b,c....
     indcur=indcur-1;
-    nom_type='#A';   
     num=1;count=0; % extract the numerical appendix
     while num==1;
@@ -106 +105 @@
         end
     end
+    if strcmp('0',RootFile(indcur+1)); % select the non-numerical characters
+        nom_type=['%0' num2str(length(RootFile(indcur+1:end-1))) 'dA'];
+    else
+        nom_type='#A';
+    end  
+   
     if count~=0             
             field_count=RootFile(indcur+1:indcur+count);% set the selected field number
     end   
-    indcur=indcur-1;
+%     indcur=indcur-1;
 elseif strcmp(filelit(end-2:end),'-_-_')%new  nomenclature appendix num1-num2_num_a-num_b
     field_count=num0;

trunk/src/name_generator.m

@@ -112 +112 @@
 elseif length(nom_type)>=4 & strcmp(nom_type(1:2),'%0') & strcmp(nom_type(end),'d')
         filename=[filebase num2str(num_i1,nom_type) ext]; %test number with a 0 before
+        num_i2_out=num_i1;
+        num_j1_out=[];
+        num_j2_out=[];
+elseif length(nom_type)>=4 & strcmp(nom_type(1:2),'%0') & strcmp(nom_type(end-1:end),'dA')
+        filename=[filebase num2str(num_i1,nom_type(1:end-1)) num2stra(num_j1,'#A') ext]; %test number with a 0 before
         num_i2_out=num_i1;
         num_j1_out=[];

trunk/src/uvmat.m

@@ -912 +912 @@
 scan_option='i';%default
 switch NomType
-    case {'_i_j','_i_j1-j2','_i1-i2_j','#_ab'},% two navigation indices
+    case {'_i_j','_i_j1-j2','_i1-i2_j','#_ab','#A','%01dA','%02dA','%03dA','%04dA'},% two navigation indices
         state_j='on';
         if isequal(nbfield,1)
@@ -1723 +1723 @@
 function errormsg=runpm(hObject,eventdata,handles,increment)
 %------------------------------------------------------------------
-%check for mùovie pair status
+%check for mï¿œovie pair status
 movie_status=get(handles.movie_pair,'Value');
 if isequal(movie_status,1)