Changeset 01ef3f7 in sasview for src/sas/qtgui

Timestamp:

Apr 19, 2018 9:30:04 AM (7 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:

• GUITests.py (modified) (2 diffs)
• MainWindow/GuiManager.py (modified) (3 diffs)
• MainWindow/UI/MainWindowUI.ui (modified) (3 diffs)
• Utilities/AddMultEditor.py (added)
• Utilities/UI/AddMultEditorUI.ui (added)
• Utilities/UnitTesting/AddMultEditorTest.py (added)

src/sas/qtgui/GUITests.py

@@ -48 +48 @@
 from Utilities.UnitTesting import PluginDefinitionTest
 from Utilities.UnitTesting import TabbedModelEditorTest
+from Utilities.UnitTesting import AddMultEditorTest
 
 # Unit Testing
@@ -107 +108 @@
         unittest.makeSuite(PluginDefinitionTest.PluginDefinitionTest,  'test'),
         unittest.makeSuite(TabbedModelEditorTest.TabbedModelEditorTest,'test'),
+        unittest.makeSuite(AddMultEditorTest.AddMultEditorTest, 'test'),
 
         # Calculators

src/sas/qtgui/MainWindow/GuiManager.py

@@ -39 +39 @@
 from sas.qtgui.Perspectives.Fitting.FittingPerspective import FittingWindow
 from sas.qtgui.MainWindow.DataExplorer import DataExplorerWindow, DEFAULT_PERSPECTIVE
+
+from sas.qtgui.Utilities.AddMultEditor import AddMultEditor
 
 class Acknowledgements(QDialog, Ui_Acknowledgements):
@@ -407 +409 @@
         self._workspace.actionEdit_Custom_Model.triggered.connect(self.actionEdit_Custom_Model)
         self._workspace.actionManage_Custom_Models.triggered.connect(self.actionManage_Custom_Models)
+        self._workspace.actionAddMult_Models.triggered.connect(self.actionAddMult_Models)
         # Window
         self._workspace.actionCascade.triggered.connect(self.actionCascade)
@@ -681 +684 @@
         self.model_manager.show()
 
+    def actionAddMult_Models(self):
+        """
+        """
+        print("Open simple add / multiply editor")
+        # Add Simple Add / Multiple Editor
+        self.add_mult_editor = AddMultEditor(self)
+        self.add_mult_editor.show()
+        # pass
+
     #============ ANALYSIS =================
     def actionFitting(self):

src/sas/qtgui/MainWindow/UI/MainWindowUI.ui

@@ -25 +25 @@
      <y>0</y>
      <width>915</width>
-     <height>26</height>
+     <height>22</height>
     </rect>
    </property>
@@ -111 +111 @@
     <addaction name="actionEdit_Custom_Model"/>
     <addaction name="actionManage_Custom_Models"/>
+    <addaction name="actionAddMult_Models"/>
    </widget>
    <widget class="QMenu" name="menuWindow">
@@ -526 +527 @@
    </property>
   </action>
+  <action name="actionAddMult_Models">
+   <property name="text">
+    <string>Add/Multiply Models</string>
+   </property>
+  </action>
  </widget>
  <resources/>