@abi-software/simulationvuer 3.0.10 → 3.0.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abi-software/simulationvuer",
-  "version": "3.0.10",
+  "version": "3.0.12",
   "private": false,
   "scripts": {
     "serve": "vite serve --host --force",

package/src/components/SimulationVuer.vue

@@ -274,7 +274,8 @@ export default {
 
       this.activeSubscriptions.push(payload);
 
-      // Build the list of model parameters to be tracked for this subscription.
+      // Ask OpenCOR to track the simulation data associated with the subscription's component and variable (and the
+      // VOI, if requested).
 
       const modelParameters = [];
 
@@ -292,6 +293,48 @@ export default {
      * @arg `subscriptionId `
      */
     removeDataSubscription(subscriptionId) {
+      // Ask OpenCOR to stop tracking the simulation data associated with the subscription's component and variable (and
+      // the VOI, if requested and unless it's requested by another subscription).
+
+      const subscription = this.activeSubscriptions.find((activeSubscription) => {
+        return activeSubscription.windowId === subscriptionId;
+      });
+
+      if (!subscription) {
+        console.warn(`removeDataSubscription: no active subscription found for id ${subscriptionId}.`);
+
+        return;
+      }
+
+      const isVoiTrackedByAnotherSubscription = this.activeSubscriptions.some((activeSubscription) => {
+        return activeSubscription.windowId !== subscriptionId && activeSubscription.withVOI;
+      });
+      const isModelParameterTrackedByAnotherSubscription = this.activeSubscriptions.some((activeSubscription) => {
+        return (
+          activeSubscription.windowId !== subscriptionId &&
+          activeSubscription.component === subscription.component &&
+          activeSubscription.variable === subscription.variable
+        );
+      });
+
+      if (!isVoiTrackedByAnotherSubscription || !isModelParameterTrackedByAnotherSubscription) {
+        const modelParameters = [];
+
+        if (subscription.withVOI && !isVoiTrackedByAnotherSubscription) {
+          modelParameters.push('VOI');
+        }
+
+        if (!isModelParameterTrackedByAnotherSubscription) {
+          modelParameters.push(`${subscription.component}/${subscription.variable}`);
+        }
+
+        if (modelParameters.length) {
+          this.$refs.opencorRef?.untrackSimulationData(modelParameters);
+        }
+      }
+
+      // Remove the subscription from our list of active subscriptions.
+
       this.activeSubscriptions = this.activeSubscriptions.filter((activeSubscription) => {
         return activeSubscription.windowId !== subscriptionId;
       });
@@ -778,7 +821,10 @@ export default {
   }
 }
 
-:deep(.p-floatlabel:has(input:focus)) label, :deep(.p-floatlabel:has(input:-webkit-autofill)) label, :deep(.p-floatlabel:has(textarea:focus)) label, :deep(.p-floatlabel:has(.p-inputwrapper-focus)) label {
+:deep(.p-floatlabel:has(input:focus)) label,
+:deep(.p-floatlabel:has(input:-webkit-autofill)) label,
+:deep(.p-floatlabel:has(textarea:focus)) label,
+:deep(.p-floatlabel:has(.p-inputwrapper-focus)) label {
   color: #8300BF;
 }
 
@@ -786,6 +832,10 @@ export default {
     border-color: #8300BF;
 }
 
+:deep(.p-progressbar-value) {
+  background-color: #8300BF !important;
+}
+
 :deep(.p-select:not(.p-disabled).p-focus) {
     border-color: #8300BF;
 }
@@ -993,8 +1043,10 @@ span.error {
 <style>
 /* Note: not sure why, but the following rules need to be global!? */
 
-.p-progressbar-value {
-  background-color: #8300BF !important;
+.p-contextmenu-item-label,
+.p-select-option-label {
+    font-family: Inter, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;
+    font-size: 0.875rem;
 }
 
 .p-select-option:not(.p-select-option-selected):not(.p-disabled).p-focus {
@@ -1010,9 +1062,4 @@ span.error {
     background: white !important;
     color: #8300BF !important;
 }
-
-.p-select-option-label {
-    font-family: Inter, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;
-    font-size: 0.875rem;
-}
 </style>