Changeset 416fa8f in sasview

Timestamp:

Dec 7, 2016 6:17:38 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:

cad617b

Parents:

64f1e93

Message:

Initial implementation of the mask editor.
Refactored plotter base to QDialog and reimplemented as local widgets.
Fixed some unit tests.

Location:

src/sas/qtgui

Files:

• DataExplorer.py (modified) (2 diffs)
• MaskEditor.py (added)
• Plotter.py (modified) (2 diffs)
• Plotter2D.py (modified) (2 diffs)
• PlotterBase.py (modified) (3 diffs)
• UI/MaskEditorUI.ui (added)
• UnitTesting/DensityCalculatorTest.py (modified) (1 diff, 1 prop)
• UnitTesting/Plotter2DTest.py (modified) (1 diff)
• UnitTesting/PlotterTest.py (modified) (1 diff)
• UnitTesting/SLDCalculatorTest.py (modified) (1 diff)

src/sas/qtgui/DataExplorer.py

@@ -23 +23 @@
 from sas.qtgui.Plotter2D import Plotter2D
 from sas.qtgui.DroppableDataLoadWidget import DroppableDataLoadWidget
+from sas.qtgui.MaskEditor import MaskEditor
 
 class DataExplorerWindow(DroppableDataLoadWidget):
@@ -801 +802 @@
         """
         """
-        print "showEditDataMask"
-        pass
+        index = self.treeView.selectedIndexes()[0]
+        model_item = self.model.itemFromIndex(self.data_proxy.mapToSource(index))
+        data = GuiUtils.dataFromItem(model_item)
+
+        mask_editor = MaskEditor(self, data)
+
+        mask_editor.exec_()
 
     def loadComplete(self, output):

src/sas/qtgui/Plotter.py

@@ -7 +7 @@
 from sas.qtgui.PlotterBase import PlotterBase
 
-class Plotter(PlotterBase):
-    def __init__(self, parent=None, quickplot=False):
-        super(Plotter, self).__init__(parent, quickplot=quickplot)
+class PlotterWidget(PlotterBase):
+    def __init__(self, parent=None, manager=None, quickplot=False):
+        super(PlotterWidget, self).__init__(parent, manager=manager, quickplot=quickplot)
 
     @property
@@ -199 +199 @@
         # Plot the updated chart
         self.plot(marker='o', linestyle='')
+
+
+class Plotter(QtGui.QDialog, PlotterWidget):
+    def __init__(self, parent=None, quickplot=False):
+
+        QtGui.QDialog.__init__(self)
+        PlotterWidget.__init__(self, manager=parent, quickplot=quickplot)
+

src/sas/qtgui/Plotter2D.py

@@ -11 +11 @@
 from mpl_toolkits.mplot3d import Axes3D
 
-class Plotter2D(PlotterBase):
-    def __init__(self, parent=None, quickplot=False, dimension=2):
+class Plotter2DWidget(PlotterBase):
+    def __init__(self, parent=None, manager=None, quickplot=False, dimension=2):
         self.dimension = dimension
-        super(Plotter2D, self).__init__(parent, quickplot=quickplot)
+        super(Plotter2DWidget, self).__init__(parent, manager=manager, quickplot=quickplot)
 
     @property
@@ -189 +189 @@
         else:
             self.figure.canvas.draw()
+
+class Plotter2D(QtGui.QDialog, Plotter2DWidget):
+    def __init__(self, parent=None, quickplot=False, dimension=2):
+
+        QtGui.QDialog.__init__(self)
+        Plotter2DWidget.__init__(self, manager=parent, quickplot=quickplot, dimension=2)

src/sas/qtgui/PlotterBase.py

@@ -17 +17 @@
 import sas.qtgui.PlotHelper as PlotHelper
 
-class PlotterBase(QtGui.QDialog):
-    def __init__(self, parent=None, quickplot=False):
+class PlotterBase(QtGui.QWidget):
+    def __init__(self, parent=None, manager=None, quickplot=False):
         super(PlotterBase, self).__init__(parent)
 
         # Required for the communicator
-        self.parent = parent
+        self.manager = manager
         self.quickplot = quickplot
 
@@ -71 +71 @@
             self.contextMenu()
             # Notify the listeners
-            self.parent.communicator.activeGraphsSignal.emit(PlotHelper.currentPlots())
+            self.manager.communicator.activeGraphsSignal.emit(PlotHelper.currentPlots())
         else:
             self.contextMenuQuickPlot()
@@ -181 +181 @@
         PlotHelper.deletePlot(PlotHelper.idOfPlot(self))
         # Notify the listeners
-        self.parent.communicator.activeGraphsSignal.emit(PlotHelper.currentPlots())
+        self.manager.communicator.activeGraphsSignal.emit(PlotHelper.currentPlots())
         event.accept()
 

src/sas/qtgui/UnitTesting/DensityCalculatorTest.py

@@ -9 +9 @@
 
 ####### TEMP
-import LocalSetup
+import path_prepare
 #######
 

src/sas/qtgui/UnitTesting/Plotter2DTest.py

@@ -9 +9 @@
 
 ####### TEMP
-import LocalSetup
+import path_prepare
 #######
 from sas.sasgui.guiframe.dataFitting import Data1D

src/sas/qtgui/UnitTesting/PlotterTest.py

@@ -8 +8 @@
 
 ####### TEMP
-import LocalSetup
+import path_prepare
 #######
 from sas.sasgui.guiframe.dataFitting import Data1D

src/sas/qtgui/UnitTesting/SLDCalculatorTest.py

@@ -9 +9 @@
 
 ####### TEMP
-import LocalSetup
+import path_prepare
 #######