Changeset 570e091 in sasview for src/sas

Timestamp:

Jan 10, 2018 5:45:43 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:

676f137

Parents:

e147ce2 (diff), a3c94b54 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'ESS_GUI_cns' of ​https://github.com/SasView/sasview into ESS_GUI_cns

Location:

src/sas/qtgui

Files:

• GUITests.py (modified) (1 diff)
• Calculators/DataOperationUtilityPanel.py (modified) (1 diff)
• Calculators/DensityPanel.py (modified) (1 diff)
• Calculators/GenericScatteringCalculator.py (modified) (1 diff)
• Calculators/KiessigPanel.py (modified) (1 diff)
• Calculators/ResolutionCalculatorPanel.py (modified) (1 diff)
• Calculators/SldPanel.py (modified) (1 diff)
• Calculators/SlitSizeCalculator.py (modified) (1 diff)
• Calculators/UnitTesting/DataOperationUtilityTest.py (modified) (2 diffs)
• Calculators/UnitTesting/DensityCalculatorTest.py (modified) (1 diff)
• Calculators/UnitTesting/GenericScatteringCalculatorTest.py (modified) (1 diff)
• Calculators/UnitTesting/KiessigCalculatorTest.py (modified) (2 diffs)
• Calculators/UnitTesting/ResolutionCalculatorPanelTest.py (modified) (1 diff)
• Calculators/UnitTesting/SLDCalculatorTest.py (modified) (1 diff)
• Calculators/UnitTesting/SlitSizeCalculatorTest.py (modified) (1 diff)
• MainWindow/DataExplorer.py (modified) (3 diffs)
• MainWindow/GuiManager.py (modified) (6 diffs)
• MainWindow/MainWindow.py (modified) (2 diffs)
• MainWindow/UnitTesting/GuiManagerTest.py (modified) (1 diff, 1 prop)
• MainWindow/UnitTesting/MainWindowTest.py (modified) (2 diffs)
• Perspectives/Corfunc/CorfuncPerspective.py (modified) (5 diffs)
• Perspectives/Fitting/FittingOptions.py (modified) (4 diffs)
• Perspectives/Fitting/FittingPerspective.py (modified) (1 diff)
• Perspectives/Fitting/FittingWidget.py (modified) (4 diffs)
• Perspectives/Fitting/GPUOptions.py (modified) (2 diffs)
• Perspectives/Fitting/MultiConstraint.py (modified) (3 diffs)
• Perspectives/Invariant/InvariantPerspective.py (modified) (6 diffs)
• Perspectives/Invariant/UI/TabbedInvariantUI.ui (modified) (10 diffs)
• Perspectives/Inversion/InversionPerspective.py (modified) (6 diffs)
• Perspectives/Inversion/UnitTesting/InversionPerspectiveTest.py (added)
• Perspectives/Inversion/UnitTesting/__init__.py (added)
• Plotting/SlicerParameters.py (modified) (2 diffs)
• Utilities/GuiUtils.py (modified) (6 diffs)
• Utilities/UnitTesting/GuiUtilsTest.py (modified) (2 diffs)

src/sas/qtgui/GUITests.py

@@ -60 +60 @@
 #  Invariant
 from Perspectives.Invariant.UnitTesting import InvariantPerspectiveTest
-from Perspectives.Invariant.UnitTesting import InvariantDetailsTest
 
 def suite():

src/sas/qtgui/Calculators/DataOperationUtilityPanel.py

@@ -110 +110 @@
         documentation tree (after /doc/ ....".
         """
-        try:
-            location = GuiUtils.HELP_DIRECTORY_LOCATION + \
-                       "/user/sasgui/perspectives/calculator/data_operator_help.html"
-            self.manager._helpView.load(QtCore.QUrl(location))
-            self.manager._helpView.show()
-
-        except AttributeError:
-            # No manager defined - testing and standalone runs
-            pass
+        location = "/user/sasgui/perspectives/calculator/data_operator_help.html"
+        self.manager.showHelp(location)
 
     def onClose(self):

src/sas/qtgui/Calculators/DensityPanel.py

@@ -146 +146 @@
 
     def displayHelp(self):
-        try:
-            location = HELP_DIRECTORY_LOCATION + \
-                "/user/sasgui/perspectives/calculator/density_calculator_help.html"
+        location =  "/user/sasgui/perspectives/calculator/density_calculator_help.html"
+        self.manager.showHelp(location)
 
-            self.manager._helpView.load(QtCore.QUrl(location))
-            self.manager._helpView.show()
-        except AttributeError:
-            # No manager defined - testing and standalone runs
-            pass
+

src/sas/qtgui/Calculators/GenericScatteringCalculator.py

@@ -382 +382 @@
         documentation tree (after /doc/ ....".
         """
-        try:
-            location = GuiUtils.HELP_DIRECTORY_LOCATION + \
-                       "/user/sasgui/perspectives/calculator/sas_calculator_help.html"
-            self.manager._helpView.load(QtCore.QUrl(location))
-            self.manager._helpView.show()
-        except AttributeError:
-            # No manager defined - testing and standalone runs
-            pass
+        location = "/user/sasgui/perspectives/calculator/sas_calculator_help.html"
+        self.manager.showHelp(location)
 
     def onReset(self):

src/sas/qtgui/Calculators/KiessigPanel.py

@@ -38 +38 @@
         documentation tree (after /doc/ ....".
         """
-        try:
-            location = GuiUtils.HELP_DIRECTORY_LOCATION + \
-                "/user/sasgui/perspectives/calculator/kiessig_calculator_help.html"
-
-            self.manager._helpView.load(QtCore.QUrl(location))
-            self.manager._helpView.show()
-        except AttributeError:
-            # No manager defined - testing and standalone runs
-            pass
+        location = "/user/sasgui/perspectives/calculator/kiessig_calculator_help.html"
+        self.manager.showHelp(location)
 
     def onCompute(self):

src/sas/qtgui/Calculators/ResolutionCalculatorPanel.py

@@ -366 +366 @@
         documentation tree (after /doc/ ....".
         """
-        try:
-            location = GuiUtils.HELP_DIRECTORY_LOCATION + \
-                       "/user/sasgui/perspectives/calculator/resolution_calculator_help.html"
-            self.manager._helpView.load(QtCore.QUrl(location))
-            self.manager._helpView.show()
-
-        except AttributeError:
-            # No manager defined - testing and standalone runs
-            pass
+        location = "/user/sasgui/perspectives/calculator/resolution_calculator_help.html"
+        self.manager.showHelp(location)
 
     def onReset(self):

src/sas/qtgui/Calculators/SldPanel.py

@@ -213 +213 @@
 
     def displayHelp(self):
-        try:
-            location = GuiUtils.HELP_DIRECTORY_LOCATION + \
-                "/user/sasgui/perspectives/calculator/sld_calculator_help.html"
-            self.manager._helpView.load(QtCore.QUrl(location))
-            self.manager._helpView.show()
-        except AttributeError:
-            # No manager defined - testing and standalone runs
-            pass
-
+        location = "/user/sasgui/perspectives/calculator/sld_calculator_help.html"
+        self.manager.showHelp(location)
+
+

src/sas/qtgui/Calculators/SlitSizeCalculator.py

@@ -47 +47 @@
         documentation tree (after /doc/ ....".
         """
-        try:
-            location = GuiUtils.HELP_DIRECTORY_LOCATION + \
-                "/user/sasgui/perspectives/calculator/slit_calculator_help.html"
-
-            self._parent._helpView.load(QtCore.QUrl(location))
-            self._parent._helpView.show()
-        except AttributeError:
-            # No manager defined - testing and standalone runs
-            pass
+        location = "/user/sasgui/perspectives/calculator/slit_calculator_help.html"
+        self._parent.showHelp(location)
 
     def onBrowse(self):

src/sas/qtgui/Calculators/UnitTesting/DataOperationUtilityTest.py

@@ -4 +4 @@
 import logging
 import unittest
+import webbrowser
+
 from PyQt5 import QtGui, QtWidgets
 from PyQt5 import QtCore
@@ -119 +121 @@
     def testHelp(self):
         """ Assure help file is shown """
-        # this should not rise
+        self.widget.manager.showHelp = MagicMock()
         self.widget.onHelp()
+        self.assertTrue(self.widget.manager.showHelp.called_once())
+        args = self.widget.manager.showHelp.call_args
+        self.assertIn('data_operator_help.html', args[0][0])
 
     def testOnReset(self):

src/sas/qtgui/Calculators/UnitTesting/DensityCalculatorTest.py

@@ -121 +121 @@
     def testHelp(self):
         """ Assure help file is shown """
-
-        # this should not rise
+        self.widget.manager = QtWidgets.QWidget()
+        self.widget.manager.showHelp = MagicMock()
         self.widget.displayHelp()
+        self.assertTrue(self.widget.manager.showHelp.called_once())
+        args = self.widget.manager.showHelp.call_args
+        self.assertIn('density_calculator_help.html', args[0][0])
 
 if __name__ == "__main__":

src/sas/qtgui/Calculators/UnitTesting/GenericScatteringCalculatorTest.py

@@ -104 +104 @@
     def testHelpButton(self):
         """ Assure help file is shown """
+        self.widget.manager.showHelp = MagicMock()
         self.widget.onHelp()
+        self.assertTrue(self.widget.manager.showHelp.called_once())
+        args = self.widget.manager.showHelp.call_args
+        self.assertIn('sas_calculator_help.html', args[0][0])
 
     def testValidator(self):

src/sas/qtgui/Calculators/UnitTesting/KiessigCalculatorTest.py

@@ -5 +5 @@
 from PyQt5.QtCore import Qt
 
-# TEMP
-#import sas.qtgui.path_prepare
 import path_prepare
-
+from unittest.mock import MagicMock
 
 from sas.qtgui.Calculators.KiessigPanel import KiessigPanel
@@ -35 +33 @@
     def testHelp(self):
         """ Assure help file is shown """
-
-        # this should not rise
+        self.widget.manager = QtWidgets.QWidget()
+        self.widget.manager.showHelp = MagicMock()
         self.widget.onHelp()
+        self.assertTrue(self.widget.manager.showHelp.called_once())
+        args = self.widget.manager.showHelp.call_args
+        self.assertIn('kiessig_calculator_help.html', args[0][0])
 
     def testComplexEntryNumbers(self):

src/sas/qtgui/Calculators/UnitTesting/ResolutionCalculatorPanelTest.py

@@ -240 +240 @@
         """ Assure help file is shown """
         # this should not rise
+        self.widget.manager = QtWidgets.QWidget()
+        self.widget.manager.showHelp = MagicMock()
         self.widget.onHelp()
+        self.assertTrue(self.widget.manager.showHelp.called_once())
+        args = self.widget.manager.showHelp.call_args
+        self.assertIn('resolution_calculator_help.html', args[0][0])
 
     def testOnReset(self):

src/sas/qtgui/Calculators/UnitTesting/SLDCalculatorTest.py

@@ -142 +142 @@
     def testHelp(self):
         """ Assure help file is shown """
-
-        # this should not rise
+        self.widget.manager = QtWidgets.QWidget()
+        self.widget.manager.showHelp = MagicMock()
         self.widget.displayHelp()
+        self.assertTrue(self.widget.manager.showHelp.called_once())
+        args = self.widget.manager.showHelp.call_args
+        self.assertIn('sld_calculator_help.html', args[0][0])
 
 if __name__ == "__main__":

src/sas/qtgui/Calculators/UnitTesting/SlitSizeCalculatorTest.py

@@ -37 +37 @@
     def testHelp(self):
         """ Assure help file is shown """
-
-        # this should not rise
+        self.widget._parent = QtWidgets.QWidget()
+        self.widget._parent.showHelp = MagicMock()
         self.widget.onHelp()
+        self.assertTrue(self.widget._parent.showHelp.called_once())
+        args = self.widget._parent.showHelp.call_args
+        self.assertIn('slit_calculator_help.html', args[0][0])
 
     def testBrowseButton(self):

src/sas/qtgui/MainWindow/DataExplorer.py

@@ -8 +8 @@
 from PyQt5 import QtGui
 from PyQt5 import QtWidgets
-from PyQt5 import QtWebKitWidgets
 
 from twisted.internet import threads
@@ -70 +69 @@
         self.cmdHelp_2.clicked.connect(self.displayHelp)
 
-        # Display HTML content
-        self._helpView = QtWebKitWidgets.QWebView()
-
         # Fill in the perspectives combo
         self.initPerspectives()
@@ -141 +137 @@
         Show the "Loading data" section of help
         """
-        tree_location = GuiUtils.HELP_DIRECTORY_LOCATION +\
-            "/user/sasgui/guiframe/data_explorer_help.html"
-        self._helpView.load(QtCore.QUrl(tree_location))
-        self._helpView.show()
+        tree_location = "/user/sasgui/guiframe/data_explorer_help.html"
+        self.parent.showHelp(tree_location)
 
     def enableGraphCombo(self, combo_text):

src/sas/qtgui/MainWindow/GuiManager.py

@@ -86 +86 @@
         # Set up the status bar
         self.statusBarSetup()
-        # Show the Welcome panel
-        self.welcomePanel = WelcomePanel()
-        self._workspace.workspace.addSubWindow(self.welcomePanel)
-
-        # Current help file
-        self._helpView = QWebView()
+
         # Needs URL like path, so no path.join() here
         self._helpLocation = GuiUtils.HELP_DIRECTORY_LOCATION + "/index.html"
@@ -99 +94 @@
                                               "_downloads",
                                               "Tutorial.pdf"))
+
     def addWidgets(self):
         """
@@ -131 +127 @@
         self.ackWidget = Acknowledgements()
         self.aboutWidget = AboutBox()
+        self.welcomePanel = WelcomePanel()
 
         # Add calculators - floating for usability
@@ -165 +162 @@
         """
         pass
+
+    def showHelp(self, url):
+        """
+        Open a local url in the default browser
+        """
+        location = GuiUtils.HELP_DIRECTORY_LOCATION + url
+        try:
+            webbrowser.open('file://' + os.path.realpath(location))
+        except webbrowser.Error as ex:
+            logging.warning("Cannot display help. %s" % ex)
 
     def workspace(self):
@@ -334 +341 @@
             msg += " Please try again later."
             self.communicate.statusBarUpdateSignal.emit(msg)
+
+    def showWelcomeMessage(self):
+        """ Show the Welcome panel """
+        self._workspace.workspace.addSubWindow(self.welcomePanel)
+        self.welcomePanel.show()
 
     def addCallbacks(self):
@@ -714 +726 @@
         TODO: use QNetworkAccessManager to assure _helpLocation is valid
         """
-        self._helpView.load(QUrl(self._helpLocation))
-        self._helpView.show()
+        self.showHelp(self._helpLocation)
 
     def actionTutorial(self):

src/sas/qtgui/MainWindow/MainWindow.py

@@ -1 +1 @@
 # UNLESS EXEPTIONALLY REQUIRED TRY TO AVOID IMPORTING ANY MODULES HERE
 # ESPECIALLY ANYTHING IN SAS, SASMODELS NAMESPACE
-#from PyQt4 import QtGui
-from PyQt5.QtWidgets import *
-from PyQt5.QtGui import *
+from PyQt5.QtWidgets import QMainWindow
+from PyQt5.QtWidgets import QMdiArea
+from PyQt5.QtWidgets import QSplashScreen
+from PyQt5.QtWidgets import QApplication
+from PyQt5.QtGui import QPixmap
 
 # Local UI
@@ -71 +73 @@
     # Show the main SV window
     mainwindow = MainSasViewWindow()
-    mainwindow.show()
+    mainwindow.showMaximized()
 
     # no more splash screen
     splash.finish(mainwindow)
+
+    # Time for the welcome window
+    mainwindow.guiManager.showWelcomeMessage()
 
     # No need to .exec_ - the reactor takes care of it.

src/sas/qtgui/MainWindow/UnitTesting/GuiManagerTest.py

@@ -19 +19 @@
 from sas.qtgui.MainWindow.AboutBox import AboutBox
 from sas.qtgui.MainWindow.WelcomePanel import WelcomePanel
-#from sas.qtgui.Utilities.IPythonWidget import IPythonWidget
+from sas.qtgui.Utilities.IPythonWidget import IPythonWidget
 
 from sas.qtgui.MainWindow.GuiManager import Acknowledgements, GuiManager

src/sas/qtgui/MainWindow/UnitTesting/MainWindowTest.py

@@ -15 +15 @@
 from sas.qtgui.MainWindow.MainWindow import SplashScreen
 from sas.qtgui.MainWindow.GuiManager import GuiManager
+from sas.qtgui.Perspectives.Fitting import FittingPerspective
 
 if not QtWidgets.QApplication.instance():
@@ -40 +41 @@
         self.assertIsInstance(splash, QtWidgets.QSplashScreen)
 
+    def testWidgets(self):
+        """ Test enablement/disablement of widgets """
+        # Open the main window
+        tmp_main = MainSasViewWindow(None)
+        tmp_main.showMaximized()
+        # See that only one subwindow is up
+        self.assertEqual(len(tmp_main.workspace.subWindowList()), 1)
+        # and that the subwindow is the fitting perspective
+        self.assertIsInstance(tmp_main.workspace.subWindowList()[0].widget(),
+                              FittingPerspective.FittingWindow)
+        # Show the message widget
+        tmp_main.guiManager.showWelcomeMessage()
+        # Assure it is visible and a part of the MdiArea
+        self.assertTrue(tmp_main.guiManager.welcomePanel.isVisible())
+        self.assertEqual(len(tmp_main.workspace.subWindowList()), 2)
+
+        tmp_main.close()
+
     def testExit(self):
         """

src/sas/qtgui/Perspectives/Corfunc/CorfuncPerspective.py

@@ -5 +5 @@
 
 # global
+from matplotlib.backends.backend_qt5agg import FigureCanvasQTAgg \
+    as FigureCanvas
+from matplotlib.figure import Figure
+from numpy.linalg.linalg import LinAlgError
+
 from PyQt5 import QtCore
 from PyQt5 import QtGui, QtWidgets
@@ -17 +22 @@
 from .UI.CorfuncPanel import Ui_CorfuncDialog
 from .CorfuncUtils import WIDGETS as W
-
-from matplotlib.backends.backend_qt5agg import FigureCanvasQTAgg \
-    as FigureCanvas
-from matplotlib.figure import Figure
-from numpy.linalg.linalg import LinAlgError
 
 
@@ -136 +136 @@
         self.cmdCalculateBg.clicked.connect(self.calculate_background)
         self.cmdCalculateBg.setEnabled(False)
+        self.cmdHelp.clicked.connect(self.showHelp)
 
         self.model.itemChanged.connect(self.model_changed)
@@ -306 +307 @@
 
     # pylint: disable=invalid-name
+    def showHelp(self):
+        """
+        Opens a webpage with help on the perspective
+        """
+        """ Display help when clicking on Help button """
+        treeLocation = "/user/sasgui/perspectives/corfunc/corfunc_help.html"
+        self.parent.showHelp(treeLocation)
+
     @staticmethod
     def allowBatch():
@@ -368 +377 @@
             self.setClosable(value=False)
             # Tell the MdiArea to close the container
-            self.parentWidget().close()
+            if self.parent:
+                self.parentWidget().close()
             event.accept()
         else:

src/sas/qtgui/Perspectives/Fitting/FittingOptions.py

@@ -3 +3 @@
 import os
 import types
+import webbrowser
 
 from PyQt5 import QtCore
 from PyQt5 import QtGui
 from PyQt5 import QtWidgets
-from PyQt5 import QtWebKitWidgets
 
 from sas.qtgui.UI import images_rc
@@ -73 +73 @@
         # OK has to be initialized to True, after initial validator setup
         self.buttonBox.button(QtWidgets.QDialogButtonBox.Ok).setEnabled(True)
-
-        # Display HTML content
-        self.helpView = QtWebKitWidgets.QWebView()
 
     def assignValidators(self):
@@ -160 +157 @@
         Show the "Fitting options" section of help
         """
-        tree_location = GuiUtils.HELP_DIRECTORY_LOCATION + "/user/sasgui/perspectives/fitting/"
+        tree_location = GuiUtils.HELP_DIRECTORY_LOCATION
+        tree_location += "/user/sasgui/perspectives/fitting/"
 
         # Actual file anchor will depend on the combo box index
@@ -167 +165 @@
         helpfile = "optimizer.html#fit-" + self.current_fitter_id 
         help_location = tree_location + helpfile
-        self.helpView.load(QtCore.QUrl(help_location))
-        self.helpView.show()
+        webbrowser.open('file://' + os.path.realpath(help_location))
 
     def widgetFromOption(self, option_id, current_fitter=None):

src/sas/qtgui/Perspectives/Fitting/FittingPerspective.py

@@ -13 +13 @@
 from sas.qtgui.Perspectives.Fitting.FittingOptions import FittingOptions
 from sas.qtgui.Perspectives.Fitting.GPUOptions import GPUOptions
-#from sas.qtgui.Perspectives.Fitting import ModelUtilities
 
 class FittingWindow(QtWidgets.QTabWidget):

src/sas/qtgui/Perspectives/Fitting/FittingWidget.py

@@ -8 +8 @@
 from twisted.internet import threads
 import numpy as np
+import webbrowser
 
 from PyQt5 import QtCore
 from PyQt5 import QtGui
 from PyQt5 import QtWidgets
-from PyQt5 import QtWebKitWidgets
-# Officially QtWebEngineWidgets are the way to display HTML in Qt5,
-# but this module isn't ported to PyQt5 yet...
-# let's wait. In the meantime no Help.
-#from PyQt5 import QtWebEngineWidgets
 
 from sasmodels import product
@@ -130 +126 @@
 
         # Display HTML content
-        self.helpView = QtWebKitWidgets.QWebView()
+        #self.setupHelp()
 
         # New font to display angstrom symbol
@@ -945 +941 @@
         Show the "Fitting" section of help
         """
-        tree_location = GuiUtils.HELP_DIRECTORY_LOCATION + "/user/sasgui/perspectives/fitting/"
+        tree_location = "/user/sasgui/perspectives/fitting/"
 
         # Actual file will depend on the current tab
@@ -955 +951 @@
             helpfile = "residuals_help.html"
         elif tab_id == 2:
-            helpfile = "sm_help.html"
+            helpfile = "resolution.html"
         elif tab_id == 3:
-            helpfile = "pd_help.html"
+            helpfile = "pd/polydispersity.html"
         elif tab_id == 4:
-            helpfile = "mag_help.html"
+            helpfile = "magnetism/magnetism.html"
         help_location = tree_location + helpfile
 
-        content = QtCore.QUrl(help_location)
-        self.helpView.load(QtCore.QUrl(help_location))
-        self.helpView.show()
+        self.showHelp(help_location)
+
+    def showHelp(self, url):
+        """
+        Calls parent's method for opening an HTML page
+        """
+        self.parent.showHelp(url)
 
     def onDisplayMagneticAngles(self):

src/sas/qtgui/Perspectives/Fitting/GPUOptions.py

@@ -8 +8 @@
 
 import sas.qtgui.Utilities.GuiUtils as GuiUtils
-from PyQt5 import QtGui, QtCore, QtWebKit, QtWidgets
+from PyQt5 import QtGui, QtCore, QtWidgets
 from sas.qtgui.Perspectives.Fitting.UI.GPUOptionsUI import Ui_GPUOptions
 from sas.qtgui.Perspectives.Fitting.UI.GPUTestResultsUI import Ui_GPUTestResults
@@ -172 +172 @@
         help_location += "/user/sasgui/perspectives/fitting/gpu_setup.html"
         help_location += "#device-selection"
-        # Test the system browser solution
+        # Display the page in default browser
         webbrowser.open('file://' + os.path.realpath(help_location))
 

src/sas/qtgui/Perspectives/Fitting/MultiConstraint.py

@@ -2 +2 @@
 Widget for parameter constraints.
 """
+import os
 from numpy import *
 
@@ -7 +8 @@
 from PyQt5 import QtGui
 from PyQt5 import QtWidgets
+import webbrowser
 
 import sas.qtgui.Utilities.GuiUtils as GuiUtils
@@ -128 +130 @@
         """
         try:
-            location = GuiUtils.HELP_DIRECTORY_LOCATION + \
+            help_location = GuiUtils.HELP_DIRECTORY_LOCATION + \
             "/user/sasgui/perspectives/fitting/fitting_help.html#simultaneous-fits-with-constraints"
-
-            self.manager._helpView.load(QtCore.QUrl(location))
-            self.manager._helpView.show()
+            webbrowser.open('file://' + os.path.realpath(help_location))
         except AttributeError:
             # No manager defined - testing and standalone runs

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

@@ -8 +8 @@
 from PyQt5 import QtCore
 from PyQt5 import QtGui, QtWidgets
-from PyQt5 import QtWebKit
 
 from twisted.internet import threads
@@ -63 +62 @@
         self._model_item = QtGui.QStandardItem()
 
-        #self._helpView = QtWebKit.QWebView()
         self.detailsDialog = DetailsDialog(self)
         self.detailsDialog.cmdOK.clicked.connect(self.enabling)
@@ -82 +80 @@
         # no reason to have this widget resizable
         self.resize(self.minimumSizeHint())
-        #self.setFixedSize(self.sizeHint())
 
         self.communicate = self._manager.communicator()
@@ -228 +225 @@
 
         self.model = model
+        self.mapper.toFirst()
         self._data = GuiUtils.dataFromItem(self._model_item)
 
         # Send the modified model item to DE for keeping in the model
         # Currently -unused
-        #self.communicate.updateModelFromPerspectiveSignal.emit(self._model_item)
+        # self.communicate.updateModelFromPerspectiveSignal.emit(self._model_item)
 
         plot_data = GuiUtils.plotsFromCheckedItems(self._manager.filesWidget.model)
@@ -365 +363 @@
             if self._high_extrapolate:
                 # for presentation in InvariantDetails
-                qmax_plot = Q_MAXIMUM_PLOT * max(temp_data.x) # self._data.x)
+                qmax_plot = Q_MAXIMUM_PLOT * max(temp_data.x)
 
                 if qmax_plot > Q_MAXIMUM:
@@ -431 +429 @@
     def onHelp(self):
         """ Display help when clicking on Help button """
-        treeLocation = GuiUtils.HELP_DIRECTORY_LOCATION + \
-            "/user/sasgui/perspectives/invariant/invariant_help.html"
-        webbrowser.open('file://' + treeLocation)
+        treeLocation = "/user/sasgui/perspectives/invariant/invariant_help.html"
+        self.parent.showHelp(treeLocation)
 
     def setupSlots(self):

src/sas/qtgui/Perspectives/Invariant/UI/TabbedInvariantUI.ui

@@ -142 +142 @@
                 <widget class="QLineEdit" name="txtTotalQMin">
                  <property name="enabled">
-                  <bool>false</bool>
+                  <bool>true</bool>
                  </property>
                 </widget>
@@ -156 +156 @@
                 <widget class="QLineEdit" name="txtTotalQMax">
                  <property name="enabled">
-                  <bool>false</bool>
+                  <bool>true</bool>
                  </property>
                 </widget>
@@ -192 +192 @@
            <widget class="QLineEdit" name="txtVolFract">
             <property name="enabled">
-             <bool>false</bool>
+             <bool>true</bool>
             </property>
             <property name="autoFillBackground">
@@ -221 +221 @@
            <widget class="QLineEdit" name="txtVolFractErr">
             <property name="enabled">
-             <bool>false</bool>
+             <bool>true</bool>
             </property>
             <property name="frame">
@@ -244 +244 @@
            <widget class="QLineEdit" name="txtSpecSurf">
             <property name="enabled">
-             <bool>false</bool>
+             <bool>true</bool>
             </property>
             <property name="frame">
@@ -267 +267 @@
            <widget class="QLineEdit" name="txtSpecSurfErr">
             <property name="enabled">
-             <bool>false</bool>
+             <bool>true</bool>
             </property>
             <property name="frame">
@@ -305 +305 @@
            <widget class="QLineEdit" name="txtInvariantTot">
             <property name="enabled">
-             <bool>false</bool>
+             <bool>true</bool>
             </property>
             <property name="toolTip">
@@ -331 +331 @@
            <widget class="QLineEdit" name="txtInvariantTotErr">
             <property name="enabled">
-             <bool>false</bool>
+             <bool>true</bool>
             </property>
             <property name="frame">
@@ -467 +467 @@
              <widget class="QLineEdit" name="txtExtrapolQMin">
               <property name="enabled">
-               <bool>false</bool>
+               <bool>true</bool>
               </property>
               <property name="toolTip">
                <string>The minimum extrapolated q value.</string>
+              </property>
+              <property name="readOnly">
+               <bool>true</bool>
               </property>
              </widget>
@@ -484 +487 @@
              <widget class="QLineEdit" name="txtExtrapolQMax">
               <property name="enabled">
-               <bool>false</bool>
+               <bool>true</bool>
+              </property>
+              <property name="readOnly">
+               <bool>true</bool>
               </property>
              </widget>

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

@@ -25 +25 @@
         return 0.0
 
+NUMBER_OF_TERMS = 10
+REGULARIZATION = 0.0001
+BACKGROUND_INPUT = 0.0
+MAX_DIST = 140.0
 
 # TODO: Modify plot references, don't just send new
@@ -47 +51 @@
         self._manager = parent
         self._model_item = QtGui.QStandardItem()
-        #self._helpView = QtWebKit.QWebView()
-
         self.communicate = GuiUtils.Communicate()
 
@@ -227 +229 @@
         item = QtGui.QStandardItem("")
         self.model.setItem(WIDGETS.W_FILENAME, item)
-        item = QtGui.QStandardItem('0.0')
+        item = QtGui.QStandardItem(str(BACKGROUND_INPUT))
         self.model.setItem(WIDGETS.W_BACKGROUND_INPUT, item)
         item = QtGui.QStandardItem("")
@@ -237 +239 @@
         item = QtGui.QStandardItem("")
         self.model.setItem(WIDGETS.W_SLIT_HEIGHT, item)
-        item = QtGui.QStandardItem("10")
+        item = QtGui.QStandardItem(str(NUMBER_OF_TERMS))
         self.model.setItem(WIDGETS.W_NO_TERMS, item)
-        item = QtGui.QStandardItem("0.0001")
+        item = QtGui.QStandardItem(str(REGULARIZATION))
         self.model.setItem(WIDGETS.W_REGULARIZATION, item)
-        item = QtGui.QStandardItem("140.0")
+        item = QtGui.QStandardItem(str(MAX_DIST))
         self.model.setItem(WIDGETS.W_MAX_DIST, item)
         item = QtGui.QStandardItem("")
@@ -370 +372 @@
         Open the P(r) Inversion help browser
         """
-        tree_location = (GuiUtils.HELP_DIRECTORY_LOCATION +
-                         "user/sasgui/perspectives/pr/pr_help.html")
+        tree_location = "/user/sasgui/perspectives/pr/pr_help.html"
 
         # Actual file anchor will depend on the combo box index
         # Note that we can be clusmy here, since bad current_fitter_id
         # will just make the page displayed from the top
-        #self._helpView.load(QtCore.QUrl(tree_location))
-        #self._helpView.show()
+        self._manager.showHelp(tree_location)
 
     def toggleBgd(self):
@@ -439 +439 @@
     def getNFunc(self):
         """Get the n_func value from the GUI object"""
-        return int(self.noOfTermsInput.text())
+        try:
+            nfunc = int(self.noOfTermsInput.text())
+        except ValueError:
+            logging.error("Incorrect number of terms specified: %s" %self.noOfTermsInput.text())
+            self.noOfTermsInput.setText(str(NUMBER_OF_TERMS))
+            nfunc = NUMBER_OF_TERMS
+        return nfunc
 
     def setCurrentData(self, data_ref):

src/sas/qtgui/Plotting/SlicerParameters.py

@@ -7 +7 @@
 from PyQt5 import QtGui
 from PyQt5 import QtWidgets
-from PyQt5 import QtWebKitWidgets
 
 import sas.qtgui.Utilities.GuiUtils as GuiUtils
@@ -87 +86 @@
         Display generic data averaging help
         """
-        location = "docs/sphinx-docs/build/html" + \
-            "/user/sasgui/guiframe/graph_help.html#d-data-averaging"
-        self.helpView = QtWebKitWidgets.QWebView()
-        self.helpView.load(QtCore.QUrl(location))
-        self.helpView.show()
+        location = "/user/sasgui/guiframe/graph_help.html#d-data-averaging"
+        self.parent.showHelp(location)
 
 

src/sas/qtgui/Utilities/GuiUtils.py

@@ -58 +58 @@
     # clean all these module variables and put them into a config class
     # that can be passed by sasview.py.
-    #logging.info(sys.executable)
-    #logging.info(str(sys.argv))
+    # logging.info(sys.executable)
+    # logging.info(str(sys.argv))
     from sas import sasview as sasview
     app_path = os.path.dirname(sasview.__file__)
-    #logging.info("Using application path: %s", app_path)
+    # logging.info("Using application path: %s", app_path)
     return app_path
 
@@ -249 +249 @@
         if plot_item.isCheckable():
             plot_data = plot_item.child(0).data()
-            if plot_data.id is not None and plot_data.id == update_data.id:
+            if plot_data.id is not None and \
+                   (plot_data.name == update_data.name or plot_data.id == update_data.id):
+            # if plot_data.id is not None and plot_data.id == update_data.id:
                 # replace data section in item
                 plot_item.child(0).setData(update_data)
@@ -343 +345 @@
     for index in range(model_item.rowCount()):
         item = model_item.item(index)
-        if item.text() == filename and item.isCheckable() and item.checkState() == QtCore.Qt.Checked:
+        if item.text() == filename and item.isCheckable() \
+                and item.checkState() == QtCore.Qt.Checked:
             # Going 1 level deeper only
             for index_2 in range(item.rowCount()):
@@ -360 +363 @@
 
     # Iterate over model looking for named items
-    item = list([i for i in [model_item.item(index) for index in range(model_item.rowCount())] if str(i.text()) == filename])
+    item = list([i for i in [model_item.item(index)
+                             for index in range(model_item.rowCount())]
+                 if str(i.text()) == filename])
     return item[0] if len(item)>0 else None
 
@@ -396 +401 @@
     for index in range(model_item.rowCount()):
         item = model_item.item(index)
-        if item.isCheckable() and item.checkState() == QtCore.Qt.Checked:
-            # TODO: assure item type is correct (either data1/2D or Plotter)
-            plot_data.append((item, item.child(0).data()))
+
         # Going 1 level deeper only
         for index_2 in range(item.rowCount()):
@@ -405 +408 @@
                 # TODO: assure item type is correct (either data1/2D or Plotter)
                 plot_data.append((item_2, item_2.child(0).data()))
+
+        if item.isCheckable() and item.checkState() == QtCore.Qt.Checked:
+            # TODO: assure item type is correct (either data1/2D or Plotter)
+            plot_data.append((item, item.child(0).data()))
 
     return plot_data

src/sas/qtgui/Utilities/UnitTesting/GuiUtilsTest.py

@@ -100 +100 @@
         Test the QModelItem checkbox update method
         """
+        # test_item = QtGui.QStandardItem()
+        # test_list = ['aa','11']
+        # update_data = test_list
+        # name = "Black Sabbath"
+
+        # # update the item
+        # updateModelItemWithPlot(test_item, update_data, name)
+
         test_item = QtGui.QStandardItem()
-        test_list = ['aa','11']
-        update_data = test_list
+        update_data = Data1D(x=[1.0, 2.0, 3.0], y=[10.0, 11.0, 12.0])
         name = "Black Sabbath"
-
+        update_data.id = '[0]data0'
+        update_data.name = 'data0'
         # update the item
         updateModelItemWithPlot(test_item, update_data, name)
-        
+
         # Make sure test_item got all data added
         self.assertEqual(test_item.child(0).text(), name)
         self.assertTrue(test_item.child(0).isCheckable())
-        list_from_item = test_item.child(0).child(0).data()
-        self.assertIsInstance(list_from_item, list)
-        self.assertEqual(str(list_from_item[0]), test_list[0])
-        self.assertEqual(str(list_from_item[1]), test_list[1])
+        data_from_item = test_item.child(0).child(0).data()
+        self.assertIsInstance(data_from_item, Data1D)
+        self.assertSequenceEqual(list(data_from_item.x), [1.0, 2.0, 3.0])
+        self.assertSequenceEqual(list(data_from_item.y), [10.0, 11.0, 12.0])
+        self.assertEqual(test_item.rowCount(), 1)
+
+        # add another dataset (different from the first one)
+        update_data1 = Data1D(x=[1.1, 2.1, 3.1], y=[10.1, 11.1, 12.1])
+        update_data1.id = '[0]data1'
+        update_data1.name = 'data1'
+        name1 = "Black Sabbath1"
+        # update the item and check number of rows
+        updateModelItemWithPlot(test_item, update_data1, name1)
+
+        self.assertEqual(test_item.rowCount(), 2)
+
+        # add another dataset (with the same name as the first one)
+        # check that number of rows was not changed but data have been updated
+        update_data2 = Data1D(x=[4.0, 5.0, 6.0], y=[13.0, 14.0, 15.0])
+        update_data2.id = '[1]data0'
+        update_data2.name = 'data0'
+        name2 = "Black Sabbath2"
+        updateModelItemWithPlot(test_item, update_data2, name2)
+        self.assertEqual(test_item.rowCount(), 2)
+
+        data_from_item = test_item.child(0).child(0).data()
+        self.assertSequenceEqual(list(data_from_item.x), [4.0, 5.0, 6.0])
+        self.assertSequenceEqual(list(data_from_item.y), [13.0, 14.0, 15.0])
 
 
@@ -162 +194 @@
         # Make sure only the checked data is present
         # FRIDAY IN
-        self.assertIn(test_list0, plot_list[0])
+        self.assertIn(test_list0, plot_list[1])
         # SATURDAY IN
-        self.assertIn(test_list1, plot_list[1])
+        self.assertIn(test_list1, plot_list[0])
         # MONDAY NOT IN
         self.assertNotIn(test_list2, plot_list[0])