Changeset bb8a180 in sasview for fittingview/src/sans

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:

• basepage.py (modified) (2 diffs)
• fitpage.py (modified) (1 diff)
• fitting.py (modified) (1 diff)

fittingview/src/sans/perspectives/fitting/basepage.py

@@ -775 +775 @@
         wx.CallAfter(self._onDraw, None)
         
+        
     def old_on_bookmark(self, event):
         """
@@ -1212 +1213 @@
         # else:
                 
-        if self._manager !=None:
+        if self._manager !=None and self.engine_type != None:
             self._manager._on_change_engine(engine=self.engine_type)
         ## set the select all check box to the a given state

fittingview/src/sans/perspectives/fitting/fitpage.py

@@ -2012 +2012 @@
         """
         self.reset_page_helper(state)
-        #import sans.guiframe.gui_manager
-        #evt = ModelEventbox(model=state.model)
-        #wx.PostEvent(self.event_owner, evt)  
-   
-        if self.engine_type != None:
-            self._manager._on_change_engine(engine=self.engine_type)
 
         self.select_param(event = None) 

fittingview/src/sans/perspectives/fitting/fitting.py

@@ -1299 +1299 @@
         wx.PostEvent(self.parent, StatusEvent(status=msg, info="info",
                                                       type="stop"))
-       # reset fit_engine if changed by simul_fit
-        self._on_change_engine(self._gui_engine)
+        # reset fit_engine if changed by simul_fit
+        if self._fit_engine != self._gui_engine:
+            self._on_change_engine(self._gui_engine)
         self._update_fit_button(page_id)
         result = result[0]