Changeset d4881f6a in sasview

Timestamp:

Nov 15, 2017 6:52:27 AM (7 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

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:

c7ebb37

Parents:

fa81e94

Message:

Initial implementation of Adam Washington's Corfunc perspective.
Converted to py3/Qt5.

Location:

src/sas/qtgui

Files:

• Calculators/DensityPanel.py (modified) (1 diff)
• Calculators/SldPanel.py (modified) (1 diff)
• MainWindow/DataExplorer.py (modified) (2 diffs)
• MainWindow/GuiManager.py (modified) (3 diffs)
• Perspectives/Corfunc/CorfuncPerspective.py (added)
• Perspectives/Corfunc/CorfuncUtils.py (added)
• Perspectives/Corfunc/UI/CorfuncPanel.ui (added)
• Perspectives/Corfunc/UI/__init__.py (added)
• Perspectives/Corfunc/UnitTesting/CorfuncTest.py (added)
• Perspectives/Corfunc/__init__.py (added)
• Perspectives/Invariant/InvariantUtils.py (modified) (1 diff)
• Perspectives/Inversion/DMaxExplorerWidget.py (modified) (1 diff)
• Perspectives/Inversion/InversionPerspective.py (modified) (4 diffs)
• Perspectives/Inversion/InversionUtils.py (modified) (1 diff)
• Perspectives/__init__.py (modified) (1 diff)
• Utilities/GuiUtils.py (modified) (1 diff)

src/sas/qtgui/Calculators/DensityPanel.py

@@ -15 +15 @@
 from sas.qtgui.Calculators.UI.DensityPanel import Ui_DensityPanel
 
-def enum(*sequential, **named):
-    enums = dict(list(zip(sequential, list(range(len(sequential))))), **named)
-    return type('Enum', (), enums)
+from sas.qtgui.Utilities.GuiUtils import enum
 
 MODEL = enum(

src/sas/qtgui/Calculators/SldPanel.py

@@ -16 +16 @@
 from sas.qtgui.Calculators.UI.SldPanel import Ui_SldPanel
 
-def enum(*sequential, **named):
-    enums = dict(list(zip(sequential, list(range(len(sequential))))), **named)
-    return type('Enum', (), enums)
+from sas.qtgui.Utilities.GuiUtils import enum
 
 MODEL = enum(

src/sas/qtgui/MainWindow/DataExplorer.py

@@ -29 +29 @@
 
 import sas.qtgui.Perspectives as Perspectives
+
+DEFAULT_PERSPECTIVE = "Fitting"
 
 class DataExplorerWindow(DroppableDataLoadWidget):
@@ -161 +163 @@
         self.cbFitting.currentIndexChanged.connect(self.updatePerspectiveCombo)
         # Set the index so we see the default (Fitting)
-        self.updatePerspectiveCombo(0)
+        self.cbFitting.setCurrentIndex(self.cbFitting.findText(DEFAULT_PERSPECTIVE))
 
     def _perspective(self):

src/sas/qtgui/MainWindow/GuiManager.py

@@ -37 +37 @@
 import sas.qtgui.Perspectives as Perspectives
 from sas.qtgui.Perspectives.Fitting.FittingPerspective import FittingWindow
-from sas.qtgui.MainWindow.DataExplorer import DataExplorerWindow
+from sas.qtgui.MainWindow.DataExplorer import DataExplorerWindow, DEFAULT_PERSPECTIVE
 
 class Acknowledgements(QDialog, Ui_Acknowledgements):
@@ -69 +69 @@
         self.addTriggers()
 
-        # Populate menus with dynamic data
-        #
-        # Analysis/Perspectives - potentially
-        # Window/current windows
-        #
-        # Widgets
-        #
-        # Current displayed perspective
+        # Currently displayed perspective
         self._current_perspective = None
 
-        # Invoke the initial perspective
-        #self.perspectiveChanged("Fitting")
+        # Populate the main window with stuff
         self.addWidgets()
 
@@ -674 +666 @@
         # For now we'll just update the analysis menu status but when the inversion is implemented delete from here
         self.checkAnalysisOption(self._workspace.actionInversion)
-        print("actionInversion TRIGGERED")
         # to here and uncomment the following line
-        # self.perspectiveChanged("Inversion")
+        self.perspectiveChanged("Inversion")
 
     def actionInvariant(self):

src/sas/qtgui/Perspectives/Invariant/InvariantUtils.py

@@ -1 @@
-def enum(*sequential, **named):
-    enums = dict(list(zip(sequential, list(range(len(sequential))))), **named)
-    return type('Enum', (), enums)
+from sas.qtgui.Utilities.GuiUtils import enum
 
 WIDGETS = enum( 'W_FILENAME',

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

@@ -30 +30 @@
 logger = logging.getLogger(__name__)
 
-def enum(*sequential, **named):
-    enums = dict(list(zip(sequential, list(range(len(sequential))))), **named)
-    return type('Enum', (), enums)
+from sas.qtgui.Utilities.GuiUtils import enum
 
 W = enum( 'NPTS',           #0

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

@@ -31 +31 @@
 # TODO: Easy way to scroll through results - no tabs in window(?) - 'spreadsheet'
 # TODO: Method to export results in some meaningful way
-class InversionWindow(QtWidgets.QTabWidget, Ui_PrInversion):
+#class InversionWindow(QtWidgets.QTabWidget, Ui_PrInversion):
+class InversionWindow(QtWidgets.QDialog, Ui_PrInversion):
     """
     The main window for the P(r) Inversion perspective.
@@ -117 +118 @@
             # reset the closability flag
             self.setClosable(value=False)
+            # Tell the MdiArea to close the container
+            self.parentWidget().close()
             event.accept()
         else:
@@ -253 +256 @@
     def setupWindow(self):
         """Initialize base window state on init"""
-        self.setTabPosition(0)
+        #self.setTabPosition(0)
         self.enableButtons()
         self.estimateBgd.setChecked(True)
@@ -380 +383 @@
         for data in data_item:
             # Create initial internal mappings
-            self._data_list[data] = self._calculator.clone()
+            # TODO: in PyQt5 QStandardItem no longer can be used as dict key
+            # Possibly the easiest solution is to subclass QStandardItem
+            # and reimplement __hash__() method so it can be hashed.
+            self._data_list[data] = self._calculator.clone() #<- this crashes
             self._data_set = GuiUtils.dataFromItem(data)
             self.data_plot_list[data] = self.data_plot

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

@@ -1 @@
-def enum(*sequential, **named):
-    enums = dict(list(zip(sequential, list(range(len(sequential))))), **named)
-    return type('Enum', (), enums)
+from sas.qtgui.Utilities.GuiUtils import enum
 
 WIDGETS = enum( 'W_FILENAME',               #0

src/sas/qtgui/Perspectives/__init__.py

@@ -5 +5 @@
 from .Invariant.InvariantPerspective import InvariantWindow
 from .Inversion.InversionPerspective import InversionWindow
+from .Corfunc.CorfuncPerspective import CorfuncWindow
 
 PERSPECTIVES = {
     FittingWindow.name: FittingWindow,
     InvariantWindow.name: InvariantWindow,
-    InversionWindow.name: InversionWindow
+    InversionWindow.name: InversionWindow,
+    CorfuncWindow.name: CorfuncWindow,
 }

src/sas/qtgui/Utilities/GuiUtils.py

@@ -864 +864 @@
         input = input.replace(",", "")
 
+def enum(*sequential, **named):
+    """Create an enumeration object from a list of strings"""
+    enums = dict(zip(sequential, range(len(sequential))), **named)
+    return type('Enum', (), enums)