Changeset 1051 for trunk/src/uvmat.m

Timestamp:

Jun 27, 2018, 11:20:37 PM (6 years ago)

Author:

sommeria

Message:

psmsn cluster command updated, pb with multimask solved...

File:

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

trunk/src/uvmat.m

@@ -2615 +2615 @@
         RootPath=MaskPath;
     end
-    if mdetect==0
+    if mdetect==0 % if no mask is detected in the current folder
         MaskFullName=uigetfile_uvmat('pick a mask image file:',RootPath,'image');
         if isempty(MaskFullName)
@@ -2633 +2633 @@
     else
         Mask.File=MaskFile{1};
+    end
+    Mask.NbSlice_i=1;
+    Mask.NbSlice_j=1;
+    if isempty(j1_series)
+        Mask.NbSlice_i=i1_series(1,2,end);
+    else
+        Mask.NbSlice_j=j1_series(1,end,2);
     end
     Mask.Ext=MaskExt;
@@ -2657 +2664 @@
 errormsg=[];%default
 Mask=get(handles.CheckMask,'UserData');
-MaskIndex=1;
 if strcmp(get(handles.z_index,'Visible'),'on')
-    MaskIndex=str2num(get(handles.z_index,'String'));
+    MaskIndex_i=str2num(get(handles.z_index,'String'));
+else
+    MaskIndex_i=mod(str2num(get(handles.i1,'String')),Mask.NbSlice_i);
+end
+if Mask.NbSlice_j>1
+    MaskIndex_j=str2num(get(handles.j1,'String'));
+else
+    MaskIndex_j=1;
 end
 if isfield(Mask,'maskhandle')&& ishandle(Mask.maskhandle)
     uistack(Mask.maskhandle,'top');
 end
-MaskName=fullfile_uvmat(Mask.Path,'',Mask.File,Mask.Ext,Mask.NomType,MaskIndex);
+MaskName=fullfile_uvmat(Mask.Path,'',Mask.File,Mask.Ext,Mask.NomType,MaskIndex_i,[],MaskIndex_j);
 UvData=get(handles.uvmat,'UserData');
 
@@ -2689 +2702 @@
             return
         end
-        MaskField.ZIndex=MaskIndex;
+        MaskField.ZIndex=MaskIndex_i;
         %px to phys or other transform on field
          menu_transform=get(handles.TransformName,'String');