Changeset 363fbfa in sasview

Timestamp:

Dec 1, 2016 6:49:00 AM (7 years ago)

Author:

trnielsen

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:

040529d

Parents:

ded2ce3

Message:

Add new Kiessing Calculator

Location:

src/sas/qtgui

Files:

• GuiManager.py (modified) (4 diffs)
• KiessigPanel.py (added)
• UI/KiessigPanel.ui (added)
• UI/MainWindowUI.ui (modified) (3 diffs)
• UnitTesting/KiessigCalculatorTest.py (added)
• run_tests.bat (modified) (1 diff)
• run_tests.sh (modified) (1 diff)

src/sas/qtgui/GuiManager.py

@@ -25 +25 @@
 from sas.qtgui.SldPanel import SldPanel
 from sas.qtgui.DensityPanel import DensityPanel
+from sas.qtgui.KiessigPanel import KiessigPanel
 
 # Perspectives
@@ -137 +138 @@
         self.SLDCalculator = SldPanel(self)
         self.DVCalculator = DensityPanel(self)
-
+        #self.KIESSIGCalculator = DensityPanel(self)#KiessigPanel(self)
+        self.KIESSIGCalculator =  KiessigPanel(self)
     def statusBarSetup(self):
         """
@@ -353 +355 @@
         self._workspace.actionSLD_Calculator.triggered.connect(self.actionSLD_Calculator)
         self._workspace.actionDensity_Volume_Calculator.triggered.connect(self.actionDensity_Volume_Calculator)
+        self._workspace.actionKeissig_Calculator.triggered.connect(self.actionKiessig_Calculator)
+        #self._workspace.actionKIESSING_Calculator.triggered.connect(self.actionKIESSING_Calculator)
         self._workspace.actionSlit_Size_Calculator.triggered.connect(self.actionSlit_Size_Calculator)
         self._workspace.actionSAS_Resolution_Estimator.triggered.connect(self.actionSAS_Resolution_Estimator)
@@ -526 +530 @@
         self.DVCalculator.show()
 
+    def actionKiessig_Calculator(self):
+        """
+        """
+        #self.DVCalculator.show()
+        self.KIESSIGCalculator.show()
+
     def actionSlit_Size_Calculator(self):
         """

src/sas/qtgui/UI/MainWindowUI.ui

@@ -25 +25 @@
      <y>0</y>
      <width>915</width>
-     <height>21</height>
+     <height>25</height>
     </rect>
    </property>
@@ -82 +82 @@
     </property>
     <addaction name="actionData_Operation"/>
+    <addaction name="separator"/>
     <addaction name="actionSLD_Calculator"/>
     <addaction name="actionDensity_Volume_Calculator"/>
     <addaction name="actionSlit_Size_Calculator"/>
+    <addaction name="actionKeissig_Calculator"/>
     <addaction name="actionSAS_Resolution_Estimator"/>
     <addaction name="actionGeneric_Scattering_Calculator"/>
@@ -489 +491 @@
    </property>
   </action>
+  <action name="actionKeissig_Calculator">
+   <property name="text">
+    <string>Kiessig Thickness Calculator</string>
+   </property>
+  </action>
  </widget>
  <resources>

src/sas/qtgui/run_tests.bat

@@ -11 +11 @@
 python -m UnitTesting.SasviewLoggerTest
 python -m UnitTesting.PlotHelperTest
+python -m UnitTesting.KiessigCalculatorTest

src/sas/qtgui/run_tests.sh

@@ -10 +10 @@
 python -m UnitTesting.SasviewLoggerTest
 python -m UnitTesting.DensityCalculatorTest
+python -m UnitTesting.KiessigCalculatorTest