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

Timestamp:

Apr 21, 2017 7:38:11 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:

180bd54

Parents:

e1e3e09

Message:

More smearing functionality

File:

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

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

@@ -197 +197 @@
         self.chkMagnetism.setEnabled(True)
 
-        # Weighting and smearing controls
+        # Weighting 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 \
@@ -211 +208 @@
                 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\
@@ -305 +300 @@
         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)
@@ -320 +314 @@
         self.txtMinRange.editingFinished.connect(self.onMinRange)
         self.txtMaxRange.editingFinished.connect(self.onMaxRange)
-        #self.txtSmearUp.editingFinished.connect(self.onSmearUp)
-        #self.txtSmearDown.editingFinished.connect(self.onSmearDown)
         # Button groups
         self.weightingGroup.buttonClicked.connect(self.onWeightingChoice)
@@ -399 +391 @@
         # 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 onWeightingChoice(self, button):
@@ -476 +450 @@
         # Potential weights added
         self.addWeightingToData(data)
+
+        # Potential smearing added
+        smearing, accuracy, smearing_min, smearing_max = self.smearing_widget.state()
 
         # These should be updating somehow?