Changeset 409 for trunk/src

Timestamp:

May 5, 2012, 6:36:06 PM (13 years ago)

Author:

sommeria

Message:

bug corrected in merge_proj (tansform_fct was not properly transmitted with the new version of series)

File:

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

trunk/src/series/merge_proj.m

@@ -43 +43 @@
 [filecell,i1_series,i2_series,j1_series,j2_series]=get_file_series(Param);
 
-%% coordinate transform or other user defined transform (TODO: case BATCH ?)
+%% coordinate transform or other user defined transform
 transform_fct='';%default
-if isfield(Param,'transform_fct') % transform function handle
-    transform_fct=Param.transform_fct;
+if isfield(Param,'FieldTransform')&&isfield(Param.FieldTransform,'fct_handle')
+    transform_fct=Param.FieldTransform.fct_handle;
 end
 
@@ -81 +81 @@
 for iview=1:nbview
     test_movie(iview)=0;
-    if ~isequal(hhh,'')&& mmreader.isPlatformSupported()
+    if ~isempty(hhh)
         if isequal(lower(FileExt{iview}),'.avi')
             MovieObject{iview}=mmreader(fullfile(RootPath{iview},[RootFile{iview} FileExt{iview}]));
@@ -319 +319 @@
          %projection on object (gridded plane)
             if test_object
-                Field{iview}=proj_field(Field{iview},ProjObject);
+                [Field{iview},errormsg]=proj_field(Field{iview},ProjObject);
+                if ~isempty(errormsg)
+                    msgbox_uvmat('ERROR',['error in merge_proge/proj_field: ' errormsg])
+                    return
+                end
             end
         end