Skip to content
Snippets Groups Projects
Commit 7ed2e0e5 authored by AUBRY JEAN-PASCAL's avatar AUBRY JEAN-PASCAL
Browse files

feat: add fieldset to display discretized aprons in case of inclined rugofond type

Refs #658
parent d3422bd7
No related branches found
No related tags found
2 merge requests!275Release v4.19.0,!255Resolve "Ajout de la passe à rugosité de fond: cas d'un radier incliné"
Pipeline #169709 passed
...@@ -36,7 +36,6 @@ ...@@ -36,7 +36,6 @@
"type": "select", "type": "select",
"property": "rugofondType" "property": "rugofondType"
}, },
"ZF1",
{ {
"id": "ZRR", "id": "ZRR",
"allowEmpty": true "allowEmpty": true
...@@ -50,5 +49,27 @@ ...@@ -50,5 +49,27 @@
"allowEmpty": true "allowEmpty": true
} }
] ]
},
{
"id": "fs_rugofond",
"type": "fieldset_template",
"calcType": "RugoFond",
"fields": [
{
"id": "ZF1",
"help": "pam/macrorugo.html#rugosite-de-fond"
}
]
},
{
"id": "rugofond_container",
"type": "template_container",
"templates": [
"fs_rugofond"
]
},
{
"type": "options",
"help": "pam/macrorugo_complexe.html"
} }
] ]
...@@ -6,8 +6,8 @@ ...@@ -6,8 +6,8 @@
"fs_pass": "Fish pass parameters", "fs_pass": "Fish pass parameters",
"fs_bloc": "Blocks parameters", "fs_bloc": "Blocks parameters",
"fs_pass_type": "Pass type", "fs_pass_type": "Pass type",
"macrorugo_container": "Aprons", "rugofond_container": "Aprons",
"fs_macrorugo": "Apron", "fs_rugofond": "Apron",
"select_passtype": "Pass type", "select_passtype": "Pass type",
"Q": "Flow", "Q": "Flow",
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
"ZF1": "Upstream ramp bottom elevation", "ZF1": "Upstream ramp bottom elevation",
"ZRR": "Lower upstream ramp bottom elevation", "ZRR": "Lower upstream ramp bottom elevation",
"ZRL": "Upper upstream ramp bottom elevation", "ZRL": "Upper upstream ramp bottom elevation",
"NbT": "Number of baffles", "NbT": "Number of flow sections",
"L": "Total width of ramp", "L": "Total width of ramp",
"Cd": "Discharge coefficient", "Cd": "Discharge coefficient",
"d65": "d65", "d65": "d65",
......
...@@ -6,8 +6,8 @@ ...@@ -6,8 +6,8 @@
"fs_pass": "Paramètres de la passe", "fs_pass": "Paramètres de la passe",
"fs_bloc": "Paramètres des blocs", "fs_bloc": "Paramètres des blocs",
"fs_pass_type": "Type de passe", "fs_pass_type": "Type de passe",
"macrorugo_container": "Radiers", "rugofond_container": "Radiers",
"fs_macrorugo": "Radier", "fs_rugofond": "Radier",
"select_passtype": "Type de passe", "select_passtype": "Type de passe",
"Q": "Débit", "Q": "Débit",
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
"ZF1": "Cote de fond amont rampe", "ZF1": "Cote de fond amont rampe",
"ZRR": "Cote de fond bas amont rampe", "ZRR": "Cote de fond bas amont rampe",
"ZRL": "Cote de fond haut amont rampe", "ZRL": "Cote de fond haut amont rampe",
"NbT": "Nombre de ralentisseurs", "NbT": "Nombre de tranche d'écoulement",
"L": "Largeur totale de la rampe", "L": "Largeur totale de la rampe",
"Cd": "Coefficient de débit", "Cd": "Coefficient de débit",
"d65": "d65", "d65": "d65",
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment