Changeset 28a09b0 in sasview

Timestamp:

May 1, 2017 3:34:05 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:

0a6e097

Parents:

61a92d4

Message:

Merged Celine's implementation of the generic scattering calculator

Location:

src/sas/qtgui

Files:

• Calculators/GenericScatteringCalculator.py (added)
• Calculators/UI/GenericScatteringCalculator.ui (added)
• Calculators/UnitTesting/GenericScatteringCalculatorTest.py (added)
• GUITests.py (modified) (2 diffs)
• MainWindow/GuiManager.py (modified) (3 diffs)

src/sas/qtgui/GUITests.py

@@ -29 +29 @@
 from Calculators.UnitTesting import KiessigCalculatorTest
 from Calculators.UnitTesting import DensityCalculatorTest
+from Calculators.UnitTesting import GenericScatteringCalculatorTest
 
 # Utilities
@@ -80 +81 @@
         unittest.makeSuite(KiessigCalculatorTest.KiessigCalculatorTest, 'test'),
         unittest.makeSuite(DensityCalculatorTest.DensityCalculatorTest, 'test'),
+        unittest.makeSuite(GenericScatteringCalculatorTest.GenericScatteringCalculatorTest, 'test'),
 
         # Perspectives

src/sas/qtgui/MainWindow/GuiManager.py

@@ -28 +28 @@
 from sas.qtgui.Calculators.KiessigPanel import KiessigPanel
 from sas.qtgui.Calculators.SlitSizeCalculator import SlitSizeCalculator
+from sas.qtgui.Calculators.GenericScatteringCalculator import GenericScatteringCalculator
 
 # Perspectives
@@ -139 +140 @@
         self.KIESSIGCalculator = KiessigPanel(self)
         self.SlitSizeCalculator = SlitSizeCalculator(self)
+        self.GENSASCalculator = GenericScatteringCalculator(self)
 
     def statusBarSetup(self):
@@ -560 +562 @@
         """
         """
-        print("actionGeneric_Scattering_Calculator TRIGGERED")
-        pass
+        self.GENSASCalculator.show()
 
     def actionPython_Shell_Editor(self):