@3cr/viewer-browser 0.0.248 → 0.0.292

package/src/models/progress.ts

@@ -0,0 +1,23 @@
+export class Progress {
+  private _startTime: number | null = null;
+  private _elapsedTime: number = 0;
+  private _remainingTime: number = 0;
+
+  get value(): number {
+    return this._remainingTime;
+  }
+
+  next(progress: number): void {
+    if (progress > 0 && this._startTime === null) {
+      this._startTime = Date.now();
+    }
+
+    if (progress > 0 && this._startTime !== null) {
+      this._elapsedTime = (Date.now() - this._startTime) / 1000; // in seconds
+      if (progress > 0) {
+        const speed = this._elapsedTime / progress;
+        this._remainingTime = speed * (1 - progress);
+      }
+    }
+  }
+}

package/src/models/scanState.ts

@@ -1,61 +1,46 @@
-import { computed, nextTick, ref, unref } from 'vue';
+import { computed, nextTick, ref } from 'vue';
 import {
   AnchorPoint,
-  DataOverlayData,
   ColourPresetData,
-  CurrentDataOverlayState,
-  CurrentMcadState,
   CurrentScanState,
-  InitialDataOverlayState,
-  InitialMcadState,
   InitialScanState,
   LayoutActions,
-  McadInteraction,
   PositionData,
   ScanView
 } from '@3cr/types-ts';
-import {
-  inflateInitialDataOverlayState,
-  inflateInitialMcadObjectState,
-  inflateInitialScanState,
-  inflateScanState
-} from '@/functions/modelHelper';
+import { inflateInitialScanState, inflateScanState } from '@/functions/modelHelper';
+import { clamp } from '@/functions/clamp';
+
+const _stlResolution = ref<number>(5);
 
-export const currentColourPreset = ref<ColourPresetData | undefined>(undefined);
+export const currentColourPreset = ref<ColourPresetData>();
 export const transactionStarted = ref<boolean>(false);
 export const scanStateIncoming = ref<string>('');
 export const initialScanState = ref<InitialScanState>(inflateInitialScanState());
 export const scanState = ref<CurrentScanState>(inflateScanState());
-export const stlResolution = ref<number>(5);
-export const dataOverlayState = ref<InitialDataOverlayState>(inflateInitialDataOverlayState());
-export const dataOverlayEvent = ref<DataOverlayData | null>(null);
-export const mcadObjectState = ref<InitialMcadState>(inflateInitialMcadObjectState());
-export const mcadObjectEvent = ref<McadInteraction | null>(null);
 export const previousLayout = ref<LayoutActions>(LayoutActions.lo02);
 
-export const huMinMax = ref({
-  min: -999999,
-  max: 999999
-});
-
-export const tMinMax = ref({
-  min: 0,
-  max: 999999
-});
-
-export const sMinMax = ref({
-  min: 0,
-  max: 999999
-});
+export const huMinMax = ref({ min: -999999, max: 999999 });
+export const tMinMax = ref({ min: 0, max: 999999 });
+export const sMinMax = ref({ min: 0, max: 999999 });
+export const cMinMax = ref({ min: 0, max: 999999 });
 
-export const cMinMax = ref({
-  min: 0,
-  max: 999999
+export const stlResolution = computed({
+  /* v8 ignore start -- @preserve */
+  get(): number {
+    return _stlResolution.value;
+  },
+  set(value: number): void {
+    // STL Resolution intentionally limited between 0 and 25%.
+    _stlResolution.value = clamp(value, 0, 25);
+  }
+  /* v8 ignore stop -- @preserve */
 });
 
 export const windowSlider = computed({
   get(): [number, number] {
-    return [unref(scanState).Display.WindowLower, unref(scanState).Display.WindowUpper];
+    const { WindowLower, WindowUpper } = scanState.value.Display;
+    return [WindowLower, WindowUpper];
   },
   set(value: [number, number]): void {
     scanState.value.Display.WindowLower = value[0];
@@ -65,7 +50,8 @@ export const windowSlider = computed({
 
 export const thresholdSlider = computed({
   get(): [number, number] {
-    return [Math.trunc(unref(scanState).Display.ThresholdLower), Math.trunc(unref(scanState).Display.ThresholdUpper)];
+    const { ThresholdLower, ThresholdUpper } = scanState.value.Display;
+    return [Math.trunc(ThresholdLower), Math.trunc(ThresholdUpper)];
   },
   set(value: [number, number]): void {
     scanState.value.Display.ThresholdLower = value[0];
@@ -75,7 +61,8 @@ export const thresholdSlider = computed({
 
 export const tSlider = computed({
   get(): [number, number] {
-    return [Math.trunc(unref(scanState).Slice.TransverseLower), Math.trunc(unref(scanState).Slice.TransverseUpper)];
+    const { TransverseLower, TransverseUpper } = scanState.value.Slice;
+    return [Math.trunc(TransverseLower), Math.trunc(TransverseUpper)];
   },
   set(value: [number, number]): void {
     scanState.value.Slice.TransverseLower = value[0];
@@ -85,7 +72,8 @@ export const tSlider = computed({
 
 export const sSlider = computed({
   get(): [number, number] {
-    return [Math.trunc(unref(scanState).Slice.SagittalLower), Math.trunc(unref(scanState).Slice.SagittalUpper)];
+    const { SagittalLower, SagittalUpper } = scanState.value.Slice;
+    return [Math.trunc(SagittalLower), Math.trunc(SagittalUpper)];
   },
   set(value: [number, number]): void {
     scanState.value.Slice.SagittalLower = value[0];
@@ -95,7 +83,8 @@ export const sSlider = computed({
 
 export const cSlider = computed({
   get(): [number, number] {
-    return [Math.trunc(unref(scanState).Slice.CoronalLower), Math.trunc(unref(scanState).Slice.CoronalUpper)];
+    const { CoronalLower, CoronalUpper } = scanState.value.Slice;
+    return [Math.trunc(CoronalLower), Math.trunc(CoronalUpper)];
   },
   set(value: [number, number]): void {
     scanState.value.Slice.CoronalLower = value[0];
@@ -105,37 +94,43 @@ export const cSlider = computed({
 
 export const isLayout2x2 = computed(() => {
   return (
-    unref(scanState).Layout.PositionData.length > 1 &&
-    unref(scanState).Layout.PositionData[0].Anchor === AnchorPoint.TOP_LEFT &&
-    unref(scanState).Layout.PositionData[1].Anchor === AnchorPoint.TOP_RIGHT &&
-    unref(scanState).Layout.PositionData[2].Anchor === AnchorPoint.BOTTOM_LEFT &&
-    unref(scanState).Layout.PositionData[3].Anchor === AnchorPoint.BOTTOM_RIGHT
+    scanState.value.Layout.PositionData.length > 1 &&
+    scanState.value.Layout.PositionData[0].Anchor === AnchorPoint.TOP_LEFT &&
+    scanState.value.Layout.PositionData[1].Anchor === AnchorPoint.TOP_RIGHT &&
+    scanState.value.Layout.PositionData[2].Anchor === AnchorPoint.BOTTOM_LEFT &&
+    scanState.value.Layout.PositionData[3].Anchor === AnchorPoint.BOTTOM_RIGHT
   );
 });
 
 export const isLayout1x3 = computed(() => {
   return (
-    unref(scanState).Layout.PositionData.length > 1 &&
-    unref(scanState).Layout.PositionData[0].Anchor === AnchorPoint.CENTER &&
-    unref(scanState).Layout.PositionData[1].Anchor === AnchorPoint.TOP_RIGHT &&
-    unref(scanState).Layout.PositionData[2].Anchor === AnchorPoint.RIGHT &&
-    unref(scanState).Layout.PositionData[3].Anchor === AnchorPoint.BOTTOM_RIGHT
+    scanState.value.Layout.PositionData.length > 1 &&
+    scanState.value.Layout.PositionData[0].Anchor === AnchorPoint.CENTER &&
+    scanState.value.Layout.PositionData[1].Anchor === AnchorPoint.TOP_RIGHT &&
+    scanState.value.Layout.PositionData[2].Anchor === AnchorPoint.RIGHT &&
+    scanState.value.Layout.PositionData[3].Anchor === AnchorPoint.BOTTOM_RIGHT
   );
 });
 
 export const isFullscreen = computed(() => {
-  return unref(scanState).Layout.PositionData.length === 1;
+  return scanState.value.Layout.PositionData.length === 1;
+});
+
+export const fullscreenView = computed(() => {
+  /* v8 ignore start -- @preserve */
+  return isFullscreen.value ? scanState.value.CurrentView : null;
+  /* v8 ignore stop -- @preserve */
 });
 
 export const currentGreyscalePreset = computed(() => {
-  for (const preset of unref(initialScanState).GreyscalePresets) {
+  for (const preset of initialScanState.value.GreyscalePresets) {
     if (
-      (unref(scanState).Display.WindowLower === preset.Lower ||
-        (preset.Lower < unref(initialScanState).HuLower &&
-          unref(scanState).Display.WindowLower === unref(initialScanState).HuLower)) &&
-      (unref(scanState).Display.WindowUpper === preset.Upper ||
-        (preset.Upper > unref(initialScanState).HuUpper &&
-          unref(scanState).Display.WindowUpper === unref(initialScanState).HuUpper))
+      (scanState.value.Display.WindowLower === preset.Lower ||
+        (preset.Lower < initialScanState.value.HuLower &&
+          scanState.value.Display.WindowLower === initialScanState.value.HuLower)) &&
+      (scanState.value.Display.WindowUpper === preset.Upper ||
+        (preset.Upper > initialScanState.value.HuUpper &&
+          scanState.value.Display.WindowUpper === initialScanState.value.HuUpper))
     ) {
       return preset;
     }
@@ -154,7 +149,7 @@ export async function setScanStateFromPayload(message: string): Promise<void> {
 export function setInitialScanStateFromPayload(message: string): void {
   transactionStarted.value = true;
   scanStateIncoming.value = JSON.stringify(JSON.parse(message), null, 2);
-  const obj = JSON.parse(unref(scanStateIncoming)) as InitialScanState;
+  const obj = JSON.parse(scanStateIncoming.value) as InitialScanState;
   setScanState(JSON.stringify(obj.DefaultDisplaySettings, null, 2));
   initialScanState.value = obj;
   huMinMax.value.max = obj.HuUpper;
@@ -169,47 +164,8 @@ export function setScanState(message: string): void {
   scanState.value = JSON.parse(message) as CurrentScanState;
 }
 
-export function setInitialDataOverlayState(message: string): void {
-  dataOverlayState.value = JSON.parse(message) as InitialDataOverlayState;
-}
-
-export function setDataOverlayState(message: string): void {
-  dataOverlayState.value = { Version: '1.1.0', DataOverlay: JSON.parse(message) as CurrentDataOverlayState };
-}
-
-export function setDataOverlayEvent(message: string): void {
-  dataOverlayEvent.value = JSON.parse(message) as DataOverlayData;
-}
-
-export function setInitialMcadState(message: string): void {
-  mcadObjectState.value = JSON.parse(message) as InitialMcadState;
-}
-
-export function setMcadState(message: string): void {
-  mcadObjectState.value = { Version: '1.1.0', Models: JSON.parse(message) as CurrentMcadState };
-}
-
-export function setMcadEvent(message: string): void {
-  mcadObjectEvent.value = JSON.parse(message) as McadInteraction;
-}
-
 export function getCurrentView(position: PositionData): ScanView {
-  return unref(scanState).Layout.PositionData.length !== 1 ? position.DefaultView : unref(scanState).CurrentView;
-}
-
-export function getViewName(view: ScanView): string {
-  switch (view) {
-    case ScanView.Coronal:
-      return 'Coronal';
-    case ScanView.Sagittal:
-      return 'Sagittal';
-    case ScanView.Transverse:
-      return 'Transverse';
-    case ScanView.Volume:
-      return '3D Volume';
-    default:
-      return '';
-  }
+  return scanState.value.Layout.PositionData.length !== 1 ? position.DefaultView : scanState.value.CurrentView;
 }
 
 export function isHorizontalFlip(view: ScanView): boolean {

package/src/plugins/__tests__/pinia.spec.ts

@@ -0,0 +1,7 @@
+import { pinia } from '@/plugins/pinia';
+
+describe('pinia', () => {
+  it('should be defined', () => {
+    expect(pinia).toBeTruthy();
+  });
+});

package/src/plugins/__tests__/vue-i18n.spec.ts

@@ -0,0 +1,7 @@
+import { i18n } from '@/plugins/vue-i18n';
+
+describe('vue-i18n', () => {
+  it('should be defined', () => {
+    expect(i18n).toBeTruthy();
+  });
+});

package/src/plugins/__tests__/vuetify.spec.ts

@@ -1,7 +1,7 @@
-import vuetify from '@/plugins/vuetify';
+import { vuetify } from '@/plugins/vuetify';
 
-describe('vuetify.ts', () => {
-  it('should vuetify base', () => {
+describe('vuetify', () => {
+  it('should be defined', () => {
     expect(vuetify).toBeTruthy();
   });
 });