ALVINN/ALVINN_f7
1
0
Fork 0
Code Issues 8 Pull Requests Actions Packages Projects Releases 7 Wiki Activity

Improve model location determination #148

Merged
jgeorgi merged 2 commits from msv-model-location into main 2024-03-26 04:03:57 +00:00
Conversation 0 Commits 2 Files Changed 1 +7 -6
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 97706e54b9 - Show all commits

13
src/pages/detect.vue
View File

@@ -165,26 +165,27 @@
created () { created () {
var loadOtherSettings = localStorage.getItem('otherSettings') var loadOtherSettings = localStorage.getItem('otherSettings')
if (loadOtherSettings) this.otherSettings = JSON.parse(loadOtherSettings) if (loadOtherSettings) this.otherSettings = JSON.parse(loadOtherSettings)
let modelRoot = this.isCordova ? 'https://localhost' : (import.meta.env.PROD ? '.' : '..')
switch (this.f7route.params.region) { switch (this.f7route.params.region) {
case 'thorax': case 'thorax':
this.activeRegion = 0 this.activeRegion = 0
this.detectorName = 'thorax' this.detectorName = 'thorax'
/* VITE setting */ /* VITE setting */
this.modelLocation = `../models/thorax${this.otherSettings.mini ? '-mini' : ''}/model.json` this.modelLocation = `${modelRoot}/models/thorax${this.otherSettings.mini ? '-mini' : ''}/model.json`
this.miniLocation = `../models/thorax-mini/model.json` this.miniLocation = `${modelRoot}/models/thorax-mini/model.json`
/* PWA Build setting */ /* PWA Build setting */
//this.modelLocation = `./models/thorax${this.otherSettings.mini ? '-mini' : ''}/model.json` //this.modelLocation = `./models/thorax${this.otherSettings.mini ? '-mini' : ''}/model.json`
this.modelLocationCordova = `https://localhost/models/thorax${this.otherSettings.mini ? '-mini' : ''}/model.json` this.modelLocationCordova = `${modelRoot}/models/thorax${this.otherSettings.mini ? '-mini' : ''}/model.json`
break; break;
case 'abdomen': case 'abdomen':
this.activeRegion = 1 this.activeRegion = 1
this.detectorName = 'abdomen' this.detectorName = 'abdomen'
/* VITE setting */ /* VITE setting */
this.modelLocation = `../models/abdomen${this.otherSettings.mini ? '-mini' : ''}/model.json` this.modelLocation = `${modelRoot}/models/abdomen${this.otherSettings.mini ? '-mini' : ''}/model.json`
this.miniLocation = `../models/abdomen-mini/model.json` this.miniLocation = `${modelRoot}/models/abdomen-mini/model.json`
/* PWA Build setting */ /* PWA Build setting */
//this.modelLocation = `./models/abdomen${this.otherSettings.mini ? '-mini' : ''}/model.json` //this.modelLocation = `./models/abdomen${this.otherSettings.mini ? '-mini' : ''}/model.json`
this.modelLocationCordova = `https://localhost/models/abdomen${this.otherSettings.mini ? '-mini' : ''}/model.json` this.modelLocationCordova = `${modelRoot}/models/abdomen${this.otherSettings.mini ? '-mini' : ''}/model.json`
break; break;
case 'limbs': case 'limbs':
this.activeRegion = 2 this.activeRegion = 2