mirror of
https://gitlab.com/pamhyr/pamhyr2.git
synced 2026-10-30 03:20:41 +01:00
Merge branch 'terraz_dev' into adists_release
This commit is contained in:
commit
1266884f93
33 files changed
+1193
-349
No files matched your search
@@ -72,10 +72,10 @@ class ResultsTranslate(MainTranslate):
|
||||
"name": _translate("Results", "Profile"),
|
||||
"water_elevation": self._dict["unit_water_elevation"],
|
||||
"discharge": self._dict["unit_discharge"],
|
||||
"velocity": self._dict["unit_speed"],
|
||||
"velocity": self._dict["unit_velocity"],
|
||||
"width": self._dict["unit_width"],
|
||||
"max_depth": self._dict["unit_max_height"],
|
||||
"mean_depth": self._dict["unit_mean_height"],
|
||||
"depth": self._dict["unit_depth"],
|
||||
"mean_depth": self._dict["unit_mean_depth"],
|
||||
"wet_area": self._dict["unit_wet_area"],
|
||||
"wet_perimeter": self._dict["unit_wet_perimeter"],
|
||||
"hydraulic_radius": self._dict["unit_hydraulic_radius"],
|
||||
@@ -88,12 +88,12 @@ class ResultsTranslate(MainTranslate):
|
||||
}
|
||||
|
||||
self._sub_dict["values_y"] = {
|
||||
"elevation": self._dict["unit_elevation"],
|
||||
"bed_elevation": self._dict["unit_bed_elevation"],
|
||||
"water_elevation": self._dict["unit_water_elevation"],
|
||||
"discharge": self._dict["unit_discharge"],
|
||||
"velocity": self._dict["unit_speed"],
|
||||
"max_depth": self._dict["unit_max_height"],
|
||||
"mean_depth": self._dict["unit_mean_height"],
|
||||
"velocity": self._dict["unit_velocity"],
|
||||
"depth": self._dict["unit_depth"],
|
||||
"mean_depth": self._dict["unit_mean_depth"],
|
||||
"froude": self._dict["unit_froude"],
|
||||
"wet_area": self._dict["unit_wet_area"],
|
||||
}
|
||||
@@ -110,6 +110,18 @@ class ResultsTranslate(MainTranslate):
|
||||
"name": _translate("Results", "Profile"),
|
||||
"water_elevation": self._dict["unit_water_elevation"],
|
||||
"discharge": self._dict["unit_discharge"],
|
||||
"speed": self._dict["unit_speed"],
|
||||
"discharge": self._dict["unit_discharge"],
|
||||
}
|
||||
|
||||
self._sub_dict["values_y_envelop"] = {
|
||||
"min_bed_elevation": self._dict["unit_min_bed_elevation"],
|
||||
"max_bed_elevation": self._dict["unit_max_bed_elevation"],
|
||||
"min_water_elevation": self._dict["unit_min_water_elevation"],
|
||||
"max_water_elevation": self._dict["unit_max_water_elevation"],
|
||||
"min_discharge": self._dict["unit_min_discharge"],
|
||||
"max_discharge": self._dict["unit_max_discharge"],
|
||||
"min_velocity": self._dict["unit_min_velocity"],
|
||||
"max_velocity": self._dict["unit_max_velocity"],
|
||||
"min_depth": self._dict["unit_min_depth"],
|
||||
"max_depth": self._dict["unit_max_depth"],
|
||||
}
|
||||
Reference in new issue
Block a user