Changeset 7d077d1 in sasview

Timestamp:

Mar 31, 2017 3:29:50 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:

0274aea

Parents:

0268aed

Message:

When chart is shown - react and show changes to Qmodel

Location:

src/sas/qtgui

Files:

• DataExplorer.py (modified) (5 diffs)
• GuiUtils.py (modified) (2 diffs)
• Perspectives/Fitting/FittingLogic.py (modified) (3 diffs)
• Perspectives/Fitting/FittingUtilities.py (modified) (3 diffs)
• Perspectives/Fitting/FittingWidget.py (modified) (6 diffs)

src/sas/qtgui/DataExplorer.py

@@ -49 +49 @@
 
         # Active plots
-        self.active_plots = []
+        self.active_plots = {}
 
         # Connect the buttons
@@ -87 +87 @@
         self.communicator.activeGraphsSignal.connect(self.updateGraphCombo)
         self.communicator.activeGraphName.connect(self.updatePlotName)
+        self.communicator.plotUpdateSignal.connect(self.updatePlot)
         self.cbgraph.editTextChanged.connect(self.enableGraphCombo)
         self.cbgraph.currentIndexChanged.connect(self.enableGraphCombo)
@@ -473 +474 @@
 
         # Update the active chart list
-        self.active_plots.append(title)
+        self.active_plots[new_plot.data.id] = new_plot
+        print "ADDING ", new_plot.data.id
 
     def appendPlot(self):
@@ -494 +496 @@
                 old_plot.data = plot_set
                 old_plot.plot()
+
+    def updatePlot(self, new_data):
+        """
+        Modify existing plot for immediate response
+        """
+        data = new_data[0]
+        assert type(data).__name__ in ['Data1D', 'Data2D']
+
+        id = data.id
+        if data.id in self.active_plots.keys():
+            self.active_plots[id].replacePlot(id, data)
 
     def chooseFiles(self):
@@ -940 +953 @@
         # Reset the view
         self.model.reset()
-
         # Pass acting as a debugger anchor
         pass

src/sas/qtgui/GuiUtils.py

@@ -228 +228 @@
     plotRequestedSignal = QtCore.pyqtSignal(str)
 
+    # Plot update requested from a perspective
+    plotUpdateSignal = QtCore.pyqtSignal(list)
+
     # Progress bar update value
     progressBarUpdateSignal = QtCore.pyqtSignal(int)
@@ -255 +258 @@
         if plot_item.isCheckable():
             plot_data = plot_item.child(0).data().toPyObject()
-            if plot_data.id == py_update_data.id:
-                item.removeRow(index)
-                break
+            if plot_data.id is not None and plot_data.id == py_update_data.id:
+                # replace data section in item
+                plot_item.child(0).setData(update_data)
+                plot_item.setText(name)
+                # Force redisplay
+                return
 
     # Create the new item

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

@@ -103 +103 @@
         self._data.ymax = ymax
 
-    def new1DPlot(self, return_data):
+    def new1DPlot(self, return_data, tab_id):
         """
         Create a new 1D data instance based on fitting results
@@ -121 +121 @@
 
         new_plot.group_id = data.group_id
-        #new_plot.id = str(self.tab_id) + " " + data.name
+        new_plot.id = str(tab_id) + " " + data.name
         new_plot.name = model.name + " [" + data.name + "]"
         new_plot.title = new_plot.name
@@ -135 +135 @@
         Create a new 2D data instance based on fitting results
         """
-
         image, data, page_id, model, state, toggle_mode_on,\
         elapsed, index, fid, qmin, qmax, weight, \

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

@@ -224 +224 @@
 def residualsData1D(reference_data, current_data):
     """
+    Calculate the residuals for difference of two Data1D sets
     """
     # temporary default values for index and weight
@@ -265 +266 @@
 def residualsData2D(reference_data, current_data):
     """
+    Calculate the residuals for difference of two Data2D sets
     """
     # temporary default values for index and weight
@@ -304 +306 @@
     data_copy = deepcopy(current_data)
     # Get data: data I, theory I, and data dI in order
-
     method_name = current_data.__class__.__name__
     residuals_dict = {"Data1D": residualsData1D,

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

@@ -586 +586 @@
         # multishell params in self.kernel_module.details[??] = value
 
+        # Force the chart update
+        self.onPlot()
+
     def nameForFittedData(self, name):
         """
@@ -605 +608 @@
                 fitted_data.name = name
                 fitted_data.filename = name
+                fitted_data.symbol = "Line"
             self.updateModelIndex(fitted_data)
         else:
@@ -625 +629 @@
             name = fitted_data.name
         # Make this a line if no other defined
-        if fitted_data.symbol is None:
+        if hasattr(fitted_data, 'symbol') and fitted_data.symbol is None:
             fitted_data.symbol = 'Line'
         # Notify the GUI manager so it can update the main model in DataExplorer
         GuiUtils.updateModelItemWithPlot(self._index, QtCore.QVariant(fitted_data), name)
+        # Force redisplay
 
     def createTheoryIndex(self, fitted_data):
@@ -680 +685 @@
         Plot the current 1D data
         """
-        fitted_plot = self.logic.new1DPlot(return_data)
+        fitted_plot = self.logic.new1DPlot(return_data, self.tab_id)
         self.calculateResiduals(fitted_plot)
 
@@ -695 +700 @@
         """
         # Create a new index for holding data
+        fitted_data.symbol = "Line"
         self.createNewIndex(fitted_data)
         # Calculate difference between return_data and logic.data
@@ -704 +710 @@
         if self.data_is_loaded:
             residuals_plot = FittingUtilities.plotResiduals(self.data, fitted_data)
+            residuals_plot.id = "Residual " + residuals_plot.id
             self.createNewIndex(residuals_plot)
+
+        self.communicate.plotUpdateSignal.emit([fitted_data])
 
     def calcException(self, etype, value, tb):