Changeset 2c60cb69 in sasview

Timestamp:

Aug 26, 2011 5:51:38 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:

946b452

Parents:

4957b16

Message:

enabled smear even without data

File:

• fittingview/src/sans/perspectives/fitting/fitpage.py (modified) (3 diffs)

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

@@ -484 +484 @@
         self.model_help.SetToolTipString("Model Function Help")
         id = wx.NewId()
-        self.model_view = wx.Button(self, id,"1D Mode", size=(80, 23))
+        self.model_view = wx.Button(self, id,"Show 2D", size=(80, 23))
         self.model_view.Bind(wx.EVT_BUTTON, self._onModel2D, id=id)
         hint = "toggle view of model from 1D to 2D  or 2D to 1D"
@@ -1114 +1114 @@
             # Reset smearer, model and data
             self._set_smear(self.data)
+    
+            # more disables for 2D
+            self._set_smear_buttons()
+            
             try:
                 # update smearer sizer
@@ -2965 +2969 @@
         toggle view of model from 1D to 2D  or 2D from 1D
         """
-        if self.model_view.GetLabelText() == "1D Mode":
-            self.model_view.SetLabel("2D Mode")
+        if self.model_view.GetLabelText() == "Show 2D":
+            self.model_view.SetLabel("Show 1D")
             self.enable2D = True
               
         else:
-            self.model_view.SetLabel("1D Mode")
+            self.model_view.SetLabel("Show 2D")
             self.enable2D = False
         self.create_default_data()
         self.set_model_param_sizer(self.model)
         self._set_sizer_dispersion()  
+        self._set_smear_buttons()
         self._draw_model()
         
         
         self.state.enable2D =  copy.deepcopy(self.enable2D)
-        
+    
+    def _set_smear_buttons(self):
+        """
+        Set semarer radio buttons 
+        """
+        # more disables for 2D
+        if self.data.__class__.__name__ ==  "Data2D" or \
+                    self.enable2D:
+            self.slit_smearer.Disable()
+            self.pinhole_smearer.Enable(True) 
+            self.default_mask = copy.deepcopy(self.data.mask)
+        else:
+            self.slit_smearer.Enable(True) 
+            self.pinhole_smearer.Enable(True)  
+            
+            
 class BGTextCtrl(wx.TextCtrl):
     """