Changeset 2a432e7 in sasview

Timestamp:

May 17, 2017 1:17:36 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:

dc5ef15

Parents:

00b3b40

Message:

Minor refactoring + improvements to fitting views

Location:

src/sas/qtgui

Files:

• MainWindow/GuiManager.py (modified) (2 diffs)
• Perspectives/Fitting/FittingWidget.py (modified) (7 diffs)
• Perspectives/Fitting/ViewDelegate.py (modified) (3 diffs)

src/sas/qtgui/MainWindow/GuiManager.py

@@ -19 +19 @@
 import sas.qtgui.Utilities.LocalConfig as LocalConfig
 import sas.qtgui.Utilities.GuiUtils as GuiUtils
+import sas.qtgui.Utilities.ObjectLibrary as ObjectLibrary
 
 from sas.qtgui.MainWindow.UI.AcknowledgementsUI import Ui_Acknowledgements
@@ -113 +114 @@
         # Add FileDialog widget as docked
         self.filesWidget = DataExplorerWindow(self._parent, self, manager=self._data_manager)
+        ObjectLibrary.addObject('DataExplorer', self.filesWidget)
 
         self.dockedFilesWidget = QtGui.QDockWidget("Data Explorer", self._workspace)

src/sas/qtgui/Perspectives/Fitting/FittingWidget.py

@@ -52 +52 @@
         # Necessary globals
         self.parent = parent
+
+        # Which tab is this widget displayed in?
+        self.tab_id = tab_id
+
+        # Main Data[12]D holder
+        self.logic = FittingLogic(data=data)
+
+        # Globals
+        self.initializeGlobals()
+
+        # Main GUI setup up
+        self.setupUi(self)
+        self.setWindowTitle("Fitting")
+
+        # Set up tabs widgets
+        self.initializeWidgets()
+
+        # Set up models and views
+        self.initializeModels()
+
+        # Defaults for the structure factors
+        self.setDefaultStructureCombo()
+
+        # Make structure factor and model CBs disabled
+        self.disableModelCombo()
+        self.disableStructureCombo()
+
+        # Generate the category list for display
+        self.initializeCategoryCombo()
+
+        # Connect signals to controls
+        self.initializeSignals()
+
+        # Initial control state
+        self.initializeControls()
+
+        # Display HTML content
+        self.helpView = QtWebKit.QWebView()
+
+        self._index = None
+        if data is not None:
+            self.data = data
+
+    def close(self):
+        """
+        Remember to kill off things on exit
+        """
+        self.helpView.close()
+        del self.helpView
+
+    @property
+    def data(self):
+        return self.logic.data
+
+    @data.setter
+    def data(self, value):
+        """ data setter """
+        assert isinstance(value, QtGui.QStandardItem)
+        # _index contains the QIndex with data
+        self._index = value
+
+        # Update logics with data items
+        self.logic.data = GuiUtils.dataFromItem(value)
+
+        # Overwrite data type descriptor
+        self.is2D = True if isinstance(self.logic.data, Data2D) else False
+
+        self.data_is_loaded = True
+
+        # Enable/disable UI components
+        self.setEnablementOnDataLoad()
+
+    def initializeGlobals(self):
+        """
+        Initialize global variables used in this class
+        """
         # SasModel is loaded
         self.model_is_loaded = False
@@ -77 +153 @@
         self.weighting = 0
         self.chi2 = None
-
         # Does the control support UNDO/REDO
         # temporarily off
@@ -86 +161 @@
         self.model_data = None
 
-        # Which tab is this widget displayed in?
-        self.tab_id = tab_id
-
         # Which shell is being currently displayed?
         self.current_shell_displayed = 0
         self.has_error_column = False
 
-        # Main Data[12]D holder
-        self.logic = FittingLogic(data=data)
-
-        # Main GUI setup up
-        self.setupUi(self)
-        self.setWindowTitle("Fitting")
+        # signal communicator
         self.communicate = self.parent.communicate
 
+    def initializeWidgets(self):
+        """
+        Initialize widgets for tabs
+        """
         # Options widget
         layout = QtGui.QGridLayout()
@@ -122 +193 @@
         self.lblFilename.setText("")
 
+    def initializeModels(self):
+        """
+        Set up models and views
+        """
         # Set the main models
         # We can't use a single model here, due to restrictions on flattening
@@ -139 +214 @@
         self.lstParams.setAlternatingRowColors(True)
         stylesheet = """
-            QTreeView{
-                alternate-background-color: #f6fafb;
-                background: #e8f4fc;
+            QTreeView::item:hover {
+                background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #e7effd, stop: 1 #cbdaf1);
+                border: 1px solid #bfcde4;
             }
-        """
+
+            QTreeView::item:selected {
+                border: 1px solid #567dbc;
+            }
+
+            QTreeView::item:selected:active{
+                background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #6ea1f1, stop: 1 #567dbc);
+            }
+
+            QTreeView::item:selected:!active {
+                background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #6b9be8, stop: 1 #577fbf);
+            }
+           """
         self.lstParams.setStyleSheet(stylesheet)
         self.lstParams.setContextMenuPolicy(QtCore.Qt.CustomContextMenu)
@@ -160 +247 @@
         self.setTableProperties(self.lstMagnetic)
 
-        # Defaults for the structure factors
-        self.setDefaultStructureCombo()
-
-        # Make structure factor and model CBs disabled
-        self.disableModelCombo()
-        self.disableStructureCombo()
-
-        # Generate the category list for display
+    def initializeCategoryCombo(self):
+        """
+        Model category combo setup
+        """
         category_list = sorted(self.master_category_dict.keys())
         self.cbCategory.addItem(CATEGORY_DEFAULT)
@@ -173 +256 @@
         self.cbCategory.addItem(CATEGORY_STRUCTURE)
         self.cbCategory.setCurrentIndex(0)
-
-        # Connect signals to controls
-        self.initializeSignals()
-
-        # Initial control state
-        self.initializeControls()
-
-        # Display HTML content
-        self.helpView = QtWebKit.QWebView()
-
-        self._index = None
-        if data is not None:
-            self.data = data
-
-    def close(self):
-        """
-        Remember to kill off things on exit
-        """
-        self.helpView.close()
-        del self.helpView
-
-    @property
-    def data(self):
-        return self.logic.data
-
-    @data.setter
-    def data(self, value):
-        """ data setter """
-        assert isinstance(value, QtGui.QStandardItem)
-        # _index contains the QIndex with data
-        self._index = value
-
-        # Update logics with data items
-        self.logic.data = GuiUtils.dataFromItem(value)
-
-        # Overwrite data type descriptor
-        self.is2D = True if isinstance(self.logic.data, Data2D) else False
-
-        self.data_is_loaded = True
-
-        # Enable/disable UI components
-        self.setEnablementOnDataLoad()
 
     def setEnablementOnDataLoad(self):

src/sas/qtgui/Perspectives/Fitting/ViewDelegate.py

@@ -35 +35 @@
             options = QtGui.QStyleOptionViewItemV4(option)
             self.initStyleOption(options,index)
+
             style = QtGui.QApplication.style() if options.widget is None else options.widget.style()
 
@@ -46 +47 @@
             # delete the original content
             options.text = ""
-            style.drawControl(QtGui.QStyle.CE_ItemViewItem, options, painter);
+            style.drawControl(QtGui.QStyle.CE_ItemViewItem, options, painter, options.widget);
 
             context = QtGui.QAbstractTextDocumentLayout.PaintContext()
@@ -56 +57 @@
             # Draw the QTextDocument in the cell
             doc.documentLayout().draw(painter, context)
-
             painter.restore()
         else: