|
@@ -16,7 +16,7 @@
|
|
|
#include <thread>
|
|
|
#include "objectarray.pb.h"
|
|
|
//#include "ivbacktrace.h"
|
|
|
-#include "Tracking.hpp"
|
|
|
+
|
|
|
iv::Ivfault *gfault = nullptr;
|
|
|
iv::Ivlog *givlog = nullptr;
|
|
|
|
|
@@ -30,9 +30,6 @@ const int kOutputNumBoxFeature = 7;
|
|
|
std::string gstrinput;
|
|
|
std::string gstroutput;
|
|
|
|
|
|
-TrackerSettings settings;
|
|
|
-CTracker tracker(settings);
|
|
|
-bool m_isTrackerInitialized = false;
|
|
|
|
|
|
void PclToArray(
|
|
|
const pcl::PointCloud<pcl::PointXYZI>::Ptr& in_pcl_pc_ptr,
|
|
@@ -162,19 +159,7 @@ void DectectOnePCD(const pcl::PointCloud<pcl::PointXYZI>::Ptr &pc_ptr)
|
|
|
double timex = pc_ptr->header.stamp;
|
|
|
timex = timex/1000.0;
|
|
|
lidarobjvec.set_timestamp(pc_ptr->header.stamp);
|
|
|
- //--------------------------------------------- init tracker -------------------------------------------------
|
|
|
- if (!m_isTrackerInitialized)
|
|
|
- {
|
|
|
- m_isTrackerInitialized = InitTracker(tracker);
|
|
|
- if (!m_isTrackerInitialized)
|
|
|
- {
|
|
|
- std::cerr << "Tracker initialize error!!!" << std::endl;
|
|
|
- }
|
|
|
- }
|
|
|
- Tracking(lidarobjvec, tracker);
|
|
|
-// std::<<"track end"<<std::endl;
|
|
|
|
|
|
- //-------------------------------------------- end tracking --------------------------------------------------
|
|
|
int ntlen;
|
|
|
std::string out = lidarobjvec.SerializeAsString();
|
|
|
iv::modulecomm::ModuleSendMsg(gpdetect,out.data(),out.length());
|
|
@@ -284,7 +269,7 @@ int main(int argc, char *argv[])
|
|
|
QCoreApplication a(argc, argv);
|
|
|
|
|
|
// RegisterIVBackTrace();
|
|
|
- tracker.setSettings(settings);
|
|
|
+
|
|
|
gfault = new iv::Ivfault("lidar_pointpillar");
|
|
|
givlog = new iv::Ivlog("lidar_pointpillar");
|
|
|
|