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

Timestamp:

Apr 19, 2013, 8:26:37 AM (11 years ago)

Author:

sommeria

Message:

error messages improved

File:

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

trunk/src/series/merge_proj.m

@@ -200 +200 @@
         [Data{iview},tild,errormsg] = read_field(filecell{iview,index},FileType{iview},Param.InputFields,frame_index{iview}(index));
         if ~isempty(errormsg)
-            errormsg=['merge_proj/read_field/' errormsg];
-            display(errormsg)
-            break
+            disp(['ERROR in merge_proj/read_field/' errormsg])
+            return
         end
         timeread(iview)=0;
@@ -239 +238 @@
 
         %% calculate tps coeff if needed
-        check_proj_tps= ~isempty(Param.ProjObject)&& strcmp(Param.ProjObject.ProjMode,'filter')&&~isfield(Data{iview},'Coord_tps');
+        check_proj_tps= isfield(Param,'ProjObject')&&~isempty(Param.ProjObject)&& strcmp(Param.ProjObject.ProjMode,'interp_tps')&&~isfield(Data{iview},'Coord_tps');
         Data{iview}=tps_coeff_field(Data{iview},check_proj_tps);
 
@@ -246 +245 @@
             [Data{iview},errormsg]=proj_field(Data{iview},Param.ProjObject);
             if ~isempty(errormsg)
-                displ_uvmat('ERROR',['error in merge_proge/proj_field: ' errormsg],checkrun)
+                disp(['ERROR in merge_proge/proj_field: ' errormsg])
                 return
             end
@@ -256 +255 @@
     MergeData=merge_field(Data);
     if isfield(MergeData,'Txt')
-        displ_uvmat('ERROR',MergeData.Txt,checkrun)
+        disp(MergeData.Txt);
         return
     end