mirror of
https://gitlab.com/pamhyr/pamhyr2.git
synced 2026-10-30 03:20:41 +01:00
more pep8
This commit is contained in:
1 parent
3b8a49d429
commit
a317cd849f
38 files changed
+241
-125
No files matched your search
+19
-10
@@ -77,7 +77,10 @@ from View.AdditionalFiles.Window import AddFileListWindow
|
||||
from View.REPLines.Window import REPLineListWindow
|
||||
from View.SolverParameters.Window import SolverParametersWindow
|
||||
from View.RunSolver.Window import SelectSolverWindow, SolverLogWindow
|
||||
from View.RunSolver.WindowAdisTS import SelectSolverWindowAdisTS, SolverLogWindowAdisTS
|
||||
from View.RunSolver.WindowAdisTS import (
|
||||
SelectSolverWindowAdisTS,
|
||||
SolverLogWindowAdisTS
|
||||
)
|
||||
from View.CheckList.Window import CheckListWindow
|
||||
from View.CheckList.WindowAdisTS import CheckListWindowAdisTS
|
||||
from View.Results.Window import ResultsWindow
|
||||
@@ -247,7 +250,7 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit):
|
||||
"action_menu_dif": self.open_dif,
|
||||
"action_menu_d90": self.open_d90,
|
||||
"action_menu_pollutants": self.open_pollutants,
|
||||
"action_menu_run_adists":self.select_run_solver_adists,
|
||||
"action_menu_run_adists": self.select_run_solver_adists,
|
||||
"action_menu_output_rk": self.open_output_rk_adists,
|
||||
"action_menu_config": self.open_configure,
|
||||
"action_menu_new": self.open_new_study,
|
||||
@@ -1296,10 +1299,12 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit):
|
||||
if self._study is None:
|
||||
return
|
||||
|
||||
#solver = next(filter(lambda x: x._type == "adistswc", self.conf.solvers))
|
||||
#solver = next(filter(lambda x: x.name == "AdisTS-WC", self.conf.solvers))
|
||||
#print(solver._type)
|
||||
#self.run_solver(solver)
|
||||
# solver = next(filter(lambda x: x._type == "adistswc",
|
||||
# self.conf.solvers))
|
||||
# solver = next(filter(lambda x: x.name == "AdisTS-WC",
|
||||
# self.conf.solvers))
|
||||
# print(solver._type)
|
||||
# self.run_solver(solver)
|
||||
|
||||
run = SelectSolverWindowAdisTS(
|
||||
study=self._study,
|
||||
@@ -1549,7 +1554,8 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit):
|
||||
options |= QFileDialog.DontUseNativeDialog
|
||||
|
||||
dialog = QFileDialog(self, options=options)
|
||||
dialog.setFileMode(QFileDialog.DirectoryOnly) ##QFileDialog.FileMode.ExistingFile)
|
||||
dialog.setFileMode(QFileDialog.DirectoryOnly)
|
||||
# QFileDialog.FileMode.ExistingFile)
|
||||
|
||||
if self._last_solver is None:
|
||||
dialog.setDirectory(
|
||||
@@ -1567,10 +1573,13 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit):
|
||||
bin_list = list(filter(lambda s: "bin" in s, dir_list))
|
||||
solver_name = dir_path.split("/")[-2]
|
||||
print("dir solver name path:", solver_name)
|
||||
solver_results = next(filter(lambda x: x.name == solver_name, self.conf.solvers))
|
||||
solver_results = next(filter(lambda x: x.name == solver_name,
|
||||
self.conf.solvers))
|
||||
print("solver type:", solver_results._type)
|
||||
print("dir path bis:", dir_path)
|
||||
solver_results_adists = solver_results.results(self._study, repertory=dir_path[:-10], qlog=None)#self._output)
|
||||
solver_results_adists = solver_results.results(
|
||||
self._study,
|
||||
repertory=dir_path[:-10], qlog=None) # self._output)
|
||||
print("results adists", solver_results_adists)
|
||||
logger.info(f"Select results: {dir_path}")
|
||||
if len(bin_list) >= 2 and ("total_sediment.bin" in bin_list):
|
||||
@@ -1581,7 +1590,7 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit):
|
||||
else:
|
||||
dlg = QDialog(self)
|
||||
dlg.setWindowTitle("AdisTS Results")
|
||||
layout = QVBoxLayout()
|
||||
layout = QVBoxLayout()
|
||||
message = QLabel("AdisTS Results not found")
|
||||
layout.addWidget(message)
|
||||
dlg.setLayout(layout)
|
||||
|
||||
Reference in new issue
Block a user