Changeset 9d266d2 in sasview

Timestamp:

Apr 19, 2017 9:07:46 AM (8 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:

e1e3e09

Parents:

cd2cc745

Message:

Added data weighting prototype

Location:

src/sas/qtgui

Files:

• MainWindow/GuiManager.py (modified) (4 diffs)
• Perspectives/Fitting/FittingWidget.py (modified) (7 diffs)
• Perspectives/Fitting/UI/FittingWidgetUI.ui (modified) (4 diffs)

src/sas/qtgui/MainWindow/GuiManager.py

@@ -52 +52 @@
         self._workspace = parent
         self._parent = parent
-
-        # Reactor - singleton
-        self.setReactor(reactor)
 
         # Add signal callbacks
@@ -162 +159 @@
         self.progress.setVisible(False)
 
-    def fileRead(self, data):
+    def fileWasRead(self, data):
         """
         Callback for fileDataReceivedSignal
@@ -208 +205 @@
         """ Accessor for the communicator """
         return self.communicate
-
-    def reactor(self):
-        """ Accessor for the reactor """
-        return self._reactor
-
-    def setReactor(self, reactor):
-        """ Reactor setter """
-        self._reactor = reactor
 
     def perspective(self):
@@ -338 +327 @@
         """
         self.communicate = GuiUtils.Communicate()
-        self.communicate.fileDataReceivedSignal.connect(self.fileRead)
+        self.communicate.fileDataReceivedSignal.connect(self.fileWasRead)
         self.communicate.statusBarUpdateSignal.connect(self.updateStatusBar)
         self.communicate.updatePerspectiveWithDataSignal.connect(self.updatePerspective)

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

@@ -25 +25 @@
 from sas.sasgui.perspectives.fitting.model_thread import Calc1D
 from sas.sasgui.perspectives.fitting.model_thread import Calc2D
+from sas.sasgui.perspectives.fitting.utils import get_weight
 
 from UI.FittingWidgetUI import Ui_FittingWidgetUI
@@ -67 +68 @@
         # Parameters to fit
         self.parameters_to_fit = None
+        # Weight radio box group
+        self.weightingGroup = QtGui.QButtonGroup()
 
         # Which tab is this widget displayed in?
@@ -231 +234 @@
         self.tabFitting.setTabEnabled(TAB_MAGNETISM, False)
         self.lblChi2Value.setText("---")
-        # group boxes
+        # Group boxes
         self.boxWeighting.setEnabled(False)
         self.cmdMaskEdit.setEnabled(False)
+        # Button groups
+        self.weightingGroup.addButton(self.rbWeighting1)
+        self.weightingGroup.addButton(self.rbWeighting2)
+        self.weightingGroup.addButton(self.rbWeighting3)
+        self.weightingGroup.addButton(self.rbWeighting4)
 
     def initializeSignals(self):
@@ -260 +268 @@
         self.txtSmearUp.editingFinished.connect(self.onSmearUp)
         self.txtSmearDown.editingFinished.connect(self.onSmearDown)
+        # Button groups
+        self.weightingGroup.buttonClicked.connect(self.onWeightingChoice)
 
         # Respond to change in parameters from the UI
@@ -353 +363 @@
         """
         pass
+
+    def onWeightingChoice(self, button):
+        """
+        Update weighting in the fit state
+        """
+        button_id = button.group().checkedId()
+        button_id = abs(button_id + 2)
+        #self.fitPage.weighting = button_id
+        print button_id
 
     def onPolyModelChange(self, item):
@@ -401 +420 @@
         params_to_fit = self.parameters_to_fit
 
+        # Potential weights added
+        self.addWeightingToData(data)
+
         # These should be updating somehow?
         fit_id = 0
@@ -688 +710 @@
         checked_list = ['scale', '1.0', '0.0', 'inf', '']
         FittingUtilities.addCheckedListToModel(model, checked_list)
+
+    def addWeightingToData(self, data):
+        """
+        Adds weighting contribution to fitting data
+        """
+        # Check the state of the Weighting radio buttons
+        button_id = self.weightingGroup.checkedId()
+        button_id = abs(button_id + 2)
+        if button_id == 0:
+            return
+        # Send original data for weighting
+        weight = get_weight(data=data, is2d=self.is2D, flag=button_id)
+        if self.is2D:
+            data.err_data = weight
+        else:
+            data.dy = weight
 
     def updateQRange(self):

src/sas/qtgui/Perspectives/Fitting/UI/FittingWidgetUI.ui

@@ -511 +511 @@
            <layout class="QVBoxLayout" name="verticalLayout">
             <item>
-             <widget class="QRadioButton" name="radioButton">
+             <widget class="QRadioButton" name="rbWeighting1">
               <property name="text">
                <string>None</string>
@@ -521 +521 @@
             </item>
             <item>
-             <widget class="QRadioButton" name="radioButton_2">
+             <widget class="QRadioButton" name="rbWeighting2">
               <property name="text">
                <string>Use dI Data</string>
@@ -528 +528 @@
             </item>
             <item>
-             <widget class="QRadioButton" name="radioButton_3">
+             <widget class="QRadioButton" name="rbWeighting3">
               <property name="text">
                <string>Use |sqrt(I Data)|</string>
@@ -535 +535 @@
             </item>
             <item>
-             <widget class="QRadioButton" name="radioButton_4">
+             <widget class="QRadioButton" name="rbWeighting4">
               <property name="text">
                <string>Use |I Data|</string>