end?

Author: LaurentBerger

models/pose_estimation_mediapipe/demo.cpp

@@ -459,7 +459,7 @@ void drawLines(Mat image, Mat landmarks, Mat keeplandmarks, bool isDrawPoint = t
     if (isDrawPoint)
         for (int idxRow = 0; idxRow < landmarks.rows; idxRow++)
             if (keeplandmarks.at<uchar>(idxRow))
-                circle(image, Point(landmarks.row(idxRow)), thickness, (0, 0, 255), -1);
+                circle(image, Point(landmarks.row(idxRow)), thickness, Scalar(0, 0, 255), -1);
 }
 
 
@@ -514,49 +514,48 @@ pair<Mat, Mat> visualize(Mat image, vector<tuple<Mat, Mat, Mat, Mat, Mat, float>
         for (int idxRow = 0; idxRow < landmarksScreen.rows; idxRow++)
         {
             Mat landmark;// p in enumerate(landmarks_screen[:, 0 : 3].astype(np.int32))
-            landmarksScreen.colRange(0, 3).convertTo(landmark, CV_32S);
+            landmarksScreen.row(idxRow).convertTo(landmark, CV_32S);
             if (keepLandmarks.at<uchar>(idxRow))
                 circle(displayScreen, Point(landmark.at<int>(0), landmark.at<int>(1)), 2, Scalar(0, 0, 255), -1);
+        }
 
+        if (!isDraw)
+        {
+            isDraw = true;
+            // Main view
+            Mat landmarksXY = landmarksWord.colRange(0, 2).clone();
+            Mat x = landmarksXY * 100 + 100;
+            x.convertTo(landmarksXY, CV_32S);
+            drawLines(display3d, landmarksXY, keepLandmarks, 2);
 
-            if (!isDraw)
-            {
-                isDraw = true;
-                // Main view
-                Mat landmarksXY = landmarksWord.colRange(0, 2).clone();
-                Mat x = landmarksXY * 100 + 100;
-                x.convertTo(landmarksXY, CV_32S);
-                drawLines(display3d, landmarksXY, keepLandmarks, 2);
-
-                // Top view
-                Mat landmarksXZ;
-                hconcat(landmarksWord.col(0), landmarksWord.col(2), landmarksXZ);
-                landmarksXZ.col(1) = -landmarksXZ.col(1);
-                x = landmarksXZ * 100;
-                x.col(0) += 300;
-                x.col(1) += 100;
-                x.convertTo(landmarksXZ, CV_32S);
-                drawLines(display3d, landmarksXZ, keepLandmarks, 2);
+            // Top view
+            Mat landmarksXZ;
+            hconcat(landmarksWord.col(0), landmarksWord.col(2), landmarksXZ);
+            landmarksXZ.col(1) = -landmarksXZ.col(1);
+            x = landmarksXZ * 100;
+            x.col(0) += 300;
+            x.col(1) += 100;
+            x.convertTo(landmarksXZ, CV_32S);
+            drawLines(display3d, landmarksXZ, keepLandmarks, 2);
 
-                // Left view
-                Mat landmarksYZ;
-                hconcat(landmarksWord.col(2), landmarksWord.col(1), landmarksYZ);
-                landmarksYZ.col(0) = -landmarksYZ.col(0);
-                x = landmarksYZ * 100;
-                x.col(0) += 100;
-                x.col(1) += 300;
-                x.convertTo(landmarksYZ, CV_32S);
-                drawLines(display3d, landmarksYZ, keepLandmarks, 2);
+            // Left view
+            Mat landmarksYZ;
+            hconcat(landmarksWord.col(2), landmarksWord.col(1), landmarksYZ);
+            landmarksYZ.col(0) = -landmarksYZ.col(0);
+            x = landmarksYZ * 100;
+            x.col(0) += 100;
+            x.col(1) += 300;
+            x.convertTo(landmarksYZ, CV_32S);
+            drawLines(display3d, landmarksYZ, keepLandmarks, 2);
 
-                // Right view
-                Mat landmarksZY;
-                hconcat(landmarksWord.col(2), landmarksWord.col(1), landmarksZY);
-                x = landmarksZY * 100;
-                x.col(0) += 300;
-                x.col(1) += 300;
-                x.convertTo(landmarksZY, CV_32S);
-                drawLines(display3d, landmarksZY, keepLandmarks, 2);
-            }
+            // Right view
+            Mat landmarksZY;
+            hconcat(landmarksWord.col(2), landmarksWord.col(1), landmarksZY);
+            x = landmarksZY * 100;
+            x.col(0) += 300;
+            x.col(1) += 300;
+            x.convertTo(landmarksZY, CV_32S);
+            drawLines(display3d, landmarksZY, keepLandmarks, 2);
         }
     }
     return pair<Mat, Mat>(displayScreen, display3d);