Changeset db8fd5b in sasview

Timestamp:

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

Location:

fittingview/src/sans/perspectives/fitting

Files:

• basepage.py (modified) (2 diffs)
• pagestate.py (modified) (4 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)
         

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

@@ -69 +69 @@
                       ["smear_type","smear_type", "string"],
                       ["dq_l", "dq_l", "string"],
-                      ["dq_r","dq_r", "string"]]
+                      ["dq_r","dq_r", "string"],
+                      ["dx_max", "dx_max", "float"],
+                      ["dx_min","dx_min", "float"],
+                      ["dxl", "dxl", "float"],
+                      ["dxw","dxw", "float"]]
 
 list_of_model_attributes = [["values", "values"],
@@ -208 +212 @@
         self.dq_l = None
         self.dq_r = None
-
+        self.dx_max = None
+        self.dx_min = None
+        self.dxl = None
+        self.dxw = None
         #list of dispersion paramaters
         self.disp_list = []
@@ -332 +339 @@
         obj.dq_l = copy.deepcopy(self.dq_l)
         obj.dq_r = copy.deepcopy(self.dq_r)
-
+        obj.dx_max = copy.deepcopy(self.dx_max)
+        obj.dx_min = copy.deepcopy(self.dx_min)
+        obj.dxl = copy.deepcopy(self.dxl)
+        obj.dxw = copy.deepcopy(self.dxw)        
         obj.disp_box = copy.deepcopy(self.disp_box)
         obj.qmin = copy.deepcopy(self.qmin)
@@ -417 +427 @@
         rep += "dq_l  : %s\n" % self.dq_l
         rep += "dq_r  : %s\n" % self.dq_r
-        
+        rep += "dx_max  : %s\n" % str(self.dx_max)
+        rep += "dx_min : %s\n" % str(self.dx_min)  
+        rep += "dxl  : %s\n" % str(self.dxl)
+        rep += "dxw : %s\n" % str(self.dxw)    
         rep += "model  : %s\n\n" % str(self.model)
         temp_parameters = []