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 9dfc187..2dc0d2e 100644 --- a/pdb-js/src/app/visualization-page/visualization-page.component.html +++ b/pdb-js/src/app/visualization-page/visualization-page.component.html @@ -17,23 +17,13 @@ Type: - + {{plotType.name}} - - Combine With Type: - - - - - {{plotType.name}} - - - - Group By: 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 735fc30..13ea687 100644 --- a/pdb-js/src/app/visualization-page/visualization-page.component.ts +++ b/pdb-js/src/app/visualization-page/visualization-page.component.ts @@ -23,12 +23,9 @@ export class VisualizationPageComponent implements OnInit { availablePlotTypes = {}; - selectedPlotType = new FormControl(''); + selectedPlotType = []; plotTypes: Array; - - selectedCombinePlotType = new FormControl(''); - combinePlotTypes: Array; - + tagFields: Array = new Array(); groupBy = new Array(); @@ -66,12 +63,10 @@ export class VisualizationPageComponent implements OnInit { ngOnInit() { const that = this; this.plotTypes = this.plotService.getPlotTypes(); - this.selectedPlotType.setValue(this.plotTypes[0]); + this.selectedPlotType.push(this.plotTypes[0]); this.plotTypes.forEach(pt => this.availablePlotTypes[pt.name] = pt); - - this.combinePlotTypes = this.getCombinablePlotTypes(this.selectedPlotType.value); - + that.plotService.getFilterDefaults().subscribe(function(filterDefaults) { filterDefaults.fields.forEach(function(name) { @@ -85,16 +80,6 @@ export class VisualizationPageComponent implements OnInit { that.splitBy = that.tagFields.find(val => filterDefaults.splitBy == val.name); }); this.yAxisScale = "LOG10"; - - this.selectedPlotType.valueChanges.subscribe(function(selectedMainPlotType){ - that.combinePlotTypes = that.getCombinablePlotTypes(selectedMainPlotType); - if (!that.combinePlotTypes.includes(that.selectedCombinePlotType.value)){ - that.selectedCombinePlotType.setValue(''); - } - }, - error => { - that.showError(error.error.message); - }); } getCombinablePlotTypes(selectedMainPlotType) : Array{ @@ -137,10 +122,7 @@ export class VisualizationPageComponent implements OnInit { createPlotRequest(): PlotRequest { const aggregates = []; - aggregates.push(this.selectedPlotType.value.id); - if (this.selectedCombinePlotType.value){ - aggregates.push(this.selectedCombinePlotType.value.id); - } + this.selectedPlotType.forEach(a => aggregates.push(a.id)); const request = new PlotRequest(); request.query = this.query.query;