fixes Issues #3, #4, #6

ui/QDSMain.py

@@ -2,8 +2,8 @@
 
 # Form implementation generated from reading ui file 'ui/QDSMain.ui'
 #
-# Created: Tue Sep 30 15:34:02 2014
-#      by: PyQt4 UI code generator 4.11.2
+# Created: Fri Jan  9 21:17:26 2015
+#      by: PyQt4 UI code generator 4.11.3
 #
 # WARNING! All changes made in this file will be lost!
 
@@ -125,6 +125,11 @@ class Ui_MainWindow(object):
         self.actionActionAbortFit.setObjectName(_fromUtf8("actionActionAbortFit"))
         self.actionShow_Derivative = QtGui.QAction(MainWindow)
         self.actionShow_Derivative.setObjectName(_fromUtf8("actionShow_Derivative"))
+        self.actionAppend_Fit = QtGui.QAction(MainWindow)
+        icon6 = QtGui.QIcon()
+        icon6.addPixmap(QtGui.QPixmap(_fromUtf8(":/icons/append_save_fit.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        self.actionAppend_Fit.setIcon(icon6)
+        self.actionAppend_Fit.setObjectName(_fromUtf8("actionAppend_Fit"))
         self.menuExtras.addAction(self.actionShow_Derivative)
         self.menubar.addAction(self.menuExtras.menuAction())
         self.menubar.addAction(self.menuConfiguration.menuAction())
@@ -136,6 +141,8 @@ class Ui_MainWindow(object):
         self.toolBar.addAction(self.actionYAFF)
         self.toolBar.addSeparator()
         self.toolBar.addAction(self.actionSave_FitResult)
+        self.toolBar.addAction(self.actionAppend_Fit)
+        self.toolBar.addSeparator()
         self.toolBar.addAction(self.actionActionAbortFit)
 
         self.retranslateUi(MainWindow)
@@ -160,6 +167,8 @@ class Ui_MainWindow(object):
         self.actionActionAbortFit.setText(_translate("MainWindow", "Abort Fit", None))
         self.actionActionAbortFit.setShortcut(_translate("MainWindow", "Ctrl+C", None))
         self.actionShow_Derivative.setText(_translate("MainWindow", "Show Derivative", None))
+        self.actionAppend_Fit.setText(_translate("MainWindow", "Append Fit", None))
+        self.actionAppend_Fit.setToolTip(_translate("MainWindow", "Appends current plot to existing plot.", None))
 
 from pyqtgraph import PlotWidget
 import images_rc

ui/QDSMain.ui

@@ -109,6 +109,8 @@
    <addaction name="actionYAFF"/>
    <addaction name="separator"/>
    <addaction name="actionSave_FitResult"/>
+   <addaction name="actionAppend_Fit"/>
+   <addaction name="separator"/>
    <addaction name="actionActionAbortFit"/>
   </widget>
   <widget class="QDockWidget" name="dockWidget_3">
@@ -221,6 +223,18 @@
     <string>Show Derivative</string>
    </property>
   </action>
+  <action name="actionAppend_Fit">
+   <property name="icon">
+    <iconset resource="icons/images.qrc">
+     <normaloff>:/icons/append_save_fit.png</normaloff>:/icons/append_save_fit.png</iconset>
+   </property>
+   <property name="text">
+    <string>Append Fit</string>
+   </property>
+   <property name="toolTip">
+    <string>Appends current plot to existing plot.</string>
+   </property>
+  </action>
  </widget>
  <customwidgets>
   <customwidget>

ui/icons/images.qrc

@@ -1,6 +1,7 @@
 <RCC>
   <qresource prefix="icons">
     <file>add_cond.svg</file>
+    <file>append_save_fit.png</file>
     <file>add_yaff.png</file>
     <file>add_eps_infty.png</file>
     <file>qds_fit_abort.png</file>