Changeset 01ef3f7 in sasview for src/sas/qtgui


Ignore:
Timestamp:
Apr 19, 2018 7:30:04 AM (6 years ago)
Author:
celinedurniak <celine.durniak@…>
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:
3b8cc00
Parents:
d6e38661
Message:

Implemented new GUI for Add/Multiply? models

Location:
src/sas/qtgui
Files:
3 added
3 edited

Legend:

Unmodified
Added
Removed
  • src/sas/qtgui/GUITests.py

    r3b3b40b r01ef3f7  
    4848from Utilities.UnitTesting import PluginDefinitionTest 
    4949from Utilities.UnitTesting import TabbedModelEditorTest 
     50from Utilities.UnitTesting import AddMultEditorTest 
    5051 
    5152# Unit Testing 
     
    107108        unittest.makeSuite(PluginDefinitionTest.PluginDefinitionTest,  'test'), 
    108109        unittest.makeSuite(TabbedModelEditorTest.TabbedModelEditorTest,'test'), 
     110        unittest.makeSuite(AddMultEditorTest.AddMultEditorTest, 'test'), 
    109111 
    110112        # Calculators 
  • src/sas/qtgui/MainWindow/GuiManager.py

    r8ac3551 r01ef3f7  
    3939from sas.qtgui.Perspectives.Fitting.FittingPerspective import FittingWindow 
    4040from sas.qtgui.MainWindow.DataExplorer import DataExplorerWindow, DEFAULT_PERSPECTIVE 
     41 
     42from sas.qtgui.Utilities.AddMultEditor import AddMultEditor 
    4143 
    4244class Acknowledgements(QDialog, Ui_Acknowledgements): 
     
    407409        self._workspace.actionEdit_Custom_Model.triggered.connect(self.actionEdit_Custom_Model) 
    408410        self._workspace.actionManage_Custom_Models.triggered.connect(self.actionManage_Custom_Models) 
     411        self._workspace.actionAddMult_Models.triggered.connect(self.actionAddMult_Models) 
    409412        # Window 
    410413        self._workspace.actionCascade.triggered.connect(self.actionCascade) 
     
    681684        self.model_manager.show() 
    682685 
     686    def actionAddMult_Models(self): 
     687        """ 
     688        """ 
     689        print("Open simple add / multiply editor") 
     690        # Add Simple Add / Multiple Editor 
     691        self.add_mult_editor = AddMultEditor(self) 
     692        self.add_mult_editor.show() 
     693        # pass 
     694 
    683695    #============ ANALYSIS ================= 
    684696    def actionFitting(self): 
  • src/sas/qtgui/MainWindow/UI/MainWindowUI.ui

    r8ac3551 r01ef3f7  
    2525     <y>0</y> 
    2626     <width>915</width> 
    27      <height>26</height> 
     27     <height>22</height> 
    2828    </rect> 
    2929   </property> 
     
    111111    <addaction name="actionEdit_Custom_Model"/> 
    112112    <addaction name="actionManage_Custom_Models"/> 
     113    <addaction name="actionAddMult_Models"/> 
    113114   </widget> 
    114115   <widget class="QMenu" name="menuWindow"> 
     
    526527   </property> 
    527528  </action> 
     529  <action name="actionAddMult_Models"> 
     530   <property name="text"> 
     531    <string>Add/Multiply Models</string> 
     532   </property> 
     533  </action> 
    528534 </widget> 
    529535 <resources/> 
Note: See TracChangeset for help on using the changeset viewer.