Changeset 8b6e4be in sasview for src/sas/qtgui/Perspectives/Fitting

Timestamp:

Sep 25, 2018 4:25:14 AM (6 years ago)

Author:

Piotr Rozyczko <piotr.rozyczko@…>

Branches:

ESS_GUI, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

8a09457

Parents:

6f6e8e4

git-author:

Piotr Rozyczko <piotr.rozyczko@…> (09/25/18 04:19:34)

git-committer:

Piotr Rozyczko <piotr.rozyczko@…> (09/25/18 04:25:14)

Message:

check data and kernel model before using them. SASVIEW-1162

File:

• src/sas/qtgui/Perspectives/Fitting/SmearingWidget.py (modified) (2 diffs)

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

@@ -61 +61 @@
         self.data = None
         self.current_smearer = None
+        self.kernel_model = None
 
         # Let only floats in the line edits
@@ -110 +111 @@
         if data is None:
             self.setElementsVisibility(False)
-        elif isinstance(data, Data1D):
+
+    def updateKernelModel(self, kernel_model=None):
+        """
+        Update the model
+        """
+        self.kernel_model = kernel_model
+        if self.data is None:
+            self.setElementsVisibility(False)
+            return
+        if self.kernel_model is None:
+            return
+        elif isinstance(self.data, Data1D):
             self.cbSmearing.addItems(SMEARING_1D)
         else:
             self.cbSmearing.addItems(SMEARING_2D)
         self.cbSmearing.setCurrentIndex(0)
-
-    def updateKernelModel(self, kernel_model=None):
-        """
-        Update the model
-        """
-        self.kernel_model = kernel_model
 
     def smearer(self):