yuchuli 2 жил өмнө
parent
commit
5ae464b251

+ 3 - 3
src/tool/map_lanetoxodr/function/cdaproc.cpp

@@ -362,9 +362,9 @@ int CDAProc::Proc(std::string strxlsxpath,OpenDrive * pxodr)
     ServiceExcelAPI.getcellvalue(pexcel,121,4,strroadlen);
     ServiceExcelAPI.getcellvalue(pexcel,122,4,strlanewidth);
     ServiceExcelAPI.getcellvalue(pexcel,123,4,strlannecount);
-    ServiceExcelAPI.getcellvalue(pexcel,124,4,strlanetype);
-    ServiceExcelAPI.getcellvalue(pexcel,125,4,strlanemarkcolor);
-    ServiceExcelAPI.getcellvalue(pexcel,126,4,strlanemarktype);
+//    ServiceExcelAPI.getcellvalue(pexcel,124,4,strlanetype);
+    ServiceExcelAPI.getcellvalue(pexcel,124,4,strlanemarkcolor);
+    ServiceExcelAPI.getcellvalue(pexcel,125,4,strlanemarktype);
     std::cout<<"type : "<<strtype<<std::endl;
     ServiceExcelAPI.Closexlsx(pexcel);
 

+ 2 - 2
src/tool/map_lanetoxodr/mainwindow.ui

@@ -210,12 +210,12 @@
   </action>
   <action name="actionAdd_Road_From_CDA">
    <property name="text">
-    <string>Add Road From CDA</string>
+    <string>Add Road From Label</string>
    </property>
   </action>
   <action name="actionDraw_Road_From_CDA">
    <property name="text">
-    <string>Draw Road From CDA</string>
+    <string>Draw Road From Label</string>
    </property>
   </action>
  </widget>