Changeset 0d795bf in sasview

Timestamp:

Mar 7, 2013 2:51:21 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:

5709051

Parents:

db8fd5b

Message:

more fixes in saving custom slit information

Location:

fittingview/src/sans/perspectives/fitting

Files:

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

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

@@ -1368 +1368 @@
                 self.smear_slit_height.SetValue(str(self.dxl))
             if self.dxw != None:
-                self.smear_slit_width.SetValue(str(self.dxw))
+                self.smear_slit_width.SetValue(str(self.dxw))  
+            else:
+                self.smear_slit_width.SetValue('')  
             self.onSlitSmear(event=None)
         

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

@@ -2405 +2405 @@
             self.smear_slit_height.SetBackgroundColour(wx.WHITE)
         except:
+            self.dxl = None
             data.dxl = numpy.zeros(data_len)
             if self.smear_slit_height.GetValue().lstrip().rstrip() != "":
@@ -2416 +2417 @@
             data.dxw = self.dxw * numpy.ones(data_len)
         except:
+            self.dxw = None
             data.dxw = numpy.zeros(data_len)
             if self.smear_slit_width.GetValue().lstrip().rstrip() != "":