From 032a758562a6808280409183d65e1553d155790a Mon Sep 17 00:00:00 2001 From: rozetko Date: Tue, 4 Jun 2019 11:33:12 +0300 Subject: [PATCH] Hidden analytic units in tooltip #239 (#332) --- .../graph_panel/controllers/analytic_controller.ts | 13 ++++++++----- src/panel/graph_panel/graph_tooltip.ts | 6 +++--- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/panel/graph_panel/controllers/analytic_controller.ts b/src/panel/graph_panel/controllers/analytic_controller.ts index 0ae0515..4b7b14c 100644 --- a/src/panel/graph_panel/controllers/analytic_controller.ts +++ b/src/panel/graph_panel/controllers/analytic_controller.ts @@ -80,12 +80,15 @@ export class AnalyticController { } private _segmentsSearcher(point: number, rangeDist: number): AnalyticSegmentPair[] { - var result: AnalyticSegmentPair[] = []; - this._analyticUnitsSet.items.forEach(at => { - var segs = at.segments.findSegments(point, rangeDist); + let result: AnalyticSegmentPair[] = []; + this._analyticUnitsSet.items.forEach(analyticUnit => { + if(!analyticUnit.visible) { + return; + } + const segs = analyticUnit.segments.findSegments(point, rangeDist); segs.forEach(s => { - result.push({ analyticUnit: at, segment: s }); - }) + result.push({ analyticUnit, segment: s }); + }); }) return result; } diff --git a/src/panel/graph_panel/graph_tooltip.ts b/src/panel/graph_panel/graph_tooltip.ts index 1a4c2cb..f0e1a4a 100644 --- a/src/panel/graph_panel/graph_tooltip.ts +++ b/src/panel/graph_panel/graph_tooltip.ts @@ -116,7 +116,7 @@ export class GraphTooltip { } - seriesHtml += this._appendAnomaliesHTML(pos.x, rangeDist); + seriesHtml += this._appendAnalyticsHTML(pos.x, rangeDist); this._renderAndShow(absoluteTime, seriesHtml, pos, xMode); @@ -140,7 +140,7 @@ export class GraphTooltip { group += '
' + value + '
'; - group += this._appendAnomaliesHTML(pos.x, rangeDist); + group += this._appendAnalyticsHTML(pos.x, rangeDist); this._renderAndShow(absoluteTime, group, pos, xMode); } @@ -192,7 +192,7 @@ export class GraphTooltip { } }; - private _appendAnomaliesHTML(pos: number, rangeDist: number): string { + private _appendAnalyticsHTML(pos: number, rangeDist: number): string { if(this._analyticSegmentsSearcher === undefined) { return ''; }