Changeset 61a8b58 in sasview for src/sas/qtgui

Timestamp:

Sep 29, 2017 3:46:22 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:

7d8bebf

Parents:

7d97e2d (diff), 7d353af (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_SasView250' into ESS_GUI

Location:

src/sas/qtgui

Files:

• Calculators/ResolutionCalculatorPanel.py (added)
• Calculators/UI/ResolutionCalculatorPanelUI.ui (added)
• Calculators/UnitTesting/ResolutionCalculatorPanelTest.py (added)
• GUITests.py (modified) (3 diffs)
• MainWindow/GuiManager.py (modified) (3 diffs)
• Plotting/Plotter2D.py (modified) (2 diffs)

src/sas/qtgui/GUITests.py

@@ -37 +37 @@
 from Calculators.UnitTesting import SLDCalculatorTest
 from Calculators.UnitTesting import SlitSizeCalculatorTest
+from Calculators.UnitTesting import ResolutionCalculatorPanelTest
 
 # Utilities
@@ -92 +93 @@
         unittest.makeSuite(SLDCalculatorTest.SLDCalculatorTest, 'test'),
         unittest.makeSuite(SlitSizeCalculatorTest.SlitSizeCalculatorTest, 'test'),
+        unittest.makeSuite(ResolutionCalculatorPanelTest.ResolutionCalculatorPanelTest, 'test'),
 
         # Perspectives
@@ -100 +102 @@
         unittest.makeSuite(FitPageTest.FitPageTest,                       'test'),
         unittest.makeSuite(FittingOptionsTest.FittingOptionsTest,         'test'),
-    )
+     )
     return unittest.TestSuite(suites)
 

src/sas/qtgui/MainWindow/GuiManager.py

@@ -30 +30 @@
 from sas.qtgui.Calculators.SlitSizeCalculator import SlitSizeCalculator
 from sas.qtgui.Calculators.GenericScatteringCalculator import GenericScatteringCalculator
+from sas.qtgui.Calculators.ResolutionCalculatorPanel import ResolutionCalculatorPanel
+
 
 # Perspectives
@@ -136 +138 @@
         self.SLDCalculator = SldPanel(self)
         self.DVCalculator = DensityPanel(self)
-        #self.KIESSIGCalculator = DensityPanel(self)#KiessigPanel(self)
         self.KIESSIGCalculator = KiessigPanel(self)
         self.SlitSizeCalculator = SlitSizeCalculator(self)
         self.GENSASCalculator = GenericScatteringCalculator(self)
+        self.ResolutionCalculator = ResolutionCalculatorPanel(self)
 
     def statusBarSetup(self):
@@ -556 +558 @@
         """
         """
-        print("actionSAS_Resolution_Estimator TRIGGERED")
-        pass
+        self.ResolutionCalculator.show()
 
     def actionGeneric_Scattering_Calculator(self):

src/sas/qtgui/Plotting/Plotter2D.py

@@ -429 +429 @@
 
             im = self.ax.imshow(output, interpolation='nearest',
-                                origin='lower',
+                                # origin='lower',
                                 vmin=zmin_temp, vmax=zmax_temp,
                                 cmap=self.cmap,
@@ -494 +494 @@
         """
         Replace data in current chart.
-        This effectlvely refreshes the chart with changes to one of its plots
+        This effectively refreshes the chart with changes to one of its plots
         """
         self.plot(data=new_plot)