diff --git a/doxygen.log b/doxygen.log index 0b2f9cd5222f62ec7a9df923cbdca52271bc39f7..26833c8f0e8d5e972813a43af6b123e447d5a22e 100644 --- a/doxygen.log +++ b/doxygen.log @@ -973,5 +973,5 @@ Generating file index... Generating file member index... Generating example index... finalizing index lists... -lookup cache used 2999/65536 hits=17811 misses=3204 +lookup cache used 2998/65536 hits=17805 misses=3203 finished... diff --git a/html/namespaceop.html b/html/namespaceop.html index 18658aff434ee047b76208f5b57c93c96b12e55b..fd561d09c9715bb0a9c370791b770507e7d6fa05 100644 --- a/html/namespaceop.html +++ b/html/namespaceop.html @@ -2402,14 +2402,14 @@ template<typename TPointerContainer > - +
- + @@ -2418,14 +2418,14 @@ template<typename TPointerContainer > - +
op::COMPILE_TEMPLATE_DATUM (WPeopleJsonSaver WGui  )
- + @@ -2434,14 +2434,14 @@ template<typename TPointerContainer > - +
op::COMPILE_TEMPLATE_DATUM (WGui WPoseTriangulation  )
- + @@ -2450,14 +2450,14 @@ template<typename TPointerContainer > - +
op::COMPILE_TEMPLATE_DATUM (WGui3D WPeopleJsonSaver  )
- + diff --git a/html/w_gui3_d_8hpp_source.html b/html/w_gui3_d_8hpp_source.html index d5cfdb7aaedf34b2bc2a2bac73a7922bcf13637b..24101b11ac547e03883fc0f8fa7a21c7164dcfb3 100644 --- a/html/w_gui3_d_8hpp_source.html +++ b/html/w_gui3_d_8hpp_source.html @@ -172,39 +172,42 @@ $(document).ready(function(){initNavTree('w_gui3_d_8hpp_source.html','');});
63  dLog("", Priority::Low, __LINE__, __FUNCTION__, __FILE__);
64  // Profiling speed
65  const auto profilerKey = Profiler::timerInit(__LINE__, __FUNCTION__, __FILE__);
-
66  if (!tDatums->empty())
-
67  {
-
68  // T* to T
-
69  auto& tDatum = (*tDatums)[0];
-
70  // Update cvMat
-
71  std::vector<cv::Mat> cvOutputDatas;
-
72  for (auto& tDatum : *tDatums)
-
73  cvOutputDatas.emplace_back(tDatum.cvOutputData);
-
74  spGui3D->setImage(cvOutputDatas);
-
75  // Update keypoints
+
66  // Update cvMat & keypoints
+
67  if (!tDatums->empty())
+
68  {
+
69  // Update cvMat
+
70  std::vector<cv::Mat> cvOutputDatas;
+
71  for (auto& tDatum : *tDatums)
+
72  cvOutputDatas.emplace_back(tDatum.cvOutputData);
+
73  spGui3D->setImage(cvOutputDatas);
+
74  // Update keypoints
+
75  auto& tDatum = (*tDatums)[0];
76  spGui3D->setKeypoints(tDatum.poseKeypoints3D, tDatum.faceKeypoints3D, tDatum.handKeypoints3D[0],
77  tDatum.handKeypoints3D[1]);
-
78  // Refresh/update GUI
-
79  spGui3D->update();
-
80  // Profiling speed
-
81  Profiler::timerEnd(profilerKey);
-
82  Profiler::printAveragedTimeMsOnIterationX(profilerKey, __LINE__, __FUNCTION__, __FILE__);
-
83  }
-
84  // Debugging log
-
85  dLog("", Priority::Low, __LINE__, __FUNCTION__, __FILE__);
-
86  }
-
87  }
-
88  catch (const std::exception& e)
-
89  {
-
90  this->stop();
-
91  error(e.what(), __LINE__, __FUNCTION__, __FILE__);
-
92  }
-
93  }
-
94 
-
95  COMPILE_TEMPLATE_DATUM(WGui3D);
-
96 }
+
78  }
+
79  // Refresh/update GUI
+
80  spGui3D->update();
+
81  // Profiling speed
+
82  if (!tDatums->empty())
+
83  {
+
84  Profiler::timerEnd(profilerKey);
+
85  Profiler::printAveragedTimeMsOnIterationX(profilerKey, __LINE__, __FUNCTION__, __FILE__);
+
86  }
+
87  // Debugging log
+
88  dLog("", Priority::Low, __LINE__, __FUNCTION__, __FILE__);
+
89  }
+
90  }
+
91  catch (const std::exception& e)
+
92  {
+
93  this->stop();
+
94  error(e.what(), __LINE__, __FUNCTION__, __FILE__);
+
95  }
+
96  }
97 
-
98 #endif // OPENPOSE_GUI_W_GUI_3D_HPP
+
98  COMPILE_TEMPLATE_DATUM(WGui3D);
+
99 }
+
100 
+
101 #endif // OPENPOSE_GUI_W_GUI_3D_HPP
op::WorkerConsumer
Definition: workerConsumer.hpp:10
op::WGui3D::workConsumer
void workConsumer(const TDatums &tDatums)
Definition: wGui3D.hpp:55
diff --git a/html/w_gui_8hpp_source.html b/html/w_gui_8hpp_source.html index a6e3d9891057686e6be6f9aed7be36d34f385db0..797242c13c75a00c335a41a8d7ee38c8e67c1d3b 100644 --- a/html/w_gui_8hpp_source.html +++ b/html/w_gui_8hpp_source.html @@ -168,22 +168,22 @@ $(document).ready(function(){initNavTree('w_gui_8hpp_source.html','');});
59  // tDatums might be empty but we still wanna update the GUI
60  if (tDatums != nullptr)
61  {
-
62  // Check tDatums->size() == 1
-
63  if (tDatums->size() > 1)
-
64  error("Only implemented for tDatums->size() == 1", __LINE__, __FUNCTION__, __FILE__);
-
65  // Debugging log
-
66  dLog("", Priority::Low, __LINE__, __FUNCTION__, __FILE__);
-
67  // Profiling speed
-
68  const auto profilerKey = Profiler::timerInit(__LINE__, __FUNCTION__, __FILE__);
-
69  // T* to T
-
70  auto& tDatumsNoPtr = *tDatums;
-
71  // Set image
-
72  const auto cvOutputData = (!tDatumsNoPtr.empty() ? tDatumsNoPtr[0].cvOutputData : cv::Mat());
-
73  spGui->setImage(cvOutputData);
+
62  // Debugging log
+
63  dLog("", Priority::Low, __LINE__, __FUNCTION__, __FILE__);
+
64  // Profiling speed
+
65  const auto profilerKey = Profiler::timerInit(__LINE__, __FUNCTION__, __FILE__);
+
66  // Update cvMat
+
67  if (!tDatums->empty())
+
68  {
+
69  std::vector<cv::Mat> cvOutputDatas;
+
70  for (auto& tDatum : *tDatums)
+
71  cvOutputDatas.emplace_back(tDatum.cvOutputData);
+
72  spGui->setImage(cvOutputDatas);
+
73  }
74  // Refresh GUI
75  spGui->update();
76  // Profiling speed
-
77  if (!tDatumsNoPtr.empty())
+
77  if (!tDatums->empty())
78  {
79  Profiler::timerEnd(profilerKey);
80  Profiler::printAveragedTimeMsOnIterationX(profilerKey, __LINE__, __FUNCTION__, __FILE__);
diff --git a/html/w_people_json_saver_8hpp_source.html b/html/w_people_json_saver_8hpp_source.html index 8f89dafb1e462b69b9fc50eabb5c7051ad03438c..4ce1f12fbfd1ba922e21848a7d3d0cbe351dcfbe 100644 --- a/html/w_people_json_saver_8hpp_source.html +++ b/html/w_people_json_saver_8hpp_source.html @@ -175,32 +175,38 @@ $(document).ready(function(){initNavTree('w_people_json_saver_8hpp_source.html',
66  const auto fileName = baseFileName + (i != 0 ? "_" + std::to_string(i) : "");
67 
68  const std::vector<std::pair<Array<float>, std::string>> keypointVector{
-
69  std::make_pair(tDatum.poseKeypoints, "pose_keypoints"),
-
70  std::make_pair(tDatum.faceKeypoints, "face_keypoints"),
-
71  std::make_pair(tDatum.handKeypoints[0], "hand_left_keypoints"),
-
72  std::make_pair(tDatum.handKeypoints[1], "hand_right_keypoints")
-
73  };
-
74  // Save keypoints
-
75  spPeopleJsonSaver->save(keypointVector, tDatum.poseCandidates, fileName, humanReadable);
-
76  }
-
77  // Profiling speed
-
78  Profiler::timerEnd(profilerKey);
-
79  Profiler::printAveragedTimeMsOnIterationX(profilerKey, __LINE__, __FUNCTION__, __FILE__);
-
80  // Debugging log
-
81  dLog("", Priority::Low, __LINE__, __FUNCTION__, __FILE__);
-
82  }
-
83  }
-
84  catch (const std::exception& e)
-
85  {
-
86  this->stop();
-
87  error(e.what(), __LINE__, __FUNCTION__, __FILE__);
-
88  }
-
89  }
-
90 
-
91  COMPILE_TEMPLATE_DATUM(WPeopleJsonSaver);
-
92 }
-
93 
-
94 #endif // OPENPOSE_FILESTREAM_W_PEOPLE_JSON_SAVER_HPP
+
69  // 2D
+
70  std::make_pair(tDatum.poseKeypoints, "pose_keypoints"),
+
71  std::make_pair(tDatum.faceKeypoints, "face_keypoints"),
+
72  std::make_pair(tDatum.handKeypoints[0], "hand_left_keypoints"),
+
73  std::make_pair(tDatum.handKeypoints[1], "hand_right_keypoints"),
+
74  // 3D
+
75  std::make_pair(tDatum.poseKeypoints3D, "pose_keypoints_3d"),
+
76  std::make_pair(tDatum.faceKeypoints3D, "face_keypoints_3d"),
+
77  std::make_pair(tDatum.handKeypoints3D[0], "hand_left_keypoints_3d"),
+
78  std::make_pair(tDatum.handKeypoints3D[1], "hand_right_keypoints_3d")
+
79  };
+
80  // Save keypoints
+
81  spPeopleJsonSaver->save(keypointVector, tDatum.poseCandidates, fileName, humanReadable);
+
82  }
+
83  // Profiling speed
+
84  Profiler::timerEnd(profilerKey);
+
85  Profiler::printAveragedTimeMsOnIterationX(profilerKey, __LINE__, __FUNCTION__, __FILE__);
+
86  // Debugging log
+
87  dLog("", Priority::Low, __LINE__, __FUNCTION__, __FILE__);
+
88  }
+
89  }
+
90  catch (const std::exception& e)
+
91  {
+
92  this->stop();
+
93  error(e.what(), __LINE__, __FUNCTION__, __FILE__);
+
94  }
+
95  }
+
96 
+
97  COMPILE_TEMPLATE_DATUM(WPeopleJsonSaver);
+
98 }
+
99 
+
100 #endif // OPENPOSE_FILESTREAM_W_PEOPLE_JSON_SAVER_HPP
op::WorkerConsumer
Definition: workerConsumer.hpp:10
op::WPeopleJsonSaver::initializationOnThread
void initializationOnThread()
Definition: wPeopleJsonSaver.hpp:42
op::COMPILE_TEMPLATE_DATUM (WPoseTriangulation WGui3D  )