Changeset 6b50296 in sasview

Timestamp:

Sep 4, 2018 6:18:49 AM (6 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

Branches:

ESS_GUI, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

e3df84e

Parents:

f53bc04

Message:

Added freeze action for inner main model datasets. SASVIEW-1002

Location:

src/sas/qtgui

Files:

• MainWindow/DataExplorer.py (modified) (1 diff)
• MainWindow/GuiManager.py (modified) (2 diffs)
• MainWindow/UI/MainWindowUI.ui (modified) (2 diffs)
• Perspectives/Fitting/FittingUtilities.py (modified) (1 diff)
• Perspectives/Fitting/FittingWidget.py (modified) (1 diff)

src/sas/qtgui/MainWindow/DataExplorer.py

@@ -394 +394 @@
         # Notify the GuiManager about the send request
         self._perspective().setData(data_item=selected_items, is_batch=self.chkBatch.isChecked())
+
+    def freezeCheckedData(self):
+        """
+        Convert checked results (fitted model, residuals) into separate dataset.
+        """
+        outer_index = -1
+        theories_copied = 0
+        orig_model_size = self.model.rowCount()
+        while outer_index < orig_model_size:
+            outer_index += 1
+            outer_item = self.model.item(outer_index)
+            if not outer_item:
+                continue
+            if not outer_item.isCheckable():
+                continue
+            # Look for checked inner items
+            inner_index = -1
+            while inner_index < outer_item.rowCount():
+               inner_item = outer_item.child(inner_index)
+               inner_index += 1
+               if not inner_item:
+                   continue
+               if not inner_item.isCheckable():
+                   continue
+               if inner_item.checkState() != QtCore.Qt.Checked:
+                   continue
+               self.model.beginResetModel()
+               theories_copied += 1
+               new_item = self.cloneTheory(inner_item)
+               self.model.appendRow(new_item)
+               self.model.endResetModel()
+
+        freeze_msg = ""
+        if theories_copied == 0:
+            return
+        elif theories_copied == 1:
+            freeze_msg = "1 theory copied to a separate data set"
+        elif theories_copied > 1:
+            freeze_msg = "%i theories copied to separate data sets" % theories_copied
+        else:
+            freeze_msg = "Unexpected number of theories copied: %i" % theories_copied
+            raise AttributeError(freeze_msg)
+        self.communicator.statusBarUpdateSignal.emit(freeze_msg)
 
     def freezeTheory(self, event):

src/sas/qtgui/MainWindow/GuiManager.py

@@ -438 +438 @@
         self._workspace.actionImage_Viewer.triggered.connect(self.actionImage_Viewer)
         self._workspace.actionOrientation_Viewer.triggered.connect(self.actionOrientation_Viewer)
+        self._workspace.actionFreeze_Theory.triggered.connect(self.actionFreeze_Theory)
         # Fitting
         self._workspace.actionNew_Fit_Page.triggered.connect(self.actionNew_Fit_Page)
@@ -683 +684 @@
         self._workspace.addDockWidget(Qt.RightDockWidgetArea, self.ipDockWidget)
 
+    def actionFreeze_Theory(self):
+        """
+        Convert a child index with data into a separate top level dataset
+        """
+        self.filesWidget.freezeCheckedData()
+
     def actionOrientation_Viewer(self):
         """

src/sas/qtgui/MainWindow/UI/MainWindowUI.ui

@@ -64 +64 @@
     <addaction name="actionReport"/>
     <addaction name="actionReset"/>
+    <addaction name="separator"/>
+    <addaction name="actionFreeze_Theory"/>
    </widget>
    <widget class="QMenu" name="menuView">
@@ -535 +537 @@
    </property>
   </action>
+  <action name="actionFreeze_Theory">
+   <property name="text">
+    <string>Freeze Theory</string>
+   </property>
+  </action>
  </widget>
  <resources/>

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

@@ -430 +430 @@
 
     theory_name = str(current_data.name.split()[0])
-    residuals.name = "Residuals for " + str(theory_name) + "[" + \
-                    str(reference_data.filename) + "]"
+    res_name = reference_data.filename if reference_data.filename else reference_data.name
+    residuals.name = "Residuals for " + str(theory_name) + "[" + res_name + "]"
     residuals.title = residuals.name
     residuals.ytransform = 'y'

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

@@ -392 +392 @@
         # Tag along functionality
         self.label.setText("Data loaded from: ")
-        self.lblFilename.setText(self.logic.data.filename)
+        if self.logic.data.filename:
+            self.lblFilename.setText(self.logic.data.filename)
+        else:
+            self.lblFilename.setText(self.logic.data.name)
         self.updateQRange()
         # Switch off Data2D control