Ignore:
Timestamp:
Jan 27, 2015, 9:21:37 AM (6 years ago)
Author:
sommeria
Message:

bug_repair

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/series/civ_input.m

    r858 r859  
    11491149%------------------------------------------------------------------------
    11501150
     1151% --- Executes on button press in CheckDeformation.
     1152function CheckDeformation_Callback(hObject, eventdata, handles)
     1153set(handles.configSource,'String','NEW')
     1154set(handles.OK,'BackgroundColor',[1 0 1])
     1155
    11511156%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
    11521157% Callbacks in the uipanel Fix1
     
    18861891     Param.Action.RUN=1;
    18871892     Param.ActionInput=read_GUI(handles.civ_input);
     1893     if isfield(Param,'OutputSubDir')
    18881894     Param=rmfield(Param,'OutputSubDir'); %remove output file option from civ_series
    1889      Param.ActionInput.Civ2.SmoothParam=0;% launch Civ2 with no data point (to get the image names for A and B)
     1895     end
     1896     Param.ActionInput.Civ2.CorrSmooth=0;% launch Civ2 with no data point (to get the image names for A and B)
    18901897     set(handles.Civ1,'BackgroundColor',[1 1 0])
     1898     set(handles.Fix1,'BackgroundColor',[1 1 0])
     1899     set(handles.Patch1,'BackgroundColor',[1 1 0])
    18911900     [Data,errormsg]=civ_series(Param);% get the civ1+fix1 results
    18921901     
     
    19161925    hhview_field=guihandles(hview_field);%
    19171926    set(hview_field,'CurrentAxes',hhview_field.PlotAxes)
    1918     %ViewData=get(hview_field,'UserData');
     1927    ViewData=get(hview_field,'UserData'); % get the currently plotted field (the image A)
    19191928    % store info in the UserData of view-field
    19201929    ViewData.CivHandle=handles.civ_input;% indicate the handle of the civ GUI in view_field
     
    19221931    ViewData.PlotAxes.X=Data.Civ2_X';
    19231932    ViewData.PlotAxes.Y=Data.Civ2_Y';
    1924     ViewData.PlotAxes.ShiftX=Data.Civ2_U';
     1933    ViewData.PlotAxes.ShiftX=Data.Civ2_U';% shift at each point (from patch1) estimated by running civ2
    19251934    ViewData.PlotAxes.ShiftY=Data.Civ2_V';
    19261935    ViewData.PlotAxes.Civ1_SubRange=Data.Civ1_SubRange;
     
    19321941    ViewData.PlotAxes.Civ2_Dt=Data.Civ2_Dt;
    19331942    set(hview_field,'UserData',ViewData)% store the info in the UserData of image view_field
     1943    bckcolor=get(handles.civ_input,'Color');
     1944    set(handles.Civ1,'BackgroundColor',bckcolor)% indicate civ1 calmculation is finished
     1945    set(handles.Fix1,'BackgroundColor',bckcolor)
     1946    set(handles.Patch1,'BackgroundColor',bckcolor)
     1947    drawnow
    19341948   
    19351949    %% look for a current figure for image correlation display
     
    22452259% --- Executes on button press in TestPatch2.
    22462260function TestPatch2_Callback(hObject, eventdata, handles)
     2261
     2262
     2263
Note: See TracChangeset for help on using the changeset viewer.