Changeset b1e36a3 in sasview for src/sas/qtgui/Perspectives/Fitting/FittingWidget.py

Timestamp:

Mar 23, 2017 7:53:10 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:

9934e48

Parents:

29eb947

Message:

FittingWidget? code review SASVIEW-561

File:

• src/sas/qtgui/Perspectives/Fitting/FittingWidget.py (modified) (15 diffs)

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

@@ -79 +79 @@
         self.communicate = self.parent.communicate
 
+        # Define bold font for use in various controls
+        self.boldFont=QtGui.QFont()
+        self.boldFont.setBold(True)
+
+        # Set data label
+        self.label.setFont(self.boldFont)
+        self.label.setText("No data loaded")
+        self.lblFilename.setText("")
+
         # Set the main models
         # We can't use a single model here, due to restrictions on flattening
@@ -116 +125 @@
         self.cbCategory.setCurrentIndex(0)
 
-        self._index = data
+        self._index = None
         if data is not None:
             self.data = data
@@ -136 +145 @@
         # _index contains the QIndex with data
         self._index = value
+
         # Update logics with data items
         self.logic.data = GuiUtils.dataFromItem(value[0])
@@ -141 +151 @@
         self.data_is_loaded = True
         # Tag along functionality
+        self.label.setText("Data loaded from: ")
+        self.lblFilename.setText(self.logic.data.title)
         self.updateQRange()
         self.cmdFit.setEnabled(True)
@@ -151 +163 @@
         """ Disable the combobox """
         self.cbModel.setEnabled(False)
-        self.label_3.setEnabled(False)
+        self.lblModel.setEnabled(False)
 
     def enableModelCombo(self):
         """ Enable the combobox """
         self.cbModel.setEnabled(True)
-        self.label_3.setEnabled(True)
+        self.lblModel.setEnabled(True)
 
     def disableStructureCombo(self):
         """ Disable the combobox """
         self.cbStructureFactor.setEnabled(False)
-        self.label_4.setEnabled(False)
+        self.lblStructure.setEnabled(False)
 
     def enableStructureCombo(self):
         """ Enable the combobox """
         self.cbStructureFactor.setEnabled(True)
-        self.label_4.setEnabled(True)
+        self.lblStructure.setEnabled(True)
 
     def updateQRange(self):
@@ -271 +283 @@
         models = []
         # Populate the models combobox
-        self.cbModel.addItems(sorted([model for (model,_) in model_list]))
+        self.cbModel.addItems(sorted([model for (model, _) in model_list]))
 
     def createDefaultDataset(self):
@@ -303 +315 @@
             self.createDefaultDataset()
         else:
-            self.calculateDataForModel()
+            self.calculateQGridForModel()
 
     def onSelectStructureFactor(self):
@@ -427 +439 @@
             value = item.checkState()
         else:
-            value = float(item.text())
+            try:
+                value = float(item.text())
+            except ValueError:
+                # Can't be converted properly, bring back the old value and exit
+                return
+
         parameter_name = str(self._poly_model.data(name_index).toPyObject()) # "distribution of sld" etc.
         if "Distribution of" in parameter_name:
@@ -506 +523 @@
         if self.data is None or not self.data.is_data:
             self.createDefaultDataset()
-        self.calculateDataForModel()
+        self.calculateQGridForModel()
 
     def onNpts(self, text):
@@ -515 +532 @@
         try:
             self.npts = int(text)
-        except:
+        except ValueError:
+            # TODO
+            # This will return the old value to model/view and return
+            # notifying the user about format available.
             pass
 
@@ -525 +545 @@
         try:
             self.q_range_min = float(text)
-        except:
-            pass
+        except ValueError:
+            # TODO
+            # This will return the old value to model/view and return
+            # notifying the user about format available.
+            return
         # set Q range labels on the main tab
         self.lblMinRangeDef.setText(str(self.q_range_min))
@@ -550 +573 @@
         return self.complete1D if isinstance(self.data, Data1D) else self.complete2D
 
-    def calculateDataForModel(self):
+    def calculateQGridForModel(self):
         """
         Prepare the fitting data object, based on current ModelModel
@@ -603 +626 @@
     def calcException(self, etype, value, tb):
         """
-        Something horrible happened in the deferred. Cry me a river.
+        Something horrible happened in the deferred.
         """
         logging.error("".join(traceback.format_exception(etype, value, tb)))
-        msg = traceback.format_exception(etype, value, tb, limit=1)
 
     def setTableProperties(self, table):
@@ -624 +646 @@
 
         header.ResizeMode(QtGui.QHeaderView.Interactive)
+        # Resize column 0 and 6 to content
         header.setResizeMode(0, QtGui.QHeaderView.ResizeToContents)
         header.setResizeMode(6, QtGui.QHeaderView.ResizeToContents)
@@ -694 +717 @@
 
         func = QtGui.QComboBox()
-        func.addItems([str(i+1) for i in xrange(param_length)])
+        # Available range of shells displayed in the combobox
+        func.addItems([str(i) for i in xrange(param_length+1)])
+        # Respond to index change
         func.currentIndexChanged.connect(self.modifyShellsInList)