Browse Source

change tool/map_lanetoxdr. fix a bug in merge.

yuchuli 3 years ago
parent
commit
79287c2ba9
1 changed files with 5 additions and 1 deletions
  1. 5 1
      src/tool/map_lanetoxodr/dialogroadmerge.cpp

+ 5 - 1
src/tool/map_lanetoxodr/dialogroadmerge.cpp

@@ -63,7 +63,7 @@ int DialogRoadMerge::MergeGeometry(Road *pRoad1, Road *pRoad2)
             pnewgb->AddGeometryParamPoly3(pgeb->GetS() + froad1len,pgeb->GetX(),pgeb->GetY(),
                                           pgeb->GetHdg(),pgeb->GetLength(),pparmp3d->GetuA(),pparmp3d->GetuB(),
                                           pparmp3d->GetuC(),pparmp3d->GetuD(),pparmp3d->GetvA(),
-                                          pparmp3d->GetvB(),pparmp3d->GetvC(),pparmp3d->GetvD());
+                                          pparmp3d->GetvB(),pparmp3d->GetvC(),pparmp3d->GetvD(),pparmp3d->GetNormal());
         }
         default:
             break;
@@ -267,4 +267,8 @@ void DialogRoadMerge::on_pushButton_Merge_clicked()
 
     pRoad1->SetRoadLength(pRoad1->GetRoadLength() + pRoad2->GetRoadLength());
      mpxodr->DeleteRoad(xodrfunc::GetRoadIndex(mpxodr,pRoad2));
+
+     QMessageBox::information(this,"Merge Road","Merge Road Successfully.",QMessageBox::YesAll);
+
+     this->accept();
 }