From 3c9d56e4a51836de3e44d5528d97557fa148f1bc Mon Sep 17 00:00:00 2001
From: "mathias.chouet" <mathias.chouet@irstea.fr>
Date: Wed, 16 Sep 2020 10:38:32 +0200
Subject: [PATCH] Update after merge
---
.../calculator-results.component.ts | 4 ++
.../calculator.component.ts | 6 +-
.../section-results.component.html | 19 ------
.../section-results.component.ts | 4 +-
.../verificateur-results.component.html | 2 +-
.../verificateur-results.component.ts | 64 +------------------
src/app/results/pab-results.ts | 2 +-
7 files changed, 15 insertions(+), 86 deletions(-)
diff --git a/src/app/components/calculator-results/calculator-results.component.ts b/src/app/components/calculator-results/calculator-results.component.ts
index 41a6e20d1..e26bc762f 100644
--- a/src/app/components/calculator-results/calculator-results.component.ts
+++ b/src/app/components/calculator-results/calculator-results.component.ts
@@ -61,4 +61,8 @@ export class CalculatorResultsComponent implements AfterViewChecked {
return this.calculatorComponent.isJet;
}
+ public get isVerificateur() {
+ return this.calculatorComponent.isVerificateur;
+ }
+
}
diff --git a/src/app/components/generic-calculator/calculator.component.ts b/src/app/components/generic-calculator/calculator.component.ts
index 4426cff87..2cd8d2d6f 100644
--- a/src/app/components/generic-calculator/calculator.component.ts
+++ b/src/app/components/generic-calculator/calculator.component.ts
@@ -645,6 +645,11 @@ export class GenericCalculatorComponent implements OnInit, DoCheck, AfterViewChe
return this.is(CalculatorType.Par);
}
+ // true if current Nub is Verificateur
+ public get isVerificateur() {
+ return this.is(CalculatorType.Verificateur);
+ }
+
// true if current Nub is Espece
public get isEspece() {
return this.is(CalculatorType.Espece);
@@ -1037,7 +1042,6 @@ export class GenericCalculatorComponent implements OnInit, DoCheck, AfterViewChe
const form = this._formulaire as FormulaireFixedVar;
const nub = (form.currentNub as Espece);
nub.loadPredefinedSpecies(result.selected);
- console.log("================ espèce chargée, refresh tout");
form.refreshFieldsets();
}
});
diff --git a/src/app/components/section-results/section-results.component.html b/src/app/components/section-results/section-results.component.html
index 9f855a34e..ac4e78fa0 100644
--- a/src/app/components/section-results/section-results.component.html
+++ b/src/app/components/section-results/section-results.component.html
@@ -1,6 +1,5 @@
<div class="section-results-container" #sectionResults *ngIf="hasResults" fxLayout="row wrap"
fxLayoutAlign="center center">
-
<div fxFlex="1 1 100%">
<div class="section-results-buttons">
<button mat-icon-button (click)="exportAsImage(sectionResults)" [title]="uitextExportImageTitle">
@@ -21,21 +20,3 @@
</div>
</div>
</div>
-
-<div class="container">
- <!-- journal -->
- <log></log>
-
- <results-chart *ngIf="showVarResults"></results-chart>
- <!--<results-chart [hidden]="! showVarResultsChart"></results-chart>-->
-
- <div>
- <!-- table des résultats fixés -->
- <fixed-results [results]=fixedResults></fixed-results>
-
- <!-- table des résultats variés -->
- <div *ngIf="showVarResults">
- <var-results [results]=varResults></var-results>
- </div>
- </div>
-</div>
\ No newline at end of file
diff --git a/src/app/components/section-results/section-results.component.ts b/src/app/components/section-results/section-results.component.ts
index 359845b85..0893a387f 100644
--- a/src/app/components/section-results/section-results.component.ts
+++ b/src/app/components/section-results/section-results.component.ts
@@ -1,10 +1,10 @@
-import { Component, ElementRef, Input, AfterContentChecked } from "@angular/core";
+import { Component, ElementRef, Input } from "@angular/core";
import { SectionResults } from "../../results/section-results";
import { CalculatorResults } from "../../results/calculator-results";
import { I18nService } from "../../services/internationalisation.service";
import { AppComponent } from "../../app.component";
-import { FixedVarResultsComponent } from "../fixedvar-results/fixedvar-results.component";
+import { ResultsComponentDirective } from "../fixedvar-results/results.component";
@Component({
selector: "section-results",
diff --git a/src/app/components/verificateur-results/verificateur-results.component.html b/src/app/components/verificateur-results/verificateur-results.component.html
index 1d0f78479..f84e65938 100644
--- a/src/app/components/verificateur-results/verificateur-results.component.html
+++ b/src/app/components/verificateur-results/verificateur-results.component.html
@@ -1,7 +1,7 @@
<div class="container">
<log #generalLog [logTitle]="uitextGeneralLogTitle">log général</log>
- <variable-results-selector [results]="verificateurResults" (indexChange)="variableIndexChanged()">
+ <variable-results-selector [results]="verificateurResults" [variatedParameters]=verificateurResults?.variatedParameters>
</variable-results-selector>
<log-drawer #iterationLog></log-drawer>
diff --git a/src/app/components/verificateur-results/verificateur-results.component.ts b/src/app/components/verificateur-results/verificateur-results.component.ts
index 1d76c0420..d0e06ee55 100644
--- a/src/app/components/verificateur-results/verificateur-results.component.ts
+++ b/src/app/components/verificateur-results/verificateur-results.component.ts
@@ -1,4 +1,4 @@
-import { Component, ViewChild, DoCheck } from "@angular/core";
+import { Component, ViewChild } from "@angular/core";
import { cLog, Message } from "jalhyd";
@@ -17,7 +17,7 @@ import { LogDrawerComponent } from "../log-drawer/log-drawer.component";
"./verificateur-results.component.scss"
]
})
-export class VerificateurResultsComponent extends ResultsComponentDirective implements DoCheck {
+export class VerificateurResultsComponent extends ResultsComponentDirective {
/** résultats non mis en forme */
private _verificateurResults: VerificateurResults;
@@ -45,39 +45,6 @@ export class VerificateurResultsComponent extends ResultsComponentDirective impl
if (rs.length > 0 && rs[0] instanceof VerificateurResults) {
this._verificateurResults = rs[0] as VerificateurResults;
}
- this.updateView();
- }
-
- /**
- * update iteration log when the variable index changed (event sent by
- * VariableResultsSelectorComponent); variable index is already set in
- * verificateurResults at this time
- */
- public variableIndexChanged() {
- this.updateView();
- }
-
- public updateView() {
- if (this.iterationLogComponent) {
- this.iterationLogComponent.log = undefined;
- }
- if (this.generalLogComponent) {
- this.generalLogComponent.log = undefined;
- }
- if (this.variableResultsSelectorComponent) {
- this.variableResultsSelectorComponent.results = undefined;
- }
- // set _doUpdate flag so that results are rebuilt on the next Angular display cycle
- this._doUpdate = false;
- if (this._verificateurResults !== undefined) {
- this._doUpdate = this._doUpdate || this._verificateurResults.hasResults || this._verificateurResults.hasLog;
- }
- }
-
- public ngDoCheck() {
- if (this._doUpdate) {
- this._doUpdate = !this.updateResults();
- }
}
/*
@@ -136,33 +103,6 @@ export class VerificateurResultsComponent extends ResultsComponentDirective impl
return l;
}
- /**
- * met à jour l'affichage des résultats
- * @returns true si les résultats ont pu être mis à jour
- */
- private updateResults() {
- let selectorUpdated: boolean;
-
- // results or not, there might be a log
- const logUpdated = (this.iterationLogComponent !== undefined || this.generalLogComponent !== undefined); // gne ?
- if (logUpdated) {
- // order of logs is important !
- this.iterationLogComponent.log = this.iterationLog;
- this.generalLogComponent.log = this.globalLog;
- }
-
- if (this.hasResults) {
- selectorUpdated = this.variableResultsSelectorComponent !== undefined;
- if (selectorUpdated) {
- this.variableResultsSelectorComponent.results = this._verificateurResults;
- }
- } else {
- selectorUpdated = true;
- }
-
- return logUpdated && selectorUpdated;
- }
-
public get verificateurResults() {
return this._verificateurResults;
}
diff --git a/src/app/results/pab-results.ts b/src/app/results/pab-results.ts
index f77a2f9b4..d282524ef 100644
--- a/src/app/results/pab-results.ts
+++ b/src/app/results/pab-results.ts
@@ -150,7 +150,7 @@ export class PabResults extends MultiDimensionResults implements PlottableData {
*/
public getChartAxisLabel(symbol: string): string {
if (symbol === "x") { // specific case for wall abscissa
- return ServiceFactory.instance.i18nService.localizeText("INFO_LIB_ABSCISSE_CLOISON");
+ return ServiceFactory.i18nService.localizeText("INFO_LIB_ABSCISSE_CLOISON");
} else {
return this.headers[this.columns.indexOf(symbol)];
}
--
GitLab