Changeset cad617b in sasview

Timestamp:

Dec 8, 2016 3:46:27 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:

b4b8589, d1fb22ee

Parents:

416fa8f

Message:

Code review issues, fixing matplotlib behaviour in unit testing, minor fixes.

Location:

src/sas

Files:

• qtgui/DataExplorer.py (modified) (2 diffs)
• qtgui/Plotter2D.py (modified) (2 diffs)
• qtgui/UI/MaskEditorUI.ui (modified) (9 diffs)
• qtgui/UnitTesting/DataExplorerTest.py (modified) (3 diffs)
• sasgui/plottools/PlotPanel.py (modified) (1 diff)
• sasgui/plottools/config.py (modified) (1 diff)
• sasgui/plottools/plottables.py (modified) (2 diffs)

src/sas/qtgui/DataExplorer.py

@@ -801 +801 @@
     def showEditDataMask(self):
         """
+        Mask Editor for 2D plots
         """
         index = self.treeView.selectedIndexes()[0]
@@ -807 +808 @@
 
         mask_editor = MaskEditor(self, data)
-
+        # Modal dialog here.
         mask_editor.exec_()
 

src/sas/qtgui/Plotter2D.py

@@ -47 +47 @@
             self.scale = 'linear'
             if not self.zmin is None:
-                zmin_2D_temp = numpy.pow(10, self.zmin)
+                zmin_2D_temp = numpy.power(10, self.zmin)
             if not self.zmax is None:
-                zmax_2D_temp = numpy.pow(10, self.zmax)
+                zmax_2D_temp = numpy.power(10, self.zmax)
         else:
             self.scale = 'log_{10}'
@@ -194 +194 @@
 
         QtGui.QDialog.__init__(self)
-        Plotter2DWidget.__init__(self, manager=parent, quickplot=quickplot, dimension=2)
+        Plotter2DWidget.__init__(self, manager=parent, quickplot=quickplot, dimension=dimension)

src/sas/qtgui/UI/MaskEditorUI.ui

@@ -26 +26 @@
      <layout class="QVBoxLayout" name="verticalLayout">
       <item>
-       <widget class="QRadioButton" name="radioButton">
+       <widget class="QRadioButton" name="rbWings">
         <property name="text">
          <string>Double Wings</string>
@@ -33 +33 @@
       </item>
       <item>
-       <widget class="QRadioButton" name="radioButton_3">
+       <widget class="QRadioButton" name="rbCircularDisk">
         <property name="text">
          <string>Circular Disk</string>
@@ -40 +40 @@
       </item>
       <item>
-       <widget class="QRadioButton" name="radioButton_2">
+       <widget class="QRadioButton" name="rbRectangularDisk">
         <property name="text">
          <string>Rectangular Disk</string>
@@ -47 +47 @@
       </item>
       <item>
-       <widget class="QRadioButton" name="radioButton_4">
+       <widget class="QRadioButton" name="rbDoubleWingWindow">
         <property name="text">
          <string>Double Wing Window</string>
@@ -54 +54 @@
       </item>
       <item>
-       <widget class="QRadioButton" name="radioButton_5">
+       <widget class="QRadioButton" name="rbCircularWindow">
         <property name="text">
          <string>Circular Window</string>
@@ -61 +61 @@
       </item>
       <item>
-       <widget class="QRadioButton" name="radioButton_6">
+       <widget class="QRadioButton" name="rbRectangularWindow">
         <property name="text">
          <string>Rectangular Window</string>
@@ -97 +97 @@
    </item>
    <item row="2" column="0">
-    <widget class="QPushButton" name="pushButton">
+    <widget class="QPushButton" name="btnAdd">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
@@ -110 +110 @@
    </item>
    <item row="3" column="0">
-    <widget class="QPushButton" name="pushButton_2">
+    <widget class="QPushButton" name="btnReset">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
@@ -123 +123 @@
    </item>
    <item row="4" column="0">
-    <widget class="QPushButton" name="pushButton_3">
+    <widget class="QPushButton" name="btnClear">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Fixed" vsizetype="Fixed">

src/sas/qtgui/UnitTesting/DataExplorerTest.py

@@ -7 +7 @@
 from mock import MagicMock
 from mock import patch
+from mpl_toolkits.mplot3d import Axes3D
 
 # set up import paths
@@ -21 +22 @@
 from UnitTesting.TestUtils import QtSignalSpy
 from sas.qtgui.Plotter import Plotter
+from sas.qtgui.Plotter2D import Plotter2D
 import sas.qtgui.PlotHelper as PlotHelper
 
@@ -758 +760 @@
         """
         Quick data plot generation.
+        """
+        # get Data1D
+        p_file=["cyl_400_20.txt"]
+        # Read in the file
+        output, message = self.form.readData(p_file)
+        self.form.loadComplete((output, message))
+
+        # select the data
+        self.form.treeView.selectAll()
+
+        Plotter.show = MagicMock() # for masking the display
+
+        self.form.quickDataPlot()
+        self.assertTrue(Plotter.show.called)
+
+    def testQuickData3DPlot(self):
+        """
+        Slow(er) 3D data plot generation.
+        """
+        # get Data1D
+        p_file=["Dec07031.ASC"]
+        # Read in the file
+        output, message = self.form.readData(p_file)
+        self.form.loadComplete((output, message))
+
+        # select the data
+        self.form.treeView.selectAll()
+
+        Plotter2D.show = MagicMock() # for masking the display
+
+        self.form.quickData3DPlot()
+
+        self.assertTrue(Plotter2D.show.called)
+
+    def testShowEditMask(self):
+        """
+        Edit mask on a 2D plot.
 
         TODO: add content once plotting finalized
         """
         pass
+
 
 if __name__ == "__main__":

src/sas/sasgui/plottools/PlotPanel.py

@@ -10 +10 @@
 matplotlib.interactive(False)
 #Use the WxAgg back end. The Wx one takes too long to render
-matplotlib.use('WXAgg')
+#matplotlib.use('WXAgg')
 from matplotlib.backends.backend_wxagg import FigureCanvasWxAgg
 from matplotlib.figure import Figure

src/sas/sasgui/plottools/config.py

@@ -31 +31 @@
 
 plot_version = "0.98"
-plot_backend = "WXAgg"
+#plot_backend = "WXAgg"
+plot_backend = "Qt4Agg"
 
 # Sort out matplotlib version

src/sas/sasgui/plottools/plottables.py

@@ -676 +676 @@
         # Sanity check
         # Do the transofrmation only when x and y are empty
-        has_err_x = not (dx == None or len(dx) == 0)
-        has_err_y = not (dy == None or len(dy) == 0)
-
-        if(x != None) and (y != None):
-            if not dx == None and not len(dx) == 0 and not len(x) == len(dx):
+        has_err_x = not (dx is None or len(dx) == 0)
+        has_err_y = not (dy is None or len(dy) == 0)
+
+        if(x is not None) and (y is not None):
+            if not dx is None and not len(dx) == 0 and not len(x) == len(dx):
                 msg = "Plottable.View: Given x and dx are not"
                 msg += " of the same length"
@@ -690 +690 @@
                 raise ValueError, msg
 
-            if not dy == None and not len(dy) == 0 and not len(y) == len(dy):
+            if not dy is None and not len(dy) == 0 and not len(y) == len(dy):
                 msg = "Plottable.View: Given y and dy are not of the same "
                 msg += "length: len(y)=%s, len(dy)=%s" % (len(y), len(dy))