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

Timestamp:

Apr 11, 2017 6:06:56 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:

83eb5208

Parents:

9687d58

Message:

Fitting options - connected GUI to logic.
Minor UI redesign of fitting options tab.

File:

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

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

@@ -164 +164 @@
         self.updateQRange()
         self.cmdFit.setEnabled(True)
+        self.boxWeighting.setEnabled(True)
+        self.cmdMaskEdit.setEnabled(True)
+        # Switch off txtNpts related controls
+        self.txtNpts.setEnabled(False)
+        self.txtNptsFit.setEnabled(False)
+        self.chkLogData.setEnabled(False)
 
     def acceptsData(self):
@@ -204 +210 @@
         self.onSelectModel()
 
+    def toggleLogData(self, isChecked):
+        """ Toggles between log and linear data sets """
+        pass
+
     def initializeControls(self):
         """
@@ -210 +220 @@
         self.cmdFit.setEnabled(False)
         self.cmdPlot.setEnabled(True)
+        self.cmdComputePoints.setVisible(False) # probably redundant
         self.chkPolydispersity.setEnabled(True)
         self.chkPolydispersity.setCheckState(False)
@@ -220 +231 @@
         self.tabFitting.setTabEnabled(TAB_MAGNETISM, False)
         self.lblChi2Value.setText("---")
+        # group boxes
+        self.boxWeighting.setEnabled(False)
+        self.cmdMaskEdit.setEnabled(False)
 
     def initializeSignals(self):
@@ -229 +243 @@
         self.cbCategory.currentIndexChanged.connect(self.onSelectCategory)
         self.cbModel.currentIndexChanged.connect(self.onSelectModel)
+        self.cbSmearing.currentIndexChanged.connect(self.onSelectSmearing)
         # Checkboxes
         self.chk2DView.toggled.connect(self.toggle2D)
         self.chkPolydispersity.toggled.connect(self.togglePoly)
         self.chkMagnetism.toggled.connect(self.toggleMagnetism)
+        self.chkLogData.toggled.connect(self.toggleLogData)
         # Buttons
         self.cmdFit.clicked.connect(self.onFit)
         self.cmdPlot.clicked.connect(self.onPlot)
+        self.cmdMaskEdit.clicked.connect(self.onMaskEdit)
+        self.cmdReset.clicked.connect(self.onReset)
         # Line edits
         self.txtNpts.editingFinished.connect(self.onNpts)
         self.txtMinRange.editingFinished.connect(self.onMinRange)
         self.txtMaxRange.editingFinished.connect(self.onMaxRange)
+        self.txtSmearUp.editingFinished.connect(self.onSmearUp)
+        self.txtSmearDown.editingFinished.connect(self.onSmearDown)
 
         # Respond to change in parameters from the UI
@@ -315 +335 @@
         # Populate the models combobox
         self.cbModel.addItems(sorted([model for (model, _) in model_list]))
+
+    def onSelectSmearing(self):
+        """
+        Select Smearing type from list
+        """
+        pass
+
+    def onSmearUp(self):
+        """
+        Update state based on entered smear value
+        """
+        pass
+
+    def onSmearDown(self):
+        """
+        Update state based on entered smear value
+        """
+        pass
 
     def onPolyModelChange(self, item):
@@ -549 +587 @@
             return
         # set Q range labels on the main tab
-        self.lblMinRangeDef.setText(str(self.q_range_min))
+        #self.lblMinRangeDef.setText(str(self.q_range_min))
         if self.model_is_loaded:
             self.onPlot()
@@ -567 +605 @@
             self.onPlot()
 
+    def onMaskEdit(self):
+        """
+        Callback for running the mask editor
+        """
+        pass
+
+    def onReset(self):
+        """
+        Callback for resetting qmin/qmax
+        """
+        pass
+
     def setDefaultStructureCombo(self):
         """
@@ -652 +702 @@
         self.txtMinRange.setText(str(self.q_range_min))
         self.txtNpts.setText(str(self.npts))
+        self.txtNptsFit.setText(str(self.npts))
 
     def SASModelToQModel(self, model_name, structure_factor=None):