Browse Source

remove look useless conmment files

HAPO-9# 3 năm trước cách đây
mục cha
commit
d70b679598

+ 0 - 1
src/ui/ui_ads_hmi_1px/ADCIntelligentVehicle.cpp

@@ -279,7 +279,6 @@ ADCIntelligentVehicle::ADCIntelligentVehicle(QWidget *parent)
     painter_small = new QPainter(image_small);   //创建QPainter对象
     scene = new QGraphicsScene;
     scene_small = new QGraphicsScene;
-    look_decition = new Look_decition;
     timer = new QTimer(this);
     connect(timer, SIGNAL(timeout()), this, SLOT(timeoutslot()));//timeoutslot()为自定义槽
     timer->start(100);

+ 0 - 2
src/ui/ui_ads_hmi_1px/ADCIntelligentVehicle.h

@@ -9,7 +9,6 @@
 #include "ui_ADCIntelligentVehicle.h"
 //#include <decition/brain.h>
 //#include <control/can.h>
-#include "look.h"
 #include <common/car_status.h>
 #include <qtimer.h>
 #include <qpainter.h>
@@ -195,7 +194,6 @@ private:
     bool is_speed_control_mode_enable_ = false;
     bool is_show_enable = false;
 
-    Look_decition *look_decition;
     Qt::MouseButton m_translateButton;  // 平移按钮
     qreal m_translateSpeed;  // 平移速度
     qreal m_zoomDelta;  // 缩放的增量

+ 0 - 125
src/ui/ui_ads_hmi_1px/look.cpp

@@ -1,125 +0,0 @@
-#include "look.h"
-
-Look_decition::Look_decition(QWidget *parent)
-{
-    look1 = 0.0;
-    look2 = 0.0;
-    look3 = 0.0;
-    look4 = 0.0;
-    look5 = 0.0;
-    look6 = 0.0;
-    look7 = 0.0;
-    setObjectName(QStringLiteral("Look_dection"));
-    resize(350, 350);
-    setObjectName(QStringLiteral("centralWidget"));
-    label = new QLabel(this);
-    label->setObjectName(QStringLiteral("label"));
-    label->setGeometry(QRect(30, 10, 100, 20));
-    label_2 = new QLabel(this);
-    label_2->setObjectName(QStringLiteral("label_2"));
-    label_2->setGeometry(QRect(30, 40, 100, 20));
-    label_3 = new QLabel(this);
-    label_3->setObjectName(QStringLiteral("label_3"));
-    label_3->setGeometry(QRect(30, 70, 100, 20));
-    label_4 = new QLabel(this);
-    label_4->setObjectName(QStringLiteral("label_4"));
-    label_4->setGeometry(QRect(30, 100, 100, 20));
-    label_5 = new QLabel(this);
-    label_5->setObjectName(QStringLiteral("label_5"));
-    label_5->setGeometry(QRect(30, 130, 100, 20));
-    label_6 = new QLabel(this);
-    label_6->setObjectName(QStringLiteral("label_6"));
-    label_6->setGeometry(QRect(30, 160, 100, 20));
-    label_7 = new QLabel(this);
-    label_7->setObjectName(QStringLiteral("label_7"));
-    label_7->setGeometry(QRect(30, 190, 100, 20));
-    label_8 = new QLabel(this);
-    label_8->setObjectName(QStringLiteral("label_8"));
-    label_8->setGeometry(QRect(30, 220, 100, 20));
-    label_9 = new QLabel(this);
-    label_9->setObjectName(QStringLiteral("label_9"));
-    label_9->setGeometry(QRect(30, 250, 100, 20));
-    label_10 = new QLabel(this);
-    label_10->setObjectName(QStringLiteral("label_10"));
-    label_10->setGeometry(QRect(30, 280, 100, 20));
-    label_11 = new QLabel(this);
-    label_11->setObjectName(QStringLiteral("label_11"));
-    label_11->setGeometry(QRect(30, 310, 100, 20));
-    lineEdit = new QLineEdit(this);
-    lineEdit->setObjectName(QStringLiteral("lineEdit"));
-    lineEdit->setGeometry(QRect(154, 10, 113, 20));
-    lineEdit_2 = new QLineEdit(this);
-    lineEdit_2->setObjectName(QStringLiteral("lineEdit_2"));
-    lineEdit_2->setGeometry(QRect(154, 40, 113, 20));
-    lineEdit_3 = new QLineEdit(this);
-    lineEdit_3->setObjectName(QStringLiteral("lineEdit_3"));
-    lineEdit_3->setGeometry(QRect(154, 70, 113, 20));
-    lineEdit_4 = new QLineEdit(this);
-    lineEdit_4->setObjectName(QStringLiteral("lineEdit_4"));
-    lineEdit_4->setGeometry(QRect(154, 100, 113, 20));
-    lineEdit_5 = new QLineEdit(this);
-    lineEdit_5->setObjectName(QStringLiteral("lineEdit_5"));
-    lineEdit_5->setGeometry(QRect(154, 130, 113, 20));
-    lineEdit_6 = new QLineEdit(this);
-    lineEdit_6->setObjectName(QStringLiteral("lineEdit_6"));
-    lineEdit_6->setGeometry(QRect(154, 160, 113, 20));
-    lineEdit_7 = new QLineEdit(this);
-    lineEdit_7->setObjectName(QStringLiteral("lineEdit_7"));
-    lineEdit_7->setGeometry(QRect(154, 190, 113, 20));
-    lineEdit_8 = new QLineEdit(this);
-    lineEdit_8->setObjectName(QStringLiteral("lineEdit_8"));
-    lineEdit_8->setGeometry(QRect(154, 220, 113, 20));
-    lineEdit_9 = new QLineEdit(this);
-    lineEdit_9->setObjectName(QStringLiteral("lineEdit_9"));
-    lineEdit_9->setGeometry(QRect(154, 250, 113, 20));
-    lineEdit_10 = new QLineEdit(this);
-    lineEdit_10->setObjectName(QStringLiteral("lineEdit_10"));
-    lineEdit_10->setGeometry(QRect(154, 280, 113, 20));
-    lineEdit_11 = new QLineEdit(this);
-    lineEdit_11->setObjectName(QStringLiteral("lineEdit_11"));
-    lineEdit_11->setGeometry(QRect(154, 310, 113, 20));
-
-    setWindowTitle(QApplication::translate("Look_decition", "决策观察器", nullptr));
-    label->setText(QApplication::translate("Look_decition", "\346\262\271\351\227\250", nullptr));
-    label_2->setText(QApplication::translate("Look_decition", "\345\210\271\350\275\246", nullptr));
-    label_3->setText(QApplication::translate("Look_decition", "\350\275\254\345\220\221", nullptr));
-    label_4->setText(QApplication::translate("Look_decition", "\351\200\237\345\272\246", nullptr));
-    label_5->setText(QApplication::translate("Look_decition", "\346\277\200\345\205\211\351\233\267\350\276\276\350\267\235\347\246\273", nullptr));
-    label_6->setText(QApplication::translate("Look_decition", "\346\257\253\347\261\263\346\263\242\350\267\235\347\246\273", nullptr));
-    label_7->setText(QApplication::translate("Look_decition", "\346\234\200\347\273\210obs\350\267\235\347\246\273", nullptr));
-    label_8->setText(QApplication::translate("Look_decition", "\347\272\254\345\272\246", nullptr));
-    label_9->setText(QApplication::translate("Look_decition", "\347\262\276\345\272\246", nullptr));
-    label_10->setText(QApplication::translate("Look_decition", "\344\277\235\347\225\231", nullptr));
-    label_11->setText(QApplication::translate("Look_decition", "\344\277\235\347\225\231", nullptr));
-
-    timer = new QTimer(this);
-    connect(timer, SIGNAL(timeout()), this, SLOT(timeoutslot()));
-    timer->start(40);
-}
-
-Look_decition::~Look_decition()
-{
-
-}
-
-void Look_decition::timeoutslot()
-{
-    look1 = ServiceCarStatus.mfAcc;
-    look2 = ServiceCarStatus.mfBrake;
-    look3 = ServiceCarStatus.mfWheel;
-    look4 = ServiceCarStatus.speed;
-    look5 = ServiceCarStatus.mLidarObs;
-    look6 = ServiceCarStatus.mRadarObs;
-    look7 = ServiceCarStatus.mObs;
-    lineEdit->setText(QString::number(look1));//决策油门
-    lineEdit_2->setText(QString::number(look2));//决策刹车
-    lineEdit_3->setText(QString::number(look3));//决策转向
-    lineEdit_4->setText(QString::number(look4));//决策速度
-    lineEdit_5->setText(QString::number(look5));//激光雷达距离
-    lineEdit_6->setText(QString::number(look6));//毫米波距离
-    lineEdit_7->setText(QString::number(look7));//最终obs距离
-    lineEdit_8->setText(QString::number(ServiceCarStatus.location->gps_lat, 'g', 12));//保留
-    lineEdit_9->setText(QString::number(ServiceCarStatus.location->gps_lng, 'g', 12));//保留
-    //    lineEdit_10->setText();//保留
-    //    lineEdit_11->setText();//保留
-}

+ 0 - 96
src/ui/ui_ads_hmi_1px/look.h

@@ -1,96 +0,0 @@
-#ifndef _LOOK_H_
-#define _LOOK_H_
-
-#include <QWidget>
-#include <QCloseEvent>
-#include <QtWidgets/qpushbutton.h>
-#include <qtimer.h>
-#include <qpainter.h>
-#include <QGraphicsView>
-#include <QWheelEvent>
-#include <QKeyEvent>
-#include <QPoint>
-#include <QPointF>
-#include <qfiledialog.h>
-#include <qmessagebox.h>
-#include <qabstractscrollarea.h>
-#include <QGraphicsItem>
-#include <QKeyEvent>
-#include <qpainter.h>
-#include <QDebug>
-#include <QtCore/QVariant>
-#include <QtWidgets/QAction>
-#include <QtWidgets/QApplication>
-#include <QtWidgets/QButtonGroup>
-#include <QtWidgets/QComboBox>
-#include <QtWidgets/QFrame>
-#include <QtWidgets/QHeaderView>
-#include <QtWidgets/QLabel>
-#include <QtWidgets/QLineEdit>
-#include <QtWidgets/QMainWindow>
-#include <QtWidgets/QMenuBar>
-#include <QtWidgets/QStatusBar>
-#include <QtWidgets/QWidget>
-#include <boost/serialization/singleton.hpp>
-#include <boost/signals2/slot.hpp>
-#include <boost/thread/mutex.hpp>
-#include <boost/shared_ptr.hpp>
-#include <boost/signals2.hpp>
-#include <boost/thread.hpp>
-#include <iostream>
-#include <fstream>
-#include <sstream>
-#include <stdio.h>
-#include <math.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <time.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
-#include "common/car_status.h"
-
-class Look_decition : public QWidget
-{
-    Q_OBJECT
-
-public:
-    explicit Look_decition(QWidget *parent = 0);
-    ~Look_decition();
-    double look1;
-    double look2;
-    double look3;
-    double look4;
-    double look5;
-    double look6;
-    double look7;
-public slots:
-    void timeoutslot();
-protected:
-private:
-    QTimer *timer;
-    QLabel *label;
-    QLabel *label_2;
-    QLabel *label_3;
-    QLabel *label_4;
-    QLabel *label_5;
-    QLabel *label_6;
-    QLabel *label_7;
-    QLabel *label_8;
-    QLabel *label_9;
-    QLabel *label_10;
-    QLabel *label_11;
-    QLineEdit *lineEdit;
-    QLineEdit *lineEdit_2;
-    QLineEdit *lineEdit_3;
-    QLineEdit *lineEdit_4;
-    QLineEdit *lineEdit_5;
-    QLineEdit *lineEdit_6;
-    QLineEdit *lineEdit_7;
-    QLineEdit *lineEdit_8;
-    QLineEdit *lineEdit_9;
-    QLineEdit *lineEdit_10;
-    QLineEdit *lineEdit_11;
-};
-
-#endif

+ 0 - 2
src/ui/ui_ads_hmi_1px/ui_ads_hmi_1px.pro

@@ -36,7 +36,6 @@ include(common/common.pri)
 SOURCES += \
         main.cpp \
         ADCIntelligentVehicle.cpp \
-    look.cpp \
     perceptionoutput.cpp \
     ../../include/msgtype/hmi.pb.cc \
     ../../include/msgtype/gps.pb.cc \
@@ -55,7 +54,6 @@ SOURCES += \
 
 HEADERS += \
         ADCIntelligentVehicle.h \
-    look.h \
     ultrasonic_type.h \
     perceptionoutput.h \
     ../../include/msgtype/hmi.pb.h \