From 7ec427097e7d267e988cbc911c669dfe48551c90 Mon Sep 17 00:00:00 2001
From: kite_lucs <334054969@qq.com>
Date: Mon, 21 Sep 2026 10:46:02 +0800
Subject: [PATCH] =?UTF-8?q?hlp:=E6=96=B0=E5=A2=9E=E7=B2=98=E5=BA=A6?=
=?UTF-8?q?=E6=8A=A5=E8=AD=A6=E7=95=8C=E9=9D=A2=EF=BC=88=E6=9C=AA=E5=AE=8C?=
=?UTF-8?q?=E6=88=90=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
CounterVarSet.cpp | 6 ++++++
InkJetPrinter.cpp | 6 +++---
MainInstruction.cpp | 10 +++++++++-
MainInstruction.h | 6 ++++++
MainInstruction.ui | 15 ++++++++++++++-
QtUI.pro | 9 ++++++---
dlgviscositysetting.cpp | 14 ++++++++++++++
dlgviscositysetting.h | 22 ++++++++++++++++++++++
dlgviscositysetting.ui | 19 +++++++++++++++++++
9 files changed, 99 insertions(+), 8 deletions(-)
create mode 100644 dlgviscositysetting.cpp
create mode 100644 dlgviscositysetting.h
create mode 100644 dlgviscositysetting.ui
diff --git a/CounterVarSet.cpp b/CounterVarSet.cpp
index 7c92447..ea5bb0d 100644
--- a/CounterVarSet.cpp
+++ b/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);
}
}
diff --git a/InkJetPrinter.cpp b/InkJetPrinter.cpp
index 9ec5a4f..df7cd5f 100644
--- a/InkJetPrinter.cpp
+++ b/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，从当前控制字开始，避免突变
diff --git a/MainInstruction.cpp b/MainInstruction.cpp
index 094c188..2b5f1ed 100644
--- a/MainInstruction.cpp
+++ b/MainInstruction.cpp
@@ -424,4 +424,12 @@ void MainInstruction::applyStyleSheet()
)";
this->setStyleSheet(styleSheet);
-}
\ No newline at end of file
+}
+void MainInstruction::on_visSetBtn_clicked()
+{
+ if (dlgVisSetting == nullptr) {
+ dlgVisSetting = new DlgViscositySetting(this);
+ }
+ if (dlgVisSetting)
+ dlgVisSetting->show();
+}
diff --git a/MainInstruction.h b/MainInstruction.h
index c33cacc..2bd71e8 100644
--- a/MainInstruction.h
+++ b/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(); // 应用样式表
};
diff --git a/MainInstruction.ui b/MainInstruction.ui
index 3a6a385..64a86f5 100644
--- a/MainInstruction.ui
+++ b/MainInstruction.ui
@@ -98,7 +98,7 @@
- 0
+ 2
@@ -304,6 +304,19 @@
窗口点阵设置
+
+
+
+ 310
+ 230
+ 254
+ 92
+
+
+
+ 粘度设置
+
+
diff --git a/QtUI.pro b/QtUI.pro
index 5e5d599..4d6da8d 100644
--- a/QtUI.pro
+++ b/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
diff --git a/dlgviscositysetting.cpp b/dlgviscositysetting.cpp
new file mode 100644
index 0000000..fae47ff
--- /dev/null
+++ b/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;
+}
diff --git a/dlgviscositysetting.h b/dlgviscositysetting.h
new file mode 100644
index 0000000..0ffe0e2
--- /dev/null
+++ b/dlgviscositysetting.h
@@ -0,0 +1,22 @@
+#ifndef DLGVISCOSITYSETTING_H
+#define DLGVISCOSITYSETTING_H
+
+#include
+
+namespace Ui {
+class DlgViscositySetting;
+}
+
+class DlgViscositySetting : public QDialog
+{
+ Q_OBJECT
+
+public:
+ explicit DlgViscositySetting(QWidget *parent = 0);
+ ~DlgViscositySetting();
+
+private:
+ Ui::DlgViscositySetting *ui;
+};
+
+#endif // DLGVISCOSITYSETTING_H
diff --git a/dlgviscositysetting.ui b/dlgviscositysetting.ui
new file mode 100644
index 0000000..14b4e6c
--- /dev/null
+++ b/dlgviscositysetting.ui
@@ -0,0 +1,19 @@
+
+
+ DlgViscositySetting
+
+
+
+ 0
+ 0
+ 421
+ 266
+
+
+
+ Dialog
+
+
+
+
+