Changes in / [b94889a:ef01be4] in sasview
- Location:
- src/sas/qtgui
- Files:
-
- 3 deleted
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
src/sas/qtgui/GuiManager.py
r363fbfa r31c5b58 25 25 from sas.qtgui.SldPanel import SldPanel 26 26 from sas.qtgui.DensityPanel import DensityPanel 27 from sas.qtgui.KiessigPanel import KiessigPanel28 27 29 28 # Perspectives … … 138 137 self.SLDCalculator = SldPanel(self) 139 138 self.DVCalculator = DensityPanel(self) 140 #self.KIESSIGCalculator = DensityPanel(self)#KiessigPanel(self) 141 self.KIESSIGCalculator = KiessigPanel(self) 139 142 140 def statusBarSetup(self): 143 141 """ … … 355 353 self._workspace.actionSLD_Calculator.triggered.connect(self.actionSLD_Calculator) 356 354 self._workspace.actionDensity_Volume_Calculator.triggered.connect(self.actionDensity_Volume_Calculator) 357 self._workspace.actionKeissig_Calculator.triggered.connect(self.actionKiessig_Calculator)358 #self._workspace.actionKIESSING_Calculator.triggered.connect(self.actionKIESSING_Calculator)359 355 self._workspace.actionSlit_Size_Calculator.triggered.connect(self.actionSlit_Size_Calculator) 360 356 self._workspace.actionSAS_Resolution_Estimator.triggered.connect(self.actionSAS_Resolution_Estimator) … … 530 526 self.DVCalculator.show() 531 527 532 def actionKiessig_Calculator(self):533 """534 """535 #self.DVCalculator.show()536 self.KIESSIGCalculator.show()537 538 528 def actionSlit_Size_Calculator(self): 539 529 """ -
src/sas/qtgui/UI/MainWindowUI.ui
r363fbfa r0cd8612 25 25 <y>0</y> 26 26 <width>915</width> 27 <height>2 5</height>27 <height>21</height> 28 28 </rect> 29 29 </property> … … 82 82 </property> 83 83 <addaction name="actionData_Operation"/> 84 <addaction name="separator"/>85 84 <addaction name="actionSLD_Calculator"/> 86 85 <addaction name="actionDensity_Volume_Calculator"/> 87 86 <addaction name="actionSlit_Size_Calculator"/> 88 <addaction name="actionKeissig_Calculator"/>89 87 <addaction name="actionSAS_Resolution_Estimator"/> 90 88 <addaction name="actionGeneric_Scattering_Calculator"/> … … 491 489 </property> 492 490 </action> 493 <action name="actionKeissig_Calculator">494 <property name="text">495 <string>Kiessig Thickness Calculator</string>496 </property>497 </action>498 491 </widget> 499 492 <resources> -
src/sas/qtgui/run_tests.bat
r363fbfa rf51ed67 11 11 python -m UnitTesting.SasviewLoggerTest 12 12 python -m UnitTesting.PlotHelperTest 13 python -m UnitTesting.KiessigCalculatorTest -
src/sas/qtgui/run_tests.sh
r363fbfa r9968d6a 10 10 python -m UnitTesting.SasviewLoggerTest 11 11 python -m UnitTesting.DensityCalculatorTest 12 python -m UnitTesting.KiessigCalculatorTest
Note: See TracChangeset
for help on using the changeset viewer.