From 1c976d87d0b55d9e135df595f39416db88b2aead Mon Sep 17 00:00:00 2001
From: "francois.grand" <francois.grand@irstea.fr>
Date: Fri, 26 Jan 2018 10:04:48 +0100
Subject: [PATCH] =?UTF-8?q?d=C3=A9placement=20de=20GraphTypeSelectComponen?=
=?UTF-8?q?t=20dans=20son=20propre=20fichier?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/app/app.module.ts | 3 ++-
.../results-graph/graph-type.component.ts | 22 +++++++++++++++++++
.../results-graph/results-graph.component.ts | 20 +----------------
3 files changed, 25 insertions(+), 20 deletions(-)
create mode 100644 src/app/components/results-graph/graph-type.component.ts
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 5b51e56b9..e386fe63e 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -34,7 +34,8 @@ import { CalculatorNameComponent } from './components/generic-calculator/calc-na
import { CalcCanvasComponent } from './components/canvas/canvas.component';
import { SectionCanvasComponent } from './components/section-canvas/section-canvas.component';
import { RemousResultsComponent } from './components/remous-results/remous-results.component';
-import { ResultsGraphComponent, GraphTypeSelectComponent } from './components/results-graph/results-graph.component';
+import { ResultsGraphComponent } from './components/results-graph/results-graph.component';
+import { GraphTypeSelectComponent } from './components/results-graph/graph-type.component';
import { LogComponent } from './components/log/log.component';
import { CalculatorListComponent } from './components/calculator-list/calculator-list.component';
import { ApplicationSetupComponent } from './components/app-setup/app-setup.component';
diff --git a/src/app/components/results-graph/graph-type.component.ts b/src/app/components/results-graph/graph-type.component.ts
new file mode 100644
index 000000000..441517009
--- /dev/null
+++ b/src/app/components/results-graph/graph-type.component.ts
@@ -0,0 +1,22 @@
+import { Component } from '@angular/core';
+
+import { GenericSelectComponent } from '../generic-select/generic-select.component';
+import { GraphType } from "../../results/fixed-var-results";
+
+@Component({
+ selector: "graph-type",
+ templateUrl: "../generic-select/generic-select.component.html"
+})
+export class GraphTypeSelectComponent extends GenericSelectComponent<GraphType> {
+ private _entries: GraphType[] = [GraphType.Histogram, GraphType.Scatter];
+ private _entriesLabels: string[] = ["Histogramme", "XY"];
+
+ protected get entries(): GraphType[] {
+ return this._entries;
+ }
+
+ protected entryLabel(entry: GraphType): string {
+ const i = this._entries.indexOf(entry);
+ return this._entriesLabels[i];
+ }
+}
diff --git a/src/app/components/results-graph/results-graph.component.ts b/src/app/components/results-graph/results-graph.component.ts
index ceba3ed60..861ea6798 100644
--- a/src/app/components/results-graph/results-graph.component.ts
+++ b/src/app/components/results-graph/results-graph.component.ts
@@ -1,25 +1,7 @@
import { Component, AfterViewInit, EventEmitter, Output, ViewChild } from '@angular/core';
import { FixedVarResults, GraphType } from "../../results/fixed-var-results";
-import { GenericSelectComponent } from '../generic-select/generic-select.component';
-
-@Component({
- selector: "graph-type",
- templateUrl: "../generic-select/generic-select.component.html"
-})
-export class GraphTypeSelectComponent extends GenericSelectComponent<GraphType> {
- private _entries: GraphType[] = [GraphType.Histogram, GraphType.Scatter];
- private _entriesLabels: string[] = ["Histogramme", "XY"];
-
- protected get entries(): GraphType[] {
- return this._entries;
- }
-
- protected entryLabel(entry: GraphType): string {
- const i = this._entries.indexOf(entry);
- return this._entriesLabels[i];
- }
-}
+import { GraphTypeSelectComponent } from './graph-type.component';
@Component({
selector: 'results-graph',
--
GitLab