Fixed #233 + typos + pose tutorial 2

CMU-Perceptual-Computing-Lab · Sep 3, 2017 · 4f81fe5 · 4f81fe5
1 parent 8c86d14
commit 4f81fe5
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 6 deletions.
diff --git a/examples/tutorial_thread/1_openpose_read_and_display.cpp b/examples/tutorial_thread/1_openpose_read_and_display.cpp
@@ -132,7 +132,7 @@ int openPoseTutorialThread1()
 
     // ------------------------- CLOSING -------------------------
     // Logging information message
-    op::log("Example 3 successfully finished.", op::Priority::High);
+    op::log("Example 1 successfully finished.", op::Priority::High);
     // Return successful message
     return 0;
 }

diff --git a/examples/tutorial_thread/2_user_processing_function.cpp b/examples/tutorial_thread/2_user_processing_function.cpp
@@ -174,7 +174,7 @@ int openPoseTutorialThread2()
 
     // ------------------------- CLOSING -------------------------
     // Logging information message
-    op::log("Example 3 successfully finished.", op::Priority::High);
+    op::log("Example 2 successfully finished.", op::Priority::High);
     // Return successful message
     return 0;
 }

diff --git a/examples/tutorial_thread/4_user_input_processing_output_and_datum.cpp b/examples/tutorial_thread/4_user_input_processing_output_and_datum.cpp
@@ -229,7 +229,7 @@ int openPoseTutorialThread4()
 
     // ------------------------- CLOSING -------------------------
     // Logging information message
-    op::log("Example 3 successfully finished.", op::Priority::High);
+    op::log("Example 4 successfully finished.", op::Priority::High);
     // Return successful message
     return 0;
 }

diff --git a/include/openpose/pose/poseParameters.hpp b/include/openpose/pose/poseParameters.hpp
@@ -61,7 +61,7 @@ namespace op
          85.f,     0.f,   255.f
     const std::vector<float> POSE_COCO_COLORS_RENDER{POSE_COCO_COLORS_RENDER_GPU};
     // MPI
-    const std::map<unsigned int, std::string> POSE_MPI_BODY_PARTS{
+    const std::map<unsigned int, std::string> POSE_MPI_BODY_PARTS {
         {0,  "Head"},
         {1,  "Neck"},
         {2,  "RShoulder"},
@@ -102,7 +102,27 @@ namespace op
           0.f,     0.f,   255.f
     const std::vector<float> POSE_MPI_COLORS_RENDER{POSE_MPI_COLORS_RENDER_GPU};
     // BODY_18
-    const std::map<unsigned int, std::string> POSE_BODY_18_BODY_PARTS   {POSE_COCO_BODY_PARTS};
+    const std::map<unsigned int, std::string> POSE_BODY_18_BODY_PARTS { // Windows map copy error if `= POSE_COCO_BODY_PARTS`
+		{ 0,  "Nose" },
+		{ 1,  "Neck" },
+		{ 2,  "RShoulder" },
+		{ 3,  "RElbow" },
+		{ 4,  "RWrist" },
+		{ 5,  "LShoulder" },
+		{ 6,  "LElbow" },
+		{ 7,  "LWrist" },
+		{ 8,  "RHip" },
+		{ 9,  "RKnee" },
+		{ 10, "RAnkle" },
+		{ 11, "LHip" },
+		{ 12, "LKnee" },
+		{ 13, "LAnkle" },
+		{ 14, "REye" },
+		{ 15, "LEye" },
+		{ 16, "REar" },
+		{ 17, "LEar" },
+		{ 18, "Background" }
+	};
     const unsigned int POSE_BODY_18_NUMBER_PARTS                        {POSE_COCO_NUMBER_PARTS};
     const std::vector<unsigned int> POSE_BODY_18_MAP_IDX                {POSE_COCO_MAP_IDX};
     #define POSE_BODY_18_PAIRS_RENDER_GPU                               POSE_COCO_PAIRS_RENDER_GPU

diff --git a/include/openpose/pose/poseRenderer.hpp b/include/openpose/pose/poseRenderer.hpp
@@ -17,7 +17,7 @@ namespace op
                      const std::shared_ptr<PoseExtractor>& poseExtractor, const float renderThreshold,
                      const bool blendOriginalFrame = true, const float alphaKeypoint = POSE_DEFAULT_ALPHA_KEYPOINT,
                      const float alphaHeatMap = POSE_DEFAULT_ALPHA_HEAT_MAP, const unsigned int elementToRender = 0u,
-                     const RenderMode renderMode = RenderMode::Cpu);
+                     const RenderMode renderMode = RenderMode::Gpu);
 
         ~PoseRenderer();