|
@@ -54,8 +54,8 @@ void DialogRoadMove::lanemodemove(double fmovex, double fmovey, Road &newroad, R
|
|
|
{
|
|
|
xodrfunc::GetRoadXYByS(pRoad,snow + fstep *j,x,y,fhdg);
|
|
|
|
|
|
- double yoff = fmovex*sin(fhdg+M_PI/2.0) + fmovey *sin(fhdg);
|
|
|
- double xoff = fmovex*cos(fhdg+M_PI/2.0) + fmovey *cos(fhdg);
|
|
|
+ double yoff = fmovex*sin(fhdg+M_PI/2.0) + fmovey *sin(fhdg+M_PI/2.0);
|
|
|
+ double xoff = fmovex*cos(fhdg+M_PI/2.0) + fmovey *cos(fhdg+M_PI/2.0);
|
|
|
x = x + xoff;
|
|
|
y = y + yoff;
|
|
|
iv::rtkdata xdata;
|
|
@@ -76,8 +76,8 @@ void DialogRoadMove::lanemodemove(double fmovex, double fmovey, Road &newroad, R
|
|
|
{
|
|
|
xodrfunc::GetRoadXYByS(pRoad,snow + fstep *j,x,y,fhdg);
|
|
|
|
|
|
- double yoff = fmovex*sin(fhdg+M_PI/2.0) + fmovey *sin(fhdg);
|
|
|
- double xoff = fmovex*cos(fhdg+M_PI/2.0) + fmovey *cos(fhdg);
|
|
|
+ double yoff = fmovex*sin(fhdg+M_PI/2.0) + fmovey *sin(fhdg+M_PI/2.0);
|
|
|
+ double xoff = fmovex*cos(fhdg+M_PI/2.0) + fmovey *cos(fhdg+M_PI/2.0);
|
|
|
x = x + xoff;
|
|
|
y = y + yoff;
|
|
|
iv::rtkdata xdata;
|
|
@@ -329,6 +329,9 @@ void DialogRoadMove::on_pushButton_Move_clicked()
|
|
|
int nnewroadid = gw->CreateRoadID();
|
|
|
newroad.SetRoadId(QString::number(nnewroadid).toStdString());
|
|
|
|
|
|
+ newroad.RemovePredecessor();
|
|
|
+ newroad.RemoveSuccessor();
|
|
|
+
|
|
|
mpxodr->GetRoadVector()->push_back(newroad);
|
|
|
|
|
|
bool bSaveOldRoad = true;
|