2 Commits 9c9b3db167 ... 73617ff965

Author SHA1 Message Date
  dongjunhong 73617ff965 Merge branch 'master' of http://116.63.46.168:3000/ADPilot/modularization 2 months ago
  dongjunhong 45aaceec82 Fixed the error in calculating the correction value for traffic lights 2 months ago
1 changed files with 12 additions and 11 deletions
  1. 12 11
      src/v2x/v2xpro/mainwindow.cpp

+ 12 - 11
src/v2x/v2xpro/mainwindow.cpp

@@ -1682,16 +1682,17 @@ void MainWindow::on_ea_cf_clicked()
 {
     double x,y,head;
     x= ui->ea_cf_x->text().toDouble();
+    x=-x;
     y= ui->ea_cf_y->text().toDouble();
     head=m_structMGpsImu.yaw;
 
-    double now_x,now_y,lat,lon,aim_x,aim_y,aim_lat,aim_lon;
+    double now_x,now_y,lat,lon,aim_x,aim_y,aim_lat,aim_lon,dis,add_x,add_y;
     GaussProjCal(m_structMGpsImu.gps_lng,m_structMGpsImu.gps_lat,now_x,now_y);
+    add_x=x*qCos(qDegreesToRadians(head))+y*qSin(qDegreesToRadians(head));
+    add_y=x*qSin(qDegreesToRadians(head))-y*qCos(qDegreesToRadians(head));
 
-    x=x*qCos(qDegreesToRadians(head));
-    y=y*qSin(qDegreesToRadians(head));
-    aim_x=now_x+x;
-    aim_y=now_y+y;
+    aim_x=now_x+add_x;
+    aim_y=now_y+add_y;
     GaussProjInvCal(aim_x,aim_y,&aim_lon,&aim_lat);
 
 
@@ -1756,19 +1757,19 @@ void MainWindow::on_ns_cf_clicked()
 {
     double x,y,head;
     x= ui->ns_cf_x->text().toDouble();
+    x=-x;
     y= ui->ns_cf_y->text().toDouble();
     head=m_structMGpsImu.yaw;
 
-    double now_x,now_y,lat,lon,aim_x,aim_y,aim_lat,aim_lon;
+    double now_x,now_y,lat,lon,aim_x,aim_y,aim_lat,aim_lon,dis,add_x,add_y;
     GaussProjCal(m_structMGpsImu.gps_lng,m_structMGpsImu.gps_lat,now_x,now_y);
+    add_x=x*qCos(qDegreesToRadians(head))+y*qSin(qDegreesToRadians(head));
+    add_y=x*qSin(qDegreesToRadians(head))-y*qCos(qDegreesToRadians(head));
 
-    x=x*qCos(qDegreesToRadians(head));
-    y=y*qSin(qDegreesToRadians(head));
-    aim_x=now_x+x;
-    aim_y=now_y+y;
+    aim_x=now_x+add_x;
+    aim_y=now_y+add_y;
     GaussProjInvCal(aim_x,aim_y,&aim_lon,&aim_lat);
 
-
     QFile inputFile("./v2xTcpClient.xml"); // 替换成你的XML文件路径
 
     if (!inputFile.open(QIODevice::ReadOnly | QIODevice::Text)) {