Changeset 595 for trunk/src/series/merge_proj.m

Timestamp:

Mar 29, 2013, 9:03:29 PM (11 years ago)

Author:

sommeria

Message:

steps further to use series with cluster. Some bsolete functions removed

File:

• trunk/src/series/merge_proj.m (modified) (3 diffs)

trunk/src/series/merge_proj.m

@@ -63 +63 @@
 
 %%%%%%%%%%%% STANDARD PART (DO NOT EDIT) %%%%%%%%%%%%
+
+
 %% read input parameters from an xml file if input is a file name (batch mode)
 checkrun=1;
@@ -157 +159 @@
 end
 NomTypeOut=NomType;% output file index will indicate the first and last ref index in the series
-if checkrun==1
-    ParamOut.Specific=[];%no specific parameter
-    return %stop here for interactive input (option Param.Specific='?')
-end
+% if checkrun==1
+%     ParamOut.Specific=[];%no specific parameter
+%     return %stop here for interactive input (option Param.Specific='?')
+% end
 
 %% Set field names and velocity types
@@ -174 +176 @@
     %%%%%%%%%%%%%%%% loop on field indices %%%%%%%%%%%%%%%%
     for index=index_slice
-  
         if checkrun
-            update_waitbar(hseries.Waitbar,index/(nbfield))
-            stopstate=get(hseries.RUN,'BusyAction');
+            stopstate=get(Param.RUNHandle,'BusyAction');
+            update_waitbar(Param.WaitbarHandle,index/nbfield)
         else
             stopstate='queue';
         end
-        
+        if ~isequal(stopstate,'queue')% enable STOP command
+            return
+        end
         %%%%%%%%%%%%%%%% loop on views (input lines) %%%%%%%%%%%%%%%%
         Data=cell(1,nbview);%initiate the set Data