Fetch models and model details from vite public folder

Signed-off-by: Justin Georgi <justin.georgi@gmail.com>
This commit is contained in:
2024-03-26 20:09:24 -07:00
parent 78264af4a9
commit 6527e3d4bb
38 changed files with 19 additions and 21 deletions

View File

@@ -168,7 +168,7 @@ import App from 'framework7-vue/components/app'
created () { created () {
let loadOtherSettings = localStorage.getItem('otherSettings') let 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 ? '.' : '..') let modelRoot = this.isCordova ? 'https://localhost' : '.'
switch (this.f7route.params.region) { switch (this.f7route.params.region) {
case 'thorax': case 'thorax':
this.activeRegion = 0 this.activeRegion = 0
@@ -188,8 +188,10 @@ import App from 'framework7-vue/components/app'
} }
this.modelLocation = `${modelRoot}/models/${this.detectorName}${this.otherSettings.mini ? '-mini' : ''}/model.json` this.modelLocation = `${modelRoot}/models/${this.detectorName}${this.otherSettings.mini ? '-mini' : ''}/model.json`
this.miniLocation = `${modelRoot}/models/${this.detectorName}-mini/model.json` this.miniLocation = `${modelRoot}/models/${this.detectorName}-mini/model.json`
import(`../models/${this.detectorName}/classes.json`).then((mod) => { fetch(`./models/${this.detectorName}/classes.json`)
this.classesList = mod.default .then((mod) => { return mod.json() })
.then((classes) => {
this.classesList = classes
this.detectorLabels = this.classesList.map( l => { return {'name': l, 'detect': true} } ) this.detectorLabels = this.classesList.map( l => { return {'name': l, 'detect': true} } )
}) })
var loadServerSettings = localStorage.getItem('serverSettings') var loadServerSettings = localStorage.getItem('serverSettings')

View File

@@ -54,22 +54,18 @@
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)
import('../models/thorax/descript.json') fetch('./models/thorax/descript.json')
.then((mod) => { .then((mod) => { return mod.json() })
this.thoraxDetails = mod.default .then((desc) => { this.thoraxDetails = desc })
}) fetch('./models/thorax-mini/descript.json')
import('../models/thorax-mini/descript.json') .then((mod) => { return mod.json() })
.then((mod) => { .then((desc) => { this.miniThoraxDetails = desc })
this.miniThoraxDetails = mod.default fetch('./models/abdomen/descript.json')
}) .then((mod) => { return mod.json() })
import('../models/abdomen/descript.json') .then((desc) => { this.abdomenDetails = desc })
.then((mod) => { fetch('./models/abdomen-mini/descript.json')
this.abdomenDetails = mod.default .then((mod) => { return mod.json() })
}) .then((desc) => { this.miniAbdomenDetails = desc })
import('../models/abdomen-mini/descript.json')
.then((mod) => {
this.miniAbdomenDetails = mod.default
})
}, },
methods: { methods: {
} }