Merge pull request #288 from iteratec/feature/legendDynamicPosition

Feature/legend dynamic position
iteratec · Nov 13, 2019 · 8a23f68 · 8a23f68
2 parents 4111ae9 + f786981
commit 8a23f68
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 10 deletions.
diff --git a/frontend/src/app/enums/chart-commons.enum.ts b/frontend/src/app/enums/chart-commons.enum.ts
@@ -6,5 +6,5 @@ export enum ChartCommons {
   CHART_HEADER_HEIGHT = 40,
   COLOR_PREVIEW_SIZE = 10,
   COLOR_PREVIEW_MARGIN = 5,
-  LABEL_HEIGHT = 30
+  LABEL_HEIGHT = 18
 }
diff --git a/...dules/time-series/components/time-series-line-chart/time-series-line-chart.component.scss b/...dules/time-series/components/time-series-line-chart/time-series-line-chart.component.scss
@@ -59,3 +59,11 @@ osm-time-series-line-chart {
 
   }
 }
+
+.legend-entry {
+  cursor: pointer;
+}
+
+.legend-text {
+  font-size: 12px;
+}
diff --git a/frontend/src/app/modules/time-series/services/line-chart.service.ts b/frontend/src/app/modules/time-series/services/line-chart.service.ts
@@ -68,6 +68,9 @@ export class LineChartService {
   private _labelGroupHeight: number;
   private _legendGroupTop: number = this._margin.top + this._height + 50;
   private _legendGroupLeft: number = this._margin.left;
+  private _legendGroupHeight;
+  private _legendGroupColumnWidth;
+  private _legendGroupColumns;
   private legendDataMap: Object = {};
   private brush: BrushBehavior<{}>;
   private focusedLegendEntry: string;
@@ -106,9 +109,9 @@ export class LineChartService {
     let chart: D3Selection<D3BaseType, {}, D3ContainerElement, {}> = d3Select('g#time-series-chart-drawing-area');
     let xScale: D3ScaleTime<number, number> = this.getXScale(data);
     let yScale: D3ScaleLinear<number, number> = this.getYScale(data);
-    this._labelGroupHeight = data.length * ChartCommons.LABEL_HEIGHT;
+this.calculateLegendDimensions();
     d3Select('osm-time-series-line-chart').transition().duration(500).style('visibility', 'visible');
-    d3Select('svg#time-series-chart').transition().duration(500).attr('height', this._height + this._labelGroupHeight + this._margin.top + this._margin.bottom);
+    d3Select('svg#time-series-chart').transition().duration(500).attr('height', this._height + this._legendGroupHeight + this._margin.top + this._margin.bottom);
     d3Select('.x-axis').transition().call(this.updateXAxis, xScale);
     d3Select('.y-axis').transition().call(this.updateYAxis, yScale, this._width, this._margin);
     this.brush = d3BrushX().extent([[0, 0], [this._width, this._height]]);
@@ -187,6 +190,7 @@ export class LineChartService {
       .attr('height', 0);
 
     svg.append('g')
+      .attr('id', 'time-series-chart-legend')
       .attr('class', 'legend-group')
       .attr('transform', `translate(${this._legendGroupLeft}, ${this._legendGroupTop})`);
 
@@ -245,6 +249,34 @@ export class LineChartService {
       .nice();
   }
 
+  private calculateLegendDimensions(): void {
+    let maximumLabelWidth: number = 1;
+    let labels = Object.keys(this.legendDataMap);
+
+    d3Select('g#time-series-chart-legend')
+      .append('g')
+      .attr('id', 'renderToCalculateMaxWidth')
+      .selectAll('.renderToCalculateMaxWidth')
+      .data(labels)
+      .enter()
+      .append('text')
+      .attr('class', 'legend-text')
+      .text(datum => this.legendDataMap[datum].text)
+      .each((datum, index, groups) => {
+        Array.from(groups).forEach((text) => {
+          if (text) {
+            maximumLabelWidth = Math.max(maximumLabelWidth, text.getBoundingClientRect().width)
+          }
+        });
+      });
+
+    d3Select('g#renderToCalculateMaxWidth').remove();
+
+    this._legendGroupColumnWidth = maximumLabelWidth + ChartCommons.COLOR_PREVIEW_SIZE + 30;
+    this._legendGroupColumns = Math.floor(this._width / this._legendGroupColumnWidth);
+    this._legendGroupHeight = Math.ceil(labels.length / this._legendGroupColumns) * ChartCommons.LABEL_HEIGHT + 30;
+  }
+
   private getMaxValue(data: TimeSeries[]): number {
     return d3Max(data, (dataItem: TimeSeries) => {
       return d3Max(dataItem.values, (point: TimeSeriesPoint) => {
@@ -761,13 +793,8 @@ export class LineChartService {
   }
 
   private getPosition(index: number): string {
-    const columns = 3;
-    const columnWidth = 550;
-    const xMargin = 10;
-    const yMargin = 10;
-
-    const x = index % columns * columnWidth + xMargin;
-    const y = Math.floor(index / columns) * ChartCommons.LABEL_HEIGHT + yMargin;
+    const x = index % this._legendGroupColumns * this._legendGroupColumnWidth;
+    const y = Math.floor(index / this._legendGroupColumns) * ChartCommons.LABEL_HEIGHT + 12;
 
     return "translate(" + x + "," + y + ")";
   }