diff --git a/ExtraDifferential.py b/ExtraDifferential.py index 1e72653..1ea5897 100644 --- a/ExtraDifferential.py +++ b/ExtraDifferential.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'ExtraDifferential.ui' # -# Created: Tue Jul 29 08:56:48 2014 +# Created: Tue Sep 23 21:38:12 2014 # by: PyQt4 UI code generator 4.11.1 # # WARNING! All changes made in this file will be lost! diff --git a/PeakGroupBox.py b/PeakGroupBox.py index b24c03b..c785dd9 100644 --- a/PeakGroupBox.py +++ b/PeakGroupBox.py @@ -2,8 +2,8 @@ # Form implementation generated from reading ui file 'PeakGroupBox.ui' # -# Created: Tue Jul 29 08:56:47 2014 -# by: PyQt4 UI code generator 4.11.1 +# Created: Tue Sep 23 21:38:12 2014 +# by: PyQt4 UI code generator 4.11.1 # # WARNING! All changes made in this file will be lost! @@ -12,21 +12,19 @@ from PyQt4 import QtCore, QtGui try: _fromUtf8 = QtCore.QString.fromUtf8 except AttributeError: - def _fromUtf8( s ): + def _fromUtf8(s): return s try: _encoding = QtGui.QApplication.UnicodeUTF8 - - def _translate( context, text, disambig ): + def _translate(context, text, disambig): return QtGui.QApplication.translate(context, text, disambig, _encoding) except AttributeError: - def _translate( context, text, disambig ): + def _translate(context, text, disambig): return QtGui.QApplication.translate(context, text, disambig) - class Ui_PeakGroupBox(object): - def setupUi( self, PeakGroupBox ): + def setupUi(self, PeakGroupBox): PeakGroupBox.setObjectName(_fromUtf8("PeakGroupBox")) PeakGroupBox.setEnabled(True) PeakGroupBox.resize(269, 179) @@ -73,7 +71,7 @@ class Ui_PeakGroupBox(object): self.removeButton.setSizePolicy(sizePolicy) self.removeButton.setMinimumSize(QtCore.QSize(0, 0)) self.removeButton.setObjectName(_fromUtf8("removeButton")) - self.gridLayout.addWidget(self.removeButton, 0, 1, 1, 1, QtCore.Qt.AlignHCenter | QtCore.Qt.AlignVCenter) + self.gridLayout.addWidget(self.removeButton, 0, 1, 1, 1, QtCore.Qt.AlignHCenter|QtCore.Qt.AlignVCenter) self.label_1 = QtGui.QLabel(PeakGroupBox) sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Preferred) sizePolicy.setHorizontalStretch(0) @@ -155,14 +153,14 @@ class Ui_PeakGroupBox(object): self.comboBox.addItem(_fromUtf8("")) self.comboBox.addItem(_fromUtf8("")) self.comboBox.addItem(_fromUtf8("")) - self.gridLayout.addWidget(self.comboBox, 0, 2, 1, 1, QtCore.Qt.AlignHCenter | QtCore.Qt.AlignVCenter) + self.gridLayout.addWidget(self.comboBox, 0, 2, 1, 1, QtCore.Qt.AlignHCenter|QtCore.Qt.AlignVCenter) self.gridLayout_2.addLayout(self.gridLayout, 0, 0, 1, 1) self.retranslateUi(PeakGroupBox) QtCore.QObject.connect(self.removeButton, QtCore.SIGNAL(_fromUtf8("clicked()")), PeakGroupBox.hide) QtCore.QMetaObject.connectSlotsByName(PeakGroupBox) - def retranslateUi( self, PeakGroupBox ): + def retranslateUi(self, PeakGroupBox): PeakGroupBox.setWindowTitle(_translate("PeakGroupBox", "GroupBox", None)) PeakGroupBox.setTitle(_translate("PeakGroupBox", "GroupBox", None)) self.label.setText(_translate("PeakGroupBox", "Fix", None)) @@ -171,13 +169,9 @@ class Ui_PeakGroupBox(object): self.label_6.setText(_translate("PeakGroupBox", "TextLabel", None)) self.removeButton.setText(_translate("PeakGroupBox", "Remove", None)) self.label_1.setText(_translate("PeakGroupBox", "Δε", None)) - self.label_3.setText(_translate("PeakGroupBox", - "

γCC

", - None)) + self.label_3.setText(_translate("PeakGroupBox", "

γCC

", None)) self.label_8.setText(_translate("PeakGroupBox", "TextLabel", None)) - self.label_4.setText(_translate("PeakGroupBox", - "

βCD

", - None)) + self.label_4.setText(_translate("PeakGroupBox", "

βCD

", None)) self.label_2.setText(_translate("PeakGroupBox", "τ", None)) self.comboBox.setItemText(0, _translate("PeakGroupBox", "H-N", None)) self.comboBox.setItemText(1, _translate("PeakGroupBox", "C-C", None)) diff --git a/PowerLawGroupBox.py b/PowerLawGroupBox.py index 82bf8dd..3f25fed 100644 --- a/PowerLawGroupBox.py +++ b/PowerLawGroupBox.py @@ -2,8 +2,8 @@ # Form implementation generated from reading ui file 'PowerLawGroupBox.ui' # -# Created: Tue Jul 29 08:56:48 2014 -# by: PyQt4 UI code generator 4.11.1 +# Created: Tue Sep 23 21:38:12 2014 +# by: PyQt4 UI code generator 4.11.1 # # WARNING! All changes made in this file will be lost! @@ -12,21 +12,19 @@ from PyQt4 import QtCore, QtGui try: _fromUtf8 = QtCore.QString.fromUtf8 except AttributeError: - def _fromUtf8( s ): + def _fromUtf8(s): return s try: _encoding = QtGui.QApplication.UnicodeUTF8 - - def _translate( context, text, disambig ): + def _translate(context, text, disambig): return QtGui.QApplication.translate(context, text, disambig, _encoding) except AttributeError: - def _translate( context, text, disambig ): + def _translate(context, text, disambig): return QtGui.QApplication.translate(context, text, disambig) - class Ui_PowerLawGroupBox(object): - def setupUi( self, PowerLawGroupBox ): + def setupUi(self, PowerLawGroupBox): PowerLawGroupBox.setObjectName(_fromUtf8("PowerLawGroupBox")) PowerLawGroupBox.resize(206, 129) sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Preferred) @@ -63,7 +61,7 @@ class Ui_PowerLawGroupBox(object): self.checkBox_3.setText(_fromUtf8("")) self.checkBox_3.setChecked(True) self.checkBox_3.setObjectName(_fromUtf8("checkBox_3")) - self.gridLayout.addWidget(self.checkBox_3, 2, 3, 1, 1, QtCore.Qt.AlignHCenter | QtCore.Qt.AlignVCenter) + self.gridLayout.addWidget(self.checkBox_3, 2, 3, 1, 1, QtCore.Qt.AlignHCenter|QtCore.Qt.AlignVCenter) self.label_6 = QtGui.QLabel(PowerLawGroupBox) self.label_6.setObjectName(_fromUtf8("label_6")) self.gridLayout.addWidget(self.label_6, 2, 2, 1, 1) @@ -121,7 +119,7 @@ class Ui_PowerLawGroupBox(object): QtCore.QObject.connect(self.removeButton, QtCore.SIGNAL(_fromUtf8("clicked()")), PowerLawGroupBox.hide) QtCore.QMetaObject.connectSlotsByName(PowerLawGroupBox) - def retranslateUi( self, PowerLawGroupBox ): + def retranslateUi(self, PowerLawGroupBox): PowerLawGroupBox.setWindowTitle(_translate("PowerLawGroupBox", "GroupBox", None)) PowerLawGroupBox.setTitle(_translate("PowerLawGroupBox", "Power Law", None)) self.label.setText(_translate("PowerLawGroupBox", "Fix", None)) diff --git a/QDSMain.py b/QDSMain.py index f29ca6f..9abd287 100644 --- a/QDSMain.py +++ b/QDSMain.py @@ -2,8 +2,8 @@ # Form implementation generated from reading ui file 'QDSMain.ui' # -# Created: Tue Jul 29 08:56:47 2014 -# by: PyQt4 UI code generator 4.11.1 +# Created: Tue Sep 23 21:38:12 2014 +# by: PyQt4 UI code generator 4.11.1 # # WARNING! All changes made in this file will be lost! @@ -12,21 +12,19 @@ from PyQt4 import QtCore, QtGui try: _fromUtf8 = QtCore.QString.fromUtf8 except AttributeError: - def _fromUtf8( s ): + def _fromUtf8(s): return s try: _encoding = QtGui.QApplication.UnicodeUTF8 - - def _translate( context, text, disambig ): + def _translate(context, text, disambig): return QtGui.QApplication.translate(context, text, disambig, _encoding) except AttributeError: - def _translate( context, text, disambig ): + def _translate(context, text, disambig): return QtGui.QApplication.translate(context, text, disambig) - class Ui_MainWindow(object): - def setupUi( self, MainWindow ): + def setupUi(self, MainWindow): MainWindow.setObjectName(_fromUtf8("MainWindow")) MainWindow.resize(956, 699) sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Maximum, QtGui.QSizePolicy.Maximum) @@ -79,7 +77,7 @@ class Ui_MainWindow(object): self.toolBar.setObjectName(_fromUtf8("toolBar")) MainWindow.addToolBar(QtCore.Qt.TopToolBarArea, self.toolBar) self.dockWidget_3 = QtGui.QDockWidget(MainWindow) - self.dockWidget_3.setFeatures(QtGui.QDockWidget.DockWidgetFloatable | QtGui.QDockWidget.DockWidgetMovable) + self.dockWidget_3.setFeatures(QtGui.QDockWidget.DockWidgetFloatable|QtGui.QDockWidget.DockWidgetMovable) self.dockWidget_3.setObjectName(_fromUtf8("dockWidget_3")) self.dockWidgetContents_4 = QtGui.QWidget() self.dockWidgetContents_4.setObjectName(_fromUtf8("dockWidgetContents_4")) @@ -140,7 +138,7 @@ class Ui_MainWindow(object): self.retranslateUi(MainWindow) QtCore.QMetaObject.connectSlotsByName(MainWindow) - def retranslateUi( self, MainWindow ): + def retranslateUi(self, MainWindow): MainWindow.setWindowTitle(_translate("MainWindow", "MainWindow", None)) self.menuExtras.setTitle(_translate("MainWindow", "Extras", None)) self.toolBar.setWindowTitle(_translate("MainWindow", "toolBar", None)) @@ -159,6 +157,5 @@ class Ui_MainWindow(object): self.actionActionAbortFit.setShortcut(_translate("MainWindow", "Ctrl+C", None)) self.actionShow_Derivative.setText(_translate("MainWindow", "Show Derivative", None)) - from pyqtgraph import PlotWidget import images_rc diff --git a/StaticGroupBox.py b/StaticGroupBox.py index 27ab7f1..5c8e8f8 100644 --- a/StaticGroupBox.py +++ b/StaticGroupBox.py @@ -2,8 +2,8 @@ # Form implementation generated from reading ui file 'StaticGroupBox.ui' # -# Created: Tue Jul 29 08:56:48 2014 -# by: PyQt4 UI code generator 4.11.1 +# Created: Tue Sep 23 21:38:12 2014 +# by: PyQt4 UI code generator 4.11.1 # # WARNING! All changes made in this file will be lost! @@ -12,21 +12,19 @@ from PyQt4 import QtCore, QtGui try: _fromUtf8 = QtCore.QString.fromUtf8 except AttributeError: - def _fromUtf8( s ): + def _fromUtf8(s): return s try: _encoding = QtGui.QApplication.UnicodeUTF8 - - def _translate( context, text, disambig ): + def _translate(context, text, disambig): return QtGui.QApplication.translate(context, text, disambig, _encoding) except AttributeError: - def _translate( context, text, disambig ): + def _translate(context, text, disambig): return QtGui.QApplication.translate(context, text, disambig) - class Ui_StaticGroupBox(object): - def setupUi( self, StaticGroupBox ): + def setupUi(self, StaticGroupBox): StaticGroupBox.setObjectName(_fromUtf8("StaticGroupBox")) StaticGroupBox.resize(218, 102) sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Preferred) @@ -85,20 +83,18 @@ class Ui_StaticGroupBox(object): self.checkBox_1.setText(_fromUtf8("")) self.checkBox_1.setChecked(True) self.checkBox_1.setObjectName(_fromUtf8("checkBox_1")) - self.gridLayout.addWidget(self.checkBox_1, 1, 3, 1, 1, QtCore.Qt.AlignHCenter | QtCore.Qt.AlignVCenter) + self.gridLayout.addWidget(self.checkBox_1, 1, 3, 1, 1, QtCore.Qt.AlignHCenter|QtCore.Qt.AlignVCenter) self.gridLayout_2.addLayout(self.gridLayout, 0, 0, 1, 1) self.retranslateUi(StaticGroupBox) QtCore.QObject.connect(self.removeButton, QtCore.SIGNAL(_fromUtf8("clicked()")), StaticGroupBox.hide) QtCore.QMetaObject.connectSlotsByName(StaticGroupBox) - def retranslateUi( self, StaticGroupBox ): + def retranslateUi(self, StaticGroupBox): StaticGroupBox.setWindowTitle(_translate("StaticGroupBox", "GroupBox", None)) StaticGroupBox.setTitle(_translate("StaticGroupBox", "e\'_infty", None)) self.label.setText(_translate("StaticGroupBox", "Fix", None)) self.removeButton.setText(_translate("StaticGroupBox", "Remove", None)) self.label_4.setText(_translate("StaticGroupBox", "TextLabel", None)) - self.label_1.setText(_translate("StaticGroupBox", - "

εinfty

", - None)) + self.label_1.setText(_translate("StaticGroupBox", "

εinfty

", None)) diff --git a/images_rc.py b/images_rc.py index c00c944..b79f1f4 100644 --- a/images_rc.py +++ b/images_rc.py @@ -2,8 +2,8 @@ # Resource object code # -# Created: Di. Juli 29 08:56:47 2014 -# by: The Resource Compiler for PyQt (Qt v4.8.6) +# Created: Di. Sep. 23 21:38:12 2014 +# by: The Resource Compiler for PyQt (Qt v4.8.6) # # WARNING! All changes made in this file will be lost! @@ -5550,13 +5550,10 @@ qt_resource_struct = "\ \x00\x00\x00\xd2\x00\x00\x00\x00\x00\x01\x00\x01\x31\xb3\ " - -def qInitResources( ): +def qInitResources(): QtCore.qRegisterResourceData(0x01, qt_resource_struct, qt_resource_name, qt_resource_data) - -def qCleanupResources( ): +def qCleanupResources(): QtCore.qUnregisterResourceData(0x01, qt_resource_struct, qt_resource_name, qt_resource_data) - qInitResources()