From 523b50ec656eeb0a155b02ddd7a9a88b1c56f618 Mon Sep 17 00:00:00 2001
From: Justin Georgi <justin.georgi@gmail.com>
Date: Wed, 21 Aug 2024 15:48:55 -0700
Subject: [PATCH] Cleanup for 0.5.0 alpha release

Signed-off-by: Justin Georgi <justin.georgi@gmail.com>
---
 cordova/config.xml   |  2 +-
 cordova/package.json |  2 +-
 package.json         |  2 +-
 src/js/store.js      |  2 +-
 src/pages/detect.vue | 11 ++---------
 5 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/cordova/config.xml b/cordova/config.xml
index 432d9c8..5a83745 100644
--- a/cordova/config.xml
+++ b/cordova/config.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<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">
+<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">
     <name>ALVINN</name>
     <description>Anatomy Lab Visual Identification Neural Network.</description>
     <author email="jgeorg@midwestern.edu" href="https://midwestern.edu">
diff --git a/cordova/package.json b/cordova/package.json
index 9c1ea0f..c43f19d 100644
--- a/cordova/package.json
+++ b/cordova/package.json
@@ -1,7 +1,7 @@
 {
   "name": "edu.midwestern.alvinn",
   "displayName": "ALVINN",
-  "version": "0.5.0-rc",
+  "version": "0.5.0-alpha",
   "description": "Anatomy Lab Visual Identification Neural Network.",
   "main": "index.js",
   "scripts": {
diff --git a/package.json b/package.json
index 609dde5..04ef36f 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "alvinn",
   "private": true,
-  "version": "0.5.0-rc",
+  "version": "0.5.0-alpha",
   "description": "ALVINN",
   "repository": "",
   "license": "UNLICENSED",
diff --git a/src/js/store.js b/src/js/store.js
index e625f98..1064141 100644
--- a/src/js/store.js
+++ b/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-rc',
+    version: '0.5.0-alpha',
     fullscreen: false,
     useExternal: 'optional',
     siteDemo: false,
diff --git a/src/pages/detect.vue b/src/pages/detect.vue
index e2a7ec9..16577e4 100644
--- a/src/pages/detect.vue
+++ b/src/pages/detect.vue
@@ -205,8 +205,6 @@
           this.activeRegion = 3
           break;
       }
-      //this.modelLocation = `../models/${this.detectorName}${this.otherSettings.mini ? '-mini' : ''}/model.json`
-      //this.miniLocation = `../models/${this.detectorName}-mini/model.json`
       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)
@@ -315,7 +313,6 @@
         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) {
@@ -515,13 +512,9 @@
         }).then( () => {
           const [imCanvas, _]  = this.resetView()
           imCanvas.style['background-image'] = `url(${this.imageView.src})`
-          /******
-           * 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(() => {
+          f7.utils.nextFrame(() => {
             this.setData()
-//          }, 1)
+          })
         }).catch((e) => {
           console.log(e.message)
           f7.dialog.alert(`Error loading image: ${e.message}`)