Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Show object collection name #59

Merged
merged 11 commits into from
Jul 17, 2024
34 changes: 29 additions & 5 deletions js/events.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { canvas } from "./main.js";
import { canvas, ctx } from "./main.js";
import { drawAll, drawVisible } from "./draw.js";

const mouseDown = function (event, visibleObjects, dragTools) {
Expand Down Expand Up @@ -44,14 +44,38 @@ const mouseOut = function (event, dragTools) {
};

const mouseMove = function (event, visibleObjects, dragTools) {
if (!dragTools.isDragging) {
return;
}

const boundigClientRect = canvas.getBoundingClientRect();
const mouseX = parseInt(event.clientX - boundigClientRect.x);
const mouseY = parseInt(event.clientY - boundigClientRect.y);

const allObjects = Object.values(visibleObjects.datatypes)
.map((datatype) => datatype.collection)
.flat();

let someHovered = false;
for (const object of allObjects) {
if (object.isHere(mouseX, mouseY)) {
if (dragTools.hoveredObject !== object) {
dragTools.hoveredObject = object;
drawVisible(visibleObjects);
object.showObjectTip(ctx);
}
someHovered = true;
document.body.style.cursor = "pointer";
break;
}
}

if (!someHovered) {
document.body.style.cursor = "default";
dragTools.hoveredObject = null;
drawVisible(visibleObjects);
}

if (!dragTools.isDragging) {
return;
}

const dx = mouseX - dragTools.prevMouseX;
const dy = mouseY - dragTools.prevMouseY;

Expand Down
2 changes: 1 addition & 1 deletion js/lib/getName.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { mappings } from "../../data/particles.js";
import { mappings } from "../../mappings/particles.js";

export function getName(pdg) {
const particle = mappings[pdg];
Expand Down
15 changes: 15 additions & 0 deletions js/lib/graphic-primitives.js
Original file line number Diff line number Diff line change
Expand Up @@ -131,3 +131,18 @@ export function drawObjectHeader(ctx, object) {
}
ctx.restore();
}

export function drawObjectInfoTip(ctx, x, y, ...args) {
ctx.save();
ctx.font = "bold 12px sans-serif";
const lines = args.length;
const height = 20 * lines;
const maxWidth = Math.max(...args.map((arg) => ctx.measureText(arg).width));
ctx.fillStyle = "rgba(225, 225, 225, 1)";
ctx.fillRect(x, y, maxWidth + 10, height + 10);
ctx.fillStyle = "black";
for (const [i, arg] of args.entries()) {
ctx.fillText(arg, x + 5, y + 20 + i * 20);
}
ctx.restore();
}
12 changes: 1 addition & 11 deletions js/menu/filter/filter.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { reconnect } from "./reconnect.js";
import { getVisible } from "../../events.js";
import { units } from "../../types/units.js";
import { copyObject } from "../../lib/copy.js";
import { SimStatusBitFieldDisplayValues } from "../../../mappings/sim-status.js";

const filterButton = document.getElementById("filter-button");
const openFilter = document.getElementById("open-filter");
Expand Down Expand Up @@ -60,17 +61,6 @@ let parametersRange = units.sort((a, b) =>

parametersRange = parametersRange.map((parameter) => new Range(parameter));

const SimStatusBitFieldDisplayValues = {
23: "Overlay",
24: "Stopped",
25: "LeftDetector",
26: "DecayedInCalorimeter",
27: "DecayedInTracker",
28: "VertexIsNotEndpointOfParent",
29: "Backscatter",
30: "CreatedInSimulation",
};

const bits = new BitFieldBuilder(
"simulatorStatus",
"Simulation status",
Expand Down
13 changes: 10 additions & 3 deletions js/types/load.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,19 @@ function loadEmptyRelations(object, relations) {
}
}

export function loadPlainObject(collection, datatype, collectionId) {
export function loadPlainObject(
collection,
datatype,
collectionId,
collectionName
) {
const objects = [];

for (const [index, particle] of collection.entries()) {
const newObject = new objectTypes[datatype]();
newObject.index = index;
newObject.collectionId = collectionId;
newObject.collectionName = collectionName;

loadMembers(newObject, particle, datatypes[datatype].members);
loadEmptyRelations(newObject, datatypes[datatype]);
Expand Down Expand Up @@ -66,15 +72,16 @@ export function loadObjects(jsonData, event, objectsToLoad) {
});

for (const datatype of datatypesToLoad) {
Object.values(eventData).forEach((element) => {
Object.entries(eventData).forEach(([key, element]) => {
const collectionName = `${datatype}Collection`;
if (element.collType === collectionName) {
const collection = element.collection;
const collectionId = element.collID;
const objectCollection = loadPlainObject(
collection,
datatype,
collectionId
collectionId,
key
);
objects.datatypes[datatype].collection.push(...objectCollection);
}
Expand Down
32 changes: 31 additions & 1 deletion js/types/objects.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,12 @@ import {
drawRoundedRect,
drawTextLines,
drawObjectHeader,
drawObjectInfoTip,
} from "../lib/graphic-primitives.js";
import { getName } from "../lib/getName.js";
import { linkTypes } from "./links.js";
import { parseCharge } from "../lib/parseCharge.js";
import { getSimStatusDisplayValuesFromBit } from "../../mappings/sim-status.js";

const TOP_MARGIN = 40;

Expand Down Expand Up @@ -53,6 +55,13 @@ class EDMObject {
y < this.y + this.height
);
}

showObjectTip(ctx) {
const x = this.x;
const y = this.y - 10;
const collectionName = "Collection: " + this.collectionName;
drawObjectInfoTip(ctx, x, y, collectionName);
}
}

export class MCParticle extends EDMObject {
Expand Down Expand Up @@ -105,7 +114,17 @@ export class MCParticle extends EDMObject {
const topLines = [];
topLines.push("ID: " + this.index);
topLines.push("Gen. stat.: " + this.generatorStatus);
topLines.push("Sim. stat.: " + this.simulatorStatus);
const simulatorStatus = getSimStatusDisplayValuesFromBit(
this.simulatorStatus
);
const simulatorStatusFirstLetter = simulatorStatus
.map((s) => s[0])
.join("");
const simulatorStatusString =
simulatorStatusFirstLetter !== ""
? simulatorStatusFirstLetter
: this.simulatorStatus;
topLines.push("Sim. stat.: " + simulatorStatusString);

const bottomY = this.y + this.height * 0.6;
const bottomLines = [];
Expand All @@ -120,6 +139,17 @@ export class MCParticle extends EDMObject {
drawTextLines(ctx, bottomLines, boxCenterX, bottomY, 22);
}

showObjectTip(ctx) {
const x = this.x;
const y = this.y - 10;
const collectionName = "Collection: " + this.collectionName;
const simulatorStatus = getSimStatusDisplayValuesFromBit(
this.simulatorStatus
);

drawObjectInfoTip(ctx, x, y, collectionName, ...simulatorStatus);
}

static setup(mcCollection) {
for (const mcParticle of mcCollection) {
const parentLength = mcParticle.oneToManyRelations["parents"].length;
Expand Down
File renamed without changes.
34 changes: 34 additions & 0 deletions mappings/sim-status.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
export const SimStatusBitFieldDisplayValues = {
23: "Overlay",
24: "Stopped",
25: "LeftDetector",
26: "DecayedInCalorimeter",
27: "DecayedInTracker",
28: "VertexIsNotEndpointOfParent",
29: "Backscatter",
30: "CreatedInSimulation",
};

export function parseBits(bit) {
const bits = [];

for (let i = 0; i < 32; i++) {
if (bit & (1 << i)) {
bits.push(i);
}
}

return bits;
}

export function getSimStatusDisplayValues(bits) {
return bits.map((bit) =>
SimStatusBitFieldDisplayValues[bit] !== undefined
? SimStatusBitFieldDisplayValues[bit]
: `Bit ${bit}`
);
}

export function getSimStatusDisplayValuesFromBit(bit) {
return getSimStatusDisplayValues(parseBits(bit));
}
Loading