Changeset 384 for trunk/src/civ.m


Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/civ.m

    r382 r384  
    2323%TODO: search range
    2424
    25 % Last Modified by GUIDE v2.5 27-Jan-2012 00:32:33
     25% Last Modified by GUIDE v2.5 10-Mar-2012 22:32:10
    2626% Begin initialization code - DO NOT EDIT
    2727gui_Singleton = 1;
    … …  
    281281end
    282282set(handles.RootPath,'BackgroundColor',[1 1 1])%paint RootName back to white to indicate that the file input is finished
     283
    283284%------------------------------------------------------------------------
    284285% --- general function activated for an input file series
    … …  
    10351036%could be included in get_mask callback ?
    10361037if isequal(get(handles.CheckMask,'Value'),1)
    1037     maskname=get(handles.txt_Mask,'String');
     1038    maskname=get(handles.Mask,'String');
    10381039    if ~exist(maskname,'file')
    10391040        get_mask_civ1_Callback(hObject, eventdata, handles);
    … …  
    10411042end
    10421043if isequal(get(handles.CheckMask,'Value'),1)
    1043     maskname=get(handles.txt_Mask,'String');
     1044    maskname=get(handles.Mask,'String');
    10441045    if ~exist(maskname,'file')
    10451046        get_mask_fix1_Callback(hObject, eventdata, handles);
    … …  
    10471048end
    10481049if isequal(get(handles.CheckMask,'Value'),1)
    1049     maskname=get(handles.txt_Mask,'String');
     1050    maskname=get(handles.Mask,'String');
    10501051    if ~exist(maskname,'file')
    10511052        get_mask_civ2_Callback(hObject, eventdata, handles);
    … …  
    10531054end
    10541055if isequal(get(handles.CheckMask,'Value'),1)
    1055     maskname=get(handles.txt_Mask,'String');
     1056    maskname=get(handles.Mask,'String');
    10561057    if ~exist(maskname,'file')
    10571058        get_mask_fix2_Callback(hObject, eventdata, handles);
    … …  
    33103311maskval=get(handles.CheckMask,'Value');
    33113312if isequal(maskval,0)
    3312     set(handles.txt_Mask,'String','')
     3313    set(handles.Mask,'String','')
    33133314else
    33143315    mask_displ='no mask'; %default
    … …  
    33433344        set(handles.CheckMask,'Value',1)
    33443345    end
    3345     set(handles.txt_Mask,'String',mask_displ)
    3346     set(handles.txt_Mask,'String',mask_displ)
    3347     set(handles.txt_Mask,'String',mask_displ)
     3346    set(handles.Mask,'String',mask_displ)
     3347    set(handles.Mask,'String',mask_displ)
     3348    set(handles.Mask,'String',mask_displ)
    33483349end
    33493350
    … …  
    33543355maskval=get(handles.CheckMask,'Value');
    33553356if isequal(maskval,0)
    3356     set(handles.txt_Mask,'String','')
     3357    set(handles.Mask,'String','')
    33573358else
    33583359    mask_displ='no mask'; %default
    … …  
    33853386        set(handles.CheckMask,'Value',1)
    33863387    end
    3387     set(handles.txt_Mask,'String',mask_displ)
    3388     set(handles.txt_Mask,'String',mask_displ)
     3388    set(handles.Mask,'String',mask_displ)
     3389    set(handles.Mask,'String',mask_displ)
    33893390end
    33903391
    … …  
    33953396maskval=get(handles.CheckMask,'Value');
    33963397if isequal(maskval,0)
    3397     set(handles.txt_Mask,'String','')
     3398    set(handles.Mask,'String','')
    33983399else
    33993400    mask_displ='no mask'; %default
    … …  
    34233424        set(handles.CheckMask,'Value',0)
    34243425    end
    3425     set(handles.txt_Mask,'String',mask_displ)
     3426    set(handles.Mask,'String',mask_displ)
    34263427end
    34273428
    … …  
    36763677%     stage=4;%default
    36773678    if strcmp(parent_tag,'Civ1')
    3678             set(handles.txt_Mask,'Visible','on')
    3679         set(handles.txt_Mask,'String',filemask)
     3679            set(handles.Mask,'Visible','on')
     3680        set(handles.Mask,'String',filemask)
    36803681    set(handles.CheckMask,'Value',1)
    36813682    end
    … …  
    36883689% %             stage=4;
    36893690%     end
    3690 %     set(handles.txt_Mask(stage:end),'Visible','on')
    3691 %     set(handles.txt_Mask(stage:end),'String',filemask)
     3691%     set(handles.Mask(stage:end),'Visible','on')
     3692%     set(handles.Mask(stage:end),'String',filemask)
    36923693%     set(handles.CheckMask(stage:end),'Value',1)
    36933694else
    … …  
    43804381
    43814382function NomType_Callback(hObject, eventdata, handles)
    4382 
     4383set(handles.RootPath,'BackgroundColor',[1 1 0])%paint RootName edit box in yellow to indicate that the file input is proceeding
     4384RootPath=get(handles.RootPath,'String');
     4385RootFile=get(handles.RootFile,'String');
     4386ref_i=str2num(get(handles.ref_i,'String'));
     4387ref_j=str2num(get(handles.ref_j,'String'));
     4388NomType=get(handles.NomType,'String');
     4389ImaExt=get(handles.ImaExt,'String');
     4390fileinput=fullfile_uvmat(RootPath,'',RootFile,ImaExt,NomType,ref_i,[],ref_j);
     4391errormsg=display_file_name(handles,fileinput);
     4392if ~isempty(errormsg)
     4393    msgbox_uvmat('ERROR',errormsg)
     4394end
     4395set(handles.RootPath,'BackgroundColor',[1 1 1])%paint RootName back to white to indicate that the file input is finished
    43834396
    43844397% --- Executes on selection change in ListProgram.
Note: See TracChangeset for help on using the changeset viewer.