Switch image display to canvas

Signed-off-by: Justin Georgi <justin.georgi@gmail.com>
Remove run attempt from build number
2024-09-15 12:58:08 -07:00 · 2024-09-12 19:55:30 -07:00 · 2024-09-12 19:47:09 -07:00 · 2024-09-12 18:56:03 -07:00 · 2024-09-11 16:32:55 -07:00 · 2024-09-11 11:46:37 -07:00
11 changed files with 194 additions and 134 deletions
--- a/.gitea/workflows/dev-build.yaml
+++ b/.gitea/workflows/dev-build.yaml
@@ -13,6 +13,8 @@ jobs:
        uses: actions/checkout@v4
      - name: Install node modules
        run: npm install
+      - name: Add build number
+        run: sed -i 's/####/#${{ github.run_number }}/' ./src/js/store.js
      - name: Build pwa
        run: npm run build
      - name: Replace previous dev pwa
--- a/.gitignore
+++ b/.gitignore
@@ -40,7 +40,8 @@ cordova/platforms/
 cordova/plugins/
 cordova/www/

-
-
 # Production build
 www/
+
+# VSCode settings
+.vscode/settings.json
--- a/README.md
+++ b/README.md
@@ -47,9 +47,10 @@ The following site settings are avaible:
 | name | description | values | default |
 | --- | --- | --- | --- |
 | `agreeExpire` | number of months before users are shown the site agreement dialog again<br />set to 0 to display dialog on every reload | integer >= 0 | 3 |
-| `demo` | set to **true** to enable demo mode by default | boolean | false
+| `demo` | set to **true** to enable demo mode by default | boolean | false |
 | `regions` | array of regions names to enable | thorax, abdomen, limbs, head | [thorax, abdomen, limbs, head] |
 | `useExternal` | detemines the ability to use an external detection server:<br />**none** - external server cannot be configured<br />**optional** - external server can be configured in the app's settings page<br />**list** - external server can be selected in the app's settings page but only the configured server(s) may be selected<br />**required** - external server settings from conf file will be used by default and disable server options in the settings page | none, optional, list, required | **optional** |
+| `disableWorkers` | force app to use a single thread for detection computations instead of multi threading web workers | boolean | **optional** |
 | `external` | properties of the external server(s) ALVINN may connect to<br />This setting must be a single element array if **useExternal** is set to **required**.<br />This setting must be an array of one or more elements if **useExternal** is set to **list** | external server settings array | []|
 | `infoUrl` | root url for links to information about identified structures<br />Structure labels with spaces replaced by underscores will be appended to this value for full information links (*e.g.,* Abdominal_diapragm) | string | info link not shown |

--- a/package-lock.json
+++ b/package-lock.json
@@ -1,16 +1,16 @@
 {
  "name": "alvinn",
-  "version": "0.5.0-rc",
+  "version": "0.5.0-alpha",
  "lockfileVersion": 2,
  "requires": true,
  "packages": {
    "": {
      "name": "alvinn",
-      "version": "0.5.0-rc",
+      "version": "0.5.0-alpha",
      "hasInstallScript": true,
      "license": "UNLICENSED",
      "dependencies": {
-        "@tensorflow/tfjs": "^4.17.0",
+        "@tensorflow/tfjs": "^4.21.0",
        "dom7": "^4.0.6",
        "framework7": "^8.3.0",
        "framework7-icons": "^5.0.5",
@@ -3354,16 +3354,17 @@
      }
    },
    "node_modules/@tensorflow/tfjs": {
-      "version": "4.17.0",
-      "resolved": "https://registry.npmjs.org/@tensorflow/tfjs/-/tfjs-4.17.0.tgz",
-      "integrity": "sha512-yXRBhpM3frlNA/YaPp6HNk9EfIi8han5RYeQA3R8OCa0Od+AfoG1PUmlxV8fE2wCorlGVyHsgpiJ6M9YZPB56w==",
+      "version": "4.21.0",
+      "resolved": "https://registry.npmjs.org/@tensorflow/tfjs/-/tfjs-4.21.0.tgz",
+      "integrity": "sha512-7D/+H150ptvt+POMbsME3WlIvLiuBR2rCC2Z0hOKKb/5Ygkj7xsp/K2HzOvUj0g0yjk+utkU45QEYhnhjnbHRA==",
+      "license": "Apache-2.0",
      "dependencies": {
-        "@tensorflow/tfjs-backend-cpu": "4.17.0",
-        "@tensorflow/tfjs-backend-webgl": "4.17.0",
-        "@tensorflow/tfjs-converter": "4.17.0",
-        "@tensorflow/tfjs-core": "4.17.0",
-        "@tensorflow/tfjs-data": "4.17.0",
-        "@tensorflow/tfjs-layers": "4.17.0",
+        "@tensorflow/tfjs-backend-cpu": "4.21.0",
+        "@tensorflow/tfjs-backend-webgl": "4.21.0",
+        "@tensorflow/tfjs-converter": "4.21.0",
+        "@tensorflow/tfjs-core": "4.21.0",
+        "@tensorflow/tfjs-data": "4.21.0",
+        "@tensorflow/tfjs-layers": "4.21.0",
        "argparse": "^1.0.10",
        "chalk": "^4.1.0",
        "core-js": "3.29.1",
@@ -3375,9 +3376,10 @@
      }
    },
    "node_modules/@tensorflow/tfjs-backend-cpu": {
-      "version": "4.17.0",
-      "resolved": "https://registry.npmjs.org/@tensorflow/tfjs-backend-cpu/-/tfjs-backend-cpu-4.17.0.tgz",
-      "integrity": "sha512-2VSCHnX9qhYTjw9HiVwTBSnRVlntKXeBlK7aSVsmZfHGwWE2faErTtO7bWmqNqw0U7gyznJbVAjlow/p+0RNGw==",
+      "version": "4.21.0",
+      "resolved": "https://registry.npmjs.org/@tensorflow/tfjs-backend-cpu/-/tfjs-backend-cpu-4.21.0.tgz",
+      "integrity": "sha512-yS9Oisg4L48N7ML6677ilv1eP5Jt59S74skSU1cCsM4yBAtH4DAn9b89/JtqBISh6JadanfX26b4HCWQvMvqFg==",
+      "license": "Apache-2.0",
      "dependencies": {
        "@types/seedrandom": "^2.4.28",
        "seedrandom": "^3.0.5"
@@ -3386,15 +3388,16 @@
        "yarn": ">= 1.3.2"
      },
      "peerDependencies": {
-        "@tensorflow/tfjs-core": "4.17.0"
+        "@tensorflow/tfjs-core": "4.21.0"
      }
    },
    "node_modules/@tensorflow/tfjs-backend-webgl": {
-      "version": "4.17.0",
-      "resolved": "https://registry.npmjs.org/@tensorflow/tfjs-backend-webgl/-/tfjs-backend-webgl-4.17.0.tgz",
-      "integrity": "sha512-CC5GsGECCd7eYAUaKq0XJ48FjEZdgXZWPxgUYx4djvfUx5fQPp35hCSP9w/k463jllBMbjl2tKRg8u7Ia/LYzg==",
+      "version": "4.21.0",
+      "resolved": "https://registry.npmjs.org/@tensorflow/tfjs-backend-webgl/-/tfjs-backend-webgl-4.21.0.tgz",
+      "integrity": "sha512-7k6mb7dd0uF9jI51iunF3rhEXjvR/a613kjWZ0Rj3o1COFrneyku2C7cRMZERWPhbgXZ+dF+j9MdpGIpgtShIQ==",
+      "license": "Apache-2.0",
      "dependencies": {
-        "@tensorflow/tfjs-backend-cpu": "4.17.0",
+        "@tensorflow/tfjs-backend-cpu": "4.21.0",
        "@types/offscreencanvas": "~2019.3.0",
        "@types/seedrandom": "^2.4.28",
        "seedrandom": "^3.0.5"
@@ -3403,21 +3406,23 @@
        "yarn": ">= 1.3.2"
      },
      "peerDependencies": {
-        "@tensorflow/tfjs-core": "4.17.0"
+        "@tensorflow/tfjs-core": "4.21.0"
      }
    },
    "node_modules/@tensorflow/tfjs-converter": {
-      "version": "4.17.0",
-      "resolved": "https://registry.npmjs.org/@tensorflow/tfjs-converter/-/tfjs-converter-4.17.0.tgz",
-      "integrity": "sha512-qFxIjPfomCuTrYxsFjtKbi3QfdmTTCWo+RvqD64oCMS0sjp7sUDNhJyKDoLx6LZhXlwXpHIVDJctLMRMwet0Zw==",
+      "version": "4.21.0",
+      "resolved": "https://registry.npmjs.org/@tensorflow/tfjs-converter/-/tfjs-converter-4.21.0.tgz",
+      "integrity": "sha512-cUhU+F1lGx2qnKk/gRy8odBh0PZlFz0Dl71TG8LVnj0/g352DqiNrKXlKO/po9aWzP8x0KUGC3gNMSMJW+T0DA==",
+      "license": "Apache-2.0",
      "peerDependencies": {
-        "@tensorflow/tfjs-core": "4.17.0"
+        "@tensorflow/tfjs-core": "4.21.0"
      }
    },
    "node_modules/@tensorflow/tfjs-core": {
-      "version": "4.17.0",
-      "resolved": "https://registry.npmjs.org/@tensorflow/tfjs-core/-/tfjs-core-4.17.0.tgz",
-      "integrity": "sha512-v9Q5430EnRpyhWNd9LVgXadciKvxLiq+sTrLKRowh26BHyAsams4tZIgX3lFKjB7b90p+FYifVMcqLTTHgjGpQ==",
+      "version": "4.21.0",
+      "resolved": "https://registry.npmjs.org/@tensorflow/tfjs-core/-/tfjs-core-4.21.0.tgz",
+      "integrity": "sha512-ZbECwXps5wb9XXcGq4ZXvZDVjr5okc3I0+i/vU6bpQ+nVApyIrMiyEudP8f6vracVTvNmnlN62vUXoEsQb2F8g==",
+      "license": "Apache-2.0",
      "dependencies": {
        "@types/long": "^4.0.1",
        "@types/offscreencanvas": "~2019.7.0",
@@ -3434,28 +3439,31 @@
    "node_modules/@tensorflow/tfjs-core/node_modules/@types/offscreencanvas": {
      "version": "2019.7.3",
      "resolved": "https://registry.npmjs.org/@types/offscreencanvas/-/offscreencanvas-2019.7.3.tgz",
-      "integrity": "sha512-ieXiYmgSRXUDeOntE1InxjWyvEelZGP63M+cGuquuRLuIKKT1osnkXjxev9B7d1nXSug5vpunx+gNlbVxMlC9A=="
+      "integrity": "sha512-ieXiYmgSRXUDeOntE1InxjWyvEelZGP63M+cGuquuRLuIKKT1osnkXjxev9B7d1nXSug5vpunx+gNlbVxMlC9A==",
+      "license": "MIT"
    },
    "node_modules/@tensorflow/tfjs-data": {
-      "version": "4.17.0",
-      "resolved": "https://registry.npmjs.org/@tensorflow/tfjs-data/-/tfjs-data-4.17.0.tgz",
-      "integrity": "sha512-aPKrDFip+gXicWOFALeNT7KKQjRXFkHd/hNe/zs4mCFcIN00hy1PkZ6xkYsgrsdLDQMBSGeS4B4ZM0k5Cs88QA==",
+      "version": "4.21.0",
+      "resolved": "https://registry.npmjs.org/@tensorflow/tfjs-data/-/tfjs-data-4.21.0.tgz",
+      "integrity": "sha512-LpJ/vyQMwYHkcVCqIRg7IVVw13VBY7rNAiuhmKP9S5NP/2ye4KA8BJ4XwDIDgjCVQM7glK9L8bMav++xCDf7xA==",
+      "license": "Apache-2.0",
      "dependencies": {
        "@types/node-fetch": "^2.1.2",
        "node-fetch": "~2.6.1",
        "string_decoder": "^1.3.0"
      },
      "peerDependencies": {
-        "@tensorflow/tfjs-core": "4.17.0",
+        "@tensorflow/tfjs-core": "4.21.0",
        "seedrandom": "^3.0.5"
      }
    },
    "node_modules/@tensorflow/tfjs-layers": {
-      "version": "4.17.0",
-      "resolved": "https://registry.npmjs.org/@tensorflow/tfjs-layers/-/tfjs-layers-4.17.0.tgz",
-      "integrity": "sha512-DEE0zRKvf3LJ0EcvG5XouJYOgFGWYAneZ0K1d23969z7LfSyqVmBdLC6BTwdLKuJk3ouUJIKXU1TcpFmjDuh7g==",
+      "version": "4.21.0",
+      "resolved": "https://registry.npmjs.org/@tensorflow/tfjs-layers/-/tfjs-layers-4.21.0.tgz",
+      "integrity": "sha512-a8KaMYlY3+llvE9079nvASKpaaf8xpCMdOjbgn+eGhdOGOcY7QuFUkd/2odvnXDG8fK/jffE1LoNOlfYoBHC4w==",
+      "license": "Apache-2.0 AND MIT",
      "peerDependencies": {
-        "@tensorflow/tfjs-core": "4.17.0"
+        "@tensorflow/tfjs-core": "4.21.0"
      }
    },
    "node_modules/@tensorflow/tfjs/node_modules/regenerator-runtime": {
@@ -3472,7 +3480,8 @@
    "node_modules/@types/long": {
      "version": "4.0.2",
      "resolved": "https://registry.npmjs.org/@types/long/-/long-4.0.2.tgz",
-      "integrity": "sha512-MqTGEo5bj5t157U6fA/BiDynNkn0YknVdh48CMPkTSpFTVmvao5UQmm7uEF6xBEo7qIMAlY/JSleYaE6VOdpaA=="
+      "integrity": "sha512-MqTGEo5bj5t157U6fA/BiDynNkn0YknVdh48CMPkTSpFTVmvao5UQmm7uEF6xBEo7qIMAlY/JSleYaE6VOdpaA==",
+      "license": "MIT"
    },
    "node_modules/@types/minimist": {
      "version": "1.2.5",
@@ -3492,6 +3501,7 @@
      "version": "2.6.11",
      "resolved": "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.6.11.tgz",
      "integrity": "sha512-24xFj9R5+rfQJLRyM56qh+wnVSYhyXC2tkoBndtY0U+vubqNsYXGjufB2nn8Q6gt0LrARwL6UBtMCSVCwl4B1g==",
+      "license": "MIT",
      "dependencies": {
        "@types/node": "*",
        "form-data": "^4.0.0"
@@ -3506,7 +3516,8 @@
    "node_modules/@types/offscreencanvas": {
      "version": "2019.3.0",
      "resolved": "https://registry.npmjs.org/@types/offscreencanvas/-/offscreencanvas-2019.3.0.tgz",
-      "integrity": "sha512-esIJx9bQg+QYF0ra8GnvfianIY8qWB0GBx54PK5Eps6m+xTj86KLavHv6qDhzKcu5UUOgNfJ2pWaIIV7TRUd9Q=="
+      "integrity": "sha512-esIJx9bQg+QYF0ra8GnvfianIY8qWB0GBx54PK5Eps6m+xTj86KLavHv6qDhzKcu5UUOgNfJ2pWaIIV7TRUd9Q==",
+      "license": "MIT"
    },
    "node_modules/@types/resolve": {
      "version": "1.17.1",
@@ -3520,7 +3531,8 @@
    "node_modules/@types/seedrandom": {
      "version": "2.4.34",
      "resolved": "https://registry.npmjs.org/@types/seedrandom/-/seedrandom-2.4.34.tgz",
-      "integrity": "sha512-ytDiArvrn/3Xk6/vtylys5tlY6eo7Ane0hvcx++TKo6RxQXuVfW0AF/oeWqAj9dN29SyhtawuXstgmPlwNcv/A=="
+      "integrity": "sha512-ytDiArvrn/3Xk6/vtylys5tlY6eo7Ane0hvcx++TKo6RxQXuVfW0AF/oeWqAj9dN29SyhtawuXstgmPlwNcv/A==",
+      "license": "MIT"
    },
    "node_modules/@types/trusted-types": {
      "version": "2.0.6",
@@ -3646,7 +3658,8 @@
    "node_modules/@webgpu/types": {
      "version": "0.1.38",
      "resolved": "https://registry.npmjs.org/@webgpu/types/-/types-0.1.38.tgz",
-      "integrity": "sha512-7LrhVKz2PRh+DD7+S+PVaFd5HxaWQvoMqBbsV9fNJO1pjUs1P8bM2vQVNfk+3URTqbuTI7gkXi0rfsN0IadoBA=="
+      "integrity": "sha512-7LrhVKz2PRh+DD7+S+PVaFd5HxaWQvoMqBbsV9fNJO1pjUs1P8bM2vQVNfk+3URTqbuTI7gkXi0rfsN0IadoBA==",
+      "license": "BSD-3-Clause"
    },
    "node_modules/acorn": {
      "version": "8.11.2",
@@ -3814,7 +3827,8 @@
    "node_modules/asynckit": {
      "version": "0.4.0",
      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
+      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
+      "license": "MIT"
    },
    "node_modules/at-least-node": {
      "version": "1.0.0",
@@ -4412,6 +4426,7 @@
      "version": "1.0.8",
      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+      "license": "MIT",
      "dependencies": {
        "delayed-stream": "~1.0.0"
      },
@@ -4872,6 +4887,7 @@
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
      "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
+      "license": "MIT",
      "engines": {
        "node": ">=0.4.0"
      }
@@ -5357,6 +5373,7 @@
      "version": "4.0.0",
      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
      "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
+      "license": "MIT",
      "dependencies": {
        "asynckit": "^0.4.0",
        "combined-stream": "^1.0.8",
@@ -6577,7 +6594,8 @@
    "node_modules/long": {
      "version": "4.0.0",
      "resolved": "https://registry.npmjs.org/long/-/long-4.0.0.tgz",
-      "integrity": "sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA=="
+      "integrity": "sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA==",
+      "license": "Apache-2.0"
    },
    "node_modules/lower-case": {
      "version": "2.0.2",
@@ -6688,6 +6706,7 @@
      "version": "1.52.0",
      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
+      "license": "MIT",
      "engines": {
        "node": ">= 0.6"
      }
@@ -6696,6 +6715,7 @@
      "version": "2.1.35",
      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
+      "license": "MIT",
      "dependencies": {
        "mime-db": "1.52.0"
      },
@@ -6823,6 +6843,7 @@
      "version": "2.6.13",
      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.13.tgz",
      "integrity": "sha512-StxNAxh15zr77QvvkmveSQ8uCQ4+v5FkvNTj0OESmiHu+VRi/gXArXtkWMElOsOUNLtUEvI4yS+rdtOHZTwlQA==",
+      "license": "MIT",
      "dependencies": {
        "whatwg-url": "^5.0.0"
      },
@@ -6841,17 +6862,20 @@
    "node_modules/node-fetch/node_modules/tr46": {
      "version": "0.0.3",
      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
-      "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="
+      "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==",
+      "license": "MIT"
    },
    "node_modules/node-fetch/node_modules/webidl-conversions": {
      "version": "3.0.1",
      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
-      "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="
+      "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==",
+      "license": "BSD-2-Clause"
    },
    "node_modules/node-fetch/node_modules/whatwg-url": {
      "version": "5.0.0",
      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
      "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
+      "license": "MIT",
      "dependencies": {
        "tr46": "~0.0.3",
        "webidl-conversions": "^3.0.0"
@@ -8481,7 +8505,8 @@
    "node_modules/seedrandom": {
      "version": "3.0.5",
      "resolved": "https://registry.npmjs.org/seedrandom/-/seedrandom-3.0.5.tgz",
-      "integrity": "sha512-8OwmbklUNzwezjGInmZ+2clQmExQPvomqjL7LFqOYqtmuxRgQYqOD3mHaU+MvZn5FLUeVxVfQjwLZW/n/JFuqg=="
+      "integrity": "sha512-8OwmbklUNzwezjGInmZ+2clQmExQPvomqjL7LFqOYqtmuxRgQYqOD3mHaU+MvZn5FLUeVxVfQjwLZW/n/JFuqg==",
+      "license": "MIT"
    },
    "node_modules/semver": {
      "version": "6.3.1",
@@ -11858,16 +11883,16 @@
      }
    },
    "@tensorflow/tfjs": {
-      "version": "4.17.0",
-      "resolved": "https://registry.npmjs.org/@tensorflow/tfjs/-/tfjs-4.17.0.tgz",
-      "integrity": "sha512-yXRBhpM3frlNA/YaPp6HNk9EfIi8han5RYeQA3R8OCa0Od+AfoG1PUmlxV8fE2wCorlGVyHsgpiJ6M9YZPB56w==",
+      "version": "4.21.0",
+      "resolved": "https://registry.npmjs.org/@tensorflow/tfjs/-/tfjs-4.21.0.tgz",
+      "integrity": "sha512-7D/+H150ptvt+POMbsME3WlIvLiuBR2rCC2Z0hOKKb/5Ygkj7xsp/K2HzOvUj0g0yjk+utkU45QEYhnhjnbHRA==",
      "requires": {
-        "@tensorflow/tfjs-backend-cpu": "4.17.0",
-        "@tensorflow/tfjs-backend-webgl": "4.17.0",
-        "@tensorflow/tfjs-converter": "4.17.0",
-        "@tensorflow/tfjs-core": "4.17.0",
-        "@tensorflow/tfjs-data": "4.17.0",
-        "@tensorflow/tfjs-layers": "4.17.0",
+        "@tensorflow/tfjs-backend-cpu": "4.21.0",
+        "@tensorflow/tfjs-backend-webgl": "4.21.0",
+        "@tensorflow/tfjs-converter": "4.21.0",
+        "@tensorflow/tfjs-core": "4.21.0",
+        "@tensorflow/tfjs-data": "4.21.0",
+        "@tensorflow/tfjs-layers": "4.21.0",
        "argparse": "^1.0.10",
        "chalk": "^4.1.0",
        "core-js": "3.29.1",
@@ -11883,35 +11908,35 @@
      }
    },
    "@tensorflow/tfjs-backend-cpu": {
-      "version": "4.17.0",
-      "resolved": "https://registry.npmjs.org/@tensorflow/tfjs-backend-cpu/-/tfjs-backend-cpu-4.17.0.tgz",
-      "integrity": "sha512-2VSCHnX9qhYTjw9HiVwTBSnRVlntKXeBlK7aSVsmZfHGwWE2faErTtO7bWmqNqw0U7gyznJbVAjlow/p+0RNGw==",
+      "version": "4.21.0",
+      "resolved": "https://registry.npmjs.org/@tensorflow/tfjs-backend-cpu/-/tfjs-backend-cpu-4.21.0.tgz",
+      "integrity": "sha512-yS9Oisg4L48N7ML6677ilv1eP5Jt59S74skSU1cCsM4yBAtH4DAn9b89/JtqBISh6JadanfX26b4HCWQvMvqFg==",
      "requires": {
        "@types/seedrandom": "^2.4.28",
        "seedrandom": "^3.0.5"
      }
    },
    "@tensorflow/tfjs-backend-webgl": {
-      "version": "4.17.0",
-      "resolved": "https://registry.npmjs.org/@tensorflow/tfjs-backend-webgl/-/tfjs-backend-webgl-4.17.0.tgz",
-      "integrity": "sha512-CC5GsGECCd7eYAUaKq0XJ48FjEZdgXZWPxgUYx4djvfUx5fQPp35hCSP9w/k463jllBMbjl2tKRg8u7Ia/LYzg==",
+      "version": "4.21.0",
+      "resolved": "https://registry.npmjs.org/@tensorflow/tfjs-backend-webgl/-/tfjs-backend-webgl-4.21.0.tgz",
+      "integrity": "sha512-7k6mb7dd0uF9jI51iunF3rhEXjvR/a613kjWZ0Rj3o1COFrneyku2C7cRMZERWPhbgXZ+dF+j9MdpGIpgtShIQ==",
      "requires": {
-        "@tensorflow/tfjs-backend-cpu": "4.17.0",
+        "@tensorflow/tfjs-backend-cpu": "4.21.0",
        "@types/offscreencanvas": "~2019.3.0",
        "@types/seedrandom": "^2.4.28",
        "seedrandom": "^3.0.5"
      }
    },
    "@tensorflow/tfjs-converter": {
-      "version": "4.17.0",
-      "resolved": "https://registry.npmjs.org/@tensorflow/tfjs-converter/-/tfjs-converter-4.17.0.tgz",
-      "integrity": "sha512-qFxIjPfomCuTrYxsFjtKbi3QfdmTTCWo+RvqD64oCMS0sjp7sUDNhJyKDoLx6LZhXlwXpHIVDJctLMRMwet0Zw==",
+      "version": "4.21.0",
+      "resolved": "https://registry.npmjs.org/@tensorflow/tfjs-converter/-/tfjs-converter-4.21.0.tgz",
+      "integrity": "sha512-cUhU+F1lGx2qnKk/gRy8odBh0PZlFz0Dl71TG8LVnj0/g352DqiNrKXlKO/po9aWzP8x0KUGC3gNMSMJW+T0DA==",
      "requires": {}
    },
    "@tensorflow/tfjs-core": {
-      "version": "4.17.0",
-      "resolved": "https://registry.npmjs.org/@tensorflow/tfjs-core/-/tfjs-core-4.17.0.tgz",
-      "integrity": "sha512-v9Q5430EnRpyhWNd9LVgXadciKvxLiq+sTrLKRowh26BHyAsams4tZIgX3lFKjB7b90p+FYifVMcqLTTHgjGpQ==",
+      "version": "4.21.0",
+      "resolved": "https://registry.npmjs.org/@tensorflow/tfjs-core/-/tfjs-core-4.21.0.tgz",
+      "integrity": "sha512-ZbECwXps5wb9XXcGq4ZXvZDVjr5okc3I0+i/vU6bpQ+nVApyIrMiyEudP8f6vracVTvNmnlN62vUXoEsQb2F8g==",
      "requires": {
        "@types/long": "^4.0.1",
        "@types/offscreencanvas": "~2019.7.0",
@@ -11930,9 +11955,9 @@
      }
    },
    "@tensorflow/tfjs-data": {
-      "version": "4.17.0",
-      "resolved": "https://registry.npmjs.org/@tensorflow/tfjs-data/-/tfjs-data-4.17.0.tgz",
-      "integrity": "sha512-aPKrDFip+gXicWOFALeNT7KKQjRXFkHd/hNe/zs4mCFcIN00hy1PkZ6xkYsgrsdLDQMBSGeS4B4ZM0k5Cs88QA==",
+      "version": "4.21.0",
+      "resolved": "https://registry.npmjs.org/@tensorflow/tfjs-data/-/tfjs-data-4.21.0.tgz",
+      "integrity": "sha512-LpJ/vyQMwYHkcVCqIRg7IVVw13VBY7rNAiuhmKP9S5NP/2ye4KA8BJ4XwDIDgjCVQM7glK9L8bMav++xCDf7xA==",
      "requires": {
        "@types/node-fetch": "^2.1.2",
        "node-fetch": "~2.6.1",
@@ -11940,9 +11965,9 @@
      }
    },
    "@tensorflow/tfjs-layers": {
-      "version": "4.17.0",
-      "resolved": "https://registry.npmjs.org/@tensorflow/tfjs-layers/-/tfjs-layers-4.17.0.tgz",
-      "integrity": "sha512-DEE0zRKvf3LJ0EcvG5XouJYOgFGWYAneZ0K1d23969z7LfSyqVmBdLC6BTwdLKuJk3ouUJIKXU1TcpFmjDuh7g==",
+      "version": "4.21.0",
+      "resolved": "https://registry.npmjs.org/@tensorflow/tfjs-layers/-/tfjs-layers-4.21.0.tgz",
+      "integrity": "sha512-a8KaMYlY3+llvE9079nvASKpaaf8xpCMdOjbgn+eGhdOGOcY7QuFUkd/2odvnXDG8fK/jffE1LoNOlfYoBHC4w==",
      "requires": {}
    },
    "@types/estree": {
--- a/package.json
+++ b/package.json
@@ -24,7 +24,7 @@
    "last 5 Firefox versions"
  ],
  "dependencies": {
-    "@tensorflow/tfjs": "^4.17.0",
+    "@tensorflow/tfjs": "^4.21.0",
    "dom7": "^4.0.6",
    "framework7": "^8.3.0",
    "framework7-icons": "^5.0.5",
--- a/public/conf/conf.yaml
+++ b/public/conf/conf.yaml
@@ -6,6 +6,7 @@ regions:
  - limbs
  - head
 useExternal: none
+disableWorkers: false
 external:
  - name: Mserver
    address: "192.169.1.105"
--- a/src/components/app.vue
+++ b/src/components/app.vue
@@ -79,7 +79,6 @@
          .then((mod) => { return mod.text() })
        this.siteConf = YAML.parse(confText)
      }
-      if (window.safari !== undefined) {store().safariDetected()}
      const loadSiteSettings = localStorage.getItem('siteSettings')
      if (loadSiteSettings) {
        let loadedSettings = JSON.parse(loadSiteSettings)
@@ -99,6 +98,9 @@
      store().set('siteDemo',this.siteConf?.demo)
      store().set('infoUrl',this.siteConf?.infoUrl)
      const loadServerSettings = localStorage.getItem('serverSettings')
+      if (this.siteConf.disableWorkers) {
+        store().disableWorkers()
+      }
      if (this.siteConf?.useExternal) {
        if (!['none','list','optional','required'].includes(this.siteConf.useExternal)) {
          console.warn(`'${this.siteConf.useExternal}' is not a valid value for useExternal configuration: using 'optional'`)
--- a/src/js/store.js
+++ b/src/js/store.js
@@ -5,12 +5,13 @@ const state = reactive({
    enabledRegions: ['thorax','abdomen','limbs','head'],
    regionIconSet: Math.floor(Math.random() * 3) + 1,
    version: '0.5.0-alpha',
+    build: '####',
    fullscreen: false,
    useExternal: 'optional',
+    workersEnabled: 'true',
    siteDemo: false,
    externalServerList: [],
-    infoUrl: false,
-    safariBrowser: false
+    infoUrl: false
  })

 const set = (config, confObj) => {
@@ -22,8 +23,8 @@ const agree = () => {
  state.disclaimerAgreement = true
 }

-const safariDetected = () => {
-  state.safariBrowser = true
+const disableWorkers = () => {
+  state.workersEnabled = false
 }

 const getServerList = () => {
@@ -51,14 +52,15 @@ export default () => ({
  isFullscreen: computed(() => state.fullscreen),
  demoMode: computed(() => state.siteDemo),
  externalType: computed(() => state.useExternal),
+  useWorkers: computed(() => state.workersEnabled),
  getRegions: computed(() => state.enabledRegions),
  getVersion: computed(() => state.version),
+  getBuild: computed(() => state.build),
  getIconSet: computed(() => state.regionIconSet),
  getInfoUrl: computed(() => state.infoUrl),
-  isSafari: computed(() => state.safariBrowser),
  set,
  agree,
-  safariDetected,
+  disableWorkers,
  getServerList,
  toggleFullscreen
 })
--- a/src/pages/detect.vue
+++ b/src/pages/detect.vue
@@ -160,6 +160,7 @@
        classesList: [],
        imageLoaded: false,
        imageView: new Image(),
+        imCvsLocation: {},
        imageLoadMode: "environment",
        detecting: false,
        detectPanel: false,
@@ -205,9 +206,12 @@
          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)
+      let modelJ = `../models/${this.detectorName}${this.otherSettings.mini ? '-mini' : ''}/model.json`
+      let miniJ = `../models/${this.detectorName}-mini/model.json`
+      this.modelLocation = new URL(modelJ,import.meta.url).href
+      this.miniLocation = new URL(miniJ,import.meta.url).href
+      let classesJ = `../models/${this.detectorName}/classes.json`
+      fetch(new URL(classesJ,import.meta.url).href)
        .then((mod) => { return mod.json() })
        .then((classes) => {
          this.classesList = classes
@@ -217,30 +221,12 @@
      if (loadServerSettings) this.serverSettings = JSON.parse(loadServerSettings)
    },
    mounted () {
-      this.detectWorker = new detectionWorker()
-      this.detectWorker.onmessage = (eMount) => {
-        self = this
-        if (eMount.data.error) {
-          console.log(eMount.data.message)
-          f7.dialog.alert(`ALVINN AI model error: ${eMount.data.message}`)
-        }
-        self.modelLoading = false
-      }
-      this.vidWorker = new detectionWorker()
-      this.vidWorker.onmessage = (eMount) => {
-        self = this
-        if (eMount.data.error) {
-          console.log(eMount.data.message)
-          f7.dialog.alert(`ALVINN AI nano model error: ${eMount.data.message}`)
-        }
-      }
-
      if (this.serverSettings && this.serverSettings.use) {
        this.getRemoteLabels()
        this.modelLoading = false
      } else {
        this.modelLoading = true
-        if (this.isSafari) {
+        if (!this.useWorkers) {
          this.loadModel(this.modelLocation, true).then(() => {
            this.modelLoading = false
          }).catch((e) => {
@@ -249,6 +235,23 @@
            this.modelLoading = false
          })
        } else {
+          this.detectWorker = new detectionWorker()
+          this.detectWorker.onmessage = (eMount) => {
+            self = this
+            if (eMount.data.error) {
+              console.log(eMount.data.message)
+              f7.dialog.alert(`ALVINN AI model error: ${eMount.data.message}`)
+            }
+            self.modelLoading = false
+          }
+          this.vidWorker = new detectionWorker()
+          this.vidWorker.onmessage = (eMount) => {
+            self = this
+            if (eMount.data.error) {
+              console.log(eMount.data.message)
+              f7.dialog.alert(`ALVINN AI nano model error: ${eMount.data.message}`)
+            }
+          }
          this.detectWorker.postMessage({call: 'loadModel', weights: this.modelLocation, preload: true})
          this.vidWorker.postMessage({call: 'loadModel', weights: this.miniLocation, preload: true})
        }
@@ -313,30 +316,32 @@
        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 () {
-        this.detectWorker.onmessage = (eDetect) => {
-          self = this
-          if (eDetect.data.error) {
-            self.detecting = false
-            self.resultData = {}
-            loadFailure()
-            f7.dialog.alert(`ALVINN structure finding error: ${eDetect.data.message}`)
-          } else if (eDetect.data.success == 'detection') {
-            self.detecting = false
-            self.resultData = eDetect.data.detections
-            if (self.resultData) {
-              self.resultData.detections.map(d => {d.label = self.detectorLabels[d.label].name})
+        if (this.detectWorker) {
+          this.detectWorker.onmessage = (eDetect) => {
+            self = this
+            if (eDetect.data.error) {
+              self.detecting = false
+              self.resultData = {}
+              loadFailure()
+              f7.dialog.alert(`ALVINN structure finding error: ${eDetect.data.message}`)
+            } else if (eDetect.data.success == 'detection') {
+              self.detecting = false
+              self.resultData = eDetect.data.detections
+              if (self.resultData) {
+                self.resultData.detections.map(d => {d.label = self.detectorLabels[d.label].name})
+              }
+              self.uploadDirty = true
+            } else if (eDetect.data.success == 'model') {
+              self.reloadModel = false
+              loadSuccess()
            }
-            self.uploadDirty = true
-          } else if (eDetect.data.success == 'model') {
-            self.reloadModel = false
-            loadSuccess()
          }
        }

        let loadSuccess = null
        let loadFailure = null
        let modelReloading = null
-        if (this.isSafari && this.reloadModel) {
+        if (!this.useWorkers && this.reloadModel) {
          await this.loadModel(this.modelLocation)
          this.reloadModel = false          
        } else {
@@ -353,12 +358,14 @@

        if (this.serverSettings && this.serverSettings.use) {
          this.remoteDetect()
-        } else if (!this.isSafari) {
+        } else if (this.useWorkers) {
          Promise.all([modelReloading,createImageBitmap(this.imageView)]).then(res => {
            this.detectWorker.postMessage({call: 'localDetect', image: res[1]}, [res[1]])
          })
        } else {
-          this.localDetect(this.imageView).then(dets => {
+          createImageBitmap(this.imageView).then(res => {
+            return this.localDetect(res)
+          }).then(dets => {
            this.detecting = false
            this.resultData = dets
            this.uploadDirty = true
@@ -395,7 +402,7 @@
            var vidElement = this.$refs.vid_viewer
            vidElement.width = trackDetails.width
            vidElement.height = trackDetails.height
-            if (this.isSafari) {
+            if (!this.useWorkers) {
              this.videoFrameDetect(vidElement)
            } else {
              this.videoFrameDetectWorker(vidElement)
@@ -470,6 +477,9 @@
        imageCtx.globalAlpha = 1
        imageCtx.strokeStyle = 'yellow'
        imageCtx.lineWidth = 3
+        if (this.imageLoaded) {
+          imageCtx.drawImage(this.imageView, 0, 0, this.imageView.width, this.imageView.height, this.imCvsLocation.left, this.imCvsLocation.top, this.imCvsLocation.width, this.imCvsLocation.height)
+        }
        return [imCanvas, imageCtx]
      },
      getImage (searchImage) {
@@ -510,8 +520,16 @@
          this.imageView.src = imgData
          return(this.imageView.decode())
        }).then( () => {
-          const [imCanvas, _]  = this.resetView()
-          imCanvas.style['background-image'] = `url(${this.imageView.src})`
+          const imCanvas = this.$refs.image_cvs
+          imCanvas.width = imCanvas.clientWidth
+          imCanvas.height = imCanvas.clientHeight
+          const imageCtx = imCanvas.getContext("2d")
+          let imageLoc = this.box2cvs({top: 0,left: 0,right: 1,bottom: 1})
+          this.imCvsLocation.top = imageLoc[0].cvsTop
+          this.imCvsLocation.left = imageLoc[0].cvsLeft
+          this.imCvsLocation.width = imageLoc[0].cvsRight - imageLoc[0].cvsLeft
+          this.imCvsLocation.height = imageLoc[0].cvsBottom - imageLoc[0].cvsTop
+          imageCtx.drawImage(this.imageView, 0, 0, this.imageView.width, this.imageView.height, this.imCvsLocation.left, this.imCvsLocation.top, this.imCvsLocation.width, this.imCvsLocation.height)
          f7.utils.nextFrame(() => {
            this.setData()
          })
@@ -546,7 +564,9 @@
      box2cvs(boxInput) {
        if (!boxInput || boxInput.length == 0) return []
        const boxList = boxInput.length ? boxInput : [boxInput]
-        const [imCanvas, imageCtx] = this.resetView()
+        //const [imCanvas, imageCtx] = this.resetView()
+        const imCanvas = this.$refs.image_cvs
+        //const imageCtx = imCanvas.getContext("2d")
        var imgWidth
        var imgHeight
        const imgAspect = this.imageView.width / this.imageView.height
--- a/src/pages/home.vue
+++ b/src/pages/home.vue
@@ -97,8 +97,7 @@
 </style>

 <script>
-  import { touchstart } from 'dom7'
-import RegionIcon from '../components/region-icon.vue'
+  import RegionIcon from '../components/region-icon.vue'
  import store from '../js/store'
  import { f7 } from 'framework7-vue'

@@ -113,6 +112,11 @@ import RegionIcon from '../components/region-icon.vue'
      }
    },
    setup() {
+      //URL TESTING CODE
+      //let testUrl = URL.parse(`../models/thorax/model.json`,import.meta.url).href
+      //console.log(testUrl)
+      //let testUrl2 = new URL(`../models/thorax/model.json`,import.meta.url)
+      //console.log(testUrl2)
      return store()
    },
    methods: {
--- a/src/pages/specs.vue
+++ b/src/pages/specs.vue
@@ -8,7 +8,8 @@
        <f7-block-title medium>Details</f7-block-title>
        <f7-list>
          <f7-list-item title="Version" :after="alvinnVersion"></f7-list-item>
-          <f7-list-item v-if="isSafari" title="Safari" after="Workers disabled"></f7-list-item>
+          <f7-list-item title="Build" :after="alvinnBuild"></f7-list-item>
+          <f7-list-item title="Workers" :after="useWorkers ? 'Enabled' : 'Disabled'"></f7-list-item>
        </f7-list>
        <f7-block-title medium>Models</f7-block-title>
        <f7-list style="width: 100%;">
@@ -52,8 +53,9 @@
        headneckDetails: {},
        miniHeadneckDetails: {},
        alvinnVersion: store().getVersion,
+        alvinnBuild: store().getBuild,
        isCordova: !!window.cordova,
-        isSafari: store().isSafari,
+        useWorkers: store().useWorkers,
        otherSettings: {}
      }
    },
Author	SHA1	Message	Date
Justin Georgi	47363b9a4c	Switch image display to canvas Signed-off-by: Justin Georgi <justin.georgi@gmail.com>	2024-09-15 12:58:08 -07:00
Justin Georgi	8ba930ed2e	Remove run attempt from build number All checks were successful Build Dev PWA / Build-PWA (push) Successful in 36s Details Signed-off-by: Justin Georgi <justin.georgi@gmail.com>	2024-09-12 19:55:30 -07:00
Justin Georgi	d2ee45c61a	Add build info to specs page All checks were successful Build Dev PWA / Build-PWA (push) Successful in 37s Details Signed-off-by: Justin Georgi <justin.georgi@gmail.com>	2024-09-12 19:47:09 -07:00
Justin Georgi	e4a3d1ab46	Remove safari detection All checks were successful Build Dev PWA / Build-PWA (push) Successful in 37s Details Signed-off-by: Justin Georgi <justin.georgi@gmail.com>	2024-09-12 18:56:03 -07:00
Justin Georgi	862773d622	Upgrade tensorflowjs All checks were successful Build Dev PWA / Build-PWA (push) Successful in 37s Details Signed-off-by: Justin Georgi <justin.georgi@gmail.com>	2024-09-11 16:32:55 -07:00
Justin Georgi	47ec235cfa	Clean up new worker configuration All checks were successful Build Dev PWA / Build-PWA (push) Successful in 39s Details Signed-off-by: Justin Georgi <justin.georgi@gmail.com>	2024-09-11 11:46:37 -07:00
Justin Georgi	dcdde0289b	Set worker use as configuration setting Signed-off-by: Justin Georgi <justin.georgi@gmail.com>	2024-09-11 10:55:26 -07:00
Justin Georgi	390faf0a29	Replace url parse with new url for safari All checks were successful Build Dev PWA / Build-PWA (push) Successful in 38s Details Signed-off-by: Justin Georgi <justin.georgi@gmail.com>	2024-09-10 17:41:20 -07:00