Changeset 640

Timestamp:

May 21, 2013, 1:14:33 AM (12 years ago)

Author:

sommeria

Message:

introduction of mask on projection: correction of merge_proj

File:

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

trunk/src/series/merge_proj.m

@@ -164 +164 @@
 %use Param.InputFields for all views
 
-%% MAIN LOOP ON SLICES
+%% MAIN LOOP ON FIELDS
 %%%%%%%%%%%%% STANDARD PART (DO NOT EDIT) %%%%%%%%%%%%
 % for i_slice=1:NbSlice
@@ -205 +205 @@
             end
         end
-
-        %% check whether tps is needed, then calculate tps coefficients if needed
-%         check_tps=0;
-%         if isfield(Param.InputFields,'FieldName')
-%             if ischar(Param.InputFields.FieldName)
-%                 Param.InputFields.FieldName={Param.InputFields.FieldName};
-%             end
-%         else
-%             Param.InputFields.FieldName={};
-%         end
-%         for ilist=1:numel(Param.InputFields.FieldName)
-%             switch Param.InputFields.FieldName{ilist}
-%                 case {'vort','div','strain'}
-%                     check_tps=1;
-%             end
-%         end
-
         
          %% calculate tps coefficients if needed
@@ -234 +217 @@
                 return
             end
+        end
+        
+        %% mask
+        if isfield(Param,'Mask')
+            %TODO: introduce a table of masks for multiple views
+            [MaskData{iview},tild,errormsg] = read_field(Param.Mask,'image');
+            if ~isempty(transform_fct) && nargin(transform_fct)>=2
+                    MaskData{iview}=transform_fct(MaskData,XmlData{iview});
+            end
+            [Data{iview},errormsg]=mask_proj(Data{iview},MaskData{iview});
         end
     end