diff --git a/src/models/abdomen-mini/descript.json b/public/models/abdomen-mini/descript.json similarity index 100% rename from src/models/abdomen-mini/descript.json rename to public/models/abdomen-mini/descript.json diff --git a/src/models/abdomen-mini/group1-shard1of4.bin b/public/models/abdomen-mini/group1-shard1of4.bin similarity index 100% rename from src/models/abdomen-mini/group1-shard1of4.bin rename to public/models/abdomen-mini/group1-shard1of4.bin diff --git a/src/models/abdomen-mini/group1-shard2of4.bin b/public/models/abdomen-mini/group1-shard2of4.bin similarity index 100% rename from src/models/abdomen-mini/group1-shard2of4.bin rename to public/models/abdomen-mini/group1-shard2of4.bin diff --git a/src/models/abdomen-mini/group1-shard3of4.bin b/public/models/abdomen-mini/group1-shard3of4.bin similarity index 100% rename from src/models/abdomen-mini/group1-shard3of4.bin rename to public/models/abdomen-mini/group1-shard3of4.bin diff --git a/src/models/abdomen-mini/group1-shard4of4.bin b/public/models/abdomen-mini/group1-shard4of4.bin similarity index 100% rename from src/models/abdomen-mini/group1-shard4of4.bin rename to public/models/abdomen-mini/group1-shard4of4.bin diff --git a/src/models/abdomen-mini/metadata.yaml b/public/models/abdomen-mini/metadata.yaml similarity index 100% rename from src/models/abdomen-mini/metadata.yaml rename to public/models/abdomen-mini/metadata.yaml diff --git a/src/models/abdomen-mini/model.json b/public/models/abdomen-mini/model.json similarity index 100% rename from src/models/abdomen-mini/model.json rename to public/models/abdomen-mini/model.json diff --git a/src/models/abdomen/classes.json b/public/models/abdomen/classes.json similarity index 100% rename from src/models/abdomen/classes.json rename to public/models/abdomen/classes.json diff --git a/src/models/abdomen/descript.json b/public/models/abdomen/descript.json similarity index 100% rename from src/models/abdomen/descript.json rename to public/models/abdomen/descript.json diff --git a/src/models/abdomen/group1-shard1of4.bin b/public/models/abdomen/group1-shard1of4.bin similarity index 100% rename from src/models/abdomen/group1-shard1of4.bin rename to public/models/abdomen/group1-shard1of4.bin diff --git a/src/models/abdomen/group1-shard2of4.bin b/public/models/abdomen/group1-shard2of4.bin similarity index 100% rename from src/models/abdomen/group1-shard2of4.bin rename to public/models/abdomen/group1-shard2of4.bin diff --git a/src/models/abdomen/group1-shard3of4.bin b/public/models/abdomen/group1-shard3of4.bin similarity index 100% rename from src/models/abdomen/group1-shard3of4.bin rename to public/models/abdomen/group1-shard3of4.bin diff --git a/src/models/abdomen/group1-shard4of4.bin b/public/models/abdomen/group1-shard4of4.bin similarity index 100% rename from src/models/abdomen/group1-shard4of4.bin rename to public/models/abdomen/group1-shard4of4.bin diff --git a/src/models/abdomen/metadata.yaml b/public/models/abdomen/metadata.yaml similarity index 100% rename from src/models/abdomen/metadata.yaml rename to public/models/abdomen/metadata.yaml diff --git a/src/models/abdomen/model.json b/public/models/abdomen/model.json similarity index 100% rename from src/models/abdomen/model.json rename to public/models/abdomen/model.json diff --git a/src/models/thorax-mini/descript.json b/public/models/thorax-mini/descript.json similarity index 100% rename from src/models/thorax-mini/descript.json rename to public/models/thorax-mini/descript.json diff --git a/src/models/thorax-mini/group1-shard1of3.bin b/public/models/thorax-mini/group1-shard1of3.bin similarity index 100% rename from src/models/thorax-mini/group1-shard1of3.bin rename to public/models/thorax-mini/group1-shard1of3.bin diff --git a/src/models/thorax-mini/group1-shard2of3.bin b/public/models/thorax-mini/group1-shard2of3.bin similarity index 100% rename from src/models/thorax-mini/group1-shard2of3.bin rename to public/models/thorax-mini/group1-shard2of3.bin diff --git a/src/models/thorax-mini/group1-shard3of3.bin b/public/models/thorax-mini/group1-shard3of3.bin similarity index 100% rename from src/models/thorax-mini/group1-shard3of3.bin rename to public/models/thorax-mini/group1-shard3of3.bin diff --git a/src/models/thorax-mini/metadata.yaml b/public/models/thorax-mini/metadata.yaml similarity index 100% rename from src/models/thorax-mini/metadata.yaml rename to public/models/thorax-mini/metadata.yaml diff --git a/src/models/thorax-mini/model.json b/public/models/thorax-mini/model.json similarity index 100% rename from src/models/thorax-mini/model.json rename to public/models/thorax-mini/model.json diff --git a/src/models/thorax/classes.json b/public/models/thorax/classes.json similarity index 100% rename from src/models/thorax/classes.json rename to public/models/thorax/classes.json diff --git a/src/models/thorax/descript.json b/public/models/thorax/descript.json similarity index 100% rename from src/models/thorax/descript.json rename to public/models/thorax/descript.json diff --git a/src/models/thorax/group1-shard10of11.bin b/public/models/thorax/group1-shard10of11.bin similarity index 100% rename from src/models/thorax/group1-shard10of11.bin rename to public/models/thorax/group1-shard10of11.bin diff --git a/src/models/thorax/group1-shard11of11.bin b/public/models/thorax/group1-shard11of11.bin similarity index 100% rename from src/models/thorax/group1-shard11of11.bin rename to public/models/thorax/group1-shard11of11.bin diff --git a/src/models/thorax/group1-shard1of11.bin b/public/models/thorax/group1-shard1of11.bin similarity index 100% rename from src/models/thorax/group1-shard1of11.bin rename to public/models/thorax/group1-shard1of11.bin diff --git a/src/models/thorax/group1-shard2of11.bin b/public/models/thorax/group1-shard2of11.bin similarity index 100% rename from src/models/thorax/group1-shard2of11.bin rename to public/models/thorax/group1-shard2of11.bin diff --git a/src/models/thorax/group1-shard3of11.bin b/public/models/thorax/group1-shard3of11.bin similarity index 100% rename from src/models/thorax/group1-shard3of11.bin rename to public/models/thorax/group1-shard3of11.bin diff --git a/src/models/thorax/group1-shard4of11.bin b/public/models/thorax/group1-shard4of11.bin similarity index 100% rename from src/models/thorax/group1-shard4of11.bin rename to public/models/thorax/group1-shard4of11.bin diff --git a/src/models/thorax/group1-shard5of11.bin b/public/models/thorax/group1-shard5of11.bin similarity index 100% rename from src/models/thorax/group1-shard5of11.bin rename to public/models/thorax/group1-shard5of11.bin diff --git a/src/models/thorax/group1-shard6of11.bin b/public/models/thorax/group1-shard6of11.bin similarity index 100% rename from src/models/thorax/group1-shard6of11.bin rename to public/models/thorax/group1-shard6of11.bin diff --git a/src/models/thorax/group1-shard7of11.bin b/public/models/thorax/group1-shard7of11.bin similarity index 100% rename from src/models/thorax/group1-shard7of11.bin rename to public/models/thorax/group1-shard7of11.bin diff --git a/src/models/thorax/group1-shard8of11.bin b/public/models/thorax/group1-shard8of11.bin similarity index 100% rename from src/models/thorax/group1-shard8of11.bin rename to public/models/thorax/group1-shard8of11.bin diff --git a/src/models/thorax/group1-shard9of11.bin b/public/models/thorax/group1-shard9of11.bin similarity index 100% rename from src/models/thorax/group1-shard9of11.bin rename to public/models/thorax/group1-shard9of11.bin diff --git a/src/models/thorax/metadata.yaml b/public/models/thorax/metadata.yaml similarity index 100% rename from src/models/thorax/metadata.yaml rename to public/models/thorax/metadata.yaml diff --git a/src/models/thorax/model.json b/public/models/thorax/model.json similarity index 100% rename from src/models/thorax/model.json rename to public/models/thorax/model.json diff --git a/src/samples/thorax-sample1.jpeg b/public/samples/thorax-sample1.jpeg similarity index 100% rename from src/samples/thorax-sample1.jpeg rename to public/samples/thorax-sample1.jpeg diff --git a/src/samples/thorax-sample2.jpeg b/public/samples/thorax-sample2.jpeg similarity index 100% rename from src/samples/thorax-sample2.jpeg rename to public/samples/thorax-sample2.jpeg diff --git a/src/samples/thorax-sample3.jpeg b/public/samples/thorax-sample3.jpeg similarity index 100% rename from src/samples/thorax-sample3.jpeg rename to public/samples/thorax-sample3.jpeg diff --git a/src/pages/detect.vue b/src/pages/detect.vue index ea64164..7c25af9 100644 --- a/src/pages/detect.vue +++ b/src/pages/detect.vue @@ -120,7 +120,6 @@ import submitMixin from './submit-mixin' import detectionMixin from './detection-mixin' import cameraMixin from './camera-mixin' -import App from 'framework7-vue/components/app' export default { mixins: [submitMixin, detectionMixin, cameraMixin], @@ -168,7 +167,7 @@ import App from 'framework7-vue/components/app' created () { let loadOtherSettings = localStorage.getItem('otherSettings') 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) { case 'thorax': this.activeRegion = 0 @@ -188,10 +187,12 @@ import App from 'framework7-vue/components/app' } this.modelLocation = `${modelRoot}/models/${this.detectorName}${this.otherSettings.mini ? '-mini' : ''}/model.json` this.miniLocation = `${modelRoot}/models/${this.detectorName}-mini/model.json` - import(`../models/${this.detectorName}/classes.json`).then((mod) => { - this.classesList = mod.default - this.detectorLabels = this.classesList.map( l => { return {'name': l, 'detect': true} } ) - }) + fetch(`${this.isCordova ? 'https://localhost' : '.'}/models/${this.detectorName}/classes.json`) + .then((mod) => { return mod.json() }) + .then((classes) => { + this.classesList = classes + this.detectorLabels = this.classesList.map( l => { return {'name': l, 'detect': true} } ) + }) var loadServerSettings = localStorage.getItem('serverSettings') if (loadServerSettings) this.serverSettings = JSON.parse(loadServerSettings) }, @@ -385,7 +386,7 @@ import App from 'framework7-vue/components/app' resolve(reader.result) }) if (this.imageLoadMode == 'sample') { - fetch(`${this.isCordova ? 'https://localhost' : '..'}/samples/${this.detectorName}-${searchImage}.jpeg`).then( resp => { + fetch(`${this.isCordova ? 'https://localhost' : '.'}/samples/${this.detectorName}-${searchImage}.jpeg`).then( resp => { return resp.blob() }).then(respBlob => { reader.readAsDataURL(respBlob) diff --git a/src/pages/specs.vue b/src/pages/specs.vue index 42fdc7f..2cb9d37 100644 --- a/src/pages/specs.vue +++ b/src/pages/specs.vue @@ -45,6 +45,7 @@ limbsDetails: { "version": "N/A" }, headneckDetails: { "version": "N/A" }, alvinnVersion: store().getVersion, + isCordova: !!window.cordova, otherSettings: {} } }, @@ -54,22 +55,18 @@ created () { var loadOtherSettings = localStorage.getItem('otherSettings') if (loadOtherSettings) this.otherSettings = JSON.parse(loadOtherSettings) - import('../models/thorax/descript.json') - .then((mod) => { - this.thoraxDetails = mod.default - }) - import('../models/thorax-mini/descript.json') - .then((mod) => { - this.miniThoraxDetails = mod.default - }) - import('../models/abdomen/descript.json') - .then((mod) => { - this.abdomenDetails = mod.default - }) - import('../models/abdomen-mini/descript.json') - .then((mod) => { - this.miniAbdomenDetails = mod.default - }) + fetch(`${this.isCordova ? 'https://localhost' : '.'}/models/thorax/descript.json`) + .then((mod) => { return mod.json() }) + .then((desc) => { this.thoraxDetails = desc }) + fetch(`${this.isCordova ? 'https://localhost' : '.'}/models/thorax-mini/descript.json`) + .then((mod) => { return mod.json() }) + .then((desc) => { this.miniThoraxDetails = desc }) + fetch(`${this.isCordova ? 'https://localhost' : '.'}/models/abdomen/descript.json`) + .then((mod) => { return mod.json() }) + .then((desc) => { this.abdomenDetails = desc }) + fetch(`${this.isCordova ? 'https://localhost' : '.'}/models/abdomen-mini/descript.json`) + .then((mod) => { return mod.json() }) + .then((desc) => { this.miniAbdomenDetails = desc }) }, methods: { }