Merge pull request #15 from GOOD-I-DEER/feat/face-detection-node

Feat/face detection node
Samsung · Sep 21, 2023 · 45b9df8 · 45b9df8
2 parents c03e4e7 + c33c111
commit 45b9df8
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 16 deletions.
diff --git a/GOOD-I-DEER/nodes/object-detection-node/face-detection.html b/GOOD-I-DEER/nodes/object-detection-node/face-detection.html
@@ -1,10 +1,10 @@
 <script type="text/javascript">
-  RED.nodes.registerType("face-detection", {
+  RED.nodes.registerType("good-face-detection", {
     category: "GOOD I DEER",
     color: "#1AE5BE",
     defaults: {
       name: { value: "" },
-      returnType: { value: "information", validate: function(v) {
+      returnType: { value: 0, validate: function(v) {
         const returnType = Number(v);
 
         if(returnType <= 1) {
@@ -15,10 +15,18 @@
           } else if(returnType == 1) {
             this._def.outputLabels = ["Image Buffer"];
           }
+          this._def.defaults.absolutePathDir.validate = function(v) {
+            return true;
+          };
         } else if (returnType == 2){
           $("#absolutePathDir-form").css('display', 'block');
           this.outputs = 0;
           this._def.outputLabels = undefined;
+          this._def.defaults.absolutePathDir.validate = function(v) {
+            if(v)
+              return true;
+            return false;
+          }
         }
         return true;
       } },
@@ -32,11 +40,7 @@
         }
         return threshold >= 0 && threshold < 1;
       }},
-      absolutePathDir: { value: "", validate: function(v) {
-        if(v)
-          return true;
-        return false;
-      } }
+      absolutePathDir: { value: "" }
     },
     inputs: 1,
     outputs: 1,
@@ -50,7 +54,7 @@
   });
 </script>
 
-<script type="text/html" data-template-name="face-detection">
+<script type="text/html" data-template-name="good-face-detection">
   <div class="form-row">
     <label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
     <input type="text" id="node-input-name" placeholder="Name" />
@@ -74,6 +78,6 @@
   </div>
 </script>
 
-<script type="text/html" data-help-name="face-detection">
+<script type="text/html" data-help-name="good-face-detection">
   <p>face-detection node using yolov8</p>
 </script>
diff --git a/GOOD-I-DEER/nodes/object-detection-node/face-detection.js b/GOOD-I-DEER/nodes/object-detection-node/face-detection.js
@@ -7,6 +7,7 @@ module.exports = function (RED) {
 
     const node = this;
     const returnType = Number(config.returnType);
+    console.log(config.returnType);
     const saveDir = config.absolutePathDir;
     let bufferFromImage;
 
@@ -207,5 +208,5 @@ module.exports = function (RED) {
     }
   }
 
-  RED.nodes.registerType("face-detection", yolov8NodeFace);
+  RED.nodes.registerType("good-face-detection", yolov8NodeFace);
 };
diff --git a/GOOD-I-DEER/nodes/object-detection-node/object-detection.html b/GOOD-I-DEER/nodes/object-detection-node/object-detection.html
@@ -1,5 +1,5 @@
 <script type="text/javascript">
-  RED.nodes.registerType("object-detection", {
+  RED.nodes.registerType("good-object-detection", {
     category: "GOOD I DEER",
     color: "#1AE5BE",
     defaults: {
@@ -28,7 +28,7 @@
   });
 </script>
 
-<script type="text/html" data-template-name="object-detection">
+<script type="text/html" data-template-name="good-object-detection">
   <div class="form-row">
     <label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
     <input type="text" id="node-input-name" placeholder="Name" />
@@ -48,6 +48,6 @@
   </div>
 </script>
 
-<script type="text/html" data-help-name="object-detection">
+<script type="text/html" data-help-name="good-object-detection">
   <p>object-detection node using yolov8</p>
 </script>
diff --git a/GOOD-I-DEER/nodes/object-detection-node/object-detection.js b/GOOD-I-DEER/nodes/object-detection-node/object-detection.js
@@ -257,5 +257,5 @@ module.exports = function (RED) {
     ];
   }
 
-  RED.nodes.registerType("object-detection", yolov8Node);
+  RED.nodes.registerType("good-object-detection", yolov8Node);
 };
diff --git a/package.json b/package.json
@@ -22,9 +22,9 @@
       "AWS": "301-AWS.js",
       "DB": "302-DB.js",
       "SlackNotification": "303-SlackNotification.js",
-      "ObjectDetection": "GOOD-I-DEER/nodes/object-detection-node/object-detection.js",
+      "GoodObjectDetection": "GOOD-I-DEER/nodes/object-detection-node/object-detection.js",
+      "GoodFaceDetection": "GOOD-I-DEER/nodes/object-detection-node/face-detection.js",
       "ChromaDB": "GOOD-I-DEER/nodes/chroma-db-node/chroma-db.js",
-      "FaceDetection": "GOOD-I-DEER/nodes/object-detection-node/face-detection.js",
       "FaceVectorization": "GOOD-I-DEER/nodes/face-vectorization-node/face-vectorization.js",
       "CalculateCosine": "GOOD-I-DEER/nodes/cosine-similarity-node/calculate-cosine.js"
     }