Changeset 4b7d322 in sasview for src/sas

Timestamp:

Sep 13, 2018 9:59:29 AM (6 years ago)

Author:

wojciech

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:

9f2f713

Parents:

eeea6a3 (diff), 855e7ad (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'ESS_GUI' of ​https://github.com/SasView/sasview into ESS_GUI_Pr_fixes

Location:

src/sas

Files:

• qtgui/MainWindow/DataExplorer.py (modified) (2 diffs)
• qtgui/Perspectives/Fitting/FittingWidget.py (modified) (12 diffs)
• qtgui/Perspectives/Inversion/InversionPerspective.py (modified) (2 diffs)
• qtgui/Perspectives/Inversion/DMaxExplorerWidget.py (modified) (5 diffs)
• sascalc/pr/invertor.py (modified) (4 diffs)

src/sas/qtgui/MainWindow/DataExplorer.py

@@ -574 +574 @@
         new_plots = []
         for item, plot in plots.items():
-            if self.updatePlot(plot) or filename not in plot.name:
+            if self.updatePlot(plot):
+                # Don't create plots which are already displayed
                 continue
             # Don't plot intermediate results, e.g. P(Q), S(Q)
@@ -582 +583 @@
                 continue
             # Don't include plots from different fitpages, but always include the original data
-            if fitpage_name in plot.name or filename == plot.name:
+            if fitpage_name in plot.name or filename in plot.name or filename == plot.filename:
                 # Residuals get their own plot
                 if plot.plot_role == Data1D.ROLE_RESIDUAL:

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

@@ -1377 +1377 @@
         self.communicate.statusBarUpdateSignal.emit('Fitting started...')
         self.fit_started = True
+
         # Disable some elements
-        self.setFittingStarted()
+        self.disableInteractiveElements()
 
     def stopFit(self):
@@ -1387 +1388 @@
             return
         self.calc_fit.stop()
-        #self.fit_started=False
         #re-enable the Fit button
-        self.setFittingStopped()
+        self.enableInteractiveElements()
 
         msg = "Fitting cancelled."
@@ -1403 +1403 @@
         """
         """
-        self.setFittingStopped()
+        self.enableInteractiveElements()
         msg = "Fitting failed with: "+ str(reason)
         self.communicate.statusBarUpdateSignal.emit(msg)
@@ -1420 +1420 @@
         """
         #re-enable the Fit button
-        self.setFittingStopped()
+        self.enableInteractiveElements()
 
         if len(result) == 0:
@@ -1492 +1492 @@
         """
         #re-enable the Fit button
-        self.setFittingStopped()
+        self.enableInteractiveElements()
 
         if len(result) == 0:
@@ -2363 +2363 @@
         weight = FittingUtilities.getWeight(data=data, is2d=self.is2D, flag=self.weighting)
 
+        # Disable buttons/table
+        self.disableInteractiveElements()
         # Awful API to a backend method.
         calc_thread = self.methodCalculateForData()(data=data,
@@ -2404 +2406 @@
         Thread returned error
         """
+        # Bring the GUI to normal state
+        self.enableInteractiveElements()
         print("Calculate Data failed with ", reason)
 
@@ -2416 +2420 @@
         Plot the current 1D data
         """
+        # Bring the GUI to normal state
+        self.enableInteractiveElements()
+
         fitted_data = self.logic.new1DPlot(return_data, self.tab_id)
         residuals = self.calculateResiduals(fitted_data)
@@ -2445 +2452 @@
         Plot the current 2D data
         """
+        # Bring the GUI to normal state
+        self.enableInteractiveElements()
+
         fitted_data = self.logic.new2DPlot(return_data)
         residuals = self.calculateResiduals(fitted_data)
@@ -2515 +2525 @@
         Thread threw an exception.
         """
+        # Bring the GUI to normal state
+        self.enableInteractiveElements()
         # TODO: remimplement thread cancellation
         logger.error("".join(traceback.format_exception(etype, value, tb)))
@@ -2892 +2904 @@
         self.setMagneticModel()
 
-    def setFittingStarted(self):
-        """
-        Set buttion caption on fitting start
+    def setInteractiveElements(self, enabled=True):
+        """
+        Switch interactive GUI elements on/off
+        """
+        assert isinstance(enabled, bool)
+
+        self.lstParams.setEnabled(enabled)
+        self.lstPoly.setEnabled(enabled)
+        self.lstMagnetic.setEnabled(enabled)
+
+        self.cbCategory.setEnabled(enabled)
+        self.cbModel.setEnabled(enabled)
+        self.cbStructureFactor.setEnabled(enabled)
+
+        self.chkPolydispersity.setEnabled(enabled)
+        self.chkMagnetism.setEnabled(enabled)
+        self.chk2DView.setEnabled(enabled)
+
+    def enableInteractiveElements(self):
+        """
+        Set buttion caption on fitting/calculate finish
+        Enable the param table(s)
+        """
+        # Notify the user that fitting is available
+        self.cmdFit.setStyleSheet('QPushButton {color: black;}')
+        self.cmdFit.setText("Fit")
+        self.fit_started = False
+        self.setInteractiveElements(True)
+
+    def disableInteractiveElements(self):
+        """
+        Set buttion caption on fitting/calculate start
+        Disable the param table(s)
         """
         # Notify the user that fitting is being run
@@ -2900 +2942 @@
         self.cmdFit.setStyleSheet('QPushButton {color: red;}')
         self.cmdFit.setText('Stop fit')
-
-    def setFittingStopped(self):
-        """
-        Set button caption on fitting stop
-        """
-        # Notify the user that fitting is available
-        self.cmdFit.setStyleSheet('QPushButton {color: black;}')
-        self.cmdFit.setText("Fit")
-        self.fit_started = False
+        self.setInteractiveElements(False)
 
     def readFitPage(self, fp):

src/sas/qtgui/Perspectives/Inversion/InversionPerspective.py

@@ -14 +14 @@
 # pr inversion calculation elements
 from sas.sascalc.pr.invertor import Invertor
+from sas.qtgui.Plotting.PlotterData import Data1D
 # Batch calculation display
 from sas.qtgui.Utilities.GridPanel import BatchInversionOutputPanel
@@ -559 +560 @@
         if self.prPlot is not None:
             title = self.prPlot.name
+            self.prPlot.plot_role = Data1D.ROLE_RESIDUAL
             GuiUtils.updateModelItemWithPlot(self._data, self.prPlot, title)
-            self.communicate.plotRequestedSignal.emit([self.prPlot], None)
         if self.dataPlot is not None:
             title = self.dataPlot.name
+            self.dataPlot.plot_role = Data1D.ROLE_DEFAULT
             GuiUtils.updateModelItemWithPlot(self._data, self.dataPlot, title)
-            self.communicate.plotRequestedSignal.emit([self.dataPlot], None)
+        if self.dataPlot is not None or self.prPlot is not None:
+            self.communicate.plotRequestedSignal.emit([self.logic.data], None)
         self.enableButtons()
 

src/sas/qtgui/Perspectives/Inversion/DMaxExplorerWidget.py

@@ -42 +42 @@
         self.parent = parent
 
-        self.setWindowTitle("Dₐₓ Explorer")
+        self.setWindowTitle("Dmax Explorer")
 
         self.pr_state = pr_state
@@ -116 +116 @@
         bck = []
         chi2 = []
-
+        plotable_xs = [] #Introducing this to make sure size of x and y for plotting is the same.8
         try:
             dmin = float(self.model.item(W.DMIN).text())
@@ -128 +128 @@
 
         original = self.pr_state.d_max
+
         for x in xs:
             self.pr_state.d_max = x
@@ -140 +141 @@
                 bck.append(self.pr_state.background)
                 chi2.append(self.pr_state.chi2)
+                plotable_xs.append(x)
             except Exception as ex:
                 # This inversion failed, skip this D_max value
@@ -188 +190 @@
             y_unit = "a.u."
 
-        data = Data1D(xs, ys)
+        data = Data1D(plotable_xs, ys)
         if self.hasPlot:
             self.plot.removePlot(None)

src/sas/sascalc/pr/invertor.py

@@ -71 +71 @@
         A[j][i] = (Fourier transformed base function for point j)
 
-    We them choose a number of r-points, n_r, to evaluate the second
+    We then choose a number of r-points, n_r, to evaluate the second
     derivative of P(r) at. This is used as our regularization term.
     For a vector r of length n_r, the following n_r rows are set to ::
@@ -144 +144 @@
         x, y, err, d_max, q_min, q_max and alpha
         """
-        if   name == 'x':
+        if name == 'x':
             if 0.0 in value:
                 msg = "Invertor: one of your q-values is zero. "
@@ -227 +227 @@
         return None
 
+    def add_errors(self, yvalues):
+        """
+        Adds errors to data set is they are not avaialble
+        :return:
+        """
+        stats_errors = np.zeros(len(yvalues))
+        for i in range(len(yvalues)):
+            # Scale the error so that we can fit over several decades of Q
+            scale = 0.05 * np.sqrt(yvalues[i])
+            min_err = 0.01 * yvalues[i]
+            stats_errors[i] = scale * np.sqrt(np.fabs(yvalues[i])) + min_err
+        logger.warning("Simulated errors have been added to the data set\n")
+        return stats_errors
+
     def clone(self):
         """
@@ -268 +282 @@
             A[i][j] = (Fourier transformed base function for point j)
 
-        We them choose a number of r-points, n_r, to evaluate the second
+        We then choose a number of r-points, n_r, to evaluate the second
         derivative of P(r) at. This is used as our regularization term.
         For a vector r of length n_r, the following n_r rows are set to ::