Merge pull request #58 from key4hep/feat/object-title

Show object name at top when drawing
key4hep · Jul 17, 2024 · 669cc24 · 669cc24
2 parents bc2b522 + 136f20a
commit 669cc24
Show file tree

Hide file tree

Showing 3 changed files with 74 additions and 73 deletions.
diff --git a/js/lib/graphic-primitives.js b/js/lib/graphic-primitives.js
@@ -107,3 +107,27 @@ export function drawStraightLink(ctx, link) {
   ctx.stroke();
   ctx.restore();
 }
+
+export function drawObjectHeader(ctx, object) {
+  ctx.save();
+  ctx.font = "bold 16px sans-serif";
+  const text = object.constructor.name;
+  const boxCenterX = object.x + object.width / 2;
+  const textWidth = ctx.measureText(text).width;
+  const x = boxCenterX - ctx.measureText(text).width / 2;
+  const topY = object.y + 20;
+
+  if (textWidth > object.width) {
+    const lines = text.split(/(?=[A-Z])/);
+    for (const [i, lineText] of lines.entries()) {
+      ctx.fillText(
+        lineText,
+        boxCenterX - ctx.measureText(lineText).width / 2,
+        topY + i * 20
+      );
+    }
+  } else {
+    ctx.fillText(text, x, topY);
+  }
+  ctx.restore();
+}
diff --git a/js/types/objects.js b/js/types/objects.js
@@ -2,25 +2,39 @@ import {
   drawTex,
   drawRoundedRect,
   drawTextLines,
+  drawObjectHeader,
 } from "../lib/graphic-primitives.js";
 import { getName } from "../lib/getName.js";
 import { linkTypes } from "./links.js";
 import { parseCharge } from "../lib/parseCharge.js";
 
+const TOP_MARGIN = 45;
+
 class EDMObject {
   constructor() {
     this.x = NaN;
     this.y = NaN;
     this.index = NaN;
     this.collectionId = NaN;
     this.width = 120;
-    this.height = 240;
+    this.height = 260;
     this.lineColor = "black";
     this.lineWidth = 2;
     this.color = "white";
   }
 
-  draw(ctx) {}
+  draw(ctx) {
+    drawRoundedRect(
+      ctx,
+      this.x,
+      this.y,
+      this.width,
+      this.height,
+      this.color,
+      this.radius
+    );
+    drawObjectHeader(ctx, this);
+  }
 
   isHere(mouseX, mouseY) {
     return (
@@ -44,10 +58,11 @@ class EDMObject {
 export class MCParticle extends EDMObject {
   constructor() {
     super();
-
     this.row = -1;
-
     this.texImg = null;
+    this.color = "#dff6ff";
+    this.radius = 15;
+    this.height = 270;
   }
 
   updateTexImg(text) {
@@ -65,21 +80,13 @@ export class MCParticle extends EDMObject {
   draw(ctx) {
     const boxCenterX = this.x + this.width / 2;
 
-    drawRoundedRect(
-      ctx,
-      this.x,
-      this.y,
-      this.width,
-      this.height,
-      "#dff6ff",
-      15
-    );
+    super.draw(ctx);
 
     if (this.texImg.complete) {
       drawTex(
         ctx,
         boxCenterX,
-        this.y + this.height * 0.4,
+        this.y + TOP_MARGIN + 80,
         this.texImg,
         this.width
       );
@@ -88,20 +95,20 @@ export class MCParticle extends EDMObject {
         drawTex(
           ctx,
           boxCenterX,
-          this.y + this.height * 0.4,
+          this.y + TOP_MARGIN + 80,
           this.texImg,
           this.width
         );
       };
     }
 
-    const topY = this.y + 20;
+    const topY = this.y + TOP_MARGIN;
     const topLines = [];
     topLines.push("ID: " + this.index);
     topLines.push("Gen. stat.: " + this.generatorStatus);
     topLines.push("Sim. stat.: " + this.simulatorStatus);
 
-    const bottomY = this.y + this.height * 0.6;
+    const bottomY = this.y + this.height * 0.65;
     const bottomLines = [];
     bottomLines.push("p = " + this.momentum + " GeV");
     bottomLines.push("d = " + this.vertex + " mm");
@@ -200,23 +207,17 @@ class ReconstructedParticle extends EDMObject {
   constructor() {
     super();
     this.width = 140;
-    this.height = 180;
+    this.height = 190;
+    this.color = "#fbffdf";
+    this.radius = 30;
   }
 
   draw(ctx) {
     const boxCenterX = this.x + this.width / 2;
 
-    drawRoundedRect(
-      ctx,
-      this.x,
-      this.y,
-      this.width,
-      this.height,
-      "#fbffdf",
-      30
-    );
+    super.draw(ctx);
 
-    const topY = this.y + 20;
+    const topY = this.y + 1.5 * TOP_MARGIN;
     const lines = [];
 
     lines.push("ID: " + this.index);
@@ -245,23 +246,17 @@ class Cluster extends EDMObject {
   constructor() {
     super();
     this.width = 140;
-    this.height = 180;
+    this.height = 170;
+    this.color = "#ffe8df";
+    this.radius = 20;
   }
 
   draw(ctx) {
     const boxCenterX = this.x + this.width / 2;
 
-    drawRoundedRect(
-      ctx,
-      this.x,
-      this.y,
-      this.width,
-      this.height,
-      "#ffe8df",
-      20
-    );
+    super.draw(ctx);
 
-    const topY = this.y + 20;
+    const topY = this.y + TOP_MARGIN;
     const lines = [];
     lines.push("ID: " + this.index);
     lines.push("type: " + this.type);
@@ -284,23 +279,17 @@ class Track extends EDMObject {
   constructor() {
     super();
     this.width = 140;
-    this.height = 180;
+    this.height = 150;
+    this.color = "#fff6df";
+    this.radius = 25;
   }
 
   draw(ctx) {
     const boxCenterX = this.x + this.width / 2;
 
-    drawRoundedRect(
-      ctx,
-      this.x,
-      this.y,
-      this.width,
-      this.height,
-      "#fff6df",
-      25
-    );
+    super.draw(ctx);
 
-    const topY = this.y + 20;
+    const topY = this.y + TOP_MARGIN;
 
     const lines = [];
     lines.push("ID: " + this.index);
@@ -324,23 +313,17 @@ class ParticleID extends EDMObject {
   constructor() {
     super();
     this.width = 140;
-    this.height = 120;
+    this.height = 140;
+    this.color = "#c9edf7";
+    this.radius = 25;
   }
 
   draw(ctx) {
     const boxCenterX = this.x + this.width / 2;
 
-    drawRoundedRect(
-      ctx,
-      this.x,
-      this.y,
-      this.width,
-      this.height,
-      "#c9edf7",
-      25
-    );
+    super.draw(ctx);
 
-    const topY = this.y + 20;
+    const topY = this.y + TOP_MARGIN;
 
     const lines = [];
     lines.push("ID: " + this.index);
@@ -359,23 +342,17 @@ class Vertex extends EDMObject {
   constructor() {
     super();
     this.width = 140;
-    this.height = 140;
+    this.height = 150;
+    this.color = "#f5d3ef";
+    this.radius = 25;
   }
 
   draw(ctx) {
     const boxCenterX = this.x + this.width / 2;
 
-    drawRoundedRect(
-      ctx,
-      this.x,
-      this.y,
-      this.width,
-      this.height,
-      "#f5d3ef",
-      25
-    );
+    super.draw(ctx);
 
-    const topY = this.y + 20;
+    const topY = this.y + TOP_MARGIN;
 
     const lines = [];
     lines.push("ID: " + this.index);

diff --git a/test/objects.test.js b/test/objects.test.js
@@ -108,7 +108,7 @@ describe("Link", () => {
     secondObject.x = 140;
     secondObject.y = 250;
 
-    expect(link.isVisible(0, 0, 250, 250)).toBe(true);
+    expect(link.isVisible(0, 0, 300, 300)).toBe(true);
   });
 
   it("should return false if the link is not visible", () => {