Solver: Rename and fix solvers parameters.

This commit is contained in:
Pierre-Antoine Rouby committed 2023-06-15 10:52:01 +02:00
1 parent 6eca4647a9
commit 314ae4d249
4 files changed
+50 -30

No files matched your search

+23 -12
View File
@@ -28,6 +28,7 @@ from View.InitialConditions.Window import InitialConditionsWindow
from View.Stricklers.Window import StricklersWindow
from View.Sections.Window import SectionsWindow
from View.SolverParameters.Window import SolverParametersWindow
from View.RunSolver.Window import SelectSolverWindow
from Model.Study import Study
@@ -46,12 +47,15 @@ other_model_action = [
]
define_model_action = [
# Toolbar
"action_toolBar_network", "action_toolBar_geometry",
"action_toolBar_mesh", "action_toolBar_run_meshing_tool",
"action_toolBar_boundary_cond", "action_toolBar_lateral_contrib",
"action_toolBar_spills", "action_toolBar_sections",
"action_toolBar_stricklers", "action_toolBar_building",
"action_toolBar_initial_cond",
# Menu
"action_run_solver",
]
action = (
@@ -112,6 +116,7 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit):
"action_menu_open": self.open_model,
"action_menu_save": self.save_study,
"action_menu_save_as": self.save_as_study,
"action_run_solver": self.run_solver,
## Help
"action_menu_about": self.open_about,
# ToolBar action
@@ -332,43 +337,49 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit):
"into river network window to work on it")
def open_boundary_cond(self):
self.bound = BoundaryConditionWindow(study = self.model, parent = self)
self.bound.show()
bound = BoundaryConditionWindow(study = self.model, parent = self)
bound.show()
def open_lateral_contrib(self):
self.lateral = LateralContributionWindow(study = self.model, parent = self)
self.lateral.show()
lateral = LateralContributionWindow(study = self.model, parent = self)
lateral.show()
def open_stricklers(self):
self.strick = StricklersWindow(
strick = StricklersWindow(
study = self.model,
config = self.conf,
parent = self
)
self.strick.show()
strick.show()
def open_sections(self):
self.sections = SectionsWindow(
sections = SectionsWindow(
study = self.model,
parent = self
)
self.sections.show()
sections.show()
def open_initial_conditions(self):
if self.model.river.has_current_reach():
self.initial = InitialConditionsWindow(
initial = InitialConditionsWindow(
study = self.model,
parent = self
)
self.initial.show()
initial.show()
def open_solver_parameters(self):
self.params = SolverParametersWindow(
params = SolverParametersWindow(
study = self.model,
parent = self
)
self.params.show()
params.show()
def run_solver(self):
run = SelectSolverWindow(
study = self.model,
parent = self
)
run.show()
# TODO: Delete me !
###############