Merge pull request #108 from challenzhou/multi-tracking

reformat partial coding style

Author: challen-zhou

object_analytics_node/src/util/logger.cpp

@@ -22,7 +22,7 @@ namespace diag
 {
 /*static members*/
 std::unordered_map<std::string, std::shared_ptr<loggerBase>>
-loggerFarm::loggerBaseList_{{"",nullptr}};
+loggerFarm::loggerBaseList_{{"", nullptr}};
 
 REGISTER_LOGGER(consoleLogger);
 

object_analytics_node/src/visualizer/control/control.hpp

@@ -16,13 +16,13 @@
 
 #include <stdio.h>
 #include <unistd.h>
+#include <opencv2/core/core.hpp>
+#include <opencv2/opencv.hpp>
+
 #include <cstring>
 #include <memory>
 #include <string>
 
-#include <opencv2/core/core.hpp>
-#include <opencv2/opencv.hpp>
-
 #include "math_sample.hpp"
 #include "view.hpp"
 #include "stream_device.hpp"

object_analytics_node/src/visualizer/control/control_ds.cpp

@@ -12,6 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <string>
+#include <memory>
+
 #include "control_ds.hpp"
 #include "render_ellipse.hpp"
 #include "render_image.hpp"

object_analytics_node/src/visualizer/control/control_ds.hpp

@@ -16,13 +16,13 @@
 
 #include <stdio.h>
 #include <unistd.h>
+#include <opencv2/core/core.hpp>
+#include <opencv2/opencv.hpp>
+
 #include <cstring>
 #include <memory>
 #include <string>
 
-#include <opencv2/core/core.hpp>
-#include <opencv2/opencv.hpp>
-
 #include "math_sample.hpp"
 
 #include "utility.hpp"
@@ -70,5 +70,4 @@ class ControlDS : public Control
   bool StepMode_ = false;
   bool PauseMode_ = true;
   bool InitialScreen_ = true;
-
 };

object_analytics_node/src/visualizer/main.cpp

@@ -12,6 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <stdio.h>
+#include <unistd.h>
+
 #include <opencv2/core/core.hpp>
 #include <opencv2/imgproc/imgproc.hpp>
 #include <opencv2/opencv.hpp>
@@ -28,15 +31,10 @@
 #include <string>
 #include <memory>
 
-#include <stdio.h>
-#include <unistd.h>
-
 #include "control_ds.hpp"
 #include "stream_device.hpp"
 #include "view.hpp"
 
-using namespace std;
-
 static const char * keys = {
   "{@device_type | | camera or image files}"
   "{@device_path | | camera index or image path}"};
@@ -55,8 +53,8 @@ int main(int argc, char ** argv)
   */
 
   cv::CommandLineParser parser(argc, argv, keys);
-  string SrcType = parser.get<string>(0);
-  string FilePath = parser.get<string>(1);
+  std::string SrcType = parser.get<std::string>(0);
+  std::string FilePath = parser.get<std::string>(1);
 
   /*Just hack for convinience*/
   std::string ds_file =

object_analytics_node/tests/unittest_tracking.cpp

@@ -16,6 +16,7 @@
 #include <gtest/gtest.h>
 #include <cassert>
 #include <string>
+#include <memory>
 #include "tracker/tracking.hpp"
 
 TEST(UnitTestTracking, TrackingNomal) {
@@ -25,7 +26,7 @@ TEST(UnitTestTracking, TrackingNomal) {
   stamp.tv_nsec = 1;
   std::shared_ptr<sFrame> frame = std::make_shared<sFrame>(image, stamp);
   tracker::Tracking t(2, "cat");
-  t.rectifyTracker(frame, cv::Rect2d(100,100,200,300));
+  t.rectifyTracker(frame, cv::Rect2d(100, 100, 200, 300));
 
   EXPECT_EQ(t.getObjName(), std::string("cat"));
   EXPECT_EQ(t.getTrackingId(), int32_t(2));
@@ -41,7 +42,7 @@ TEST(UnitTestTracking, TrackingNullName) {
   stamp.tv_nsec = 1;
   std::shared_ptr<sFrame> frame = std::make_shared<sFrame>(image, stamp);
   tracker::Tracking t(2, "");
-  t.rectifyTracker(frame, cv::Rect2d(100,100,200,300));
+  t.rectifyTracker(frame, cv::Rect2d(100, 100, 200, 300));
 
   EXPECT_EQ(t.getObjName(), std::string(""));
   EXPECT_EQ(t.getTrackingId(), int32_t(2));