Changeset 7d8bebf in sasview

Timestamp:

Oct 1, 2017 1:07:17 PM (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:

4f790d2

Parents:

61a8b58

Message:

Some improvements in plot handling

Location:

src/sas/qtgui

Files:

• MainWindow/DataExplorer.py (modified) (7 diffs)
• Plotting/PlotterBase.py (modified) (2 diffs)

src/sas/qtgui/MainWindow/DataExplorer.py

@@ -90 +90 @@
         self.communicator = self.parent.communicator()
         self.communicator.fileReadSignal.connect(self.loadFromURL)
-        self.communicator.activeGraphsSignal.connect(self.updateGraphCombo)
+        self.communicator.activeGraphsSignal.connect(self.updateGraphCount)
         self.communicator.activeGraphName.connect(self.updatePlotName)
         self.communicator.plotUpdateSignal.connect(self.updatePlot)
@@ -417 +417 @@
         self.cbgraph.setItemText(ind, current_name)
 
+    def updateGraphCount(self, graph_list):
+        """
+        Modify the graph name combo and potentially remove
+        deleted graphs
+        """
+        self.updateGraphCombo(graph_list)
+
+        if not self.active_plots:
+            return
+        new_plots = [PlotHelper.plotById(plot) for plot in graph_list]
+        active_plots_copy = self.active_plots.keys()
+        for plot in active_plots_copy:
+            if self.active_plots[plot] in new_plots:
+                continue
+            self.active_plots.pop(plot)
+
     def updateGraphCombo(self, graph_list):
         """
@@ -423 +439 @@
         orig_text = self.cbgraph.currentText()
         self.cbgraph.clear()
-        #graph_titles= [str(graph) for graph in graph_list]
-
-        #self.cbgraph.insertItems(0, graph_titles)
         self.cbgraph.insertItems(0, graph_list)
         ind = self.cbgraph.findText(orig_text)
@@ -454 +467 @@
             plot_id = plot.id
             if plot_id in self.active_plots.keys():
-                self.active_plots[plot_id].replacePlot(plot_id, plot_to_show)
+                self.active_plots[plot_id].replacePlot(plot_id, plot)
             else:
                 self.plotData([(None, plot)])
@@ -486 +499 @@
         # Call show on requested plots
         # All same-type charts in one plot
-        new_plot = Plotter(self)
+        #if isinstance(plot_set, Data1D):
+        #    new_plot = Plotter(self)
 
         for item, plot_set in plots:
             if isinstance(plot_set, Data1D):
+                if not 'new_plot' in locals():
+                    new_plot = Plotter(self)
                 new_plot.plot(plot_set)
             elif isinstance(plot_set, Data2D):
@@ -497 +513 @@
                 raise AttributeError, msg
 
-        if plots and \
+        if 'new_plot' in locals() and \
             hasattr(new_plot, 'data') and \
             isinstance(new_plot.data, Data1D):
@@ -521 +537 @@
         title = str(PlotHelper.idOfPlot(new_plot))
         new_plot.setWindowTitle(title)
+
+        # Set the object name to satisfy the Squish object picker
+        new_plot.setObjectName(title)
 
         # Add the plot to the workspace

src/sas/qtgui/Plotting/PlotterBase.py

@@ -128 +128 @@
         """ title setter """
         self._title = title
+        # Set the object name to satisfy the Squish object picker
+        self.canvas.setObjectName(title)
 
     @property
@@ -271 +273 @@
         # Please remove me from your database.
         PlotHelper.deletePlot(PlotHelper.idOfPlot(self))
+
         # Notify the listeners
         self.manager.communicator.activeGraphsSignal.emit(PlotHelper.currentPlots())
+
         event.accept()