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

MacroRugoCompound: add Y to results

parent d86df210
No related branches found
No related tags found
Loading
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
"BR": "Total width", "BR": "Total width",
"ZF1": "Apron elevation", "ZF1": "Apron elevation",
"B": "Width", "B": "Width",
"Y": "Water depth",
"xCenter": "Mid-apron abscissa", "xCenter": "Mid-apron abscissa",
"select_pass_type_0": "Multiple aprons", "select_pass_type_0": "Multiple aprons",
......
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
"BR": "Largeur totale", "BR": "Largeur totale",
"ZF1": "Cote de radier", "ZF1": "Cote de radier",
"B": "Largeur", "B": "Largeur",
"Y": "Profondeur",
"xCenter": "Abscisse du milieu du radier", "xCenter": "Abscisse du milieu du radier",
"select_pass_type_0": "Radiers multiples", "select_pass_type_0": "Radiers multiples",
......
...@@ -82,11 +82,22 @@ export class MacrorugoCompoundResultsTableComponent extends ResultsComponent { ...@@ -82,11 +82,22 @@ export class MacrorugoCompoundResultsTableComponent extends ResultsComponent {
} catch (e) { } catch (e) {
// silent fail // silent fail
} }
let Y: number;
try {
if (nub.prms.Y.hasMultipleValues) {
Y = nub.prms.Y.getInferredValuesList()[vi];
} else {
Y = nub.prms.Y.singleValue;
}
} catch (e) {
// silent fail
}
this._dataSet.push([ this._dataSet.push([
i + 1, // n° radier i + 1, // n° radier
(zf1 !== undefined ? zf1.toFixed(nDigits) : "-"), (zf1 !== undefined ? zf1.toFixed(nDigits) : "-"),
(b !== undefined ? b.toFixed(nDigits) : "-"), (b !== undefined ? b.toFixed(nDigits) : "-"),
(Y !== undefined ? Y.toFixed(nDigits) : "-"),
(res.Q !== undefined ? res.Q.toFixed(nDigits) : "-"), (res.Q !== undefined ? res.Q.toFixed(nDigits) : "-"),
res.Vdeb.toFixed(nDigits), res.Vdeb.toFixed(nDigits),
res.Fr.toFixed(nDigits), res.Fr.toFixed(nDigits),
......
...@@ -19,6 +19,7 @@ export class MacrorugoCompoundResults extends MultiDimensionResults { ...@@ -19,6 +19,7 @@ export class MacrorugoCompoundResults extends MultiDimensionResults {
"RADIER_N", "RADIER_N",
"ZF1", "ZF1",
"B", "B",
"Y",
"Q", "Q",
"Vdeb", "Vdeb",
"Fr", "Fr",
......
...@@ -85,6 +85,7 @@ export class PlottableMacrorugoCompoundResults implements PlottableData { ...@@ -85,6 +85,7 @@ export class PlottableMacrorugoCompoundResults implements PlottableData {
break; break;
case "ZF1": case "ZF1":
case "Y":
case "B": case "B":
let v: number; let v: number;
const nub = this.mrcResults.childrenResults[i].sourceNub; const nub = this.mrcResults.childrenResults[i].sourceNub;
......
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