Add safari-based logic for detection calls

Signed-off-by: Justin Georgi <justin.georgi@gmail.com>

cordova/config.xml

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget id="edu.midwestern.alvinn" version="0.5.0-alpha" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0" xmlns:android="http://schemas.android.com/apk/res/android">
+<widget id="edu.midwestern.alvinn" version="0.5.0-rc" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0" xmlns:android="http://schemas.android.com/apk/res/android">
     <name>ALVINN</name>
     <description>Anatomy Lab Visual Identification Neural Network.</description>
     <author email="jgeorg@midwestern.edu" href="https://midwestern.edu">

cordova/package.json

@@ -1,7 +1,7 @@
 {
   "name": "edu.midwestern.alvinn",
   "displayName": "ALVINN",
-  "version": "0.5.0-alpha",
+  "version": "0.5.0-rc",
   "description": "Anatomy Lab Visual Identification Neural Network.",
   "main": "index.js",
   "scripts": {

package.json

@@ -1,7 +1,7 @@
 {
   "name": "alvinn",
   "private": true,
-  "version": "0.5.0-alpha",
+  "version": "0.5.0-rc",
   "description": "ALVINN",
   "repository": "",
   "license": "UNLICENSED",
@@ -14,8 +14,7 @@
     "cordova-ios": "cross-env TARGET=cordova cross-env NODE_ENV=production vite build && node ./build/build-cordova.js && cd cordova && cordova run ios",
     "build-cordova-android": "cross-env TARGET=cordova cross-env NODE_ENV=production vite build && node ./build/build-cordova.js && cd cordova && cordova build android",
     "cordova-android": "cross-env TARGET=cordova cross-env NODE_ENV=production vite build && node ./build/build-cordova.js && cd cordova && cordova run android",
-    "postinstall": "cpy --flat ./node_modules/framework7-icons/fonts/*.* ./src/fonts/",
-    "preview": "vite preview"
+    "postinstall": "cpy --flat ./node_modules/framework7-icons/fonts/*.* ./src/fonts/"
   },
   "browserslist": [
     "IOS >= 15",

src/assets/detect-worker.js

@@ -5,7 +5,7 @@ let model = null
 onmessage = function (e) {
   switch (e.data.call) {
     case 'loadModel':
-      loadModel(e.data.weights,e.data.preload).then(() => {
+      loadModel('.' + e.data.weights,e.data.preload).then(() => {
         postMessage({success: 'model'})
       }).catch((err) => {
         postMessage({error: true, message: err.message})

src/js/store.js

@@ -4,7 +4,7 @@ const state = reactive({
     disclaimerAgreement: false,
     enabledRegions: ['thorax','abdomen','limbs','head'],
     regionIconSet: Math.floor(Math.random() * 3) + 1,
-    version: '0.5.0-alpha',
+    version: '0.5.0-rc',
     fullscreen: false,
     useExternal: 'optional',
     siteDemo: false,

src/pages/detect.vue

@@ -140,7 +140,7 @@
   import detectionMixin from './detection-mixin'
   import cameraMixin from './camera-mixin'
 
-  import detectionWorker from '@/assets/detect-worker.js?worker&inline'
+  import detectionWorker from '../assets/detect-worker.js?worker&inline'
 
   export default {
     mixins: [submitMixin, detectionMixin, cameraMixin],
@@ -190,6 +190,7 @@
     created () {
       let loadOtherSettings = localStorage.getItem('otherSettings')
       if (loadOtherSettings) this.otherSettings = JSON.parse(loadOtherSettings)
+      let modelRoot = this.isCordova ? 'https://localhost' : '.'
       this.detectorName = this.f7route.params.region
       switch (this.detectorName) {
         case 'thorax':
@@ -205,9 +206,9 @@
           this.activeRegion = 3
           break;
       }
-      this.modelLocation = URL.parse(`../models/${this.detectorName}${this.otherSettings.mini ? '-mini' : ''}/model.json`,import.meta.url).href
-      this.miniLocation = URL.parse(`../models/${this.detectorName}-mini/model.json`,import.meta.url).href
-      fetch(URL.parse(`../models/${this.detectorName}/classes.json`,import.meta.url).href)
+      this.modelLocation = `${modelRoot}/models/${this.detectorName}${this.otherSettings.mini ? '-mini' : ''}/model.json`
+      this.miniLocation = `${modelRoot}/models/${this.detectorName}-mini/model.json`
+      fetch(`${modelRoot}/models/${this.detectorName}/classes.json`)
         .then((mod) => { return mod.json() })
         .then((classes) => {
           this.classesList = classes
@@ -313,6 +314,7 @@
         return `--chip-media-gradient: conic-gradient(from ${270 - (confFactor * 360 / 2)}deg, hsl(${confFactor * 120}deg, 100%, 50%) ${confFactor}turn, hsl(${confFactor * 120}deg, 50%, 66%) ${confFactor}turn)`
       },
       async setData () {
+        //const detectWorker = new detectionWorker()
         this.detectWorker.onmessage = (eDetect) => {
           self = this
           if (eDetect.data.error) {
@@ -512,9 +514,13 @@
         }).then( () => {
           const [imCanvas, _]  = this.resetView()
           imCanvas.style['background-image'] = `url(${this.imageView.src})`
-          f7.utils.nextFrame(() => {
+          /******
+           * setTimeout is not a good solution, but it's the only way
+           * I can find to not cut off drawing of the canvas background
+           ******/
+//          setTimeout(() => {
             this.setData()
-          })
+//          }, 1)
         }).catch((e) => {
           console.log(e.message)
           f7.dialog.alert(`Error loading image: ${e.message}`)