Ignore:
Timestamp:
Mar 12, 2013, 12:52:13 PM (8 years ago)
Author:
sommeria
Message:

clean the transform field functions

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/browse_data.m

    r576 r581  
    2222function varargout = browse_data(varargin)
    2323
    24 % Last Modified by GUIDE v2.5 15-Feb-2013 19:41:48
     24% Last Modified by GUIDE v2.5 07-Mar-2013 18:55:00
    2525
    2626% Begin initialization code - DO NOT EDIT
     
    4747function browse_data_OpeningFcn(hObject, eventdata, handles, Campaign)
    4848%------------------------------------------------------------------------
    49 % Choose default command line output for browse_data
     49
     50%% Choose default command line output for browse_data
    5051handles.output = 'Cancel';
    5152
    52 % Update handles structure
     53%% Update handles structure
    5354guidata(hObject, handles);
    54 
    55 % Determine the position of the dialog - centered on the screen
     55set(hObject,'WindowButtonDownFcn',{'mouse_down'}) % allows mouse action with right button (zoom for uicontrol display)
     56
     57%% Determine the position of the dialog - centered on the screen
    5658FigPos=get(0,'DefaultFigurePosition');
    5759OldUnits = get(hObject, 'Units');
     
    9597   set(handles.OK,'Visible','on')
    9698   set(handles.Cancel,'Visible','on')
    97    set(handles.figure,'WindowStyle','modal')% Make% Make the GUI modal
     99   set(handles.browse_data,'WindowStyle','modal')% Make the GUI modal
    98100   set(hObject,'Visible','on')
    99101   drawnow
    100102   % UIWAIT makes GUI wait for user response (see UIRESUME)
    101    uiwait(handles.figure);
     103   uiwait(handles.browse_data);
    102104end
    103105
     
    108110% Get default command line output from handles structure
    109111varargout{1} = handles.output;
    110 delete(handles.figure)
     112delete(handles.browse_data)
    111113
    112114%------------------------------------------------------------------------
     
    312314set(handles.ListExperiments,'Value',1)
    313315ListExperiments_Callback(hObject, eventdata, handles)%update the overview of the experiment directories
    314 DataviewData=get(handles.figure,'UserData');
     316DataviewData=get(handles.browse_data,'UserData');
    315317List=DataviewData.List;
    316318Currentpath=get(handles.SourceDir,'String');
     
    580582set(handles.ListExperiments,'Value',1)
    581583ListExperiments_Callback(hObject, eventdata, handles)%update the overview of the experiment directories
    582 DataviewData=get(handles.figure,'UserData')
     584DataviewData=get(handles.browse_data,'UserData')
    583585List=DataviewData.List;
    584586Currentpath=get(handles.SourceDir,'String');
     
    654656handles.output.Device=Device;
    655657guidata(hObject, handles);% Update handles structure
    656 uiresume(handles.figure);
     658uiresume(handles.browse_data);
    657659drawnow
    658660return
     
    676678
    677679%update all the selected xml files
    678 DataviewData=get(handles.figure,'UserData');
     680DataviewData=get(handles.browse_data,'UserData');
    679681% answer=msgbox_uvmat('INPUT_Y-N',[num2str(length(Value)) ' xml files for device ' ListDevices{1} ' will be refreshed with ' ...
    680682%     DataviewData.GeometryCalib.CalibrationType ' calibration data'])
     
    771773% handles.output ='OK, Calibration replicated';
    772774% guidata(hObject, handles);% Update handles structure
    773 % uiresume(handles.figure);
     775% uiresume(handles.browse_data);
    774776
    775777% --- Executes on button press in Cancel.
     
    778780guidata(hObject, handles); % Update handles structure
    779781% Use UIRESUME instead of delete because the OutputFcn needs
    780 uiresume(handles.figure);
    781 
    782 % --- Executes when user attempts to close figure.
    783 function figure_CloseRequestFcn(hObject, eventdata, handles)
    784 if isequal(get(handles.figure, 'waitstatus'), 'waiting')
     782uiresume(handles.browse_data);
     783
     784% --- Executes when user attempts to close browse_data.
     785function browse_data_CloseRequestFcn(hObject, eventdata, handles)
     786if isequal(get(handles.browse_data, 'waitstatus'), 'waiting')
    785787    % The GUI is still in UIWAIT, us UIRESUME
    786     uiresume(handles.figure);
     788    uiresume(handles.browse_data);
    787789else
    788790    % The GUI is no longer waiting, just close it
    789     delete(handles.figure);
     791    delete(handles.browse_data);
    790792end
    791793
    792794% --- Executes on key press over figure1 with no controls selected.
    793 function figure_KeyPressFcn(hObject, eventdata, handles)
     795function browse_data_KeyPressFcn(hObject, eventdata, handles)
    794796% Check for "enter" or "escape"
    795797if isequal(get(hObject,'CurrentKey'),'escape')
     
    800802    guidata(hObject, handles);
    801803   
    802     uiresume(handles.figure);
     804    uiresume(handles.browse_data);
    803805end
    804806if isequal(get(hObject,'CurrentKey'),'return')
    805     uiresume(handles.figure);
     807    uiresume(handles.browse_data);
    806808end
Note: See TracChangeset for help on using the changeset viewer.