Changeset 3c6ecd9 in sasview for src/sas/qtgui/Perspectives/Invariant

Timestamp:

May 7, 2018 6:47:21 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:

42787fb

Parents:

b0ba43e (diff), 80468f6 (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' into ESS_GUI_Pr

Location:

src/sas/qtgui/Perspectives/Invariant

Files:

• InvariantPerspective.py (modified) (1 diff)
• UnitTesting/InvariantPerspectiveTest.py (modified) (1 diff, 1 prop)
• media/bookmark.png (moved) (moved from src/sas/sasgui/perspectives/invariant/media/bookmark.png) (1 prop)
• media/image005.png (moved) (moved from src/sas/sasgui/perspectives/invariant/media/image005.png) (1 prop)
• media/invariant_help.rst (moved) (moved from src/sas/sasgui/perspectives/invariant/media/invariant_help.rst) (1 prop)
• media/redo.png (moved) (moved from src/sas/sasgui/perspectives/invariant/media/redo.png) (1 prop)
• media/report.png (moved) (moved from src/sas/sasgui/perspectives/invariant/media/report.png) (1 prop)
• media/report_template.html (moved) (moved from src/sas/sasgui/perspectives/invariant/media/report_template.html) (1 prop)
• media/save.png (moved) (moved from src/sas/sasgui/perspectives/invariant/media/save.png) (1 prop)
• media/undo.png (moved) (moved from src/sas/sasgui/perspectives/invariant/media/undo.png) (1 prop)

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

@@ -429 +429 @@
     def onHelp(self):
         """ Display help when clicking on Help button """
-        treeLocation = "/user/sasgui/perspectives/invariant/invariant_help.html"
+        treeLocation = "/user/qtgui/Perspectives/Invariant/invariant_help.html"
         self.parent.showHelp(treeLocation)
 

src/sas/qtgui/Perspectives/Invariant/UnitTesting/InvariantPerspectiveTest.py

@@ -90 +90 @@
         self.assertFalse(self.widget.txtPorodCst.isReadOnly())
 
-        self.assertFalse(self.widget.txtExtrapolQMin.isEnabled())
-        self.assertFalse(self.widget.txtExtrapolQMax.isEnabled())
+        self.assertTrue(self.widget.txtExtrapolQMin.isEnabled())
+        self.assertTrue(self.widget.txtExtrapolQMax.isEnabled())
 
         self.assertFalse(self.widget.txtNptsLowQ.isReadOnly())