HS: Basic: Rename all HS to english and add translation.

setup.py
Pierre-Antoine Rouby 2024-01-15 15:15:05 +01:00
parent 22f3823699
commit 975f2027ed
3 changed files with 184 additions and 89 deletions

View File

@ -37,145 +37,145 @@ class NotDefined(BasicHS):
self._data = []
class SeuilDeversoir(BasicHS):
class DischargeWeir(BasicHS):
def __init__(self, id: int = -1, name: str = "",
status=None):
super(SeuilDeversoir, self).__init__(
super(DischargeWeir, self).__init__(
id=id, name=name,
status=status
)
self._type = "S1"
self._data = [
BHSValue("Largeur", float, 1.0, status=status),
BHSValue("Cote", float, 1.0, status=status),
BHSValue("Coefficient de debit", float, 0.4, status=status),
BHSValue("width", float, 1.0, status=status),
BHSValue("elevation", float, 1.0, status=status),
BHSValue("discharge_coefficient", float, 0.4, status=status),
]
class SeuilTrapezoidal(BasicHS):
class TrapezoidalWeir(BasicHS):
def __init__(self, id: int = -1, name: str = "",
status=None):
super(SeuilTrapezoidal, self).__init__(
super(TrapezoidalWeir, self).__init__(
id=id, name=name,
status=status
)
self._type = "S2"
self._data = [
BHSValue("Largeur", float, 1.0, status=status),
BHSValue("Cote", float, 1.0, status=status),
BHSValue("Cote de mise en charge", float, 9999.999, status=status),
BHSValue("Coefficient de debit", float, 0.4, status=status),
BHSValue("Tangeante du demi angle", float, 0.0, status=status),
BHSValue("width", float, 1.0, status=status),
BHSValue("elevation", float, 1.0, status=status),
BHSValue("loading_elevation", float, 9999.999, status=status),
BHSValue("discharge_coefficient", float, 0.4, status=status),
BHSValue("half-angle_tangent", float, 0.0, status=status),
]
class SeuilTriangulaire(BasicHS):
class TriangularWeir(BasicHS):
def __init__(self, id: int = -1, name: str = "",
status=None):
super(SeuilTriangulaire, self).__init__(
super(TriangularWeir, self).__init__(
id=id, name=name,
status=status
)
self._type = "S3"
self._data = [
BHSValue("Cote", float, 1.0, status=status),
BHSValue("Cote de mise en charge", float, 9999.999, status=status),
BHSValue("Coefficient de debit", float, 0.4, status=status),
BHSValue("Tangeante du demi angle", float, 0.0, status=status),
BHSValue("elevation", float, 1.0, status=status),
BHSValue("loading_elevation", float, 9999.999, status=status),
BHSValue("discharge_coefficient", float, 0.4, status=status),
BHSValue("half-angle_tangent", float, 0.0, status=status),
]
class OrificeRectangulaire(BasicHS):
class RectangularOrifice(BasicHS):
def __init__(self, id: int = -1, name: str = "",
status=None):
super(OrificeRectangulaire, self).__init__(
super(RectangularOrifice, self).__init__(
id=id, name=name,
status=status
)
self._type = "OR"
self._data = [
BHSValue("Largeur", float, 0.0, status=status),
BHSValue("Cote", float, 0.0, status=status),
BHSValue("Cote de mise en charge", float, 9999.999,
BHSValue("width", float, 0.0, status=status),
BHSValue("elevation", float, 0.0, status=status),
BHSValue("loading_elevation", float, 9999.999,
status=status),
BHSValue("Coefficient de debit", float, 0.4, status=status),
BHSValue("Cote de mise en charge maximale", float, 9999.999,
BHSValue("discharge_coefficient", float, 0.4, status=status),
BHSValue("maximal_loading_elevation", float, 9999.999,
status=status),
]
class OrificeCirculaire(BasicHS):
class CircularOrifice(BasicHS):
def __init__(self, id: int = -1, name: str = "",
status=None):
super(OrificeCirculaire, self).__init__(
super(CircularOrifice, self).__init__(
id=id, name=name,
status=status
)
self._type = "OC"
self._data = [
BHSValue("Diametre", float, 0.0, status=status),
BHSValue("Cote", float, 0.0, status=status),
BHSValue("hauteur envasement", float, 0.0, status=status),
BHSValue("Coefficient de debit", float, 0.4, status=status),
BHSValue("diameter", float, 0.0, status=status),
BHSValue("elevation", float, 0.0, status=status),
BHSValue("siltation_height", float, 0.0, status=status),
BHSValue("discharge_coefficient", float, 0.4, status=status),
]
# class OrificeVoute(BasicHS):
# def __init__(self, id: int = -1, name: str = "",
# status=None):
# super(OrificeVoute, self).__init__(
# id=id, name=name,
# status=status
# )
# self._type = "OV"
# self._data = [
# BHSValue("Cote", float, 1.0, status=status),
# BHSValue("Largeur", float, 1.0, status=status),
# BHSValue("Haut de la voute", float, 0.0, status=status),
# BHSValue("Bas de la voute", float, 0.0, status=status),
# BHSValue("Coefficient de debit", float, 0.4, status=status),
# ]
class VanneRectangulaire(BasicHS):
class VaultedOrifice(BasicHS):
def __init__(self, id: int = -1, name: str = "",
status=None):
super(VanneRectangulaire, self).__init__(
super(VaultedOrifice, self).__init__(
id=id, name=name,
status=status
)
self._type = "OV"
self._data = [
BHSValue("elevation", float, 1.0, status=status),
BHSValue("width", float, 1.0, status=status),
BHSValue("top_of_the_vault", float, 0.0, status=status),
BHSValue("bottom_of_the_vault", float, 0.0, status=status),
BHSValue("discharge_coefficient", float, 0.4, status=status),
]
class RectangularGate(BasicHS):
def __init__(self, id: int = -1, name: str = "",
status=None):
super(RectangularGate, self).__init__(
id=id, name=name,
status=status
)
self._type = "V1"
self._data = [
BHSValue("Largeur", float, 1.0, status=status),
BHSValue("Cote", float, 0.0, status=status),
BHSValue("Coefficient de debit", float, 0.4, status=status),
BHSValue("Ouverture", float, 1.0, status=status),
BHSValue("Ouverture maximale", float, 1.0, status=status),
BHSValue("width", float, 1.0, status=status),
BHSValue("elevation", float, 0.0, status=status),
BHSValue("discharge coefficient", float, 0.4, status=status),
BHSValue("opening", float, 1.0, status=status),
BHSValue("maximal_opening", float, 1.0, status=status),
]
class VanneRectangulaireSimplifiee(BasicHS):
class SimplifiedRectangularGate(BasicHS):
def __init__(self, id: int = -1, name: str = "",
status=None):
super(VanneRectangulaireSimplifiee, self).__init__(
super(SimplifiedRectangularGate, self).__init__(
id=id, name=name,
status=status
)
self._type = "V2"
self._data = [
BHSValue("Largeur", float, 1.0, status=status),
BHSValue("Cote", float, 0.0, status=status),
BHSValue("Coefficient de debit", float, 0.4, status=status),
BHSValue("Ouverture", float, 1.0, status=status),
BHSValue("Ouverture maximale", float, 1.0, status=status),
BHSValue("width", float, 1.0, status=status),
BHSValue("elevation", float, 0.0, status=status),
BHSValue("discharge coefficient", float, 0.4, status=status),
BHSValue("opening", float, 1.0, status=status),
BHSValue("maximal_opening", float, 1.0, status=status),
]
@ -189,9 +189,27 @@ class Borda(BasicHS):
self._type = "BO"
self._data = [
BHSValue("Pas espace", float, 0.1, status=status),
BHSValue("Seuil", float, 0.15, status=status),
BHSValue("Coefficient", float, 0.4, status=status),
BHSValue("step_space", float, 0.1, status=status),
BHSValue("weir", float, 0.15, status=status),
BHSValue("coefficient", float, 0.4, status=status),
]
class CheckValve(BasicHS):
def __init__(self, id: int = -1, name: str = "",
status=None):
super(CheckValve, self).__init__(
id=id, name=name,
status=status
)
self._type = "CV"
self._data = [
BHSValue("parameter_1", float, 0.0, status=status),
BHSValue("parameter_2", float, 0.0, status=status),
BHSValue("parameter_3", float, 0.0, status=status),
BHSValue("parameter_4", float, 0.0, status=status),
BHSValue("parameter_5", float, 0.0, status=status),
]
@ -205,24 +223,25 @@ class UserDefined(BasicHS):
self._type = "UD"
self._data = [
BHSValue("Parameter 1", float, 0.0, status=status),
BHSValue("Parameter 2", float, 0.0, status=status),
BHSValue("Parameter 3", float, 0.0, status=status),
BHSValue("Parameter 4", float, 0.0, status=status),
BHSValue("Parameter 5", float, 0.0, status=status),
BHSValue("parameter_1", float, 0.0, status=status),
BHSValue("parameter_2", float, 0.0, status=status),
BHSValue("parameter_3", float, 0.0, status=status),
BHSValue("parameter_4", float, 0.0, status=status),
BHSValue("parameter_5", float, 0.0, status=status),
]
BHS_types = {
"ND": NotDefined,
"S1": SeuilDeversoir,
"S2": SeuilTrapezoidal,
"S3": SeuilTriangulaire,
"OR": OrificeRectangulaire,
"OC": OrificeCirculaire,
# "OV": OrificeVoute,
"V1": VanneRectangulaire,
"V2": VanneRectangulaireSimplifiee,
"S1": DischargeWeir,
"S2": TrapezoidalWeir,
"S3": TriangularWeir,
"OR": RectangularOrifice,
"OC": CircularOrifice,
# "OV": VaultedOrifice,
"V1": RectangularGate,
"V2": SimplifiedRectangularGate,
"BO": Borda,
# "VC": CheckValve,
"UD": UserDefined
}

View File

@ -239,7 +239,7 @@ class ParametersTableModel(PamhyrTableModel):
hs = self._data.basic_structure(self._hs_index)
if self._headers[column] == "name":
return hs.parameters[row].name
return self._trad[hs.parameters[row].name]
elif self._headers[column] == "value":
return str(hs.parameters[row].value)

View File

@ -38,42 +38,118 @@ class BasicHydraulicStructuresTranslate(PamhyrTranslate):
hydraulic structure values?"
)
# BHSValues translation
self._dict['width'] = _translate(
"BasicHydraulicStructures", "Width"
)
self._dict['height'] = _translate(
"BasicHydraulicStructures", "Height"
)
self._dict['elevation'] = _translate(
"BasicHydraulicStructures", "Elevation"
)
self._dict['diameter'] = _translate(
"BasicHydraulicStructures", "Diameter"
)
self._dict['discharge_coefficient'] = _translate(
"BasicHydraulicStructures", "Discharge coefficient"
)
self._dict['loading_elevation'] = _translate(
"BasicHydraulicStructures", "Loading elevation"
)
self._dict['half-angle_tangent'] = _translate(
"BasicHydraulicStructures", "Half-angle tangent"
)
self._dict['maximal_loading_elevation'] = _translate(
"BasicHydraulicStructures", "Maximal loading elevation"
)
self._dict['siltation_height'] = _translate(
"BasicHydraulicStructures", "Siltation height"
)
self._dict['top_of_the_vault'] = _translate(
"BasicHydraulicStructures", "Top of the vault"
)
self._dict['bottom_of_the_vault'] = _translate(
"BasicHydraulicStructures", "Bottom of the vault"
)
self._dict['opening'] = _translate(
"BasicHydraulicStructures", "Opening"
)
self._dict['maximal_opening'] = _translate(
"BasicHydraulicStructures", "Maximal opening"
)
self._dict['step_space'] = _translate(
"BasicHydraulicStructures", "Step space"
)
self._dict['weir'] = _translate(
"BasicHydraulicStructures", "Weir"
)
self._dict['coefficient'] = _translate(
"BasicHydraulicStructures", "coefficient"
)
# Dummy parameters
self._dict['parameter_1'] = _translate(
"BasicHydraulicStructures", "Parameter 1"
)
self._dict['parameter_2'] = _translate(
"BasicHydraulicStructures", "Parameter 2"
)
self._dict['parameter_3'] = _translate(
"BasicHydraulicStructures", "Parameter 3"
)
self._dict['parameter_4'] = _translate(
"BasicHydraulicStructures", "Parameter 4"
)
self._dict['parameter_5'] = _translate(
"BasicHydraulicStructures", "Parameter 5"
)
# BHS types long names
self._sub_dict["long_types"] = {
"ND": _translate(
"BasicHydraulicStructures", "Not defined"
),
"S1": _translate(
"BasicHydraulicStructures", "Seuil déversoir"
"BasicHydraulicStructures", "Discharge weir"
),
"S2": _translate(
"BasicHydraulicStructures", "Seuil trapezoidal"
"BasicHydraulicStructures", "Trapezoidal weir"
),
"S3": _translate(
"BasicHydraulicStructures", "Seuil triangulaire"
"BasicHydraulicStructures", "Triangular weir"
),
"OR": _translate(
"BasicHydraulicStructures", "Orifice rectangulaire"
"BasicHydraulicStructures", "Rectangular orifice"
),
"OC": _translate(
"BasicHydraulicStructures", "Orifice circulaire"
"BasicHydraulicStructures", "Circular orifice"
),
"OV": _translate(
"BasicHydraulicStructures", "Orifice voute"
"BasicHydraulicStructures", "Vaulted orifice"
),
"V1": _translate(
"BasicHydraulicStructures", "Vanne rectangulaire"
"BasicHydraulicStructures", "Rectangular gate"
),
"V2": _translate(
"BasicHydraulicStructures", "Vanne rectangulaire simplifiée"
"BasicHydraulicStructures", "Simplified rectangular gate"
),
"BO": _translate(
"BasicHydraulicStructures", "Perte de charge à la Borda"
"BasicHydraulicStructures", "Borda-type head loss"
),
"CV": _translate(
"BasicHydraulicStructures", "Check valve"
),
"UD": _translate(
"BasicHydraulicStructures", "User defined"
),
}
# Tables
self._sub_dict["table_headers"] = {
"name": _translate("BasicHydraulicStructures", "Name"),
"type": _translate("BasicHydraulicStructures", "Type"),