From 2c6f338ef6335a7ddf2259f4cf3f930a94cc95f2 Mon Sep 17 00:00:00 2001
From: "mathias.chouet" <mathias.chouet@irstea.fr>
Date: Mon, 5 Aug 2019 15:03:18 +0200
Subject: [PATCH] Removed most references to old "extraResults"
---
.../fixed-results.component.ts | 5 +--
.../fixedvar-results/var-results.component.ts | 4 +-
.../pab-profile-graph.component.ts | 10 ++---
.../pab-results-table.component.ts | 12 +++---
.../remous-results.component.ts | 10 ++---
.../section-results.component.ts | 17 ++++----
src/app/results/plottable-data.ts | 2 +-
src/app/results/plottable-pab-results.ts | 10 ++---
src/app/results/remous-results.ts | 6 +--
src/app/results/var-results.ts | 2 +-
.../services/formulaire/formulaire.service.ts | 2 +-
.../internationalisation.service.ts | 6 +--
src/locale/messages.en.json | 40 +++++++++----------
src/locale/messages.fr.json | 40 +++++++++----------
14 files changed, 84 insertions(+), 82 deletions(-)
diff --git a/src/app/components/fixedvar-results/fixed-results.component.ts b/src/app/components/fixedvar-results/fixed-results.component.ts
index 2f1240942..354b068a9 100644
--- a/src/app/components/fixedvar-results/fixed-results.component.ts
+++ b/src/app/components/fixedvar-results/fixed-results.component.ts
@@ -69,7 +69,7 @@ export class FixedResultsComponent {
}
/**
- * Returns a combination of and results and extraResults for mat-table
+ * Returns a set of parameters and results for mat-table
*/
public get dataSet() {
const data = [];
@@ -93,14 +93,13 @@ export class FixedResultsComponent {
res
&& res.resultElements.length > 0
&& res.resultElement
- && res.extraResults
+ && res.resultElement.count() > 0
) {
const sn = this._fixedResults.result.sourceNub;
// 2.1 all results
for (const k of res.resultElement.keys) {
const er: number = res.resultElement.getValue(k);
- // console.log(">> extraresult", k, er);
// calculator type for translation
let ct = sn.calcType;
if (sn.parent) {
diff --git a/src/app/components/fixedvar-results/var-results.component.ts b/src/app/components/fixedvar-results/var-results.component.ts
index 6b03eec40..18a813a80 100644
--- a/src/app/components/fixedvar-results/var-results.component.ts
+++ b/src/app/components/fixedvar-results/var-results.component.ts
@@ -29,7 +29,7 @@ export class VarResultsComponent extends ResultsComponent {
/** résultats mis en forme */
protected _results: any[];
- /** entêtes des colonnes (param à varier, à calculer + extraResults) */
+ /** entêtes des colonnes (param à varier, résultats) */
protected _headers: string[];
/** messages de log issus des résultats variés */
@@ -161,7 +161,7 @@ export class VarResultsComponent extends ResultsComponent {
}
/**
- * Returns a combination of results and extraResults for mat-table
+ * Returns a combination of parameters and results for mat-table
*/
public get dataSet() {
return this._results;
diff --git a/src/app/components/pab-profile-graph/pab-profile-graph.component.ts b/src/app/components/pab-profile-graph/pab-profile-graph.component.ts
index f6cb671da..00dc20354 100644
--- a/src/app/components/pab-profile-graph/pab-profile-graph.component.ts
+++ b/src/app/components/pab-profile-graph/pab-profile-graph.component.ts
@@ -208,10 +208,10 @@ export class PabProfileGraphComponent extends ResultsComponent {
const nDigits = this.appSetupService.displayDigits;
// X is always wall abscissa
for (const cr of this._results.cloisonsResults) {
- const x = cr.resultElement.getExtraResult("x"); // any resultElement will do
+ const x = cr.resultElement.getValue("x"); // any resultElement will do
data.push(x.toFixed(nDigits));
}
- const xdw = this._results.cloisonAvalResults.resultElement.getExtraResult("x");
+ const xdw = this._results.cloisonAvalResults.resultElement.getValue("x");
data.push(xdw.toFixed(nDigits));
return data;
}
@@ -228,19 +228,19 @@ export class PabProfileGraphComponent extends ResultsComponent {
// extend upstrem
dataF.push({
x: (Number(xs[0]) - pabLength5Pct).toFixed(nDigits),
- y: this._results.cloisonsResults[0].resultElement.getExtraResult("ZRAM").toFixed(nDigits)
+ y: this._results.cloisonsResults[0].resultElement.getValue("ZRAM").toFixed(nDigits)
});
// regular walls
for (let i = 0; i < this._results.cloisonsResults.length; i++) {
const cr = this._results.cloisonsResults[i];
- const ZRAM = cr.resultElement.getExtraResult("ZRAM"); // any ResultElement will do
+ const ZRAM = cr.resultElement.getValue("ZRAM"); // any ResultElement will do
dataF.push({
x: xs[i],
y: ZRAM.toFixed(nDigits)
});
}
// downwall
- const ZRAMdw = this._results.cloisonAvalResults.resultElement.getExtraResult("ZRAM");
+ const ZRAMdw = this._results.cloisonAvalResults.resultElement.getValue("ZRAM");
dataF.push({
x: xs[ xs.length - 1 ],
y: ZRAMdw.toFixed(nDigits)
diff --git a/src/app/components/pab-results/pab-results-table.component.ts b/src/app/components/pab-results/pab-results-table.component.ts
index ad39f84bb..6b0550eb7 100644
--- a/src/app/components/pab-results/pab-results-table.component.ts
+++ b/src/app/components/pab-results/pab-results-table.component.ts
@@ -41,8 +41,8 @@ export class PabResultsTableComponent extends ResultsComponent {
// jet type for each device
const devices = re.sourceNub.getChildren();
const jetTypes: string[] = devices.map((device) => {
- const jt = device.result.resultElements[vi].getExtraResult("ENUM_StructureJetType");
- let jetType = this.intlService.localizeText("INFO_EXTRARES_ENUM_STRUCTUREJETTYPE_" + jt);
+ const jt = device.result.resultElements[vi].getValue("ENUM_StructureJetType");
+ let jetType = this.intlService.localizeText("INFO_ENUM_STRUCTUREJETTYPE_" + jt);
if (devices.length > 1) {
// evil HTML injection in table cell (simpler)
jetType = this.intlService.localizeText("INFO_LIB_FS_OUVRAGE") + " n°"
@@ -86,7 +86,7 @@ export class PabResultsTableComponent extends ResultsComponent {
if (
pr.cloisonsResults[i].resultElements[vi].vCalc
) {
- const r2n = pr.cloisonsResults[i].resultElements[vi].extraResults;
+ const r2n = pr.cloisonsResults[i].resultElements[vi].values;
let Z1: number;
if (i < pr.cloisonsResults.length - 1) {
Z1 = pr.cloisonsResults[i + 1].resultElements[vi].vCalc;
@@ -111,7 +111,7 @@ export class PabResultsTableComponent extends ResultsComponent {
// downstream line
if (pr.cloisonAvalResults.resultElements[vi].vCalc) {
- const rln = pr.cloisonAvalResults.resultElements[vi].extraResults;
+ const rln = pr.cloisonAvalResults.resultElements[vi].values;
this._dataSet.push([
this.intlService.localizeText("INFO_LIB_AVAL"),
pr.Z2[vi].toFixed(nDigits),
@@ -124,7 +124,7 @@ export class PabResultsTableComponent extends ResultsComponent {
// extra lift gate ?
const cloisonAval = (pr.cloisonAvalResults.sourceNub as CloisonAval);
if (cloisonAval && cloisonAval.hasVanneLevante()) {
- const vanneZDV = cloisonAval.result.resultElements[vi].getExtraResult("ZDV");
+ const vanneZDV = cloisonAval.result.resultElements[vi].getValue("ZDV");
if (vanneZDV) {
this._dataSet.push([
this.intlService.localizeText("INFO_LIB_COTE_VANNE_LEVANTE"),
@@ -142,7 +142,7 @@ export class PabResultsTableComponent extends ResultsComponent {
}
/**
- * Returns a combination of and results and extraResults for mat-table
+ * Returns a combination of parameters and results for mat-table
*/
public get dataSet() {
return this._dataSet;
diff --git a/src/app/components/remous-results/remous-results.component.ts b/src/app/components/remous-results/remous-results.component.ts
index 1d7274ca7..da77b6c0d 100644
--- a/src/app/components/remous-results/remous-results.component.ts
+++ b/src/app/components/remous-results/remous-results.component.ts
@@ -403,7 +403,7 @@ export class RemousResultsComponent extends ResultsComponent implements DoCheck
throw new Error("RemousResultsComponent.connectRessaut() : erreur interne (itérateur sur x)");
}
const x = itX.next().value;
- if (re.getExtraResult("flu") !== undefined) {
+ if (re.getValue("flu") !== undefined) {
minXflu = x;
break;
}
@@ -426,7 +426,7 @@ export class RemousResultsComponent extends ResultsComponent implements DoCheck
throw new Error("RemousResultsComponent.connectRessaut() : erreur interne (itérateur sur x)");
}
const x = itX.next();
- if (r.getExtraResult("tor") !== undefined) {
+ if (r.getValue("tor") !== undefined) {
maxXtor = x;
break;
}
@@ -527,17 +527,17 @@ export class RemousResultsComponent extends ResultsComponent implements DoCheck
}
const x = itX.next().value;
- const yExtra = re.getExtraResult(this._remousResults.extraParamSymbol);
+ const yExtra = re.getValue(this._remousResults.extraParamSymbol);
if (yExtra !== undefined) {
lineExtra.mapPoint(x, yExtra);
}
- const yFlu = re.getExtraResult("flu");
+ const yFlu = re.getValue("flu");
if (yFlu !== undefined) {
lineFlu.mapPoint(x, yFlu);
}
- const yTor = re.getExtraResult("tor");
+ const yTor = re.getValue("tor");
if (yTor !== undefined) {
lineTor.mapPoint(x, yTor);
}
diff --git a/src/app/components/section-results/section-results.component.ts b/src/app/components/section-results/section-results.component.ts
index 9ec2b037a..dc00f2a1c 100644
--- a/src/app/components/section-results/section-results.component.ts
+++ b/src/app/components/section-results/section-results.component.ts
@@ -105,13 +105,16 @@ export class SectionResultsComponent extends ResultsComponent implements DoCheck
this._resultElement = new ResultElement();
// traduction des symboles des variables calculées
- for (const k in this._results.result.realExtraResults) {
- const lbl = k.toUpperCase();
- const er = this._results.result.getExtraResult(k);
- this._resultElement.addExtraResult(lbl, er);
-
- if (this.isSectionLevel(k)) {
- this._sectionCanvas.addLevel(er, k + " = " + er.toFixed(nDigits), SectionResultsComponent.labelColors[k]);
+ const re = this._results.result.resultElement;
+ for (const k in re.values) {
+ if (k !== re.vCalcSymbol) {
+ const lbl = k.toUpperCase();
+ const er = re.getValue(k);
+ this._resultElement.addExtraResult(lbl, er);
+
+ if (this.isSectionLevel(k)) {
+ this._sectionCanvas.addLevel(er, k + " = " + er.toFixed(nDigits), SectionResultsComponent.labelColors[k]);
+ }
}
}
diff --git a/src/app/results/plottable-data.ts b/src/app/results/plottable-data.ts
index 687c40273..4b5d3f678 100644
--- a/src/app/results/plottable-data.ts
+++ b/src/app/results/plottable-data.ts
@@ -17,7 +17,7 @@ export interface PlottableData {
getChartAxisLabel(symbol: string): string;
/**
- * Returns the translated name of the given symbol (usually an extraResult)
+ * Returns the translated name of the given symbol (usually a result or child result)
* if available, with its unit, but without the symbol itself
*/
expandLabelFromSymbol(symbol: string): string;
diff --git a/src/app/results/plottable-pab-results.ts b/src/app/results/plottable-pab-results.ts
index c75e3f5b3..03875d2d1 100644
--- a/src/app/results/plottable-pab-results.ts
+++ b/src/app/results/plottable-pab-results.ts
@@ -93,10 +93,10 @@ export class PlottablePabResults implements PlottableData {
case "Q":
data.push("");
for (let i = 0; i < l; i++) {
- const er = pr.cloisonsResults[i].resultElements[vi].getExtraResult(symbol);
+ const er = pr.cloisonsResults[i].resultElements[vi].getValue(symbol);
data.push((er !== undefined) ? er.toFixed(nDigits) : "");
}
- const zrAval = pr.cloisonAvalResults.resultElements[vi].getExtraResult(symbol);
+ const zrAval = pr.cloisonAvalResults.resultElements[vi].getValue(symbol);
data.push((zrAval !== undefined) ? zrAval.toFixed(nDigits) : "");
break;
@@ -114,7 +114,7 @@ export class PlottablePabResults implements PlottableData {
case "QA":
data.push("");
for (let i = 0; i < l; i++) {
- const er = pr.cloisonsResults[i].resultElements[vi].getExtraResult(symbol);
+ const er = pr.cloisonsResults[i].resultElements[vi].getValue(symbol);
data.push((er !== undefined) ? er.toFixed(nDigits) : "");
}
data.push("");
@@ -123,10 +123,10 @@ export class PlottablePabResults implements PlottableData {
case "x": // wall abscissa
data.push("");
for (let i = 0; i < l; i++) {
- const er = pr.cloisonsResults[i].resultElements[vi].getExtraResult(symbol);
+ const er = pr.cloisonsResults[i].resultElements[vi].getValue(symbol);
data.push((er !== undefined) ? er.toFixed(nDigits) : "");
}
- const erXdw = pr.cloisonAvalResults.resultElements[vi].getExtraResult(symbol);
+ const erXdw = pr.cloisonAvalResults.resultElements[vi].getValue(symbol);
data.push((erXdw !== undefined) ? erXdw.toFixed(nDigits) : "");
break;
}
diff --git a/src/app/results/remous-results.ts b/src/app/results/remous-results.ts
index e0f5b3f3a..5f3bcbc56 100644
--- a/src/app/results/remous-results.ts
+++ b/src/app/results/remous-results.ts
@@ -123,13 +123,13 @@ export class RemousResults extends CalculatorResults {
this._hasExtra = false;
for (const re of this._result.resultElements) {
- if (!this._hasFlu && re.getExtraResult("flu")) {
+ if (!this._hasFlu && re.getValue("flu")) {
this._hasFlu = true;
}
- if (!this._hasTor && re.getExtraResult("tor")) {
+ if (!this._hasTor && re.getValue("tor")) {
this._hasTor = true;
}
- if (!this._hasExtra && re.getExtraResult(this.extraParamSymbol)) {
+ if (!this._hasExtra && re.getValue(this.extraParamSymbol)) {
this._hasExtra = true;
}
}
diff --git a/src/app/results/var-results.ts b/src/app/results/var-results.ts
index bf059017f..cd6effda2 100644
--- a/src/app/results/var-results.ts
+++ b/src/app/results/var-results.ts
@@ -118,7 +118,7 @@ export class VarResults extends CalculatedParamResults implements PlottableData
}
/**
- * Returns the translated name of the given symbol (usually an extraResult) with
+ * Returns the translated name of the given symbol (usually a result or child result) with
* its unit, but without the symbol itself
*/
public expandLabelFromSymbol(symbol: string): string {
diff --git a/src/app/services/formulaire/formulaire.service.ts b/src/app/services/formulaire/formulaire.service.ts
index a89142101..c88c9681a 100644
--- a/src/app/services/formulaire/formulaire.service.ts
+++ b/src/app/services/formulaire/formulaire.service.ts
@@ -191,7 +191,7 @@ export class FormulaireService extends Observable {
const re = /([A-Z,a-z]+)\[(\d+)\]\.(.+)/;
const match = re.exec(symbol);
if (match) {
- // Les libellés correspondants sont INFO OUVRAGE et INFO_EXTRARES_LIB_OUVRAGE_XXX
+ // Les libellés correspondants sont INFO OUVRAGE et INFO_LIB_OUVRAGE_XXX
s = this.intlService.localizeText(`INFO_${match[1].toUpperCase()}`)
+ " n°" + (+match[2] + 1) + ": "
+ this.expandVariableName(calcType, `${match[1].toUpperCase()}_${match[3].toUpperCase()}`);
diff --git a/src/app/services/internationalisation/internationalisation.service.ts b/src/app/services/internationalisation/internationalisation.service.ts
index ef1629c4f..7590f251d 100644
--- a/src/app/services/internationalisation/internationalisation.service.ts
+++ b/src/app/services/internationalisation/internationalisation.service.ts
@@ -186,8 +186,8 @@ export class I18nService extends Observable implements Observer {
}
/**
- * Met en forme un extraResult en fonction du libellé qui l'accompagne
- * Les extraResult avec le terme "ENUM_" sont traduit avec le message INFO_EXTRARES_ENUM_[Nom de la variable après ENUM_]
+ * Met en forme un result en fonction du libellé qui l'accompagne
+ * Les result avec le terme "ENUM_" sont traduit avec le message INFO_ENUM_[Nom de la variable après ENUM_]
*/
public formatResult(label: string, value: number): string {
if (value === undefined) {
@@ -195,7 +195,7 @@ export class I18nService extends Observable implements Observer {
}
const match = label.indexOf("ENUM_");
if (match > -1) {
- return this.localizeText(`INFO_EXTRARES_${label.substring(match).toUpperCase()}_${value}`);
+ return this.localizeText(`INFO_${label.substring(match).toUpperCase()}_${value}`);
}
const nDigits = this.applicationSetupService.displayDigits;
return value.toFixed(nDigits);
diff --git a/src/locale/messages.en.json b/src/locale/messages.en.json
index 85f684af9..e670ce51e 100644
--- a/src/locale/messages.en.json
+++ b/src/locale/messages.en.json
@@ -90,26 +90,26 @@
"INFO_DIALOG_SAVE_SESSION_TITLE": "Save calculator modules",
"INFO_EMPTY_SESSION_DIALOGUE_TEXT": "Warning ! All open calculators will be lost. Continue ?",
"INFO_EMPTY_SESSION_DIALOGUE_TITRE": "New session",
- "INFO_EXTRARES_ENUM_MACRORUGOFLOWTYPE_0": "Emergent",
- "INFO_EXTRARES_ENUM_MACRORUGOFLOWTYPE_1": "Quasi-emergent",
- "INFO_EXTRARES_ENUM_MACRORUGOFLOWTYPE_2": "Submerged",
- "INFO_EXTRARES_ENUM_OUVRAGE_Q_MODE_0": "Weir",
- "INFO_EXTRARES_ENUM_OUVRAGE_Q_MODE_1": "Orifice",
- "INFO_EXTRARES_ENUM_OUVRAGE_Q_MODE_2": "Zero flow",
- "INFO_EXTRARES_ENUM_OUVRAGE_Q_REGIME_0": "Free flow",
- "INFO_EXTRARES_ENUM_OUVRAGE_Q_REGIME_1": "Partially submerged",
- "INFO_EXTRARES_ENUM_OUVRAGE_Q_REGIME_2": "Submerged",
- "INFO_EXTRARES_ENUM_OUVRAGE_Q_REGIME_3": "Zero flow",
- "INFO_EXTRARES_ENUM_STRUCTUREFLOWMODE_0": "Weir",
- "INFO_EXTRARES_ENUM_STRUCTUREFLOWMODE_1": "Orifice",
- "INFO_EXTRARES_ENUM_STRUCTUREFLOWMODE_2": "Zero flow",
- "INFO_EXTRARES_ENUM_STRUCTUREFLOWREGIME_0": "Free flow",
- "INFO_EXTRARES_ENUM_STRUCTUREFLOWREGIME_1": "Partially submerged",
- "INFO_EXTRARES_ENUM_STRUCTUREFLOWREGIME_2": "Submerged",
- "INFO_EXTRARES_ENUM_STRUCTUREFLOWREGIME_3": "Zero flow",
- "INFO_EXTRARES_ENUM_STRUCTUREJETTYPE_0": "Not applicable",
- "INFO_EXTRARES_ENUM_STRUCTUREJETTYPE_1": "Diving",
- "INFO_EXTRARES_ENUM_STRUCTUREJETTYPE_2": "Surface",
+ "INFO_ENUM_MACRORUGOFLOWTYPE_0": "Emergent",
+ "INFO_ENUM_MACRORUGOFLOWTYPE_1": "Quasi-emergent",
+ "INFO_ENUM_MACRORUGOFLOWTYPE_2": "Submerged",
+ "INFO_ENUM_OUVRAGE_Q_MODE_0": "Weir",
+ "INFO_ENUM_OUVRAGE_Q_MODE_1": "Orifice",
+ "INFO_ENUM_OUVRAGE_Q_MODE_2": "Zero flow",
+ "INFO_ENUM_OUVRAGE_Q_REGIME_0": "Free flow",
+ "INFO_ENUM_OUVRAGE_Q_REGIME_1": "Partially submerged",
+ "INFO_ENUM_OUVRAGE_Q_REGIME_2": "Submerged",
+ "INFO_ENUM_OUVRAGE_Q_REGIME_3": "Zero flow",
+ "INFO_ENUM_STRUCTUREFLOWMODE_0": "Weir",
+ "INFO_ENUM_STRUCTUREFLOWMODE_1": "Orifice",
+ "INFO_ENUM_STRUCTUREFLOWMODE_2": "Zero flow",
+ "INFO_ENUM_STRUCTUREFLOWREGIME_0": "Free flow",
+ "INFO_ENUM_STRUCTUREFLOWREGIME_1": "Partially submerged",
+ "INFO_ENUM_STRUCTUREFLOWREGIME_2": "Submerged",
+ "INFO_ENUM_STRUCTUREFLOWREGIME_3": "Zero flow",
+ "INFO_ENUM_STRUCTUREJETTYPE_0": "Not applicable",
+ "INFO_ENUM_STRUCTUREJETTYPE_1": "Diving",
+ "INFO_ENUM_STRUCTUREJETTYPE_2": "Surface",
"INFO_GRAPH_BUTTON_TITLE_RESET_ZOOM": "Restore default zoom",
"INFO_GRAPH_BUTTON_TITLE_EXPORT_IMAGE": "Save picture",
"INFO_GRAPH_BUTTON_TITLE_ENTER_FS": "Display fullscreen",
diff --git a/src/locale/messages.fr.json b/src/locale/messages.fr.json
index 2d69da54f..4eb47086a 100644
--- a/src/locale/messages.fr.json
+++ b/src/locale/messages.fr.json
@@ -90,26 +90,26 @@
"INFO_DIALOG_SAVE_SESSION_TITLE": "Enregistrer les modules de calcul",
"INFO_EMPTY_SESSION_DIALOGUE_TEXT": "Attention ! Tous les modules de calcul ouverts seront perdus.",
"INFO_EMPTY_SESSION_DIALOGUE_TITRE": "Démarrer une nouvelle session",
- "INFO_EXTRARES_ENUM_MACRORUGOFLOWTYPE_0": "Émergent",
- "INFO_EXTRARES_ENUM_MACRORUGOFLOWTYPE_1": "Quasi-émergent",
- "INFO_EXTRARES_ENUM_MACRORUGOFLOWTYPE_2": "Immergé",
- "INFO_EXTRARES_ENUM_OUVRAGE_Q_MODE_0": "Surface libre",
- "INFO_EXTRARES_ENUM_OUVRAGE_Q_MODE_1": "En charge",
- "INFO_EXTRARES_ENUM_OUVRAGE_Q_MODE_2": "Débit nul",
- "INFO_EXTRARES_ENUM_OUVRAGE_Q_REGIME_0": "Dénoyé",
- "INFO_EXTRARES_ENUM_OUVRAGE_Q_REGIME_1": "Partiellement noyé",
- "INFO_EXTRARES_ENUM_OUVRAGE_Q_REGIME_2": "Noyé",
- "INFO_EXTRARES_ENUM_OUVRAGE_Q_REGIME_3": "Débit nul",
- "INFO_EXTRARES_ENUM_STRUCTUREFLOWMODE_0": "Surface libre",
- "INFO_EXTRARES_ENUM_STRUCTUREFLOWMODE_1": "En charge",
- "INFO_EXTRARES_ENUM_STRUCTUREFLOWMODE_2": "Débit nul",
- "INFO_EXTRARES_ENUM_STRUCTUREFLOWREGIME_0": "Dénoyé",
- "INFO_EXTRARES_ENUM_STRUCTUREFLOWREGIME_1": "Partiellement noyé",
- "INFO_EXTRARES_ENUM_STRUCTUREFLOWREGIME_2": "Noyé",
- "INFO_EXTRARES_ENUM_STRUCTUREFLOWREGIME_3": "Débit nul",
- "INFO_EXTRARES_ENUM_STRUCTUREJETTYPE_0": "Sans objet",
- "INFO_EXTRARES_ENUM_STRUCTUREJETTYPE_1": "Plongeant",
- "INFO_EXTRARES_ENUM_STRUCTUREJETTYPE_2": "De surface",
+ "INFO_ENUM_MACRORUGOFLOWTYPE_0": "Émergent",
+ "INFO_ENUM_MACRORUGOFLOWTYPE_1": "Quasi-émergent",
+ "INFO_ENUM_MACRORUGOFLOWTYPE_2": "Immergé",
+ "INFO_ENUM_OUVRAGE_Q_MODE_0": "Surface libre",
+ "INFO_ENUM_OUVRAGE_Q_MODE_1": "En charge",
+ "INFO_ENUM_OUVRAGE_Q_MODE_2": "Débit nul",
+ "INFO_ENUM_OUVRAGE_Q_REGIME_0": "Dénoyé",
+ "INFO_ENUM_OUVRAGE_Q_REGIME_1": "Partiellement noyé",
+ "INFO_ENUM_OUVRAGE_Q_REGIME_2": "Noyé",
+ "INFO_ENUM_OUVRAGE_Q_REGIME_3": "Débit nul",
+ "INFO_ENUM_STRUCTUREFLOWMODE_0": "Surface libre",
+ "INFO_ENUM_STRUCTUREFLOWMODE_1": "En charge",
+ "INFO_ENUM_STRUCTUREFLOWMODE_2": "Débit nul",
+ "INFO_ENUM_STRUCTUREFLOWREGIME_0": "Dénoyé",
+ "INFO_ENUM_STRUCTUREFLOWREGIME_1": "Partiellement noyé",
+ "INFO_ENUM_STRUCTUREFLOWREGIME_2": "Noyé",
+ "INFO_ENUM_STRUCTUREFLOWREGIME_3": "Débit nul",
+ "INFO_ENUM_STRUCTUREJETTYPE_0": "Sans objet",
+ "INFO_ENUM_STRUCTUREJETTYPE_1": "Plongeant",
+ "INFO_ENUM_STRUCTUREJETTYPE_2": "De surface",
"INFO_GRAPH_BUTTON_TITLE_RESET_ZOOM": "Réinitialiser le zoom",
"INFO_GRAPH_BUTTON_TITLE_EXPORT_IMAGE": "Enregistrer l'image",
"INFO_GRAPH_BUTTON_TITLE_ENTER_FS": "Afficher en plein écran",
--
GitLab