Changeset 49e124c in sasview for src/sas

Timestamp:

Nov 22, 2016 7:23:03 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:

14d9c7b

Parents:

469b4622

Message:

Initial functionality of Plot2D

Location:

src/sas/qtgui

Files:

• DataExplorer.py (modified) (2 diffs)
• Plotter2D.py (added)

src/sas/qtgui/DataExplorer.py

@@ -21 +21 @@
 import PlotHelper
 from Plotter import Plotter
+from Plotter2D import Plotter2D
 from DroppableDataLoadWidget import DroppableDataLoadWidget
 
@@ -393 +394 @@
 
         # Call show on requested plots
-        new_plot = Plotter(self)
         for plot_set in plots:
+            new_plot = None
+            if isinstance(plot_set, Data1D):
+                new_plot = Plotter(self)
+            elif isinstance(plot_set, Data2D):
+                new_plot = Plotter2D(self)
+            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)
+            # 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):