Changeset 70080a0 in sasview

Timestamp:

Jun 8, 2017 5:10:49 AM (8 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:

919d47c

Parents:

06b0138

Message:

Added tab-dependent help display in fiting

Location:

src/sas/qtgui/Perspectives/Fitting

Files:

• FittingWidget.py (modified) (1 diff)
• UnitTesting/FittingWidgetTest.py (modified) (2 diffs)

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

@@ -544 +544 @@
         Show the "Fitting" section of help
         """
-        tree_location = self.parent.HELP_DIRECTORY_LOCATION +\
-            "/user/sasgui/perspectives/fitting/fitting_help.html"
-        self.helpView.load(QtCore.QUrl(tree_location))
+        tree_location = self.parent.HELP_DIRECTORY_LOCATION + "/user/sasgui/perspectives/fitting/"
+
+        # Actual file will depend on the current tab
+        tab_id = self.tabFitting.currentIndex()
+        helpfile = "fitting.html"
+        if tab_id == 0:
+            helpfile = "fitting_help.html"
+        elif tab_id == 1:
+            helpfile = "residuals_help.html"
+        elif tab_id == 2:
+            helpfile = "sm_help.html"
+        elif tab_id == 3:
+            helpfile = "pd_help.html"
+        elif tab_id == 4:
+            helpfile = "mag_help.html"
+        help_location = tree_location + helpfile
+        self.helpView.load(QtCore.QUrl(help_location))
         self.helpView.show()
 

src/sas/qtgui/Perspectives/Fitting/UnitTesting/FittingWidgetTest.py

@@ -23 +23 @@
 
 class dummy_manager(object):
+    HELP_DIRECTORY_LOCATION = "html"
     communicate = Communicate()
 
@@ -677 +678 @@
             self.assertEqual(update_spy.count(), 1)
 
+    def testOnHelp(self):
+        """
+        Test various help pages shown in this widget
+        """
+        #Mock the QWebView method
+        QtWebKit.QWebView.show = MagicMock()
+        QtWebKit.QWebView.load = MagicMock()
+
+        # Invoke the action on default tab
+        self.widget.onHelp()
+        # Check if show() got called
+        self.assertTrue(QtWebKit.QWebView.show.called)
+        # Assure the filename is correct
+        self.assertIn("fitting_help.html", QtWebKit.QWebView.load.call_args[0][0].toString())
+
+        # Change the tab to options
+        self.widget.tabFitting.setCurrentIndex(1)
+        self.widget.onHelp()
+        # Check if show() got called
+        self.assertEqual(QtWebKit.QWebView.show.call_count, 2)
+        # Assure the filename is correct
+        self.assertIn("residuals_help.html", QtWebKit.QWebView.load.call_args[0][0].toString())
+
+        # Change the tab to smearing
+        self.widget.tabFitting.setCurrentIndex(2)
+        self.widget.onHelp()
+        # Check if show() got called
+        self.assertEqual(QtWebKit.QWebView.show.call_count, 3)
+        # Assure the filename is correct
+        self.assertIn("sm_help.html", QtWebKit.QWebView.load.call_args[0][0].toString())
+
+        # Change the tab to poly
+        self.widget.tabFitting.setCurrentIndex(3)
+        self.widget.onHelp()
+        # Check if show() got called
+        self.assertEqual(QtWebKit.QWebView.show.call_count, 4)
+        # Assure the filename is correct
+        self.assertIn("pd_help.html", QtWebKit.QWebView.load.call_args[0][0].toString())
+
+        # Change the tab to magnetism
+        self.widget.tabFitting.setCurrentIndex(4)
+        self.widget.onHelp()
+        # Check if show() got called
+        self.assertEqual(QtWebKit.QWebView.show.call_count, 5)
+        # Assure the filename is correct
+        self.assertIn("mag_help.html", QtWebKit.QWebView.load.call_args[0][0].toString())
+
     def testReadFitPage(self):
         """