Ignore:
Timestamp:
May 1, 2017 3:34:05 AM (8 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

File:
1 edited

Legend:

Unmodified
Added
Removed

  • src/sas/qtgui/MainWindow/GuiManager.py

    r9d266d2 r28a09b0  
    2828from sas.qtgui.Calculators.KiessigPanel import KiessigPanel 
    2929from sas.qtgui.Calculators.SlitSizeCalculator import SlitSizeCalculator 
     30from sas.qtgui.Calculators.GenericScatteringCalculator import GenericScatteringCalculator 
    3031 
    3132# Perspectives 
    … …  
    139140        self.KIESSIGCalculator = KiessigPanel(self) 
    140141        self.SlitSizeCalculator = SlitSizeCalculator(self) 
     142        self.GENSASCalculator = GenericScatteringCalculator(self) 
    141143 
    142144    def statusBarSetup(self): 
    … …  
    560562        """ 
    561563        """ 
    562         print("actionGeneric_Scattering_Calculator TRIGGERED") 
    563         pass 
     564        self.GENSASCalculator.show() 
    564565 
    565566    def actionPython_Shell_Editor(self): 
Note: See TracChangeset for help on using the changeset viewer.