Changeset 135 for trunk/src

Timestamp:

Nov 25, 2010, 4:56:33 PM (14 years ago)

Author:

sommeria

Message:

supercmd compatible with windows also

File:

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

trunk/src/civ.m

@@ -454 +454 @@
 filebase=get(handles.RootName,'String');
 ext_imadoc=get(handles.ImaDoc,'String');
-browse=get(handles.browse_root,'UserData')%default
+browse=get(handles.browse_root,'UserData');%default
 if isfield(browse,'nom_type_ima')
     nom_type_ima=browse.nom_type_ima;% get an image nomenclature type already determined by an input image name
@@ -2095 +2095 @@
             %endTESTgrid
             i_cmd=i_cmd+1;
-            filename_cmx(1:end-4)
             cmd_CIV2=CIV2_CMD(filename_cmx(1:end-4),namelog,par_civ2,sparam);
             if isequal(civAll,0)
@@ -2233 +2232 @@
             %% to lauch the jobs locally :
             if(isunix)
-              cmd_str=['!. ' filename_bat ' &'];
-%                 cmd_str=['!. ' filename_bat];
-                display(cmd_str)
-     %            cmd_str=['!at -qb now -f ' filename_bat ' &']; %ou at -qb now -f bad idea...
+                cmd_str=['. ' filename_bat];
+                % cmd_str=['!at -qb now -f ' filename_bat ' &']; %ou at -qb now -f bad idea...
             else %case of Windows
-               cmd_str=['!' filename_bat ' &'];
-            end
-               super_cmd=[super_cmd '. ' filename_bat '\n']
-%             eval(cmd_str);
-%             display(cmd_str);
-        end
-    end
-end
-
-           
-% filename_superbat(end-2:end)='bat';
-%         fid=fopen(filename_bat,'w');
-%         fprintf(fid,cmd);
-%         fclose(fid);
+                cmd_str=['@call ' regexprep(filename_bat,'\\','\\\\')];
+            end
+            super_cmd=[super_cmd cmd_str '\n'];         
+            %             eval(cmd_str);
+            disp(cmd_str);
+        end
+    end
+end
+
 
 if ~batch%TODO: a revoir, cas 'run as background task'
-    eval(['!. ' filename_superbat ' &'])
     [Rootbat,Filebat,extbat]=fileparts(filename_cmx);
-    filename_superbat=fullfile(Rootbat,['toto.bat']);
+    filename_superbat=fullfile(Rootbat,['job_list.bat']);
     fid=fopen(filename_superbat,'w');
     fprintf(fid,super_cmd');
     fclose(fid);
+    if(isunix)
+        eval(['!. ' filename_superbat ' &']);
+    else
+        eval(['!' filename_superbat ' &']);
+    end
 end
 
@@ -2461 +2457 @@
 if isequal(subdir_civ1,''),subdir_civ1='A'; end% put default subdir
 if isequal(subdir_civ2,''),subdir_civ2=subdir_civ1; end% put default subdir
-currentdir=pwd%store the current working directory
+currentdir=pwd;%store the current working directory
 [Path_ima,Name]=fileparts(filebase);%Path of the image files (.civ)
 if ~exist(Path_ima,'dir')