Merge pull request #487 from harena-lab/development

feat (pocus): new video classifier
harena-lab · Sep 25, 2024 · 33cdae6 · 33cdae6
2 parents 0de89ca + c07b3cb
commit 33cdae6
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 10 deletions.
diff --git a/src/adonisjs/public/author/index.html b/src/adonisjs/public/author/index.html
@@ -449,9 +449,13 @@ <h6 style="color:#808080;">Created by {{author_grade}}: {{username}} ({{institut
                     <div id="case-artifacts"></div>
                     <div id="progress-artifacts"></div>
                     <div id="artifact-controls">
-                       <input type="file" id="artifacts-select" name="artifacts-select" multiple="multiple"
-                              accept="image/png, image/jpeg, image/svg+xml, audio/mpeg, video/mp4, video/webm, video/quicktime, video/x-msvideo">
-                       <dcc-button xstyle="in" topic="generator/activate/artifact-knot" label="PLACE IN KNOTS"></dcc-button>
+                      <input type="file" id="artifacts-select" name="artifacts-select" multiple="multiple"
+                             accept="image/png, image/jpeg, image/svg+xml, audio/mpeg, video/mp4, video/webm, video/quicktime, video/x-msvideo">
+                      <div class="form-check" style="background-color: lightgray; padding: 10px;">
+                        <input type="checkbox" id="auto-classify" name="auto-classify">
+                        <label for="auto-classify">Automatically Classify (may take time)</label>
+                      </div>
+                      <dcc-button xstyle="in" topic="generator/activate/artifact-knot" label="PLACE IN KNOTS"></dcc-button>
                     </div>
                  </div>
               </div>

diff --git a/src/adonisjs/public/author/js/artifacts.js b/src/adonisjs/public/author/js/artifacts.js
@@ -20,8 +20,10 @@ class Artifacts {
   }
 
   async _uploadArtifacts () {
+    this._artifactClass = {}
     let files = document.querySelector('#artifacts-select').files
     let progSpace = document.querySelector('#progress-artifacts')
+    const classify = document.querySelector('#auto-classify').checked
     let a = 0
     for (let f of files) {
       let art = document.createElement('div')
@@ -39,11 +41,15 @@ class Artifacts {
           {
             file: f,
             caseid: Basic.service.currentCaseId,
+            classify: (classify) ? 'true' : 'false',
             progress: prMsg
           }, null, true)
-      ref.innerHTML = '<a href="' + artifact.message.url + '" target="_blank">' +
-                      f.name + '</a>'
+      const html = `<a href="${artifact.message.url}" target="_blank">${f.name}</a>`
+      ref.innerHTML = html
+
       this._insertArtifactReference(artifact.message.filename, f.name)
+      if (artifact.message.classification != null)
+        this._artifactClass[artifact.message.filename] = artifact.message.classification
     }
     progSpace.innerHTML = ''
     this.showArtifacts()
@@ -103,7 +109,8 @@ class Artifacts {
       document.querySelector('#artifact-controls').style.display = 'none'
       ArtifactKnotGenerator.activate(
         compiled.artifacts, compiled.generators['artifact-knot'],
-          document.querySelector('#case-artifacts'))
+        document.querySelector('#case-artifacts'),
+        this._artifactClass)
     }
   }
 

diff --git a/src/adonisjs/public/author/js/dcc-author-server-proxy.js b/src/adonisjs/public/author/js/dcc-author-server-proxy.js
@@ -369,6 +369,7 @@ class DCCAuthorServer {
       data.append('image', this.b64toBlob(message.b64))
     }
     data.append('caseId', message.caseid)
+    data.append('classify', message.classify)
     const config = {
       method: 'POST',
       url: DCCCommonServer.managerAddressAPI + 'artifact',

diff --git a/src/adonisjs/public/author/js/generator/artifact-knot.js b/src/adonisjs/public/author/js/generator/artifact-knot.js
@@ -3,14 +3,14 @@
  */
 
 class ArtifactKnotGenerator {
-  static activate (artifacts, candidates, html) {
+  static activate (artifacts, candidates, html, classification) {
     if (ArtifactKnotGenerator.i == null)
       ArtifactKnotGenerator.i = new ArtifactKnotGenerator()
 
-    ArtifactKnotGenerator.i.buildGenerator(artifacts, candidates, html)
+    ArtifactKnotGenerator.i.buildGenerator(artifacts, candidates, html, classification)
   }
 
-  buildGenerator (artifacts, candidates, html) {
+  buildGenerator (artifacts, candidates, html, classification) {
     MessageBus.i.publish('control/elements/wide')
 
     this._prepareSubgroup = this._prepareSubgroup.bind(this)
@@ -42,7 +42,10 @@ class ArtifactKnotGenerator {
                  '<option value="_empty_" selected></option>'
       for (let c in candidates)
          artHTML += '<option value="' + c + '">' + candidates[c].description + '</option>'
-      artHTML += '</select></td>'
+      artHTML += '</select>'
+      if (classification[a] != null)
+        artHTML += `<p>suggestion: ${classification[a]} - ${ArtifactKnotGenerator._classDescription[classification[a]]}</p>`
+      artHTML += '</td>'
       artHTML += '<td><select name="s_' + id + '" id="s_' + id + '">' +
                  '<option value="_empty_" selected></option></select></td></tr>'
     }
@@ -139,3 +142,14 @@ class ArtifactKnotGenerator {
     MessageBus.i.publish('generator/finished/artifact-knot')
   }
 }
+
+ArtifactKnotGenerator._classDescription = {
+  'SX': 'Sub-xifóide ou Subcostal',
+  'PL': 'Para-esternal Longa',
+  'A4': 'Apical de 4 câmaras',
+  'PM': 'Paraesternal curta nível mitral',
+  'PV': 'Paraesternal curta nível V. aortica',
+  'PP': 'Paraesternal curta nível papilares',
+  'VI': 'Other',
+  'UN': 'Unidentified'
+}