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

Timestamp:

Apr 21, 2017 6:40:01 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:

98b13f72

Parents:

9d266d2

Message:

Refactor instrumental smearing tab + make it functional

File:

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

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

@@ -30 +30 @@
 from sas.qtgui.Perspectives.Fitting.FittingLogic import FittingLogic
 from sas.qtgui.Perspectives.Fitting import FittingUtilities
+from SmearingWidget import SmearingWidget
 
 TAB_MAGNETISM = 4
@@ -91 +92 @@
         self.communicate = self.parent.communicate
 
+        # Smearing widget
+        layout = QtGui.QGridLayout()
+        self.smearing_widget = SmearingWidget(self)
+        layout.addWidget(self.smearing_widget) 
+        #self.tabFitting.removeTab(2)
+        self.tabFitting.insertTab(2, self.smearing_widget, "Resolution")
+
         # Define bold font for use in various controls
         self.boldFont=QtGui.QFont()
@@ -161 +169 @@
         self.logic.data = GuiUtils.dataFromItem(value)
 
+        # Overwrite data type descriptor
+        self.is2D = True if isinstance(self.logic.data, Data2D) else False
+
         self.data_is_loaded = True
+
+        # Enable/disable UI components
+        self.setEnablementOnDataLoad()
+
+    def setEnablementOnDataLoad(self):
+        """
+        Enable/disable various UI elements based on data loaded
+        """
         # Tag along functionality
         self.label.setText("Data loaded from: ")
@@ -173 +192 @@
         self.txtNptsFit.setEnabled(False)
         self.chkLogData.setEnabled(False)
+        # Switch off Data2D control
+        self.chk2DView.setEnabled(False)
+        self.chk2DView.setVisible(False)
+        self.chkMagnetism.setEnabled(True)
+
+        # Weighting and smearing controls
+        if self.is2D:
+            #self.slit_smearer.Disable()
+            #self.pinhole_smearer.Enable(True)
+            #self.default_mask = copy.deepcopy(self.data.mask)
+            if self.logic.data.err_data is None or\
+                    numpy.all(err == 1 for err in self.logic.data.err_data) or \
+                    not numpy.any(self.logic.data.err_data):
+                self.rbWeighting2.setEnabled(False)
+                self.rbWeighting1.setChecked(True)
+            else:
+                self.rbWeighting2.setEnabled(True)
+                self.rbWeighting2.setChecked(True)
+        else:
+            #self.slit_smearer.Enable(True)
+            #self.pinhole_smearer.Enable(True)
+            if self.logic.data.dy is None or\
+                    numpy.all(self.logic.data.dy == 1) or\
+                    not numpy.any(self.logic.data.dy):
+                self.rbWeighting2.setEnabled(False)
+                self.rbWeighting1.setChecked(True)
+            else:
+                self.rbWeighting2.setEnabled(True)
+                self.rbWeighting2.setChecked(True)
+
+        # Smearing tab
+        self.smearing_widget.updateSmearing(self.data)
 
     def acceptsData(self):
@@ -211 +262 @@
         self.is2D = isChecked
         # Reload the current model
-        self.onSelectModel()
+        if self.kernel_module:
+            self.onSelectModel()
 
     def toggleLogData(self, isChecked):
@@ -242 +294 @@
         self.weightingGroup.addButton(self.rbWeighting3)
         self.weightingGroup.addButton(self.rbWeighting4)
+        # Smearing tab
+        self.smearing_widget.updateSmearing(self.data)
 
     def initializeSignals(self):
@@ -251 +305 @@
         self.cbCategory.currentIndexChanged.connect(self.onSelectCategory)
         self.cbModel.currentIndexChanged.connect(self.onSelectModel)
-        self.cbSmearing.currentIndexChanged.connect(self.onSelectSmearing)
+        #self.cbSmearing.currentIndexChanged.connect(self.onSelectSmearing)
         # Checkboxes
         self.chk2DView.toggled.connect(self.toggle2D)
@@ -266 +320 @@
         self.txtMinRange.editingFinished.connect(self.onMinRange)
         self.txtMaxRange.editingFinished.connect(self.onMaxRange)
-        self.txtSmearUp.editingFinished.connect(self.onSmearUp)
-        self.txtSmearDown.editingFinished.connect(self.onSmearDown)
+        #self.txtSmearUp.editingFinished.connect(self.onSmearUp)
+        #self.txtSmearDown.editingFinished.connect(self.onSmearDown)
         # Button groups
         self.weightingGroup.buttonClicked.connect(self.onWeightingChoice)
@@ -717 +771 @@
         # Check the state of the Weighting radio buttons
         button_id = self.weightingGroup.checkedId()
+        # Cast the id to a valid index
         button_id = abs(button_id + 2)
         if button_id == 0:
+            # No weight added
             return
         # Send original data for weighting