add repair

app.py

@@ -126,7 +126,7 @@ with gr.Blocks(css="""button { min-width: 80px; }""") as demo:
 - "q + click" to delete person
 - "x + drag" to x-axis pseudo-3D rotation
 - "c + drag" to y-axis pseudo-3D rotation
-
+- "r + click" to repair
 Points to note for pseudo-3D rotation: When performing pseudo-3D rotation on the X and Y axes, the projection is converted to 2D and Z-axis information is lost when the mouse button is released. This means that if you finish dragging while the shape is collapsed, you may not be able to restore it to its original state. In such a case, please use the "undo" function.
 """)
 

static/poseEditor.js

@@ -2,6 +2,53 @@ console.log("hello from poseEditor.js")
 var canvas = null;
 var ctx = null;
 
+const limbSeq = [
+  [1, 2], [2, 3], [3, 4], // 右腕
+  [1, 5], [5, 6], [6, 7], // 左腕
+  [1, 8], [8, 9], [9, 10],  // 右胴→右脚
+  [1, 11], [11, 12], [12, 13], // 左胴→左脚
+  [1, 0], // 首
+  [0, 14], [14, 16], // 右目
+  [0, 15], [15, 17] // 左目
+];
+
+function findParentNodeIndex(nodeIndex) {
+  // limbSeqの各要素の2番目の要素がjointIndexの場合、その要素の1番目の要素を返す
+  // 見つからないばあいは-1を返す
+  limbIndex = limbSeq.findIndex((limb) => limb[1] === nodeIndex);
+  return limbIndex === -1 ? -1 : limbSeq[limbIndex][0];
+}
+
+function repairPose(sourcePose) {
+  // TODO: ループには対応してないかも
+  var pose = sourcePose;
+  var newPose = new Array(18)
+  for (var k = 0; k < 3; k++) {
+    var processed = 0; // イテレーション用
+    for (let i = 0; i < 18; i++) {
+      if (pose[i] == null) {
+        let parent = findParentNodeIndex(i);
+        if (parent === -1) {continue;} // あり得ない
+        if (pose[parent] == null) {
+          console.log(`repair failed(A): ${i} -> parent loss`);
+          continue;
+        }
+
+        // サンプルデータから引っ張ってくる
+        var v = sampleCandidateSource[i].map((x, j) => x - sampleCandidateSource[parent][j]);
+        newPose[i] = pose[parent].map((x, j) => x + v[j]);
+        console.log(`repaired: ${i} -> ${newPose[newPose.length - 1]}`);
+        processed++;
+      } else {
+        newPose[i] = pose[i].map(x => x);
+      }
+    }
+    if (processed === 0) {break;}
+    pose = newPose;
+  }
+  return newPose;
+}
+
 function deepCopy(arr) {
   return JSON.parse(JSON.stringify(arr));
 }
@@ -68,6 +115,12 @@ function removePerson(personIndex) {
   Redraw();
 }
 
+function repairPerson(personIndex) {
+  poseData[personIndex] = repairPose(poseData[personIndex]);
+  addHistory();
+  Redraw();
+}
+
 // ドラッグ中の各キーが押されているかどうかのフラグ
 var keyDownFlags = {};
 // マウスカーソル
@@ -158,9 +211,6 @@ function rotateAndProject(f, p, c, angle) {
 
 function drawBodyPose() {
   const stickWidth = 6;
-  const limbSeq = [[2, 3], [2, 6], [3, 4], [4, 5], [6, 7], [7, 8], [2, 9], [9, 10],
-                [10, 11], [2, 12], [12, 13], [13, 14], [2, 1], [1, 15], [15, 17],
-                [1, 16], [16, 18], [3, 17], [6, 18]];
 
   const colors = [[255, 0, 0], [255, 85, 0], [255, 170, 0], [255, 255, 0], [170, 255, 0], [85, 255, 0], [0, 255, 0],
               [0, 255, 85], [0, 255, 170], [0, 255, 255], [0, 170, 255], [0, 85, 255], [0, 0, 255], [85, 0, 255],
@@ -173,8 +223,8 @@ function drawBodyPose() {
 
     // edge
     for (let j = 0; j < 17; j++) {
-      const p = pose[limbSeq[j][0]-1];
-      const q = pose[limbSeq[j][1]-1];
+      const p = pose[limbSeq[j][0]];
+      const q = pose[limbSeq[j][1]];
       if (p == null || q == null) continue;
       const [X0, Y0] = p;
       const [X1, Y1] = q;
@@ -317,10 +367,8 @@ function handleMouseDown(event) {
   const p = getCanvasPosition(event);
   const [personIndex, nodeIndex, minDist] = getNearestNode(p);
 
-  if (keyDownFlags["KeyQ"]) {
-    removePerson(personIndex);
-    return;
-  }
+  if (keyDownFlags["KeyQ"]) {removePerson(personIndex);return;}
+  if (keyDownFlags["KeyR"]) {repairPerson(personIndex);return;}
 
   // ドラッグ処理の開始
   dragStart = p;