Changeset 384 for trunk/src/uvmat.m

Timestamp:

Mar 11, 2012, 11:47:21 AM (12 years ago)

Author:

sommeria

Message:

pb with masks corrected
bug in fileparts_uvmat corrected
find_file_series corrected so that it finds the root name corresponding tothe existing xml file : for instance Dalsa1_0001 gives root=Dalsa1 instead of Dalsa
bug corrected in uvmat, runpm (j1 and j2 set to 1 when not visible)

File:

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

trunk/src/uvmat.m

@@ -1354 +1354 @@
 MaskName=fullfile_uvmat(RootPath,'',RootFile,'.png',MaskData.NomType,num_i1_mask,[],num_j1);
 %MaskName=name_generator(MaskData.Base,num_i1_mask,num_j1,'.png',MaskData.NomType);
-huvmat=get(handles.CheckMask,'parent');
-UvData=get(huvmat,'UserData');
-
+% huvmat=get(handles.CheckMask,'parent');
+UvData=get(handles.uvmat,'UserData');
 %update mask image if the mask is new
 if ~ (isfield(UvData,'MaskName') && isequal(UvData.MaskName,MaskName)) 
     UvData.MaskName=MaskName; %update the recorded name on UvData
-    set(huvmat,'UserData',UvData);
+    set(handles.uvmat,'UserData',UvData);
     if ~exist(MaskName,'file')
         if isfield(MaskData,'maskhandle')&& ishandle(MaskData.maskhandle)
@@ -1430 +1429 @@
 function MenuExportFigure_Callback(hObject, eventdata, handles)
 %------------------------------------------------------------------------
-huvmat=get(handles.MenuExport,'parent');
+% huvmat=get(handles.MenuExport,'parent');
 hfig=figure;
 copyobj(handles.axes3,hfig);
@@ -1570 +1569 @@
 i1=str2num(get(handles.i1,'String'));%read the field indices (for movie, it is not given by the file name)
 i2=str2num(get(handles.i2,'String'));
-j1=stra2num(get(handles.j1,'String'));
-j2=stra2num(get(handles.j2,'String'));
+j1=1;
+if strcmp(get(handles.j1,'Visible'),'on')
+    j1=stra2num(get(handles.j1,'String'));
+end
+j2=j1;
+if strcmp(get(handles.j2,'Visible'),'on')
+    j2=stra2num(get(handles.j2,'String'));
+end
 sub_value= get(handles.SubField,'Value');
 if sub_value % a second input file has been entered 
@@ -3195 +3200 @@
                                                       % associate the set_object interface handle to the plotting axes
     if isfield(UvData.OpenParam,'SetObjectOrigin')                                                
-    pos_uvmat=get(huvmat,'Position');
+    pos_uvmat=get(handles.uvmat,'Position');
     pos_set_object(1:2)=UvData.OpenParam.SetObjectOrigin + pos_uvmat(1:2);
     pos_set_object(3:4)=UvData.OpenParam.SetObjectSize .* pos_uvmat(3:4);  
@@ -3205 +3210 @@
     UvData.MouseAction='none';
 end
-set(huvmat,'UserData',UvData)
+set(handles.uvmat,'UserData',UvData)
 
 %-------------------------------------------------------
@@ -3520 +3525 @@
 %--------------------------------------------
 %plot first histo
-huvmat=get(handles.histo1_menu,'parent');
+%huvmat=get(handles.histo1_menu,'parent');
 histo_menu=get(handles.histo1_menu,'String');
 histo_value=get(handles.histo1_menu,'Value');
 FieldName=histo_menu{histo_value};
-update_histo(handles.histo_u,huvmat,FieldName)
+update_histo(handles.histo_u,handles.uvmat,FieldName)
 
 %------------------------------------------------------------------------
@@ -3530 +3535 @@
 %------------------------------------------------------------------------
 %plot second histo
-huvmat=get(handles.histo2_menu,'parent');
+%huvmat=get(handles.histo2_menu,'parent');
 histo_menu=get(handles.histo2_menu,'String');
 histo_value=get(handles.histo2_menu,'Value');
 FieldName=histo_menu{histo_value};
-update_histo(handles.histo_v,huvmat,FieldName)
+update_histo(handles.histo_v,handles.uvmat,FieldName)
 
 %------------------------------------------------------------------------