Changeset 8cb6cd6 in sasview

Timestamp:

Jul 12, 2016 6:44:53 AM (8 years ago)

Author:

Piotr Rozyczko <piotr.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:

e3ae090

Parents:

a95260d

Message:

Plot handler prototype + append plot functionality

Location:

src/sas/qtgui

Files:

• DataExplorer.py (modified) (13 diffs)
• GuiManager.py (modified) (5 diffs)
• GuiUtils.py (modified) (1 diff)
• Perspectives/Invariant/InvariantPerspective.py (modified) (2 diffs)
• PlotHelper.py (added)
• Plotter.py (modified) (5 diffs)
• UI/DataExplorerUI.py (modified) (2 diffs)
• UI/DataExplorerUI.ui (modified) (1 diff)
• UnitTesting/DataExplorerTest.py (modified) (5 diffs)
• UnitTesting/PlotHelperTest.py (added)
• run_tests.sh (modified) (1 diff)

src/sas/qtgui/DataExplorer.py

@@ -13 +13 @@
 
 # SAS
-import GuiUtils
-from Plotter import Plotter
 from sas.sascalc.dataloader.loader import Loader
 from sas.sasgui.guiframe.data_manager import DataManager
@@ -20 +18 @@
 from sas.sasgui.guiframe.dataFitting import Data2D
 
+import GuiUtils
+import PlotHelper
+from Plotter import Plotter
 from DroppableDataLoadWidget import DroppableDataLoadWidget
 
@@ -46 +47 @@
         # Be careful with twisted threads.
         self.mutex = QMutex()
+
+        # Active plots
+        self.active_plots = []
 
         # Connect the buttons
@@ -54 +58 @@
         self.cmdSendTo.clicked.connect(self.sendData)
         self.cmdNew.clicked.connect(self.newPlot)
+        self.cmdAppend.clicked.connect(self.appendPlot)
         self.cmdHelp.clicked.connect(self.displayHelp)
         self.cmdHelp_2.clicked.connect(self.displayHelp)
@@ -76 +81 @@
         self.communicator = self.parent.communicator()
         self.communicator.fileReadSignal.connect(self.loadFromURL)
+        self.communicator.activeGraphsSignal.connect(self.updateGraphCombo)
+        self.cbgraph.editTextChanged.connect(self.enableGraphCombo)
+        self.cbgraph.currentIndexChanged.connect(self.enableGraphCombo)
 
         # Proxy model for showing a subset of Data1D/Data2D content
@@ -97 +105 @@
         self.freezeView.setModel(self.theory_proxy)
 
+        self.enableGraphCombo(None)
+
     def closeEvent(self, event):
         """
@@ -110 +120 @@
         self._helpView.load(QtCore.QUrl(_TreeLocation))
         self._helpView.show()
+
+    def enableGraphCombo(self, combo_text):
+        """
+        Enables/disables "Assign Plot" elements
+        """
+        self.cbgraph.setEnabled(len(PlotHelper.currentPlots()) > 0)
+        self.cmdAppend.setEnabled(len(PlotHelper.currentPlots()) > 0)
 
     def loadFromURL(self, url):
@@ -187 +204 @@
         delete_msg = "This operation will delete the checked data sets and all the dependents." +\
                      "\nDo you want to continue?"
-        reply = QtGui.QMessageBox.question(self, 'Warning', delete_msg,
-                QtGui.QMessageBox.Yes, QtGui.QMessageBox.No)
+        reply = QtGui.QMessageBox.question(self,
+                                           'Warning',
+                                           delete_msg,
+                                           QtGui.QMessageBox.Yes,
+                                           QtGui.QMessageBox.No)
 
         if reply == QtGui.QMessageBox.No:
@@ -263 +283 @@
             if not outer_item:
                 continue
-            for inner_index in xrange(outer_item.rowCount()): # Should be just two rows: data and Info
+            # Should be just two rows: data and Info
+            for inner_index in xrange(outer_item.rowCount()):
                 subitem = outer_item.child(inner_index)
-                if subitem and subitem.isCheckable() and subitem.checkState() == QtCore.Qt.Checked:
+                if subitem and \
+                   subitem.isCheckable() and \
+                   subitem.checkState() == QtCore.Qt.Checked:
                     theories_copied += 1
                     new_item = self.recursivelyCloneItem(subitem)
                     # Append a "unique" descriptor to the name
-                    time_bit = str(time.time())[7:-1].replace('.','')
+                    time_bit = str(time.time())[7:-1].replace('.', '')
                     new_name = new_item.text() + '_@' + time_bit
                     new_item.setText(new_name)
@@ -300 +323 @@
         return new_item
 
+    def updateGraphCombo(self, graph_list):
+        """
+        Modify Graph combo box on graph add/delete
+        """
+        orig_text = self.cbgraph.currentText()
+        self.cbgraph.clear()
+        graph_titles = []
+        for graph in graph_list:
+            graph_titles.append("Graph"+str(graph))
+        self.cbgraph.insertItems(0, graph_titles)
+        ind = self.cbgraph.findText(orig_text)
+        if ind > 0:
+            self.cbgraph.setCurrentIndex(ind)
+        pass
+
     def newPlot(self):
         """
@@ -306 +344 @@
         TODO: Add 2D-functionality
         """
-
         plots = GuiUtils.plotsFromCheckedItems(self.model)
 
         # Call show on requested plots
-        new_plot = Plotter()
+        new_plot = Plotter(self)
         for plot_set in plots:
             new_plot.data(plot_set)
             new_plot.plot()
 
+        # Update the global plot counter
+        title = "Graph"+str(PlotHelper.idOfPlot(new_plot))
+        new_plot.setWindowTitle(title)
+
+        # Add the plot to the workspace
+        self.parent.workspace().addWindow(new_plot)
+
+        # Show the plot
         new_plot.show()
+
+        # Update the active chart list
+        self.active_plots.append(title)
+
+    def appendPlot(self):
+        """
+        Add data set(s) to the existing matplotlib chart
+
+        TODO: Add 2D-functionality
+        """
+        # new plot data
+        new_plots = GuiUtils.plotsFromCheckedItems(self.model)
+
+        # old plot data
+        plot_id = self.cbgraph.currentText()
+        plot_id = int(plot_id[5:])
+
+        assert plot_id in PlotHelper.currentPlots(), "No such plot: Graph%s"%str(plot_id)
+
+        old_plot = PlotHelper.plotById(plot_id)
+
+        # Add new data to the old plot
+        for plot_set in new_plots:
+            old_plot.data(plot_set)
+            old_plot.plot()
 
     def chooseFiles(self):
@@ -424 +494 @@
                 else:
                     error_message += "%s\n" % str(p_file)
-                info = "error"
 
             current_percentage = int(100.0* index/number_of_files)
@@ -563 +632 @@
         Post message to status bar and update the data manager
         """
-        assert type(output) == tuple
+        assert isinstance(output, tuple)
 
         # Reset the model so the view gets updated.

src/sas/qtgui/GuiManager.py

@@ -63 +63 @@
 
         # Fork off logging messages to the Log Window
-        XStream.stdout().messageWritten.connect( self.listWidget.insertPlainText  )
-        XStream.stderr().messageWritten.connect( self.listWidget.insertPlainText  )
+        XStream.stdout().messageWritten.connect(self.listWidget.insertPlainText)
+        XStream.stderr().messageWritten.connect(self.listWidget.insertPlainText)
 
         # Log the start of the session
@@ -138 +138 @@
         self.statusLabel = QtGui.QLabel()
         self.statusLabel.setText("Welcome to SasView")
-        self._workspace.statusbar.addPermanentWidget(self.statusLabel,1)
+        self._workspace.statusbar.addPermanentWidget(self.statusLabel, 1)
         self._workspace.statusbar.addPermanentWidget(self.progress, stretch=0)
-        self.progress.setRange(0,100)
+        self.progress.setRange(0, 100)
         self.progress.setValue(0)
         self.progress.setTextVisible(True)
@@ -150 +150 @@
         """
         pass
+
+    def workspace(self):
+        """
+        Accessor for the main window workspace
+        """
+        return self._workspace.workspace
 
     def updatePerspective(self, data):
@@ -186 +192 @@
         Update progress bar with the required value (0-100)
         """
-        assert(-1 <= value <= 100)
+        assert -1 <= value <= 100
         if value == -1:
             self.progress.setVisible(False)
@@ -253 +259 @@
                              % (content))
                 version_info = json.loads(content)
-            except:
-                logging.info("Failed to connect to www.sasview.org")
+            except ValueError, ex:
+                logging.info("Failed to connect to www.sasview.org:", ex)
         self.processVersion(version_info)
 

src/sas/qtgui/GuiUtils.py

@@ -217 +217 @@
     progressBarUpdateSignal = QtCore.pyqtSignal(int)
 
+    # Workspace charts added/removed
+    activeGraphsSignal = QtCore.pyqtSignal(list)
+
 
 def updateModelItem(item, update_data, name=""):

src/sas/qtgui/Perspectives/Invariant/InvariantPerspective.py

@@ -58 +58 @@
         self._helpView = QtWebKit.QWebView()
         self.detailsDialog = DetailsDialog(self)
-        self._plotter = Plotter(self)
+        # self._plotter = Plotter(self)
 
         self._low_extrapolate = False
@@ -159 +159 @@
         """
         """
+        self._plotter = Plotter(self)
         if self._low_extrapolate or self._high_extrapolate:
             self._plotter.show()

src/sas/qtgui/Plotter.py

@@ +1 @@
+import logging
+
 from PyQt4 import QtGui
 
@@ -9 +11 @@
 import matplotlib.pyplot as plt
 
+import PlotHelper
+
 class Plotter(QtGui.QDialog):
     def __init__(self, parent=None):
         super(Plotter, self).__init__(parent)
+
+        # Required for the communicator
+        self.parent = parent
 
         # a figure instance to plot on
@@ -39 +46 @@
         self._ax = self.figure.add_subplot(self._current_plot)
 
+        # Notify the helper
+        PlotHelper.addPlot(self)
+        # Notify the listeners
+        self.parent.communicator.activeGraphsSignal.emit(PlotHelper.currentPlots())
 
     def data(self, data=None):
-        """
-        """
+        """ data setter """
         self._data = data
 
     def title(self, title=""):
-        """
-        """
+        """ title setter """
         self._title = title
 
     def id(self, id=""):
-        """
-        """
+        """ id setter """
         self._id = id
 
     def x_label(self, xlabel=""):
-        """
-        """
+        """ x-label setter """
         self._xlabel = xlabel
 
     def y_label(self, ylabel=""):
-        """
-        """
+        """ y-label setter """
         self._ylabel = ylabel
 
     def clean(self):
         """
+        Redraw the graph
         """
         self.figure.delaxes(self._ax)
@@ -73 +80 @@
     def plot(self):
         """
-        plot self._data
+        Plot self._data
         """
         # create an axis
@@ -92 +99 @@
         # refresh canvas
         self.canvas.draw()
+
+    def closeEvent(self, event):
+        """
+        Overwrite the close event adding helper notification
+        """
+        # Please remove me from your database.
+        PlotHelper.deletePlot(PlotHelper.idOfPlot(self))
+        # Notify the listeners
+        self.parent.communicator.activeGraphsSignal.emit(PlotHelper.currentPlots())
+        event.accept()
+

src/sas/qtgui/UI/DataExplorerUI.py

@@ -131 +131 @@
         self.cbgraph.setSizeAdjustPolicy(QtGui.QComboBox.AdjustToContents)
         self.cbgraph.setObjectName(_fromUtf8("cbgraph"))
-        self.cbgraph.addItem(_fromUtf8(""))
         self.gridLayout_3.addWidget(self.cbgraph, 1, 1, 1, 1)
         self.gridLayout_2.addWidget(self.groupBox_3, 0, 0, 1, 1)
@@ -227 +226 @@
         self.cmdNew.setText(_translate("DataLoadWidget", "Create New", None))
         self.cmdAppend.setText(_translate("DataLoadWidget", "Append to", None))
-        self.cbgraph.setItemText(0, _translate("DataLoadWidget", "Graph1", None))
         self.cmdHelp.setText(_translate("DataLoadWidget", "Help", None))
         DataLoadWidget.setTabText(DataLoadWidget.indexOf(self.dataTab), _translate("DataLoadWidget", "Data", None))

src/sas/qtgui/UI/DataExplorerUI.ui

@@ -252 +252 @@
             <enum>QComboBox::AdjustToContents</enum>
            </property>
-           <item>
-            <property name="text">
-             <string>Graph1</string>
-            </property>
-           </item>
           </widget>
          </item>

src/sas/qtgui/UnitTesting/DataExplorerTest.py

@@ -17 +17 @@
 from UnitTesting.TestUtils import QtSignalSpy
 from Plotter import Plotter
+import PlotHelper
 
 app = QApplication(sys.argv)
@@ -39 +40 @@
             def perspective(self):
                 return MyPerspective()
+            def workspace(self):
+                return None
 
         self.form = DataExplorerWindow(None, dummy_manager())
@@ -505 +508 @@
         loader = Loader()
         manager = DataManager()
+        PlotHelper.clear()
+        self.form.enableGraphCombo(None)
+
+        # Make sure the controls are disabled
+        self.assertFalse(self.form.cbgraph.isEnabled())
+        self.assertFalse(self.form.cmdAppend.isEnabled())
 
         # get Data1D
@@ -517 +526 @@
         self.form.plotsFromCheckedItems = MagicMock(return_value=new_data)
 
+        # Mask plotting
+        self.form.parent.workspace = MagicMock()
+
         # Call the plotting method
         self.form.newPlot()
@@ -522 +534 @@
         # The plot was displayed
         self.assertTrue(Plotter.show.called)
+
+        # The plot was registered
+        self.assertEqual(len(PlotHelper.currentPlots()), 1)
+
+        self.assertTrue(self.form.cbgraph.isEnabled())
+        self.assertTrue(self.form.cmdAppend.isEnabled())
+
+    def testAppendPlot(self):
+        """
+        Creating new plots from Data1D/2D
+        """
+        loader = Loader()
+        manager = DataManager()
+
+        PlotHelper.clear()
+        self.form.enableGraphCombo(None)
+
+        # Make sure the controls are disabled
+        self.assertFalse(self.form.cbgraph.isEnabled())
+        self.assertFalse(self.form.cmdAppend.isEnabled())
+
+        # get Data1D
+        p_file="cyl_400_20.txt"
+        output_object = loader.load(p_file)
+        new_data = [manager.create_gui_data(output_object, p_file)]
+
+        # Mask plotting
+        self.form.parent.workspace = MagicMock()
+
+        # Mask the plot show call
+        Plotter.show = MagicMock()
+
+        # Mask retrieval of the data
+        self.form.plotsFromCheckedItems = MagicMock(return_value=new_data)
+
+        # Call the plotting method
+        self.form.newPlot()
+
+        # Call the plotting method again, so we have 2 graphs
+        self.form.newPlot()
+
+        # See that we have two plots
+        self.assertEqual(len(PlotHelper.currentPlots()), 2)
+
+        # Add data to plot #1
+        self.form.cbgraph.setCurrentIndex(1)
+        self.form.appendPlot()
+
+        # See that we still have two plots
+        self.assertEqual(len(PlotHelper.currentPlots()), 2)
+
+    def testUpdateGraphCombo(self):
+        """
+        Test the combo box update
+        """
+        PlotHelper.clear()
+
+        graph_list=[1,2,3]
+        self.form.updateGraphCombo(graph_list)
+
+        self.assertEqual(self.form.cbgraph.count(), 3)
+        self.assertEqual(self.form.cbgraph.currentText(), 'Graph1')
+
+        graph_list=[]
+        self.form.updateGraphCombo(graph_list)
+        self.assertEqual(self.form.cbgraph.count(), 0)
 
     def testUpdateModelFromPerspective(self):

src/sas/qtgui/run_tests.sh

@@ -8 +8 @@
 python -m UnitTesting.DroppableDataLoadWidgetTest
 python -m UnitTesting.SasviewLoggerTest
+python -m UnitTesting.PlotHelperTest