@3cr/viewer-browser 0.0.86 → 0.0.92

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@3cr/viewer-browser",
-  "version": "0.0.86",
+  "version": "0.0.92",
   "main": "./dist/Viewer3CR.umd.js",
   "module": "dist/Viewer3CR.umd.js",
   "homepage": "https://docs.3cr.singular.health",

package/src/components/modal/MftpWebGL3DRModal.vue

@@ -172,7 +172,7 @@
           height="36"
           style="min-width: 36px !important"
           :color="isLayout2x2 ? 'secondary' : 'primary'"
-          @click="layouts('lo_02')"
+          @click="payloadHandler.layouts(LayoutActions.lo02)"
           ><v-icon>grid_view</v-icon></v-btn
         >
         <v-btn
@@ -180,7 +180,7 @@
           height="36"
           style="min-width: 36px !important"
           :color="isLayout1x3 ? 'secondary' : 'primary'"
-          @click="layouts('lo_03')"
+          @click="payloadHandler.layouts(LayoutActions.lo03)"
           ><v-icon style="rotate: -90deg">view_comfy</v-icon></v-btn
         >
         <v-btn class="" variant="flat" color="red" @click="alterValue(false)"
@@ -202,7 +202,6 @@
           <div
             class="d-flex align-center pb-1"
             :class="drawerCollapsed ? 'py-2' : 'pa-2'"
-            @click="snap"
           >
             <img
               v-if="!drawerCollapsed"
@@ -224,7 +223,6 @@
           <div
             class="text-center mx-auto pa-0 text-white sub-type"
             :style="drawerCollapsed ? 'font-size: 100%' : 'font-size: 140%'"
-            @click="snap"
           >
             Online Viewer
           </div>
@@ -343,7 +341,9 @@
                     closeOnContentClick: true,
                   }"
                   placeholder="Select a Density Preset"
-                  @change="setPreset(PresetsActions.pr01, $event)"
+                  @change="
+                    payloadHandler.setPreset(PresetsActions.pr01, $event)
+                  "
                 >
                   <template #item="{ props, item }">
                     <v-list-item
@@ -352,7 +352,9 @@
                       :title="item.raw.Name"
                       lines="three"
                       @mousedown.prevent
-                      @click="setPreset(PresetsActions.pr01, item.raw)"
+                      @click="
+                        payloadHandler.setPreset(PresetsActions.pr01, item.raw)
+                      "
                     >
                       <template v-slot:prepend>
                         <v-icon
@@ -390,7 +392,9 @@
                   }"
                   placeholder="Select a Colour Preset"
                   return-object
-                  @update:modelValue="setPreset(PresetsActions.pr02, $event)"
+                  @update:modelValue="
+                    payloadHandler.setPreset(PresetsActions.pr02, $event)
+                  "
                 ></v-select>
               </v-card-actions>
             </v-expansion-panel-text>
@@ -431,7 +435,7 @@
           id="webgl-container"
           @on_payload="handleOnPayload"
           @instance_loaded="load"
-          @hover="hoverOverCanvas"
+          @hover="payloadHandler.hoverOverCanvas($event)"
         >
           <div
             class="bordered-event-window"
@@ -471,7 +475,7 @@
                     <div v-if="scanState.Layout.PositionData.length === 1">
                       <v-btn
                         color="transparent"
-                        @click="layouts(previousLayout)"
+                        @click="payloadHandler.layouts(previousLayout)"
                         :icon="true"
                       >
                         <v-icon color="white">fullscreen_exit</v-icon>
@@ -673,6 +677,8 @@ import { generateDivStyleForLayout } from "@/helpers/layoutOverlayStyle";
 import {
   FileManagementActions,
   FrontEndInterfaces,
+  LayoutActions,
+  NotificationsActions,
   PositionData,
   PresetsActions,
   ScanMovementActions,
@@ -708,6 +714,7 @@ import {
   initialScanState,
   isLayout1x3,
   isLayout2x2,
+  previousLayout,
   scanState,
   setInitialScanStateFromPayload,
   setScanStateFromPayload,
@@ -721,16 +728,14 @@ import {
 } from "@/dataLayer/scanState";
 import { getIconForPreset } from "@/dataLayer/iconData";
 
-const emit = defineEmits<{
-  instanceLoaded: [void];
-  snap: [void];
-}>();
-
 export interface Props {
   payload?: LoadViewerPayload;
   options?: LoadViewerOptions;
 }
 
+const emit = defineEmits<{
+  instanceLoaded: [void];
+}>();
 const props = withDefaults(defineProps<Props>(), {
   payload: () => ({
     Url: "https://webgl-3dr.singular.health/test_scans/8bdddee1-e581-485d-827d-6aa12eef2fc8/Head+Axial+Axial.3vxl",
@@ -744,27 +749,12 @@ const props = withDefaults(defineProps<Props>(), {
 
 const web_gl = ref<typeof WebGL3DR | null>(null);
 const payloadHandler = new PayloadHandler(web_gl);
-
-function executeOption(key: keyof LoadViewerOptions) {
-  if (unref(isDemo)) {
-    executeDemoOption(key);
-  } else {
-    const functionToExecute = unref(props.options)[key];
-    if (functionToExecute !== undefined) {
-      functionToExecute();
-    }
-  }
-}
-
-const emptyPayload = { Version: "1.1.0" };
-
 const value = ref<boolean>(false);
 const drawer = ref<boolean>(true);
 const drawerCollapsed = ref<boolean>(true);
 const scanLoading = ref<boolean>(true);
 const instanceLoaded = ref<boolean>(true);
 const openPanels = ref<number>(0);
-const previousLayout = ref<string>("lo_02");
 const footerItems = ref([
   {
     text: "Reset Scan",
@@ -794,7 +784,6 @@ const footerItems = ref([
     click: async () => executeOption("OnScreenshot"),
   },
 ]);
-
 const miniMenu = ref([
   {
     icon: "display_settings",
@@ -803,11 +792,21 @@ const miniMenu = ref([
       "Tissue Density - Change the view of density within the scan, allowing you to see through a certain density of particles",
   },
 ]);
-
 const rotationDeg = ref<number>(0);
 const stateOverlay = ref<boolean>(false);
 const m_closeDialog = ref<boolean>(false);
 
+function executeOption(key: keyof LoadViewerOptions) {
+  if (unref(isDemo)) {
+    executeDemoOption(key);
+  } else {
+    const functionToExecute = unref(props.options)[key];
+    if (functionToExecute !== undefined) {
+      functionToExecute();
+    }
+  }
+}
+
 type WatchSlidersType = { [key in SlidersActions]: WatchSource<number> };
 const watchSliders: WatchSlidersType = {
   [SlidersActions.sl01]: () => scanState.value.Display.Brightness,
@@ -879,17 +878,9 @@ function getViewName(index: number) {
     })[index];
 }
 async function fullscreenLayout(view: ScanView) {
-  await layouts("lo_01");
+  await payloadHandler.layouts(LayoutActions.lo01);
   await payloadHandler.viewSelection(`vs_0${view + 1}` as ViewSelectionActions);
 }
-// async function scanMovementHandler(action: string, value: number) {
-//   if (unref(transactionStarted)) return;
-//   await scanMovement(action, value);
-// }
-// async function sliderHandler(action: string, value: number) {
-//   if (unref(transactionStarted)) return;
-//   await slider(action, value);
-// }
 
 function closeModal() {
   m_closeDialog.value = false;
@@ -912,31 +903,6 @@ async function load() {
   await sendPayload(web_gl, "file_management", "fm_01", props.payload);
 }
 
-async function layouts(action: string) {
-  if (action !== "lo_01") previousLayout.value = action;
-  await sendPayload(web_gl, FrontEndInterfaces.layout, action, emptyPayload);
-}
-async function snap() {
-  emit("snap");
-}
-
-async function setPreset(action: PresetsActions, preset: any) {
-  await sendPayload(web_gl, "presets", action, preset);
-  if (action === PresetsActions.pr02) {
-    currentColourPreset.value = preset;
-  }
-}
-
-async function hoverOverCanvas(isHovering: boolean) {
-  await sendPayload(web_gl, "interactivity", "in_01", {
-    Version: "0.0.1",
-    Value: isHovering,
-  });
-  await sendPayload(web_gl, "interactivity", "in_02", {
-    Version: "0.0.1",
-    Value: isHovering,
-  });
-}
 async function i_fileManagement(action: string, message: string) {
   if (action === FileManagementActions.fm02) {
     await setInitialScanStateFromPayload(action, message);
@@ -945,7 +911,7 @@ async function i_fileManagement(action: string, message: string) {
     transactionStarted.value = false;
     scanLoading.value = false;
     drawerCollapsed.value = false;
-    await hoverOverCanvas(false);
+    await payloadHandler.hoverOverCanvas(false);
   }
 }
 
@@ -961,7 +927,7 @@ function handleOnPayload(
     i_fileManagement(actionSet, message);
   }
   if (interfaceSet === FrontEndInterfaces.notifications) {
-    handleNotification(actionSet, message);
+    handleNotification(actionSet as NotificationsActions, message);
   }
 }
 
@@ -971,23 +937,16 @@ defineExpose({
   handleOnPayload,
   sendPayload,
   getIconForPreset,
-  cSlider,
-  sSlider,
-  tSlider,
   thresholdSlider,
   windowSlider,
   m_closeDialog,
   closeModal,
-  snap,
   scanState,
   initialScanState,
   footerItems,
-  // rotateByDeg,
   getCurrentActiveView,
   getViewName,
   fullscreenLayout,
-  layouts,
-  setPreset,
   value,
   transactionStarted,
 });