Changeset 0268aed in sasview for src/sas/qtgui/DataExplorer.py

Timestamp:

Mar 29, 2017 10:02:34 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:

7d077d1

Parents:

6fd4e36

Message:

Plotting residuals in fitting.
PlotHelper? updates.
Minor refactoring.

File:

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

src/sas/qtgui/DataExplorer.py

@@ -58 +58 @@
         self.cmdSendTo.clicked.connect(self.sendData)
         self.cmdNew.clicked.connect(self.newPlot)
+        self.cmdNew_2.clicked.connect(self.newPlot)
         self.cmdAppend.clicked.connect(self.appendPlot)
         self.cmdHelp.clicked.connect(self.displayHelp)
@@ -409 +410 @@
         orig_text = self.cbgraph.currentText()
         self.cbgraph.clear()
-        graph_titles= ["Graph"+str(graph) for graph in graph_list]
-
-        self.cbgraph.insertItems(0, graph_titles)
+        #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)
         if ind > 0:
@@ -426 +428 @@
         Create a new matplotlib chart from selected data
         """
-        plots = GuiUtils.plotsFromCheckedItems(self.model)
+        # Check which tab is currently active
+        if self.current_view == self.treeView:
+            plots = GuiUtils.plotsFromCheckedItems(self.model)
+        else:
+            plots = GuiUtils.plotsFromCheckedItems(self.theory_model)
 
         # Call show on requested plots
@@ -457 +463 @@
         """
         # Update the global plot counter
-        title = "Graph"+str(PlotHelper.idOfPlot(new_plot))
+        title = str(PlotHelper.idOfPlot(new_plot))
         new_plot.setWindowTitle(title)
 
@@ -477 +483 @@
 
         # old plot data
-        plot_id = self.cbgraph.currentIndex() + 1
-
-        assert plot_id in PlotHelper.currentPlots(), "No such plot: Graph%s"%str(plot_id)
+        plot_id = str(self.cbgraph.currentText())
+
+        assert plot_id in PlotHelper.currentPlots(), "No such plot: %s"%(plot_id)
 
         old_plot = PlotHelper.plotById(plot_id)