Changeset ba4e3ba in sasview for src/sas/qtgui/Perspectives

Timestamp:

Mar 27, 2018 11:18:04 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:

b685c7b

Parents:

8289ae3

Message:

P(r) fixes.

Location:

src/sas/qtgui/Perspectives/Inversion

Files:

• InversionLogic.py (modified) (1 diff)
• InversionPerspective.py (modified) (7 diffs)

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

@@ -37 +37 @@
         """ data setter """
         self._data = value
-        self.data_is_loaded = True
+        self.data_is_loaded = (self._data is not None)
 
     def isLoadedData(self):

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

@@ -15 +15 @@
 
 # pr inversion calculation elements
-from sas.sascalc.dataloader.data_info import Data1D
 from sas.sascalc.pr.invertor import Invertor
 
@@ -29 +28 @@
 BACKGROUND_INPUT = 0.0
 MAX_DIST = 140.0
-DICT_KEYS = ["Calculator", "PrPlot", "DataPlot", "DMaxWindow",
-             "Logic", "NFuncEst"]
-
-
-# TODO: Remove not working
+DICT_KEYS = ["Calculator", "PrPlot", "DataPlot", "DMaxWindow", "NFuncEst"]
+
+
 # TODO: Explore window not working
 # TODO: Update help with batch capabilities
@@ -309 +306 @@
         self.updateDataList(ref_item)
         self.setCurrentData(ref_item)
-        self.updateGuiValues()
 
     ######################################################################
@@ -416 +412 @@
             DICT_KEYS[2]: self.data_plot,
             DICT_KEYS[3]: self.dmaxWindow,
-            DICT_KEYS[4]: self.logic,
-            DICT_KEYS[5]: self.nTermsSuggested
+            DICT_KEYS[4]: self.nTermsSuggested
         }
 
@@ -444 +439 @@
         self.data_plot = self._data_list[data_ref].get(DICT_KEYS[2])
         self.dmaxWindow = self._data_list[data_ref].get(DICT_KEYS[3])
-        self.logic = self._data_list[data_ref].get(DICT_KEYS[4])
-        self.nTermsSuggested = self._data_list[data_ref].get(DICT_KEYS[5])
+        self.nTermsSuggested = self._data_list[data_ref].get(DICT_KEYS[4])
+        self.logic.set_data = self._data_set
         self.updateGuiValues()
 
@@ -506 +501 @@
             self._data_set = None
             self._calculator = Invertor()
-            self.logic = InversionLogic()
+            self.logic.data = None
             self.enableButtons()
-        self.dataList.setCurrentIndex(0)
-        self.updateGuiValues()
+        else:
+            self.dataList.setCurrentIndex(0)
+            self.updateGuiValues()
 
     ######################################################################
@@ -600 +596 @@
         """
         alpha, message, elapsed = output_tuple
-        self.updateGuiValues()
         if message:
             logging.info(message)