Browse Source

修改地图比例尺..

nvidia 3 years ago
parent
commit
a690c25ea8

+ 4 - 6
src/detection/detection_radar_delphi_esr_send/main.cpp

@@ -32,7 +32,7 @@ static uint16_t CAN_Scan_Index;
 static double Vehicle_Yaw_Rate;
 static double Vehicle_Speed;        //< m/s
 static double Steering_Angle; //< optional signal, ready to use
-static int16_t Radius_Curvature = 8191; //< optional signal, 8191 meter is default
+static int16_t Radius_Curvature = 0; //< optional signal, 8191 meter is default
 static uint8_t Radar_FOV_Long_Range = 30; //< 0-30 degree
 static uint8_t Radar_FOV_Mid_Range = 120; //< 0-120 degree
 static uint8_t Radar_Height = 50;//< 0-125 cm
@@ -69,9 +69,7 @@ void ExecSend()
 {
     iv::can::canmsg xmsg;
     iv::can::canraw xraw;
-//    for(int i = 0 ; i< 8;i++)
-//        qDebug("%x",canbyte[i]);
-
+qDebug()<<QTime::currentTime();
     xraw.set_id(0x4F0);
     xraw.set_data(canData4f0.byte,8);
     xraw.set_bext(false);
@@ -91,7 +89,7 @@ void ExecSend()
     pxraw->CopyFrom(xraw);
     xmsg.set_channel(1);
     xmsg.set_index(gnIndex);
-
+/*
     xraw.set_id(0x5F2);
     xraw.set_data(canData5f2.byte,8);
     xraw.set_bext(false);
@@ -112,7 +110,7 @@ void ExecSend()
     pxraw->CopyFrom(xraw);
     xmsg.set_channel(1);
     xmsg.set_index(gnIndex);
-
+*/
     gnIndex++;
     xmsg.set_mstime(QDateTime::currentMSecsSinceEpoch());
     int ndatasize = xmsg.ByteSize();

+ 2 - 2
src/ui/ui_ads_hmi/ADCIntelligentVehicle.cpp

@@ -1188,9 +1188,9 @@ void ADCIntelligentVehicle::paintEvent(QPaintEvent *)
             {
                 if (xradararray.obj(a).bvalid())
                 {
-                    painter->drawEllipse(xradararray.obj(a).x() * 10 + 450, -(xradararray.obj(a).y() * 10) + 700, 10, 10);
+                    painter->drawEllipse(xradararray.obj(a).x() * 10 + 450, -((xradararray.obj(a).y() + 3.2) * 10) + 700, 10, 10);
                     sprintf(coordinate_ear, "(%d, %d)", (int)xradararray.obj(a).x(), (int)xradararray.obj(a).y());
-                    painter->drawText(xradararray.obj(a).x() * 10 + 450, -(xradararray.obj(a).y() * 10) + 700, QString(coordinate_ear));
+                    painter->drawText(xradararray.obj(a).x() * 10 + 450, -((xradararray.obj(a).y() +3.2 ) * 10) + 700, QString(coordinate_ear));
 
                 }
             }