Browse Source

change tool/map_lanetoxodr. change rtk to old.

yuchuli 3 years ago
parent
commit
23cc27b276
1 changed files with 34 additions and 34 deletions
  1. 34 34
      src/tool/map_lanetoxodr/dialogaddroadfromrtk.cpp

+ 34 - 34
src/tool/map_lanetoxodr/dialogaddroadfromrtk.cpp

@@ -332,7 +332,7 @@ void DialogAddRoadFromRTK::on_pushButton_CreateRoad_clicked()
         return;
     }
 
-    double LINE_ERROR = 0.05;
+    double LINE_ERROR = 0.10;
 
 
     std::vector<geobase> xvectorgeo;
@@ -341,9 +341,9 @@ void DialogAddRoadFromRTK::on_pushButton_CreateRoad_clicked()
     int j;
     int ncurpos = 0;
     int nrange = mvectorrtkdata.size();
-    double fXLast;
-    double fYLast;
-    bool bFirst = true;
+//    double fXLast;
+//    double fYLast;
+//    bool bFirst = true;
     while(bComplete == false)
     {
 
@@ -415,19 +415,19 @@ void DialogAddRoadFromRTK::on_pushButton_CreateRoad_clicked()
                 xgeo.mfY = y0;
                 xgeo.mfLen = sqrt(pow(x1-x0,2)+pow(y1-y0,2));
                 xgeo.mnType = 0;
-                if(bFirst)
-                {
-                    xgeo.mfX = x_veh[0];
-                    xgeo.mfY = y_veh[0];
-                    bFirst = false;
-                }
-                else
-                {
-                    xgeo.mfX = fXLast;
-                    xgeo.mfY = fYLast;
-                }
-                fXLast = xgeo.mfX + xgeo.mfLen * cos(xgeo.mfHdg);
-                fYLast = xgeo.mfY + xgeo.mfLen * sin(xgeo.mfHdg);
+//                if(bFirst)
+//                {
+//                    xgeo.mfX = x_veh[0];
+//                    xgeo.mfY = y_veh[0];
+//                    bFirst = false;
+//                }
+//                else
+//                {
+//                    xgeo.mfX = fXLast;
+//                    xgeo.mfY = fYLast;
+//                }
+//                fXLast = xgeo.mfX + xgeo.mfLen * cos(xgeo.mfHdg);
+//                fYLast = xgeo.mfY + xgeo.mfLen * sin(xgeo.mfHdg);
                 xvectorgeo.push_back(xgeo);
             }
             else
@@ -448,23 +448,23 @@ void DialogAddRoadFromRTK::on_pushButton_CreateRoad_clicked()
                     xgeo.mfEndX = ep.x();
                     xgeo.mfEndY = ep.y();
                     xgeo.mR = fR;
-                    if(bFirst)
-                    {
-                        xgeo.mfX = x_veh[0];
-                        xgeo.mfY = y_veh[0];
-                        xgeo.mfEndX = ep.x() + (x_veh[0] - sp.x());
-                        xgeo.mfEndY = ep.y() + (y_veh[0] - sp.y());
-                        bFirst = false;
-                    }
-                    else
-                    {
-                        xgeo.mfX = fXLast;
-                        xgeo.mfY = fYLast;
-                        xgeo.mfEndX = ep.x() + (fXLast - sp.x());
-                        xgeo.mfEndY = ep.y() + (fYLast - sp.y());
-                    }
-                    fXLast = xgeo.mfEndX;
-                    fYLast = xgeo.mfEndY;
+//                    if(bFirst)
+//                    {
+//                        xgeo.mfX = x_veh[0];
+//                        xgeo.mfY = y_veh[0];
+//                        xgeo.mfEndX = ep.x() + (x_veh[0] - sp.x());
+//                        xgeo.mfEndY = ep.y() + (y_veh[0] - sp.y());
+//                        bFirst = false;
+//                    }
+//                    else
+//                    {
+//                        xgeo.mfX = fXLast;
+//                        xgeo.mfY = fYLast;
+//                        xgeo.mfEndX = ep.x() + (fXLast - sp.x());
+//                        xgeo.mfEndY = ep.y() + (fYLast - sp.y());
+//                    }
+//                    fXLast = xgeo.mfEndX;
+//                    fYLast = xgeo.mfEndY;
                     xvectorgeo.push_back(xgeo);
                 }
             }