Changeset 8aa3c4d in sasview

Timestamp:

Nov 29, 2018 7:45:44 AM (6 years ago)

Author:

Piotr Rozyczko <piotr.rozyczko@…>

Branches:

ESS_GUI_ordering

Children:

cdf8f00

Parents:

376a939

Message:

Initial commit of the dataset ordering functionality TRAC#933

Location:

src/sas/qtgui/Perspectives/Fitting

Files:

• FittingWidget.py (modified) (6 diffs)
• OrderWidget.py (added)
• UI/FittingWidgetUI.ui (modified) (2 diffs)
• UI/OrderWidgetUI.ui (added)

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

@@ -49 +49 @@
 from sas.qtgui.Perspectives.Fitting.MultiConstraint import MultiConstraint
 from sas.qtgui.Perspectives.Fitting.ReportPageLogic import ReportPageLogic
+from sas.qtgui.Perspectives.Fitting.OrderWidget import OrderWidget
 
 TAB_MAGNETISM = 4
 TAB_POLY = 3
+TAB_ORDERING = 5
 CATEGORY_DEFAULT = "Choose category..."
 MODEL_DEFAULT = "Choose model..."
@@ -210 +212 @@
                 logic = FittingLogic(data=GuiUtils.dataFromItem(data_item))
                 self._logic.append(logic)
+            # update the ordering tab
+            self.order_widget.updateData(self.all_data)
 
         # Overwrite data type descriptor
@@ -324 +328 @@
         self.tabResolution.setLayout(layout)
 
+        # Order widget
+        layout = QtWidgets.QGridLayout()
+        # pass all data items to access multiple datasets
+        self.order_widget = OrderWidget(self, self.all_data)
+        layout.addWidget(self.order_widget)
+        self.tabOrder.setLayout(layout)
+
         # Define bold font for use in various controls
         self.boldFont = QtGui.QFont()
@@ -412 +423 @@
         # Delegates for custom editing and display
         self.lstMagnetic.setItemDelegate(MagnetismViewDelegate(self))
+        # Initial status of the ordering tab - invisible
+        self.tabFitting.removeTab(TAB_ORDERING)
 
     def initializeCategoryCombo(self):
@@ -500 +513 @@
         """ Enable/disable chain fitting """
         self.is_chain_fitting = isChecked
+        # show/hide the ordering tab
+        if isChecked:
+            self.tabFitting.insertTab(TAB_ORDERING, self.tabOrder, "Order")
+        else:
+            self.tabFitting.removeTab(TAB_ORDERING)
 
     def toggle2D(self, isChecked):
@@ -1756 +1774 @@
 
         fitters = []
-        for fit_index in self.all_data:
+        # order datasets if chain fit
+        order = self.all_data
+        if self.is_chain_fitting:
+            order = self.order_widget.ordering()
+        for fit_index in order:
             fitter_single = Fit() if fitter is None else fitter
             data = GuiUtils.dataFromItem(fit_index)

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

@@ -7 +7 @@
     <x>0</x>
     <y>0</y>
-    <width>651</width>
-    <height>540</height>
+    <width>540</width>
+    <height>600</height>
    </rect>
   </property>
@@ -428 +428 @@
       </layout>
      </widget>
+     <widget class="QWidget" name="tabOrder">
+      <attribute name="title">
+       <string>Order</string>
+      </attribute>
+     </widget>
     </widget>
    </item>