Changeset 6052c02 in sasview

Timestamp:

Jul 9, 2018 10:13:03 AM (6 years ago)

Author:

Torin Cooper-Bennun <torin.cooper-bennun@…>

Branches:

ESS_GUI_iss959

Children:

085e3c9d

Parents:

515c23df

Message:

added S(Q) tab with a preliminary (example) param. tree, incl. attempt to use comboboxes for some properties

Location:

src/sas/qtgui/Perspectives/Fitting

Files:

• FittingWidget.py (modified) (5 diffs)
• UI/FittingWidgetUI.ui (modified) (2 diffs)
• ViewDelegate.py (modified) (3 diffs)

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

@@ -45 +45 @@
 from sas.qtgui.Perspectives.Fitting.ViewDelegate import PolyViewDelegate
 from sas.qtgui.Perspectives.Fitting.ViewDelegate import MagnetismViewDelegate
+from sas.qtgui.Perspectives.Fitting.ViewDelegate import StructureViewDelegate
 from sas.qtgui.Perspectives.Fitting.Constraint import Constraint
 from sas.qtgui.Perspectives.Fitting.MultiConstraint import MultiConstraint
@@ -50 +51 @@
 
 
-
-TAB_MAGNETISM = 4
-TAB_POLY = 3
+TAB_STRUCTURE = 3
+TAB_POLY = 4
+TAB_MAGNETISM = 5
+
 CATEGORY_DEFAULT = "Choose category..."
 CATEGORY_STRUCTURE = "Structure Factor"
@@ -195 +197 @@
         # Enable/disable UI components
         self.setEnablementOnDataLoad()
+
+    @property
+    def structureView(self):
+        return self.lstStructureOptions
 
     def initializeGlobals(self):
@@ -307 +313 @@
         self._poly_model = ToolTippedItemModel()
         self._magnet_model = ToolTippedItemModel()
+        self._structure_model = ToolTippedItemModel()
 
         # Param model displayed in param list
@@ -361 +368 @@
         # Delegates for custom editing and display
         self.lstMagnetic.setItemDelegate(MagnetismViewDelegate(self))
+
+        # Structure factor options model (TEMPORARY EXAMPLE)
+
+        header_list = ["Property", "Value"]
+        num_cols = len(header_list)
+        self._structure_model.setHorizontalHeaderLabels(header_list)
+
+        self.structure_params = [
+            "mixture",
+            "effective radius",
+            "volume fraction"
+        ]
+
+        # these are just an example
+        param_vals = [
+            "P(Q)S(Q)",
+            "ER_mean_curvature",
+            "VR_something_or_other"
+        ]
+
+        num_SoQs = 3
+        for i in range(num_SoQs):
+            item_toplevel = QtGui.QStandardItem()
+            item_toplevel.setEditable(False)
+            item_toplevel.setText("S{}(Q)".format(i+1))
+
+            for param, val in zip(self.structure_params, param_vals):
+                item1 = QtGui.QStandardItem()
+                item1.setEditable(False)
+                item1.setText(param)
+
+                item2 = QtGui.QStandardItem()
+                item2.setText(val)
+
+                item_toplevel.appendRow([item1, item2])
+
+            row_toplevel = [item_toplevel]
+            for i in range(num_cols - 1):
+                item = QtGui.QStandardItem()
+                item.setEditable(False)
+                row_toplevel.append(item)
+
+            self._structure_model.appendRow(row_toplevel)
+
+        self.lstStructureOptions.setModel(self._structure_model)
+        self.lstStructureOptions.setItemDelegate(StructureViewDelegate(self))
+        self.lstStructureOptions.setAlternatingRowColors(True)
+        self.lstStructureOptions.setStyleSheet(stylesheet)
 
     def initializeCategoryCombo(self):

src/sas/qtgui/Perspectives/Fitting/UI/FittingWidgetUI.ui

@@ -7 +7 @@
     <x>0</x>
     <y>0</y>
-    <width>680</width>
+    <width>487</width>
     <height>605</height>
    </rect>
@@ -352 +352 @@
       </attribute>
      </widget>
+     <widget class="QWidget" name="tabStructure">
+      <attribute name="title">
+       <string>S(Q) Options</string>
+      </attribute>
+      <layout class="QGridLayout" name="gridLayout_7">
+       <property name="leftMargin">
+        <number>15</number>
+       </property>
+       <property name="topMargin">
+        <number>15</number>
+       </property>
+       <property name="rightMargin">
+        <number>15</number>
+       </property>
+       <property name="bottomMargin">
+        <number>15</number>
+       </property>
+       <item row="0" column="0">
+        <widget class="QTreeView" name="lstStructureOptions"/>
+       </item>
+      </layout>
+     </widget>
      <widget class="QWidget" name="tab_4">
       <attribute name="title">

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

@@ -4 +4 @@
 
 import sas.qtgui.Utilities.GuiUtils as GuiUtils
+
+import logging
+logger = logging.getLogger(__name__)
 
 class ModelViewDelegate(QtWidgets.QStyledItemDelegate):
@@ -102 +105 @@
                 return
         QtWidgets.QStyledItemDelegate.setModelData(self, editor, model, index)
-
 
 class PolyViewDelegate(QtWidgets.QStyledItemDelegate):
@@ -280 +282 @@
             # Just the default paint
             QtWidgets.QStyledItemDelegate.paint(self, painter, option, index)
+
+class StructureViewDelegate(QtWidgets.QStyledItemDelegate):
+    """
+    Custom delegate for appearance and behaviour control of the structure
+    factor options view
+    """
+    def __init__(self, parent=None):
+        """
+        Override parent constructor
+        """
+
+        super(StructureViewDelegate, self).__init__()
+
+        self.fittingWidget = parent
+
+    def paint(self, painter, option, index):
+        """
+        Override generic painter
+        """
+        # TODO override this with something useful ... ?
+        super(StructureViewDelegate, self).paint(
+            painter, option, index
+        )
+
+    def createEditor(self, parent, option, index):
+        """
+        Override generic createEditor -- certain elements have
+        combo boxes
+        """
+
+        model = self.fittingWidget.structureView.model()
+
+        if not index.parent():
+            # we only care about child items since we don't edit top-level
+            # items in this view anyway
+            return super(QtWidgets.QStyledItemDelegate, self).createEditor(
+                parent, option, index
+            )
+
+        # navigate to the parameter name through the parent item (it'll be
+        # on the same row, but col. 0)
+        parent_item = model.itemFromIndex(index.parent())
+        param_item = parent_item.child(index.row(), 0)
+
+        #item = model.itemFromIndex(index)
+        #print("item (row) [param]: \"{}\" ({}) [{}]".format(
+        #    item.text(), index.row(), param_item.text())
+        #)
+
+        if param_item.text() in ["effective radius", "volume fraction"]:
+            # we want a combo box for these
+            return QtWidgets.QComboBox(parent)
+
+        # return default otherwise
+        return super(StructureViewDelegate, self).createEditor(
+            parent, option, index
+        )