Przeglądaj źródła

change pilot_apollo_bridge_gui, add console out. add a apollo doc, not complete.

yuchuli 1 miesiąc temu
rodzic
commit
7a52fb8428

BIN
doc/Apollo/Apollo增加模块说明.docx


+ 2 - 2
src/apollo/code/apollochassis/Readme.md

@@ -1,5 +1,5 @@
-copy libnvcan.so from nvcan folder.
+copy libadchassis.so .
 
 /apollo/.cache/bazel/679551712d2357b63e6e0ce858ebf90e/execroot/__main__/bazel-out/aarch64-opt-exec-2B5CBBC6/bin/external/com_google_protobuf/protoc -I=./ --cpp_out=./  *.proto
-qmake apollodriver_nvcan.pro  
+qmake apollochassis.pro  
 make

+ 1 - 1
src/apollo/code/apollochassis/apollochassis.pro

@@ -1,5 +1,5 @@
 #/apollo/.cache/bazel/679551712d2357b63e6e0ce858ebf90e/execroot/__main__/bazel-out/aarch64-opt-exec-2B5CBBC6/bin/external/com_google_protobuf/protoc -I=./ --cpp_out=./  *.proto
-#qmake apollodriver_nvcan.pro  
+#qmake apollochassis.pro  
 #make
 
 QT -= gui core

+ 4 - 4
src/apollo/code/pilot_apollo_bridge_gui/groupunit.cpp

@@ -131,22 +131,22 @@ void GroupUnit::CreateTitle()
     nXPos = nXPos + 100;
 
     pLA = new QLabel(mpGroup);
-    pLA->setText("CPU");
+    pLA->setText("CPU(%)");
     pLA->setGeometry(nXPos,nYPos,90,nHgt);
     nXPos = nXPos + 100;
 
     pLA = new QLabel(mpGroup);
-    pLA->setText("Mem");
+    pLA->setText("Mem(MB)");
     pLA->setGeometry(nXPos,nYPos,90,nHgt);
     nXPos = nXPos + 100;
 
     pLA = new QLabel(mpGroup);
-    pLA->setText("Thread");
+    pLA->setText("Threads");
     pLA->setGeometry(nXPos,nYPos,90,nHgt);
     nXPos = nXPos + 100;
 
     pLA = new QLabel(mpGroup);
-    pLA->setText("log(stdout)");
+    pLA->setText("show out");
     pLA->setGeometry(nXPos,nYPos,90,nHgt);
     nXPos = nXPos + 100;
 

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

@@ -52,6 +52,7 @@ MainWindow::MainWindow(QWidget *parent)
     CenterView * pcv = new CenterView(p,mPM);
     mpCV = pcv;
     connect(pcv,SIGNAL(ProgClick(ProgUnit*,ProgramViewUnit * ,bool)),this,SLOT(onProgClick(ProgUnit*,ProgramViewUnit * ,bool)));
+    connect(pcv,SIGNAL(ProgLogClick(ProgUnit*,ProgramViewUnit*,bool)),this,SLOT(onProgLogClick(ProgUnit*,ProgramViewUnit*,bool)));
 
     mPM->start();
 
@@ -256,6 +257,11 @@ void MainWindow::onTimerState()
     mpCV->UpdateState();
 }
 
+void MainWindow::onProgLogClick(ProgUnit *pu, ProgramViewUnit *pvu, bool bClick)
+{
+    pu->mbSavestdout = bClick;
+}
+
 
 
 

+ 1 - 0
src/apollo/code/pilot_apollo_bridge_gui/mainwindow.h

@@ -45,6 +45,7 @@ private slots:
 private slots:
 
      void onProgClick(ProgUnit * pu,ProgramViewUnit * pvu,bool bClick);
+     void onProgLogClick(ProgUnit * pu,ProgramViewUnit * pvu,bool bClick);
 
 private:
     Ui::MainWindow *ui;

+ 32 - 0
src/apollo/code/pilot_apollo_bridge_gui/progmon.cpp

@@ -311,7 +311,22 @@ void ProgMon::onReadStandardOutput()
     QProcess * proc = (QProcess *)sender();
     QByteArray ba = proc->readAllStandardOutput();
 
+    int nsize = mvectorprog.size();
+    int i;
+    for(i=0;i<nsize;i++)
+    {
+        if(proc == mvectorprog.at(i).mProcess)
+        {
+            if(mvectorprog.at(i).mbSavestdout)
+            {
+                std::cout<<ba.data()<<std::endl;
+            }
+        }
+    }
+
 
+ //   std::cout<<" proc std out: "<<ba.data()<<std::endl;
+    return;
     if(mbAllNoLog == false)
     {
         mMutex_stdout.lock();
@@ -326,7 +341,21 @@ void ProgMon::onReadStandardError()
     QProcess * proc = (QProcess *)sender();
     QByteArray ba = proc->readAllStandardError();
 
+    int nsize = mvectorprog.size();
+    int i;
+    for(i=0;i<nsize;i++)
+    {
+        if(proc == mvectorprog.at(i).mProcess)
+        {
+            if(mvectorprog.at(i).mbSavestdout)
+            {
+                std::cout<<ba.data()<<std::endl;
+            }
+        }
+    }
 
+//    std::cout<<" proc err out: "<<ba.data()<<std::endl;
+    return;
     mMutex_errout.lock();
     if(mvectorerrout.size()<1000) mvectorerrout.push_back(stdoutunit(proc,ba));
     mMutex_errout.unlock();
@@ -534,6 +563,9 @@ void ProgMon::StartProc(ProgUnit *pu)
     connect(pu->mProcess,SIGNAL(started()),this,SLOT(onProcessStarted()));
     connect(pu->mProcess,SIGNAL(finished(int)),this,SLOT(onProcessEnd()));
 
+    connect(pu->mProcess,SIGNAL(readyReadStandardOutput()),this,SLOT(onReadStandardOutput()));
+    connect(pu->mProcess,SIGNAL(readyReadStandardError()),this,SLOT(onReadStandardError()));
+
     pu->mProcess->start("cyber_launch",QStringList() << "start"<<pu->strcmd.data());
     pu->state = 1;