Changeset 31c5b58 in sasview for src/sas/qtgui/DataExplorer.py

Timestamp:

Nov 25, 2016 8:56:41 AM (8 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:

3968752

Parents:

14d9c7b

Message:

Refactored to allow running with run.py.
Minor fixes to plotting.

File:

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

src/sas/qtgui/DataExplorer.py

@@ -18 +18 @@
 from sas.sasgui.guiframe.dataFitting import Data2D
 
-import GuiUtils
-import PlotHelper
-from Plotter import Plotter
-from Plotter2D import Plotter2D
-from DroppableDataLoadWidget import DroppableDataLoadWidget
+import sas.qtgui.GuiUtils as GuiUtils
+import sas.qtgui.PlotHelper as PlotHelper
+from sas.qtgui.Plotter import Plotter
+from sas.qtgui.Plotter2D import Plotter2D
+from sas.qtgui.DroppableDataLoadWidget import DroppableDataLoadWidget
 
 # This is how to get data1/2D from the model item
@@ -117 +117 @@
         Show the "Loading data" section of help
         """
-        _TreeLocation = "html/user/sasgui/guiframe/data_explorer_help.html"
-        self._helpView.load(QtCore.QUrl(_TreeLocation))
+        tree_location = self.parent.HELP_DIRECTORY_LOCATION +\
+            "/user/sasgui/guiframe/data_explorer_help.html"
+        self._helpView.load(QtCore.QUrl(tree_location))
         self._helpView.show()
 
@@ -392 +393 @@
 
         # Call show on requested plots
+        # All same-type charts in one plot
+        new_plot = Plotter(self)
         for plot_set in plots:
-            new_plot = None
             if isinstance(plot_set, Data1D):
-                new_plot = Plotter(self)
+                new_plot.data = plot_set
+                new_plot.plot()
             elif isinstance(plot_set, Data2D):
-                new_plot = Plotter2D(self)
+                # Separate 2D plot
+                plot2D = Plotter2D(self)
+                plot2D.data = plot_set
+                plot2D.plot()
+                self.plotAdd(plot2D)
             else:
                 msg = "Incorrect data type passed to Plotting"
                 raise AttributeError, msg
 
-            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)
+        if plots and \
+           hasattr(new_plot, 'data') and \
+           len(new_plot.data.x) > 0:
+            self.plotAdd(new_plot)
+
+    def plotAdd(self, new_plot):
+        """
+        Helper method for plot bookkeeping
+        """
+        # 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):
@@ -438 +451 @@
         for plot_set in new_plots:
             if type(plot_set) is type(old_plot._data):
-                old_plot.data(plot_set)
+                old_plot.data = plot_set
                 old_plot.plot()