Parcourir la source

1、修改军工8寸屏泄漏传感器显示

liyuezong il y a 1 an
Parent
commit
911404b0a7

+ 1 - 0
Qt/SmartPDU_QT/PDUInfoDef.h

@@ -46,6 +46,7 @@ struct PDUAllInfo
     float Sensor_INTemperature=0;
     float Sensor_OUTTemperature=0;
     bool Sensor_WaterImmersion=false;
+    bool Sensor_LeakFlag=false;
 
 };
 struct PDUCHInfo

+ 3 - 3
Qt/SmartPDU_QT/mainwidget.cpp

@@ -567,14 +567,14 @@ void MainWidget::UpdateStatusInfo()
     ui->label_temperature->setText(strTemp);
     strTemp=QString::number(m_PDUAllInfo.Sensor_Humidity, 'f', 2);
     ui->label_humidity->setText(strTemp);
-    if(!m_PDUAllInfo.Sensor_WaterImmersion)
+    if(!m_PDUAllInfo.Sensor_LeakFlag)
     {
-        ui->label_water->setText("未浸入");
+        ui->label_water->setText("未泄漏");
         ui->label_water->setStyleSheet("color: rgb(10, 197, 50);");
     }
     else
     {
-        ui->label_water->setText("浸入");
+        ui->label_water->setText("泄漏");
         // 切换颜色
         QColor currentColor = ui->label_water->palette().color(QPalette::WindowText);
         if (currentColor == Qt::white) {

+ 2 - 2
Qt/SmartPDU_QT/mainwidget.ui

@@ -364,7 +364,7 @@
                   <string notr="true">color: rgb(255, 255, 255);</string>
                  </property>
                  <property name="text">
-                  <string>水浸:</string>
+                  <string>泄漏:</string>
                  </property>
                 </widget>
                </item>
@@ -382,7 +382,7 @@
                   <string notr="true">color: rgb(255, 255, 255);</string>
                  </property>
                  <property name="text">
-                  <string>未浸入</string>
+                  <string>未泄漏</string>
                  </property>
                 </widget>
                </item>

+ 4 - 1
Qt/SmartPDU_QT/serialinfo.cpp

@@ -245,7 +245,10 @@ void SerialInfo::on_Parse_PDUStatus(const QString &Sendstr,const QString &Recstr
         }
         m_PDUAllInfo.Sensor_Temperature = ((pRecVector[1] << 16) + pRecVector[0] )/1000.0f;
         m_PDUAllInfo.Sensor_Humidity = ((pRecVector[3] << 16) + pRecVector[2] )/1000.0f;
-        m_PDUAllInfo.Sensor_CO2 = ((pRecVector[5] << 16) + pRecVector[4] )/1000.0f;
+        float ftemp=((pRecVector[5] << 16) + pRecVector[4] )/1000.0f;
+        if(ftemp>0.05)m_PDUAllInfo.Sensor_LeakFlag=true;
+        else m_PDUAllInfo.Sensor_LeakFlag=false;
+        //m_PDUAllInfo.Sensor_CO2 = ((pRecVector[5] << 16) + pRecVector[4] )/1000.0f;
         m_PDUAllInfo.Sensor_INTemperature = ((pRecVector[9] << 16)+ pRecVector[8])/1000.0f;
         m_PDUAllInfo.Sensor_OUTTemperature = ((pRecVector[13] << 16)+ pRecVector[12])/1000.0f;
     }