From fe6b2e59ecb4ad246b497ce1453b3cbb0a29a1c6 Mon Sep 17 00:00:00 2001
From: "mathias.chouet" <mathias.chouet@irstea.fr>
Date: Tue, 12 Nov 2019 10:41:14 +0100
Subject: [PATCH] Results chart: exclude pseudo-family ANY
---
src/app/results/var-results.ts | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/src/app/results/var-results.ts b/src/app/results/var-results.ts
index 3594635b6..293dc0d14 100644
--- a/src/app/results/var-results.ts
+++ b/src/app/results/var-results.ts
@@ -254,8 +254,10 @@ export class VarResults extends CalculatedParamResults implements PlottableData
const families: { [key: string]: string[] } = {};
// variating parameters
for (const v of this._variatedParams) {
- const f = ParamFamily[v.paramDefinition.family];
- if (f !== undefined) {
+ // exclude pseudo-family "ANY"
+ const fam = v.paramDefinition.family;
+ if (fam !== undefined && fam !== ParamFamily.ANY) {
+ const f = ParamFamily[fam];
if (! (f in families)) {
families[f] = [];
}
@@ -264,8 +266,10 @@ export class VarResults extends CalculatedParamResults implements PlottableData
}
// results
for (const erk of this.resultKeys) {
- const f = ParamFamily[this.result.sourceNub.getFamily(erk)];
- if (f !== undefined) {
+ const fam = this.result.sourceNub.getFamily(erk);
+ // exclude pseudo-family "ANY"
+ if (fam !== undefined && fam !== ParamFamily.ANY) {
+ const f = ParamFamily[fam];
if (! (f in families)) {
families[f] = [];
}
@@ -277,8 +281,10 @@ export class VarResults extends CalculatedParamResults implements PlottableData
for (const c of sn.getChildren()) {
if (c.result) {
for (const k of c.result.resultElement.keys) {
- const f = ParamFamily[this.result.sourceNub.getFamily(k)];
- if (f !== undefined) {
+ const fam = this.result.sourceNub.getFamily(k);
+ // exclude pseudo-family "ANY"
+ if (fam !== undefined && fam !== ParamFamily.ANY) {
+ const f = ParamFamily[fam];
if (! (f in families)) {
families[f] = [];
}
--
GitLab