Changeset b7f7d3f in sasview for src/sas

Timestamp:

Aug 22, 2018 7:02:41 AM (6 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

Branches:

ESS_GUI, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

54492dc

Parents:

f7d39c9 (diff), 0fe7e5b (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

Location:

src/sas/qtgui

Files:

• Perspectives/Fitting/FittingWidget.py (modified) (6 diffs)
• Utilities/GuiUtils.py (modified) (1 diff)
• MainWindow/DataExplorer.py (modified) (3 diffs)
• Perspectives/Fitting/FittingOptions.py (modified) (1 diff)
• Perspectives/Fitting/FittingUtilities.py (modified) (2 diffs)

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

@@ -977 +977 @@
         if category == CATEGORY_STRUCTURE:
             model = None
+
+        # Reset parameters to fit
+        self.parameters_to_fit = None
+        self.has_error_column = False
+        self.has_poly_error_column = False
+
         self.respondToModelStructure(model=model, structure_factor=structure)
 
@@ -1650 +1656 @@
         Take func and throw it inside the magnet model row loop
         """
-        for row_i in range(self._model_model.rowCount()):
+        for row_i in range(self._magnet_model.rowCount()):
             func(row_i)
 
@@ -1662 +1668 @@
         if self._magnet_model.rowCount() == 0:
             return
-
-        def iterateOverMagnetModel(func):
-            """
-            Take func and throw it inside the magnet model row loop
-            """
-            for row_i in range(self._magnet_model.rowCount()):
-                func(row_i)
 
         def updateFittedValues(row):
@@ -2228 +2227 @@
         """
         fitted_data = self.logic.new1DPlot(return_data, self.tab_id)
-        self.calculateResiduals(fitted_data)
+        residuals = self.calculateResiduals(fitted_data)
         self.model_data = fitted_data
+
+        new_plots = [fitted_data, residuals]
 
         # Create plots for intermediate product data
@@ -2236 +2237 @@
             pq_data.symbol = "Line"
             self.createNewIndex(pq_data)
+            new_plots.append(pq_data)
         if sq_data is not None:
             sq_data.symbol = "Line"
             self.createNewIndex(sq_data)
+            new_plots.append(sq_data)
+
+        if self.data_is_loaded:
+            GuiUtils.deleteRedundantPlots(self.all_data[self.data_index], new_plots)
 
     def complete2D(self, return_data):
@@ -2274 +2280 @@
         residuals_plot.id = "Residual " + residuals_plot.id
         self.createNewIndex(residuals_plot)
+        return residuals_plot
 
     def onCategoriesChanged(self):

src/sas/qtgui/Utilities/GuiUtils.py

@@ -292 +292 @@
     # Append the new row to the main item
     item.appendRow(checkbox_item)
+
+def deleteRedundantPlots(item, new_plots):
+    """
+    Checks all plots that are children of the given item; if any have an ID or name not included in new_plots,
+    it is deleted. Useful for e.g. switching from P(Q)S(Q) to P(Q); this would remove the old S(Q) plot.
+
+    Ensure that new_plots contains ALL the relevant plots(!!!)
+    """
+    assert isinstance(item, QtGui.QStandardItem)
+
+    names = [p.name for p in new_plots if p.name is not None]
+    ids = [p.id for p in new_plots if p.id is not None]
+
+    items_to_delete = []
+
+    for index in range(item.rowCount()):
+        plot_item = item.child(index)
+        if plot_item.isCheckable():
+            plot_data = plot_item.child(0).data()
+            if (plot_data.id is not None) and (plot_data.id not in ids) and (plot_data.name not in names):
+                items_to_delete.append(plot_item)
+
+    for plot_item in items_to_delete:
+        item.removeRow(plot_item.row())
 
 class HashableStandardItem(QtGui.QStandardItem):

src/sas/qtgui/MainWindow/DataExplorer.py

@@ -542 +542 @@
                 # 'sophisticated' test to generate standalone plot for residuals
                 if 'esiduals' in plot.title:
-                    self.plotData([(item, plot)])
+                    self.plotData([(item, plot)], transform=False)
                 else:
                     new_plots.append((item, plot))
@@ -583 +583 @@
         #============================================
 
-    def plotData(self, plots):
+    def plotData(self, plots, transform=True):
         """
         Takes 1D/2D data and generates a single plot (1D) or multiple plots (2D)
@@ -594 +594 @@
                     new_plot = Plotter(self)
                     new_plot.item = item
-                new_plot.plot(plot_set)
+                new_plot.plot(plot_set, transform=transform)
                 # active_plots may contain multiple charts
                 self.active_plots[plot_set.id] = new_plot

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

@@ -146 +146 @@
             """
             widget = self.widgetFromOption(option)
-            new_value = widget.currentText() if isinstance(widget, QtWidgets.QComboBox) \
-                else float(widget.text())
-            self.config.values[self.current_fitter_id][option] = new_value
+            if widget is None:
+                return
+            try:
+                new_value = widget.currentText() if isinstance(widget, QtWidgets.QComboBox) \
+                    else float(widget.text())
+                self.config.values[self.current_fitter_id][option] = new_value
+            except ValueError:
+                # Don't update bumps if widget has bad data
+                self.reject
 
         # Update the BUMPS singleton

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

@@ -335 +335 @@
     gn = reference_data.y
     en = dy[index][0]
+
+    # x values
+    x_current = current_data.x
+    x_reference = reference_data.x
+
     # build residuals
     residuals = Data1D()
@@ -340 +345 @@
         y = (fn - gn)/en
         residuals.y = -y
+    elif len(fn) > len(gn):
+        residuals.y = (fn - gn[1:len(fn)])/en
     else:
-        # TODO: fix case where applying new data from file on top of existing model data
         try:
-            y = (fn - gn[index][0]) / en
+            y = numpy.zeros(len(current_data.y))
+            begin = 0
+            for i, x_value in enumerate(x_reference):
+                if x_value in x_current:
+                    begin = i
+                    break
+            end = len(x_reference)
+            endl = 0
+            for i, x_value in enumerate(list(x_reference)[::-1]):
+                if x_value in x_current:
+                    endl = i
+                    break
+            # make sure we have correct lengths
+            assert len(x_current) == len(x_reference[begin:end-endl])
+
+            y = (fn - gn[begin:end-endl])/en
             residuals.y = y
         except ValueError: