@3cr/viewer-browser 0.0.44 → 0.0.47

package/package.json

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

package/src/App.vue

@@ -6,7 +6,7 @@
 
 <script setup lang="ts">
 
-import MftpWebGL3DRModal from "@/components/MftpWebGL3DRModal.vue";
+import MftpWebGL3DRModal from "@/components/modal/MftpWebGL3DRModal.vue";
 import {ref, unref} from "vue";
 import {LoadViewerPayload} from "../index";
 

package/src/components/{MftpWebGL3DRModal.vue → modal/MftpWebGL3DRModal.vue}

@@ -157,7 +157,7 @@
           <div class="d-flex align-center pb-1" :class="drawerCollapsed ? 'py-2' : 'pa-2'" @click="snap">
             <img
               v-if="!drawerCollapsed"
-              src="@/assets/images/dark/3dicom-logo.svg"
+              src="../../assets/images/dark/3dicom-logo.svg"
               height="48"
               alt="logo"
               class="ma-auto"
@@ -165,7 +165,7 @@
             />
             <img
               v-if="drawerCollapsed"
-              src="@/assets/images/dark/3DICOM.png"
+              src="../../assets/images/dark/3DICOM.png"
               height="64"
               alt="logo"
               class="ma-auto"
@@ -296,7 +296,7 @@
               </v-card-actions>
               <v-card-actions class="py-3">
                 <v-select
-                  :value="currentColourPreset"
+                  :model-value="currentColourPreset"
                   label="Colour Preset"
                   variant="outlined"
                   density="compact"
@@ -510,12 +510,12 @@
 </template>
 <script setup lang="ts" >
 
-import ExpansionHeaderMiniMenu from '@/components/ExpansionHeaderMiniMenu.vue';
-import LoadingSpinner from '@/components/LoadingSpinner.vue';
+import ExpansionHeaderMiniMenu from '@/components/expansion-panels/ExpansionHeaderMiniMenu.vue';
+import LoadingSpinner from '@/components/loading/LoadingSpinner.vue';
 import WebGL3DR from '@/components/WebGL3DR.vue';
-import DoubleSliderSelector from '@/components/DoubleSliderSelector.vue';
-import SliderSelector from '@/components/SliderSelector.vue';
-import VerticalSliderSelector from '@/components/VerticalSliderSelector.vue';
+import DoubleSliderSelector from '@/components/sliders/DoubleSliderSelector.vue';
+import SliderSelector from '@/components/sliders/SliderSelector.vue';
+import VerticalSliderSelector from '@/components/sliders/VerticalSliderSelector.vue';
 
 import { generateDivStyleForLayout } from '@/helpers/layoutOverlayStyle';
 import {
@@ -529,7 +529,7 @@ import {
 import {
   inflateInitialScanState,
   inflateScanState,
-} from '../helpers/modelHelper';
+} from '../../helpers/modelHelper';
 import {
   AnchorPoint,
   ColourPresetData,
@@ -541,7 +541,7 @@ import {
 
 import { toNumber } from '@/helpers/utils';
 import {computed, ref, unref, watch, defineEmits, nextTick} from "vue";
-import {LoadViewerPayload} from "../../index";
+import {LoadViewerPayload} from "../../../index";
 
 const emit = defineEmits<{
   instanceLoaded: [void];
@@ -576,12 +576,7 @@ const scanLoading = ref<boolean>(true);
 const instanceLoaded = ref<boolean>(true);
 const scanState = ref<CurrentScanState>(inflateScanState());
 const initialScanState = ref<InitialScanState>(inflateInitialScanState());
-const currentColourPreset = ref<ColourPresetData | undefined>({
-  Name: 'None',
-  ColourGradient: [],
-  Version: '1.0.0',
-  AlphaGradient: []
-});
+const currentColourPreset = ref<ColourPresetData | undefined>(undefined);
 const openPanels = ref<number>(0);
 const previousLayout = ref<string>('lo_02');
 const footerItems = ref([
@@ -650,6 +645,7 @@ const transactionStarted = ref<boolean>(false)
 const stateOverlay = ref<boolean>(false)
 const m_closeDialog = ref<boolean>(false)
 
+watch(currentColourPreset, (val) => {console.log(val)})
 const windowSlider = computed({
   get() {
     return [unref(scanState).Display.WindowLower, unref(scanState).Display.WindowUpper];
@@ -943,7 +939,6 @@ function getCurrentGreyscalePreset() {
 }
 function setScanState(message: string) {
   scanState.value = JSON.parse(message) as CurrentScanState;
-  console.log(scanState.value);
 }
 
 function handleOnPayload(interfaceSet: string | FrontEndInterfaces, actionSet: string, message: string) {

package/src/components/{DoubleSliderSelector.vue → sliders/DoubleSliderSelector.vue}

@@ -80,6 +80,7 @@ watch(sliderValue, async (currentValue: Array<number>) => {
       v-model="sliderValue"
       :loading="loading"
       :thumb-label="showThumb"
+      thumb-color="blue"
       :min="min"
       hide-details
       :max="max"

package/src/helpers/layoutOverlayStyle.ts

@@ -83,6 +83,5 @@ export function generateDivStyleForLayout(layout: PositionData) {
     }
   }
 
-  console.log(props)
   return props;
 }

package/src/main.ts

@@ -10,7 +10,7 @@ import 'material-design-icons-iconfont/dist/material-design-icons.css' // Ensure
 
 // Components
 import App from './App.vue'
-import './types/window.shim';
+// import './types/window.shim';
 
 // Composables
 // import { createApp } from 'vue'

package/scripts/modules.d.ts

@@ -1,2 +0,0 @@
-declare module 'randomstring';
-declare module 'mime-types';

package/scripts/postPublish.js

@@ -1,93 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-// import { CloudFront, S3 } from 'aws-sdk';
-const randomstring_1 = require("randomstring");
-const path_1 = require("path");
-const mime_types_1 = require("mime-types");
-const fs_1 = require("fs");
-const aws_sdk_1 = __importDefault(require("aws-sdk"));
-const package_json_1 = require("../package.json");
-const { CloudFront, S3 } = aws_sdk_1.default;
-//Note: Config is injected in CI now. (leaving this for in case we need to do a local)
-// import dotenv from 'dotenv';
-// dotenv.config();
-const { DIST_NAME, AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY, BUCKET_NAME } = process.env;
-if (!AWS_ACCESS_KEY_ID || !AWS_SECRET_ACCESS_KEY)
-    throw Error('Please define environment variables for AWS');
-if (!DIST_NAME)
-    throw Error('Please define environment variables for DIST_NAME');
-const DistributionName = DIST_NAME;
-const BucketName = BUCKET_NAME;
-const s3 = new S3({
-    region: 'ap-southeast-2',
-});
-const cloudfront = new CloudFront();
-async function uploadDir(s3Path) {
-    for (const name of (0, fs_1.readdirSync)(s3Path)) {
-        const filePath = (0, path_1.join)(s3Path, name);
-        const stat = (0, fs_1.statSync)(filePath);
-        if (stat.isFile()) {
-            if (!filePath.endsWith('.map'))
-                await executeUpload(s3Path, filePath);
-        }
-        else if (stat.isDirectory()) {
-            await uploadDir(filePath);
-        }
-    }
-}
-async function executeUpload(s3Path, filePath) {
-    const parentDir = s3Path.includes('/')
-        ? s3Path.substring(0, s3Path.indexOf('/'))
-        : s3Path;
-    const bucketPath = filePath.substring(parentDir.length + 1);
-    const options = {
-        Bucket: BucketName,
-        Key: `${bucketPath}`,
-        Body: (0, fs_1.readFileSync)(filePath).toString().replace("{{version}}", package_json_1.version),
-    };
-    if (typeof (0, mime_types_1.lookup)(bucketPath) === 'string') {
-        options.ContentType = (0, mime_types_1.lookup)(bucketPath);
-    }
-    await s3.putObject(options).promise();
-}
-async function deployToAws() {
-    const listObjectsParams = {
-        Bucket: BucketName,
-        Prefix: ``
-    };
-    const listObjectsResponse = await s3
-        .listObjectsV2(listObjectsParams)
-        .promise();
-    if (listObjectsResponse.Contents && listObjectsResponse.Contents.length > 0) {
-        const deleteParams = {
-            Bucket: BucketName,
-            Delete: {
-                Objects: listObjectsResponse.Contents?.map((x) => ({
-                    Key: x.Key || '',
-                })).filter((x) => x.Key !== '') || [],
-            },
-        };
-        await s3.deleteObjects(deleteParams).promise();
-    }
-    await uploadDir('playground');
-    const reference = (0, randomstring_1.generate)(16);
-    const params = {
-        DistributionId: DistributionName,
-        InvalidationBatch: {
-            CallerReference: reference,
-            Paths: {
-                Quantity: 1,
-                Items: ['/*'],
-            },
-        },
-    };
-    console.log(`Creating Invalidation for (${DistributionName}): ${reference}`);
-    const invalidation = await cloudfront.createInvalidation(params).promise();
-    console.log(invalidation);
-}
-deployToAws()
-    .then((data) => console.log(data))
-    .catch((err) => console.error(err));

package/scripts/postPublish.ts

@@ -1,106 +0,0 @@
-// import { CloudFront, S3 } from 'aws-sdk';
-import { generate } from 'randomstring';
-import { join } from 'path';
-import { lookup } from 'mime-types';
-import { readdirSync, statSync, readFileSync } from 'fs';
-import pkg from 'aws-sdk';
-import {version} from '../package.json';
-const { CloudFront, S3 } = pkg;
-
-
-import { CreateInvalidationRequest } from 'aws-sdk/clients/cloudfront';
-import {DeleteObjectsRequest, ListObjectsV2Request, PutObjectRequest } from 'aws-sdk/clients/s3';
-
-//Note: Config is injected in CI now. (leaving this for in case we need to do a local)
-// import dotenv from 'dotenv';
-// dotenv.config();
-
-const { DIST_NAME, AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY, BUCKET_NAME } = process.env;
-
-if (!AWS_ACCESS_KEY_ID || !AWS_SECRET_ACCESS_KEY) throw Error('Please define environment variables for AWS');
-if (!DIST_NAME) throw Error('Please define environment variables for DIST_NAME');
-
-
-const DistributionName = DIST_NAME as string;
-const BucketName = BUCKET_NAME as string;
-const s3 = new S3({
-  region: 'ap-southeast-2',
-});
-const cloudfront = new CloudFront();
-
-async function uploadDir(s3Path: string) {
-  for (const name of readdirSync(s3Path)) {
-    const filePath = join(s3Path, name);
-    const stat = statSync(filePath);
-
-    if (stat.isFile()) {
-      if (!filePath.endsWith('.map')) await executeUpload(s3Path, filePath);
-    } else if (stat.isDirectory()) {
-      await uploadDir(filePath);
-    }
-  }
-}
-async function executeUpload(s3Path: string, filePath: string) {
-  const parentDir = s3Path.includes('/')
-    ? s3Path.substring(0, s3Path.indexOf('/'))
-    : s3Path;
-  const bucketPath = filePath.substring(parentDir.length + 1);
-  const options: PutObjectRequest = {
-    Bucket: BucketName,
-    Key: `${bucketPath}`,
-    Body: readFileSync(filePath).toString().replace("{{version}}", version),
-  };
-  if (typeof lookup(bucketPath) === 'string') {
-    options.ContentType = lookup(bucketPath) as string;
-  }
-
-  await s3.putObject(options).promise();
-}
-
-async function deployToAws() {
-  const listObjectsParams: ListObjectsV2Request = {
-    Bucket: BucketName,
-    Prefix: ``
-  };
-
-  const listObjectsResponse = await s3
-    .listObjectsV2(listObjectsParams)
-    .promise();
-
-  if (listObjectsResponse.Contents && listObjectsResponse.Contents.length > 0) {
-    const deleteParams: DeleteObjectsRequest = {
-      Bucket: BucketName,
-      Delete: {
-        Objects:
-          listObjectsResponse.Contents?.map((x) => ({
-            Key: x.Key || '',
-          })).filter((x) => x.Key !== '') || [],
-      },
-    };
-    await s3.deleteObjects(deleteParams).promise();
-  }
-
-  await uploadDir('playground');
-
-  const reference = generate(16);
-  const params: CreateInvalidationRequest = {
-    DistributionId: DistributionName,
-    InvalidationBatch: {
-      CallerReference: reference,
-      Paths: {
-        Quantity: 1,
-        Items: ['/*'],
-      },
-    },
-  };
-  console.log(`Creating Invalidation for (${DistributionName}): ${reference}`);
-
-  const invalidation = await cloudfront.createInvalidation(params).promise();
-  console.log(invalidation);
-}
-
-deployToAws()
-  .then((data) => console.log(data))
-  .catch((err) => console.error(err));
-
-

package/src/components/HelloWorld.vue

@@ -1,157 +0,0 @@
-<template>
-  <v-container class="fill-height">
-    <v-responsive
-      class="align-centerfill-height mx-auto"
-      max-width="900"
-    >
-      <v-img
-        class="mb-4"
-        height="150"
-        src="@/assets/logo.png"
-      />
-
-      <div class="text-center">
-        <div class="text-body-2 font-weight-light mb-n1">Welcome to</div>
-
-        <h1 class="text-h2 font-weight-bold">Vuetify</h1>
-      </div>
-
-      <div class="py-4" />
-
-      <v-row>
-        <v-col cols="12">
-          <v-card
-            class="py-4"
-            color="surface-variant"
-            image="https://cdn.vuetifyjs.com/docs/images/one/create/feature.png"
-            prepend-icon="mdi-rocket-launch-outline"
-            rounded="lg"
-            variant="outlined"
-          >
-            <template #image>
-              <v-img position="top right" />
-            </template>
-
-            <template #title>
-              <h2 class="text-h5 font-weight-bold">Get started</h2>
-            </template>
-
-            <template #subtitle>
-              <div class="text-subtitle-1">
-                Replace this page by removing <v-kbd>{{ `<HelloWorld />` }}</v-kbd> in <v-kbd>pages/index.vue</v-kbd>.
-              </div>
-            </template>
-
-            <v-overlay
-              opacity=".12"
-              scrim="primary"
-              contained
-              model-value
-              persistent
-            />
-          </v-card>
-        </v-col>
-
-        <v-col cols="6">
-          <v-card
-            append-icon="mdi-open-in-new"
-            class="py-4"
-            color="surface-variant"
-            href="https://vuetifyjs.com/"
-            prepend-icon="mdi-text-box-outline"
-            rel="noopener noreferrer"
-            rounded="lg"
-            subtitle="Learn about all things Vuetify in our documentation."
-            target="_blank"
-            title="Documentation"
-            variant="text"
-          >
-            <v-overlay
-              opacity=".06"
-              scrim="primary"
-              contained
-              model-value
-              persistent
-            />
-          </v-card>
-        </v-col>
-
-        <v-col cols="6">
-          <v-card
-            append-icon="mdi-open-in-new"
-            class="py-4"
-            color="surface-variant"
-            href="https://vuetifyjs.com/introduction/why-vuetify/#feature-guides"
-            prepend-icon="mdi-star-circle-outline"
-            rel="noopener noreferrer"
-            rounded="lg"
-            subtitle="Explore available framework Features."
-            target="_blank"
-            title="Features"
-            variant="text"
-          >
-            <v-overlay
-              opacity=".06"
-              scrim="primary"
-              contained
-              model-value
-              persistent
-            />
-          </v-card>
-        </v-col>
-
-        <v-col cols="6">
-          <v-card
-            append-icon="mdi-open-in-new"
-            class="py-4"
-            color="surface-variant"
-            href="https://vuetifyjs.com/components/all"
-            prepend-icon="mdi-widgets-outline"
-            rel="noopener noreferrer"
-            rounded="lg"
-            subtitle="Discover components in the API Explorer."
-            target="_blank"
-            title="Components"
-            variant="text"
-          >
-            <v-overlay
-              opacity=".06"
-              scrim="primary"
-              contained
-              model-value
-              persistent
-            />
-          </v-card>
-        </v-col>
-
-        <v-col cols="6">
-          <v-card
-            append-icon="mdi-open-in-new"
-            class="py-4"
-            color="surface-variant"
-            href="https://discord.vuetifyjs.com"
-            prepend-icon="mdi-account-group-outline"
-            rel="noopener noreferrer"
-            rounded="lg"
-            subtitle="Connect with Vuetify developers."
-            target="_blank"
-            title="Community"
-            variant="text"
-          >
-            <v-overlay
-              opacity=".06"
-              scrim="primary"
-              contained
-              model-value
-              persistent
-            />
-          </v-card>
-        </v-col>
-      </v-row>
-    </v-responsive>
-  </v-container>
-</template>
-
-<script setup lang="ts">
-  //
-</script>

package/src/components/README.md

@@ -1,35 +0,0 @@
-# Components
-
-Vue template files in this folder are automatically imported.
-
-## 🚀 Usage
-
-Importing is handled by [unplugin-vue-components](https://github.com/unplugin/unplugin-vue-components). This plugin automatically imports `.vue` files created in the `src/components` directory, and registers them as global components. This means that you can use any component in your application without having to manually import it.
-
-The following example assumes a component located at `src/components/MyComponent.vue`:
-
-```vue
-<template>
-  <div>
-    <MyComponent />
-  </div>
-</template>
-
-<script lang="ts" setup>
-  //
-</script>
-```
-
-When your template is rendered, the component's import will automatically be inlined, which renders to this:
-
-```vue
-<template>
-  <div>
-    <MyComponent />
-  </div>
-</template>
-
-<script lang="ts" setup>
-  import MyComponent from '@/components/MyComponent.vue'
-</script>
-```

package/src/plugins/README.md

@@ -1,3 +0,0 @@
-# Plugins
-
-Plugins are a way to extend the functionality of your Vue application. Use this folder for registering plugins that you want to use globally.

package/src/types/window.shim.ts

@@ -1,24 +0,0 @@
-export {};
-
-declare global {
-  interface Window {
-    createUnityInstance(element: HTMLElement, config: UnityConfig): Promise<UnityInstance>;
-    receiveMessageFromUnity(payload: string): void;
-  }
-}
-export interface UnityInstance {
-  SendMessage: (payload: string) => void;
-}
-export interface UnityConfig {
-  dataUrl: string;
-  frameworkUrl: string;
-  codeUrl: string;
-  streamingAssetsUrl: string;
-  companyName: string;
-  productName: string;
-  productVersion: string;
-  webglContextAttributes: WebglConfig;
-}
-export interface WebglConfig {
-  preserveDrawingBuffer: boolean;
-}