Changeset 93c79b5 in sasview for src/sas/qtgui/MainWindow

Timestamp:

Apr 25, 2018 6:08:35 AM (6 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:

d4dac80

Parents:

27689dc (diff), 38f838e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'ESS_GUI' into ESS_GUI_sum_editor

Location:

src/sas/qtgui/MainWindow

Files:

• MainWindow.py (modified) (2 diffs)
• GuiManager.py (modified) (3 diffs)
• UI/MainWindowUI.ui (modified) (3 diffs)

src/sas/qtgui/MainWindow/MainWindow.py

@@ -50 +50 @@
     return splashScreen
 
-def run():
+def run_sasview():
     app = QApplication([])
 
@@ -85 +85 @@
 
 if __name__ == "__main__":
-    run()
+    run_sasview()

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):
+        """
+        """
+        # Add Simple Add/Multiply Editor
+        self.add_mult_editor = AddMultEditor(self)
+        self.add_mult_editor.show()
+
     #============ 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/>