Changeset e7651ff in sasview for src/sas

Timestamp:

Oct 28, 2017 6:09:10 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:

57ad773

Parents:

d1a4793

Message:

Renamed from PrInversion? to Inversion. Added base for plotting.

Location:

src/sas/qtgui/Perspectives

Files:

• Inversion/InversionLogic.py (added)
• Inversion/InversionPerspective.py (moved) (moved from src/sas/qtgui/Perspectives/PrInversion/PrInversionPerspective.py) (16 diffs)
• Inversion/InversionUtils.py (moved) (moved from src/sas/qtgui/Perspectives/PrInversion/PrInversionUtils.py)
• Inversion/Thread.py (moved) (moved from src/sas/qtgui/Perspectives/PrInversion/PrThread.py)
• Inversion/UI/TabbedPrInversionUI.ui (moved) (moved from src/sas/qtgui/Perspectives/PrInversion/UI/TabbedPrInversionUI.ui)
• Inversion/UI/__init__.py (moved) (moved from src/sas/qtgui/Perspectives/PrInversion/UI/__init__.py)
• Inversion/UI/convert_all.bat (moved) (moved from src/sas/qtgui/Perspectives/PrInversion/UI/convert_all.bat)
• Inversion/UI/convert_all.sh (moved) (moved from src/sas/qtgui/Perspectives/PrInversion/UI/convert_all.sh)
• Inversion/UI/convert_ui.sh (moved) (moved from src/sas/qtgui/Perspectives/PrInversion/UI/convert_ui.sh)
• Inversion/__init__.py (moved) (moved from src/sas/qtgui/Perspectives/PrInversion/__init__.py)
• __init__.py (modified) (1 diff)

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

@@ -5 +5 @@
 
 from PyQt4 import QtGui, QtCore, QtWebKit
+from twisted.internet import reactor
 
 # sas-global
 import sas.qtgui.Utilities.GuiUtils as GuiUtils
 
-# pr inversion gui elements
-from PrInversionUtils import WIDGETS
+# pr inversion GUI elements
+from InversionUtils import WIDGETS
 import UI.TabbedPrInversionUI
 from UI.TabbedPrInversionUI import Ui_PrInversion
+from InversionLogic import InversionLogic
 
 # pr inversion calculation elements
@@ -24 +26 @@
         return 0.0
 
-class PrInversionWindow(QtGui.QTabWidget, Ui_PrInversion):
+class InversionWindow(QtGui.QTabWidget, Ui_PrInversion):
     """
     The main window for the P(r) Inversion perspective.
     """
 
-    name = "PrInversion"
+    name = "Inversion"
 
     def __init__(self, parent=None, data=None):
-        super(PrInversionWindow, self).__init__()
+        super(InversionWindow, self).__init__()
         self.setupUi(self)
 
@@ -43 +45 @@
         self.communicate = GuiUtils.Communicate()
 
+        self.logic = InversionLogic()
+
         # The window should not close
         self._allow_close = False
 
-        # is there data
-        self._has_data = False
-        self._data = Data1D()
+        # current QStandardItem showing on the panel
+        self._data = None
+        # current Data1D as referenced by self._data
+        self._data_set = None
 
         # p(r) calculator
@@ -65 +70 @@
             self._data_list.append({datum: self._calculator.clone()})
 
+        # plots
+        self.pr_plot = None
+        self.data_plot = None
+
         self.model = QtGui.QStandardItemModel(self)
         self.mapper = QtGui.QDataWidgetMapper(self)
@@ -76 +85 @@
     ######################################################################
     # Base Perspective Class Definitions
+
+    def communicator(self):
+        return self.communicate
 
     def allowBatch(self):
@@ -214 +226 @@
         Enable buttons when data is present, else disable them
         """
-        if self._has_data:
+        if self.logic.data_is_loaded:
             self.explorerButton.setEnabled(True)
             self.calculateButton.setEnabled(True)
@@ -244 +256 @@
     def update_calculator(self):
         """Update all p(r) params. Take all GUI values as an override"""
-        self._calculator.set_x(self._data.x)
-        self._calculator.set_y(self._data.y)
-        self._calculator.set_err(self._data.dy)
+        self._calculator.set_x(self._data_set.x)
+        self._calculator.set_y(self._data_set.y)
+        self._calculator.set_err(self._data_set.dy)
         self._calculator.set_qmin(is_float(UI.TabbedPrInversionUI._fromUtf8(
             self.minQInput.text())))
@@ -275 +287 @@
         if not self.mapper:
             return
+        # TODO: Update plots
         self.mapper.toFirst()
-        # TODO: Update plots, etc.
 
     def help(self):
@@ -339 +351 @@
 
         for data in data_item:
-            data_object = GuiUtils.dataFromItem(data)
-            self._data_list.append({data_object: None})
-            self._has_data = True
-            self._data = data_object
+            self._data = data
+            self._data_set = GuiUtils.dataFromItem(data)
             self.enableButtons()
-            self.populateDataComboBox(data_object.filename)
+            self.populateDataComboBox(self._data_set.filename)
+
+            # Estimate initial values from data
+            self.performEstimate()
+            self.logic.data(self._calculator)
+
+            self._manager.createGuiData(None)
+
+            # TODO: Finish plotting
+            if self.pr_plot is None:
+                self.pr_plot = None
+                #self.pr_plot = self.logic.new1DPlot(self._calculator)
+            if self.data_plot is None:
+                self.data_plot = None
+
+            qmin, qmax, _ = self.logic.computeDataRange()
+            title = self._data.filename
+
             self.model.setItem(WIDGETS.W_QMIN, QtGui.QStandardItem(
-                "{:.4g}".format(data_object.x.min())))
+                "{:.4g}".format(qmin)))
             self.model.setItem(WIDGETS.W_QMAX, QtGui.QStandardItem(
-                "{:.4g}".format(data_object.x.max())))
-
-            # Estimate initial values from data
-            self.update_calculator()
-            self.performEstimate()
-
-            # TODO: Plot data on load
-
-            # TODO: Only load the 1st data until batch mode is working
-            # TODO: thus, the break
+                "{:.4g}".format(qmax)))
+            #reactor.callFromThread(GuiUtils.updateModelItemWithPlot,
+            #                       self._model_item, self._communicator, title)
+
+            # TODO: Only load 1st data until batch mode working. Thus, break
             break
 
@@ -367 +389 @@
             Start a calculation thread
         """
-        from PrThread import CalcPr
+        from Thread import CalcPr
 
         # If a thread is already started, stop it
@@ -385 +407 @@
             Perform parameter estimation
         """
-        from PrThread import EstimateNT
+        from Thread import EstimateNT
 
         # If a thread is already started, stop it
@@ -409 +431 @@
             Perform parameter estimation
         """
-        from PrThread import EstimatePr
+        from Thread import EstimatePr
+
+        self._calculation()
 
         # If a thread is already started, stop it
@@ -464 +488 @@
         self.model.setItem(WIDGETS.W_COMP_TIME,
                            QtGui.QStandardItem(str(elapsed)))
+        self.PrTabWidget.setCurrentIndex(0)
         if message:
             logging.info(message)
-            pass
 
     def _completed(self, out, cov, pr, elapsed):
@@ -481 +505 @@
         # Keep a copy of the last result
         self._last_calculator = pr.clone()
-
-        # TODO: Append to data dictionary
-        # self._data_list.append({s})
 
         # Save Pr invertor
@@ -512 +533 @@
         # Display results tab
         self.PrTabWidget.setCurrentIndex(1)
-
-        # TODO: Show plots
+        self._data_list.append({self._data: pr})
+
+        # TODO: Show plots - Really, this should be linked to the inputs, etc,
+        # TODO: so it should happen automagically
         # Show I(q) fit
         # self.show_iq(out, self._calculator)
@@ -524 +547 @@
         """
         logging.warning(error)
-
-    def show_data(self, path=None, data=None, reset=False):
-        """
-        Show data read from a file
-
-        :param path: file path
-        :param reset: if True all other plottables will be cleared
-
-        """
-        if data is not None:
-            try:
-                pr = self._create_file_pr(data)
-            except:
-                status = "Problem reading data: %s" % sys.exc_value
-                raise RuntimeError, status
-
-            # If the file contains nothing, just return
-            if pr is None:
-                raise RuntimeError, "Loaded data is invalid"
-
-            self._calculator = pr
-
-        # Make a plot of I(q) data
-        if self._calculator.err is None:
-            logging.log(self._calculator.err)
-        else:
-            # TODO: Do something
-            pass
-        # Get Q range
-        #self.control_panel.q_min = min(self._calculator.x)
-        #self.control_panel.q_max = max(self._calculator.x)

src/sas/qtgui/Perspectives/__init__.py

@@ -4 +4 @@
 from Fitting.FittingPerspective import FittingWindow
 from Invariant.InvariantPerspective import InvariantWindow
-from PrInversion.PrInversionPerspective import PrInversionWindow
+from Inversion.InversionPerspective import InversionWindow
 
 PERSPECTIVES = {
     FittingWindow.name: FittingWindow,
     InvariantWindow.name: InvariantWindow,
-    PrInversionWindow.name: PrInversionWindow
+    InversionWindow.name: InversionWindow
 }