Changeset 248 for trunk/src/uvmat.m

Timestamp:

May 9, 2011, 12:32:20 AM (14 years ago)

Author:

sommeria

Message:

various modifications

File:

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

trunk/src/uvmat.m

@@ -1494 +1494 @@
             maskname=maskfiles(ilist).name;% take the first mask file in the list
             [rr,ff,x1,x2,xa,xb,xext,Mask_NomType{ilist}]=name2display(maskname);
-            if ~strcmp(Mask_NomType{ilist},Mask_NomType{1})
-                msgbox_uvmat('ERROR',['inconsistent mask types ' Mask_NomType{1} Mask_NomType{ilist } ' coexist in the current image directory'])
-                return
-            end
+% 
+%             if ~strcmp(Mask_NomType{ilist},Mask_NomType{1})
+%                 msgbox_uvmat('ERROR',['inconsistent mask types ' Mask_NomType{1} ' and ' Mask_NomType{ilist } ' coexist in the current image directory'])
+%                 return
+%             end
             [Path2,Name,ext]=fileparts(maskname);
             Namedouble=double(Name);
@@ -1521 +1522 @@
             Mask.NbSlice=nbslice;
             num_i1=mod(num_i1-1,nbslice)+1;
-            Mask.NomType=Mask_NomType{1};
+            Mask.NomType=regexprep(Mask_NomType{1},'0','');%remove '0' in nom type for masks
             [maskname,mdetect]=name_generator(Mask.Base,num_i1,num_j1,'.png',Mask.NomType);%
             mdetect=exist(maskname,'file');
@@ -2147 +2148 @@
     ParamIn.GUIName='get_field';
     [Field{1},ParamOut,errormsg] = read_field(ObjectName,FileType,ParamIn,num_i1);
-    Field{1}
     if ~isempty(errormsg)
         errormsg=['error in reading ' filename ': ' errormsg];
@@ -2594 +2594 @@
 
 %% Plot the projections on the selected  projection objects
-'PLOT'
+
 % main projection object (uvmat display)
 list_object=get(handles.list_object_1,'String');