hlp:新增粘度报警界面（未完成）

CounterVarSet.cpp

@@ -168,6 +168,8 @@ void CounterVarSet::handleChange(bool isChange)
                 ui->tabWidget->insertTab(1, ui->cnt1Tab, tr("计数器1"));
 
             ui->tabWidget->setCurrentWidget(ui->cnt1Tab);
+            ui->radioButtonVar1->setEnabled(true);
+            ui->radioButtonVar2->setEnabled(false);
         } else {
             // 只显示 cnt2Tab
             if (ui->tabWidget->indexOf(ui->cnt1Tab) >= 0)
@@ -176,6 +178,8 @@ void CounterVarSet::handleChange(bool isChange)
                 ui->tabWidget->insertTab(1, ui->cnt2Tab, tr("计数器2"));
 
             ui->tabWidget->setCurrentWidget(ui->cnt2Tab);
+            ui->radioButtonVar1->setEnabled(false);
+            ui->radioButtonVar2->setEnabled(true);
         }
     } else {
         // 两个都显示
@@ -183,6 +187,8 @@ void CounterVarSet::handleChange(bool isChange)
             ui->tabWidget->insertTab(1, ui->cnt1Tab, tr("计数器1"));
         if (ui->tabWidget->indexOf(ui->cnt2Tab) < 0)
             ui->tabWidget->insertTab(2, ui->cnt2Tab, tr("计数器2"));
+        ui->radioButtonVar1->setEnabled(true);
+        ui->radioButtonVar2->setEnabled(true);
     }
 }
 

InkJetPrinter.cpp

@@ -1000,9 +1000,9 @@ void InkJetPrinter::timerHandler(void){
 #endif
                     {
                         // 通过状态管理器发送事件，在 onStateChanged 中更新 sysPara
-                         if (m_stateManager && m_stateManager->isState(PrinterState::IDLE)) {
-                             m_stateManager->requestTransition(PrinterEvent::PowerOn);
-                         }
+                        if (m_stateManager && m_stateManager->isState(PrinterState::IDLE)) {
+                            m_stateManager->requestTransition(PrinterEvent::PowerOn);
+                        }
 
                         // 自检完成后管道恢复正常阻力，重置软启动让压力重新平稳收敛
                         // 不清零 u，从当前控制字开始，避免突变

MainInstruction.cpp

@@ -424,4 +424,12 @@ void MainInstruction::applyStyleSheet()
             )";
 
     this->setStyleSheet(styleSheet);
-}
+}
+void MainInstruction::on_visSetBtn_clicked()
+{
+    if (dlgVisSetting == nullptr) {
+        dlgVisSetting = new DlgViscositySetting(this);
+    }
+    if (dlgVisSetting)
+        dlgVisSetting->show();
+}

MainInstruction.h

@@ -11,6 +11,7 @@
 #include "dialogmaintenancetimesetting.h"
 #include "LogInfo.h"
 #include "TimeSettingDialog.h"
+#include "dlgviscositysetting.h"
 
 class DlgRFIDConfig;
 class DlgCanvasHeightEditor;
@@ -60,6 +61,8 @@ private slots:
 
     void onCanvasCfgBtnClicked();
 
+    void on_visSetBtn_clicked();
+
 private:
     Ui::MainInstruction *ui;
     SysPara* sysPara = nullptr;
@@ -75,6 +78,9 @@ private:
     // 时间设置
     TimeSettingDialog timeDia;
 
+    //
+    DlgViscositySetting* dlgVisSetting = nullptr;
+
     void applyStyleSheet();    // 应用样式表
 };
 

MainInstruction.ui

@@ -98,7 +98,7 @@
     </rect>
    </property>
    <property name="currentIndex">
-    <number>0</number>
+    <number>2</number>
    </property>
    <widget class="QWidget" name="tabBasic">
     <attribute name="title">
@@ -304,6 +304,19 @@
       <string>窗口点阵设置</string>
      </property>
     </widget>
+    <widget class="QPushButton" name="visSetBtn">
+     <property name="geometry">
+      <rect>
+       <x>310</x>
+       <y>230</y>
+       <width>254</width>
+       <height>92</height>
+      </rect>
+     </property>
+     <property name="text">
+      <string>粘度设置</string>
+     </property>
+    </widget>
    </widget>
   </widget>
   <widget class="QPushButton" name="closeBtn">

QtUI.pro

@@ -186,7 +186,8 @@ HEADERS +=  Public.h \
     dump.h \
     DlgCanvasHeightEditor.h \
     StateMachine/PrinterStateManager.h \
-    CustomDoubleSpinBox.h
+    CustomDoubleSpinBox.h \
+    dlgviscositysetting.h
 
 
 FORMS += \
@@ -236,7 +237,8 @@ FORMS += \
     scene/DlgBarcodeFormat.ui \
     scene/DlgQrcodeFormat.ui \
     dlgQrCode.ui \
-    DlgCanvasHeightEditor.ui
+    DlgCanvasHeightEditor.ui \
+    dlgviscositysetting.ui
 
 SOURCES +=\
     mainwidget.cpp \
@@ -350,7 +352,8 @@ SOURCES +=\
     loginfoctrl.cpp \
     runtimectrl.cpp \
     DlgCanvasHeightEditor.cpp \
-    StateMachine/PrinterStateManager.cpp
+    StateMachine/PrinterStateManager.cpp \
+    dlgviscositysetting.cpp
 
 
 

dlgviscositysetting.cpp

@@ -0,0 +1,14 @@
+#include "dlgviscositysetting.h"
+#include "ui_dlgviscositysetting.h"
+
+DlgViscositySetting::DlgViscositySetting(QWidget *parent) :
+    QDialog(parent),
+    ui(new Ui::DlgViscositySetting)
+{
+    ui->setupUi(this);
+}
+
+DlgViscositySetting::~DlgViscositySetting()
+{
+    delete ui;
+}

dlgviscositysetting.h

@@ -0,0 +1,22 @@
+#ifndef DLGVISCOSITYSETTING_H
+#define DLGVISCOSITYSETTING_H
+
+#include <QDialog>
+
+namespace Ui {
+class DlgViscositySetting;
+}
+
+class DlgViscositySetting : public QDialog
+{
+    Q_OBJECT
+
+public:
+    explicit DlgViscositySetting(QWidget *parent = 0);
+    ~DlgViscositySetting();
+
+private:
+    Ui::DlgViscositySetting *ui;
+};
+
+#endif // DLGVISCOSITYSETTING_H

dlgviscositysetting.ui

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>DlgViscositySetting</class>
+ <widget class="QDialog" name="DlgViscositySetting">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>421</width>
+    <height>266</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Dialog</string>
+  </property>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>