Browse Source

change tool/map_lanetoxodr. fix autocontact problem.

yuchuli 3 years ago
parent
commit
9e0c337716
1 changed files with 16 additions and 1 deletions
  1. 16 1
      src/tool/map_lanetoxodr/mainwindow.cpp

+ 16 - 1
src/tool/map_lanetoxodr/mainwindow.cpp

@@ -3045,8 +3045,23 @@ void MainWindow::onClickAutoRoadContact()
     rc.mncon2 = ntype2;
 
     char strname[256];
-    snprintf(strname,256,"%s_%s_%s_%s",p1->GetRoadId().data(),mpCBRC1->currentText().toLatin1().data(),
+    if(xARCLane.size()>0)
+    {
+        snprintf(strname,256,"%s_%s_%s_%s",p1->GetRoadId().data(),mpCBRC1->currentText().toLatin1().data(),
              p2->GetRoadId().data(),mpCBRC2->currentText().toLatin1().data());
+    }
+    else
+    {
+        xARCLane = xARCOpLane;
+        xARCOpLane.clear();
+        rc.mnroad2id = atoi(p1->GetRoadId().data());
+        rc.mnroad1id = atoi(p2->GetRoadId().data());
+        rc.mncon2 = ntype1;
+        rc.mncon1 = ntype2;
+        snprintf(strname,256,"%s_%s_%s_%s",p2->GetRoadId().data(),mpCBRC2->currentText().toLatin1().data(),
+                 p1->GetRoadId().data(),mpCBRC1->currentText().toLatin1().data());
+
+    }
     mpCBRoadCon->clear();
     mpCBRoadCon->addItem(strname);
     mpCBLane1->clear();