chenyuanjie 1 год назад
Родитель
Сommit
674a1d54cb

+ 2 - 2
Qt/Qt_Test/Qt_Test.pro.user

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.5.2, 2025-05-23T12:34:32. -->
+<!-- Written by QtCreator 4.5.2, 2025-06-22T00:53:08. -->
 <qtcreator>
 <qtcreator>
  <data>
  <data>
   <variable>EnvironmentId</variable>
   <variable>EnvironmentId</variable>
@@ -66,7 +66,7 @@
    <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
    <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
    <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
    <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
    <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
    <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
-    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/tronlong/Desktop/qt/Qt_Test</value>
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/tronlong/windows/SmartPDCodeNew/Qt/output</value>
     <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
     <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
      <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
      <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
       <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
       <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>

+ 14 - 0
Qt/Qt_Test/dataupdatethread.cpp

@@ -107,7 +107,9 @@ void DataUpdateThread::run()
                 }
                 }
                 else if(nMode==0&&nPage==0)
                 else if(nMode==0&&nPage==0)
                 {
                 {
+                    ReadShmVer();
                     pwidget->UpdateDate();
                     pwidget->UpdateDate();
+                    pwidget->SetVer(strVer);
                     pwidget->update();
                     pwidget->update();
                 }
                 }
             }
             }
@@ -300,6 +302,18 @@ void DataUpdateThread::ReadShmMaxch()
     }
     }
 }
 }
 
 
+void DataUpdateThread::ReadShmVer()
+{
+    if(nReadType!=1&&!m_shmData)
+    {
+        return;
+    }
+    if(m_shmData->bPDUSet>0)
+    {
+        strVer=QString::fromLocal8Bit(m_shmData->strVer);
+    }
+}
+
 int DataUpdateThread::isT_ACType()
 int DataUpdateThread::isT_ACType()
 {
 {
     return bTacStatus;
     return bTacStatus;

+ 3 - 0
Qt/Qt_Test/dataupdatethread.h

@@ -26,6 +26,7 @@ struct smartPDU_shm_data
     float fT;//温度
     float fT;//温度
     float fH;//湿度
     float fH;//湿度
     float fCO2;//co2
     float fCO2;//co2
+    char strVer[20];//版本号
     //三项数据
     //三项数据
     int bT_ACType;//三相类型
     int bT_ACType;//三相类型
     int nSelectPh;//当前通道的三相ph参数:0:A相 1:B相 2:C相 -1通道总计
     int nSelectPh;//当前通道的三相ph参数:0:A相 1:B相 2:C相 -1通道总计
@@ -49,6 +50,7 @@ public:
     void setShmChRead(int nCh,int nPhID);
     void setShmChRead(int nCh,int nPhID);
     void ReadShmData();
     void ReadShmData();
     void ReadShmMaxch();
     void ReadShmMaxch();
+    void ReadShmVer();
     int isT_ACType();//三相标志
     int isT_ACType();//三相标志
 public:
 public:
     //窗口
     //窗口
@@ -70,6 +72,7 @@ public:
     QString strH;
     QString strH;
     QString strCO2;
     QString strCO2;
     QString strStatus;
     QString strStatus;
+    QString strVer;
     int nMaxCh;
     int nMaxCh;
 
 
     int nReadType;
     int nReadType;

+ 6 - 1
Qt/Qt_Test/widget.cpp

@@ -103,6 +103,8 @@ void Widget::UpdateDate()
     }
     }
 
 
     ui->label_modbus_Addr->setText(QString("ModbusAddress: %1").arg(pdu_Ctrl::instance()->m_nModbusAddress));
     ui->label_modbus_Addr->setText(QString("ModbusAddress: %1").arg(pdu_Ctrl::instance()->m_nModbusAddress));
+
+
 }
 }
 
 
 QString Widget::ReadIP()
 QString Widget::ReadIP()
@@ -148,7 +150,10 @@ void Widget::SetSUM(QString strShow){SetData(ui->label_14,strShow);SetData(ui->l
 
 
 void Widget::SetT(QString strShow){SetData(ui->label_Temp,strShow);}
 void Widget::SetT(QString strShow){SetData(ui->label_Temp,strShow);}
 void Widget::SetH(QString strShow){SetData(ui->label_Humidity,strShow+"%");}
 void Widget::SetH(QString strShow){SetData(ui->label_Humidity,strShow+"%");}
-void Widget::SetCO2(QString strShow){SetData(ui->label_CO2,strShow+"PPM");}
+void Widget::SetCO2(QString strShow){SetData(ui->label_CO2,strShow+" PPM");}
+
+void Widget::SetVer(QString strShow){SetData(ui->label_2,"Version:"+strShow);}
+
 void Widget::SetStatus(QString strShow){SetData(ui->label_V,strShow);}
 void Widget::SetStatus(QString strShow){SetData(ui->label_V,strShow);}
 
 
 void Widget::SetIP(QString strIP)
 void Widget::SetIP(QString strIP)

+ 1 - 0
Qt/Qt_Test/widget.h

@@ -60,6 +60,7 @@ public:
     void SetH(QString strShow);
     void SetH(QString strShow);
     void SetCO2(QString strShow);
     void SetCO2(QString strShow);
 
 
+    void SetVer(QString strShow);
     void setCH(int nIndex);
     void setCH(int nIndex);
     void setPH(int nIndex,int nPhID);
     void setPH(int nIndex,int nPhID);
     void SetStatus(QString strShow);
     void SetStatus(QString strShow);

+ 5 - 5
Qt/Qt_Test/widget.ui

@@ -95,7 +95,7 @@ QLabel
           <item>
           <item>
            <widget class="QStackedWidget" name="stackedWidget_Main">
            <widget class="QStackedWidget" name="stackedWidget_Main">
             <property name="currentIndex">
             <property name="currentIndex">
-             <number>3</number>
+             <number>0</number>
             </property>
             </property>
             <widget class="QWidget" name="page_4">
             <widget class="QWidget" name="page_4">
              <layout class="QVBoxLayout" name="verticalLayout_6">
              <layout class="QVBoxLayout" name="verticalLayout_6">
@@ -137,7 +137,7 @@ QLabel
                  </font>
                  </font>
                 </property>
                 </property>
                 <property name="text">
                 <property name="text">
-                 <string>Version:1.1.0</string>
+                 <string>Version:</string>
                 </property>
                 </property>
                </widget>
                </widget>
               </item>
               </item>
@@ -531,13 +531,13 @@ QLabel
              </property>
              </property>
              <layout class="QGridLayout" name="gridLayout_6">
              <layout class="QGridLayout" name="gridLayout_6">
               <property name="leftMargin">
               <property name="leftMargin">
-               <number>15</number>
+               <number>10</number>
               </property>
               </property>
               <property name="topMargin">
               <property name="topMargin">
                <number>0</number>
                <number>0</number>
               </property>
               </property>
               <property name="rightMargin">
               <property name="rightMargin">
-               <number>15</number>
+               <number>10</number>
               </property>
               </property>
               <property name="bottomMargin">
               <property name="bottomMargin">
                <number>0</number>
                <number>0</number>
@@ -601,7 +601,7 @@ QLabel
                  </font>
                  </font>
                 </property>
                 </property>
                 <property name="text">
                 <property name="text">
-                 <string>Humidity</string>
+                 <string>Humi</string>
                 </property>
                 </property>
                </widget>
                </widget>
               </item>
               </item>