Changeset bb6b037 in sasview

Timestamp:

Apr 9, 2018 10:57:27 AM (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:

effdd98

Parents:

edd6720

Message:

Handle data removal from the P(r) perspective.

File:

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

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

@@ -65 +65 @@
         self._calculator = Invertor()
         # Default to background estimate
-        self._calculator.set_est_bck(True)
+        self._calculator.est_bck = True
         # plots of self._data
         self.pr_plot = None
@@ -150 +150 @@
 
         self.backgroundInput.editingFinished.connect(
-            lambda: self.set_background(is_float(self.backgroundInput.text())))
+            lambda: self.set_background(self.backgroundInput.text()))
         self.minQInput.editingFinished.connect(
             lambda: self._calculator.set_qmin(is_float(self.minQInput.text())))
@@ -336 +336 @@
             GuiUtils.updateModelItemWithPlot(self._data, self.data_plot, title)
         if self.dmaxWindow is not None:
+            self.dmaxWindow.nfunc = self.getNFunc()
             self.dmaxWindow.pr_state = self._calculator
-            self.dmaxWindow.nfunc = self.getNFunc()
-            self.dmaxWindow.modelChanged()
         self.mapper.toLast()
 
@@ -488 +487 @@
             self.dmaxWindow.close()
             self.dmaxWindow = None
+        current_data = self._data
         self.dataList.removeItem(self.dataList.currentIndex())
-        self._data_list.pop(self._data)
+        self._data_list.pop(current_data)
         # Last file removed
         if len(self._data_list) == 0:
+            self._data = None
             self.pr_plot = None
             self.data_plot = None