Changeset 384 for trunk/src/uvmat.m


Ignore:
Timestamp:
Mar 11, 2012, 11:47:21 AM (9 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:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/uvmat.m

    r383 r384  
    13541354MaskName=fullfile_uvmat(RootPath,'',RootFile,'.png',MaskData.NomType,num_i1_mask,[],num_j1);
    13551355%MaskName=name_generator(MaskData.Base,num_i1_mask,num_j1,'.png',MaskData.NomType);
    1356 huvmat=get(handles.CheckMask,'parent');
    1357 UvData=get(huvmat,'UserData');
    1358 
     1356% huvmat=get(handles.CheckMask,'parent');
     1357UvData=get(handles.uvmat,'UserData');
    13591358%update mask image if the mask is new
    13601359if ~ (isfield(UvData,'MaskName') && isequal(UvData.MaskName,MaskName))
    13611360    UvData.MaskName=MaskName; %update the recorded name on UvData
    1362     set(huvmat,'UserData',UvData);
     1361    set(handles.uvmat,'UserData',UvData);
    13631362    if ~exist(MaskName,'file')
    13641363        if isfield(MaskData,'maskhandle')&& ishandle(MaskData.maskhandle)
     
    14301429function MenuExportFigure_Callback(hObject, eventdata, handles)
    14311430%------------------------------------------------------------------------
    1432 huvmat=get(handles.MenuExport,'parent');
     1431% huvmat=get(handles.MenuExport,'parent');
    14331432hfig=figure;
    14341433copyobj(handles.axes3,hfig);
     
    15701569i1=str2num(get(handles.i1,'String'));%read the field indices (for movie, it is not given by the file name)
    15711570i2=str2num(get(handles.i2,'String'));
    1572 j1=stra2num(get(handles.j1,'String'));
    1573 j2=stra2num(get(handles.j2,'String'));
     1571j1=1;
     1572if strcmp(get(handles.j1,'Visible'),'on')
     1573    j1=stra2num(get(handles.j1,'String'));
     1574end
     1575j2=j1;
     1576if strcmp(get(handles.j2,'Visible'),'on')
     1577    j2=stra2num(get(handles.j2,'String'));
     1578end
    15741579sub_value= get(handles.SubField,'Value');
    15751580if sub_value % a second input file has been entered
     
    31953200                                                      % associate the set_object interface handle to the plotting axes
    31963201    if isfield(UvData.OpenParam,'SetObjectOrigin')                                               
    3197     pos_uvmat=get(huvmat,'Position');
     3202    pos_uvmat=get(handles.uvmat,'Position');
    31983203    pos_set_object(1:2)=UvData.OpenParam.SetObjectOrigin + pos_uvmat(1:2);
    31993204    pos_set_object(3:4)=UvData.OpenParam.SetObjectSize .* pos_uvmat(3:4); 
     
    32053210    UvData.MouseAction='none';
    32063211end
    3207 set(huvmat,'UserData',UvData)
     3212set(handles.uvmat,'UserData',UvData)
    32083213
    32093214%-------------------------------------------------------
     
    35203525%--------------------------------------------
    35213526%plot first histo
    3522 huvmat=get(handles.histo1_menu,'parent');
     3527%huvmat=get(handles.histo1_menu,'parent');
    35233528histo_menu=get(handles.histo1_menu,'String');
    35243529histo_value=get(handles.histo1_menu,'Value');
    35253530FieldName=histo_menu{histo_value};
    3526 update_histo(handles.histo_u,huvmat,FieldName)
     3531update_histo(handles.histo_u,handles.uvmat,FieldName)
    35273532
    35283533%------------------------------------------------------------------------
     
    35303535%------------------------------------------------------------------------
    35313536%plot second histo
    3532 huvmat=get(handles.histo2_menu,'parent');
     3537%huvmat=get(handles.histo2_menu,'parent');
    35333538histo_menu=get(handles.histo2_menu,'String');
    35343539histo_value=get(handles.histo2_menu,'Value');
    35353540FieldName=histo_menu{histo_value};
    3536 update_histo(handles.histo_v,huvmat,FieldName)
     3541update_histo(handles.histo_v,handles.uvmat,FieldName)
    35373542
    35383543%------------------------------------------------------------------------
Note: See TracChangeset for help on using the changeset viewer.