Skip to content
Snippets Groups Projects
Commit 994f3176 authored by mathias.chouet's avatar mathias.chouet
Browse files

Removed ParallelStructures dependencies from config, use hardcoded presets from model instead 

completely removed dependencies system
parent bd65b7da
No related branches found
No related tags found
1 merge request!53Resolve "Déplacer au maximum la configuration d'un module vers JaLHyd"
Hide whitespace changes
Inline Side-by-side
Showing
with 142 additions and 770 deletions
src/app/calculators/cloisons/cloisons.config.json
+ 9
− 138
View file @ 994f3176
......@@ -54,125 +54,24 @@
{
"id": "select_ouvrage",
"type": "select",
"select": [
{
"id": "select_ouvrage_seuil_rect",
"enum": "StructureType.SeuilRectangulaire"
},
{
"id": "select_ouvrage_orifice",
"enum": "StructureType.Orifice"
},
{
"id": "select_ouvrage_seuil_triang",
"enum": "StructureType.SeuilTriangulaire"
},
{
"id": "select_ouvrage_seuil_triangtrunc",
"enum": "StructureType.SeuilTriangulaireTrunc"
}
]
"source": "device_structure_type"
},
{
"id": "select_loidebit1",
"id": "select_loidebit",
"type": "select",
"select": [
{
"id": "select_loidebit1_fente",
"enum": "LoiDebit.WeirSubmergedLarinier"
},
{
"id": "select_loidebit1_villemonte",
"enum": "LoiDebit.WeirVillemonte"
}
],
"dep_exist": [
{
"refid": "select_ouvrage",
"refvalue": "select_ouvrage_seuil_rect"
}
]
},
{
"id": "select_loidebit2",
"type": "select",
"select": [
{
"id": "select_loidebit2_orifice",
"enum": "LoiDebit.OrificeSubmerged"
}
],
"dep_exist": [
{
"refid": "select_ouvrage",
"refvalue": "select_ouvrage_orifice"
}
]
},
{
"id": "select_loidebit3",
"type": "select",
"select": [
{
"id": "select_loidebit3_seuiltriang",
"enum": "LoiDebit.TriangularWeirFree"
}
],
"dep_exist": [
{
"refid": "select_ouvrage",
"refvalue": "select_ouvrage_seuil_triang"
}
]
},
{
"id": "select_loidebit4",
"type": "select",
"select": [
{
"id": "select_loidebit4_seuiltriangtrunc",
"enum": "LoiDebit.TriangularTruncWeirFree"
}
],
"dep_exist": [
{
"refid": "select_ouvrage",
"refvalue": "select_ouvrage_seuil_triangtrunc"
}
]
"source": "device_loi_debit"
},
{
"type": "input",
"id": "h1",
"unit": "m",
"nodeType": "StructureRectangle",
"dep_exist": [
{
"refid": "select_ouvrage",
"refvalue": "select_ouvrage_seuil_rect"
},
{
"refid": "select_ouvrage",
"refvalue": "select_ouvrage_seuil_triang"
},
{
"refid": "select_ouvrage",
"refvalue": "select_ouvrage_seuil_triangtrunc"
}
]
"nodeType": "StructureRectangle"
},
{
"type": "input",
"id": "L",
"unit": "m",
"nodeType": "StructureRectangle",
"dep_exist": [
{
"refid": "select_ouvrage",
"refvalue": "select_ouvrage_seuil_rect"
}
]
"nodeType": "StructureRectangle"
},
{
"type": "input",
......@@ -184,53 +83,25 @@
"type": "input",
"id": "S",
"unit": "",
"nodeType": "StructureRectangle",
"dep_exist": [
{
"refid": "select_loidebit2",
"refvalue": "select_loidebit2_orifice"
}
]
"nodeType": "StructureRectangle"
},
{
"type": "input",
"id": "alpha2",
"unit": "",
"nodeType": "StructureRectangle",
"dep_exist": [
{
"refid": "select_ouvrage",
"refvalue": "select_ouvrage_seuil_triang"
},
{
"refid": "select_ouvrage",
"refvalue": "select_ouvrage_seuil_triangtrunc"
}
]
"nodeType": "StructureRectangle"
},
{
"type": "input",
"id": "BT",
"unit": "",
"nodeType": "StructureRectangle",
"dep_exist": [
{
"refid": "select_ouvrage",
"refvalue": "select_ouvrage_seuil_triangtrunc"
}
]
"nodeType": "StructureRectangle"
},
{
"type": "input",
"id": "ZT",
"unit": "",
"nodeType": "StructureRectangle",
"dep_exist": [
{
"refid": "select_ouvrage",
"refvalue": "select_ouvrage_seuil_triangtrunc"
}
]
"nodeType": "StructureRectangle"
}
]
},
......
src/app/calculators/cloisons/cloisons.en.json
+ 15
− 9
View file @ 994f3176
......@@ -3,15 +3,21 @@
"ZR": "Upstream bed elevation",
"PB": "Pool mean depth",
"h1": "Head",
"select_ouvrage_seuil_triang": "Triangular weir",
"select_ouvrage_seuil_triangtrunc": "Truncated triangular weir",
"select_ouvrage_orifice": "Orifice",
"select_ouvrage_seuil_rect": "Rectangular weir",
"select_loidebit1_villemonte": "Villemonte 1947",
"select_loidebit1_fente": "Submerged slot (Larinier 1992)",
"select_loidebit2_orifice": "Submerged orifice",
"select_loidebit3_seuiltriang": "Free flow triangular weir",
"select_loidebit4_seuiltriangtrunc": "Free flow truncated triangular weir",
"select_structure_SeuilTriangulaire": "Triangular weir",
"select_structure_SeuilTriangulaireTrunc": "Truncated triangular weir",
"select_structure_Orifice": "Orifice",
"select_structure_SeuilRectangulaire": "Rectangular weir",
"select_loidebit_Orifice_OrificeSubmerged": "Submerged orifice",
"select_loidebit_SeuilRectangulaire_WeirSubmergedLarinier": "Submerged slot (Larinier 1992)",
"select_loidebit_SeuilRectangulaire_WeirVillemonte": "Villemonte 1947",
"select_loidebit_SeuilTriangulaire_TriangularWeirFree": "Free flow triangular weir",
"select_loidebit_SeuilTriangulaireTrunc_TriangularTruncWeirFree": "Free flow truncated triangular weir",
"UNIT_PV": "W/m³",
"UNIT_Q": "m³/s",
"UNIT_YMOY": "m",
......
src/app/calculators/cloisons/cloisons.fr.json
+ 15
− 9
View file @ 994f3176
{
"Q": "Débit total",
"select_ouvrage_seuil_triang": "Seuil triangulaire",
"select_ouvrage_seuil_triangtrunc": "Seuil triangulaire tronqué",
"select_ouvrage_orifice": "Orifice",
"select_ouvrage_seuil_rect": "Seuil rectangulaire",
"select_loidebit1_villemonte": "Villemonte 1947",
"select_loidebit1_fente": "Fente noyée (Larinier 1992)",
"select_loidebit2_orifice": "Orifice noyé",
"select_loidebit3_seuiltriang": "Déversoir triangulaire dénoyé",
"select_loidebit4_seuiltriangtrunc": "Déversoir triangulaire tronqué dénoyé",
"select_structure_SeuilTriangulaire": "Seuil triangulaire",
"select_structure_SeuilTriangulaireTrunc": "Seuil triangulaire tronqué",
"select_structure_Orifice": "Orifice",
"select_structure_SeuilRectangulaire": "Seuil rectangulaire",
"select_loidebit_Orifice_OrificeSubmerged": "Orifice noyé",
"select_loidebit_SeuilRectangulaire_WeirSubmergedLarinier": "Fente noyée (Larinier 1992)",
"select_loidebit_SeuilRectangulaire_WeirVillemonte": "Villemonte 1947",
"select_loidebit_SeuilTriangulaire_TriangularWeirFree": "Déversoir triangulaire dénoyé",
"select_loidebit_SeuilTriangulaireTrunc_TriangularTruncWeirFree": "Déversoir triangulaire tronqué dénoyé",
"UNIT_PV": "W/m³",
"UNIT_Q": "m³/s",
"UNIT_YMOY": "m",
......
src/app/calculators/dever/dever.config.json
+ 9
− 121
View file @ 994f3176
......@@ -42,160 +42,48 @@
{
"id": "select_ouvrage",
"type": "select",
"select": [
{
"id": "select_ouvrage_seuil_rect",
"enum": "StructureType.SeuilRectangulaire"
},
{
"id": "select_ouvrage_seuil_triang",
"enum": "StructureType.SeuilTriangulaire"
},
{
"id": "select_ouvrage_seuil_triangtrunc",
"enum": "StructureType.SeuilTriangulaireTrunc"
}
]
"source": "device_structure_type"
},
{
"id": "select_loidebit1",
"id": "select_loidebit",
"type": "select",
"select": [
{
"id": "select_loidebit1_seuildenoye",
"enum": "LoiDebit.WeirFree"
}
],
"dep_exist": [
{
"refid": "select_ouvrage",
"refvalue": "select_ouvrage_seuil_rect"
}
]
},
{
"id": "select_loidebit3",
"type": "select",
"select": [
{
"id": "select_loidebit3_seuiltriang",
"enum": "LoiDebit.TriangularWeirFree"
}
],
"dep_exist": [
{
"refid": "select_ouvrage",
"refvalue": "select_ouvrage_seuil_triang"
}
]
},
{
"id": "select_loidebit4",
"type": "select",
"select": [
{
"id": "select_loidebit4_seuiltriangtrunc",
"enum": "LoiDebit.TriangularTruncWeirFree"
}
],
"dep_exist": [
{
"refid": "select_ouvrage",
"refvalue": "select_ouvrage_seuil_triangtrunc"
}
]
"source": "device_loi_debit"
},
{
"type": "input",
"id": "ZDV",
"unit": "m",
"nodeType": "StructureRectangle",
"dep_exist": [
{
"refid": "select_ouvrage",
"refvalue": "select_ouvrage_seuil_rect"
},
{
"refid": "select_ouvrage",
"refvalue": "select_ouvrage_seuil_triang"
},
{
"refid": "select_ouvrage",
"refvalue": "select_ouvrage_seuil_triangtrunc"
}
]
"nodeType": "StructureRectangle"
},
{
"type": "input",
"id": "L",
"unit": "m",
"nodeType": "StructureRectangle",
"dep_exist": [
{
"refid": "select_ouvrage",
"refvalue": "select_ouvrage_seuil_rect"
}
]
"nodeType": "StructureRectangle"
},
{
"type": "input",
"id": "Cd",
"unit": "",
"nodeType": "StructureRectangle",
"dep_exist": [
{
"refid": "select_loidebit1",
"refvalue": "select_loidebit1_seuildenoye"
},
{
"refid": "select_loidebit3",
"refvalue": "select_loidebit3_seuiltriang"
},
{
"refid": "select_loidebit3",
"refvalue": "select_loidebit4_seuiltriangtrunc"
}
]
"nodeType": "StructureRectangle"
},
{
"type": "input",
"id": "alpha2",
"unit": "°",
"nodeType": "StructureRectangle",
"dep_exist": [
{
"refid": "select_ouvrage",
"refvalue": "select_ouvrage_seuil_triang"
},
{
"refid": "select_ouvrage",
"refvalue": "select_ouvrage_seuil_triangtrunc"
}
]
"nodeType": "StructureRectangle"
},
{
"type": "input",
"id": "BT",
"unit": "m",
"nodeType": "StructureRectangle",
"dep_exist": [
{
"refid": "select_ouvrage",
"refvalue": "select_ouvrage_seuil_triangtrunc"
}
]
"nodeType": "StructureRectangle"
},
{
"type": "input",
"id": "ZT",
"unit": "m",
"nodeType": "StructureRectangle",
"dep_exist": [
{
"refid": "select_ouvrage",
"refvalue": "select_ouvrage_seuil_triangtrunc"
}
]
"nodeType": "StructureRectangle"
}
]
},
......
src/app/calculators/dever/dever.en.json
+ 9
− 6
View file @ 994f3176
......@@ -2,14 +2,17 @@
"Q": "Total Flow",
"ZR": "Upstream bed elevation",
"BR": "Upstream bed width",
"select_ouvrage_seuil_rect": "Rectangular weir",
"select_ouvrage_seuil_triang": "Triangular weir",
"select_ouvrage_seuil_triangtrunc": "Truncated triangular weir",
"select_loidebit1_seuildenoye": "Free flow rectangular weir",
"select_loidebit3_seuiltriang": "Free flow triangular weir",
"select_loidebit4_seuiltriangtrunc": "Free flow truncated triangular weir",
"L": "Width of the weir",
"Cd": "Discharge coefficient",
"select_structure_SeuilRectangulaire": "Rectangular weir",
"select_structure_SeuilTriangulaire": "Triangular weir",
"select_structure_SeuilTriangulaireTrunc": "Truncated triangular weir",
"select_loidebit_SeuilRectangulaire_WeirFree": "Free flow rectangular weir",
"select_loidebit_SeuilTriangulaire_TriangularWeirFree": "Free flow triangular weir",
"select_loidebit_SeuilTriangulaireTrunc_TriangularTruncWeirFree": "Free flow truncated triangular weir",
"UNIT_CVQT": "m³/s",
"UNIT_Q": "m³/s",
"UNIT_EC": "m",
......
src/app/calculators/dever/dever.fr.json
+ 9
− 6
View file @ 994f3176
......@@ -2,14 +2,17 @@
"Q": "Débit total",
"ZR": "Cote du lit amont",
"BR": "Largeur du lit amont",
"select_ouvrage_seuil_rect": "Déversoir rectangulaire",
"select_ouvrage_seuil_triang": "Déversoir triangulaire",
"select_ouvrage_seuil_triangtrunc": "Déversoir triangulaire tronqué",
"select_loidebit1_seuildenoye": "Déversoir rectangulaire dénoyé",
"select_loidebit3_seuiltriang": "Déversoir triangulaire dénoyé",
"select_loidebit4_seuiltriangtrunc": "Déversoir triangulaire tronqué dénoyé",
"L": "Largeur du déversoir",
"Cd": "Coefficient de débit",
"select_structure_SeuilRectangulaire": "Déversoir rectangulaire",
"select_structure_SeuilTriangulaire": "Déversoir triangulaire",
"select_structure_SeuilTriangulaireTrunc": "Déversoir triangulaire tronqué",
"select_loidebit_SeuilRectangulaire_WeirFree": "Déversoir rectangulaire dénoyé",
"select_loidebit_SeuilTriangulaire_TriangularWeirFree": "Déversoir triangulaire dénoyé",
"select_loidebit_SeuilTriangulaireTrunc_TriangularTruncWeirFree": "Déversoir triangulaire tronqué dénoyé",
"UNIT_CVQT": "m³/s",
"UNIT_Q": "m³/s",
"UNIT_EC": "m",
......
src/app/calculators/lechapt-calmon/lechapt-calmon.config.json
+ 1
− 1
View file @ 994f3176
......@@ -7,7 +7,7 @@
{
"id": "select_material",
"type": "select",
"source": "lechapt_calmon_materials"
"source": "lechapt_calmon_material"
},
{
"type": "input",
......
src/app/calculators/parallel-structures/parallel-structures.config.json
+ 16
− 270
View file @ 994f3176
......@@ -35,344 +35,90 @@
{
"id": "select_ouvrage",
"type": "select",
"select": [
{
"id": "select_ouvrage_vanne_rect",
"enum": "StructureType.VanneRectangulaire"
},
{
"id": "select_ouvrage_seuil_rect",
"enum": "StructureType.SeuilRectangulaire"
},
{
"id": "select_ouvrage_seuil_triang",
"enum": "StructureType.SeuilTriangulaire"
},
{
"id": "select_ouvrage_seuil_triangtrunc",
"enum": "StructureType.SeuilTriangulaireTrunc"
}
]
"source": "device_structure_type"
},
{
"id": "select_loidebit1",
"id": "select_loidebit",
"type": "select",
"select": [
{
"id": "select_loidebit1_cem88d",
"enum": "LoiDebit.WeirCem88d"
},
{
"id": "select_loidebit1_cem88v",
"enum": "LoiDebit.WeirCem88v"
},
{
"id": "select_loidebit1_seuildenoye",
"enum": "LoiDebit.WeirFree"
},
{
"id": "select_loidebit1_cunge80",
"enum": "LoiDebit.WeirCunge80"
},
{
"id": "select_loidebit1_villemonte",
"enum": "LoiDebit.WeirVillemonte"
},
{
"id": "select_loidebit1_kivi",
"enum": "LoiDebit.KIVI"
},
{
"id": "select_loidebit1_fente",
"enum": "LoiDebit.WeirSubmergedLarinier"
}
],
"dep_exist": [
{
"refid": "select_ouvrage",
"refvalue": "select_ouvrage_seuil_rect"
}
]
},
{
"id": "select_loidebit2",
"type": "select",
"select": [
{
"id": "select_loidebit2_cem88v",
"enum": "LoiDebit.GateCem88v"
},
{
"id": "select_loidebit2_cem88d",
"enum": "LoiDebit.GateCem88d"
},
{
"id": "select_loidebit2_vannedenoye",
"enum": "LoiDebit.RectangularOrificeFree"
},
{
"id": "select_loidebit2_vannenoye",
"enum": "LoiDebit.RectangularOrificeSubmerged"
},
{
"id": "select_loidebit2_cunge80",
"enum": "LoiDebit.GateCunge80"
}
],
"dep_exist": [
{
"refid": "select_ouvrage",
"refvalue": "select_ouvrage_vanne_rect"
}
]
},
{
"id": "select_loidebit3",
"type": "select",
"select": [
{
"id": "select_loidebit3_seuiltriang",
"enum": "LoiDebit.TriangularWeirFree"
}
],
"dep_exist": [
{
"refid": "select_ouvrage",
"refvalue": "select_ouvrage_seuil_triang"
}
]
},
{
"id": "select_loidebit4",
"type": "select",
"select": [
{
"id": "select_loidebit4_seuiltriangtrunc",
"enum": "LoiDebit.TriangularTruncWeirFree"
}
],
"dep_exist": [
{
"refid": "select_ouvrage",
"refvalue": "select_ouvrage_seuil_triangtrunc"
}
]
"source": "device_loi_debit"
},
{
"type": "input",
"id": "ZDV",
"unit": "m",
"nodeType": "StructureRectangle",
"dep_exist": [
{
"refid": "select_ouvrage",
"refvalue": "select_ouvrage_vanne_rect"
},
{
"refid": "select_ouvrage",
"refvalue": "select_ouvrage_seuil_rect"
},
{
"refid": "select_ouvrage",
"refvalue": "select_ouvrage_seuil_triang"
},
{
"refid": "select_ouvrage",
"refvalue": "select_ouvrage_seuil_triangtrunc"
}
]
"nodeType": "StructureRectangle"
},
{
"type": "input",
"id": "L",
"unit": "m",
"nodeType": "StructureRectangle",
"dep_exist": [
{
"refid": "select_ouvrage",
"refvalue": "select_ouvrage_vanne_rect"
},
{
"refid": "select_ouvrage",
"refvalue": "select_ouvrage_seuil_rect"
},
{
"refid": "select_loidebit1",
"refvalue": "select_loidebit1_kivi"
}
]
"nodeType": "StructureRectangle"
},
{
"type": "input",
"id": "W",
"nodeType": "StructureRectangle",
"unit": "m",
"dep_exist": [
{
"refid": "select_ouvrage",
"refvalue": "select_ouvrage_vanne_rect"
}
]
"unit": "m"
},
{
"type": "input",
"id": "CdWSL",
"unit": "",
"nodeType": "StructureRectangle",
"dep_exist": [
{
"refid": "select_loidebit1",
"refvalue": "select_loidebit1_fente"
}
]
"nodeType": "StructureRectangle"
},
{
"type": "input",
"id": "CdWR",
"unit": "",
"nodeType": "StructureRectangle",
"dep_exist": [
{
"refid": "select_loidebit1",
"refvalue": "select_loidebit1_seuildenoye"
},
{
"refid": "select_loidebit1",
"refvalue": "select_loidebit1_cem88d"
},
{
"refid": "select_loidebit2",
"refvalue": "select_loidebit2_cem88d"
},
{
"refid": "select_loidebit1",
"refvalue": "select_loidebit1_villemonte"
}
]
"nodeType": "StructureRectangle"
},
{
"type": "input",
"id": "CdGR",
"unit": "",
"nodeType": "StructureRectangle",
"dep_exist": [
{
"refid": "select_loidebit1",
"refvalue": "select_loidebit1_cunge80"
},
{
"refid": "select_loidebit1",
"refvalue": "select_loidebit1_cem88v"
},
{
"refid": "select_loidebit2",
"refvalue": "select_loidebit2_vannedenoye"
},
{
"refid": "select_loidebit2",
"refvalue": "select_loidebit2_vannenoye"
},
{
"refid": "select_loidebit2",
"refvalue": "select_loidebit2_cunge80"
},
{
"refid": "select_loidebit2",
"refvalue": "select_loidebit2_cem88v"
}
]
"nodeType": "StructureRectangle"
},
{
"type": "input",
"id": "CdT",
"unit": "",
"nodeType": "StructureRectangle",
"dep_exist": [
{
"refid": "select_ouvrage",
"refvalue": "select_ouvrage_seuil_triang"
},
{
"refid": "select_ouvrage",
"refvalue": "select_ouvrage_seuil_triangtrunc"
}
]
"nodeType": "StructureRectangle"
},
{
"type": "input",
"id": "alpha",
"unit": "",
"nodeType": "StructureRectangle",
"dep_exist": [
{
"refid": "select_loidebit1",
"refvalue": "select_loidebit1_kivi"
}
]
"nodeType": "StructureRectangle"
},
{
"type": "input",
"id": "beta",
"unit": "",
"nodeType": "StructureRectangle",
"dep_exist": [
{
"refid": "select_loidebit1",
"refvalue": "select_loidebit1_kivi"
}
]
"nodeType": "StructureRectangle"
},
{
"type": "input",
"id": "ZRAM",
"unit": "m",
"nodeType": "StructureRectangle",
"dep_exist": [
{
"refid": "select_loidebit1",
"refvalue": "select_loidebit1_kivi"
}
]
"nodeType": "StructureRectangle"
},
{
"type": "input",
"id": "alpha2",
"unit": "°",
"nodeType": "StructureRectangle",
"dep_exist": [
{
"refid": "select_ouvrage",
"refvalue": "select_ouvrage_seuil_triang"
},
{
"refid": "select_ouvrage",
"refvalue": "select_ouvrage_seuil_triangtrunc"
}
]
"nodeType": "StructureRectangle"
},
{
"type": "input",
"id": "BT",
"unit": "m",
"nodeType": "StructureRectangle",
"dep_exist": [
{
"refid": "select_ouvrage",
"refvalue": "select_ouvrage_seuil_triangtrunc"
}
]
"nodeType": "StructureRectangle"
},
{
"type": "input",
"id": "ZT",
"unit": "m",
"nodeType": "StructureRectangle",
"dep_exist": [
{
"refid": "select_ouvrage",
"refvalue": "select_ouvrage_seuil_triangtrunc"
}
]
"nodeType": "StructureRectangle"
}
]
},
......
src/app/calculators/parallel-structures/parallel-structures.en.json
+ 27
− 21
View file @ 994f3176
{
"Q": "Total Flow",
"select_ouvrage_vanne_circ": "Circular gate",
"select_ouvrage_vanne_rect": "Rectangular gate",
"select_ouvrage_seuil_rect": "Rectangular weir",
"select_ouvrage_seuil_triang": "Triangular weir",
"select_ouvrage_seuil_triangtrunc": "Truncated triangular weir",
"select_ouvrage_seuil_trap": "Trapezoidal weir",
"select_ouvrage_vanne_trap": "trapezoidal gate",
"W": "Gate opening",
"select_loidebit1_seuildenoye": "Free flow weir",
"select_loidebit1_cunge80": "Cunge 80",
"select_loidebit1_cem88d": "Weir/Orifice Cemagref 88",
"select_loidebit1_cem88v": "Weir/Undershot gate Cemagref 88",
"select_loidebit1_fente": "Submerged slot (Larinier 1992)",
"select_loidebit1_kivi": "Kindsvater-Carter and Villemonte",
"select_loidebit1_villemonte": "Villemonte 1957",
"select_loidebit2_vannedenoye": "Free flow gate",
"select_loidebit2_vannenoye": "Submerged gate",
"select_loidebit2_cunge80": "Cunge 80",
"select_loidebit2_cem88d": "Weir/Orifice Cemagref 88",
"select_loidebit2_cem88v": "Weir/Undershot gate Cemagref 88",
"select_loidebit3_seuiltriang": "Triangular weir (Villemonte)",
"select_loidebit4_seuiltriangtrunc": "Truncated triangular weir (Villemonte)",
"select_structure_Orifice": "Orifice",
"select_structure_VanneRectangulaire": "Rectangular gate",
"select_structure_SeuilRectangulaire": "Rectangular weir",
"select_structure_SeuilTriangulaire": "Triangular weir",
"select_structure_SeuilTriangulaireTrunc": "Truncated triangular weir",
"select_loidebit_Orifice_OrificeSubmerged": "Submerged orifice",
"select_loidebit_VanneRectangulaire_GateCem88d": "Weir/Orifice Cemagref 88",
"select_loidebit_VanneRectangulaire_GateCem88v": "Weir/Undershot gate Cemagref 88",
"select_loidebit_VanneRectangulaire_GateCunge80": "Cunge 80",
"select_loidebit_VanneRectangulaire_RectangularOrificeFree": "Free flow gate",
"select_loidebit_VanneRectangulaire_RectangularOrificeSubmerged": "Submerged gate",
"select_loidebit_SeuilTriangulaire_TriangularWeirFree": "Triangular weir (Villemonte)",
"select_loidebit_SeuilTriangulaireTrunc_TriangularTruncWeirFree": "Truncated triangular weir (Villemonte)",
"select_loidebit_SeuilRectangulaire_WeirCem88d": "Weir/Orifice Cemagref 88",
"select_loidebit_SeuilRectangulaire_WeirCem88v": "Weir/Undershot gate Cemagref 88",
"select_loidebit_SeuilRectangulaire_WeirSubmergedLarinier": "Submerged slot (Larinier 1992)",
"select_loidebit_SeuilRectangulaire_WeirVillemonte": "Villemonte 1957",
"select_loidebit_SeuilRectangulaire_WeirFree": "Free flow weir",
"select_loidebit_SeuilRectangulaire_KIVI": "Kindsvater-Carter and Villemonte",
"select_loidebit_SeuilRectangulaire_WeirCunge80": "Cunge 80",
"UNIT_Q": "m³/s"
}
src/app/calculators/parallel-structures/parallel-structures.fr.json
+ 29
− 22
View file @ 994f3176
{
"Q": "Débit total",
"select_ouvrage_vanne_circ": "Vanne circulaire",
"select_ouvrage_vanne_rect": "Vanne rectangulaire",
"select_ouvrage_seuil_rect": "Seuil rectangulaire",
"select_ouvrage_seuil_triang": "Seuil triangulaire",
"select_ouvrage_seuil_triangtrunc": "Seuil triangulaire tronqué",
"select_ouvrage_seuil_trap": "Seuil trapézoïdal",
"select_ouvrage_vanne_trap": "Vanne trapézoïdale",
"select_loidebit1_seuildenoye": "Seuil dénoyé",
"select_loidebit1_cunge80": "Cunge 80",
"select_loidebit1_cem88d": "Déversoir/Orifice Cemagref 88",
"select_loidebit1_cem88v": "Déversoir/Vanne de fond Cemagref 88",
"select_loidebit1_fente": "Fente noyée (Larinier 1992)",
"select_loidebit1_kivi": "Kindsvater-Carter et Villemonte",
"select_loidebit1_villemonte": "Villemonte 1957",
"select_loidebit2_vannedenoye": "Vanne dénoyé",
"select_loidebit2_vannenoye": "Vanne noyé",
"select_loidebit2_cunge80": "Cunge 80",
"select_loidebit2_cem88d": "Déversoir/Orifice Cemagref 88",
"select_loidebit2_cem88v": "Déversoir/Vanne de fond Cemagref 88",
"select_loidebit3_seuiltriang": "Déversoir triangulaire (Villemonte)",
"select_loidebit4_seuiltriangtrunc": "Déversoir triangulaire tronqué (Villemonte)",
"W": "Ouverture de vanne",
"select_structure_Orifice": "Orifice",
"select_structure_SeuilRectangulaire": "Seuil rectangulaire",
"select_structure_SeuilTriangulaire": "Seuil triangulaire",
"select_structure_SeuilTriangulaireTrunc": "Seuil triangulaire tronqué",
"select_structure_VanneRectangulaire": "Vanne rectangulaire",
"select_loidebit_Orifice_OrificeSubmerged": "Orifice noyé",
"select_loidebit_VanneRectangulaire_GateCem88d": "Déversoir/Orifice Cemagref 88",
"select_loidebit_VanneRectangulaire_GateCem88v": "Déversoir/Vanne de fond Cemagref 88",
"select_loidebit_VanneRectangulaire_GateCunge80": "Cunge 80",
"select_loidebit_VanneRectangulaire_RectangularOrificeFree": "Vanne dénoyée",
"select_loidebit_VanneRectangulaire_RectangularOrificeSubmerged": "Vanne noyée",
"select_loidebit_SeuilTriangulaire_TriangularWeirFree": "Déversoir triangulaire (Villemonte)",
"select_loidebit_SeuilTriangulaireTrunc_TriangularTruncWeirFree": "Déversoir triangulaire tronqué (Villemonte)",
"select_loidebit_SeuilRectangulaire_WeirCem88d": "Déversoir/Orifice Cemagref 88",
"select_loidebit_SeuilRectangulaire_WeirCem88v": "Déversoir/Vanne de fond Cemagref 88",
"select_loidebit_SeuilRectangulaire_WeirSubmergedLarinier": "Fente noyée (Larinier 1992)",
"select_loidebit_SeuilRectangulaire_WeirVillemonte": "Villemonte 1957",
"select_loidebit_SeuilRectangulaire_WeirFree": "Seuil dénoyé",
"select_loidebit_SeuilRectangulaire_KIVI": "Kindsvater-Carter et Villemonte",
"select_loidebit_SeuilRectangulaire_WeirCunge80": "Cunge 80",
"UNIT_Q": "m³/s"
}
\ No newline at end of file
}
src/app/calculators/regime-uniforme/regime-uniforme.config.json
+ 1
− 1
View file @ 994f3176
......@@ -7,7 +7,7 @@
{
"id": "select_section",
"type": "select",
"source": "acsection_available_sections"
"source": "acsection_section"
},
{
"type": "input",
......
src/app/calculators/remous/remous.config.json
+ 1
− 1
View file @ 994f3176
......@@ -7,7 +7,7 @@
{
"id": "select_section",
"type": "select",
"source": "acsection_available_sections"
"source": "acsection_section"
},
{
"type": "input",
......
src/app/calculators/section-param/section-param.config.json
+ 1
− 1
View file @ 994f3176
......@@ -7,7 +7,7 @@
{
"id": "select_section",
"type": "select",
"source": "acsection_available_sections"
"source": "acsection_section"
},
{
"type": "input",
......
src/app/formulaire/definition/form-definition.ts
+ 0
− 38
View file @ 994f3176
......@@ -196,35 +196,6 @@ export abstract class FormulaireDefinition extends FormulaireNode implements Obs
this.kids.push(tab);
}
public parseDependencies(json: {}) {
// tslint:disable-next-line:forin
for (const conf_index in json) {
const conf = json[conf_index];
const type: string = conf["type"];
switch (type) {
// field set
case "fieldset":
case "template_container":
for (const k of this.kids) {
if (k.id === conf["id"]) {
k.parseDependencies(conf);
break;
}
}
break;
case "fieldset_template":
for (const k of this.kids) {
if (k instanceof FieldsetContainer) {
k.parseDependencies(conf);
}
}
break;
}
}
}
/**
* 1ère passe d'analyse de la configuration
*/
......@@ -290,7 +261,6 @@ export abstract class FormulaireDefinition extends FormulaireNode implements Obs
}
this.completeParse(this._jsonConfig);
this.parseDependencies(this._jsonConfig);
}
public hasParameter(symbol: string): boolean {
......@@ -381,8 +351,6 @@ export abstract class FormulaireDefinition extends FormulaireNode implements Obs
*/
public reset() {
this.resetResults([], undefined, true);
this.applyDependencies();
// prévenir les composants qu'il faut détecter les changements
this.notifyReset();
}
......@@ -407,12 +375,6 @@ export abstract class FormulaireDefinition extends FormulaireNode implements Obs
return select.getValue().label;
}
public applyDependencies() {
for (const fe of this.topFormElements) {
fe.applyDependencies();
}
}
public abstract resetResults(visited: string[], symbol?: string, forceResetAllDependencies?: boolean);
public abstract doCompute();
public abstract get hasResults(): boolean;
......
src/app/formulaire/dependency/dependency-condition.ts deleted 100644 → 0
+ 0
− 16
View file @ bd65b7da
export enum DependencyConditionType {
HasValue, IsVariable, IsDisplayed
}
export class DependencyCondition {
constructor(private _type: DependencyConditionType) {
}
public get type() {
return this._type;
}
public toString(): string {
return "cond=" + DependencyConditionType[this._type];
}
}
src/app/formulaire/dependency/dependency.ts deleted 100644 → 0
+ 0
− 51
View file @ bd65b7da
import { FormulaireElement } from "../formulaire-element";
import { DependencyCondition } from "./dependency-condition";
/**
* Dépendance entre un élément maître et un élément esclave
* Si le maître vérifie une condition (masterCondition), alors la dépendance est appliquée à l'élément esclave,
* cad que son affichage, sa valeur, ... sont modifiés
*/
export abstract class Dependency {
private _slave: FormulaireElement;
private _masterId: string;
private _masterCondition: DependencyCondition;
constructor(s: FormulaireElement, mid: string, mc: DependencyCondition) {
this._slave = s;
this._masterId = mid;
this._masterCondition = mc;
}
private getMasterElement(id: string): FormulaireElement {
let parentNode = this._slave.parent;
while (parentNode !== undefined) {
const res: FormulaireElement = parentNode.getFormulaireNodeById(id) as FormulaireElement;
if (res !== undefined) {
return res;
}
parentNode = parentNode.parent;
}
}
protected get masterElement(): FormulaireElement {
return this.getMasterElement(this._masterId);
}
public get masterCondition(): DependencyCondition {
return this._masterCondition;
}
public apply() {
const master: FormulaireElement = this.masterElement;
if (master && master.verifiesDependency(this)) {
this._slave.applyDependency(this);
}
}
public toString(): string {
return "slave=" + this._slave.toString() + "\n mid=" + this._masterId + "\n " + this._masterCondition.toString();
}
}
src/app/formulaire/dependency/existence-dependency-condition.ts deleted 100644 → 0
+ 0
− 8
View file @ bd65b7da
import { DependencyCondition, DependencyConditionType } from "./dependency-condition";
export class ExistenceDependencyCondition extends DependencyCondition {
constructor() {
super(DependencyConditionType.IsDisplayed);
}
}
src/app/formulaire/dependency/existence-dependency.ts deleted 100644 → 0
+ 0
− 17
View file @ bd65b7da
import { Dependency } from "./dependency";
import { FormulaireElement } from "../formulaire-element";
/**
* dépendance déterminant l'affichage de l'élément esclave
*/
export class ExistenceDependency extends Dependency {
/**
* true : l'élément slave est affiché si le master est affiché
* false : l'élément slave est affiché si le master n'est pas affiché
*/
// private _direct: boolean;
public toString() {
return "existdep\n " + super.toString();
}
}
src/app/formulaire/dependency/value-dependency-condition.ts deleted 100644 → 0
+ 0
− 16
View file @ bd65b7da
import { DependencyCondition, DependencyConditionType } from "./dependency-condition";
export class ValueDependencyCondition extends DependencyCondition {
constructor(private _value: any) {
super(DependencyConditionType.HasValue);
}
public get value(): any {
return this._value;
}
public toString(): string {
return super.toString() + " " + this._value;
}
}
src/app/formulaire/dependency/value-dependency.ts deleted 100644 → 0
+ 0
− 18
View file @ bd65b7da
import { Dependency } from "./dependency";
import { FormulaireElement } from "../formulaire-element";
import { ValueDependencyCondition } from "./value-dependency-condition";
/**
* dépendance déterminant la valeur de l'élément esclave
*/
export class ValueDependency extends Dependency {
public slaveValue: any;
constructor(slave: FormulaireElement, masterId: string, masterValue: any) {
super(slave, masterId, new ValueDependencyCondition(masterValue));
}
public toString() {
return "valdep\n " + super.toString() + "\n slave val " + this.slaveValue;
}
}
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment