rename y-axis-range component to y-axis-definition

This commit is contained in:
2020-02-08 12:50:23 +01:00
parent b59b49f2d1
commit 4dc41faeae
8 changed files with 31 additions and 31 deletions

View File

@@ -20,7 +20,7 @@ import {MatProgressBarModule} from '@angular/material/progress-bar';
import {MatProgressSpinnerModule} from '@angular/material/progress-spinner'; import {MatProgressSpinnerModule} from '@angular/material/progress-spinner';
import {MatSnackBarModule} from '@angular/material/snack-bar'; import {MatSnackBarModule} from '@angular/material/snack-bar';
import {MatTooltipModule} from '@angular/material/tooltip'; import {MatTooltipModule} from '@angular/material/tooltip';
import { YAxisRangeComponent } from './y-axis-range/y-axis-range.component'; import { YAxisDefinitionComponent } from './y-axis-definition/y-axis-definition.component';
import { QueryAutocompleteComponent } from './query-autocomplete/query-autocomplete.component'; import { QueryAutocompleteComponent } from './query-autocomplete/query-autocomplete.component';
import { LimitByComponent } from './limit-by/limit-by.component'; import { LimitByComponent } from './limit-by/limit-by.component';
import { PlotViewComponent } from './plot-view/plot-view.component'; import { PlotViewComponent } from './plot-view/plot-view.component';
@@ -34,7 +34,7 @@ import { ImageToggleComponent } from './image-toggle/image-toggle.component';
HelpPageComponent, HelpPageComponent,
UploadPageComponent, UploadPageComponent,
VisualizationPageComponent, VisualizationPageComponent,
YAxisRangeComponent, YAxisDefinitionComponent,
QueryAutocompleteComponent, QueryAutocompleteComponent,
LimitByComponent, LimitByComponent,
PlotViewComponent, PlotViewComponent,

View File

@@ -41,7 +41,7 @@
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
<pdb-y-axis-range #yAxisRangeComponent></pdb-y-axis-range> <pdb-y-axis-definition #yAxisDefinitionComponent></pdb-y-axis-definition>
<mat-checkbox [(ngModel)]="enableGallery">Gallery</mat-checkbox> <mat-checkbox [(ngModel)]="enableGallery">Gallery</mat-checkbox>

View File

@@ -4,7 +4,7 @@ import { Observable } from 'rxjs/Observable';
import { FormControl, Validators } from '@angular/forms'; import { FormControl, Validators } from '@angular/forms';
import { MatSnackBar } from '@angular/material/snack-bar'; import { MatSnackBar } from '@angular/material/snack-bar';
import { LimitByComponent } from '../limit-by/limit-by.component'; import { LimitByComponent } from '../limit-by/limit-by.component';
import { YAxisRangeComponent } from '../y-axis-range/y-axis-range.component'; import { YAxisDefinitionComponent } from '../y-axis-definition/y-axis-definition.component';
import { QueryAutocompleteComponent } from '../query-autocomplete/query-autocomplete.component'; import { QueryAutocompleteComponent } from '../query-autocomplete/query-autocomplete.component';
import { PlotViewComponent, SelectionRange, DateAnchor } from '../plot-view/plot-view.component'; import { PlotViewComponent, SelectionRange, DateAnchor } from '../plot-view/plot-view.component';
import { GalleryViewComponent } from '../gallery-view/gallery-view.component'; import { GalleryViewComponent } from '../gallery-view/gallery-view.component';
@@ -33,8 +33,8 @@ export class VisualizationPageComponent implements OnInit {
yAxisScale: string; yAxisScale: string;
@ViewChild(YAxisRangeComponent, {static: false}) @ViewChild(YAxisDefinitionComponent, {static: false})
private yAxisRangeComponent : YAxisRangeComponent; private yAxisDefinitionComponent : YAxisDefinitionComponent;
@ViewChild(QueryAutocompleteComponent, {static: false}) @ViewChild(QueryAutocompleteComponent, {static: false})
query: QueryAutocompleteComponent; query: QueryAutocompleteComponent;
@@ -154,9 +154,9 @@ export class VisualizationPageComponent implements OnInit {
request.aggregates = aggregates; request.aggregates = aggregates;
request.keyOutside = false; request.keyOutside = false;
request.generateThumbnail = this.enableGallery; request.generateThumbnail = this.enableGallery;
request.yRangeMin = this.yAxisRangeComponent.minYValue; request.yRangeMin = this.yAxisDefinitionComponent.minYValue;
request.yRangeMax = this.yAxisRangeComponent.maxYValue; request.yRangeMax = this.yAxisDefinitionComponent.maxYValue;
request.yRangeUnit = this.yAxisRangeComponent.yAxisUnit; request.yRangeUnit = this.yAxisDefinitionComponent.yAxisUnit;
return request; return request;
} }

View File

@@ -1,20 +1,20 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { YAxisRangeComponent } from './y-axis-range.component'; import { YAxisDefinitionComponent } from './y-axis-definition.component';
describe('YAxisRangeComponent', () => { describe('YAxisDefinitionComponent', () => {
let component: YAxisRangeComponent; let component: YAxisDefinitionComponent;
let fixture: ComponentFixture<YAxisRangeComponent>; let fixture: ComponentFixture<YAxisDefinitionComponent>;
beforeEach(async(() => { beforeEach(async(() => {
TestBed.configureTestingModule({ TestBed.configureTestingModule({
declarations: [ YAxisRangeComponent ] declarations: [ YAxisDefinitionComponent ]
}) })
.compileComponents(); .compileComponents();
})); }));
beforeEach(() => { beforeEach(() => {
fixture = TestBed.createComponent(YAxisRangeComponent); fixture = TestBed.createComponent(YAxisDefinitionComponent);
component = fixture.componentInstance; component = fixture.componentInstance;
fixture.detectChanges(); fixture.detectChanges();
}); });

View File

@@ -0,0 +1,16 @@
import { Component, Input } from '@angular/core';
@Component({
selector: 'pdb-y-axis-definition',
templateUrl: './y-axis-definition.component.html',
styleUrls: ['./y-axis-definition.component.scss']
})
export class YAxisDefinitionComponent {
yAxisUnit: string = "SECONDS";
minYValue: number = 0;
maxYValue: number = 300;
constructor() {
}
}

View File

@@ -1,16 +0,0 @@
import { Component, Input } from '@angular/core';
@Component({
selector: 'pdb-y-axis-range',
templateUrl: './y-axis-range.component.html',
styleUrls: ['./y-axis-range.component.scss']
})
export class YAxisRangeComponent {
yAxisUnit: string = "SECONDS";
minYValue: number = 0;
maxYValue: number = 300;
constructor() {
}
}