Changeset 803 for trunk


Ignore:
Timestamp:
Jul 30, 2014, 8:31:18 PM (7 years ago)
Author:
sommeria
Message:

bugs corrected in series and uigetfile_uvmat (for Windows OS)

Location:
trunk/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/series.m

    r801 r803  
    240240end
    241241
    242 %% introduce the input file name(s) if defined from input Param, TODO: avoid the file checking if Param.i1_series defined
     242%% introduce the input file name(s) if defined from input Param,
    243243if isfield(Param,'InputFile')
    244244   
     
    251251    end
    252252    set(handles.InputTable,'Data',InputTable)
     253    %% determine the selected reference field indices for pair display
    253254   
    254     %     display_file_name(handles,Param,'one')%refresh the input table
     255    [tild,tild,tild,i1,i2,j1,j2]=fileparts_uvmat(Param.InputFile.FileIndex);
     256    if isempty(i1)
     257        i1=1;
     258    end
     259    if isempty(i2)
     260        i2=i1;
     261    end
     262    ref_i=floor((i1+i2)/2);% reference image number corresponding to the file
     263    % set(handles.num_ref_i,'String',num2str(ref_i));
     264    if isempty(j1)
     265        j1=1;
     266    end
     267    if isempty(j2)
     268        j2=j1;
     269    end
     270    ref_j=floor((j1+j2)/2);% reference image number corresponding to the file
     271    SeriesData.ref_i=ref_i;
     272    SeriesData.ref_j=ref_j;
     273    set(handles.series,'UserData',SeriesData)
    255274    update_rootinfo(handles,Param.HiddenData.i1_series{1},Param.HiddenData.i2_series{1},Param.HiddenData.j1_series{1},Param.HiddenData.j2_series{1},...
    256275        Param.HiddenData.FileInfo{1},Param.HiddenData.MovieObject{1},1)
    257     if isfield(Param,'FileName_1')
    258 
     276    if isfield(Param,'FileName_1')       
    259277        %         display_file_name(handles,Param,2)
    260278        update_rootinfo(handles,Param.HiddenData.i1_series{2},Param.HiddenData.i2_series{2},Param.HiddenData.j1_series{2},Param.HiddenData.j2_series{2},...
     
    266284if isfield(Param,'incr_i')
    267285    set(handles.num_incr_i,'String',num2str(Param.incr_i))
     286else
     287    set(handles.num_incr_i,'String','1')
    268288end
    269289if isfield(Param,'incr_j')
    270290    set(handles.num_incr_j,'String',num2str(Param.incr_j))
     291else
     292    set(handles.num_incr_j,'String','1')
    271293end
    272294
     
    274296% --- Outputs from this function are returned to the command line.
    275297function varargout = series_OutputFcn(hObject, eventdata, handles)
    276 %------------------------------------------------------------------------ 
     298%------------------------------------------------------------------------
    277299varargout{1} = handles.output;
    278300
  • trunk/src/uigetfile_uvmat.m

    r784 r803  
    3838            InputFileName=InputDir;
    3939            if  ~isempty(strcmp (computer, {'PCWIN','PCWIN64'}))%case of Windows systems
    40                 InputDir=[InputDir '\'];% append '\' for a correct action of dir
     40%                 InputDir=[InputDir '\'];% append '\' for a correct action of dir
    4141                InputFileName=[InputFileName '\'];
    4242            end
     
    4646        end
    4747    end
     48end
     49if  ismember(computer,{'PCWIN','PCWIN64'})%case of Windows systems
     50      InputDir=[InputDir '\'];% append '\' for a correct action of dir
    4851end
    4952hfig=findobj(allchild(0),'tag',option);
Note: See TracChangeset for help on using the changeset viewer.