Переглянути джерело

change driver_group_grpc_client. change decition to deciton.

yuchuli 3 роки тому
батько
коміт
3810388526

+ 1 - 1
src/driver/driver_group_grpc_client/groupclient.h

@@ -53,7 +53,7 @@ private:
 
 private:
     std::string mstrbrainmsgname = "brainstate";
-    std::string mstrdecitionmsgname = "decition";
+    std::string mstrdecitionmsgname = "deciton";
     std::string mstrgpsimumsgname = "hcp2_gpsimu";
     std::string mstrgroupmsgname = "groupmsg";
     std::string mstrcarstate = "carstate";

+ 27 - 0
src/tool/view_group_grpc/mainwindow.cpp

@@ -64,5 +64,32 @@ void MainWindow::onTimer()
             ui->plainTextEdit->setPlainText(strout.data());
         }
     }
+
+    delete output;
+    strout.clear();
+    output = new google::protobuf::io::StringOutputStream(&strout);
+
+    if(minfo[index].mvehinfo.has_mbrainstate())
+    {
+        bool success = TextFormat::Print(*(minfo[index].mvehinfo.mutable_mbrainstate()), output);
+        if(success)
+        {
+            ui->plainTextEdit_brainstate->setPlainText(strout.data());
+        }
+    }
+
+    delete output;
+    strout.clear();
+    output = new google::protobuf::io::StringOutputStream(&strout);
+
+    if(minfo[index].mvehinfo.has_mdecition())
+    {
+        bool success = TextFormat::Print(*(minfo[index].mvehinfo.mutable_mdecition()), output);
+        if(success)
+        {
+            ui->plainTextEdit_decision->setPlainText(strout.data());
+        }
+    }
+
 }
 

+ 26 - 3
src/tool/view_group_grpc/mainwindow.ui

@@ -47,17 +47,17 @@
      </rect>
     </property>
    </widget>
-   <widget class="QPlainTextEdit" name="plainTextEdit_2">
+   <widget class="QPlainTextEdit" name="plainTextEdit_brainstate">
     <property name="geometry">
      <rect>
       <x>460</x>
       <y>130</y>
       <width>350</width>
-      <height>600</height>
+      <height>261</height>
      </rect>
     </property>
    </widget>
-   <widget class="QPlainTextEdit" name="plainTextEdit_3">
+   <widget class="QPlainTextEdit" name="plainTextEdit_decision">
     <property name="geometry">
      <rect>
       <x>860</x>
@@ -93,6 +93,29 @@
      <string>Decision:</string>
     </property>
    </widget>
+   <widget class="QLabel" name="label_4">
+    <property name="geometry">
+     <rect>
+      <x>460</x>
+      <y>410</y>
+      <width>101</width>
+      <height>31</height>
+     </rect>
+    </property>
+    <property name="text">
+     <string>CarState:</string>
+    </property>
+   </widget>
+   <widget class="QPlainTextEdit" name="plainTextEdit_carstate">
+    <property name="geometry">
+     <rect>
+      <x>460</x>
+      <y>450</y>
+      <width>350</width>
+      <height>261</height>
+     </rect>
+    </property>
+   </widget>
   </widget>
   <widget class="QMenuBar" name="menubar">
    <property name="geometry">

+ 2 - 0
src/tool/view_group_grpc/view_group_grpc.pro

@@ -21,6 +21,7 @@ DEFINES += QT_DEPRECATED_WARNINGS
 SOURCES += \
     ../../driver/driver_group_grpc_client/grpcgroup.grpc.pb.cc \
     ../../include/msgtype/brainstate.pb.cc \
+    ../../include/msgtype/carstate.pb.cc \
     ../../include/msgtype/decition.pb.cc \
     ../../include/msgtype/gpsimu.pb.cc \
     ../../include/msgtype/groupmsg.pb.cc \
@@ -32,6 +33,7 @@ SOURCES += \
 HEADERS += \
     ../../driver/driver_group_grpc_client/grpcgroup.grpc.pb.h \
     ../../include/msgtype/brainstate.pb.h \
+    ../../include/msgtype/carstate.pb.h \
     ../../include/msgtype/decition.pb.h \
     ../../include/msgtype/gpsimu.pb.h \
     ../../include/msgtype/groupmsg.pb.h \