andi/perfdb
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Activity

put y axis definition into its own object

Browse Source
This commit is contained in:
Andreas Huber
2020-02-09 17:16:27 +01:00
parent ed7cc9bee5
commit 859491e99e
28 changed files with 268 additions and 324 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pdb-js/src/app/visualization-page/visualization-page.component.html
View File

@@ -34,7 +34,8 @@
<pdb-limit-by #limitbycomponent></pdb-limit-by>
<pdb-y-axis-definition #yAxisDefinitionComponent></pdb-y-axis-definition>
<pdb-y-axis-definition #y1AxisDefinitionComponent yIndex="1"></pdb-y-axis-definition>
<mat-checkbox [(ngModel)]="enableGallery">Gallery</mat-checkbox>
@@ -77,7 +78,8 @@
#plotView
(zoomRange)="zoomRange($event)"
(zoomWithDateAnchor)="zoomWithDateAnchor($event)"></pdb-plot-view>
<pdb-gallery-view>
<pdb-gallery-view
#galleryView>
</pdb-gallery-view>
</div>

24
pdb-js/src/app/visualization-page/visualization-page.component.ts
View File

@@ -28,19 +28,23 @@ export class VisualizationPageComponent implements OnInit {
groupBy = new Array<TagField>();
@ViewChild(LimitByComponent, {static: false})
@ViewChild('limitbycomponent', {static: false})
private limitbycomponent : LimitByComponent;
@ViewChild(YAxisDefinitionComponent, {static: false})
private yAxisDefinitionComponent : YAxisDefinitionComponent;
@ViewChild(QueryAutocompleteComponent, {static: false})
@ViewChild('y1AxisDefinitionComponent', {static: false, read: YAxisDefinitionComponent})
private y1AxisDefinitionComponent : YAxisDefinitionComponent;
@ViewChild('y2AxisDefinitionComponent', {static: false, read: YAxisDefinitionComponent})
private y2AxisDefinitionComponent : YAxisDefinitionComponent;
@ViewChild('query', {static: false})
query: QueryAutocompleteComponent;
@ViewChild(PlotViewComponent, {static: false})
@ViewChild('plotView', {static: false})
plotView: PlotViewComponent;
@ViewChild(GalleryViewComponent, {static: false})
@ViewChild('galleryView', {static: false})
galleryView: GalleryViewComponent;
enableGallery = false;
@@ -139,11 +143,8 @@ export class VisualizationPageComponent implements OnInit {
const aggregates = [];
this.selectedPlotType.forEach(a => aggregates.push(a.id));
const y1 = new YAxisDefinition();
y1.axisScale = this.yAxisDefinitionComponent.yAxisScale;
y1.yRangeMin = this.yAxisDefinitionComponent.minYValue;
y1.yRangeMax = this.yAxisDefinitionComponent.maxYValue;
y1.yRangeUnit = this.yAxisDefinitionComponent.yAxisUnit;
const y1 = this.y1AxisDefinitionComponent.getAxisDefinition();
const y2 = this.y2AxisDefinitionComponent.getAxisDefinition();
const request = new PlotRequest();
request.query = this.query.query;
@@ -153,6 +154,7 @@ export class VisualizationPageComponent implements OnInit {
request.limitBy = this.limitbycomponent.limitBy;
request.limit = this.limitbycomponent.limit;
request.y1 = y1;
request.y2 = y2;
request.dateRange = this.dateRangeAsString();
request.aggregates = aggregates;
request.keyOutside = false;