Changeset 1042dba in sasview for src/sas/qtgui/DataExplorer.py

Timestamp:

Jun 17, 2016 9:56:01 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:

9e426c1

Parents:

a281ab8

Message:

Plottables support in the data object. Additional menu items.

File:

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

src/sas/qtgui/DataExplorer.py

@@ -11 +11 @@
 # SAS
 from GuiUtils import *
+from Plotter import Plotter
 from sas.sascalc.dataloader.loader import Loader
 from sas.sasgui.guiframe.data_manager import DataManager
@@ -41 +42 @@
         self.cmdDelete.clicked.connect(self.deleteFile)
         self.cmdSendTo.clicked.connect(self.sendData)
+        self.cmdNew.clicked.connect(self.newPlot)
 
         # Connect the comboboxes
@@ -54 +56 @@
         # The Data viewer is QTreeView showing the proxy model
         self.treeView.setModel(self.proxy)
+
+        # Debug view on the model
+        self.listView.setModel(self.model)
 
 
@@ -163 +168 @@
         self._perspective.setData(data_item=data)
 
+    def newPlot(self):
+        """
+        Create a new matplotlib chart from selected data
+        """
+
+        plots = plotsFromCheckedItems(self.model)
+
+        # Call show on requested plots
+        new_plot = Plotter()
+        for plot_set in plots:
+            new_plot.data(plot_set)
+            new_plot.plot()
+
+        new_plot.show()
 
     def chooseFiles(self):
@@ -415 +434 @@
 
         # Add "Info" item
-        info_item = QtGui.QStandardItem("Info")
+        # info_item = QtGui.QStandardItem("Info")
 
         # Add the actual Data1D/Data2D object
@@ -424 +443 @@
 
         # Add rows for display in the view
-        self.addExtraRows(info_item, data)
+        # self.addExtraRows(info_item, data)
+        info_item = infoFromData(data)
 
         # Set info_item as the only child
@@ -444 +464 @@
             msg = "Wrong data type returned from calculations."
             raise AttributeError, msg
-        # Assert other properties
-
-        # Remove the original item        
-
-        # Add the current item
-        # self.model.insertRow(model_item)
+
+        # TODO: Assert other properties
 
         # Reset the view
         self.model.reset()
+
         # Pass acting as a debugger anchor
         pass
-
-    def addExtraRows(self, info_item, data):
-        """
-        Extract relevant data to include in the Info ModelItem
-        """
-        title_item   = QtGui.QStandardItem("Title: "      + data.title)
-        run_item     = QtGui.QStandardItem("Run: "        + str(data.run))
-        type_item    = QtGui.QStandardItem("Type: "       + str(data.__class__.__name__))
-        path_item    = QtGui.QStandardItem("Path: "       + data.path)
-        instr_item   = QtGui.QStandardItem("Instrument: " + data.instrument)
-        process_item = QtGui.QStandardItem("Process")
-        if isinstance(data.process, list) and data.process:
-            for process in data.process:
-                process_date = process.date
-                process_date_item = QtGui.QStandardItem("Date: " + process_date)
-                process_item.appendRow(process_date_item)
-
-                process_descr = process.description
-                process_descr_item = QtGui.QStandardItem("Description: " + process_descr)
-                process_item.appendRow(process_descr_item)
-
-                process_name = process.name
-                process_name_item = QtGui.QStandardItem("Name: " + process_name)
-                process_item.appendRow(process_name_item)
-
-        info_item.appendRow(title_item)
-        info_item.appendRow(run_item)
-        info_item.appendRow(type_item)
-        info_item.appendRow(path_item)
-        info_item.appendRow(instr_item)
-        info_item.appendRow(process_item)