Changeset 9a05a8d5 in sasview

Timestamp:

Feb 9, 2017 8:19:16 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:

cf89cce

Parents:

57b7ee2

Message:

Minor code cleanup of Slicer Parameters Editor

Location:

src/sas/qtgui

Files:

• Plotter2D.py (modified) (1 diff)
• SlicerParameters.py (modified) (6 diffs)

src/sas/qtgui/Plotter2D.py

@@ -226 +226 @@
         self.param_model = self.slicer.model()
         # Pass the model to the Slicer Parameters widget
-        self.slicer_widget = SlicerParameters(self, model=self.param_model)
+        self.slicer_widget = SlicerParameters(model=self.param_model)
         self.slicer_widget.close_signal.connect(slicer_closed)
+        # Add the plot to the workspace
+        self.manager.parent.workspace().addWindow(self.slicer_widget)
 
         self.slicer_widget.show()

src/sas/qtgui/SlicerParameters.py

@@ -16 +16 @@
     """
     close_signal = QtCore.pyqtSignal()
-    def __init__(self, parent=None, model=None):
+    def __init__(self, model=None):
         super(SlicerParameters, self).__init__()
 
@@ -41 +41 @@
 
         # Close doesn't trigger closeEvent automatically, so force it
-        self.buttonBox.button(QtGui.QDialogButtonBox.Close).clicked.connect(functools.partial(self.closeEvent,None))
+        self.buttonBox.button(QtGui.QDialogButtonBox.Close).clicked.connect(functools.partial(self.closeEvent, None))
 
         # Disable row number display
@@ -74 +74 @@
         location = "docs/sphinx-docs/build/html" + \
             "/user/sasgui/guiframe/graph_help.html#d-data-averaging"
-        self._helpView = QtWebKit.QWebView()
-        self._helpView.load(QtCore.QUrl(location))
-        self._helpView.show()
+        self.helpView = QtWebKit.QWebView()
+        self.helpView.load(QtCore.QUrl(location))
+        self.helpView.show()
 
 
@@ -88 +88 @@
 
     def columnReadOnly(self, column):
+        '''Returns True if column is read only, false otherwise'''
         return column in self._columns
 
     def setColumnReadOnly(self, column, readonly=True):
+        '''Add/removes a column from the readonly list'''
         if readonly:
             self._columns.add(column)
@@ -97 +99 @@
 
     def flags(self, index):
+        '''Sets column flags'''
         flags = super(ProxyModel, self).flags(index)
         if self.columnReadOnly(index.column()):
@@ -108 +111 @@
     """
     def createEditor(self, widget, option, index):
+        '''Overwrite default editor'''
         if not index.isValid():
             return 0