From 888b34fa4bc8ed213c05a3ae968d434ef8e0bec0 Mon Sep 17 00:00:00 2001 From: alja <amraktadel@ucsd.edu> Date: Thu, 26 Mar 2020 16:00:14 -0700 Subject: [PATCH] Add custom tooltip for StraightLineSets --- ui5/eve7/lib/EveElements.js | 13 +++++++++++++ ui5/eve7/lib/GlViewerThree.js | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/ui5/eve7/lib/EveElements.js b/ui5/eve7/lib/EveElements.js index dde82fce084..4c338f6c12b 100644 --- a/ui5/eve7/lib/EveElements.js +++ b/ui5/eve7/lib/EveElements.js @@ -34,6 +34,12 @@ sap.ui.define(['rootui5/eve7/lib/EveManager'], function(EveManager) { EveElemControl.prototype.separateDraw = false; + EveElemControl.prototype.getTooltipText = function(intersect) + { + let el = this.obj3d.eve_el; + return el.fTitle || el.fName || ""; + } + EveElemControl.prototype.elementHighlighted = function(indx) { // default is simple selection, we ignore the indx @@ -697,6 +703,13 @@ sap.ui.define(['rootui5/eve7/lib/EveManager'], function(EveManager) { } } + StraightLineSetControl.prototype.getTooltipText = function(intersect) + { + var t = this.obj3d.eve_el.fTitle || this.obj3d.eve_el.fName || ""; + var idx = this.extractIndex(intersect); + return t + " idx=" + idx; + } + StraightLineSetControl.prototype.elementSelected = function(indx) { this.invokeSceneMethod("processElementSelected", indx); diff --git a/ui5/eve7/lib/GlViewerThree.js b/ui5/eve7/lib/GlViewerThree.js index bdbd6512553..657dbe66fed 100644 --- a/ui5/eve7/lib/GlViewerThree.js +++ b/ui5/eve7/lib/GlViewerThree.js @@ -443,7 +443,7 @@ sap.ui.define([ this.highlighted_scene = c.obj3d.scene; if (c.obj3d && c.obj3d.eve_el) - this.ttip_text.innerHTML = c.obj3d.eve_el.fTitle || c.obj3d.eve_el.fName || ""; + this.ttip_text.innerHTML = c.getTooltipText(intersect); else this.ttip_text.innerHTML = ""; -- GitLab