压力算法移植前

InkJetPrinter.cpp

@@ -284,6 +284,7 @@ void InkJetPrinter::init()
     connect(m_SystemUpdate,&SystemUpdate::sendUpDateSOFTSignal,m_SystemManage,&SystemManage::on_pushButtonUpdateSoftware_pressed);
     connect(m_SystemUpdate,&SystemUpdate::sendUpDateChARLIBSignal,m_SystemManage,&SystemManage::on_pushButtonUpdateCharLib_pressed);
     connect(m_SystemUpdate,&SystemUpdate::sendButtonClickedSignal,this,&InkJetPrinter::getSystemManageWidgetButtonClickSlot);
+    connect(m_SystemUpdate,&SystemUpdate::sig_reboot,this,&InkJetPrinter::rebootApp);
 
     
     // 原注释的默认页面设置（按需启用）

MainWidget.ui

@@ -217,7 +217,7 @@ QScrollBar::add-line:horizontal { bottom: 0px; }</string>
            <x>0</x>
            <y>0</y>
            <width>780</width>
-           <height>177</height>
+           <height>169</height>
           </rect>
          </property>
         </widget>
@@ -583,9 +583,15 @@ QScrollBar::add-line:horizontal { bottom: 0px; }</string>
             </item>
             <item row="0" column="0">
              <widget class="QFrame" name="fra_state">
+              <property name="minimumSize">
+               <size>
+                <width>200</width>
+                <height>0</height>
+               </size>
+              </property>
               <property name="maximumSize">
                <size>
-                <width>180</width>
+                <width>200</width>
                 <height>140</height>
                </size>
               </property>

SystemSetting.cpp

@@ -11,7 +11,6 @@
 //#include "LogInfo.h"
 #include "myinclude.h"
 #include "QInputDialog"
-#include "dlgmutilanguage.h"
 //#define FINDVOL
 #include "InputMethod.h"
 

SystemUpdate.cpp

@@ -14,6 +14,8 @@ SystemUpdate::SystemUpdate(QWidget *parent) :
 
     connect(ui->closeBtn, &QPushButton::clicked, this, &SystemUpdate::on_closeBtn_clicked);
     applyStyleSheet();
+
+    connect(&dlgLanguage, &DlgMutiLanguage::sig_reboot, this, &SystemUpdate::sig_reboot);
 }
 
 SystemUpdate::~SystemUpdate()

SystemUpdate.h

@@ -36,6 +36,7 @@ signals:
     void sendUpDateSOFTSignal();
     void sendUpDateChARLIBSignal();
 
+    void sig_reboot();
 private slots:
     void on_pushButtonProgramFPGA_clicked();
     void on_pushButtonProgramStm32_clicked();

VerBVersion.h

@@ -6,8 +6,8 @@
 */
 #define UP_PRINTER_MAJOR_VER  6
 #define UP_PRINTER_MINOR_VER  6
-#define UP_PRINTER_RIVISION_VER  1
+#define UP_PRINTER_RIVISION_VER  3
-#define SUB_VERSION "_test"
+#define SUB_VERSION "_beta"
 #ifdef __RFID_OLD
 #define SUB_RFID "_RO"
 #else

dlgmutilanguage.cpp

@@ -130,11 +130,7 @@ void DlgMutiLanguage::SetNewLanguage()
             QMessageBox::information(this, tr("提示"),tr("是否重启?"),
                                      QMessageBox::Ok | QMessageBox::Cancel);
     if (ret == QMessageBox::Ok) {
-        sysPara->saveParaToFile();	// 关机前将相关配置保存
+        emit sig_reboot();
-        sysPara->saveRFIDPara();
-        mySleep(200);
-        system("sync");//缓存同步
-        QCoreApplication::quit();
     }
 }
 

dlgmutilanguage.h

@@ -30,6 +30,9 @@ private:
     SysPara* sysPara = nullptr;
 
     void mySleep(unsigned int msec);
+
+signals:
+    void sig_reboot();
 };
 
 #endif // DLGMUTILANGUAGE_H

mainwidget.cpp

@@ -1933,7 +1933,7 @@ void MainWidget::initSheet()
     QString startBtnSheet = R"(
                        QPushButton {
                        background-color: #1e8449;
-                       color: black;
+                       color: #99A89B;
                        border-radius: 5px;
                        }
                        QPushButton:disabled {
@@ -1947,8 +1947,8 @@ void MainWidget::initSheet()
 
     QString stopBtnSheet =  R"(
                             QPushButton {
-                            background-color: #e74c3c;
+                            background-color: #D5614E;
-                            color: black;
+                            color: #99A89B;
                             border-radius: 5px;
                             }
                             QPushButton:disabled {
@@ -1987,12 +1987,13 @@ void MainWidget::changeHighLight(bool isStart)
         QString highlightStyle =
                 R"(
                 QPushButton {
-                    background-color: #27ae60;
+                    background-color: #29B561;
                     color: black;
                     border-radius: 5px;
                     border: 3px solid #f39c12;
                     box-shadow: 0 0 8px rgba(231, 76, 60, 0.6);
                 }
+
                 QPushButton:disabled {
                 background-color: #bdc3c7;  /* 灰色背景 */
                 color: #7f8c8d;            /* 灰色文字 */
@@ -2006,7 +2007,7 @@ void MainWidget::changeHighLight(bool isStart)
         QString highlightStyle =
                 R"(
                 QPushButton {
-                background-color: #f07167;
+                background-color: #e55f5f;
                 color: black;
                 border-radius: 5px;
                 border: 3px solid #f39c12;
@@ -2351,14 +2352,13 @@ void MainWidget::updateSysStatusToUI(){ //100ms
         //    ui->pushButton_Reboot->setEnabled(false);
         }
 
-        // if(sysPara->RFIDPara.inkCardTimeOut || sysPara->RFIDPara.solventCardTimeOut || sysPara->RFIDPara.needMaintenance)
+        if(sysPara->RFIDPara.inkCardTimeOut || sysPara->RFIDPara.solventCardTimeOut || sysPara->RFIDPara.needMaintenance) {
-            // m_RightBtn->setEnabled(false); todo
+            m_RightBtn->setEnabled(false);
-        // else if(sysPara->status.selfCheckDone == 1)
+        }
-        // {
+        else if(sysPara->status.selfCheckDone == 1) {
-        //     m_RightBtn->setEnabled(true);
+            m_RightBtn->setEnabled(true);
-        // }
+        }
     }
-
 }
 
 bool MainWidget::checkRed(AlarmStatus &status)