@3cr/viewer-browser 0.0.248 → 0.0.293
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.circleci/config.yml +53 -0
- package/README.md +79 -74
- package/components.d.ts +94 -36
- package/dist/Viewer3CR.js +663 -47
- package/dist/Viewer3CR.mjs +107687 -36565
- package/dist/Viewer3CR.umd.js +663 -47
- package/index.html +35 -33
- package/package.json +27 -8
- package/playground/img.png +0 -0
- package/playground/index.html +6 -2
- package/src/App.vue +41 -97
- package/src/__tests__/app.spec.ts +2 -1
- package/src/__tests__/main.spec.ts +14 -14
- package/src/assets/_palette.scss +112 -0
- package/src/assets/_settings.scss +64 -0
- package/src/assets/_typography.scss +187 -0
- package/src/assets/images/cloud-storage.svg +22 -0
- package/src/assets/images/courtney.png +0 -0
- package/src/assets/images/dark/magic-wand.svg +32 -0
- package/src/assets/images/dark-theme.svg +33 -0
- package/src/assets/images/dot.svg +5 -0
- package/src/assets/images/dr-miles.png +0 -0
- package/src/assets/images/illustration.svg +118 -0
- package/src/assets/images/intro.svg +30 -0
- package/src/assets/{magic_wand.svg → images/light/magic-wand.svg} +22 -14
- package/src/assets/images/light-theme.svg +33 -0
- package/src/assets/images/system-theme.svg +51 -0
- package/src/assets/images/totalSegmentator.png +0 -0
- package/src/assets/logos/3dicom/black/black.svg +30 -0
- package/src/assets/logos/3dicom/colour/colour.svg +18 -0
- package/src/assets/logos/3dicom/colour/colour_single.svg +18 -0
- package/src/assets/logos/3dicom/wordmark/patients/patients.svg +29 -0
- package/src/assets/logos/3dicom/wordmark/powered-by/powered-by.svg +41 -0
- package/src/assets/logos/3dicom/wordmark/practitioners/practitioner.svg +34 -0
- package/src/assets/logos/3dicom/wordmark/research/research.svg +29 -0
- package/src/assets/logos/license/black/black.svg +22 -0
- package/src/assets/logos/license/white/white.svg +22 -0
- package/src/assets/styles.scss +435 -12
- package/src/components/ShFlatIconBtn.vue +36 -0
- package/src/components/ShPlainIconBtn.vue +42 -0
- package/src/components/ShSelect.vue +48 -0
- package/src/components/ShTextField.vue +39 -0
- package/src/components/ShTextarea.vue +39 -0
- package/src/components/__tests__/ShFlatIconBtn.spec.ts +32 -0
- package/src/components/__tests__/ShPlainIconBtn.spec.ts +37 -0
- package/src/components/__tests__/ShSelect.spec.ts +30 -0
- package/src/components/__tests__/ShTextField.spec.ts +30 -0
- package/src/components/__tests__/ShTextarea.spec.ts +30 -0
- package/src/components/demo/CloudDropZone.vue +105 -0
- package/src/components/demo/DemoAvatarDropdownMenu.vue +343 -0
- package/src/components/demo/DemoInfoModal.vue +60 -0
- package/src/components/demo/DemoNotificationNavigationDrawer.vue +118 -0
- package/src/components/demo/DemoPurchaseCreditsModal.vue +141 -0
- package/src/components/demo/DemoUpgradeCloudStorageModal.vue +74 -0
- package/src/components/demo/DemoUpgradePlanModal.vue +17 -0
- package/src/components/demo/UploadDicomToCloudModal.vue +225 -0
- package/src/components/demo/__tests__/CloudDropZone.spec.ts +132 -0
- package/src/components/demo/__tests__/DemoAvatarDropdownMenu.spec.ts +16 -0
- package/src/components/demo/{licence/__tests__/DemoLicenceEnableCloudStorageModal.spec.ts → __tests__/DemoEnableCloudStorageModal.spec.ts} +11 -11
- package/src/components/demo/{licence/__tests__/DemoLicenceInfoModal.spec.ts → __tests__/DemoInfoModal.spec.ts} +11 -8
- package/src/components/demo/__tests__/DemoNotificationNavigationDrawer.spec.ts +56 -0
- package/src/components/demo/__tests__/UploadDicomToCloudModal.spec.ts +320 -0
- package/src/components/demo/__tests__/demo-payload.spec.ts +10 -0
- package/src/components/demo/demo-notifications.ts +45 -0
- package/src/components/demo/demo-payload.ts +9 -0
- package/src/components/demo/fileReader.ts +47 -0
- package/src/{composables/useViewerOptions.ts → components/demo/mockDemoViewerStlDecimator.ts} +8 -12
- package/src/components/intro/ViewerIntro.vue +56 -0
- package/src/components/intro/ViewerTour.vue +53 -0
- package/src/components/intro/tour/Tour.vue +205 -0
- package/src/components/intro/tour/step.ts +6 -0
- package/src/components/modal/ActionRail.vue +4 -0
- package/src/components/modal/Viewer3cr.vue +224 -0
- package/src/components/modal/Viewer3crWebGL.vue +65 -0
- package/src/components/modal/ViewerActionRail.vue +10 -27
- package/src/components/modal/ViewerMain.vue +84 -0
- package/src/components/modal/ViewerNavigationDrawer.vue +269 -68
- package/src/components/modal/ViewerScanView.vue +223 -67
- package/src/components/modal/__tests__/{MftpWebGL3DRModal.spec.ts → Viewer3cr.spec.ts} +154 -53
- package/src/components/modal/__tests__/{WebGL3DR.spec.ts → Viewer3crWebGL.spec.ts} +11 -11
- package/src/components/modal/__tests__/ViewerNavigationDrawer.spec.ts +271 -11
- package/src/components/modal/__tests__/ViewerScanView.spec.ts +15 -7
- package/src/components/modal/actions/Action.vue +3 -8
- package/src/components/modal/actions/Flip3dAction.vue +31 -16
- package/src/components/modal/actions/FlipHorizontalAction.vue +14 -5
- package/src/components/modal/actions/FlipVerticalAction.vue +14 -5
- package/src/components/modal/actions/FullscreenAction.vue +9 -5
- package/src/components/modal/actions/PanAction.vue +11 -51
- package/src/components/modal/actions/ResetViewAction.vue +10 -8
- package/src/components/modal/actions/Rotate2dAction.vue +25 -15
- package/src/components/modal/actions/Slice3dAction.vue +22 -10
- package/src/components/modal/actions/ZoomAction.vue +21 -13
- package/src/components/modal/actions/__tests__/Action.spec.ts +2 -2
- package/src/components/modal/actions/__tests__/Flip3dAction.spec.ts +58 -14
- package/src/components/modal/actions/__tests__/FlipHorizontalAction.spec.ts +15 -5
- package/src/components/modal/actions/__tests__/FlipVerticalAction.spec.ts +15 -5
- package/src/components/modal/actions/__tests__/FullscreenAction.spec.ts +7 -5
- package/src/components/modal/actions/__tests__/PanAction.spec.ts +13 -32
- package/src/components/modal/actions/__tests__/ResetViewAction.spec.ts +5 -3
- package/src/components/modal/actions/__tests__/Rotate2dAction.spec.ts +13 -6
- package/src/components/modal/actions/__tests__/Slice3dAction.spec.ts +1 -1
- package/src/components/modal/actions/__tests__/ZoomAction.spec.ts +25 -11
- package/src/components/modal/app-bars/ViewerActionBar.vue +224 -0
- package/src/components/modal/app-bars/ViewerAppBar.vue +126 -0
- package/src/components/modal/app-bars/__tests__/ViewerActionBar.spec.ts +176 -0
- package/src/components/modal/app-bars/__tests__/ViewerAppBar.spec.ts +99 -0
- package/src/components/modal/layouts/Layout1x3ClipPath.vue +35 -0
- package/src/components/modal/layouts/Layout2x2ClipPath.vue +35 -0
- package/src/components/modal/layouts/LayoutFullscreenClipPath.vue +29 -0
- package/src/components/modal/layouts/__tests__/Layout1x3ClipPath.spec.ts +15 -0
- package/src/components/modal/layouts/__tests__/Layout2x2ClipPath.spec.ts +15 -0
- package/src/components/modal/layouts/__tests__/LayoutFullscreenClipPath.spec.ts +15 -0
- package/src/components/modal/layouts/composables/__tests__/useLayout1x3.spec.ts +40 -0
- package/src/components/modal/layouts/composables/__tests__/useLayout2x2.spec.ts +40 -0
- package/src/components/modal/layouts/composables/__tests__/useLayoutFullscreen.spec.ts +40 -0
- package/src/components/modal/layouts/composables/useLayout1x3.ts +46 -0
- package/src/components/modal/layouts/composables/useLayout2x2.ts +46 -0
- package/src/components/modal/layouts/composables/useLayoutFullscreen.ts +24 -0
- package/src/components/modal/menus/AutoAnnotateMenu.vue +67 -0
- package/src/components/modal/menus/AvatarDropdownMenu.vue +66 -0
- package/src/components/modal/menus/HelpMenu.vue +47 -0
- package/src/components/modal/menus/SettingsMenu.vue +242 -92
- package/src/components/modal/menus/ShareMenu.vue +58 -0
- package/src/components/modal/menus/__tests__/AutoAnnotateMenu.spec.ts +80 -0
- package/src/components/modal/menus/__tests__/AvatarDropdownMenu.spec.ts +49 -0
- package/src/components/modal/menus/__tests__/HelpMenu.spec.ts +12 -0
- package/src/components/modal/menus/__tests__/SettingsMenu.spec.ts +163 -57
- package/src/components/modal/modal/AboutModal.vue +61 -0
- package/src/components/modal/modal/AiModelList.vue +70 -0
- package/src/components/modal/{AskAI.vue → modal/AskAiModal.vue} +26 -34
- package/src/components/modal/modal/AutoAnnotateModal.vue +136 -0
- package/src/components/modal/modal/CloseViewerModal.vue +108 -0
- package/src/components/modal/modal/DataOverlayGeneralModal.vue +122 -0
- package/src/components/modal/modal/DataOverlayMeasurementModal.vue +59 -0
- package/src/components/modal/modal/DataOverlayModal.vue +121 -0
- package/src/components/modal/modal/ShareModal.vue +201 -0
- package/src/components/modal/modal/UploadsDrawer.vue +165 -0
- package/src/components/modal/modal/WhatsNewModal.vue +45 -0
- package/src/components/modal/modal/__tests__/AboutModal.spec.ts +60 -0
- package/src/components/modal/modal/__tests__/AiModelList.spec.ts +50 -0
- package/src/components/modal/{__tests__ → modal/__tests__}/AskAI.spec.ts +8 -7
- package/src/components/modal/modal/__tests__/AutoAnnotateModal.spec.ts +29 -0
- package/src/components/modal/modal/__tests__/CloseViewerModal.spec.ts +60 -0
- package/src/components/modal/modal/__tests__/DataOverlayGeneralModal.spec.ts +55 -0
- package/src/components/modal/modal/__tests__/DataOverlayMeasurementModal.spec.ts +82 -0
- package/src/components/modal/modal/__tests__/DataOverlayModal.spec.ts +94 -0
- package/src/components/modal/modal/__tests__/ShareModal.spec.ts +260 -0
- package/src/components/modal/modal/__tests__/UploadsDrawer.spec.ts +174 -0
- package/src/components/modal/modal/__tests__/WhatsNewModal.spec.ts +29 -0
- package/src/components/modal/snackbars/AnnotationGeneratedSnackbar.vue +34 -0
- package/src/components/modal/snackbars/ImagesSharedSnackbar.vue +26 -0
- package/src/components/modal/snackbars/LinkCopiedSnackbar.vue +26 -0
- package/src/components/modal/snackbars/__tests__/AnnotationGeneratedSnackbar.spec.ts +43 -0
- package/src/components/modal/snackbars/__tests__/ImagesSharedSnackbar.spec.ts +22 -0
- package/src/components/modal/snackbars/__tests__/LinkCopiedSnackbar.spec.ts +21 -0
- package/src/components/navigation/annotation/AnnotationCreateModal.vue +104 -0
- package/src/components/navigation/annotation/AnnotationCreateSnackbar.vue +20 -0
- package/src/components/navigation/annotation/AnnotationDataTable.vue +157 -0
- package/src/components/navigation/annotation/AnnotationDeleteModal.vue +48 -0
- package/src/components/navigation/annotation/AnnotationDeleteSnackbar.vue +25 -0
- package/src/components/navigation/annotation/AnnotationForm.vue +253 -0
- package/src/components/navigation/annotation/AnnotationIcon.vue +45 -0
- package/src/components/navigation/annotation/AnnotationInfo.vue +141 -0
- package/src/components/navigation/annotation/AnnotationMenu.vue +99 -0
- package/src/components/navigation/annotation/AnnotationPanel.vue +30 -0
- package/src/components/navigation/annotation/AnnotationTools.vue +106 -0
- package/src/components/navigation/annotation/AnnotationUpdateModal.vue +92 -0
- package/src/components/navigation/annotation/AnnotationVisibilityBtn.vue +52 -0
- package/src/components/navigation/annotation/DrawerTitle.vue +25 -0
- package/src/components/navigation/annotation/__tests__/AnnotationCreateModal.spec.ts +175 -0
- package/src/components/navigation/annotation/__tests__/AnnotationCreateSnackbar.spec.ts +31 -0
- package/src/components/navigation/annotation/__tests__/AnnotationDataTable.spec.ts +79 -0
- package/src/components/navigation/annotation/__tests__/AnnotationDeleteSnackbar.spec.ts +66 -0
- package/src/components/navigation/annotation/__tests__/AnnotationForm.spec.ts +248 -0
- package/src/components/navigation/annotation/__tests__/AnnotationIcon.spec.ts +13 -0
- package/src/components/navigation/annotation/__tests__/AnnotationTools.spec.ts +107 -0
- package/src/components/navigation/display/DisplayPanel.vue +156 -0
- package/src/components/{views/__tests__/DisplaySettings.spec.ts → navigation/display/__tests__/DisplayPanel.spec.ts} +14 -3
- package/src/components/navigation/history/HistoryModal.vue +140 -0
- package/src/components/navigation/mcad/McadAddObjectBtn.vue +41 -0
- package/src/components/navigation/mcad/McadDataTable.vue +78 -0
- package/src/components/navigation/mcad/McadDataTableItems.vue +382 -0
- package/src/components/navigation/mcad/McadDeleteModal.vue +44 -0
- package/src/components/navigation/mcad/McadDropZone.vue +148 -0
- package/src/components/navigation/mcad/McadFloating.vue +193 -0
- package/src/components/navigation/mcad/McadIcon.vue +34 -0
- package/src/components/navigation/mcad/McadInvert.vue +91 -0
- package/src/components/navigation/mcad/McadLockBtn.vue +62 -0
- package/src/components/navigation/mcad/McadMenu.vue +249 -0
- package/src/components/navigation/mcad/McadOpacity.vue +79 -0
- package/src/components/navigation/mcad/McadPanel.vue +31 -0
- package/src/components/navigation/mcad/McadToggleSortBtn.vue +18 -0
- package/src/components/navigation/mcad/McadToggleVisibilityBtn.vue +46 -0
- package/src/components/navigation/mcad/McadUpdateModal.vue +108 -0
- package/src/components/navigation/mcad/McadVisibilityBtn.vue +46 -0
- package/src/components/navigation/mcad/__tests__/McadAddObjectBtn.spec.ts +73 -0
- package/src/components/navigation/mcad/__tests__/McadDataTable.spec.ts +27 -0
- package/src/components/navigation/mcad/__tests__/McadDataTableItems.spec.ts +621 -0
- package/src/components/navigation/mcad/__tests__/McadDeleteModal.spec.ts +67 -0
- package/src/components/navigation/mcad/__tests__/McadDropZone.spec.ts +109 -0
- package/src/components/navigation/mcad/__tests__/McadIcon.spec.ts +13 -0
- package/src/components/navigation/mcad/__tests__/McadInvert.spec.ts +45 -0
- package/src/components/navigation/mcad/__tests__/McadLockBtn.spec.ts +38 -0
- package/src/components/navigation/mcad/__tests__/McadMenu.spec.ts +258 -0
- package/src/components/navigation/mcad/__tests__/McadOpacity.spec.ts +68 -0
- package/src/components/navigation/mcad/__tests__/McadToggleSortBtn.spec.ts +36 -0
- package/src/components/navigation/mcad/__tests__/McadToggleVisibilityBtn.spec.ts +53 -0
- package/src/components/navigation/mcad/__tests__/McadUpdateModal.spec.ts +122 -0
- package/src/components/navigation/mcad/__tests__/McadVisibilityBtn.spec.ts +45 -0
- package/src/components/navigation/measurement/MeasurementAngleSnackbar.vue +18 -0
- package/src/components/navigation/measurement/MeasurementDataTable.vue +162 -0
- package/src/components/navigation/measurement/MeasurementDeleteModal.vue +49 -0
- package/src/components/navigation/measurement/MeasurementDeleteSnackbar.vue +40 -0
- package/src/components/navigation/measurement/MeasurementIcon.vue +41 -0
- package/src/components/navigation/measurement/MeasurementInfo.vue +25 -0
- package/src/components/navigation/measurement/MeasurementInfoAngle.vue +36 -0
- package/src/components/navigation/measurement/MeasurementInfoLength.vue +37 -0
- package/src/components/navigation/measurement/MeasurementInfoPolygon.vue +58 -0
- package/src/components/navigation/measurement/MeasurementLengthSnackbar.vue +18 -0
- package/src/components/navigation/measurement/MeasurementMenu.vue +97 -0
- package/src/components/navigation/measurement/MeasurementPanel.vue +30 -0
- package/src/components/navigation/measurement/MeasurementPolygonSnackbar.vue +18 -0
- package/src/components/navigation/measurement/MeasurementTools.vue +101 -0
- package/src/components/navigation/measurement/MeasurementVisibilityBtn.vue +53 -0
- package/src/components/navigation/measurement/__tests__/MeasurementAngleSnackbar.spec.ts +34 -0
- package/src/components/navigation/measurement/__tests__/MeasurementDataTable.spec.ts +79 -0
- package/src/components/navigation/measurement/__tests__/MeasurementDeleteSnackbar.spec.ts +51 -0
- package/src/components/navigation/measurement/__tests__/MeasurementInfo.spec.ts +77 -0
- package/src/components/navigation/measurement/__tests__/MeasurementLengthSnackbar.spec.ts +35 -0
- package/src/components/navigation/measurement/__tests__/MeasurementPolygonSnackbar.spec.ts +35 -0
- package/src/components/navigation/measurement/__tests__/MeasurementTools.spec.ts +87 -0
- package/src/components/shared/ColourPalette.vue +71 -0
- package/src/components/shared/DoubleSliderSelector.vue +66 -28
- package/src/components/shared/HorizontalSliderSelector.vue +80 -0
- package/src/components/shared/KeyboardShortcuts.vue +184 -0
- package/src/components/shared/LoadingSpinner.vue +508 -144
- package/src/components/shared/MultiLoginError.vue +98 -0
- package/src/components/shared/NotificationToaster.vue +112 -0
- package/src/components/shared/UpdateSnackbar.vue +22 -9
- package/src/components/shared/ValueSelector.vue +10 -10
- package/src/components/shared/VerticalSliderSelector.vue +45 -44
- package/src/components/shared/__tests__/ColourPalette.spec.ts +21 -0
- package/src/components/shared/__tests__/DoubleSliderSelector.spec.ts +58 -46
- package/src/components/shared/__tests__/HorizontalSliderSelector.spec.ts +35 -0
- package/src/components/shared/__tests__/KeyboardShortcuts.spec.ts +50 -0
- package/src/components/shared/__tests__/MultiLoginError.spec.ts +50 -0
- package/src/components/shared/__tests__/NotificationToaster.spec.ts +65 -0
- package/src/components/shared/__tests__/UpdateSnackbar.spec.ts +7 -7
- package/src/components/shared/__tests__/ValueSelector.spec.ts +6 -0
- package/src/composables/__tests__/useDebounce.spec.ts +17 -0
- package/src/composables/__tests__/useMovingAverage.spec.ts +40 -0
- package/src/composables/__tests__/useNavigationCube.spec.ts +79 -0
- package/src/{functions/__tests__/notification.spec.ts → composables/__tests__/useNotificationHandler.spec.ts} +74 -17
- package/src/composables/__tests__/useToolGroup.spec.ts +41 -0
- package/src/composables/__tests__/useViewName.spec.ts +29 -0
- package/src/composables/useBoundingBox.ts +32 -0
- package/src/composables/useEventListener.ts +7 -9
- package/src/composables/useMedia.ts +27 -0
- package/src/composables/useNavigationCube.ts +80 -0
- package/src/composables/useNotificationHandler.ts +82 -0
- package/src/composables/useResizeObserver.ts +31 -0
- package/src/composables/useToolGroup.ts +36 -0
- package/src/composables/useViewName.ts +34 -0
- package/src/composables/useViewer3cr.ts +3 -2
- package/src/config.ts +1 -1
- package/src/constants.ts +8 -0
- package/src/functions/HotkeyScope.ts +87 -0
- package/src/functions/__tests__/HotkeyScope.spec.ts +49 -0
- package/src/functions/__tests__/colours.spec.ts +42 -0
- package/src/functions/__tests__/fileReader.spec.ts +130 -0
- package/src/functions/__tests__/modelHelper.spec.ts +1 -0
- package/src/functions/__tests__/tsHelper.spec.ts +7 -0
- package/src/functions/chunker.ts +21 -0
- package/src/functions/colours.ts +45 -0
- package/src/functions/fileReader.ts +48 -0
- package/src/functions/guards/__tests__/isDataOverlayAngle.spec.ts +21 -0
- package/src/functions/guards/__tests__/isDataOverlayLength.spec.ts +21 -0
- package/src/functions/guards/__tests__/isDataOverlayPolygon.spec.ts +21 -0
- package/src/functions/guards/isDataOverlayAngle.ts +3 -4
- package/src/functions/guards/isDataOverlayLength.ts +3 -4
- package/src/functions/guards/isDataOverlayPolygon.ts +3 -4
- package/src/functions/openUrl.ts +3 -0
- package/src/functions/{__tests__ → parsers/__tests__}/parseAction.spec.ts +1 -1
- package/src/functions/{__tests__ → parsers/__tests__}/parseCallToAction.spec.ts +1 -1
- package/src/functions/{__tests__ → parsers/__tests__}/parseDataOverlay.spec.ts +1 -1
- package/src/functions/{__tests__ → parsers/__tests__}/parseDataOverlayData.spec.ts +1 -1
- package/src/functions/{__tests__ → parsers/__tests__}/parseDataOverlayEvent.spec.ts +3 -3
- package/src/functions/{__tests__ → parsers/__tests__}/parseMcadEvent.spec.ts +3 -3
- package/src/functions/{parseAction.ts → parsers/parseAction.ts} +1 -2
- package/src/functions/{parseCallToAction.ts → parsers/parseCallToAction.ts} +2 -2
- package/src/functions/{parseDataOverlay.ts → parsers/parseDataOverlay.ts} +3 -3
- package/src/functions/parsers/parseDataOverlayData.ts +9 -0
- package/src/functions/parsers/parseDataOverlayEvent.ts +19 -0
- package/src/functions/parsers/parseMcadEvent.ts +9 -0
- package/src/functions/platform.ts +7 -0
- package/src/functions/translateTooltipShortcut.ts +35 -0
- package/src/functions/tsHelper.ts +3 -0
- package/src/main.ts +70 -48
- package/src/models/__tests__/iso-languages.spec.ts +23 -0
- package/src/models/__tests__/scanState.spec.ts +14 -38
- package/src/models/iso-languages.ts +1609 -0
- package/src/models/progress.ts +23 -0
- package/src/models/scanState.ts +56 -100
- package/src/plugins/__tests__/pinia.spec.ts +7 -0
- package/src/plugins/__tests__/vue-i18n.spec.ts +7 -0
- package/src/plugins/__tests__/vuetify.spec.ts +3 -3
- package/src/plugins/locales/en.json +442 -0
- package/src/plugins/material-symbols/aliases.ts +43 -0
- package/src/plugins/material-symbols/material-symbols-filled.ts +11 -0
- package/src/plugins/material-symbols/material-symbols-outlined.ts +9 -0
- package/src/plugins/pinia.ts +3 -0
- package/src/plugins/vue-i18n.ts +9 -0
- package/src/plugins/vuetify.ts +157 -25
- package/src/services/__tests__/features.service.spec.ts +14 -0
- package/src/services/__tests__/gpt.service.spec.ts +64 -3
- package/src/services/__tests__/viewer-3cr.service.spec.ts +616 -192
- package/src/services/features.service.ts +32 -0
- package/src/services/gpt.service.ts +5 -2
- package/src/services/viewer-3cr.service.ts +374 -307
- package/src/stores/__tests__/data-overlay.store.spec.ts +92 -0
- package/src/stores/__tests__/demo.store.spec.ts +196 -0
- package/src/stores/__tests__/drawer.store.spec.ts +27 -0
- package/src/stores/__tests__/intro.store.spec.ts +102 -0
- package/src/stores/__tests__/language.store.spec.ts +83 -0
- package/src/stores/__tests__/mcad-floating.store.spec.ts +339 -0
- package/src/stores/__tests__/mcad.store.spec.ts +88 -0
- package/src/stores/__tests__/save.store.spec.ts +51 -0
- package/src/stores/__tests__/theme.store.spec.ts +18 -0
- package/src/stores/__tests__/tool.store.spec.ts +53 -0
- package/src/stores/__tests__/upload.store.spec.ts +19 -0
- package/src/stores/__tests__/viewer.store.spec.ts +18 -0
- package/src/stores/data-overlay.store.ts +93 -0
- package/src/stores/demo.store.ts +284 -0
- package/src/stores/drawer.store.ts +23 -0
- package/src/stores/intro.store.ts +35 -0
- package/src/stores/language.store.ts +59 -0
- package/src/stores/mcad-floating.store.ts +141 -0
- package/src/stores/mcad.store.ts +53 -0
- package/src/stores/save.store.ts +59 -0
- package/src/stores/theme.store.ts +45 -0
- package/src/stores/tool.store.ts +41 -0
- package/src/stores/upload.store.ts +19 -0
- package/src/stores/viewer.store.ts +30 -0
- package/src/tools/__tests__/annotation-create.tool.spec.ts +87 -0
- package/src/tools/__tests__/annotation-move.tool.spec.ts +107 -0
- package/src/tools/__tests__/data-overlay.tool.spec.ts +127 -0
- package/src/tools/__tests__/mcad-move.tool.spec.ts +106 -0
- package/src/tools/__tests__/mcad-rotate.tool.spec.ts +103 -0
- package/src/tools/__tests__/mcad-scale.tool.spec.ts +8 -0
- package/src/tools/__tests__/mcad-select.tool.spec.ts +63 -0
- package/src/tools/__tests__/measurement-angle.tool.spec.ts +26 -0
- package/src/tools/__tests__/measurement-length.tool.spec.ts +26 -0
- package/src/tools/__tests__/measurement-polygon.tool.spec.ts +26 -0
- package/src/tools/annotation-create.tool.ts +48 -0
- package/src/tools/annotation-move.tool.ts +48 -0
- package/src/tools/data-overlay.tool.ts +45 -48
- package/src/tools/mcad-move.tool.ts +47 -0
- package/src/tools/mcad-rotate.tool.ts +47 -0
- package/src/tools/mcad-scale-tool.ts +10 -0
- package/src/tools/mcad-select-tool.ts +32 -0
- package/src/tools/measurement-angle.tool.ts +20 -0
- package/src/tools/measurement-length.tool.ts +20 -0
- package/src/tools/measurement-polygon.tool.ts +20 -0
- package/src/types/feature.ts +6 -0
- package/src/types/viewer-tool.ts +5 -0
- package/test/MockImportOriginal.ts +7 -0
- package/test/assertions/beTypeOrNull.ts +24 -0
- package/test/fakers/action-data.faker.ts +1 -1
- package/test/fakers/action.faker.ts +1 -1
- package/test/fakers/call-to-action.faker.ts +1 -1
- package/test/fakers/data-overlay-angle.faker.ts +1 -1
- package/test/fakers/data-overlay-annotation.faker.ts +1 -1
- package/test/fakers/data-overlay-data.faker.ts +18 -15
- package/test/fakers/data-overlay-interaction.faker.ts +25 -17
- package/test/fakers/data-overlay-length.faker.ts +1 -1
- package/test/fakers/data-overlay-mcad.faker.ts +4 -3
- package/test/fakers/data-overlay-polygon.faker.ts +1 -1
- package/test/fakers/feature.faker.ts +13 -0
- package/test/fakers/file.faker.ts +11 -0
- package/test/fakers/gpt-question.faker.ts +1 -1
- package/test/fakers/gpt-response.faker.ts +1 -1
- package/test/fakers/mcad-object-interaction.faker.ts +4 -4
- package/test/fakers/orientation.faker.ts +1 -1
- package/test/fakers/segment-angle.faker.ts +1 -1
- package/test/fakers/upload.faker.ts +14 -0
- package/test/getAnimationFrame.ts +3 -0
- package/test/plugins/findByTestId.ts +13 -6
- package/test/plugins/pinia.ts +20 -0
- package/test/plugins/vitest.d.ts +8 -0
- package/test/plugins/vue-i18n.ts +22 -0
- package/test/plugins/vuetify.ts +10 -0
- package/test/setup.ts +37 -12
- package/tsconfig.json +1 -1
- package/vite.config.mts +48 -18
- package/vitest.config.mts +12 -3
- package/src/assets/images/MainBackdrop.svg +0 -48
- package/src/assets/images/dark/Singular-Health-Disc-Mono.svg +0 -9
- package/src/assets/images/dark/demo-icon-small.png +0 -0
- package/src/assets/images/dark/demo-logo-small.svg +0 -27
- package/src/assets/images/dark/demo-logo.svg +0 -1
- package/src/assets/images/light/Singular-Health-Disc-Mono.svg +0 -9
- package/src/assets/logos/3dicom/white-mini.svg +0 -20
- package/src/components/demo/DemoModal.vue +0 -44
- package/src/components/demo/DemoPatientModal.vue +0 -52
- package/src/components/demo/__tests__/DemoModal.spec.ts +0 -26
- package/src/components/demo/__tests__/DemoPatientModal.spec.ts +0 -38
- package/src/components/demo/__tests__/options.spec.ts +0 -25
- package/src/components/demo/licence/DemoLicenceEnableCloudStorageModal.vue +0 -64
- package/src/components/demo/licence/DemoLicenceInfoModal.vue +0 -49
- package/src/components/demo/licence/DemoLicenceSendToPartyModal.vue +0 -178
- package/src/components/demo/licence/DemoLicenceShareToMobileModal.vue +0 -102
- package/src/components/demo/licence/__tests__/DemoLicenceSendToPartyModal.spec.ts +0 -36
- package/src/components/demo/licence/__tests__/DemoLicenceShareToMobileModal.spec.ts +0 -52
- package/src/components/demo/options.ts +0 -170
- package/src/components/demo/patient/DemoPatientEnableCloudStorageModal.vue +0 -64
- package/src/components/demo/patient/DemoPatientInfoModal.vue +0 -49
- package/src/components/demo/patient/DemoPatientSendToPartyModal.vue +0 -177
- package/src/components/demo/patient/DemoPatientShareToMobileModal.vue +0 -102
- package/src/components/demo/patient/__tests__/DemoPatientEnableCloudStorageModal.spec.ts +0 -38
- package/src/components/demo/patient/__tests__/DemoPatientInfoModal.spec.ts +0 -38
- package/src/components/demo/patient/__tests__/DemoPatientSendToPartyModal.spec.ts +0 -36
- package/src/components/demo/patient/__tests__/DemoPatientShareToMobileModal.spec.ts +0 -52
- package/src/components/modal/CloseViewerModal.vue +0 -69
- package/src/components/modal/MftpWebGL3DRModal.vue +0 -336
- package/src/components/modal/ViewerNavigationDrawerContent.vue +0 -168
- package/src/components/modal/ViewerNavigationDrawerFooter.vue +0 -131
- package/src/components/modal/ViewerNavigationDrawerHeader.vue +0 -33
- package/src/components/modal/WebGL3DR.vue +0 -91
- package/src/components/modal/__tests__/CloseViewerModal.spec.ts +0 -70
- package/src/components/modal/__tests__/ViewerNavigationDrawerContent.spec.ts +0 -11
- package/src/components/modal/__tests__/ViewerNavigationDrawerFooter.spec.ts +0 -46
- package/src/components/modal/__tests__/ViewerNavigationDrawerHeader.spec.ts +0 -40
- package/src/components/modal/actions/NavigationCubeAction.vue +0 -26
- package/src/components/modal/actions/__tests__/NavigationCubeAction.spec.ts +0 -25
- package/src/components/modal/buttons/AutoAnnotateBtn.vue +0 -197
- package/src/components/modal/buttons/__tests__/AutoAnnotateBtn.spec.ts +0 -28
- package/src/components/modal/menus/FileMenu.vue +0 -73
- package/src/components/modal/menus/__tests__/FileMenu.spec.ts +0 -110
- package/src/components/navigation/mcad/McadGlobalActions.vue +0 -20
- package/src/components/navigation/mcad/McadGlobalOpacitySlider.vue +0 -103
- package/src/components/navigation/mcad/McadGlobalScanViewBtn.vue +0 -28
- package/src/components/navigation/mcad/McadGlobalVisibilityBtn.vue +0 -38
- package/src/components/views/AnnotationTreeView.vue +0 -236
- package/src/components/views/DisplaySettings.vue +0 -94
- package/src/components/views/MarkupTreeView.vue +0 -201
- package/src/components/views/McadObjectTreeView.vue +0 -129
- package/src/components/views/__tests__/AnnotationTreeView.spec.ts +0 -62
- package/src/components/views/__tests__/MarkupTreeView.spec.ts +0 -41
- package/src/components/views/__tests__/McadObjectTreeView.spec.ts +0 -47
- package/src/components/views/modals/DataOverlayGeneralModal.vue +0 -71
- package/src/components/views/modals/DataOverlayMarkupModal.vue +0 -60
- package/src/components/views/modals/DataOverlayModal.vue +0 -88
- package/src/components/views/shared/MaskIcon.vue +0 -44
- package/src/components/views/shared/ObjectColor.vue +0 -31
- package/src/components/views/shared/ObjectLabel.vue +0 -30
- package/src/components/views/shared/Opacity.vue +0 -65
- package/src/components/views/shared/VisibilityBtn.vue +0 -25
- package/src/components/views/shared/__tests__/MaskIcon.spec.ts +0 -10
- package/src/components/views/shared/__tests__/ObjectColor.spec.ts +0 -10
- package/src/components/views/shared/__tests__/ObjectLabel.spec.ts +0 -10
- package/src/components/views/shared/__tests__/Opacity.spec.ts +0 -24
- package/src/components/views/shared/__tests__/VisibilityBtn.spec.ts +0 -11
- package/src/components/views/types/annotation-tree-view-item-child-action.ts +0 -6
- package/src/components/views/types/annotation-tree-view-item-child.ts +0 -9
- package/src/components/views/types/annotation-tree-view-item.ts +0 -13
- package/src/components/views/types/markup-tree-view-item-child.ts +0 -6
- package/src/components/views/types/markup-tree-view-item.ts +0 -14
- package/src/components/views/types/mcad-object-tree-view-item.ts +0 -13
- package/src/composables/__tests__/useAnnotations.spec.ts +0 -35
- package/src/composables/__tests__/useIntroJs.spec.ts +0 -51
- package/src/composables/__tests__/useMarkups.spec.ts +0 -39
- package/src/composables/__tests__/useMcadObjects.spec.ts +0 -36
- package/src/composables/__tests__/useNavigationCubeObserver.spec.ts +0 -61
- package/src/composables/useAnnotations.ts +0 -37
- package/src/composables/useIntroJs.ts +0 -142
- package/src/composables/useMarkups.ts +0 -41
- package/src/composables/useMcadObjects.ts +0 -32
- package/src/composables/useNavigationCubeObserver.ts +0 -114
- package/src/composables/useVersion3cr.ts +0 -7
- package/src/functions/__tests__/layoutOverlayStyle.spec.ts +0 -325
- package/src/functions/asyncTools.ts +0 -3
- package/src/functions/layoutOverlayStyle.ts +0 -84
- package/src/functions/notification.ts +0 -82
- package/src/functions/parseDataOverlayData.ts +0 -10
- package/src/functions/parseDataOverlayEvent.ts +0 -17
- package/src/functions/parseMcadEvent.ts +0 -10
- package/src/functions/rgbaToCss.ts +0 -13
- package/src/models/__tests__/loadViewerOptions.spec.ts +0 -72
- package/src/models/__tests__/loadViewerPayload.spec.ts +0 -10
- package/src/models/callbacks.ts +0 -4
- package/src/models/loadViewerOptions.ts +0 -79
- package/src/models/loadViewerPayload.ts +0 -17
- package/src/plugins/__tests__/usePlugins.spec.ts +0 -12
- package/src/plugins/usePlugins.ts +0 -8
- package/src/types/action-data.ts +0 -4
- package/src/types/action.ts +0 -13
- package/src/types/call-to-action.ts +0 -9
- package/src/types/colour.ts +0 -6
- package/src/types/data-overlay-angle.ts +0 -16
- package/src/types/data-overlay-annotation.ts +0 -18
- package/src/types/data-overlay-data.ts +0 -15
- package/src/types/data-overlay-event.ts +0 -5
- package/src/types/data-overlay-info.ts +0 -18
- package/src/types/data-overlay-interaction.ts +0 -15
- package/src/types/data-overlay-length.ts +0 -16
- package/src/types/data-overlay-markup.ts +0 -7
- package/src/types/data-overlay-mcad.ts +0 -20
- package/src/types/data-overlay-polygon.ts +0 -18
- package/src/types/data-overlay.ts +0 -16
- package/src/types/demo-type.ts +0 -4
- package/src/types/gpt-question.ts +0 -4
- package/src/types/gpt-response-payload.ts +0 -6
- package/src/types/mcad-object-interaction.ts +0 -15
- package/src/types/segment-angle.ts +0 -5
- package/src/types/vector2.ts +0 -4
- package/src/types/vector3.ts +0 -5
- package/test/fakers/data-overlay-info.faker.ts +0 -29
- /package/src/assets/logos/3dicom/{white.svg → white/white.svg} +0 -0
- /package/src/assets/{images/light/Singular-Health-Trademark-mono.svg → logos/singular-health/black/black.svg} +0 -0
- /package/src/assets/{images/dark/Singular-Health-Trademark-mono.svg → logos/singular-health/white/white.svg} +0 -0
|
@@ -1,23 +1,26 @@
|
|
|
1
|
-
import { DataOverlayData, DataOverlayDataRaw } from '@/types/data-overlay-data';
|
|
2
|
-
import { DataOverlayAnnotation } from '@/types/data-overlay-annotation';
|
|
3
1
|
import { faker } from '@faker-js/faker';
|
|
4
2
|
import { DataOverlayAnnotationFaker } from '@test/fakers/data-overlay-annotation.faker';
|
|
5
|
-
import { DataOverlayAngle } from '@/types/data-overlay-angle';
|
|
6
3
|
import { DataOverlayAngleFaker } from '@test/fakers/data-overlay-angle.faker';
|
|
7
|
-
import { DataOverlayLength } from '@/types/data-overlay-length';
|
|
8
4
|
import { DataOverlayLengthFaker } from '@test/fakers/data-overlay-length.faker';
|
|
9
|
-
import { DataOverlayPolygon } from '@/types/data-overlay-polygon';
|
|
10
5
|
import { DataOverlayPolygonFaker } from '@test/fakers/data-overlay-polygon.faker';
|
|
11
|
-
import { DataOverlayType,
|
|
12
|
-
import { DataOverlayInteraction } from '@/types/data-overlay-interaction';
|
|
6
|
+
import { DataOverlayType, InteractionType } from '@3cr/types-ts';
|
|
13
7
|
import { DataOverlayInteractionFaker } from '@test/fakers/data-overlay-interaction.faker';
|
|
8
|
+
import {
|
|
9
|
+
DataOverlayData,
|
|
10
|
+
DataOverlayAnnotation,
|
|
11
|
+
DataOverlayInteraction,
|
|
12
|
+
DataOverlayDataRaw,
|
|
13
|
+
DataOverlayLength,
|
|
14
|
+
DataOverlayPolygon,
|
|
15
|
+
DataOverlayAngle
|
|
16
|
+
} from '@3cr/viewer-types-ts';
|
|
14
17
|
|
|
15
18
|
export class DataOverlayDataFaker {
|
|
16
19
|
static annotation(): DataOverlayData<DataOverlayAnnotation> {
|
|
17
20
|
return DataOverlayDataFaker.random(DataOverlayAnnotationFaker.random(), DataOverlayType.Annotation);
|
|
18
21
|
}
|
|
19
22
|
|
|
20
|
-
static annotationEvent(type:
|
|
23
|
+
static annotationEvent(type: InteractionType): DataOverlayData<DataOverlayInteraction<DataOverlayAnnotation>> {
|
|
21
24
|
return DataOverlayDataFaker.random(DataOverlayInteractionFaker.annotation(type), DataOverlayType.Annotation);
|
|
22
25
|
}
|
|
23
26
|
|
|
@@ -25,7 +28,7 @@ export class DataOverlayDataFaker {
|
|
|
25
28
|
return DataOverlayDataFaker.randomRaw(DataOverlayAnnotationFaker.randomRaw(), DataOverlayType.Annotation);
|
|
26
29
|
}
|
|
27
30
|
|
|
28
|
-
static annotationEventRaw(type:
|
|
31
|
+
static annotationEventRaw(type: InteractionType): DataOverlayDataRaw {
|
|
29
32
|
return DataOverlayDataFaker.randomRaw(DataOverlayInteractionFaker.annotationRaw(type), DataOverlayType.Annotation);
|
|
30
33
|
}
|
|
31
34
|
|
|
@@ -33,7 +36,7 @@ export class DataOverlayDataFaker {
|
|
|
33
36
|
return DataOverlayDataFaker.random(DataOverlayLengthFaker.random(), DataOverlayType.Length);
|
|
34
37
|
}
|
|
35
38
|
|
|
36
|
-
static lengthEvent(type:
|
|
39
|
+
static lengthEvent(type: InteractionType): DataOverlayData<DataOverlayInteraction<DataOverlayLength>> {
|
|
37
40
|
return DataOverlayDataFaker.random(DataOverlayInteractionFaker.length(type), DataOverlayType.Length);
|
|
38
41
|
}
|
|
39
42
|
|
|
@@ -41,7 +44,7 @@ export class DataOverlayDataFaker {
|
|
|
41
44
|
return DataOverlayDataFaker.randomRaw(DataOverlayLengthFaker.randomRaw(), DataOverlayType.Length);
|
|
42
45
|
}
|
|
43
46
|
|
|
44
|
-
static lengthEventRaw(type:
|
|
47
|
+
static lengthEventRaw(type: InteractionType): DataOverlayDataRaw {
|
|
45
48
|
return DataOverlayDataFaker.randomRaw(DataOverlayInteractionFaker.lengthRaw(type), DataOverlayType.Length);
|
|
46
49
|
}
|
|
47
50
|
|
|
@@ -49,7 +52,7 @@ export class DataOverlayDataFaker {
|
|
|
49
52
|
return DataOverlayDataFaker.random(DataOverlayPolygonFaker.random(), DataOverlayType.Polygon);
|
|
50
53
|
}
|
|
51
54
|
|
|
52
|
-
static polygonEvent(type:
|
|
55
|
+
static polygonEvent(type: InteractionType): DataOverlayData<DataOverlayInteraction<DataOverlayPolygon>> {
|
|
53
56
|
return DataOverlayDataFaker.random(DataOverlayInteractionFaker.polygon(type), DataOverlayType.Polygon);
|
|
54
57
|
}
|
|
55
58
|
|
|
@@ -57,7 +60,7 @@ export class DataOverlayDataFaker {
|
|
|
57
60
|
return DataOverlayDataFaker.randomRaw(DataOverlayPolygonFaker.randomRaw(), DataOverlayType.Polygon);
|
|
58
61
|
}
|
|
59
62
|
|
|
60
|
-
static polygonEventRaw(type:
|
|
63
|
+
static polygonEventRaw(type: InteractionType): DataOverlayDataRaw {
|
|
61
64
|
return DataOverlayDataFaker.randomRaw(DataOverlayInteractionFaker.polygonRaw(type), DataOverlayType.Polygon);
|
|
62
65
|
}
|
|
63
66
|
|
|
@@ -65,7 +68,7 @@ export class DataOverlayDataFaker {
|
|
|
65
68
|
return DataOverlayDataFaker.random(DataOverlayAngleFaker.random(), DataOverlayType.Angle);
|
|
66
69
|
}
|
|
67
70
|
|
|
68
|
-
static angleEvent(type:
|
|
71
|
+
static angleEvent(type: InteractionType): DataOverlayData<DataOverlayInteraction<DataOverlayAngle>> {
|
|
69
72
|
return DataOverlayDataFaker.random(DataOverlayInteractionFaker.angle(type), DataOverlayType.Angle);
|
|
70
73
|
}
|
|
71
74
|
|
|
@@ -73,7 +76,7 @@ export class DataOverlayDataFaker {
|
|
|
73
76
|
return DataOverlayDataFaker.randomRaw(DataOverlayAngleFaker.randomRaw(), DataOverlayType.Angle);
|
|
74
77
|
}
|
|
75
78
|
|
|
76
|
-
static angleEventRaw(type:
|
|
79
|
+
static angleEventRaw(type: InteractionType): DataOverlayDataRaw {
|
|
77
80
|
return DataOverlayDataFaker.randomRaw(DataOverlayInteractionFaker.angleRaw(type), DataOverlayType.Angle);
|
|
78
81
|
}
|
|
79
82
|
|
|
@@ -1,50 +1,58 @@
|
|
|
1
|
-
import { DataOverlayInteraction, DataOverlayInteractionRaw } from '@/types/data-overlay-interaction';
|
|
2
|
-
import { DataOverlayAnnotation, DataOverlayAnnotationRaw } from '@/types/data-overlay-annotation';
|
|
3
1
|
import { DataOverlayAnnotationFaker } from '@test/fakers/data-overlay-annotation.faker';
|
|
4
|
-
import { DataOverlayLength, DataOverlayLengthRaw } from '@/types/data-overlay-length';
|
|
5
2
|
import { DataOverlayLengthFaker } from '@test/fakers/data-overlay-length.faker';
|
|
6
|
-
import { DataOverlayPolygon, DataOverlayPolygonRaw } from '@/types/data-overlay-polygon';
|
|
7
3
|
import { DataOverlayPolygonFaker } from '@test/fakers/data-overlay-polygon.faker';
|
|
8
|
-
import { DataOverlayAngle, DataOverlayAngleRaw } from '@/types/data-overlay-angle';
|
|
9
4
|
import { DataOverlayAngleFaker } from '@test/fakers/data-overlay-angle.faker';
|
|
10
|
-
import { DataOverlay, DataOverlayRaw } from '@/types/data-overlay';
|
|
11
5
|
import { faker } from '@faker-js/faker';
|
|
12
|
-
import {
|
|
6
|
+
import { InteractionType } from '@3cr/types-ts';
|
|
7
|
+
import {
|
|
8
|
+
DataOverlay,
|
|
9
|
+
DataOverlayAngle,
|
|
10
|
+
DataOverlayAngleRaw,
|
|
11
|
+
DataOverlayAnnotation,
|
|
12
|
+
DataOverlayAnnotationRaw,
|
|
13
|
+
DataOverlayInteraction,
|
|
14
|
+
DataOverlayInteractionRaw,
|
|
15
|
+
DataOverlayLength,
|
|
16
|
+
DataOverlayLengthRaw,
|
|
17
|
+
DataOverlayPolygon,
|
|
18
|
+
DataOverlayPolygonRaw,
|
|
19
|
+
DataOverlayRaw
|
|
20
|
+
} from '@3cr/viewer-types-ts';
|
|
13
21
|
|
|
14
22
|
export class DataOverlayInteractionFaker {
|
|
15
|
-
static annotation(interaction:
|
|
23
|
+
static annotation(interaction: InteractionType): DataOverlayInteraction<DataOverlayAnnotation> {
|
|
16
24
|
return DataOverlayInteractionFaker.random(DataOverlayAnnotationFaker.random(), interaction);
|
|
17
25
|
}
|
|
18
26
|
|
|
19
|
-
static annotationRaw(interaction:
|
|
27
|
+
static annotationRaw(interaction: InteractionType): DataOverlayInteractionRaw<DataOverlayAnnotationRaw> {
|
|
20
28
|
return DataOverlayInteractionFaker.randomRaw(DataOverlayAnnotationFaker.randomRaw(), interaction);
|
|
21
29
|
}
|
|
22
30
|
|
|
23
|
-
static length(interaction:
|
|
31
|
+
static length(interaction: InteractionType): DataOverlayInteraction<DataOverlayLength> {
|
|
24
32
|
return DataOverlayInteractionFaker.random(DataOverlayLengthFaker.random(), interaction);
|
|
25
33
|
}
|
|
26
34
|
|
|
27
|
-
static lengthRaw(interaction:
|
|
35
|
+
static lengthRaw(interaction: InteractionType): DataOverlayInteractionRaw<DataOverlayLengthRaw> {
|
|
28
36
|
return DataOverlayInteractionFaker.randomRaw(DataOverlayLengthFaker.randomRaw(), interaction);
|
|
29
37
|
}
|
|
30
38
|
|
|
31
|
-
static polygon(interaction:
|
|
39
|
+
static polygon(interaction: InteractionType): DataOverlayInteraction<DataOverlayPolygon> {
|
|
32
40
|
return DataOverlayInteractionFaker.random(DataOverlayPolygonFaker.random(), interaction);
|
|
33
41
|
}
|
|
34
42
|
|
|
35
|
-
static polygonRaw(interaction:
|
|
43
|
+
static polygonRaw(interaction: InteractionType): DataOverlayInteractionRaw<DataOverlayPolygonRaw> {
|
|
36
44
|
return DataOverlayInteractionFaker.randomRaw(DataOverlayPolygonFaker.randomRaw(), interaction);
|
|
37
45
|
}
|
|
38
46
|
|
|
39
|
-
static angle(interaction:
|
|
47
|
+
static angle(interaction: InteractionType): DataOverlayInteraction<DataOverlayAngle> {
|
|
40
48
|
return DataOverlayInteractionFaker.random(DataOverlayAngleFaker.random(), interaction);
|
|
41
49
|
}
|
|
42
50
|
|
|
43
|
-
static angleRaw(interaction:
|
|
51
|
+
static angleRaw(interaction: InteractionType): DataOverlayInteractionRaw<DataOverlayAngleRaw> {
|
|
44
52
|
return DataOverlayInteractionFaker.randomRaw(DataOverlayAngleFaker.randomRaw(), interaction);
|
|
45
53
|
}
|
|
46
54
|
|
|
47
|
-
private static random<T extends DataOverlay>(data: T, type:
|
|
55
|
+
private static random<T extends DataOverlay>(data: T, type: InteractionType): DataOverlayInteraction<T> {
|
|
48
56
|
return {
|
|
49
57
|
Version: faker.system.semver(),
|
|
50
58
|
DataOverlay: data,
|
|
@@ -52,7 +60,7 @@ export class DataOverlayInteractionFaker {
|
|
|
52
60
|
};
|
|
53
61
|
}
|
|
54
62
|
|
|
55
|
-
private static randomRaw<T extends DataOverlayRaw>(data: T, type:
|
|
63
|
+
private static randomRaw<T extends DataOverlayRaw>(data: T, type: InteractionType): DataOverlayInteractionRaw<T> {
|
|
56
64
|
return {
|
|
57
65
|
Version: faker.system.semver(),
|
|
58
66
|
DataOverlay: data,
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import { DataOverlayLength, DataOverlayLengthRaw } from '@/types/data-overlay-length';
|
|
2
1
|
import { faker } from '@faker-js/faker';
|
|
3
2
|
import { CallToActionFaker } from '@test/fakers/call-to-action.faker';
|
|
4
3
|
import { Vector3Faker } from '@test/fakers/vector3.faker';
|
|
5
4
|
import { InvertTransformFaker } from '@test/fakers/invert-transform.faker';
|
|
5
|
+
import { DataOverlayLength, DataOverlayLengthRaw } from '@3cr/viewer-types-ts';
|
|
6
6
|
|
|
7
7
|
export class DataOverlayLengthFaker {
|
|
8
8
|
static random(): DataOverlayLength {
|
|
@@ -1,10 +1,10 @@
|
|
|
1
|
-
import { DataOverlayMcad, DataOverlayMcadRaw } from '@/types/data-overlay-mcad';
|
|
2
1
|
import { faker } from '@faker-js/faker';
|
|
3
2
|
import { CallToActionFaker } from '@test/fakers/call-to-action.faker';
|
|
4
3
|
import { Vector3Faker } from '@test/fakers/vector3.faker';
|
|
5
4
|
import { InvertTransformFaker } from '@test/fakers/invert-transform.faker';
|
|
6
5
|
import { ColourFaker } from '@test/fakers/colour.faker';
|
|
7
6
|
import { OrientationFaker } from '@test/fakers/orientation.faker';
|
|
7
|
+
import { DataOverlayMcad, DataOverlayMcadRaw } from '@3cr/viewer-types-ts';
|
|
8
8
|
|
|
9
9
|
export class DataOverlayMcadFaker {
|
|
10
10
|
static random(): DataOverlayMcad {
|
|
@@ -22,9 +22,10 @@ export class DataOverlayMcadFaker {
|
|
|
22
22
|
}
|
|
23
23
|
|
|
24
24
|
private static randomBase() {
|
|
25
|
+
const keyId = faker.string.uuid();
|
|
25
26
|
return {
|
|
26
27
|
Version: faker.system.semver(),
|
|
27
|
-
Id:
|
|
28
|
+
Id: keyId,
|
|
28
29
|
Title: faker.lorem.word(),
|
|
29
30
|
Description: faker.lorem.text(),
|
|
30
31
|
Position: Vector3Faker.random(),
|
|
@@ -33,7 +34,7 @@ export class DataOverlayMcadFaker {
|
|
|
33
34
|
Inverted: InvertTransformFaker.random(),
|
|
34
35
|
Colour: ColourFaker.random(),
|
|
35
36
|
Visibility: faker.datatype.boolean(),
|
|
36
|
-
Key:
|
|
37
|
+
Key: keyId,
|
|
37
38
|
Orientation: OrientationFaker.random()
|
|
38
39
|
};
|
|
39
40
|
}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import { DataOverlayPolygon, DataOverlayPolygonRaw } from '@/types/data-overlay-polygon';
|
|
2
1
|
import { faker } from '@faker-js/faker';
|
|
3
2
|
import { Vector3Faker } from '@test/fakers/vector3.faker';
|
|
4
3
|
import { InvertTransformFaker } from '@test/fakers/invert-transform.faker';
|
|
5
4
|
import { CallToActionFaker } from '@test/fakers/call-to-action.faker';
|
|
5
|
+
import { DataOverlayPolygon, DataOverlayPolygonRaw } from '@3cr/viewer-types-ts';
|
|
6
6
|
|
|
7
7
|
export class DataOverlayPolygonFaker {
|
|
8
8
|
static random(): DataOverlayPolygon {
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
import { Feature } from '@/types/feature';
|
|
2
|
+
import { faker } from '@faker-js/faker';
|
|
3
|
+
|
|
4
|
+
export class FeatureFaker {
|
|
5
|
+
static random(): Feature {
|
|
6
|
+
return {
|
|
7
|
+
title: faker.lorem.words(),
|
|
8
|
+
version: faker.system.semver(),
|
|
9
|
+
createdAt: faker.date.past(),
|
|
10
|
+
html: faker.lorem.paragraph()
|
|
11
|
+
};
|
|
12
|
+
}
|
|
13
|
+
}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
import { faker } from '@faker-js/faker';
|
|
2
|
+
|
|
3
|
+
export class FileFaker {
|
|
4
|
+
static random(): File {
|
|
5
|
+
return {
|
|
6
|
+
name: faker.system.fileName(),
|
|
7
|
+
lastModified: faker.date.past().getTime(),
|
|
8
|
+
size: faker.number.int({ min: 1024, max: 1024 * 8 })
|
|
9
|
+
} as File;
|
|
10
|
+
}
|
|
11
|
+
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { faker } from '@faker-js/faker';
|
|
2
2
|
import { GptQuestionFaker } from '@test/fakers/gpt-question.faker';
|
|
3
|
-
import { GptResponsePayload } from '
|
|
3
|
+
import { GptResponsePayload } from '@3cr/viewer-types-ts';
|
|
4
4
|
|
|
5
5
|
export class GptResponseFaker {
|
|
6
6
|
static random(): GptResponsePayload {
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import { faker } from '@faker-js/faker';
|
|
2
|
-
import { McadObjectInteraction, McadObjectInteractionRaw } from '@/types/mcad-object-interaction';
|
|
3
2
|
import { DataOverlayMcadFaker } from '@test/fakers/data-overlay-mcad.faker';
|
|
4
|
-
import {
|
|
3
|
+
import { InteractionType } from '@3cr/types-ts';
|
|
4
|
+
import { McadObjectInteraction, McadObjectInteractionRaw } from '@3cr/viewer-types-ts';
|
|
5
5
|
|
|
6
6
|
export class McadObjectInteractionFaker {
|
|
7
|
-
static random(interaction:
|
|
7
|
+
static random(interaction: InteractionType): McadObjectInteraction {
|
|
8
8
|
return {
|
|
9
9
|
Version: faker.system.semver(),
|
|
10
10
|
Mcad: DataOverlayMcadFaker.random(),
|
|
@@ -12,7 +12,7 @@ export class McadObjectInteractionFaker {
|
|
|
12
12
|
};
|
|
13
13
|
}
|
|
14
14
|
|
|
15
|
-
static randomRaw(interaction:
|
|
15
|
+
static randomRaw(interaction: InteractionType): McadObjectInteractionRaw {
|
|
16
16
|
return {
|
|
17
17
|
Version: faker.system.semver(),
|
|
18
18
|
Mcad: DataOverlayMcadFaker.randomRaw(),
|
|
@@ -7,7 +7,7 @@ export class OrientationFaker {
|
|
|
7
7
|
static random(): OrientationSetting {
|
|
8
8
|
return {
|
|
9
9
|
Version: faker.system.semver(),
|
|
10
|
-
|
|
10
|
+
Orientation: faker.helpers.enumValue(Orientation),
|
|
11
11
|
ReferencePoint: Vector3Faker.random(),
|
|
12
12
|
Position: Vector3Faker.random(),
|
|
13
13
|
Rotation: Vector3Faker.random(),
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
import { faker } from '@faker-js/faker';
|
|
2
|
+
import { Upload } from '@3cr/viewer-types-ts';
|
|
3
|
+
|
|
4
|
+
export class UploadFaker {
|
|
5
|
+
static random(): Upload {
|
|
6
|
+
return {
|
|
7
|
+
id: faker.string.uuid(),
|
|
8
|
+
title: faker.lorem.words(),
|
|
9
|
+
subtitle: faker.lorem.words(),
|
|
10
|
+
status: faker.helpers.arrayElement(['uploading', 'completed', 'failed', 'cancelled']),
|
|
11
|
+
progress: faker.number.float()
|
|
12
|
+
};
|
|
13
|
+
}
|
|
14
|
+
}
|
|
@@ -1,20 +1,26 @@
|
|
|
1
|
-
import { config, DOMWrapper
|
|
2
|
-
import {
|
|
1
|
+
import { config, DOMWrapper } from '@vue/test-utils';
|
|
2
|
+
import { ComponentPublicInstance } from 'vue';
|
|
3
|
+
import WrapperLike from '@vue/test-utils/dist/interfaces/wrapperLike';
|
|
3
4
|
|
|
4
5
|
declare module '@vue/test-utils' {
|
|
5
|
-
interface VueWrapper {
|
|
6
|
+
interface VueWrapper<VM, T extends ComponentPublicInstance> {
|
|
6
7
|
findByTestId(selector: string): DOMWrapper<HTMLElement>;
|
|
7
|
-
findComponentByTestId<
|
|
8
|
+
findComponentByTestId<U>(selector: string): VueWrapper<U>;
|
|
9
|
+
}
|
|
10
|
+
|
|
11
|
+
interface DOMWrapper<NodeType extends Node> {
|
|
12
|
+
findByTestId(selector: string): DOMWrapper<HTMLElement>;
|
|
13
|
+
findComponentByTestId<U>(selector: string): VueWrapper<U>;
|
|
8
14
|
}
|
|
9
15
|
}
|
|
10
16
|
|
|
11
|
-
const findByTestIdPlugin = (wrapper:
|
|
17
|
+
const findByTestIdPlugin = (wrapper: WrapperLike) => {
|
|
12
18
|
function findByTestId(selector: string): DOMWrapper<HTMLElement> {
|
|
13
19
|
const testId = `[data-testid="${selector}"]`;
|
|
14
20
|
return wrapper.find(testId);
|
|
15
21
|
}
|
|
16
22
|
|
|
17
|
-
function findComponentByTestId<T extends
|
|
23
|
+
function findComponentByTestId<T extends ComponentPublicInstance>(selector: string) {
|
|
18
24
|
const testId = `[data-testid="${selector}"]`;
|
|
19
25
|
return wrapper.findComponent<T>(testId);
|
|
20
26
|
}
|
|
@@ -23,3 +29,4 @@ const findByTestIdPlugin = (wrapper: VueWrapper<unknown>) => {
|
|
|
23
29
|
};
|
|
24
30
|
|
|
25
31
|
config.plugins.VueWrapper.install(findByTestIdPlugin);
|
|
32
|
+
config.plugins.DOMWrapper.install(findByTestIdPlugin);
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
import { config, mount } from '@vue/test-utils';
|
|
2
|
+
import { createTestingPinia } from '@pinia/testing';
|
|
3
|
+
import { createPinia, setActivePinia } from 'pinia';
|
|
4
|
+
import { defineComponent } from 'vue';
|
|
5
|
+
|
|
6
|
+
config.global.plugins.push(createTestingPinia());
|
|
7
|
+
|
|
8
|
+
const Empty = defineComponent({
|
|
9
|
+
template: `
|
|
10
|
+
<div >
|
|
11
|
+
</div>
|
|
12
|
+
`
|
|
13
|
+
});
|
|
14
|
+
export function mountAndFakePiniaWrapper() {
|
|
15
|
+
const wrapper = mount(Empty, {
|
|
16
|
+
plugins: [createTestingPinia({ createSpy: vi.fn })]
|
|
17
|
+
});
|
|
18
|
+
setActivePinia(createPinia());
|
|
19
|
+
return wrapper;
|
|
20
|
+
}
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
import { config } from '@vue/test-utils';
|
|
2
|
+
import { createI18n } from 'vue-i18n';
|
|
3
|
+
import { ref } from 'vue';
|
|
4
|
+
import { MockImportOriginal } from '@test/MockImportOriginal';
|
|
5
|
+
|
|
6
|
+
vi.mock('vue-i18n', async (importOriginal: MockImportOriginal<typeof import('vue-i18n')>) => {
|
|
7
|
+
const module = await importOriginal();
|
|
8
|
+
return {
|
|
9
|
+
...module,
|
|
10
|
+
useI18n: vi.fn().mockImplementation(() => {
|
|
11
|
+
return {
|
|
12
|
+
availableLocales: [],
|
|
13
|
+
locale: ref<string>(''),
|
|
14
|
+
setLocaleMessage: vi.fn(),
|
|
15
|
+
t: vi.fn((key: string) => key),
|
|
16
|
+
tm: vi.fn((key: string) => [key])
|
|
17
|
+
};
|
|
18
|
+
})
|
|
19
|
+
};
|
|
20
|
+
});
|
|
21
|
+
|
|
22
|
+
config.global.plugins.push(createI18n({ legacy: false }));
|
package/test/plugins/vuetify.ts
CHANGED
|
@@ -3,6 +3,16 @@ import { createVuetify } from 'vuetify';
|
|
|
3
3
|
import * as components from 'vuetify/components';
|
|
4
4
|
import * as directives from 'vuetify/directives';
|
|
5
5
|
import { VTreeview, VTreeviewItem } from 'vuetify/labs/components';
|
|
6
|
+
import { ref } from 'vue';
|
|
7
|
+
import { MockImportOriginal } from '@test/MockImportOriginal';
|
|
8
|
+
|
|
9
|
+
vi.mock('vuetify', async (importOriginal: MockImportOriginal<typeof import('vuetify')>) => ({
|
|
10
|
+
...(await importOriginal()),
|
|
11
|
+
useTheme: vi.fn(() => ({
|
|
12
|
+
global: { name: ref('light') },
|
|
13
|
+
current: ref({ dark: false })
|
|
14
|
+
}))
|
|
15
|
+
}));
|
|
6
16
|
|
|
7
17
|
config.global.plugins.push(
|
|
8
18
|
createVuetify({
|
package/test/setup.ts
CHANGED
|
@@ -1,12 +1,33 @@
|
|
|
1
1
|
import '@test/plugins/findByTestId';
|
|
2
|
+
import '@test/plugins/pinia';
|
|
3
|
+
import '@test/plugins/vue-i18n';
|
|
2
4
|
import '@test/plugins/vuetify';
|
|
5
|
+
import { CrowdinWrapper } from '@3cr/translations-ts/src/crowdin';
|
|
6
|
+
import { MockImportOriginal } from '@test/MockImportOriginal';
|
|
3
7
|
|
|
4
8
|
global.ResizeObserver = require('resize-observer-polyfill');
|
|
5
9
|
|
|
6
|
-
|
|
7
|
-
|
|
10
|
+
CrowdinWrapper.Instantiate().i18n = { t: vi.fn().mockImplementation((x: any) => x) } as any;
|
|
11
|
+
window.mobileCheck = () => false;
|
|
12
|
+
vi.stubGlobal(
|
|
13
|
+
'matchMedia',
|
|
14
|
+
vi.fn().mockImplementation(() => {
|
|
15
|
+
return {
|
|
16
|
+
matches: true,
|
|
17
|
+
addEventListener: vi.fn(),
|
|
18
|
+
removeEventListener: vi.fn()
|
|
19
|
+
};
|
|
20
|
+
})
|
|
21
|
+
);
|
|
22
|
+
|
|
23
|
+
vi.stubGlobal('localStorage', {
|
|
24
|
+
getItem: vi.fn(),
|
|
25
|
+
setItem: vi.fn()
|
|
26
|
+
});
|
|
27
|
+
|
|
28
|
+
vi.mock('@3cr/sdk-browser', async (importOriginal: MockImportOriginal<typeof import('@3cr/sdk-browser')>) => {
|
|
8
29
|
return {
|
|
9
|
-
...
|
|
30
|
+
...(await importOriginal()),
|
|
10
31
|
registerVersion: vi.fn(),
|
|
11
32
|
createInstance: vi.fn(),
|
|
12
33
|
executePayload: vi.fn(),
|
|
@@ -14,12 +35,16 @@ vi.mock('@3cr/sdk-browser', async (importOriginal) => {
|
|
|
14
35
|
};
|
|
15
36
|
});
|
|
16
37
|
|
|
17
|
-
vi.mock(
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
}
|
|
38
|
+
vi.mock(
|
|
39
|
+
'@kyvg/vue3-notification',
|
|
40
|
+
async (importOriginal: MockImportOriginal<typeof import('@kyvg/vue3-notification')>) => {
|
|
41
|
+
return {
|
|
42
|
+
...(await importOriginal()),
|
|
43
|
+
useNotification: vi.fn().mockReturnValue({
|
|
44
|
+
notify: vi.fn()
|
|
45
|
+
})
|
|
46
|
+
};
|
|
47
|
+
}
|
|
48
|
+
);
|
|
49
|
+
//Note: Silences Vue warnings about injection in Unit Tests
|
|
50
|
+
vi.spyOn(console, 'warn').mockImplementation(() => undefined);
|
package/tsconfig.json
CHANGED
package/vite.config.mts
CHANGED
|
@@ -1,30 +1,59 @@
|
|
|
1
|
-
import Components from 'unplugin-vue-components/vite';
|
|
2
1
|
import Vue from '@vitejs/plugin-vue';
|
|
3
|
-
import
|
|
4
|
-
import
|
|
2
|
+
import vuetify, { transformAssetUrls } from 'vite-plugin-vuetify';
|
|
3
|
+
import Unfonts from 'unplugin-fonts/vite';
|
|
5
4
|
import { defineConfig } from 'vite';
|
|
6
5
|
import { fileURLToPath, URL } from 'node:url';
|
|
7
6
|
import { injectedStyleId } from './src/config';
|
|
8
7
|
import cssInjectedByJsPlugin from 'vite-plugin-css-injected-by-js';
|
|
8
|
+
import Components from 'unplugin-vue-components/vite';
|
|
9
|
+
import NotificationsResolver from '@kyvg/vue3-notification/auto-import-resolver';
|
|
10
|
+
import dns from 'node:dns';
|
|
11
|
+
|
|
12
|
+
dns.setDefaultResultOrder('verbatim');
|
|
9
13
|
|
|
10
14
|
export default defineConfig({
|
|
15
|
+
css: {
|
|
16
|
+
preprocessorOptions: {
|
|
17
|
+
scss: {
|
|
18
|
+
api: 'modern-compiler',
|
|
19
|
+
silenceDeprecations: ['legacy-js-api']
|
|
20
|
+
},
|
|
21
|
+
sass: {
|
|
22
|
+
api: 'modern-compiler',
|
|
23
|
+
silenceDeprecations: ['legacy-js-api']
|
|
24
|
+
}
|
|
25
|
+
}
|
|
26
|
+
},
|
|
11
27
|
plugins: [
|
|
28
|
+
Components({
|
|
29
|
+
resolvers: [NotificationsResolver('Alert')]
|
|
30
|
+
}),
|
|
12
31
|
Vue({
|
|
13
|
-
template: { transformAssetUrls }
|
|
32
|
+
template: { transformAssetUrls }
|
|
33
|
+
}),
|
|
34
|
+
vuetify({
|
|
35
|
+
styles: {
|
|
36
|
+
configFile: 'src/assets/_settings.scss'
|
|
37
|
+
}
|
|
14
38
|
}),
|
|
15
|
-
Vuetify(),
|
|
16
39
|
Components(),
|
|
17
40
|
cssInjectedByJsPlugin({
|
|
18
41
|
styleId: injectedStyleId
|
|
19
42
|
}),
|
|
20
|
-
|
|
43
|
+
Unfonts({
|
|
21
44
|
google: {
|
|
22
|
-
families: [
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
45
|
+
families: [
|
|
46
|
+
{
|
|
47
|
+
name: 'Plus Jakarta Sans',
|
|
48
|
+
styles: 'ital,wght@0,200..800;1,200..800'
|
|
49
|
+
},
|
|
50
|
+
{
|
|
51
|
+
name: 'Material Symbols Outlined',
|
|
52
|
+
styles: 'opsz,wght,FILL,GRAD@20..48,100..700,0..1,-50..200'
|
|
53
|
+
}
|
|
54
|
+
]
|
|
55
|
+
}
|
|
56
|
+
})
|
|
28
57
|
],
|
|
29
58
|
define: { 'process.env': {} },
|
|
30
59
|
build: {
|
|
@@ -33,7 +62,7 @@ export default defineConfig({
|
|
|
33
62
|
entry: 'src/main.ts',
|
|
34
63
|
name: 'Viewer3CR',
|
|
35
64
|
fileName: 'Viewer3CR',
|
|
36
|
-
formats: ['cjs', 'es', 'umd']
|
|
65
|
+
formats: ['cjs', 'es', 'umd']
|
|
37
66
|
},
|
|
38
67
|
rollupOptions: {
|
|
39
68
|
output: {
|
|
@@ -45,17 +74,18 @@ if (globalThis.Viewer3CR) {
|
|
|
45
74
|
}
|
|
46
75
|
}
|
|
47
76
|
`
|
|
48
|
-
}
|
|
49
|
-
}
|
|
77
|
+
}
|
|
78
|
+
}
|
|
50
79
|
},
|
|
51
80
|
resolve: {
|
|
52
81
|
alias: [
|
|
53
82
|
{ find: '@test', replacement: fileURLToPath(new URL('./test', import.meta.url)) },
|
|
54
83
|
{ find: '@', replacement: fileURLToPath(new URL('./src', import.meta.url)) }
|
|
55
84
|
],
|
|
56
|
-
extensions: ['.js', '.json', '.jsx', '.mjs', '.ts', '.tsx', '.vue']
|
|
85
|
+
extensions: ['.js', '.json', '.jsx', '.mjs', '.ts', '.tsx', '.vue']
|
|
57
86
|
},
|
|
58
87
|
server: {
|
|
59
|
-
|
|
60
|
-
|
|
88
|
+
host: 'localhost',
|
|
89
|
+
port: 3000
|
|
90
|
+
}
|
|
61
91
|
});
|