From fe7f9ad070fd87c098516262a2d14ef2140834fd Mon Sep 17 00:00:00 2001 From: Pierre-Antoine Rouby Date: Tue, 4 Jul 2023 09:42:48 +0200 Subject: [PATCH] MainWindow: Connect some action and disable unimplemented action. --- src/View/MainWindow.py | 14 ++++++-- src/View/ui/MainWindow.ui | 67 ++++++++++++++++++++++++++++++++------- 2 files changed, 68 insertions(+), 13 deletions(-) diff --git a/src/View/MainWindow.py b/src/View/MainWindow.py index fed284a7..1b5f06e3 100644 --- a/src/View/MainWindow.py +++ b/src/View/MainWindow.py @@ -57,7 +57,11 @@ define_model_action = [ "action_toolBar_stricklers", "action_toolBar_building", "action_toolBar_initial_cond", # Menu - "action_run_solver", + "action_menu_run_solver", "action_menu_numerical_parameter", + "action_menu_edit_network", "action_menu_edit_geometry", + "action_menu_boundary_conditions", "action_menu_initial_conditions", + "action_menu_edit_friction", "action_menu_edit_lateral_contribution", + "action_menu_run_solver", ] action = ( @@ -119,7 +123,13 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit): "action_menu_save": self.save_study, "action_menu_save_as": self.save_as_study, "action_menu_numerical_parameter": self.open_solver_parameters, - "action_run_solver": self.run_solver, + "action_menu_edit_network": self.open_network, + "action_menu_edit_geometry": self.open_geometry, + "action_menu_boundary_conditions": self.open_boundary_cond, + "action_menu_initial_conditions": self.open_initial_conditions, + "action_menu_edit_friction": self.open_sections, + "action_menu_edit_lateral_contribution": self.open_lateral_contrib, + "action_menu_run_solver": self.run_solver, ## Help "action_menu_about": self.open_about, # ToolBar action diff --git a/src/View/ui/MainWindow.ui b/src/View/ui/MainWindow.ui index 777288fe..619b87e6 100644 --- a/src/View/ui/MainWindow.ui +++ b/src/View/ui/MainWindow.ui @@ -152,7 +152,7 @@ &Execute - + @@ -163,14 +163,14 @@ &Hydraulics - + - + - - + + @@ -345,6 +345,9 @@ + + false + Import data from MAGE @@ -353,6 +356,9 @@ + + false + Import data from RubarBE @@ -437,16 +443,25 @@ + + false + Import geometry + + false + Export geometry + + false + Run extrenal meshing tool @@ -489,11 +504,17 @@ + + false + Abscisse - Cote + + false + XYZ @@ -506,7 +527,7 @@ Numerical parameter for solvers - + Boundary conditions and one-time contributions @@ -517,7 +538,7 @@ - + Initial conditions @@ -526,26 +547,35 @@ true + + false + Export initial conditions + + false + Import final state as initial condition - + Edit friction - + Edit lateral contributions + + false + Edit spills @@ -556,11 +586,14 @@ + + false + Edit cross building - + Run solver @@ -576,6 +609,9 @@ + + false + Simulation directory management @@ -591,6 +627,9 @@ + + false + Hydrograph @@ -603,6 +642,9 @@ + + false + Limnigram @@ -614,6 +656,9 @@ + + false + Map current reach @@ -625,7 +670,7 @@ - help MAGE + Help MAGE