Ignore:
Timestamp:
Oct 23, 2011 2:49:17 AM (13 years ago)
Author:
Jae Cho <jhjcho@…>
Branches:
master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload
Children:
7fd4afd
Parents:
cbf01fd
Message:

a little better back-to bookmark/still some problem to fix

Location:
fittingview/src/sans/perspectives/fitting
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • fittingview/src/sans/perspectives/fitting/basepage.py

    rcbf01fd rbb8a180  
    775775        wx.CallAfter(self._onDraw, None) 
    776776         
     777         
    777778    def old_on_bookmark(self, event): 
    778779        """ 
     
    12121213        # else: 
    12131214                 
    1214         if self._manager !=None: 
     1215        if self._manager !=None and self.engine_type != None: 
    12151216            self._manager._on_change_engine(engine=self.engine_type) 
    12161217        ## set the select all check box to the a given state 
  • fittingview/src/sans/perspectives/fitting/fitpage.py

    r2d34d55 rbb8a180  
    20122012        """ 
    20132013        self.reset_page_helper(state) 
    2014         #import sans.guiframe.gui_manager 
    2015         #evt = ModelEventbox(model=state.model) 
    2016         #wx.PostEvent(self.event_owner, evt)   
    2017     
    2018         if self.engine_type != None: 
    2019             self._manager._on_change_engine(engine=self.engine_type) 
    20202014 
    20212015        self.select_param(event = None)  
  • fittingview/src/sans/perspectives/fitting/fitting.py

    r269df2b rbb8a180  
    12991299        wx.PostEvent(self.parent, StatusEvent(status=msg, info="info", 
    13001300                                                      type="stop")) 
    1301        # reset fit_engine if changed by simul_fit 
    1302         self._on_change_engine(self._gui_engine) 
     1301        # reset fit_engine if changed by simul_fit 
     1302        if self._fit_engine != self._gui_engine: 
     1303            self._on_change_engine(self._gui_engine) 
    13031304        self._update_fit_button(page_id) 
    13041305        result = result[0] 
Note: See TracChangeset for help on using the changeset viewer.