Browse Source

change tool/map_lanetoxdor. fix a name error.

yuchuli 3 years ago
parent
commit
eb32b33f5f

+ 2 - 2
src/common/common/license/adclicensewithwin.cpp

@@ -7,14 +7,14 @@ int ADCLicenseCheckWithWin()
     int nRtn = ADCLicenseServ::CheckLincese();
     if(nRtn == -1)
     {
-        QMessageBox::warning(NULL,"Warning","License 错误,请申请Lincense",QMessageBox::YesAll);
+        QMessageBox::warning(NULL,"Warning","license 错误,请申请license",QMessageBox::YesAll);
         return nRtn;
     }
     else
     {
         if(nRtn == -2)
         {
-            QMessageBox::warning(NULL,"Warning","License服务启动失败",QMessageBox::YesAll);
+            QMessageBox::warning(NULL,"Warning","license服务启动失败",QMessageBox::YesAll);
             return nRtn;
         }
     }

+ 2 - 1
src/driver/driver_map_xodrload/xodrdijkstra.cpp

@@ -171,7 +171,7 @@ xodrdijkstra::xodrdijkstra(OpenDrive  * pxodr)
                 {
                     fseclen = px->GetRoadLength() - px->GetLaneSection(j)->GetS();
                 }
-//                if((px->GetRoadId() == "10019")||(px->GetRoadId() == "10020"))
+//                if((px->GetRoadId() == "10076")||(px->GetRoadId() == "10114"))
 //                {
 //                    int axy = 1;
 //                }
@@ -204,6 +204,7 @@ xodrdijkstra::xodrdijkstra(OpenDrive  * pxodr)
         mroadedge[i].mbvertex = true;
         mroadedge[i].mvertexstart = 2*i;
         mroadedge[i].mvertexend = 2*i + 1;
+//        std::cout<<"road id "<<mroadedge[i].mroadid<<" lenght "<<mroadedge[i].mfedgelen<<std::endl;
     }
 
 

+ 3 - 1
src/tool/map_lanetoxodr/main.cpp

@@ -76,10 +76,12 @@ int main(int argc, char *argv[])
 #ifdef XODRViewer
     XVMainWindow w;
 #else
+#ifdef OPENDRIVE_EDITONLY
     if(ADCLicenseCheckWithWin() != 0)
     {
-//        return 0;
+        return 0;
     }
+#endif
     MainWindow w;
 #endif
     w.show();