Browse Source

change modulecomm, fix a exit problem. change ui_ads_hmi.

yuchuli 3 years ago
parent
commit
5d123b6dd8

+ 10 - 2
src/common/modulecomm/shm/procsm_if.cpp

@@ -210,12 +210,20 @@ procsm_if::~procsm_if()
     if(mnType == procsm::ModeRead)
     {
 
+        QTime xTime;
+        xTime.start();
+        bool bDel = true;
         mpReadThread->requestInterruption();
         while(!mpReadThread->isFinished())
         {
-
+            if(xTime.elapsed() > 1000)
+            {
+                bDel = false;
+                std::cout<<"procsm_if Thread Read not finish."<<std::endl;
+                break;
+            }
         }
-        delete mpReadThread;
+        if(bDel)delete mpReadThread;
     }
     delete mpPSM;
 }

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

@@ -512,7 +512,6 @@ void ADCIntelligentVehicle::timeoutslot()
 
     update();
 
-
     /////////////////////////////////
     //                             //
     //      实时状态信息显示         //
@@ -1073,6 +1072,7 @@ void ADCIntelligentVehicle::paintEvent(QPaintEvent *)
        // image->fill(QColor(60, 60, 60));//对画布进行填充
        image->fill(QColor(220, 220, 220));//对画布进行填充
        image_small->fill(QColor(220,220,220));
+
         std::vector<iv::GPSData> navigation_data;
         mMutexNavi.lock();
         navigation_data = m_navigation_data;
@@ -1303,9 +1303,9 @@ void ADCIntelligentVehicle::paintEvent(QPaintEvent *)
 /////////////////////////////////////apollo add car icon  20200409
         QPixmap pix;
         //pix.load("car.png");
-        pix.load(":/ADCIntelligentVehicle/car1.png");
-        painter->drawPixmap(435,667,30,67,pix);
-        painter_small->drawPixmap(442,683,16,34,pix);
+//        pix.load(":/ADCIntelligentVehicle/car1.png");
+//        painter->drawPixmap(435,667,30,67,pix);
+//        painter_small->drawPixmap(442,683,16,34,pix);
 ///////////////////////////////////////////////////////////////////