mirror of
https://gitlab.com/pamhyr/pamhyr2.git
synced 2026-10-30 03:20:41 +01:00
rep mage select fixed
This commit is contained in:
1 parent
3c82148f44
commit
75149000db
5 files changed
+601
-11
No files matched your search
+39
-4
@@ -71,8 +71,9 @@ 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
|
||||
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
|
||||
from View.Results.ReadingResultsDialog import ReadingResultsDialog
|
||||
from View.Debug.Window import ReplWindow
|
||||
@@ -242,7 +243,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.run_solver_adists,
|
||||
"action_menu_run_adists":self.select_run_solver_adists,
|
||||
"action_menu_output_kp": self.open_output_kp_adists,
|
||||
"action_menu_config": self.open_configure,
|
||||
"action_menu_new": self.open_new_study,
|
||||
@@ -1258,7 +1259,7 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit):
|
||||
if run.exec():
|
||||
self.run_solver(run.solver)
|
||||
|
||||
def run_solver_adists(self):
|
||||
def select_run_solver_adists(self):
|
||||
if self._study is None:
|
||||
return
|
||||
|
||||
@@ -1273,7 +1274,31 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit):
|
||||
parent=self
|
||||
)
|
||||
if run.exec():
|
||||
self.run_solver(run.solver)
|
||||
self.run_solver_adists(run.solver, run.mage_rep)
|
||||
|
||||
def run_solver_adists(self, solver, mage_rep):
|
||||
if self._study is None:
|
||||
return
|
||||
|
||||
if self.sub_window_exists(
|
||||
CheckListWindowAdisTS,
|
||||
data=[
|
||||
self._study,
|
||||
self.conf,
|
||||
solver,
|
||||
mage_rep
|
||||
]
|
||||
):
|
||||
return
|
||||
|
||||
check = CheckListWindowAdisTS(
|
||||
study=self._study,
|
||||
config=self.conf,
|
||||
solver=solver,
|
||||
parent=self,
|
||||
mage_rep=mage_rep,
|
||||
)
|
||||
check.show()
|
||||
|
||||
def run_solver(self, solver):
|
||||
if self._study is None:
|
||||
@@ -1297,6 +1322,16 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit):
|
||||
)
|
||||
check.show()
|
||||
|
||||
def solver_log_adists(self, solver, mage_rep):
|
||||
sol = SolverLogWindowAdisTS(
|
||||
study=self._study,
|
||||
config=self.conf,
|
||||
solver=solver,
|
||||
parent=self,
|
||||
mage_rep=mage_rep,
|
||||
)
|
||||
sol.show()
|
||||
|
||||
def solver_log(self, solver):
|
||||
sol = SolverLogWindow(
|
||||
study=self._study,
|
||||
|
||||
Reference in new issue
Block a user