Merge common files in OA and Visualizer tool

object_analytics_node/src/common/frame.cpp

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "frame.hpp"
+#include "common/frame.hpp"
 
 sFrame::sFrame(cv::Mat & cv_frame)
 {

object_analytics_node/src/common/frame_obj.cpp

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "frame_obj.hpp"
+#include "common/frame_obj.hpp"
 
 void FrameObjs::genFrame(cv::Mat & cv_frame, int idx)
 {

object_analytics_node/src/dataset/tr_dataset.cpp

@@ -15,7 +15,7 @@
 #include <string>
 #include <vector>
 
-#include "object_analytics_node/dataset/track_dataset.hpp"
+#include "dataset/track_dataset.hpp"
 
 namespace datasets
 {

object_analytics_node/src/dataset/trvid_dataset.cpp

@@ -16,7 +16,7 @@
 #include <fstream>
 #include <string>
 #include <vector>
-#include "object_analytics_node/dataset/track_dataset.hpp"
+#include "dataset/track_dataset.hpp"
 #include "util/logger.hpp"
 
 namespace datasets

object_analytics_node/src/visualizer/CMakeLists.txt

@@ -36,19 +36,22 @@ endif()
 find_package(Pangolin REQUIRED)
 find_package(OpenCV 3.2 REQUIRED)
 
+SET(OA_ROOT "${CMAKE_SOURCE_DIR}/../..")
+SET(OA_SRC "${OA_ROOT}/src")
+SET(OA_INCLUDE "${OA_ROOT}/include/object_analytics_node")
+
 include_directories(
   include
   utils
   device
   render_object
   view
   control
-  data 
-  data/dataset
   model
   model/stat
   model/sample
-  $(CMAKE_CURRENT_SOURCE_DIR)
+  ${CMAKE_SOURCE_DIR}
+  ${OA_INCLUDE}
 )
 
 add_executable(oa_viewer
@@ -65,12 +68,13 @@ add_executable(oa_viewer
   render_object/render_lines.cpp
   render_object/render_rect.cpp
   render_object/render_ellipse.cpp
-  data/frame.cpp
-  data/frame_obj.cpp
-  data/dataset/tr_dataset.cpp
-  data/dataset/trimg_dataset.cpp
-  data/dataset/trvid_dataset.cpp
-  data/dataset/trimg_MTdataset.cpp
+  ${OA_SRC}/util/logger.cpp
+  ${OA_SRC}/common/frame.cpp
+  ${OA_SRC}/common/frame_obj.cpp
+  ${OA_SRC}/dataset/tr_dataset.cpp
+  ${OA_SRC}/dataset/trimg_dataset.cpp
+  ${OA_SRC}/dataset/trvid_dataset.cpp
+  ${OA_SRC}/dataset/trimg_MTdataset.cpp
   model/math_model.cpp
   model/math_sample.cpp
   model/stat/stat_model.cpp

object_analytics_node/src/visualizer/control/control.hpp

@@ -28,7 +28,7 @@
 #include "view.hpp"
 #include "stream_device.hpp"
 
-#include "utility.hpp"
+#include "util/logger.hpp"
 
 
 class Control

object_analytics_node/src/visualizer/control/control_ds.hpp

@@ -26,10 +26,10 @@
 
 #include "math_sample.hpp"
 
-#include "utility.hpp"
+#include "util/logger.hpp"
 
 #include "control.hpp"
-#include "frame_obj.hpp"
+#include "common/frame_obj.hpp"
 
 class ControlDS : public Control
 {