Browse Source

linted

master
Holger Frey 6 years ago
parent
commit
1a8761ea39
  1. 44
      mtor/gui.py
  2. 1
      mtor/workflows.py

44
mtor/gui.py

@ -1,22 +1,18 @@ @@ -1,22 +1,18 @@
import sys
import os
from pathlib import Path
from subprocess import Popen
home = Path.home()
import sys
import os
from PyQt5.QtWidgets import (
QApplication,
QMainWindow,
QPushButton,
QDesktopWidget,
QHBoxLayout,
QVBoxLayout,
QWidget,
QFileDialog,
QGridLayout,
QLabel,
QLineEdit,
QGridLayout,
QFileDialog,
QPushButton,
QWidget,
)
from PyQt5.QtGui import QIcon, QIntValidator
@ -24,7 +20,6 @@ from .workflows import ( @@ -24,7 +20,6 @@ from .workflows import (
prescan_workflow,
image_workflow,
data_workflow,
cached_data_workflow,
postprocessing_workflow,
)
@ -108,13 +103,6 @@ class MtorImageAnalysis(QWidget): @@ -108,13 +103,6 @@ class MtorImageAnalysis(QWidget):
self.setWindowTitle("mTor Image Analysis")
self.setWindowIcon(QIcon("web.png"))
# helpers
self.dir_selected.setText("/Users/holgerfrey/Developer/mtor/mtor-bilder")
self.roi_top_input.setText("50")
self.roi_right_input.setText("875")
self.roi_bottom_input.setText("300")
self.roi_left_input.setText("725")
self.show()
def center_window_on_desktop(self):
@ -124,7 +112,7 @@ class MtorImageAnalysis(QWidget): @@ -124,7 +112,7 @@ class MtorImageAnalysis(QWidget):
self.move(fg.topLeft())
def get_tif_dir(self):
dlg = QFileDialog(directory=str(home))
dlg = QFileDialog(directory=str(Path.home()))
dlg.setFileMode(QFileDialog.Directory)
if dlg.exec_():
@ -139,7 +127,6 @@ class MtorImageAnalysis(QWidget): @@ -139,7 +127,6 @@ class MtorImageAnalysis(QWidget):
self.dir_selected.setText(filenames[0])
self.check_button_state()
def check_button_state(self):
values = self.get_values()
self.btn_run.setEnabled(all(values))
@ -183,14 +170,21 @@ def run_gui(): @@ -183,14 +170,21 @@ def run_gui():
iw = image_workflow(pw.parameters)
dw = data_workflow(iw.data, iw.parameters)
fw = postprocessing_workflow(dw.data, dw.parameters)
pdf_path = dw.parameters.data_dir / "report.pdf"
pdf_path = fw.parameters.data_dir / "report.pdf"
if sys.platform.startswith("win"):
os.startfile(str(pdf_path))
else:
if sys.platform.startswith("darwin"):
cmd = ["open", path]
cmd = ["open", str(pdf_path)]
else:
cmd = ["xdg-open", path]
Popen(cmd, shell=False, stding=None, stdout=None, stderr=None, close_fds=True)
cmd = ["xdg-open", str(pdf_path)]
Popen(
cmd,
shell=False,
stding=None,
stdout=None,
stderr=None,
close_fds=True,
)
sys.exit()

1
mtor/workflows.py

@ -85,6 +85,7 @@ def postprocessing_workflow(selected_files, parameters): @@ -85,6 +85,7 @@ def postprocessing_workflow(selected_files, parameters):
remove_cuts_dir(parameters)
print("5/5: Post processing, annotating color coded images")
annotate_color_coded_images(file_stems, parameters)
return WorkflowResult(None, parameters)
def cached_data_workflow(folder):

Loading…
Cancel
Save