Changeset 085e3c9d in sasview

Timestamp:

Jul 10, 2018 6:21:02 AM (6 years ago)

Author:

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

Branches:

ESS_GUI_iss959

Parents:

6052c02

Message:

improve S(Q) tab tree functionality

Location:

src/sas/qtgui/Perspectives/Fitting

Files:

• FittingWidget.py (modified) (6 diffs)
• ViewDelegate.py (modified) (1 diff)

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

@@ -333 +333 @@
             QTreeView::item:hover {
                 background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #e7effd, stop: 1 #cbdaf1);
-                border: 1px solid #bfcde4;
+                /* border: 1px solid #bfcde4; */
             }
 
@@ -371 +371 @@
         # Structure factor options model (TEMPORARY EXAMPLE)
 
-        header_list = ["Property", "Value"]
+        header_list = ["Property", "Option", "Custom value"]
         num_cols = len(header_list)
         self._structure_model.setHorizontalHeaderLabels(header_list)
@@ -381 +381 @@
         ]
 
-        # these are just an example
         param_vals = [
-            "P(Q)S(Q)",
+            "P(Q)*S(Q)",
             "ER_mean_curvature",
-            "VR_something_or_other"
+            "VR_something"
         ]
 
@@ -402 +401 @@
                 item2.setText(val)
 
-                item_toplevel.appendRow([item1, item2])
+                item3 = QtGui.QStandardItem()
+                item3.setEditable(False)
+
+                item_toplevel.appendRow([item1, item2, item3])
 
             row_toplevel = [item_toplevel]
@@ -412 +414 @@
             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)
+        self._structure_model.itemChanged.connect(
+           self.onStructureViewItemChanged
+        )
+
+        view = self.lstStructureOptions
+
+        view.setModel(self._structure_model)
+        view.setItemDelegate(StructureViewDelegate(self))
+
+        view.setAlternatingRowColors(True)
+        view.setSizePolicy(
+            QtWidgets.QSizePolicy.MinimumExpanding,
+            QtWidgets.QSizePolicy.Expanding
+        )
+        view.setSelectionBehavior(QtWidgets.QAbstractItemView.SelectRows)
+
+        # resize all columns
+        for col in range(view.header().count()):
+            view.resizeColumnToContents(col)
+
+        view.setStyleSheet(stylesheet)
+
+        header = view.header()
+        #header.setSectionResizeMode(QtWidgets.QHeaderView.Interactive)
+        header.setSectionResizeMode(QtWidgets.QHeaderView.ResizeToContents)
+        font = header.font()
+        font.setBold(True)
+        header.setFont(font)
+
+        view.expandAll()
 
     def initializeCategoryCombo(self):
@@ -1060 +1088 @@
                 if func is not None:
                     self.communicate.statusBarUpdateSignal.emit("Active constrain: "+func)
+
+    def onStructureViewItemChanged(self, item):
+        """
+        Make changes as necessary when an item is modified in the structure
+        factor options view.
+        """
+        if -1 in [item.row(), item.column()]:
+            # not a child item (ignore)
+            return
+
+        # TODO: replace magic numbers, strings with stored params
+        if item.column() == 1:
+            custom_val_item = item.parent().child(item.row(), 2)
+            if item.text() == "custom":
+                custom_val_item.setEditable(True)
+                custom_val_item.setText("type here")
+            else:
+                custom_val_item.setEditable(False)
+                custom_val_item.setText("")
 
     def replaceConstraintName(self, old_name, new_name=""):

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

@@ -308 +308 @@
     def createEditor(self, parent, option, index):
         """
-        Override generic createEditor -- certain elements have
-        combo boxes
-        """
+        Override generic createEditor -- certain elements have combo boxes
+        """
+        print("gotta create me an editor")
 
         model = self.fittingWidget.structureView.model()
 
-        if not index.parent():
+        if 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)
+            print("the item has a parent")
+
+            if index.column() == 1:
+                print("the item's col. is 1")
+                # col. 1 contains elements that may be combo boxes
+
+                # 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)
+
+                if param_item.text() == "mixture":
+                    print("gonna do a mixture combo box")
+                    # TODO: ONLY TEMPORARY EXAMPLE STUFF HERE RIGHT NOW
+                    cbox = QtWidgets.QComboBox(parent)
+                    cbox.addItems([
+                        "P(Q)*S(Q)",
+                        "P(Q)+S(Q)",
+                        "custom"
+                    ])
+                    return cbox
+
+                elif param_item.text() == "effective radius":
+                    print("gonna do an effective radius combo box")
+                    # TODO: ONLY TEMPORARY EXAMPLE STUFF HERE RIGHT NOW
+                    cbox = QtWidgets.QComboBox(parent)
+                    cbox.addItems([
+                        "ER_mean_curvature",
+                        "ER_equivalent_sphere",
+                        "ER_maximum_radius",
+                        "ER_minimum_radius"
+                    ])
+                    return cbox
+
+                elif param_item.text() == "volume fraction":
+                    print("gonna do a volume fraction combo box")
+                    # TODO: ONLY TEMPORARY EXAMPLE STUFF HERE RIGHT NOW
+                    cbox = QtWidgets.QComboBox(parent)
+                    cbox.addItems([
+                        "VR_something",
+                        "VR_something_else",
+                        "VR_something_completely_different"
+                    ])
+                    return cbox
 
         # return default otherwise
+        print("let's do a normal thing instead")
         return super(StructureViewDelegate, self).createEditor(
             parent, option, index