diff --git a/pdb-js/src/app/app.module.ts b/pdb-js/src/app/app.module.ts index 7150ae7..939c12d 100644 --- a/pdb-js/src/app/app.module.ts +++ b/pdb-js/src/app/app.module.ts @@ -20,7 +20,7 @@ import {MatProgressBarModule} from '@angular/material/progress-bar'; import {MatProgressSpinnerModule} from '@angular/material/progress-spinner'; import {MatSnackBarModule} from '@angular/material/snack-bar'; 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 { LimitByComponent } from './limit-by/limit-by.component'; import { PlotViewComponent } from './plot-view/plot-view.component'; @@ -34,7 +34,7 @@ import { ImageToggleComponent } from './image-toggle/image-toggle.component'; HelpPageComponent, UploadPageComponent, VisualizationPageComponent, - YAxisRangeComponent, + YAxisDefinitionComponent, QueryAutocompleteComponent, LimitByComponent, PlotViewComponent, diff --git a/pdb-js/src/app/visualization-page/visualization-page.component.html b/pdb-js/src/app/visualization-page/visualization-page.component.html index 32c6498..0919078 100644 --- a/pdb-js/src/app/visualization-page/visualization-page.component.html +++ b/pdb-js/src/app/visualization-page/visualization-page.component.html @@ -41,7 +41,7 @@ - + Gallery diff --git a/pdb-js/src/app/visualization-page/visualization-page.component.ts b/pdb-js/src/app/visualization-page/visualization-page.component.ts index 7cd66ff..a875a88 100644 --- a/pdb-js/src/app/visualization-page/visualization-page.component.ts +++ b/pdb-js/src/app/visualization-page/visualization-page.component.ts @@ -4,7 +4,7 @@ import { Observable } from 'rxjs/Observable'; import { FormControl, Validators } from '@angular/forms'; import { MatSnackBar } from '@angular/material/snack-bar'; 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 { PlotViewComponent, SelectionRange, DateAnchor } from '../plot-view/plot-view.component'; import { GalleryViewComponent } from '../gallery-view/gallery-view.component'; @@ -33,8 +33,8 @@ export class VisualizationPageComponent implements OnInit { yAxisScale: string; - @ViewChild(YAxisRangeComponent, {static: false}) - private yAxisRangeComponent : YAxisRangeComponent; + @ViewChild(YAxisDefinitionComponent, {static: false}) + private yAxisDefinitionComponent : YAxisDefinitionComponent; @ViewChild(QueryAutocompleteComponent, {static: false}) query: QueryAutocompleteComponent; @@ -154,9 +154,9 @@ export class VisualizationPageComponent implements OnInit { request.aggregates = aggregates; request.keyOutside = false; request.generateThumbnail = this.enableGallery; - request.yRangeMin = this.yAxisRangeComponent.minYValue; - request.yRangeMax = this.yAxisRangeComponent.maxYValue; - request.yRangeUnit = this.yAxisRangeComponent.yAxisUnit; + request.yRangeMin = this.yAxisDefinitionComponent.minYValue; + request.yRangeMax = this.yAxisDefinitionComponent.maxYValue; + request.yRangeUnit = this.yAxisDefinitionComponent.yAxisUnit; return request; } diff --git a/pdb-js/src/app/y-axis-range/y-axis-range.component.html b/pdb-js/src/app/y-axis-definition/y-axis-definition.component.html similarity index 100% rename from pdb-js/src/app/y-axis-range/y-axis-range.component.html rename to pdb-js/src/app/y-axis-definition/y-axis-definition.component.html diff --git a/pdb-js/src/app/y-axis-range/y-axis-range.component.scss b/pdb-js/src/app/y-axis-definition/y-axis-definition.component.scss similarity index 100% rename from pdb-js/src/app/y-axis-range/y-axis-range.component.scss rename to pdb-js/src/app/y-axis-definition/y-axis-definition.component.scss diff --git a/pdb-js/src/app/y-axis-range/y-axis-range.component.spec.ts b/pdb-js/src/app/y-axis-definition/y-axis-definition.component.spec.ts similarity index 51% rename from pdb-js/src/app/y-axis-range/y-axis-range.component.spec.ts rename to pdb-js/src/app/y-axis-definition/y-axis-definition.component.spec.ts index 837e60b..5aa24ff 100644 --- a/pdb-js/src/app/y-axis-range/y-axis-range.component.spec.ts +++ b/pdb-js/src/app/y-axis-definition/y-axis-definition.component.spec.ts @@ -1,20 +1,20 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { YAxisRangeComponent } from './y-axis-range.component'; +import { YAxisDefinitionComponent } from './y-axis-definition.component'; -describe('YAxisRangeComponent', () => { - let component: YAxisRangeComponent; - let fixture: ComponentFixture; +describe('YAxisDefinitionComponent', () => { + let component: YAxisDefinitionComponent; + let fixture: ComponentFixture; beforeEach(async(() => { TestBed.configureTestingModule({ - declarations: [ YAxisRangeComponent ] + declarations: [ YAxisDefinitionComponent ] }) .compileComponents(); })); beforeEach(() => { - fixture = TestBed.createComponent(YAxisRangeComponent); + fixture = TestBed.createComponent(YAxisDefinitionComponent); component = fixture.componentInstance; fixture.detectChanges(); }); diff --git a/pdb-js/src/app/y-axis-definition/y-axis-definition.component.ts b/pdb-js/src/app/y-axis-definition/y-axis-definition.component.ts new file mode 100644 index 0000000..5ab4a39 --- /dev/null +++ b/pdb-js/src/app/y-axis-definition/y-axis-definition.component.ts @@ -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() { + } +} diff --git a/pdb-js/src/app/y-axis-range/y-axis-range.component.ts b/pdb-js/src/app/y-axis-range/y-axis-range.component.ts deleted file mode 100644 index 81a255d..0000000 --- a/pdb-js/src/app/y-axis-range/y-axis-range.component.ts +++ /dev/null @@ -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() { - } -}