Changeset 180bd54 in sasview for src/sas/qtgui/Perspectives/Fitting/SmearingWidget.py

Timestamp:

Apr 27, 2017 6:39:35 AM (7 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

Branches:

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

Children:

0215e0a

Parents:

98b13f72

Message:

Refactored fitting options tab

File:

• src/sas/qtgui/Perspectives/Fitting/SmearingWidget.py (modified) (5 diffs, 1 prop)

src/sas/qtgui/Perspectives/Fitting/SmearingWidget.py

@@ -42 +42 @@
 
         # Have we loaded data yet? If so, what kind
-        self.is_data = None
+        self.have_data = None
         # Local model for holding data
         self.model = None
@@ -96 +96 @@
         elif isinstance(data, Data1D):
             self.cbSmearing.addItems(SMEARING_1D)
-            self.is_data = Data1D
+            self.have_data = Data1D
         else:
             self.cbSmearing.addItems(SMEARING_2D)
-            self.is_data = Data2D
+            self.have_data = Data2D
         self.cbSmearing.setCurrentIndex(0)
 
@@ -120 +120 @@
         Respond to model change by updating
         """
-        print "MODEL CHANGED for property: %s. The value is now: %s" % \
-            (MODEL[top.row()], str(self.model.item(top.row()).text()))
+        #print "MODEL CHANGED for property: %s. The value is now: %s" % \
+        #    (MODEL[top.row()], str(self.model.item(top.row()).text()))
         pass
 
@@ -140 +140 @@
         Accuracy combobox visibility
         """
-        if self.is_data == Data2D and self.cbSmearing.currentIndex() == 1:
+        if self.have_data == Data2D and self.cbSmearing.currentIndex() == 1:
             self.cbAccuracy.setVisible(True)
         else:
@@ -165 +165 @@
         # or model-held values
         smearing = str(self.model.item(MODEL.index('SMEARING')).text())
-        accuracy = str(self.model.item(MODEL.index('ACCURACY')).text())
-        d_down = float(self.model.item(MODEL.index('PINHOLE_MIN')).text())
-        d_up = float(self.model.item(MODEL.index('PINHOLE_MAX')).text())
+        accuracy = ""
+        d_down = None
+        d_up = None
+        if smearing != "None":
+            accuracy = str(self.model.item(MODEL.index('ACCURACY')).text())
+            try:
+                d_down = float(self.model.item(MODEL.index('PINHOLE_MIN')).text())
+            except ValueError:
+                d_down = None
+            try:
+                d_up = float(self.model.item(MODEL.index('PINHOLE_MAX')).text())
+            except ValueError:
+                d_up = None
 
         return (smearing, accuracy, d_down, d_up)