modify map plan func

src/driver/driver_map_xodrload/main.cpp

@@ -82,6 +82,7 @@ struct simpletrace
  * */
 bool LoadXODR(std::string strpath)
 {
+    gbHasMap = false;
     OpenDriveXmlParser xp(&mxodr);
     xp.ReadFile(strpath);
     std::cout<<"road cout is "<<mxodr.GetRoadCount()<<std::endl;
@@ -138,7 +139,6 @@ bool LoadXODR(std::string strpath)
 
     Road * proad1 = mxodr.GetRoad(0);
     givlog->info("xodrload","road name is %s,map name is %s",proad1->GetRoadName().c_str(),strpath.c_str());
-    std::cout<<" road name is "<<proad1->GetRoadName()<<std::endl;
     gbHasMap = true;
 }
 
@@ -318,9 +318,9 @@ void CalcLatLon(const double lat0,const double lon0,const double hdg0,
 class xodrobj
 {
 public:
-    double flatsrc;
-    double flonsrc;
-    double fhgdsrc;
+    double flatsrc = 39.1210533;
+    double flonsrc = 117.0280094;
+    double fhgdsrc = 180;
     double flat;
     double flon;
     int lane;

src/ui/ui_ads_hmi_1px/ADCIntelligentVehicle.cpp

@@ -1260,8 +1260,8 @@ void ADCIntelligentVehicle::paintEvent(QPaintEvent *)
         /////////////////////////////////////apollo add car icon  20200409
         QPixmap pix;
         //pix.load("car.png");
-        //pix.load(":/ADCIntelligentVehicle/car1.png");
-        //painter->drawPixmap(435,667,30,67,pix);
+        pix.load(":/ADCIntelligentVehicle/car1.png");
+        painter->drawPixmap(435,667,30,67,pix);
         //        painter_small->drawPixmap(442,683,16,34,pix);
         ///////////////////////////////////////////////////////////////////
 
@@ -2166,7 +2166,7 @@ void ADCIntelligentVehicle::on_button_map_set_clicked()
 {
     QString fileName = QFileDialog::getOpenFileName(this,
                                                     tr("选择地图文件"),
-                                                    "/home/nvidia",
+                                                    "/home/nvidia/map",
                                                     tr("Text Files (*.xodr)"));
     if (fileName.isEmpty())
     {
@@ -2184,9 +2184,7 @@ void ADCIntelligentVehicle::on_button_map_set_clicked()
         hmi.set_mapname(fileName.toStdString());
         gIvlog->info("mapLoad","send map name");
         ShareHMIMsgPro(hmi);
-//        for(int i = 0; i < 10; i++)
-//        {for(int j = 0; j < 99999;j++){;}}
-//        QThread::sleep(2);
+        QThread::sleep(1);
         gIvlog->info("mapLoad","send des gps");
         //发送站点gps信息
         xodrobj xo;