Changeset 8696721 in sasview for src/sas/qtgui/DataExplorer.py

Timestamp:

Dec 13, 2016 5:04:25 AM (8 years ago)

Author:

wojciech

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:

0532d7c1

Parents:

6b9d41d (diff), c3b2327 (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:

Merged with ESS_GUI

File:

• src/sas/qtgui/DataExplorer.py (modified) (5 diffs)

src/sas/qtgui/DataExplorer.py

@@ -80 +80 @@
         self.communicator.fileReadSignal.connect(self.loadFromURL)
         self.communicator.activeGraphsSignal.connect(self.updateGraphCombo)
+        self.communicator.activeGraphName.connect(self.updatePlotName)
         self.cbgraph.editTextChanged.connect(self.enableGraphCombo)
         self.cbgraph.currentIndexChanged.connect(self.enableGraphCombo)
@@ -368 +369 @@
         return new_item
 
+    def updatePlotName(self, name_tuple):
+        """
+        Modify the name of the current plot
+        """
+        old_name, current_name = name_tuple
+        ind = self.cbgraph.findText(old_name)
+        self.cbgraph.setCurrentIndex(ind)
+        self.cbgraph.setItemText(ind, current_name)
+
     def updateGraphCombo(self, graph_list):
         """
@@ -411 +421 @@
                 raise AttributeError, msg
 
+
         if plots and \
-           hasattr(new_plot, 'data') and \
-           len(new_plot.data.x) > 0:
-            self.plotAdd(new_plot)
+            hasattr(new_plot, 'data') and \
+            isinstance(new_plot.data, Data1D):
+                self.plotAdd(new_plot)
 
     def plotAdd(self, new_plot):
@@ -436 +447 @@
         """
         Add data set(s) to the existing matplotlib chart
-
-        TODO: Add 2D-functionality
         """
         # new plot data
@@ -443 +452 @@
 
         # old plot data
-        plot_id = self.cbgraph.currentText()
-        plot_id = int(plot_id[5:])
+        plot_id = self.cbgraph.currentIndex() + 1
 
         assert plot_id in PlotHelper.currentPlots(), "No such plot: Graph%s"%str(plot_id)