Kaynağa Gözat

change pilot_apollo_bridge_gui. delete cyberrt dep, because only sys manage.

yuchuli 3 hafta önce
ebeveyn
işleme
df1793a0fc

+ 6 - 5
src/apollo/code/pilot_apollo_bridge_gui/mainwindow.cpp

@@ -3,6 +3,7 @@
 
 #include <QProcess>
 #include <QTimer>
+#include <iostream>
 
 MainWindow::MainWindow(QWidget *parent)
     : QMainWindow(parent)
@@ -10,8 +11,8 @@ MainWindow::MainWindow(QWidget *parent)
 {
     ui->setupUi(this);
 
-    apollo::cyber::Init("pilot_apollo_bridge_gui");
-    pilot_node = apollo::cyber::CreateNode("pilot_apollo_bridge_gui");
+//    apollo::cyber::Init("pilot_apollo_bridge_gui");
+//    pilot_node = apollo::cyber::CreateNode("pilot_apollo_bridge_gui");
 
     mpthreadtest = new std::thread(&MainWindow::threadtest,this);
 
@@ -104,9 +105,9 @@ MainWindow::~MainWindow()
 void MainWindow::threadtest()
 {
 
-    while(mbtestrun && (apollo::cyber::OK())){
-        std::this_thread::sleep_for(std::chrono::milliseconds(100));
-    }
+//    while(mbtestrun && (apollo::cyber::OK())){
+//        std::this_thread::sleep_for(std::chrono::milliseconds(100));
+//    }
 }
 
 

+ 4 - 4
src/apollo/code/pilot_apollo_bridge_gui/mainwindow.h

@@ -3,9 +3,9 @@
 
 #include <QMainWindow>
 
-#include "cyber/cyber.h"
-#include "cyber/time/rate.h"
-#include "cyber/time/time.h"
+//#include "cyber/cyber.h"
+//#include "cyber/time/rate.h"
+//#include "cyber/time/time.h"
 
 #include "sysman.h"
 #include "progmon.h"
@@ -55,7 +55,7 @@ private:
 
 
 private:
-    std::unique_ptr<apollo::cyber::Node> pilot_node;
+//    std::unique_ptr<apollo::cyber::Node> pilot_node;
 
     std::thread * mpthreadtest;
     bool mbtestrun = true;

+ 32 - 32
src/apollo/code/pilot_apollo_bridge_gui/pilot_apollo_bridge_gui.pro

@@ -53,36 +53,36 @@ else: unix:!android: target.path = /opt/$${TARGET}/bin
 INCLUDEPATH += /opt/apollo/neo/include
 INCLUDEPATH += /apollo_workspace/bazel-bin/external/apollo_src
 
-LIBS += -L/opt/apollo/neo/lib/cyber -lcyber -lcyber_binary -lcyber_state
-
-LIBS += /opt/apollo/neo/lib/cyber/component/*.so
-LIBS += /opt/apollo/neo/lib/cyber/context/*.so
-LIBS += /opt/apollo/neo/lib/cyber/io/*.so
-LIBS += /opt/apollo/neo/lib/cyber/logger/*.so
-LIBS += /opt/apollo/neo/lib/cyber/parameter/*.so
-LIBS += /opt/apollo/neo/lib/cyber/plugin_manager/*.so
-LIBS += /opt/apollo/neo/lib/cyber/node/*.so
-LIBS += /opt/apollo/neo/lib/cyber/blocker/*.so
-LIBS += /opt/apollo/neo/lib/cyber/class_loader/*.so
-LIBS += /opt/apollo/neo/lib/cyber/profiler/*.so
-LIBS += /opt/apollo/neo/lib/cyber/scheduler/*.so
-LIBS += /opt/apollo/neo/lib/cyber/service/*.so
-LIBS += /opt/apollo/neo/lib/cyber/statistics/*.so
-LIBS += /opt/apollo/neo/lib/cyber/task/*.so
-LIBS += /opt/apollo/neo/lib/cyber/common/*.so
-LIBS += /opt/apollo/neo/lib/cyber/service_discovery/*.so
-LIBS += /opt/apollo/neo/lib/cyber/transport/*.so
-LIBS += /opt/apollo/neo/lib/cyber/message/*.so
-LIBS += /opt/apollo/neo/lib/cyber/proto/*.so
-LIBS += /opt/apollo/neo/lib/cyber/croutine/*.so
-LIBS += /opt/apollo/neo/lib/cyber/event/*.so
-LIBS += /opt/apollo/neo/lib/cyber/time/*.so
-
-LIBS += -L/opt/apollo/neo/lib/3rd-fastdds-wrap -lfastrtps
-
-LIBS += -L/lib/aarch64-linux-gnu -lgflags -lglog
-
-LIBS += -L/usr/local/lib/ -lbvar
-
-LIBS += -L/opt/apollo/neo/lib/3rd-protobuf -lprotobuf
+#LIBS += -L/opt/apollo/neo/lib/cyber -lcyber -lcyber_binary -lcyber_state
+
+#LIBS += /opt/apollo/neo/lib/cyber/component/*.so
+#LIBS += /opt/apollo/neo/lib/cyber/context/*.so
+#LIBS += /opt/apollo/neo/lib/cyber/io/*.so
+#LIBS += /opt/apollo/neo/lib/cyber/logger/*.so
+#LIBS += /opt/apollo/neo/lib/cyber/parameter/*.so
+#LIBS += /opt/apollo/neo/lib/cyber/plugin_manager/*.so
+#LIBS += /opt/apollo/neo/lib/cyber/node/*.so
+#LIBS += /opt/apollo/neo/lib/cyber/blocker/*.so
+#LIBS += /opt/apollo/neo/lib/cyber/class_loader/*.so
+#LIBS += /opt/apollo/neo/lib/cyber/profiler/*.so
+#LIBS += /opt/apollo/neo/lib/cyber/scheduler/*.so
+#LIBS += /opt/apollo/neo/lib/cyber/service/*.so
+#LIBS += /opt/apollo/neo/lib/cyber/statistics/*.so
+#LIBS += /opt/apollo/neo/lib/cyber/task/*.so
+#LIBS += /opt/apollo/neo/lib/cyber/common/*.so
+#LIBS += /opt/apollo/neo/lib/cyber/service_discovery/*.so
+#LIBS += /opt/apollo/neo/lib/cyber/transport/*.so
+#LIBS += /opt/apollo/neo/lib/cyber/message/*.so
+#LIBS += /opt/apollo/neo/lib/cyber/proto/*.so
+#LIBS += /opt/apollo/neo/lib/cyber/croutine/*.so
+#LIBS += /opt/apollo/neo/lib/cyber/event/*.so
+#LIBS += /opt/apollo/neo/lib/cyber/time/*.so
+
+#LIBS += -L/opt/apollo/neo/lib/3rd-fastdds-wrap -lfastrtps
+
+#LIBS += -L/lib/aarch64-linux-gnu -lgflags -lglog
+
+#LIBS += -L/usr/local/lib/ -lbvar
+
+#LIBS += -L/opt/apollo/neo/lib/3rd-protobuf -lprotobuf