@opencor/opencor 0.20260416.2 → 0.20260417.0

package/dist/opencor.es.js

@@ -7908,7 +7908,7 @@ var Ji = null, Yi = null, Xi = null, Zi = null, Qi = null, $i = null, ea = (e) =
 		},
 		"./style.css": "./dist/opencor.css"
 	},
-	version: "0.20260416.2",
+	version: "0.20260417.0",
 	scripts: {
 		build: "vite build && bun scripts/generate.version.js",
 		"build:lib": "vite build --config vite.lib.config.ts && bunx --bun vue-tsc --project tsconfig.lib.types.json",
@@ -36581,7 +36581,7 @@ var sC = { class: "flex flex-row h-full" }, cC = {
 			}, null, 8, ["model"])
 		]));
 	}
-}), dC = (e) => (ae("data-v-a9c00de5"), e = e(), ie(), e), fC = { class: "h-full" }, pC = {
+}), dC = (e) => (ae("data-v-26c72025"), e = e(), ie(), e), fC = { class: "h-full" }, pC = {
 	key: 1,
 	class: "w-full h-full flex flex-col"
 }, mC = {
@@ -36647,7 +36647,7 @@ var sC = { class: "flex flex-row h-full" }, cC = {
 				}), me();
 				return;
 			}
-			Je(!0);
+			Ye(!0);
 		}, _ = () => {
 			let e = new Yi(), t = Sa(ve.path()).replace(/\.[^/.]+$/, ""), n = Oe.file();
 			if (!n) {
@@ -36845,22 +36845,45 @@ var sC = { class: "flex flex-row h-full" }, cC = {
 							break;
 						}
 					}
-					L.value.output.externalData?.push({
+					L.value.output.externalData || (L.value.output.externalData = []), L.value.output.externalData.push({
 						data: f,
 						dataSeries: d,
 						description: `External data ${s}`,
 						voiExpression: t?.trim() || "voi",
 						voiValues: new Float64Array(e.columns[0])
 					});
-					for (let e of L.value.output.plots) {
-						let t = Ue(e.xValue, p), n = Ue(e.yValue, p);
-						t === e.xValue && n === e.yValue || (e.additionalTraces ||= [], !e.additionalTraces.some((e) => e.xValue === t && e.yValue === n) && e.additionalTraces.push({
-							xValue: t,
-							yValue: n,
-							name: `${n} <i>vs.</i> ${t}`
-						}));
+					for (let e = 0; e < L.value.output.plots.length; ++e) {
+						let t = L.value.output.plots[e];
+						if (!t) continue;
+						t.additionalTraces ||= [];
+						let n = (e, t) => `${e}::${t}`, r = /* @__PURE__ */ new Set(), i = qe[e] ?? t.additionalTraces.length;
+						r.add(n(t.xValue, t.yValue));
+						for (let e = 0; e < i; ++e) {
+							let i = t.additionalTraces[e];
+							i && r.add(n(i.xValue, i.yValue));
+						}
+						let a = [{
+							xValue: t.xValue,
+							yValue: t.yValue
+						}];
+						for (let e = 0; e < i; ++e) {
+							let n = t.additionalTraces[e];
+							n && a.push({
+								xValue: n.xValue,
+								yValue: n.yValue
+							});
+						}
+						for (let e = 0; e < a.length; ++e) {
+							let i = a[e];
+							if (!i) continue;
+							let o = Ue(i.xValue, p), s = Ue(i.yValue, p);
+							r.has(n(o, s)) || t.additionalTraces.push({
+								xValue: o,
+								yValue: s
+							});
+						}
 					}
-					return Je(), Xe(), We.add(s), Promise.resolve(r());
+					return Ye(), Ze(), We.add(s), Promise.resolve(r());
 				} finally {
 					Ge.delete(s);
 				}
@@ -36902,10 +36925,15 @@ var sC = { class: "flex flex-row h-full" }, cC = {
 			}
 		});
 		let Ke = e.computed(() => a.simulationOnly && Ee.value || !a.simulationOnly);
-		F && (h(Ce, F), h(we, F, !0)), b(), e.watch(() => L.value, () => {
-			De.resetCompiledExpressions();
-		}, { deep: !0 });
-		let qe = (e, t) => {
+		F && (h(Ce, F), h(we, F, !0)), b();
+		let qe = [];
+		e.watch(() => L.value, () => {
+			De.resetCompiledExpressions(), qe = L.value.output.plots.map((e) => e.additionalTraces?.length ?? 0);
+		}, {
+			deep: !0,
+			immediate: !0
+		});
+		let Je = (e, t) => {
 			let n = e.length, r = new Float64Array(n), { x: i, y: a } = t, o = Math.min(i.length, a.length);
 			if (o < 2) return r.fill(NaN), r;
 			let s = !0;
@@ -36970,7 +36998,7 @@ var sC = { class: "flex flex-row h-full" }, cC = {
 				r[t] = l[i] + (n - c[i]) * o;
 			}
 			return r;
-		}, Je = (e = !1) => {
+		}, Ye = (e = !1) => {
 			if (Me.value.length || !ge.value && !e) return;
 			let t = {};
 			for (let e = 0; e < L.value.input.length; ++e) {
@@ -37022,7 +37050,7 @@ var sC = { class: "flex flex-row h-full" }, cC = {
 					for (let e of r.dataSeries) s.has(e.name) && (c[e.name] = e.values);
 					for (let n of r.data) {
 						let r = c[n.name];
-						r && (t[n.id] = qe(e, {
+						r && (t[n.id] = Je(e, {
 							x: o,
 							y: r
 						}));
@@ -37148,7 +37176,7 @@ var sC = { class: "flex flex-row h-full" }, cC = {
 				return;
 			}
 			p("simulationData");
-		}, Ye = (e, t) => {
+		}, Xe = (e, t) => {
 			Ae[e] = t;
 			let n = 0, r = 0, i = 0;
 			for (let e in Ae) {
@@ -37163,9 +37191,9 @@ var sC = { class: "flex flex-row h-full" }, cC = {
 				left: r,
 				right: i
 			};
-		}, Xe = () => {
-			Ae = {}, je.value = void 0;
 		}, Ze = () => {
+			Ae = {}, je.value = void 0;
+		}, Qe = () => {
 			let e = {};
 			for (let t = 0; t < L.value.input.length; ++t) {
 				let n = L.value.input[t];
@@ -37215,39 +37243,39 @@ var sC = { class: "flex flex-row h-full" }, cC = {
 				tooltip: n,
 				isLiveRun: !1
 			});
-		}, Qe = (e) => {
+		}, $e = (e) => {
 			R.value.splice(e, 1);
-		}, $e = () => {
+		}, et = () => {
 			R.value.splice(1);
-		}, et = (e) => {
+		}, tt = (e) => {
 			let t = R.value[e];
 			t && (t.isVisible = !t.isVisible);
-		}, tt = (e, t) => {
+		}, nt = (e, t) => {
 			let n = R.value[e];
 			n && (n.color = t);
-		}, nt = (t, n) => {
+		}, rt = (t, n) => {
 			B.value = t, e.nextTick(() => {
 				Le.value[t]?.toggle(n);
 			});
-		}, rt = (t) => {
+		}, it = (t) => {
 			let n = JSON.stringify(e.toRaw(t)), r = n !== Ve.value;
 			if (Ve.value = n, !r) {
 				_e.value = !1;
 				return;
 			}
-			$e();
+			et();
 			let i = xe.maximumStep();
 			be.setInitialTime(t.simulation.startingPoint), be.setOutputStartTime(t.simulation.startingPoint), be.setOutputEndTime(t.simulation.endingPoint), be.setNumberOfSteps(Math.max(1, Math.round((t.simulation.endingPoint - t.simulation.startingPoint) / t.simulation.pointInterval))), xe.setMaximumStep(t.solvers.cvodeMaximumStep), L.value = Oo(t.interactive.uiJson), ge.value = t.miscellaneous.liveUpdates, _e.value = !1, Me.value = Ao(t.interactive.uiJson, {
 				allModelParameters: Ce.value,
 				editableModelParameters: we.value
-			}), !(Me.value.length > 0) && (xe.maximumStep() !== i && (Se = ye.instantiate(), F = Se.task(0)), b(), Je(), !Ne.value.length && Xe());
+			}), !(Me.value.length > 0) && (xe.maximumStep() !== i && (Se = ye.instantiate(), F = Se.task(0)), b(), Ye(), !Ne.value.length && Ze());
 		};
 		e.onMounted(() => {
-			me(), Je();
+			me(), Ye();
 		});
-		let it = _f();
+		let at = _f();
 		return e.onMounted(() => {
-			e.watch(() => it.value, (e) => {
+			e.watch(() => at.value, (e) => {
 				e || B.value !== -1 && (Le.value[B.value]?.hide(), B.value = -1);
 			});
 		}), da() && hf((e) => {
@@ -37315,7 +37343,7 @@ var sC = { class: "flex flex-row h-full" }, cC = {
 							possibleValues: wo(e) ? e.possibleValues : void 0,
 							stepValue: Co(e) ? e.stepValue : void 0,
 							class: S(t === 0 ? "" : "mt-6"),
-							onChange: n[6] ||= (e) => Je()
+							onChange: n[6] ||= (e) => Ye()
 						}, null, 8, [
 							"modelValue",
 							"onUpdate:modelValue",
@@ -37336,7 +37364,7 @@ var sC = { class: "flex flex-row h-full" }, cC = {
 								outlined: "",
 								size: "small",
 								title: "Track current run",
-								onClick: Ze
+								onClick: Qe
 							}), f(i, {
 								class: "w-9!",
 								icon: "pi pi-trash",
@@ -37344,7 +37372,7 @@ var sC = { class: "flex flex-row h-full" }, cC = {
 								severity: "danger",
 								size: "small",
 								title: "Remove all tracked runs",
-								onClick: $e,
+								onClick: et,
 								disabled: M(R).length === 1
 							}, null, 8, ["disabled"])]),
 							l("div", wC, [(w(!0), c(t, null, E(M(R), (e, n) => (w(), c("div", {
@@ -37374,7 +37402,7 @@ var sC = { class: "flex flex-row h-full" }, cC = {
 										size: "small",
 										style: te(`color: ${e.color};`),
 										title: `Change ${e.isLiveRun ? "live run" : "run"} colour`,
-										onClick: (e) => nt(n, e)
+										onClick: (e) => rt(n, e)
 									}, null, 8, [
 										"style",
 										"title",
@@ -37390,7 +37418,7 @@ var sC = { class: "flex flex-row h-full" }, cC = {
 											key: r,
 											style: te(`background-color: ${r};`),
 											title: t,
-											onClick: (e) => tt(n, r)
+											onClick: (e) => nt(n, r)
 										}, null, 14, OC))), 128))])]),
 										_: 2
 									}, 1536)) : s("", !0),
@@ -37401,7 +37429,7 @@ var sC = { class: "flex flex-row h-full" }, cC = {
 										severity: e.isVisible ? "info" : "secondary",
 										size: "small",
 										title: `${e.isVisible ? "Hide" : "Show"} ${e.isLiveRun ? "live run" : "run"}`,
-										onClick: (e) => et(n)
+										onClick: (e) => tt(n)
 									}, null, 8, [
 										"icon",
 										"severity",
@@ -37416,7 +37444,7 @@ var sC = { class: "flex flex-row h-full" }, cC = {
 										severity: "danger",
 										size: "small",
 										title: "Remove run",
-										onClick: (e) => Qe(n)
+										onClick: (e) => $e(n)
 									}, null, 8, ["onClick"]))
 								])
 							])], 2))), 128))]),
@@ -37432,8 +37460,8 @@ var sC = { class: "flex flex-row h-full" }, cC = {
 					class: "w-full min-h-0",
 					margins: M(je),
 					data: M(ze)[t] || { traces: [] },
-					onMarginsUpdated: (e) => Ye(`plot_${t}`, e),
-					onResetMargins: n[7] ||= () => Xe()
+					onMarginsUpdated: (e) => Xe(`plot_${t}`, e),
+					onResetMargins: n[7] ||= () => Ze()
 				}, null, 8, [
 					"margins",
 					"data",
@@ -37525,7 +37553,7 @@ var sC = { class: "flex flex-row h-full" }, cC = {
 					voiUnit: M(F) ? M(F).voiUnit() : "",
 					allModelParameters: M(Ce),
 					editableModelParameters: M(we),
-					onOk: rt,
+					onOk: it,
 					onClose: n[9] ||= (e) => _e.value = !1
 				}, null, 8, [
 					"visible",
@@ -37539,7 +37567,7 @@ var sC = { class: "flex flex-row h-full" }, cC = {
 			]))]);
 		};
 	}
-}), [["__scopeId", "data-v-a9c00de5"]]), PC = {
+}), [["__scopeId", "data-v-26c72025"]]), PC = {
 	key: 0,
 	class: "h-full"
 }, FC = ["value"], IC = {

package/package.json

@@ -42,7 +42,7 @@
     },
     "./style.css": "./dist/opencor.css"
   },
-  "version": "0.20260416.2",
+  "version": "0.20260417.0",
   "scripts": {
     "build": "vite build && bun scripts/generate.version.js",
     "build:lib": "vite build --config vite.lib.config.ts && bunx --bun vue-tsc --project tsconfig.lib.types.json",