Changeset 448 for trunk

Timestamp:

Jun 11, 2012, 11:43:32 AM (13 years ago)

Author:

sommeria

Message:

bug corrected in output dir
BATCH mode implemented: still a problem to solve for writing the content of InputTable? in the xml file

File:

• trunk/src/series.m (modified) (5 diffs)

trunk/src/series.m

@@ -1275 +1275 @@
 set(handles.RUN,'BackgroundColor',[1 0 0])
 set(handles.RUN,'enable','on')
+set(handles.BATCH,'BackgroundColor',[1 0 0])
+set(handles.BATCH,'enable','on')
 
 %------------------------------------------------------------------------
@@ -1282 +1284 @@
 set(handles.BATCH, 'Enable','Off')
 set(handles.BATCH,'BackgroundColor',[0.831 0.816 0.784])
-[h_fun,errormsg]=prepare_jobs(handles);
-set(handles.BATCH, 'Enable','On')
-set(handles.BATCH,'BackgroundColor',[1 0 0])
-path_civ=fileparts(which('civ'));
-filename_bat=[OutputFile '.bat'];
+[h_fun,Series,errormsg]=prepare_jobs(handles);
+if ~isempty(errormsg)
+    msgbox_uvmat('ERROR',errormsg)
+    return
+end
+path_series=fileparts(which('series'));
+filename_xml=fullfile(Series.OutputDir,[Series.OutputRootFile '.xml']);
+filename_bat=fullfile(Series.OutputDir,[Series.OutputRootFile '.bat']);
 [fid,message]=fopen(filename_bat,'w');
 if isequal(fid,-1)
-    errormsg= ['creation of .bat file: ' message];
+    msgbox_uvmat('ERROR', ['creation of .bat file: ' message]);
     return
 end
@@ -1296 +1301 @@
     '. /etc/sysprofile \n'...
     'matlab -nodisplay -nosplash -nojvm <<END_MATLAB \n'...
-    'cd(''' path_civ '''); \n'...
-    'civ_matlab(''' filename_xml ''',''' OutputFile '.nc''); \n'...
+    'cd(''' path_series '''); \n'...
+    '' Series.Action  '( ''' filename_xml '''); \n'...
     'exit \n'...
     'END_MATLAB \n'];
@@ -1305 +1310 @@
     system(['chmod +x ' filename_bat]);
 end
-
+set(handles.BATCH, 'Enable','On')
+set(handles.BATCH,'BackgroundColor',[1 0 0])
 %------------------------------------------------------------------------
 % --- Executes on button press in BIN.
@@ -1410 +1416 @@
         Series.InputTable=Series.InputTable(iview,:);
     end
-    detect=exist(fullfile(Series.InputTable{1,1},SubDirOutNew),'file')==2;% test if  the dir  already exist
+    detect=exist(fullfile(Series.InputTable{1,1},SubDirOutNew),'dir');% test if  the dir  already exist
     while detect
-        r=regexp(SubDirOut,'(?<root>.*\D)(?<num1>\d+)$','names');%detect whether name ends by a number
-        if isempty(r)
-            r(1).root=[SubDirOut '_'];
-            r(1).num1='0';
-        end
-        SubDirOutNew=[r(1).root num2str(str2num(r(1).num1)+1)];%increment the index by 1 or put 1
-        detect=exist(fullfile(Series.InputTable{1,1},SubDirOutNew),'file')==2;% test if  the dir  already exists
-    end
+        answer=msgbox_uvmat('INPUT_Y-N',['use existing ouput directory: ' fullfile(Series.InputTable{1,1},SubDirOutNew) ', possibly delete previous data']);
+        if isequal(answer,'Yes')
+            detect=0;
+            check_create=0;
+        else
+            r=regexp(SubDirOutNew,'(?<root>.*\D)(?<num1>\d+)$','names');%detect whether name ends by a number
+            if isempty(r)
+                r(1).root=[SubDirOutNew '_'];
+                r(1).num1='0';
+            end
+            SubDirOutNew=[r(1).root num2str(str2num(r(1).num1)+1)];%increment the index by 1 or put 1
+            detect=exist(fullfile(Series.InputTable{1,1},SubDirOutNew),'dir');% test if  the dir  already exists   
+            check_create=1;
+        end
+    end
+    Series.OutputDirExt=regexprep(SubDirOutNew,Series.OutputSubDir,'');
     Series.OutputSubDir=SubDirOutNew;
     Series.OutputDir=fullfile(Series.InputTable{1,1},Series.OutputSubDir);%directory set for output results
     Series.OutputRootFile=Series.InputTable{1,3};% the first sorted RootFile taken for output
+    set(handles.OutputDirExt,'String',Series.OutputDirExt)
     Series=rmfield(Series,'OutputDirExt');%removes redondant information
     % create output directory 
-    answer='No';
-    if exist(Series.OutputDir,'dir')
-        answer=msgbox_uvmat('INPUT_Y-N',['use existing ouput directory: ' Series.OutputDir ', possibly delete previous data']);
-    end
-    if ~isequal(answer,'Yes')
+    if check_create
         [tild,msg1]=mkdir(Series.OutputDir);
         if ~strcmp(msg1,'')