Changeset 56b22f9 in sasview

Timestamp:

May 3, 2017 6:42:29 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:

31e4bb8

Parents:

02ddfb4

Message:

Code cleanup and minor refactoring

Location:

src/sas/qtgui

Files:

• MainWindow/DataExplorer.py (modified) (2 diffs)
• Utilities/GuiUtils.py (modified) (1 diff)

src/sas/qtgui/MainWindow/DataExplorer.py

@@ -439 +439 @@
         # Assure no multiple plots for the same ID
         plot_to_show = data_list[0]
-        for plot in PlotHelper.currentPlots():
-            if plot == plot_to_show.id:
-                return
-
-        new_plot = Plotter(self)
+        if plot_to_show.id in PlotHelper.currentPlots():
+            return
+
         # Now query the model item for available plots
         filename = plot_to_show.filename
         model = self.model if plot_to_show.is_data else self.theory_model
         plots = GuiUtils.plotsFromFilename(filename, model)
-        for plot in plots:
-            new_plot.plot(plot)
-        self.plotAdd(new_plot)
+        plots = [(None, plot) for plot in plots]
+        self.plotData(plots)
+
+    def addDataPlot2D(self, plot_set, item):
+        plot2D = Plotter2D(self)
+        plot2D.item = item
+        plot2D.plot(plot_set)
+        self.addPlot(plot2D)
+        #============================================
+        ## Attach silx
+        #from silx.gui import qt
+        #from silx.gui.plot import StackView
+        #sv = StackView()
+        #sv.setColormap("jet", autoscale=True)
+        #sv.setStack(plot_set.data.reshape(1,100,100))
+        ##sv.setLabels(["x: -10 to 10 (200 samples)",
+        ##              "y: -10 to 5 (150 samples)"])
+        #sv.show()
+        #============================================
+
+    def plotData(self, plots):
+        """
+        Takes 1D/2D data and generates a single plot (1D) or multiple plots (2D)
+        """
+        # Call show on requested plots
+        # All same-type charts in one plot
+        new_plot = Plotter(self)
+
+        for item, plot_set in plots:
+            if isinstance(plot_set, Data1D):
+                new_plot.plot(plot_set)
+            elif isinstance(plot_set, Data2D):
+                self.addDataPlot2D(plot_set, item)
+            else:
+                msg = "Incorrect data type passed to Plotting"
+                raise AttributeError, msg
+
+        if plots and \
+            hasattr(new_plot, 'data') and \
+            isinstance(new_plot.data, Data1D):
+                self.addPlot(new_plot)
 
     def newPlot(self):
         """
-        Create a new matplotlib chart from selected data
+        Select checked data and plot it
         """
         # Check which tab is currently active
@@ -462 +498 @@
             plots = GuiUtils.plotsFromCheckedItems(self.theory_model)
 
-        # Call show on requested plots
-        # All same-type charts in one plot
-        new_plot = Plotter(self)
-
-        def addDataPlot2D(plot_set, item):
-            plot2D = Plotter2D(self)
-            plot2D.item = item
-            plot2D.plot(plot_set)
-            self.plotAdd(plot2D)
-            #============================================
-            ## Attach silx
-            #from silx.gui import qt
-            #from silx.gui.plot import StackView
-            #sv = StackView()
-            #sv.setColormap("jet", autoscale=True)
-            #sv.setStack(plot_set.data.reshape(1,100,100))
-            ##sv.setLabels(["x: -10 to 10 (200 samples)",
-            ##              "y: -10 to 5 (150 samples)"])
-            #sv.show()
-            #============================================
-
-        for item, plot_set in plots:
-            if isinstance(plot_set, Data1D):
-                new_plot.plot(plot_set)
-            elif isinstance(plot_set, Data2D):
-                addDataPlot2D(plot_set, item)
-            else:
-                msg = "Incorrect data type passed to Plotting"
-                raise AttributeError, msg
-
-        if plots and \
-            hasattr(new_plot, 'data') and \
-            isinstance(new_plot.data, Data1D):
-                self.plotAdd(new_plot)
-
-    def plotAdd(self, new_plot):
+        self.plotData(plots)
+
+    def addPlot(self, new_plot):
         """
         Helper method for plot bookkeeping

src/sas/qtgui/Utilities/GuiUtils.py

@@ -337 +337 @@
             # TODO: assure item type is correct (either data1/2D or Plotter)
             plot_data.append(item.child(0).data().toPyObject())
-        # Going 1 level deeper only
-        for index_2 in range(item.rowCount()):
-            item_2 = item.child(index_2)
-            if item_2 and item_2.isCheckable():
-                # TODO: assure item type is correct (either data1/2D or Plotter)
-                plot_data.append(item_2.child(0).data().toPyObject())
+            # Going 1 level deeper only
+            for index_2 in range(item.rowCount()):
+                item_2 = item.child(index_2)
+                if item_2 and item_2.isCheckable():
+                    # TODO: assure item type is correct (either data1/2D or Plotter)
+                    plot_data.append(item_2.child(0).data().toPyObject())
 
     return plot_data