Changeset 2d34d55 in sasview

Timestamp:

Oct 22, 2011 11:39:52 PM (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:

96683dc

Parents:

db8590a

Message:

fixed model reset problem w/smearer

Location:

fittingview/src/sans/perspectives/fitting

Files:

• basepage.py (modified) (1 diff)
• fitpage.py (modified) (3 diffs)

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

@@ -634 +634 @@
         self.Show(False)
         name = menu.GetLabel(event.GetId())
-        self._on_select_model_helper()
+        self._on_select_model_helper(reset=True)
         if name in self.saved_states.keys():
             previous_state = self.saved_states[name]

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

@@ -1213 +1213 @@
         """  
         self.Show(False) 
-        copy_flag = '' 
+        copy_flag = False 
         is_poly_enabled = None 
         if event != None:
@@ -1255 +1255 @@
             #self._set_save_flag(True)
             # Reset smearer, model and data
-            #self._set_smear(self.data)
+            if not copy_flag:
+                self.disable_smearer.SetValue(True)
+                self.enable_smearer.SetValue(False)
     
             # more disables for 2D
@@ -1318 +1320 @@
             if copy_flag:
                 self.get_paste_params(copy_flag)
+                wx.CallAfter(self._onDraw, None)
                 
-                wx.CallAfter(self._onDraw, None)
         else:
             wx.CallAfter(self._draw_model)