Changeset db8fd5b in sasview for fittingview/src/sans/perspectives/fitting/basepage.py

Timestamp:

Mar 7, 2013 12:17:43 PM (12 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:

0d795bf

Parents:

00852df

Message:

fixed problems in custom pinhole and slit states

File:

• fittingview/src/sans/perspectives/fitting/basepage.py (modified) (2 diffs)

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

@@ -938 +938 @@
         self.state.pinhole_smearer = \
                                 copy.deepcopy(self.pinhole_smearer.GetValue())
+        self.state.dx_max = copy.deepcopy(self.dx_max)
+        self.state.dx_min = copy.deepcopy(self.dx_min)
+        self.state.dxl = copy.deepcopy(self.dxl)
+        self.state.dxw = copy.deepcopy(self.dxw)
         self.state.slit_smearer = copy.deepcopy(self.slit_smearer.GetValue())
                   
@@ -1351 +1355 @@
         ## we have two more options for smearing
         if self.pinhole_smearer.GetValue():
+            self.dx_min = state.dx_min
+            self.dx_max = state.dx_max
+            if self.dx_min != None:
+                self.smear_pinhole_min.SetValue(str(self.dx_min))
+            if self.dx_max != None:
+                self.smear_pinhole_max.SetValue(str(self.dx_max))
             self.onPinholeSmear(event=None)
         elif self.slit_smearer.GetValue():
+            self.dxl = state.dxl
+            self.dxw = state.dxw
+            if self.dxl != None:
+                self.smear_slit_height.SetValue(str(self.dxl))
+            if self.dxw != None:
+                self.smear_slit_width.SetValue(str(self.dxw))
             self.onSlitSmear(event=None)