diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 1cbc72c0fcd2f6a46d282e0075722732cc2e660f..e21223513b58c9e5fc04ea10d3cbdc3ef9e3395a 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -91,7 +91,7 @@ import { ModulesDiagramComponent } from "./components/modules-diagram/modules-di import { MacrorugoCompoundResultsTableComponent } from "./components/macrorugo-compound-results/macrorugo-compound-results-table.component"; import { MacrorugoCompoundResultsComponent } from "./components/macrorugo-compound-results/macrorugo-compound-results.component"; import { JetResultsComponent } from "./components/jet-results/jet-results.component"; -import { JetTrajectoryGraphComponent } from "./components/jet-trajectory-graph/jet-trajectory-graph.component"; +import { JetTrajectoryChartComponent } from "./components/jet-trajectory-chart/jet-trajectory-chart.component"; import { DialogConfirmEmptySessionComponent } from "./components/dialog-confirm-empty-session/dialog-confirm-empty-session.component"; import { DialogConfirmCloseCalcComponent } from "./components/dialog-confirm-close-calc/dialog-confirm-close-calc.component"; @@ -196,7 +196,7 @@ const appRoutes: Routes = [ JalhydModelValidationMaxDirective, JalhydModelValidationStepDirective, JetResultsComponent, - JetTrajectoryGraphComponent, + JetTrajectoryChartComponent, LogComponent, LogEntryComponent, ModulesDiagramComponent, diff --git a/src/app/components/jet-results/jet-results.component.html b/src/app/components/jet-results/jet-results.component.html index 5b726da9770d5c6630bc867189ae8155f91ad364..45e633fa8f4707c3ef3bbb6a254781e91d8872c2 100644 --- a/src/app/components/jet-results/jet-results.component.html +++ b/src/app/components/jet-results/jet-results.component.html @@ -2,9 +2,9 @@ <!-- journal --> <log></log> - <results-graph *ngIf="showVarResults"></results-graph> + <results-chart *ngIf="showVarResults"></results-chart> - <jet-trajectory-graph *ngIf="hasResults"></jet-trajectory-graph> + <jet-trajectory-chart *ngIf="hasResults"></jet-trajectory-chart> <div> <!-- table des résultats fixés --> diff --git a/src/app/components/jet-results/jet-results.component.scss b/src/app/components/jet-results/jet-results.component.scss index 6f5eb10d525664ef64b09c7c5eda9a8a074218b1..446313ba6da367fde3da7c3b760e39086f71a804 100644 --- a/src/app/components/jet-results/jet-results.component.scss +++ b/src/app/components/jet-results/jet-results.component.scss @@ -1,4 +1,4 @@ -results-graph { +results-chart { margin-left: 1em; margin-right: 1em; } diff --git a/src/app/components/jet-results/jet-results.component.ts b/src/app/components/jet-results/jet-results.component.ts index 8703b78e7f7f3528e8294e9def0553e95c24a948..3c29caa27f30d9cb4332a665dc8b11a358e4abb1 100644 --- a/src/app/components/jet-results/jet-results.component.ts +++ b/src/app/components/jet-results/jet-results.component.ts @@ -1,7 +1,7 @@ import { Component, ViewChild } from "@angular/core"; import { FixedVarResultsComponent } from "../fixedvar-results/fixedvar-results.component"; -import { JetTrajectoryGraphComponent } from "../jet-trajectory-graph/jet-trajectory-graph.component"; +import { JetTrajectoryChartComponent } from "../jet-trajectory-chart/jet-trajectory-chart.component"; @Component({ selector: "jet-results", @@ -13,8 +13,8 @@ import { JetTrajectoryGraphComponent } from "../jet-trajectory-graph/jet-traject export class JetResultsComponent extends FixedVarResultsComponent { /** graphique de trajectoire */ - @ViewChild(JetTrajectoryGraphComponent, { static: false }) - private jetTrajectoryGraphComponent: JetTrajectoryGraphComponent; + @ViewChild(JetTrajectoryChartComponent, { static: false }) + private jetTrajectoryChartComponent: JetTrajectoryChartComponent; public get hasResults(): boolean { return ( @@ -25,8 +25,8 @@ export class JetResultsComponent extends FixedVarResultsComponent { } public updateView() { - if (this.jetTrajectoryGraphComponent) { - this.jetTrajectoryGraphComponent.results = undefined; + if (this.jetTrajectoryChartComponent) { + this.jetTrajectoryChartComponent.results = undefined; } super.updateView(); } @@ -38,20 +38,20 @@ export class JetResultsComponent extends FixedVarResultsComponent { protected updateResults() { const superUpdated = super.updateResults(); - let trajectoryGraphUpdated: boolean; - trajectoryGraphUpdated = this.jetTrajectoryGraphComponent !== undefined; + let trajectoryChartUpdated: boolean; + trajectoryChartUpdated = this.jetTrajectoryChartComponent !== undefined; - if (trajectoryGraphUpdated) { + if (trajectoryChartUpdated) { // draw chart whether params are variating or not, // hence different Results object for each case if (this._varResults && this._varResults.hasResults) { - this.jetTrajectoryGraphComponent.results = this._varResults; + this.jetTrajectoryChartComponent.results = this._varResults; } else { - this.jetTrajectoryGraphComponent.results = this._fixedResults; + this.jetTrajectoryChartComponent.results = this._fixedResults; } - this.jetTrajectoryGraphComponent.updateView(); + this.jetTrajectoryChartComponent.updateView(); } - return superUpdated && trajectoryGraphUpdated; + return superUpdated && trajectoryChartUpdated; } } diff --git a/src/app/components/jet-trajectory-graph/jet-trajectory-graph.component.html b/src/app/components/jet-trajectory-chart/jet-trajectory-chart.component.html similarity index 91% rename from src/app/components/jet-trajectory-graph/jet-trajectory-graph.component.html rename to src/app/components/jet-trajectory-chart/jet-trajectory-chart.component.html index 6ef01d5045c3b0203bb619d213b5a1357261885e..a30d03c37094423e1225f969015f26bfd659bdd9 100644 --- a/src/app/components/jet-trajectory-graph/jet-trajectory-graph.component.html +++ b/src/app/components/jet-trajectory-chart/jet-trajectory-chart.component.html @@ -1,6 +1,6 @@ -<div class="graph-results-container" #graphProfile fxLayout="row wrap" fxLayoutAlign="center center"> +<div class="chart-results-container" #graphProfile fxLayout="row wrap" fxLayoutAlign="center center"> <div fxFlex="1 1 100%"> - <div class="graph-profile-buttons"> + <div class="chart-profile-buttons"> <button mat-icon-button (click)="resetZoom()" [disabled]="! zoomWasChanged" [title]="uitextResetZoomTitle"> <mat-icon color="primary">replay</mat-icon> </button> diff --git a/src/app/components/jet-trajectory-graph/jet-trajectory-graph.component.scss b/src/app/components/jet-trajectory-chart/jet-trajectory-chart.component.scss similarity index 90% rename from src/app/components/jet-trajectory-graph/jet-trajectory-graph.component.scss rename to src/app/components/jet-trajectory-chart/jet-trajectory-chart.component.scss index 19266623bd9da70c907c1db956b30eeecb2c443a..ebe1d83193a78f9d5a63c8aa5f505eabca31468d 100644 --- a/src/app/components/jet-trajectory-graph/jet-trajectory-graph.component.scss +++ b/src/app/components/jet-trajectory-chart/jet-trajectory-chart.component.scss @@ -1,9 +1,9 @@ -.graph-results-container{ +.chart-results-container{ display: block; background-color: white; } -.graph-profile-buttons { +.chart-profile-buttons { padding-right: 10px; padding-top: 4px; margin-bottom: -30px; diff --git a/src/app/components/jet-trajectory-graph/jet-trajectory-graph.component.ts b/src/app/components/jet-trajectory-chart/jet-trajectory-chart.component.ts similarity index 96% rename from src/app/components/jet-trajectory-graph/jet-trajectory-graph.component.ts rename to src/app/components/jet-trajectory-chart/jet-trajectory-chart.component.ts index 079e3fcc8c7c075ce763bc446f020812ecd9ddd9..e71fc2cd8acb48fb7403edae7a80ffa36c6989cd 100644 --- a/src/app/components/jet-trajectory-graph/jet-trajectory-graph.component.ts +++ b/src/app/components/jet-trajectory-chart/jet-trajectory-chart.component.ts @@ -12,13 +12,13 @@ import { fv } from "../../util"; import { Jet } from "jalhyd"; @Component({ - selector: "jet-trajectory-graph", - templateUrl: "./jet-trajectory-graph.component.html", + selector: "jet-trajectory-chart", + templateUrl: "./jet-trajectory-chart.component.html", styleUrls: [ - "./jet-trajectory-graph.component.scss" + "./jet-trajectory-chart.component.scss" ] }) -export class JetTrajectoryGraphComponent extends ResultsComponent { +export class JetTrajectoryChartComponent extends ResultsComponent { @ViewChild(ChartComponent, { static: false }) private chartComponent; @@ -132,7 +132,7 @@ export class JetTrajectoryGraphComponent extends ResultsComponent { } public set results(r: FixedResults | VarResults) { - this.forceRebuild(); // used for (de)activating legend in generateScatterGraph() + this.forceRebuild(); // used for (de)activating legend in generateScatterChart() this._results = r; if (this._results) { @@ -170,13 +170,13 @@ export class JetTrajectoryGraphComponent extends ResultsComponent { } public updateView() { - this.generateScatterGraph(); + this.generateScatterChart(); } /** * génère les données d'un graphe de type "scatter" */ - private generateScatterGraph() { + private generateScatterChart() { const ySeries = this.getYSeries(); // hide legend when there is only 1 series