change map_lanetoxodr for compile in windows.

src/common/ivxlnt/ivxlnt.pro

@@ -44,7 +44,7 @@ unix:LIBS += -lxlnt
 DISTFILES += \
     ../map_lanetoxodr/TinyXML/TinyXML.pri
 
-win32: LIBS += -L$$PWD/../../../thirdpartylib/xlnt/lib/win10/ -llibxlnt.dll
+win32: LIBS += -L$$PWD/../../../thirdpartylib/xlnt/lib/win10 -llibxlnt.dll
 
 INCLUDEPATH += $$PWD/../../../thirdpartylib/xlnt/lib/win10
 DEPENDPATH += $$PWD/../../../thirdpartylib/xlnt/lib/win10

src/tool/map_lanetoxodr/excelapi.cpp

@@ -6,14 +6,22 @@
 ExcelAPI::ExcelAPI()
 {
     std::cout<<"Load Excel API"<<std::endl;
+#ifdef Q_OS_WIN
+    QLibrary xlib("./plugin/libxlnt.dll");
+#else
     QLibrary xlib("./plugin/libxlnt.so.1.5.0");
+#endif
     if(!xlib.load())
     {
         std::cout<<" load libxlnt fail."<<xlib.errorString().toStdString()<< std::endl;
         return ;
     }
 
+#ifdef Q_OS_WIN
+    QLibrary qlib("./plugin/ivxlnt.dll");
+#else
     QLibrary qlib("./plugin/libivxlnt.so");
+#endif
     if(qlib.load())
     {
         std::cout<<" lib load."<<std::endl;
@@ -29,6 +37,11 @@ ExcelAPI::ExcelAPI()
     if((mOpenxlsx != NULL)&&(mgetcellvalue!=NULL)&&(mClosexlsx != NULL))
     {
         mbLoad = true;
+        std::cout<<" lib ivxlnt function suc."<<std::endl;
+    }
+    else
+    {
+        std::cout<<" load function fail."<<std::endl;
     }
 
 

src/tool/map_lanetoxodr/function/cdaproc.cpp

@@ -310,8 +310,8 @@ int CDAProc::ProcLineRoad(OpenDrive * pxodr,  std::string strtype,std::string st
 
 int CDAProc::Proc(std::string strxlsxpath,OpenDrive * pxodr)
 {
-    void * pexcel = ServiceExcelAPI.Openxlsx(strxlsxpath);
 
+    void * pexcel = ServiceExcelAPI.Openxlsx(strxlsxpath);
     std::string strtype;
     std::string strradius;
     std::string strroadlen;