Changeset 4043c96 in sasview

Timestamp:

Sep 30, 2009 9:45:41 PM (15 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:

09ef7d22

Parents:

d40a9cd

Message:

fixed a crashing-bug. Need to look at it tomorrow

File:

• sansview/perspectives/fitting/fitpage.py (modified) (6 diffs)

sansview/perspectives/fitting/fitpage.py

@@ -275 +275 @@
             ## the user didn't select dispersity display
             return 
-        
+
         self._reset_dispersity()
         # Create the dispersion objects
@@ -559 +559 @@
         self.state.model = self.model.clone()  
          ## save state into
-        
+        self.state.cb1 = self.cb1.GetValue()
         self._copy_parameters_state(self.parameters, self.state.parameters)
         self._copy_parameters_state(self.orientation_params_disp,
@@ -642 +642 @@
         self.enable_disp.SetValue(False)
         self.disable_disp.SetValue(True)
-        self.set_dispers_sizer()
+        try:
+            self.set_dispers_sizer()
+        except:
+            pass
         if self.model !=None:
             try:
@@ -657 +660 @@
             evt = ModelEventbox(model=self.model)
             wx.PostEvent(self.event_owner, evt)   
+            
         self.btFit.SetFocus() 
         self.state.enable_disp = self.enable_disp.GetValue()
         self.state.disable_disp = self.disable_disp.GetValue()
-        
+    
         self.state.structurecombobox = self.structurebox.GetCurrentSelection()
         self.state.formfactorcombobox = self.formfactorbox.GetCurrentSelection()
@@ -1084 +1088 @@
         self._copy_parameters_state(self.fixed_param, self.state.fixed_param)
            
-        #self.save_current_state()  
+        self.save_current_state()  
         if event !=None:
             #self._undo.Enable(True)
@@ -1132 +1136 @@
         self._copy_parameters_state(self.fixed_param, self.state.fixed_param)
         
-        #self.save_current_state()
+        self.save_current_state()
         if event !=None:
             #self._undo.Enable(True)