Changeset 33b3e4d in sasview

Timestamp:

Sep 12, 2018 6:03:00 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:

f37cab0

Parents:

2d47985

Message:

Replace THEORIES in data tab with FIT RESULTS. SASVIEW-1055

Location:

src/sas/qtgui/MainWindow

Files:

• DataExplorer.py (modified) (5 diffs)
• UI/DataExplorerUI.ui (modified) (1 diff)
• UI/MainWindowUI.ui (modified) (2 diffs)

src/sas/qtgui/MainWindow/DataExplorer.py

@@ -949 +949 @@
         self.context_menu.addAction(self.actionQuick3DPlot)
         self.context_menu.addAction(self.actionEditMask)
+        #self.context_menu.addSeparator()
+        #self.context_menu.addAction(self.actionFreezeResults)
         self.context_menu.addSeparator()
         self.context_menu.addAction(self.actionDelete)
@@ -960 +962 @@
         self.actionEditMask.triggered.connect(self.showEditDataMask)
         self.actionDelete.triggered.connect(self.deleteItem)
+        self.actionFreezeResults.triggered.connect(self.freezeSelectedItems)
 
     def onCustomContextMenu(self, position):
@@ -980 +983 @@
         self.actionQuick3DPlot.setEnabled(is_2D)
         self.actionEditMask.setEnabled(is_2D)
+
+        # Freezing
+        # check that the selection has inner items
+        freeze_enabled = False
+        if model_item.parent() is not None:
+            freeze_enabled = True
+        self.actionFreezeResults.setEnabled(freeze_enabled)
+
         # Fire up the menu
         self.context_menu.exec_(self.current_view.mapToGlobal(position))
@@ -1115 +1126 @@
         mask_editor.exec_()
 
+    def freezeItem(self, item=None):
+        """
+        Freeze given item
+        """
+        if item is None:
+            return
+        self.model.beginResetModel()
+        new_item = self.cloneTheory(item)
+        self.model.appendRow(new_item)
+        self.model.endResetModel()
+
+    def freezeSelectedItems(self):
+        """
+        Freeze selected items
+        """
+        indices = self.treeView.selectedIndexes()
+
+        proxy = self.treeView.model()
+        model = proxy.sourceModel()
+
+        for index in indices:
+            row_index = proxy.mapToSource(index)
+            item_to_copy = model.itemFromIndex(row_index)
+            if item_to_copy and item_to_copy.isCheckable():
+                self.freezeItem(item_to_copy)
+
     def deleteItem(self):
         """
@@ -1275 +1312 @@
 
         # Caption for the theories
-        checkbox_item.setChild(2, QtGui.QStandardItem("THEORIES"))
+        checkbox_item.setChild(2, QtGui.QStandardItem("FIT RESULTS"))
 
         # New row in the model

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

@@ -508 +508 @@
    </property>
   </action>
+  <action name="actionFreezeResults">
+   <property name="text">
+    <string>Freeze Results</string>
+   </property>
+  </action>
  </widget>
  <resources/>

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

@@ -415 +415 @@
    </property>
   </action>
-    <action name="actionEditMask">
+  <action name="actionEditMask">
    <property name="text">
     <string>Edit Mask</string>
@@ -549 +549 @@
   <action name="actionFreeze_Theory">
    <property name="text">
-    <string>Freeze Theory</string>
+    <string>Freeze Fit Results</string>
    </property>
   </action>