From 2bbe0c3b1536b993f92fa8992224f9c8add6aedd Mon Sep 17 00:00:00 2001 From: Travis CI Date: Thu, 10 May 2018 22:33:05 +0000 Subject: [PATCH] Deploy code docs to GitHub Pages Travis build: 234 Commit: 9a47921c4fc02544b831543913db1bced8c03735 --- doxygen.log | 2 +- html/classop_1_1_person_tracker-members.html | 9 ++++---- html/classop_1_1_person_tracker.html | 17 ++++++++++++++ html/classop_1_1_person_tracker.js | 1 + html/classop_1_1_pose_extractor-members.html | 2 +- html/classop_1_1_pose_extractor.html | 8 +++---- html/classop_1_1_pose_extractor.js | 2 +- html/functions_func_g.html | 9 +++++--- html/functions_func_p.html | 2 +- html/functions_g.html | 11 +++++---- html/functions_p.html | 2 +- html/navtree.js | 12 +++++----- html/navtreeindex3.js | 10 ++++---- html/navtreeindex4.js | 4 ++-- html/navtreeindex5.js | 6 ++--- html/navtreeindex6.js | 6 ++--- html/navtreeindex7.js | 4 ++-- html/navtreeindex8.js | 4 ++-- html/navtreeindex9.js | 1 + html/person_tracker_8hpp_source.html | 24 +++++++++++--------- html/pose_extractor_8hpp_source.html | 4 ++-- html/search/all_6.js | 3 ++- html/search/all_f.js | 2 +- html/search/functions_6.js | 1 + html/search/functions_f.js | 2 +- html/wrapper_8hpp_source.html | 6 ++--- 26 files changed, 92 insertions(+), 62 deletions(-) diff --git a/doxygen.log b/doxygen.log index 2569bed3..9bd9910a 100644 --- a/doxygen.log +++ b/doxygen.log @@ -1158,5 +1158,5 @@ Generating file index... Generating file member index... Generating example index... finalizing index lists... -lookup cache used 4657/65536 hits=35121 misses=4982 +lookup cache used 4660/65536 hits=35127 misses=4984 finished... diff --git a/html/classop_1_1_person_tracker-members.html b/html/classop_1_1_person_tracker-members.html index 65532c8d..3829a4ab 100644 --- a/html/classop_1_1_person_tracker-members.html +++ b/html/classop_1_1_person_tracker-members.html @@ -112,10 +112,11 @@ $(document).ready(function(){initNavTree('classop_1_1_person_tracker.html','');}

This is the complete list of members for op::PersonTracker, including all inherited members.

- - - - + + + + +
PersonTracker(const bool mergeResults)op::PersonTracker
track(Array< float > &poseKeypoints, const cv::Mat &cvMatInput, const Array< long long > &poseIds)op::PersonTracker
trackLockThread(Array< float > &poseKeypoints, const cv::Mat &cvMatInput, const Array< long long > &poseIds, const long long frameId)op::PersonTracker
~PersonTracker()op::PersonTrackervirtual
getMergeResults() const op::PersonTracker
PersonTracker(const bool mergeResults)op::PersonTracker
track(Array< float > &poseKeypoints, const cv::Mat &cvMatInput, const Array< long long > &poseIds)op::PersonTracker
trackLockThread(Array< float > &poseKeypoints, const cv::Mat &cvMatInput, const Array< long long > &poseIds, const long long frameId)op::PersonTracker
~PersonTracker()op::PersonTrackervirtual
diff --git a/html/classop_1_1_person_tracker.html b/html/classop_1_1_person_tracker.html index ce704058..be054917 100644 --- a/html/classop_1_1_person_tracker.html +++ b/html/classop_1_1_person_tracker.html @@ -125,6 +125,8 @@ Public Member Functions   void trackLockThread (Array< float > &poseKeypoints, const cv::Mat &cvMatInput, const Array< long long > &poseIds, const long long frameId)   +bool getMergeResults () const + 

Constructor & Destructor Documentation

@@ -167,6 +169,21 @@ Public Member Functions

Member Function Documentation

+ +
+
+ + + + + + + +
bool op::PersonTracker::getMergeResults () const
+
+ +
+
diff --git a/html/classop_1_1_person_tracker.js b/html/classop_1_1_person_tracker.js index e417469e..f852ab39 100644 --- a/html/classop_1_1_person_tracker.js +++ b/html/classop_1_1_person_tracker.js @@ -2,6 +2,7 @@ var classop_1_1_person_tracker = [ [ "PersonTracker", "classop_1_1_person_tracker.html#a4e540f63e9e15408e178162ada50b3aa", null ], [ "~PersonTracker", "classop_1_1_person_tracker.html#a840ed2e06c1cc4dfc89e6083b2a8bc37", null ], + [ "getMergeResults", "classop_1_1_person_tracker.html#a3616d25d3402f996ea628a048b6e5301", null ], [ "track", "classop_1_1_person_tracker.html#a7fd822cb566f9b0e0ce76435d79a54b2", null ], [ "trackLockThread", "classop_1_1_person_tracker.html#a60563c064729039783212fc48c5190b6", null ] ]; \ No newline at end of file diff --git a/html/classop_1_1_pose_extractor-members.html b/html/classop_1_1_pose_extractor-members.html index 93e70a94..4414a3c0 100644 --- a/html/classop_1_1_pose_extractor-members.html +++ b/html/classop_1_1_pose_extractor-members.html @@ -122,7 +122,7 @@ $(document).ready(function(){initNavTree('classop_1_1_pose_extractor.html','');} getScaleNetToOutput() const op::PoseExtractor initializationOnThread()op::PoseExtractor keepTopPeople(Array< float > &poseKeypoints, const Array< float > &poseScores) const op::PoseExtractor - PoseExtractor(const std::shared_ptr< PoseExtractorNet > &poseExtractorNet, const std::shared_ptr< KeepTopNPeople > &keepTopNPeople=nullptr, const std::shared_ptr< PersonIdExtractor > &personIdExtractor=nullptr, const std::vector< std::shared_ptr< PersonTracker >> &personTracker={}, const int numberPeopleMax=-1, const int tracking=-1)op::PoseExtractor + PoseExtractor(const std::shared_ptr< PoseExtractorNet > &poseExtractorNet, const std::shared_ptr< KeepTopNPeople > &keepTopNPeople=nullptr, const std::shared_ptr< PersonIdExtractor > &personIdExtractor=nullptr, const std::shared_ptr< std::vector< std::shared_ptr< PersonTracker >>> &personTracker={}, const int numberPeopleMax=-1, const int tracking=-1)op::PoseExtractor track(Array< float > &poseKeypoints, const cv::Mat &cvMatInput, const Array< long long > &poseIds, const unsigned long long imageViewIndex=0ull)op::PoseExtractor trackLockThread(Array< float > &poseKeypoints, const cv::Mat &cvMatInput, const Array< long long > &poseIds, const unsigned long long imageViewIndex, const long long frameId)op::PoseExtractor ~PoseExtractor()op::PoseExtractorvirtual diff --git a/html/classop_1_1_pose_extractor.html b/html/classop_1_1_pose_extractor.html index e3ae49b8..7f54f37f 100644 --- a/html/classop_1_1_pose_extractor.html +++ b/html/classop_1_1_pose_extractor.html @@ -117,8 +117,8 @@ $(document).ready(function(){initNavTree('classop_1_1_pose_extractor.html','');} - - + + @@ -148,7 +148,7 @@ Public Member Functions

Public Member Functions

 PoseExtractor (const std::shared_ptr< PoseExtractorNet > &poseExtractorNet, const std::shared_ptr< KeepTopNPeople > &keepTopNPeople=nullptr, const std::shared_ptr< PersonIdExtractor > &personIdExtractor=nullptr, const std::vector< std::shared_ptr< PersonTracker >> &personTracker={}, const int numberPeopleMax=-1, const int tracking=-1)
 
 PoseExtractor (const std::shared_ptr< PoseExtractorNet > &poseExtractorNet, const std::shared_ptr< KeepTopNPeople > &keepTopNPeople=nullptr, const std::shared_ptr< PersonIdExtractor > &personIdExtractor=nullptr, const std::shared_ptr< std::vector< std::shared_ptr< PersonTracker >>> &personTracker={}, const int numberPeopleMax=-1, const int tracking=-1)
 
virtual ~PoseExtractor ()
 
void initializationOnThread ()
 

Constructor & Destructor Documentation

- +
@@ -173,7 +173,7 @@ Public Member Functions - + diff --git a/html/classop_1_1_pose_extractor.js b/html/classop_1_1_pose_extractor.js index 311a7760..df16a1a9 100644 --- a/html/classop_1_1_pose_extractor.js +++ b/html/classop_1_1_pose_extractor.js @@ -1,6 +1,6 @@ var classop_1_1_pose_extractor = [ - [ "PoseExtractor", "classop_1_1_pose_extractor.html#a1b3d91b3b39afde3a5094fc8c6c0af3e", null ], + [ "PoseExtractor", "classop_1_1_pose_extractor.html#acd50fa337aef1d658b6fed3edc717ada", null ], [ "~PoseExtractor", "classop_1_1_pose_extractor.html#a9f98eef4ac08cacefe74e002ac086582", null ], [ "extractIds", "classop_1_1_pose_extractor.html#a9ac62424009ceaf3f7743da5aaf9e25c", null ], [ "extractIdsLockThread", "classop_1_1_pose_extractor.html#abb7fb51c6300efd840a505142ee37364", null ], diff --git a/html/functions_func_g.html b/html/functions_func_g.html index a3839d57..f5aaecc2 100644 --- a/html/functions_func_g.html +++ b/html/functions_func_g.html @@ -301,8 +301,11 @@ $(document).ready(function(){initNavTree('functions_func_g.html','');});
  • getMaxSize() : op::QueueBase< TDatums, TQueue >
    • +
  • getMergeResults() +: op::PersonTracker +
  • getNextFileName() -: op::FileSaver +: op::FileSaver
  • getNextFrameName() : op::FlirReader @@ -342,7 +345,7 @@ $(document).ready(function(){initNavTree('functions_func_g.html','');}); : op::ConfigureLog
  • getProfilingInfo() -: cl::Event +: cl::Event
  • getPtr() : op::Array< T > @@ -370,7 +373,7 @@ $(document).ready(function(){initNavTree('functions_func_g.html','');}); : op::Renderer
  • getSize() -: op::Array< T > +: op::Array< T >
  • getSupportedImageFormats() : cl::Context diff --git a/html/functions_func_p.html b/html/functions_func_p.html index 167f9260..d090e7a3 100644 --- a/html/functions_func_p.html +++ b/html/functions_func_p.html @@ -174,7 +174,7 @@ $(document).ready(function(){initNavTree('functions_func_p.html','');}); : op::PoseCpuRenderer
  • PoseExtractor() -: op::PoseExtractor +: op::PoseExtractor
  • PoseExtractorCaffe() : op::PoseExtractorCaffe diff --git a/html/functions_g.html b/html/functions_g.html index c3f1daa4..24c8f8a9 100644 --- a/html/functions_g.html +++ b/html/functions_g.html @@ -307,8 +307,11 @@ $(document).ready(function(){initNavTree('functions_g.html','');});
  • getMaxSize() : op::QueueBase< TDatums, TQueue >
    • +
  • getMergeResults() +: op::PersonTracker +
  • getNextFileName() -: op::FileSaver +: op::FileSaver
  • getNextFrameName() : op::FlirReader @@ -348,7 +351,7 @@ $(document).ready(function(){initNavTree('functions_g.html','');}); : op::ConfigureLog
  • getProfilingInfo() -: cl::Event +: cl::Event
  • getPtr() : op::Array< T > @@ -376,7 +379,7 @@ $(document).ready(function(){initNavTree('functions_g.html','');}); : op::Renderer
  • getSize() -: op::Array< T > +: op::Array< T >
  • getSupportedImageFormats() : cl::Context @@ -397,7 +400,7 @@ $(document).ready(function(){initNavTree('functions_g.html','');}); : op::Producer
  • getVolume() -: op::Array< T > +: op::Array< T >
  • getWorkGroupInfo() : cl::Kernel diff --git a/html/functions_p.html b/html/functions_p.html index feec424e..21d6ce7e 100644 --- a/html/functions_p.html +++ b/html/functions_p.html @@ -184,7 +184,7 @@ $(document).ready(function(){initNavTree('functions_p.html','');}); : op::PoseCpuRenderer
  • PoseExtractor() -: op::PoseExtractor +: op::PoseExtractor
  • PoseExtractorCaffe() : op::PoseExtractorCaffe diff --git a/html/navtree.js b/html/navtree.js index 9af46d95..894cfcf9 100644 --- a/html/navtree.js +++ b/html/navtree.js @@ -42,12 +42,12 @@ var NAVTREEINDEX = "classcl_1_1_enqueue_args.html#ab5379abd9903e0e82608ec82062406cc", "classcl_1_1detail_1_1_wrapper.html#a1292547dd0c591aa972e25b793481583", "classop_1_1_ip_camera_reader.html#a97b79697a2f5e12f3b48aa8506177e52", -"classop_1_1_spinnaker_wrapper.html#ac7a7064093ee6b863f92c8c3317ebaf7", -"classop_1_1_wrapper.html#a8ae0f91a6882f04464d8897a7c81d174", -"gpu_2headers_8hpp_source.html", -"pose_parameters_8hpp.html#aacf6e688031bb116e4878b811e8dbc23", -"structop_1_1_rectangle.html#addb67763ca3a0ca9fd4f7184ad9d11ae", -"wrapper_auxiliary_8hpp.html#a860009264f3fc46e18120faef1d62ac7" +"classop_1_1_spinnaker_wrapper.html#ab79aa58cda90784d16335e0081d8f33a", +"classop_1_1_wrapper.html#a8919b80a6f82330da63da9ffd9ca89be", +"gpu_2headers_8hpp.html", +"pose_parameters_8hpp.html#aab3de911b04b96c1850cc05c6947e184", +"structop_1_1_rectangle.html#ac4ae58fe6ffd2f811f5cbc48661c1856", +"wrapper_auxiliary_8hpp.html" ]; var SYNCONMSG = 'click to disable panel synchronisation'; diff --git a/html/navtreeindex3.js b/html/navtreeindex3.js index 0a61d676..5a7c8982 100644 --- a/html/navtreeindex3.js +++ b/html/navtreeindex3.js @@ -70,9 +70,10 @@ var NAVTREEINDEX3 = "classop_1_1_person_id_extractor.html#a7ff9f8faf42bff0dbd7207105c149a1e":[1,0,3,22,1], "classop_1_1_person_id_extractor.html#af3403da811a2a59c60ee8f3db67299ae":[1,0,3,22,2], "classop_1_1_person_tracker.html":[1,0,3,23], +"classop_1_1_person_tracker.html#a3616d25d3402f996ea628a048b6e5301":[1,0,3,23,2], "classop_1_1_person_tracker.html#a4e540f63e9e15408e178162ada50b3aa":[1,0,3,23,0], -"classop_1_1_person_tracker.html#a60563c064729039783212fc48c5190b6":[1,0,3,23,3], -"classop_1_1_person_tracker.html#a7fd822cb566f9b0e0ce76435d79a54b2":[1,0,3,23,2], +"classop_1_1_person_tracker.html#a60563c064729039783212fc48c5190b6":[1,0,3,23,4], +"classop_1_1_person_tracker.html#a7fd822cb566f9b0e0ce76435d79a54b2":[1,0,3,23,3], "classop_1_1_person_tracker.html#a840ed2e06c1cc4dfc89e6083b2a8bc37":[1,0,3,23,1], "classop_1_1_pointer_container_greater.html":[1,0,3,114], "classop_1_1_pointer_container_greater.html#ab63e3088591d6593c6539b91499f5063":[1,0,3,114,0], @@ -82,7 +83,6 @@ var NAVTREEINDEX3 = "classop_1_1_pose_cpu_renderer.html#a5863733d560345d4890557b0f8c0d08e":[1,0,3,78,0], "classop_1_1_pose_cpu_renderer.html#a98541b982847713472411402314efd96":[1,0,3,78,1], "classop_1_1_pose_extractor.html":[1,0,3,79], -"classop_1_1_pose_extractor.html#a1b3d91b3b39afde3a5094fc8c6c0af3e":[1,0,3,79,0], "classop_1_1_pose_extractor.html#a53eac2bf280492baca5aeb1a777d3646":[1,0,3,79,6], "classop_1_1_pose_extractor.html#a5e8d22c8500cc5097dce64a89218abe1":[1,0,3,79,11], "classop_1_1_pose_extractor.html#a5fd73c053c293c59eb3d6eb38335c157":[1,0,3,79,9], @@ -96,6 +96,7 @@ var NAVTREEINDEX3 = "classop_1_1_pose_extractor.html#ab07ee78f6a7b2dbe22b72453e9ed24c3":[1,0,3,79,4], "classop_1_1_pose_extractor.html#abb7fb51c6300efd840a505142ee37364":[1,0,3,79,3], "classop_1_1_pose_extractor.html#acb1f80be714e38c89d79b41f4a1a0ea0":[1,0,3,79,12], +"classop_1_1_pose_extractor.html#acd50fa337aef1d658b6fed3edc717ada":[1,0,3,79,0], "classop_1_1_pose_extractor_caffe.html":[1,0,3,80], "classop_1_1_pose_extractor_caffe.html#a3359641c1199c712a07859dcb76b7dcf":[1,0,3,80,1], "classop_1_1_pose_extractor_caffe.html#a5e84521120bcee4a9f047ae1d7fec8af":[1,0,3,80,3], @@ -248,6 +249,5 @@ var NAVTREEINDEX3 = "classop_1_1_spinnaker_wrapper.html#a5e36c3d04071f6c7b003c50d3f43bc36":[1,0,3,92,3], "classop_1_1_spinnaker_wrapper.html#a6e66639ee75708486b3d9aa4598607c0":[1,0,3,92,8], "classop_1_1_spinnaker_wrapper.html#a77a64d4ef798f2ea7cd54d9c170f7ea7":[1,0,3,92,5], -"classop_1_1_spinnaker_wrapper.html#aa011fe7b3bf42e3af5fb83faee42288e":[1,0,3,92,2], -"classop_1_1_spinnaker_wrapper.html#ab79aa58cda90784d16335e0081d8f33a":[1,0,3,92,4] +"classop_1_1_spinnaker_wrapper.html#aa011fe7b3bf42e3af5fb83faee42288e":[1,0,3,92,2] }; diff --git a/html/navtreeindex4.js b/html/navtreeindex4.js index aaa02023..c6359559 100644 --- a/html/navtreeindex4.js +++ b/html/navtreeindex4.js @@ -1,5 +1,6 @@ var NAVTREEINDEX4 = { +"classop_1_1_spinnaker_wrapper.html#ab79aa58cda90784d16335e0081d8f33a":[1,0,3,92,4], "classop_1_1_spinnaker_wrapper.html#ac7a7064093ee6b863f92c8c3317ebaf7":[1,0,3,92,0], "classop_1_1_sub_thread.html":[1,0,3,100], "classop_1_1_sub_thread.html#a14330cbc1117f32b6d69c1733ccdeb61":[1,0,3,100,4], @@ -248,6 +249,5 @@ var NAVTREEINDEX4 = "classop_1_1_wrapper.html#a51ab9e8a63f8fb822550365fc0417d01":[1,0,3,117,8], "classop_1_1_wrapper.html#a5a3885bb1b984cad4745fa6e9e0715ad":[1,0,3,117,2], "classop_1_1_wrapper.html#a6f2cf45c8b571b99ee92114ba8462589":[1,0,3,117,11], -"classop_1_1_wrapper.html#a74f1287f8e4f998504e2ce571ef36f58":[1,0,3,117,9], -"classop_1_1_wrapper.html#a8919b80a6f82330da63da9ffd9ca89be":[1,0,3,117,1] +"classop_1_1_wrapper.html#a74f1287f8e4f998504e2ce571ef36f58":[1,0,3,117,9] }; diff --git a/html/navtreeindex5.js b/html/navtreeindex5.js index 6ca6e6a9..0892e334 100644 --- a/html/navtreeindex5.js +++ b/html/navtreeindex5.js @@ -1,5 +1,6 @@ var NAVTREEINDEX5 = { +"classop_1_1_wrapper.html#a8919b80a6f82330da63da9ffd9ca89be":[1,0,3,117,1], "classop_1_1_wrapper.html#a8ae0f91a6882f04464d8897a7c81d174":[1,0,3,117,7], "classop_1_1_wrapper.html#a90a58d4866cef24edced2979205c87cc":[1,0,3,117,5], "classop_1_1_wrapper.html#aafe5cbb9729cee18531bcbc5e1b2a66e":[1,0,3,117,15], @@ -183,8 +184,8 @@ var NAVTREEINDEX5 = "flir_reader_8hpp_source.html":[2,0,0,0,10,2], "frame_displayer_8hpp.html":[2,0,0,0,6,1], "frame_displayer_8hpp_source.html":[2,0,0,0,6,1], -"functions.html":[1,3,0], "functions.html":[1,3,0,0], +"functions.html":[1,3,0], "functions_b.html":[1,3,0,1], "functions_c.html":[1,3,0,2], "functions_d.html":[1,3,0,3], @@ -248,6 +249,5 @@ var NAVTREEINDEX5 = "gpu_2enum_classes_8hpp.html#adbb34b5c8f2b6f0c051f831f18582e7fa6f6cb72d544962fa333e2e34ce64f719":[2,0,0,0,5,2,0,3], "gpu_2enum_classes_8hpp.html#adbb34b5c8f2b6f0c051f831f18582e7fa7982b09a852b37f2afb1227eaf552e47":[2,0,0,0,5,2,0,1], "gpu_2enum_classes_8hpp.html#adbb34b5c8f2b6f0c051f831f18582e7fa8b95dcff7397d0693c03e394af5552aa":[2,0,0,0,5,2,0,0], -"gpu_2enum_classes_8hpp_source.html":[2,0,0,0,5,2], -"gpu_2headers_8hpp.html":[2,0,0,0,5,4] +"gpu_2enum_classes_8hpp_source.html":[2,0,0,0,5,2] }; diff --git a/html/navtreeindex6.js b/html/navtreeindex6.js index 1fc89414..ecbb4e2d 100644 --- a/html/navtreeindex6.js +++ b/html/navtreeindex6.js @@ -1,5 +1,6 @@ var NAVTREEINDEX6 = { +"gpu_2headers_8hpp.html":[2,0,0,0,5,4], "gpu_2headers_8hpp_source.html":[2,0,0,0,5,4], "gpu_8hpp.html":[2,0,0,0,5,3], "gpu_8hpp.html#a971a7caa96be5b715b5c22f6e5dc6ad1":[2,0,0,0,5,3,0], @@ -115,8 +116,8 @@ var NAVTREEINDEX6 = "namespacecaffe.html":[1,0,1], "namespacecl.html":[1,0,2], "namespacecl.html":[0,0,2], -"namespacecl_1_1compatibility.html":[1,0,2,0], "namespacecl_1_1compatibility.html":[0,0,2,0], +"namespacecl_1_1compatibility.html":[1,0,2,0], "namespacecl_1_1detail.html":[0,0,2,1], "namespacecl_1_1detail.html":[1,0,2,1], "namespacemembers.html":[0,1,0], @@ -248,6 +249,5 @@ var NAVTREEINDEX6 = "pose_parameters_8hpp.html#a54a6c42a42a0a7e539061f5e30abb4bc":[2,0,0,0,9,9,9], "pose_parameters_8hpp.html#a692472b562fba051964f9ddea07b97d7":[2,0,0,0,9,9,2], "pose_parameters_8hpp.html#a84d87ec0e4ed3cf75a37ce99d0d25ef7":[2,0,0,0,9,9,6], -"pose_parameters_8hpp.html#aa170c3107396e4d0e4214bb0c1b78f08":[2,0,0,0,9,9,5], -"pose_parameters_8hpp.html#aab3de911b04b96c1850cc05c6947e184":[2,0,0,0,9,9,0] +"pose_parameters_8hpp.html#aa170c3107396e4d0e4214bb0c1b78f08":[2,0,0,0,9,9,5] }; diff --git a/html/navtreeindex7.js b/html/navtreeindex7.js index a8bf5af8..7641f178 100644 --- a/html/navtreeindex7.js +++ b/html/navtreeindex7.js @@ -1,5 +1,6 @@ var NAVTREEINDEX7 = { +"pose_parameters_8hpp.html#aab3de911b04b96c1850cc05c6947e184":[2,0,0,0,9,9,0], "pose_parameters_8hpp.html#aacf6e688031bb116e4878b811e8dbc23":[2,0,0,0,9,9,14], "pose_parameters_8hpp.html#ab48e314ecd19f55f664b14da1d83312f":[2,0,0,0,9,9,7], "pose_parameters_8hpp.html#ad7ca8d89f9045481075902c8bd98b8f4":[2,0,0,0,9,9,8], @@ -248,6 +249,5 @@ var NAVTREEINDEX7 = "structop_1_1_rectangle.html#a65620c7efbb3db95d85c90c2be3a851d":[1,0,3,12,9], "structop_1_1_rectangle.html#a85cabb0d2f3af02e32be35bb9841c1f3":[1,0,3,12,3], "structop_1_1_rectangle.html#abd3476f9a32ad2058ea67c75c2a547a2":[1,0,3,12,10], -"structop_1_1_rectangle.html#abea1a6760629dc4ed99875dae9d5ac36":[1,0,3,12,11], -"structop_1_1_rectangle.html#ac4ae58fe6ffd2f811f5cbc48661c1856":[1,0,3,12,17] +"structop_1_1_rectangle.html#abea1a6760629dc4ed99875dae9d5ac36":[1,0,3,12,11] }; diff --git a/html/navtreeindex8.js b/html/navtreeindex8.js index 51ef26ac..339dc555 100644 --- a/html/navtreeindex8.js +++ b/html/navtreeindex8.js @@ -1,5 +1,6 @@ var NAVTREEINDEX8 = { +"structop_1_1_rectangle.html#ac4ae58fe6ffd2f811f5cbc48661c1856":[1,0,3,12,17], "structop_1_1_rectangle.html#addb67763ca3a0ca9fd4f7184ad9d11ae":[1,0,3,12,13], "structop_1_1_rectangle.html#aed0ca00eb295de406ec8ec6dd03c1da5":[1,0,3,12,14], "structop_1_1_rectangle.html#aed48a0008434867b879a678c1da015b3":[1,0,3,12,6], @@ -248,6 +249,5 @@ var NAVTREEINDEX8 = "wrapper_2headers_8hpp.html":[2,0,0,0,13,0], "wrapper_2headers_8hpp_source.html":[2,0,0,0,13,0], "wrapper_8hpp.html":[2,0,0,0,13,1], -"wrapper_8hpp_source.html":[2,0,0,0,13,1], -"wrapper_auxiliary_8hpp.html":[2,0,0,0,13,2] +"wrapper_8hpp_source.html":[2,0,0,0,13,1] }; diff --git a/html/navtreeindex9.js b/html/navtreeindex9.js index 31ad3685..fe36da71 100644 --- a/html/navtreeindex9.js +++ b/html/navtreeindex9.js @@ -1,5 +1,6 @@ var NAVTREEINDEX9 = { +"wrapper_auxiliary_8hpp.html":[2,0,0,0,13,2], "wrapper_auxiliary_8hpp.html#a860009264f3fc46e18120faef1d62ac7":[2,0,0,0,13,2,0], "wrapper_auxiliary_8hpp_source.html":[2,0,0,0,13,2], "wrapper_struct_face_8hpp.html":[2,0,0,0,13,3], diff --git a/html/person_tracker_8hpp_source.html b/html/person_tracker_8hpp_source.html index b4181a53..5e92c368 100644 --- a/html/person_tracker_8hpp_source.html +++ b/html/person_tracker_8hpp_source.html @@ -129,17 +129,19 @@ $(document).ready(function(){initNavTree('person_tracker_8hpp_source.html','');}
    20  void trackLockThread(Array<float>& poseKeypoints, const cv::Mat& cvMatInput, const Array<long long>& poseIds,
    21  const long long frameId);
    22 
    -
    23  private:
    -
    24  const bool mMergeResults;
    -
    25 
    -
    26  // Thread-safe variables
    -
    27  std::atomic<long long> mLastFrameId;
    -
    28 
    -
    29  DELETE_COPY(PersonTracker);
    -
    30  };
    -
    31 }
    -
    32 
    -
    33 #endif // OPENPOSE_TRACKING_PERSON_TRACKER_HPP
    +
    23  bool getMergeResults() const;
    +
    24 
    +
    25  private:
    +
    26  const bool mMergeResults;
    +
    27 
    +
    28  // Thread-safe variables
    +
    29  std::atomic<long long> mLastFrameId;
    +
    30 
    +
    31  DELETE_COPY(PersonTracker);
    +
    32  };
    +
    33 }
    +
    34 
    +
    35 #endif // OPENPOSE_TRACKING_PERSON_TRACKER_HPP
    DELETE_COPY
    #define DELETE_COPY(className)
    Definition: macros.hpp:31
    diff --git a/html/pose_extractor_8hpp_source.html b/html/pose_extractor_8hpp_source.html index 62aa5622..c0da9585 100644 --- a/html/pose_extractor_8hpp_source.html +++ b/html/pose_extractor_8hpp_source.html @@ -126,7 +126,7 @@ $(document).ready(function(){initNavTree('pose_extractor_8hpp_source.html','');}
    17  PoseExtractor(const std::shared_ptr<PoseExtractorNet>& poseExtractorNet,
    18  const std::shared_ptr<KeepTopNPeople>& keepTopNPeople = nullptr,
    19  const std::shared_ptr<PersonIdExtractor>& personIdExtractor = nullptr,
    -
    20  const std::vector<std::shared_ptr<PersonTracker>>& personTracker = {},
    +
    20  const std::shared_ptr<std::vector<std::shared_ptr<PersonTracker>>>& personTracker = {},
    21  const int numberPeopleMax = -1, const int tracking = -1);
    22 
    23  virtual ~PoseExtractor();
    @@ -176,7 +176,7 @@ $(document).ready(function(){initNavTree('pose_extractor_8hpp_source.html','');}
    67  const std::shared_ptr<PoseExtractorNet> spPoseExtractorNet;
    68  const std::shared_ptr<KeepTopNPeople> spKeepTopNPeople;
    69  const std::shared_ptr<PersonIdExtractor> spPersonIdExtractor;
    -
    70  const std::vector<std::shared_ptr<PersonTracker>> spPersonTrackers;
    +
    70  const std::shared_ptr<std::vector<std::shared_ptr<PersonTracker>>> spPersonTrackers;
    71 
    72  DELETE_COPY(PoseExtractor);
    73  };
    diff --git a/html/search/all_6.js b/html/search/all_6.js index 1d979efd..90ed8468 100644 --- a/html/search/all_6.js +++ b/html/search/all_6.js @@ -50,6 +50,7 @@ var searchData= ['getlastnumber',['getLastNumber',['../namespaceop.html#ab670c693d8e4a540cfe75ce8383b6d10',1,'op']]], ['getlogmodes',['getLogModes',['../classop_1_1_configure_log.html#a01eebce325f7e401601804d58fd3a2b2',1,'op::ConfigureLog']]], ['getmaxsize',['getMaxSize',['../classop_1_1_queue_base.html#a25255992523051f7d2a82694ffe7a1cf',1,'op::QueueBase']]], + ['getmergeresults',['getMergeResults',['../classop_1_1_person_tracker.html#a3616d25d3402f996ea628a048b6e5301',1,'op::PersonTracker']]], ['getnextfilename',['getNextFileName',['../classop_1_1_file_saver.html#a9de8d694a526f981906c54bd48ea9b21',1,'op::FileSaver::getNextFileName(const unsigned long long index) const '],['../classop_1_1_file_saver.html#a91818f12a9409eae7c1caf6e2b525282',1,'op::FileSaver::getNextFileName(const std::string &fileNameNoExtension) const ']]], ['getnextframename',['getNextFrameName',['../classop_1_1_flir_reader.html#a711db0919bd7516fde3e641c13259637',1,'op::FlirReader::getNextFrameName()'],['../classop_1_1_image_directory_reader.html#a46ce23209afe6d3ca90db545b69cd04a',1,'op::ImageDirectoryReader::getNextFrameName()'],['../classop_1_1_ip_camera_reader.html#a0c1582090cc7c54dd9cb752207b52986',1,'op::IpCameraReader::getNextFrameName()'],['../classop_1_1_producer.html#ab35d570dc35573433ec86e3fce25e545',1,'op::Producer::getNextFrameName()'],['../classop_1_1_video_capture_reader.html#a06348fd9a290fc2ece2f3c2e4dc9bc70',1,'op::VideoCaptureReader::getNextFrameName()'],['../classop_1_1_video_reader.html#a508eed918fbe3bfe3eff4c1ebacb3463',1,'op::VideoReader::getNextFrameName()'],['../classop_1_1_webcam_reader.html#a58c315e577c12486e5ab1b941d4cce04',1,'op::WebcamReader::getNextFrameName()']]], ['getnumbercameras',['getNumberCameras',['../classop_1_1_camera_parameter_reader.html#acfd1caf98782ae3f8f83c85ba17bc4e0',1,'op::CameraParameterReader']]], @@ -109,8 +110,8 @@ var searchData= ['gui3d',['Gui3D',['../classop_1_1_gui3_d.html',1,'op']]], ['gui3d',['Gui3D',['../classop_1_1_gui3_d.html#a94fa036cadb75db381cedf563ed8058f',1,'op::Gui3D']]], ['gui3d_2ehpp',['gui3D.hpp',['../gui3_d_8hpp.html',1,'']]], - ['guiinfoadder',['GuiInfoAdder',['../classop_1_1_gui_info_adder.html#af23e17f9eeb51c7473cd0940292efa61',1,'op::GuiInfoAdder']]], ['guiinfoadder',['GuiInfoAdder',['../classop_1_1_gui_info_adder.html',1,'op']]], + ['guiinfoadder',['GuiInfoAdder',['../classop_1_1_gui_info_adder.html#af23e17f9eeb51c7473cd0940292efa61',1,'op::GuiInfoAdder']]], ['guiinfoadder_2ehpp',['guiInfoAdder.hpp',['../gui_info_adder_8hpp.html',1,'']]], ['guiverbose',['guiVerbose',['../structop_1_1_wrapper_struct_output.html#ac72ad601daf957b9b000206e9f1fe0ad',1,'op::WrapperStructOutput']]] ]; diff --git a/html/search/all_f.js b/html/search/all_f.js index 0d87a2dc..d89278d3 100644 --- a/html/search/all_f.js +++ b/html/search/all_f.js @@ -55,7 +55,7 @@ var searchData= ['posecpurenderer',['PoseCpuRenderer',['../classop_1_1_pose_cpu_renderer.html',1,'op']]], ['posecpurenderer_2ehpp',['poseCpuRenderer.hpp',['../pose_cpu_renderer_8hpp.html',1,'']]], ['poseextractor',['PoseExtractor',['../classop_1_1_pose_extractor.html',1,'op']]], - ['poseextractor',['PoseExtractor',['../classop_1_1_pose_extractor.html#a1b3d91b3b39afde3a5094fc8c6c0af3e',1,'op::PoseExtractor']]], + ['poseextractor',['PoseExtractor',['../classop_1_1_pose_extractor.html#acd50fa337aef1d658b6fed3edc717ada',1,'op::PoseExtractor']]], ['poseextractor_2ehpp',['poseExtractor.hpp',['../pose_extractor_8hpp.html',1,'']]], ['poseextractorcaffe',['PoseExtractorCaffe',['../classop_1_1_pose_extractor_caffe.html#ab58c3ab4b745b35f542165ce27293554',1,'op::PoseExtractorCaffe']]], ['poseextractorcaffe',['PoseExtractorCaffe',['../classop_1_1_pose_extractor_caffe.html',1,'op']]], diff --git a/html/search/functions_6.js b/html/search/functions_6.js index 93b5dc72..9c6235ff 100644 --- a/html/search/functions_6.js +++ b/html/search/functions_6.js @@ -48,6 +48,7 @@ var searchData= ['getlastnumber',['getLastNumber',['../namespaceop.html#ab670c693d8e4a540cfe75ce8383b6d10',1,'op']]], ['getlogmodes',['getLogModes',['../classop_1_1_configure_log.html#a01eebce325f7e401601804d58fd3a2b2',1,'op::ConfigureLog']]], ['getmaxsize',['getMaxSize',['../classop_1_1_queue_base.html#a25255992523051f7d2a82694ffe7a1cf',1,'op::QueueBase']]], + ['getmergeresults',['getMergeResults',['../classop_1_1_person_tracker.html#a3616d25d3402f996ea628a048b6e5301',1,'op::PersonTracker']]], ['getnextfilename',['getNextFileName',['../classop_1_1_file_saver.html#a9de8d694a526f981906c54bd48ea9b21',1,'op::FileSaver::getNextFileName(const unsigned long long index) const '],['../classop_1_1_file_saver.html#a91818f12a9409eae7c1caf6e2b525282',1,'op::FileSaver::getNextFileName(const std::string &fileNameNoExtension) const ']]], ['getnextframename',['getNextFrameName',['../classop_1_1_flir_reader.html#a711db0919bd7516fde3e641c13259637',1,'op::FlirReader::getNextFrameName()'],['../classop_1_1_image_directory_reader.html#a46ce23209afe6d3ca90db545b69cd04a',1,'op::ImageDirectoryReader::getNextFrameName()'],['../classop_1_1_ip_camera_reader.html#a0c1582090cc7c54dd9cb752207b52986',1,'op::IpCameraReader::getNextFrameName()'],['../classop_1_1_producer.html#ab35d570dc35573433ec86e3fce25e545',1,'op::Producer::getNextFrameName()'],['../classop_1_1_video_capture_reader.html#a06348fd9a290fc2ece2f3c2e4dc9bc70',1,'op::VideoCaptureReader::getNextFrameName()'],['../classop_1_1_video_reader.html#a508eed918fbe3bfe3eff4c1ebacb3463',1,'op::VideoReader::getNextFrameName()'],['../classop_1_1_webcam_reader.html#a58c315e577c12486e5ab1b941d4cce04',1,'op::WebcamReader::getNextFrameName()']]], ['getnumbercameras',['getNumberCameras',['../classop_1_1_camera_parameter_reader.html#acfd1caf98782ae3f8f83c85ba17bc4e0',1,'op::CameraParameterReader']]], diff --git a/html/search/functions_f.js b/html/search/functions_f.js index 29674314..ff1414d1 100644 --- a/html/search/functions_f.js +++ b/html/search/functions_f.js @@ -10,7 +10,7 @@ var searchData= ['pop',['pop',['../classop_1_1_queue_base.html#a5b28915cc58e040aca673bdfdf7c8be3',1,'op::QueueBase']]], ['posebodypartmapstringtokey',['poseBodyPartMapStringToKey',['../namespaceop.html#a3df938ef93037c534c5d342720d5fb70',1,'op::poseBodyPartMapStringToKey(const PoseModel poseModel, const std::string &string)'],['../namespaceop.html#aacf6e688031bb116e4878b811e8dbc23',1,'op::poseBodyPartMapStringToKey(const PoseModel poseModel, const std::vector< std::string > &strings)']]], ['posecpurenderer',['PoseCpuRenderer',['../classop_1_1_pose_cpu_renderer.html#a5863733d560345d4890557b0f8c0d08e',1,'op::PoseCpuRenderer']]], - ['poseextractor',['PoseExtractor',['../classop_1_1_pose_extractor.html#a1b3d91b3b39afde3a5094fc8c6c0af3e',1,'op::PoseExtractor']]], + ['poseextractor',['PoseExtractor',['../classop_1_1_pose_extractor.html#acd50fa337aef1d658b6fed3edc717ada',1,'op::PoseExtractor']]], ['poseextractorcaffe',['PoseExtractorCaffe',['../classop_1_1_pose_extractor_caffe.html#ab58c3ab4b745b35f542165ce27293554',1,'op::PoseExtractorCaffe']]], ['poseextractornet',['PoseExtractorNet',['../classop_1_1_pose_extractor_net.html#a8f1fb332299a83010830ee9d61752bc9',1,'op::PoseExtractorNet']]], ['posegpurenderer',['PoseGpuRenderer',['../classop_1_1_pose_gpu_renderer.html#a1582e63e33192d79f80b5879ba04d448',1,'op::PoseGpuRenderer']]], diff --git a/html/wrapper_8hpp_source.html b/html/wrapper_8hpp_source.html index 15ce9e6a..db4763ac 100644 --- a/html/wrapper_8hpp_source.html +++ b/html/wrapper_8hpp_source.html @@ -591,10 +591,10 @@ $(document).ready(function(){initNavTree('wrapper_8hpp_source.html','');});
    616  std::make_shared<KeepTopNPeople>(wrapperStructPose.numberPeopleMax)
    617  : nullptr);
    618  // Person tracker
    -
    619  std::vector<std::shared_ptr<PersonTracker>> personTrackers;
    +
    619  auto personTrackers = std::make_shared<std::vector<std::shared_ptr<PersonTracker>>>();
    620  if (wrapperStructPose.tracking > -1)
    -
    621  personTrackers.resize(spWPoseExtractors.size(),
    -
    622  std::make_shared<PersonTracker>(wrapperStructPose.tracking == 0));
    +
    621  personTrackers->emplace_back(
    +
    622  std::make_shared<PersonTracker>(wrapperStructPose.tracking == 0));
    623  for (auto i = 0u; i < spWPoseExtractors.size(); i++)
    624  {
    625  // OpenPose keypoint detector + keepTopNPeople
    • const std::vector< std::shared_ptr< PersonTracker >> & const std::shared_ptr< std::vector< std::shared_ptr< PersonTracker >>> &  personTracker = {},