Changeset bcf1215 in sasview for src/sas/qtgui/Perspectives/Inversion/InversionPerspective.py

Timestamp:

Nov 7, 2017 1:08:01 PM (7 years ago)

Author:

krzywon

Branches:

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

Children:

a657de3

Parents:

5fba4c4

Message:

Return P(r) window to a single tab. Added a button to remove current data set from data list.

File:

• src/sas/qtgui/Perspectives/Inversion/InversionPerspective.py (modified) (7 diffs)

src/sas/qtgui/Perspectives/Inversion/InversionPerspective.py

@@ -30 +30 @@
 # TODO: Remove data
 # TODO: Modify plot references, don't just send new
-# TODO: Explorer button - link to PR from AW
 # TODO: Update help with batch capabilities
-# TODO: Window should not be fixed size
 # TODO: Easy way to scroll through results - no tabs in window(?) - 'spreadsheet'
 # TODO: Method to export results in some meaningful way
@@ -135 +133 @@
         self.calculateAllButton.clicked.connect(self.startThreadAll)
         self.calculateThisButton.clicked.connect(self.startThread)
+        self.removeButton.clicked.connect(self.removeData)
         self.helpButton.clicked.connect(self.help)
         self.estimateBgd.toggled.connect(self.toggleBgd)
@@ -207 +206 @@
 
         # Main Buttons
+        self.mapper.addMapping(self.removeButton, WIDGETS.W_REMOVE)
         self.mapper.addMapping(self.calculateAllButton, WIDGETS.W_CALCULATE_ALL)
         self.mapper.addMapping(self.calculateThisButton,
@@ -266 +266 @@
         Enable buttons when data is present, else disable them
         """
+        self.removeButton.setEnabled(self.logic.data_is_loaded)
         self.explorerButton.setEnabled(self.logic.data_is_loaded)
         self.calculateAllButton.setEnabled(self.logic.data_is_loaded)
@@ -273 +274 @@
         """
         Append a new file name to the data combobox
-        :param data: Data1D object
+        :param filename: data filename
+        :param data_ref: QStandardItem reference for data set to be added
         """
         qt_item = QtCore.QString.fromUtf8(filename)
@@ -292 +294 @@
         variant_ref = self.dataList.itemData(self.dataList.currentIndex())
         self.setCurrentData(variant_ref.toPyObject())
+
+    def removeData(self):
+        """Remove the existing data reference from the P(r) Persepective"""
+        self._data_list.pop(self._data)
+        self.pr_plot_list.pop(self._data)
+        self.data_plot_list.pop(self._data)
+        self.dataList.removeItem(self.dataList.currentIndex())
+        self.dataList.setCurrentIndex(0)
 
     ######################################################################
@@ -552 +562 @@
                            QtGui.QStandardItem(str(pr.iq0(out))))
         self.model.setItem(WIDGETS.W_BACKGROUND_INPUT,
-                           QtGui.QStandardItem("{:.3f}".format(pr.background)))
+                           QtGui.QStandardItem("{:.3f}".format(pr.est_bck)))
         self.model.setItem(WIDGETS.W_BACKGROUND_OUTPUT,
                            QtGui.QStandardItem(str(pr.background)))