mirror of
https://github.com/Athemis/PyDSF.git
synced 2025-04-20 11:59:12 +00:00
Coding style; Overhaul of GUI
This commit is contained in:
parent
07d44ba86e
commit
35b2920d34
3 changed files with 71 additions and 108 deletions
103
ui/mainwindow.py
103
ui/mainwindow.py
|
|
@ -1,19 +1,11 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
|
||||
"""
|
||||
Module implementing MainWindow.
|
||||
"""
|
||||
from PyQt5.QtCore import (pyqtSlot,
|
||||
QObject,
|
||||
pyqtSignal,
|
||||
QThreadPool,
|
||||
QRunnable,)
|
||||
from PyQt5.QtWidgets import (QMainWindow,
|
||||
QProgressBar,
|
||||
QDialogButtonBox,
|
||||
QFileDialog,
|
||||
QMessageBox,
|
||||
QApplication)
|
||||
from PyQt5.QtCore import (pyqtSlot, QObject, pyqtSignal, QThreadPool,
|
||||
QRunnable, )
|
||||
from PyQt5.QtWidgets import (QMainWindow, QProgressBar, QDialogButtonBox,
|
||||
QFileDialog, QMessageBox, QApplication)
|
||||
|
||||
from .Ui_mainwindow import Ui_MainWindow
|
||||
from .mplwidget import MplWidget
|
||||
|
|
@ -46,21 +38,29 @@ class Worker(QRunnable):
|
|||
c_lower = self.owner.doubleSpinBox_lower.value()
|
||||
c_upper = self.owner.doubleSpinBox_upper.value()
|
||||
if self.owner.groupBox_cbar.isChecked():
|
||||
cbar_range = (self.owner.doubleSpinBox_cbar_start, self.owner.doubleSpinBox_cbar_end)
|
||||
cbar_range = (self.owner.doubleSpinBox_cbar_start,
|
||||
self.owner.doubleSpinBox_cbar_end)
|
||||
if self.owner.groupBox_signal_threshold.isChecked():
|
||||
signal_threshold = self.owner.spinBox_signal_threshold.value()
|
||||
|
||||
items = (self.owner.listWidget_data.item(i) for i in range(self.owner.listWidget_data.count()))
|
||||
items = (self.owner.listWidget_data.item(i)
|
||||
for i in range(self.owner.listWidget_data.count()))
|
||||
|
||||
files = []
|
||||
for item in items:
|
||||
files.append(item.text())
|
||||
self.exp = Experiment(exp_type=instrument_type, files=files, t1=self.owner.doubleSpinBox_tmin.value(), t2=self.owner.doubleSpinBox_tmax.value(),
|
||||
dt=self.owner.doubleSpinBox_dt.value(), cols=12, rows=8, cutoff_low=c_lower, cutoff_high=c_upper,
|
||||
signal_threshold=signal_threshold, color_range=cbar_range)
|
||||
print("Start processing of data... ")
|
||||
self.exp = Experiment(exp_type=instrument_type,
|
||||
files=files,
|
||||
t1=self.owner.doubleSpinBox_tmin.value(),
|
||||
t2=self.owner.doubleSpinBox_tmax.value(),
|
||||
dt=self.owner.doubleSpinBox_dt.value(),
|
||||
cols=12,
|
||||
rows=8,
|
||||
cutoff_low=c_lower,
|
||||
cutoff_high=c_upper,
|
||||
signal_threshold=signal_threshold,
|
||||
color_range=cbar_range)
|
||||
self.exp.analyze()
|
||||
print("done!")
|
||||
self.signals.finished.emit()
|
||||
|
||||
|
||||
|
|
@ -93,7 +93,6 @@ class Tasks(QObject):
|
|||
for task in self.tasks:
|
||||
self.data.append(task.exp)
|
||||
|
||||
print(self.data)
|
||||
self.signals.finished.emit(self.data)
|
||||
|
||||
|
||||
|
|
@ -117,7 +116,11 @@ class MainWindow(QMainWindow, Ui_MainWindow):
|
|||
self.statusBar.addPermanentWidget(self.progressBar)
|
||||
self.statusBar.showMessage("Welcome to PyDSF")
|
||||
|
||||
self.buttonBox_process.addButton("&Start Processing", QDialogButtonBox.AcceptRole)
|
||||
self.buttonBox_process.addButton("&Start Processing",
|
||||
QDialogButtonBox.AcceptRole)
|
||||
|
||||
self.tasks = Tasks()
|
||||
self.worker = Worker(self)
|
||||
|
||||
@pyqtSlot("QAbstractButton*")
|
||||
def on_buttonBox_open_reset_clicked(self, button):
|
||||
|
|
@ -125,16 +128,15 @@ class MainWindow(QMainWindow, Ui_MainWindow):
|
|||
Slot documentation goes here.
|
||||
"""
|
||||
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)
|
||||
filenames = QFileDialog.getOpenFileNames(
|
||||
self, 'Open data file', '', "Text files (*.txt *.csv)")
|
||||
self.listWidget_data.addItems(filenames[0])
|
||||
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):
|
||||
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)
|
||||
|
||||
@pyqtSlot("QString")
|
||||
def on_comboBox_instrument_currentIndexChanged(self, p0):
|
||||
|
|
@ -142,17 +144,12 @@ class MainWindow(QMainWindow, Ui_MainWindow):
|
|||
Slot documentation goes here.
|
||||
"""
|
||||
if p0 == 'Analytik Jena qTOWER 2.0/2.2':
|
||||
print(p0)
|
||||
self.groupBox_temp.setEnabled(True)
|
||||
else:
|
||||
self.groupBox_temp.setEnabled(False)
|
||||
# self.groupBox_data.setEnabled(True)
|
||||
# self.groupBox_cutoff.setEnabled(True)
|
||||
# self.groupBox_cbar.setEnabled(True)
|
||||
# self.groupBox_signal_threshold.setEnabled(True)
|
||||
|
||||
def generate_plot_tab(self, name):
|
||||
tab = MplWidget()
|
||||
tab = MplWidget(parent=self)
|
||||
tab.setObjectName(name)
|
||||
return tab
|
||||
|
||||
|
|
@ -183,18 +180,19 @@ class MainWindow(QMainWindow, Ui_MainWindow):
|
|||
"""
|
||||
|
||||
if self.listWidget_data.count() < 1:
|
||||
QMessageBox.critical(self, 'Error', "No data file loaded!", QMessageBox.Close, QMessageBox.Close)
|
||||
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)
|
||||
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.progressBar.setEnabled(True)
|
||||
self.statusBar.showMessage("Processing...")
|
||||
|
||||
self.tasks = Tasks()
|
||||
self.tasks.signals.finished.connect(self.on_processing_finished)
|
||||
self.worker = Worker(self)
|
||||
self.tasks.add_task(self.worker)
|
||||
self.tasks.start()
|
||||
|
||||
|
|
@ -203,20 +201,29 @@ class MainWindow(QMainWindow, Ui_MainWindow):
|
|||
# For now, only read the first entry
|
||||
exp = self.tasks.data[0]
|
||||
|
||||
save_data = QMessageBox.question(self, 'Save data', "Calculations are finished. Save results?",
|
||||
QMessageBox.Yes | QMessageBox.No, QMessageBox.Yes)
|
||||
save_data = QMessageBox.question(
|
||||
self, 'Save data', "Calculations are finished. Save results?",
|
||||
QMessageBox.Yes | QMessageBox.No, QMessageBox.Yes)
|
||||
if save_data == QMessageBox.Yes:
|
||||
dialog = QFileDialog()
|
||||
dialog.setFileMode(QFileDialog.Directory)
|
||||
folder = dialog.getExistingDirectory(self, 'Choose path for results')
|
||||
folder = dialog.getExistingDirectory(self,
|
||||
'Choose path for results')
|
||||
for plate in exp.plates:
|
||||
plate.write_tm_table('{}/plate_{}_04_tm.csv'.format(folder, str(plate.id)))
|
||||
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)))
|
||||
plate.write_tm_table(
|
||||
'{}/plate_{}_04_tm.csv'.format(folder, str(plate.id)))
|
||||
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(self.worker.exp.avg_plate.id)))
|
||||
exp.avg_plate.write_avg_tm_table(
|
||||
'{}/plate_{}_05_tm_avg.csv'.format(
|
||||
folder, str(self.worker.exp.avg_plate.id)))
|
||||
|
||||
for i in range(len(self.worker.exp.plates)):
|
||||
|
||||
|
|
@ -247,7 +254,7 @@ class MainWindow(QMainWindow, Ui_MainWindow):
|
|||
QApplication.quit()
|
||||
|
||||
@pyqtSlot("bool")
|
||||
def on_groupBox_cutoff_toggled(self, p0):
|
||||
def on_groupBox_cutoff_toggled(self):
|
||||
"""
|
||||
Slot documentation goes here.
|
||||
"""
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue