Browse Source

change ui/ADCIntelligentShow. default lane from 3 to default 1, can change in xml.

yuchuli 3 years ago
parent
commit
f12bdd681d

+ 5 - 1
src/ui/ADCIntelligentShow_grpc/adcintelligentshow.cpp

@@ -8,6 +8,8 @@
 #include "pos_def.h"
 extern std::vector<iv::pos_def> gvectorpos;
 
+extern std::string gstrdefaultlane;
+
 ADCIntelligentShow * gAShow;
 
 
@@ -256,6 +258,8 @@ ADCIntelligentShow::ADCIntelligentShow(QWidget *parent) :
 
     mpapad = iv::modulecomm::RegisterSend("pad",1000,1);
 
+    mndefaultlane = atoi(gstrdefaultlane.data());
+
 
 #endif
 
@@ -1064,7 +1068,7 @@ void ADCIntelligentShow::on_pushButton_go_clicked()
     xodrobj xo;
     xo.flon = gvectorpos[mnStationIndex].mflon;
     xo.flat = gvectorpos[mnStationIndex].mflat;
-    xo.lane = 1;
+    xo.lane = mndefaultlane;
 
 #ifndef Android
     iv::modulecomm::ModuleSendMsg(mpadst,(char *)&xo,sizeof(xodrobj));

+ 1 - 0
src/ui/ADCIntelligentShow_grpc/adcintelligentshow.h

@@ -255,6 +255,7 @@ private:
 
     void *mpadst;
     int mnStationIndex = 0;
+    int mndefaultlane = 1;
     ////////////////////////////////////////////////////
 
 };

+ 2 - 0
src/ui/ADCIntelligentShow_grpc/main.cpp

@@ -25,6 +25,7 @@ std::string gstrmode = "false";
 std::string gstrserverip = "192.168.1.102";
 std::string gstrserverport = "30051";
 std::string gstrqueryinterval = "10";
+std::string gstrdefaultlane = "1";
 
 #include "pos_def.h"
 
@@ -144,6 +145,7 @@ int main(int argc, char *argv[])
    gstrserverip = xp.GetParam("serverip","192.168.1.102");
    gstrserverport = xp.GetParam("serverport","30051");
    gstrqueryinterval = xp.GetParam("queryinterval","10");
+   gstrdefaultlane = xp.GetParam("defaultlane","1");
 
    grpcclientthread xrpcthread;