From 926fb01502b3b366fb326ff63a777d97517e49c8 Mon Sep 17 00:00:00 2001 From: Alexander Minges Date: Fri, 30 Jan 2015 15:00:16 +0100 Subject: [PATCH] Migrated to PyQT5; Added option to reset data list; Added progress indicator --- .gitignore | 1 + main.py | 7 +- pydsf.py | 8 +- ui/Ui_mainwindow.py | 351 +++++++++++++++++++++----------------------- ui/icons_rc.py | 2 +- ui/mainwindow.py | 87 ++++++----- ui/mainwindow.ui | 87 +++++------ 7 files changed, 275 insertions(+), 268 deletions(-) diff --git a/.gitignore b/.gitignore index db4561e..1532d61 100644 --- a/.gitignore +++ b/.gitignore @@ -21,6 +21,7 @@ var/ *.egg-info/ .installed.cfg *.egg +.idea # PyInstaller # Usually these files are written by a python script from a template diff --git a/main.py b/main.py index 4690887..e30c52c 100644 --- a/main.py +++ b/main.py @@ -1,12 +1,15 @@ #!/usr/bin/env python2 # -*- coding: utf-8 -*- -from PyQt4 import QtCore, QtGui +from PyQt5 import QtWidgets + from ui.mainwindow import MainWindow + if __name__ == "__main__": import sys - app = QtGui.QApplication(sys.argv) + + app = QtWidgets.QApplication(sys.argv) ui = MainWindow() ui.show() sys.exit(app.exec_()) diff --git a/pydsf.py b/pydsf.py index 98a51e8..b3d4e4c 100644 --- a/pydsf.py +++ b/pydsf.py @@ -1,11 +1,11 @@ #! /usr/bin/env python2 # -*- coding: utf-8 -*- -import os import csv try: import matplotlib as mpl - mpl.use('Qt4Agg') + + mpl.use('Qt5Agg') import matplotlib.ticker as ticker import matplotlib.pyplot as plt import matplotlib.patches as mpatches @@ -17,8 +17,6 @@ try: except ImportError: raise ImportError('----- PeakUtils must be installed. -----') -#from peakdetect import * - try: import numpy as np except ImportError: @@ -195,7 +193,7 @@ class Experiment: if color_range: self.color_range = color_range else: - self.color_range = None + self.color_range = (self.t1, self.t2) self.plates = [] diff --git a/ui/Ui_mainwindow.py b/ui/Ui_mainwindow.py index 314e071..52a5903 100644 --- a/ui/Ui_mainwindow.py +++ b/ui/Ui_mainwindow.py @@ -1,209 +1,205 @@ # -*- coding: utf-8 -*- -# Form implementation generated from reading ui file '/home/alex/Dokumente/Programmieren/PyDSF/ui/mainwindow.ui' +# Form implementation generated from reading ui file 'mainwindow.ui' # -# Created: Tue Oct 30 14:57:02 2012 -# by: PyQt4 UI code generator 4.9.5 +# Created: Fri Jan 30 14:07:06 2015 +# by: PyQt5 UI code generator 5.4 # # WARNING! All changes made in this file will be lost! -from PyQt4 import QtCore, QtGui - -try: - _fromUtf8 = QtCore.QString.fromUtf8 -except AttributeError: - _fromUtf8 = lambda s: s +from PyQt5 import QtCore, QtGui, QtWidgets class Ui_MainWindow(object): def setupUi(self, MainWindow): - MainWindow.setObjectName(_fromUtf8("MainWindow")) - MainWindow.resize(352, 548) + MainWindow.setObjectName("MainWindow") + MainWindow.resize(388, 642) MainWindow.setLocale(QtCore.QLocale(QtCore.QLocale.English, QtCore.QLocale.UnitedStates)) - self.centralWidget = QtGui.QWidget(MainWindow) + self.centralWidget = QtWidgets.QWidget(MainWindow) self.centralWidget.setLocale(QtCore.QLocale(QtCore.QLocale.English, QtCore.QLocale.UnitedStates)) - self.centralWidget.setObjectName(_fromUtf8("centralWidget")) - self.gridLayout_2 = QtGui.QGridLayout(self.centralWidget) - self.gridLayout_2.setObjectName(_fromUtf8("gridLayout_2")) - self.groupBox_experiment = QtGui.QGroupBox(self.centralWidget) + self.centralWidget.setObjectName("centralWidget") + self.gridLayout_2 = QtWidgets.QGridLayout(self.centralWidget) + self.gridLayout_2.setObjectName("gridLayout_2") + self.groupBox_experiment = QtWidgets.QGroupBox(self.centralWidget) self.groupBox_experiment.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignVCenter) self.groupBox_experiment.setFlat(False) self.groupBox_experiment.setCheckable(False) - self.groupBox_experiment.setObjectName(_fromUtf8("groupBox_experiment")) - self.gridLayout = QtGui.QGridLayout(self.groupBox_experiment) - self.gridLayout.setObjectName(_fromUtf8("gridLayout")) - self.label_instrument = QtGui.QLabel(self.groupBox_experiment) - self.label_instrument.setObjectName(_fromUtf8("label_instrument")) + self.groupBox_experiment.setObjectName("groupBox_experiment") + self.gridLayout = QtWidgets.QGridLayout(self.groupBox_experiment) + self.gridLayout.setObjectName("gridLayout") + self.label_instrument = QtWidgets.QLabel(self.groupBox_experiment) + self.label_instrument.setObjectName("label_instrument") self.gridLayout.addWidget(self.label_instrument, 0, 0, 1, 1) - self.comboBox_instrument = QtGui.QComboBox(self.groupBox_experiment) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.Fixed) + self.comboBox_instrument = QtWidgets.QComboBox(self.groupBox_experiment) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.comboBox_instrument.sizePolicy().hasHeightForWidth()) self.comboBox_instrument.setSizePolicy(sizePolicy) - self.comboBox_instrument.setObjectName(_fromUtf8("comboBox_instrument")) - self.comboBox_instrument.addItem(_fromUtf8("")) + self.comboBox_instrument.setObjectName("comboBox_instrument") + self.comboBox_instrument.addItem("") self.gridLayout.addWidget(self.comboBox_instrument, 0, 1, 1, 1) - self.groupBox_data = QtGui.QGroupBox(self.groupBox_experiment) + self.groupBox_data = QtWidgets.QGroupBox(self.groupBox_experiment) self.groupBox_data.setEnabled(True) - self.groupBox_data.setObjectName(_fromUtf8("groupBox_data")) - self.gridLayout_4 = QtGui.QGridLayout(self.groupBox_data) - self.gridLayout_4.setObjectName(_fromUtf8("gridLayout_4")) - self.listWidget_data = QtGui.QListWidget(self.groupBox_data) - self.listWidget_data.setAlternatingRowColors(True) - self.listWidget_data.setObjectName(_fromUtf8("listWidget_data")) - self.gridLayout_4.addWidget(self.listWidget_data, 0, 0, 1, 1) - self.buttonBox_open = QtGui.QDialogButtonBox(self.groupBox_data) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.buttonBox_open.sizePolicy().hasHeightForWidth()) - self.buttonBox_open.setSizePolicy(sizePolicy) - self.buttonBox_open.setLayoutDirection(QtCore.Qt.LeftToRight) - self.buttonBox_open.setOrientation(QtCore.Qt.Horizontal) - self.buttonBox_open.setStandardButtons(QtGui.QDialogButtonBox.Open) - self.buttonBox_open.setCenterButtons(False) - self.buttonBox_open.setObjectName(_fromUtf8("buttonBox_open")) - self.gridLayout_4.addWidget(self.buttonBox_open, 0, 1, 1, 1) - self.groupBox_replicates = QtGui.QGroupBox(self.groupBox_data) + self.groupBox_data.setObjectName("groupBox_data") + self.gridLayout_4 = QtWidgets.QGridLayout(self.groupBox_data) + self.gridLayout_4.setObjectName("gridLayout_4") + self.groupBox_replicates = QtWidgets.QGroupBox(self.groupBox_data) + self.groupBox_replicates.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignVCenter) self.groupBox_replicates.setCheckable(True) self.groupBox_replicates.setChecked(False) - self.groupBox_replicates.setObjectName(_fromUtf8("groupBox_replicates")) - self.gridLayout_3 = QtGui.QGridLayout(self.groupBox_replicates) - self.gridLayout_3.setObjectName(_fromUtf8("gridLayout_3")) - self.radioButton_rep_files = QtGui.QRadioButton(self.groupBox_replicates) + self.groupBox_replicates.setObjectName("groupBox_replicates") + self.gridLayout_3 = QtWidgets.QGridLayout(self.groupBox_replicates) + self.gridLayout_3.setObjectName("gridLayout_3") + self.radioButton_rep_files = QtWidgets.QRadioButton(self.groupBox_replicates) self.radioButton_rep_files.setEnabled(False) self.radioButton_rep_files.setChecked(True) - self.radioButton_rep_files.setObjectName(_fromUtf8("radioButton_rep_files")) + self.radioButton_rep_files.setObjectName("radioButton_rep_files") self.gridLayout_3.addWidget(self.radioButton_rep_files, 0, 0, 1, 1) - self.gridLayout_4.addWidget(self.groupBox_replicates, 1, 0, 1, 2) + self.gridLayout_4.addWidget(self.groupBox_replicates, 2, 0, 1, 2) + self.buttonBox_open_reset = QtWidgets.QDialogButtonBox(self.groupBox_data) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.buttonBox_open_reset.sizePolicy().hasHeightForWidth()) + self.buttonBox_open_reset.setSizePolicy(sizePolicy) + self.buttonBox_open_reset.setLayoutDirection(QtCore.Qt.LeftToRight) + self.buttonBox_open_reset.setOrientation(QtCore.Qt.Vertical) + self.buttonBox_open_reset.setStandardButtons(QtWidgets.QDialogButtonBox.Open|QtWidgets.QDialogButtonBox.Reset) + self.buttonBox_open_reset.setCenterButtons(False) + self.buttonBox_open_reset.setObjectName("buttonBox_open_reset") + self.gridLayout_4.addWidget(self.buttonBox_open_reset, 0, 1, 1, 1) + self.listWidget_data = QtWidgets.QListWidget(self.groupBox_data) + self.listWidget_data.setAlternatingRowColors(True) + self.listWidget_data.setObjectName("listWidget_data") + self.gridLayout_4.addWidget(self.listWidget_data, 0, 0, 2, 1) self.gridLayout.addWidget(self.groupBox_data, 1, 0, 1, 2) - self.groupBox_temp = QtGui.QGroupBox(self.groupBox_experiment) + self.groupBox_temp = QtWidgets.QGroupBox(self.groupBox_experiment) self.groupBox_temp.setEnabled(True) self.groupBox_temp.setAutoFillBackground(False) self.groupBox_temp.setCheckable(False) - self.groupBox_temp.setObjectName(_fromUtf8("groupBox_temp")) - self.formLayout = QtGui.QFormLayout(self.groupBox_temp) - self.formLayout.setFieldGrowthPolicy(QtGui.QFormLayout.ExpandingFieldsGrow) + self.groupBox_temp.setObjectName("groupBox_temp") + self.formLayout = QtWidgets.QFormLayout(self.groupBox_temp) + self.formLayout.setFieldGrowthPolicy(QtWidgets.QFormLayout.ExpandingFieldsGrow) self.formLayout.setLabelAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) self.formLayout.setFormAlignment(QtCore.Qt.AlignHCenter|QtCore.Qt.AlignTop) - self.formLayout.setObjectName(_fromUtf8("formLayout")) - self.label_tmin = QtGui.QLabel(self.groupBox_temp) - self.label_tmin.setObjectName(_fromUtf8("label_tmin")) - self.formLayout.setWidget(0, QtGui.QFormLayout.LabelRole, self.label_tmin) - self.doubleSpinBox_tmin = QtGui.QDoubleSpinBox(self.groupBox_temp) + self.formLayout.setObjectName("formLayout") + self.label_tmin = QtWidgets.QLabel(self.groupBox_temp) + self.label_tmin.setObjectName("label_tmin") + self.formLayout.setWidget(0, QtWidgets.QFormLayout.LabelRole, self.label_tmin) + self.doubleSpinBox_tmin = QtWidgets.QDoubleSpinBox(self.groupBox_temp) self.doubleSpinBox_tmin.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignVCenter) self.doubleSpinBox_tmin.setDecimals(1) - self.doubleSpinBox_tmin.setProperty("value", 25.0) - self.doubleSpinBox_tmin.setObjectName(_fromUtf8("doubleSpinBox_tmin")) - self.formLayout.setWidget(0, QtGui.QFormLayout.FieldRole, self.doubleSpinBox_tmin) - self.label_tmax = QtGui.QLabel(self.groupBox_temp) - self.label_tmax.setObjectName(_fromUtf8("label_tmax")) - self.formLayout.setWidget(1, QtGui.QFormLayout.LabelRole, self.label_tmax) - self.doubleSpinBox_tmax = QtGui.QDoubleSpinBox(self.groupBox_temp) + self.doubleSpinBox_tmin.setProperty("value", 20.0) + self.doubleSpinBox_tmin.setObjectName("doubleSpinBox_tmin") + self.formLayout.setWidget(0, QtWidgets.QFormLayout.FieldRole, self.doubleSpinBox_tmin) + self.label_tmax = QtWidgets.QLabel(self.groupBox_temp) + self.label_tmax.setObjectName("label_tmax") + self.formLayout.setWidget(1, QtWidgets.QFormLayout.LabelRole, self.label_tmax) + self.doubleSpinBox_tmax = QtWidgets.QDoubleSpinBox(self.groupBox_temp) self.doubleSpinBox_tmax.setDecimals(1) self.doubleSpinBox_tmax.setProperty("value", 95.0) - self.doubleSpinBox_tmax.setObjectName(_fromUtf8("doubleSpinBox_tmax")) - self.formLayout.setWidget(1, QtGui.QFormLayout.FieldRole, self.doubleSpinBox_tmax) - self.label_dt = QtGui.QLabel(self.groupBox_temp) - self.label_dt.setObjectName(_fromUtf8("label_dt")) - self.formLayout.setWidget(2, QtGui.QFormLayout.LabelRole, self.label_dt) - self.doubleSpinBox_dt = QtGui.QDoubleSpinBox(self.groupBox_temp) + self.doubleSpinBox_tmax.setObjectName("doubleSpinBox_tmax") + self.formLayout.setWidget(1, QtWidgets.QFormLayout.FieldRole, self.doubleSpinBox_tmax) + self.label_dt = QtWidgets.QLabel(self.groupBox_temp) + self.label_dt.setObjectName("label_dt") + self.formLayout.setWidget(2, QtWidgets.QFormLayout.LabelRole, self.label_dt) + self.doubleSpinBox_dt = QtWidgets.QDoubleSpinBox(self.groupBox_temp) self.doubleSpinBox_dt.setDecimals(1) self.doubleSpinBox_dt.setProperty("value", 1.0) - self.doubleSpinBox_dt.setObjectName(_fromUtf8("doubleSpinBox_dt")) - self.formLayout.setWidget(2, QtGui.QFormLayout.FieldRole, self.doubleSpinBox_dt) + self.doubleSpinBox_dt.setObjectName("doubleSpinBox_dt") + self.formLayout.setWidget(2, QtWidgets.QFormLayout.FieldRole, self.doubleSpinBox_dt) self.gridLayout.addWidget(self.groupBox_temp, 2, 0, 1, 1) - self.groupBox_cutoff = QtGui.QGroupBox(self.groupBox_experiment) + self.groupBox_cutoff = QtWidgets.QGroupBox(self.groupBox_experiment) self.groupBox_cutoff.setEnabled(True) self.groupBox_cutoff.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignVCenter) self.groupBox_cutoff.setCheckable(True) self.groupBox_cutoff.setChecked(False) - self.groupBox_cutoff.setObjectName(_fromUtf8("groupBox_cutoff")) - self.formLayout_2 = QtGui.QFormLayout(self.groupBox_cutoff) - self.formLayout_2.setFieldGrowthPolicy(QtGui.QFormLayout.ExpandingFieldsGrow) + self.groupBox_cutoff.setObjectName("groupBox_cutoff") + self.formLayout_2 = QtWidgets.QFormLayout(self.groupBox_cutoff) + self.formLayout_2.setFieldGrowthPolicy(QtWidgets.QFormLayout.ExpandingFieldsGrow) self.formLayout_2.setLabelAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) self.formLayout_2.setFormAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignTop) - self.formLayout_2.setObjectName(_fromUtf8("formLayout_2")) - self.label_cutoff_high = QtGui.QLabel(self.groupBox_cutoff) - self.label_cutoff_high.setObjectName(_fromUtf8("label_cutoff_high")) - self.formLayout_2.setWidget(0, QtGui.QFormLayout.LabelRole, self.label_cutoff_high) - self.doubleSpinBox_upper = QtGui.QDoubleSpinBox(self.groupBox_cutoff) - self.doubleSpinBox_upper.setPrefix(_fromUtf8("")) + self.formLayout_2.setObjectName("formLayout_2") + self.label_cutoff_high = QtWidgets.QLabel(self.groupBox_cutoff) + self.label_cutoff_high.setObjectName("label_cutoff_high") + self.formLayout_2.setWidget(0, QtWidgets.QFormLayout.LabelRole, self.label_cutoff_high) + self.doubleSpinBox_upper = QtWidgets.QDoubleSpinBox(self.groupBox_cutoff) + self.doubleSpinBox_upper.setPrefix("") self.doubleSpinBox_upper.setDecimals(1) - self.doubleSpinBox_upper.setObjectName(_fromUtf8("doubleSpinBox_upper")) - self.formLayout_2.setWidget(0, QtGui.QFormLayout.FieldRole, self.doubleSpinBox_upper) - self.label_cutoff_low = QtGui.QLabel(self.groupBox_cutoff) - self.label_cutoff_low.setObjectName(_fromUtf8("label_cutoff_low")) - self.formLayout_2.setWidget(1, QtGui.QFormLayout.LabelRole, self.label_cutoff_low) - self.doubleSpinBox_lower = QtGui.QDoubleSpinBox(self.groupBox_cutoff) + self.doubleSpinBox_upper.setObjectName("doubleSpinBox_upper") + self.formLayout_2.setWidget(0, QtWidgets.QFormLayout.FieldRole, self.doubleSpinBox_upper) + self.label_cutoff_low = QtWidgets.QLabel(self.groupBox_cutoff) + self.label_cutoff_low.setObjectName("label_cutoff_low") + self.formLayout_2.setWidget(1, QtWidgets.QFormLayout.LabelRole, self.label_cutoff_low) + self.doubleSpinBox_lower = QtWidgets.QDoubleSpinBox(self.groupBox_cutoff) self.doubleSpinBox_lower.setDecimals(1) - self.doubleSpinBox_lower.setObjectName(_fromUtf8("doubleSpinBox_lower")) - self.formLayout_2.setWidget(1, QtGui.QFormLayout.FieldRole, self.doubleSpinBox_lower) + self.doubleSpinBox_lower.setObjectName("doubleSpinBox_lower") + self.formLayout_2.setWidget(1, QtWidgets.QFormLayout.FieldRole, self.doubleSpinBox_lower) self.gridLayout.addWidget(self.groupBox_cutoff, 2, 1, 1, 1) - self.groupBox_signal_threshold = QtGui.QGroupBox(self.groupBox_experiment) + self.groupBox_signal_threshold = QtWidgets.QGroupBox(self.groupBox_experiment) self.groupBox_signal_threshold.setEnabled(True) self.groupBox_signal_threshold.setCheckable(True) self.groupBox_signal_threshold.setChecked(False) - self.groupBox_signal_threshold.setObjectName(_fromUtf8("groupBox_signal_threshold")) - self.verticalLayout = QtGui.QVBoxLayout(self.groupBox_signal_threshold) - self.verticalLayout.setObjectName(_fromUtf8("verticalLayout")) - self.spinBox_signal_threshold = QtGui.QSpinBox(self.groupBox_signal_threshold) + self.groupBox_signal_threshold.setObjectName("groupBox_signal_threshold") + self.verticalLayout = QtWidgets.QVBoxLayout(self.groupBox_signal_threshold) + self.verticalLayout.setObjectName("verticalLayout") + self.spinBox_signal_threshold = QtWidgets.QSpinBox(self.groupBox_signal_threshold) self.spinBox_signal_threshold.setMaximum(1000000) - self.spinBox_signal_threshold.setObjectName(_fromUtf8("spinBox_signal_threshold")) + self.spinBox_signal_threshold.setObjectName("spinBox_signal_threshold") self.verticalLayout.addWidget(self.spinBox_signal_threshold) self.gridLayout.addWidget(self.groupBox_signal_threshold, 3, 0, 1, 1) - self.groupBox_cbar = QtGui.QGroupBox(self.groupBox_experiment) + self.groupBox_cbar = QtWidgets.QGroupBox(self.groupBox_experiment) self.groupBox_cbar.setEnabled(True) self.groupBox_cbar.setCheckable(True) self.groupBox_cbar.setChecked(False) - self.groupBox_cbar.setObjectName(_fromUtf8("groupBox_cbar")) - self.formLayout_4 = QtGui.QFormLayout(self.groupBox_cbar) - self.formLayout_4.setFieldGrowthPolicy(QtGui.QFormLayout.ExpandingFieldsGrow) - self.formLayout_4.setObjectName(_fromUtf8("formLayout_4")) - self.label_cbar_start = QtGui.QLabel(self.groupBox_cbar) - self.label_cbar_start.setObjectName(_fromUtf8("label_cbar_start")) - self.formLayout_4.setWidget(0, QtGui.QFormLayout.LabelRole, self.label_cbar_start) - self.doubleSpinBox_cbar_start = QtGui.QDoubleSpinBox(self.groupBox_cbar) + self.groupBox_cbar.setObjectName("groupBox_cbar") + self.formLayout_4 = QtWidgets.QFormLayout(self.groupBox_cbar) + self.formLayout_4.setFieldGrowthPolicy(QtWidgets.QFormLayout.ExpandingFieldsGrow) + self.formLayout_4.setObjectName("formLayout_4") + self.label_cbar_start = QtWidgets.QLabel(self.groupBox_cbar) + self.label_cbar_start.setObjectName("label_cbar_start") + self.formLayout_4.setWidget(0, QtWidgets.QFormLayout.LabelRole, self.label_cbar_start) + self.doubleSpinBox_cbar_start = QtWidgets.QDoubleSpinBox(self.groupBox_cbar) self.doubleSpinBox_cbar_start.setDecimals(1) - self.doubleSpinBox_cbar_start.setObjectName(_fromUtf8("doubleSpinBox_cbar_start")) - self.formLayout_4.setWidget(0, QtGui.QFormLayout.FieldRole, self.doubleSpinBox_cbar_start) - self.label_cbar_end = QtGui.QLabel(self.groupBox_cbar) - self.label_cbar_end.setObjectName(_fromUtf8("label_cbar_end")) - self.formLayout_4.setWidget(2, QtGui.QFormLayout.LabelRole, self.label_cbar_end) - self.doubleSpinBox_cbar_end = QtGui.QDoubleSpinBox(self.groupBox_cbar) + self.doubleSpinBox_cbar_start.setObjectName("doubleSpinBox_cbar_start") + self.formLayout_4.setWidget(0, QtWidgets.QFormLayout.FieldRole, self.doubleSpinBox_cbar_start) + self.label_cbar_end = QtWidgets.QLabel(self.groupBox_cbar) + self.label_cbar_end.setObjectName("label_cbar_end") + self.formLayout_4.setWidget(2, QtWidgets.QFormLayout.LabelRole, self.label_cbar_end) + self.doubleSpinBox_cbar_end = QtWidgets.QDoubleSpinBox(self.groupBox_cbar) self.doubleSpinBox_cbar_end.setDecimals(1) - self.doubleSpinBox_cbar_end.setObjectName(_fromUtf8("doubleSpinBox_cbar_end")) - self.formLayout_4.setWidget(2, QtGui.QFormLayout.FieldRole, self.doubleSpinBox_cbar_end) + self.doubleSpinBox_cbar_end.setObjectName("doubleSpinBox_cbar_end") + self.formLayout_4.setWidget(2, QtWidgets.QFormLayout.FieldRole, self.doubleSpinBox_cbar_end) self.gridLayout.addWidget(self.groupBox_cbar, 3, 1, 1, 1) self.gridLayout_2.addWidget(self.groupBox_experiment, 0, 0, 1, 1) - self.buttonBox_process = QtGui.QDialogButtonBox(self.centralWidget) - self.buttonBox_process.setStandardButtons(QtGui.QDialogButtonBox.Cancel|QtGui.QDialogButtonBox.Ok) - self.buttonBox_process.setObjectName(_fromUtf8("buttonBox_process")) + self.buttonBox_process = QtWidgets.QDialogButtonBox(self.centralWidget) + self.buttonBox_process.setStandardButtons(QtWidgets.QDialogButtonBox.Cancel|QtWidgets.QDialogButtonBox.Ok) + self.buttonBox_process.setObjectName("buttonBox_process") self.gridLayout_2.addWidget(self.buttonBox_process, 1, 0, 1, 1) MainWindow.setCentralWidget(self.centralWidget) - self.menuBar = QtGui.QMenuBar(MainWindow) - self.menuBar.setGeometry(QtCore.QRect(0, 0, 352, 24)) + self.menuBar = QtWidgets.QMenuBar(MainWindow) + self.menuBar.setGeometry(QtCore.QRect(0, 0, 388, 29)) self.menuBar.setLocale(QtCore.QLocale(QtCore.QLocale.English, QtCore.QLocale.UnitedStates)) - self.menuBar.setObjectName(_fromUtf8("menuBar")) - self.menuFile = QtGui.QMenu(self.menuBar) + self.menuBar.setObjectName("menuBar") + self.menuFile = QtWidgets.QMenu(self.menuBar) self.menuFile.setLocale(QtCore.QLocale(QtCore.QLocale.English, QtCore.QLocale.UnitedStates)) - self.menuFile.setObjectName(_fromUtf8("menuFile")) - self.menuHelp = QtGui.QMenu(self.menuBar) + self.menuFile.setObjectName("menuFile") + self.menuHelp = QtWidgets.QMenu(self.menuBar) self.menuHelp.setLocale(QtCore.QLocale(QtCore.QLocale.English, QtCore.QLocale.UnitedStates)) - self.menuHelp.setObjectName(_fromUtf8("menuHelp")) + self.menuHelp.setObjectName("menuHelp") MainWindow.setMenuBar(self.menuBar) - self.statusBar = QtGui.QStatusBar(MainWindow) - self.statusBar.setObjectName(_fromUtf8("statusBar")) + self.statusBar = QtWidgets.QStatusBar(MainWindow) + self.statusBar.setObjectName("statusBar") MainWindow.setStatusBar(self.statusBar) - self.actionQuit = QtGui.QAction(MainWindow) - self.actionQuit.setObjectName(_fromUtf8("actionQuit")) - self.actionAbout = QtGui.QAction(MainWindow) - self.actionAbout.setObjectName(_fromUtf8("actionAbout")) - self.actionAbout_Qt = QtGui.QAction(MainWindow) + self.actionQuit = QtWidgets.QAction(MainWindow) + self.actionQuit.setObjectName("actionQuit") + self.actionAbout = QtWidgets.QAction(MainWindow) + self.actionAbout.setObjectName("actionAbout") + self.actionAbout_Qt = QtWidgets.QAction(MainWindow) icon = QtGui.QIcon() - icon.addPixmap(QtGui.QPixmap(_fromUtf8(":/qtlogo.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + icon.addPixmap(QtGui.QPixmap(":/qtlogo.svg"), QtGui.QIcon.Normal, QtGui.QIcon.Off) self.actionAbout_Qt.setIcon(icon) - self.actionAbout_Qt.setObjectName(_fromUtf8("actionAbout_Qt")) + self.actionAbout_Qt.setObjectName("actionAbout_Qt") self.menuFile.addAction(self.actionQuit) self.menuHelp.addAction(self.actionAbout) self.menuHelp.addAction(self.actionAbout_Qt) @@ -222,50 +218,39 @@ class Ui_MainWindow(object): QtCore.QMetaObject.connectSlotsByName(MainWindow) def retranslateUi(self, MainWindow): - MainWindow.setWindowTitle(QtGui.QApplication.translate("MainWindow", "PyDSF", None, QtGui.QApplication.UnicodeUTF8)) - self.groupBox_experiment.setTitle(QtGui.QApplication.translate("MainWindow", "Experimental Setup", None, QtGui.QApplication.UnicodeUTF8)) - self.label_instrument.setText(QtGui.QApplication.translate("MainWindow", "Instrument", None, QtGui.QApplication.UnicodeUTF8)) - self.comboBox_instrument.setItemText(0, QtGui.QApplication.translate("MainWindow", "Analytik Jena qTOWER 2.0/2.2", None, QtGui.QApplication.UnicodeUTF8)) - self.groupBox_data.setToolTip(QtGui.QApplication.translate("MainWindow", "

Add data files to the experiment. If multiple files are loaded, they are treated as replicates.

", None, QtGui.QApplication.UnicodeUTF8)) - self.groupBox_data.setTitle(QtGui.QApplication.translate("MainWindow", "Data File", None, QtGui.QApplication.UnicodeUTF8)) - self.groupBox_replicates.setTitle(QtGui.QApplication.translate("MainWindow", "Replicates", None, QtGui.QApplication.UnicodeUTF8)) - self.radioButton_rep_files.setText(QtGui.QApplication.translate("MainWindow", "Files", None, QtGui.QApplication.UnicodeUTF8)) - self.groupBox_temp.setToolTip(QtGui.QApplication.translate("MainWindow", "

Temperature range of the data points. Only applies, if the data file does not contain any temperature information.

", None, QtGui.QApplication.UnicodeUTF8)) - self.groupBox_temp.setTitle(QtGui.QApplication.translate("MainWindow", "Temperature settings", None, QtGui.QApplication.UnicodeUTF8)) - self.label_tmin.setText(QtGui.QApplication.translate("MainWindow", "

Tmin

", None, QtGui.QApplication.UnicodeUTF8)) - self.doubleSpinBox_tmin.setSuffix(QtGui.QApplication.translate("MainWindow", " °C", None, QtGui.QApplication.UnicodeUTF8)) - self.label_tmax.setText(QtGui.QApplication.translate("MainWindow", "

Tmax

", None, QtGui.QApplication.UnicodeUTF8)) - self.doubleSpinBox_tmax.setSuffix(QtGui.QApplication.translate("MainWindow", " °C", None, QtGui.QApplication.UnicodeUTF8)) - self.label_dt.setText(QtGui.QApplication.translate("MainWindow", "

ΔT

", None, QtGui.QApplication.UnicodeUTF8)) - self.doubleSpinBox_dt.setSuffix(QtGui.QApplication.translate("MainWindow", " °C", None, QtGui.QApplication.UnicodeUTF8)) - self.groupBox_cutoff.setToolTip(QtGui.QApplication.translate("MainWindow", "

Only Tm values within this limit are considered valid.

", None, QtGui.QApplication.UnicodeUTF8)) - self.groupBox_cutoff.setTitle(QtGui.QApplication.translate("MainWindow", "Cutoff", None, QtGui.QApplication.UnicodeUTF8)) - self.label_cutoff_high.setText(QtGui.QApplication.translate("MainWindow", "Upper", None, QtGui.QApplication.UnicodeUTF8)) - self.doubleSpinBox_upper.setSuffix(QtGui.QApplication.translate("MainWindow", " °C", None, QtGui.QApplication.UnicodeUTF8)) - self.label_cutoff_low.setText(QtGui.QApplication.translate("MainWindow", "Lower", None, QtGui.QApplication.UnicodeUTF8)) - self.doubleSpinBox_lower.setSuffix(QtGui.QApplication.translate("MainWindow", " °C", None, QtGui.QApplication.UnicodeUTF8)) - self.groupBox_signal_threshold.setToolTip(QtGui.QApplication.translate("MainWindow", "

If the signal exceeds this threshold, the coresponding well is assumed to be denatured.

", None, QtGui.QApplication.UnicodeUTF8)) - self.groupBox_signal_threshold.setTitle(QtGui.QApplication.translate("MainWindow", "Signal Threshold", None, QtGui.QApplication.UnicodeUTF8)) - self.groupBox_cbar.setToolTip(QtGui.QApplication.translate("MainWindow", "

Defines the range of the colorbar used for the Tm heatmap.

", None, QtGui.QApplication.UnicodeUTF8)) - self.groupBox_cbar.setTitle(QtGui.QApplication.translate("MainWindow", "Colorbar", None, QtGui.QApplication.UnicodeUTF8)) - self.label_cbar_start.setText(QtGui.QApplication.translate("MainWindow", "Start", None, QtGui.QApplication.UnicodeUTF8)) - self.doubleSpinBox_cbar_start.setSuffix(QtGui.QApplication.translate("MainWindow", " °C", None, QtGui.QApplication.UnicodeUTF8)) - self.label_cbar_end.setText(QtGui.QApplication.translate("MainWindow", "End", None, QtGui.QApplication.UnicodeUTF8)) - self.doubleSpinBox_cbar_end.setSuffix(QtGui.QApplication.translate("MainWindow", " °C", None, QtGui.QApplication.UnicodeUTF8)) - self.menuFile.setTitle(QtGui.QApplication.translate("MainWindow", "File", None, QtGui.QApplication.UnicodeUTF8)) - self.menuHelp.setTitle(QtGui.QApplication.translate("MainWindow", "Help", None, QtGui.QApplication.UnicodeUTF8)) - self.actionQuit.setText(QtGui.QApplication.translate("MainWindow", "Quit", None, QtGui.QApplication.UnicodeUTF8)) - self.actionAbout.setText(QtGui.QApplication.translate("MainWindow", "About", None, QtGui.QApplication.UnicodeUTF8)) - self.actionAbout_Qt.setText(QtGui.QApplication.translate("MainWindow", "About Qt", None, QtGui.QApplication.UnicodeUTF8)) - -#import icons_rc - -if __name__ == "__main__": - import sys - app = QtGui.QApplication(sys.argv) - MainWindow = QtGui.QMainWindow() - ui = Ui_MainWindow() - ui.setupUi(MainWindow) - MainWindow.show() - sys.exit(app.exec_()) - + _translate = QtCore.QCoreApplication.translate + MainWindow.setWindowTitle(_translate("MainWindow", "PyDSF")) + self.groupBox_experiment.setTitle(_translate("MainWindow", "Experimental Setup")) + self.label_instrument.setText(_translate("MainWindow", "Instrument")) + self.comboBox_instrument.setItemText(0, _translate("MainWindow", "Analytik Jena qTOWER 2.0/2.2")) + self.groupBox_data.setToolTip(_translate("MainWindow", "

Add data files to the experiment. If multiple files are loaded, they are treated as replicates.

")) + self.groupBox_data.setTitle(_translate("MainWindow", "Data File")) + self.groupBox_replicates.setTitle(_translate("MainWindow", "Replicates")) + self.radioButton_rep_files.setText(_translate("MainWindow", "Files")) + self.groupBox_temp.setToolTip(_translate("MainWindow", "

Temperature range of the data points. Only applies, if the data file does not contain any temperature information.

")) + self.groupBox_temp.setTitle(_translate("MainWindow", "Temperature settings")) + self.label_tmin.setText(_translate("MainWindow", "

Tmin

")) + self.doubleSpinBox_tmin.setSuffix(_translate("MainWindow", " °C")) + self.label_tmax.setText(_translate("MainWindow", "

Tmax

")) + self.doubleSpinBox_tmax.setSuffix(_translate("MainWindow", " °C")) + self.label_dt.setText(_translate("MainWindow", "

ΔT

")) + self.doubleSpinBox_dt.setSuffix(_translate("MainWindow", " °C")) + self.groupBox_cutoff.setToolTip(_translate("MainWindow", "

Only Tm values within this limit are considered valid.

")) + self.groupBox_cutoff.setTitle(_translate("MainWindow", "Cutoff")) + self.label_cutoff_high.setText(_translate("MainWindow", "&Upper")) + self.doubleSpinBox_upper.setSuffix(_translate("MainWindow", " °C")) + self.label_cutoff_low.setText(_translate("MainWindow", "Lower")) + self.doubleSpinBox_lower.setSuffix(_translate("MainWindow", " °C")) + self.groupBox_signal_threshold.setToolTip(_translate("MainWindow", "

If the signal exceeds this threshold, the coresponding well is assumed to be denatured.

")) + self.groupBox_signal_threshold.setTitle(_translate("MainWindow", "Si&gnal Threshold")) + self.groupBox_cbar.setToolTip(_translate("MainWindow", "

Defines the range of the colorbar used for the Tm heatmap.

")) + self.groupBox_cbar.setTitle(_translate("MainWindow", "Colorbar")) + self.label_cbar_start.setText(_translate("MainWindow", "Start")) + self.doubleSpinBox_cbar_start.setSuffix(_translate("MainWindow", " °C")) + self.label_cbar_end.setText(_translate("MainWindow", "En&d")) + self.doubleSpinBox_cbar_end.setSuffix(_translate("MainWindow", " °C")) + self.menuFile.setTitle(_translate("MainWindow", "Fi&le")) + self.menuHelp.setTitle(_translate("MainWindow", "Help")) + self.actionQuit.setText(_translate("MainWindow", "&Quit")) + self.actionAbout.setText(_translate("MainWindow", "&About")) + self.actionAbout_Qt.setText(_translate("MainWindow", "About &Qt")) diff --git a/ui/icons_rc.py b/ui/icons_rc.py index 5796801..a9111f9 100644 --- a/ui/icons_rc.py +++ b/ui/icons_rc.py @@ -7,7 +7,7 @@ # # WARNING! All changes made in this file will be lost! -from PyQt4 import QtCore +from PyQt5 import QtCore qt_resource_data = "\ \x00\x00\x17\x6d\ diff --git a/ui/mainwindow.py b/ui/mainwindow.py index fde0f24..b41f2f6 100644 --- a/ui/mainwindow.py +++ b/ui/mainwindow.py @@ -6,12 +6,13 @@ Module implementing MainWindow. VERSION = "1.0" -from PyQt4.QtCore import pyqtSignature -from PyQt4.QtGui import QMainWindow, QMessageBox, QFileDialog, QApplication, QProgressBar +from PyQt5.QtCore import pyqtSlot +from PyQt5.QtWidgets import * from .Ui_mainwindow import Ui_MainWindow from pydsf import * + class MainWindow(QMainWindow, Ui_MainWindow): """ Class documentation goes here. @@ -19,28 +20,38 @@ class MainWindow(QMainWindow, Ui_MainWindow): def __init__(self, parent=None): """ Constructor - + @param parent reference to the parent widget (QWidget) """ QMainWindow.__init__(self, parent) self.setupUi(self) - - - @pyqtSignature("QAbstractButton*") - def on_buttonBox_open_clicked(self, button): + self.progressBar = QProgressBar() + self.progressBar.setMaximum(0) + self.progressBar.setMaximum(0) + self.progressBar.setEnabled(False) + self.statusBar.addPermanentWidget(self.progressBar) + self.statusBar.showMessage("Welcome to PyDSF") + + + @pyqtSlot("QAbstractButton*") + def on_buttonBox_open_reset_clicked(self, button): """ Slot documentation goes here. """ - filenames = QFileDialog.getOpenFileNames(self, 'Open data file', '', "Text files (*.txt *.csv)") - self.listWidget_data.addItems(filenames) - if self.listWidget_data.count() > 1: - self.groupBox_replicates.setChecked(True) - self.radioButton_rep_files.setEnabled(True) + if button == self.buttonBox_open_reset.button(QDialogButtonBox.Open): + filenames, filter = QFileDialog.getOpenFileNames(self, 'Open data file', '', "Text files (*.txt *.csv)") + self.listWidget_data.addItems(filenames) + if self.listWidget_data.count() > 1: + self.groupBox_replicates.setChecked(True) + self.radioButton_rep_files.setEnabled(True) + elif button == self.buttonBox_open_reset.button(QDialogButtonBox.Reset): + self.listWidget_data.clear() + print("Data cleared") # self.radioButton_rep_rows.setEnabled(False) # self.radioButton_rep_columns.setEnabled(False) - - @pyqtSignature("QString") + + @pyqtSlot("QString") def on_comboBox_instrument_currentIndexChanged(self, p0): """ Slot documentation goes here. @@ -55,18 +66,21 @@ class MainWindow(QMainWindow, Ui_MainWindow): # self.groupBox_cbar.setEnabled(True) # self.groupBox_signal_threshold.setEnabled(True) - @pyqtSignature("") + @pyqtSlot() def on_buttonBox_process_accepted(self): """ Slot documentation goes here. """ + if self.listWidget_data.count() < 1: QMessageBox.critical(self, 'Error', "No data file loaded!", QMessageBox.Close, QMessageBox.Close) return if self.spinBox_signal_threshold.value() == 0 and self.groupBox_signal_threshold.isChecked(): QMessageBox.warning(self, 'Warning', "Signal threshold is currently set to zero.", QMessageBox.Ok, QMessageBox.Ok) - - self.pb = QProgressBar() + + self.progressBar.setEnabled(True) + self.statusBar.showMessage("Processing...") + c_lower = None c_upper = None cbar_range = None @@ -79,21 +93,21 @@ class MainWindow(QMainWindow, Ui_MainWindow): cbar_range = (self.doubleSpinBox_cbar_start, self.doubleSpinBox_cbar_end) if self.groupBox_signal_threshold.isChecked(): signal_threshold = self.spinBox_signal_threshold.value() - + items = (self.listWidget_data.item(i) for i in range(self.listWidget_data.count())) - + files = [] for item in items: files.append(item.text()) exp = Experiment(type=type, files=files, t1=self.doubleSpinBox_tmin.value(), t2=self.doubleSpinBox_tmax.value(), dt=self.doubleSpinBox_dt.value(), cols=12, rows=8, cutoff_low=c_lower, cutoff_high=c_upper, signal_threshold=signal_threshold, color_range=cbar_range) exp.analyze() - + # plate = Plate(type=type, filename=self.lineEdit_data_file.text(), t1=self.doubleSpinBox_tmin.value(), t2=self.doubleSpinBox_tmax.value(), dt=self.doubleSpinBox_dt.value(), cols=12, rows=8, cutoff_low=c_lower, cutoff_high=c_upper, signal_threshold=signal_threshold, color_range=cbar_range) # self.statusBar.addWidget(self.pb, 100) #plate.analyze(gui=self) - save_data = QMessageBox.question(self, 'Save data', "Calculations are finished. Save results?", + save_data = QMessageBox.question(self, 'Save data', "Calculations are finished. Save results?", QMessageBox.Yes|QMessageBox.No, QMessageBox.Yes) - if save_data == QMessageBox.Yes: + if save_data == QMessageBox.Yes: dialog = QFileDialog() dialog.setFileMode(QFileDialog.Directory) folder = dialog.getExistingDirectory(self, 'Choose path for results') @@ -102,45 +116,48 @@ class MainWindow(QMainWindow, Ui_MainWindow): plate.write_derivative_table('{}/plate_{}_03_dI_dT.csv'.format(folder, str(plate.id))) plate.write_filtered_table('{}/plate_{}_02_filtered_data.csv'.format(folder, str(plate.id))) plate.write_raw_table('{}/plate_{}_01_raw_data.csv'.format(folder, str(plate.id))) - + if exp.avg_plate: exp.avg_plate.write_avg_tm_table('{}/plate_{}_05_tm_avg.csv'.format(folder, str(exp.avg_plate.id))) #plot(plate, self) - + plot(exp) - - - @pyqtSignature("") + + self.progressBar.setEnabled(False) + self.statusBar.showMessage("Finished!") + + + @pyqtSlot() def on_buttonBox_process_rejected(self): """ Slot documentation goes here. """ QApplication.quit() - - @pyqtSignature("") + + pyqtSlot() def on_actionQuit_triggered(self): """ Slot documentation goes here. """ QApplication.quit() - - @pyqtSignature("bool") + + @pyqtSlot("bool") def on_groupBox_cutoff_toggled(self, p0): """ Slot documentation goes here. """ self.doubleSpinBox_upper.setValue(self.doubleSpinBox_tmax.value()) self.doubleSpinBox_lower.setValue(self.doubleSpinBox_tmin.value()) - - @pyqtSignature("") + + @pyqtSlot() def on_actionAbout_triggered(self): """ Slot documentation goes here. """ # TODO: not implemented yet raise NotImplementedError - - @pyqtSignature("") + + @pyqtSlot() def on_actionAbout_Qt_triggered(self): """ Slot documentation goes here. diff --git a/ui/mainwindow.ui b/ui/mainwindow.ui index 489c2b4..0b0a627 100644 --- a/ui/mainwindow.ui +++ b/ui/mainwindow.ui @@ -6,8 +6,8 @@ 0 0 - 352 - 548 + 388 + 642 @@ -73,40 +73,14 @@ Data File - - - - true - - - - - - - - 0 - 0 - - - - Qt::LeftToRight - - - Qt::Horizontal - - - QDialogButtonBox::Open - - - false - - - - + Replicates + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + true @@ -130,6 +104,35 @@ + + + + + 0 + 0 + + + + Qt::LeftToRight + + + Qt::Vertical + + + QDialogButtonBox::Open|QDialogButtonBox::Reset + + + false + + + + + + + true + + + @@ -182,7 +185,7 @@ 1 - 25.000000000000000 + 20.000000000000000 @@ -268,7 +271,7 @@ - Upper + &Upper doubleSpinBox_upper @@ -320,7 +323,7 @@ <html><head/><body><p>If the signal exceeds this threshold, the coresponding well is assumed to be denatured.</p></body></html> - Signal Threshold + Si&gnal Threshold true @@ -383,7 +386,7 @@ - End + En&d doubleSpinBox_cbar_end @@ -420,8 +423,8 @@ 0 0 - 352 - 24 + 388 + 29 @@ -432,7 +435,7 @@ - File + Fi&le @@ -452,12 +455,12 @@ - Quit + &Quit - About + &About @@ -466,7 +469,7 @@ :/qtlogo.svg:/qtlogo.svg - About Qt + About &Qt