From 6f692b5e3721f351c49f7c1dd6fc5165b4cc907b Mon Sep 17 00:00:00 2001
From: yangjiaxuan <171295266@qq.com>
Date: Wed, 8 Feb 2023 18:24:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E6=B6=88=E7=A1=AE=E8=AE=A4=E5=A4=8D?=
=?UTF-8?q?=E4=BD=8D=E6=8F=90=E9=86=92=EF=BC=8C=E8=B0=83=E6=95=B4=E8=AE=BE?=
=?UTF-8?q?=E7=BD=AE=E7=95=B8=E5=8F=98=E5=80=BC=E5=AF=B9=E8=AF=9D=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/HGProductionTool/ProductionTool_zh_CN.qm | Bin 12420 -> 12420 bytes
app/HGProductionTool/ProductionTool_zh_CN.ts | 2 +-
app/HGProductionTool/dialog_userinput.cpp | 6 ++++
app/HGProductionTool/dialog_userinput.h | 1 +
app/HGProductionTool/form_maininterface.cpp | 9 ++++--
app/HGProductionTool/hgscanner.cpp | 10 +++++++
app/HGProductionTool/hgscanner.h | 4 +++
app/HGProductionTool/mainwindow.cpp | 28 ++++++++++---------
8 files changed, 44 insertions(+), 16 deletions(-)
diff --git a/app/HGProductionTool/ProductionTool_zh_CN.qm b/app/HGProductionTool/ProductionTool_zh_CN.qm
index 45493399f7aa18da1b1be3820a2a17f642118aa3..eb800056c3ae3a98aee4c74da9458f587d141a5c 100644
GIT binary patch
delta 17
YcmZokY)RaZsm(HhA@JAcTy1ey06x|RRR910
delta 17
YcmZokY)RaZsm&5tJoWA7Ty1ey071nDzyJUM
diff --git a/app/HGProductionTool/ProductionTool_zh_CN.ts b/app/HGProductionTool/ProductionTool_zh_CN.ts
index 2f36068..c0a5753 100644
--- a/app/HGProductionTool/ProductionTool_zh_CN.ts
+++ b/app/HGProductionTool/ProductionTool_zh_CN.ts
@@ -949,7 +949,7 @@
- 关闭
+ 退出
diff --git a/app/HGProductionTool/dialog_userinput.cpp b/app/HGProductionTool/dialog_userinput.cpp
index becc7cd..d2bce64 100644
--- a/app/HGProductionTool/dialog_userinput.cpp
+++ b/app/HGProductionTool/dialog_userinput.cpp
@@ -83,6 +83,12 @@ parameter *Dialog_UserInput::getParam()
return param;
}
+void Dialog_UserInput::setDistortValue(double value)
+{
+ ui->lineEdit->setText(QString::number(value, 'f'));
+ ui->lineEdit->selectAll();
+}
+
void Dialog_UserInput::on_pbtn_yes_clicked()
{
if (ui->lineEdit->text().isEmpty() && (m_type == ui_helper::VAL_TYPE_INT || m_type == ui_helper::VAL_TYPE_FLOAT || m_type == ui_helper::VAL_TYPE_STRING))
diff --git a/app/HGProductionTool/dialog_userinput.h b/app/HGProductionTool/dialog_userinput.h
index 0f1dc8a..de6f4db 100644
--- a/app/HGProductionTool/dialog_userinput.h
+++ b/app/HGProductionTool/dialog_userinput.h
@@ -34,6 +34,7 @@ public:
~Dialog_UserInput();
parameter *getParam();
+ void setDistortValue(double value);
private slots:
void on_pbtn_yes_clicked();
diff --git a/app/HGProductionTool/form_maininterface.cpp b/app/HGProductionTool/form_maininterface.cpp
index 3fb0f39..7653b95 100644
--- a/app/HGProductionTool/form_maininterface.cpp
+++ b/app/HGProductionTool/form_maininterface.cpp
@@ -78,8 +78,8 @@ Form_mainInterface::Form_mainInterface(class MainWindow *mainwnd, Dialog_logIn::
ui->label_destortionInfo->setVisible(false);
setMinimumWidth(500);
- ui->tableWidget->setMinimumWidth(400);
- ui->tableWidget->setMaximumWidth(400);
+ ui->tableWidget->setMinimumWidth(450);
+ ui->tableWidget->setMaximumWidth(450);
m_textTips = new Form_textTips();
m_view = new HGImgView();
ui->stackedWidget->addWidget(m_textTips);
@@ -208,6 +208,11 @@ void Form_mainInterface::on_testDistortion(SANE_DISTORTION_VAL data)
ui->label_imgInfo->setText(tr("image pixel: ") + QString::number(data.w, 'f') + " * " + QString::number(data.h, 'f'));
ui->label_destortionInfo->setText(tr("destortion value: ") + QString::number(data.scaleXY, 'f'));
+ if (m_hg != nullptr)
+ {
+ m_hg->setDistortValue(data.scaleXY);
+ }
+
// updateImgPixelInfo();
updateUiEnabled(true);
diff --git a/app/HGProductionTool/hgscanner.cpp b/app/HGProductionTool/hgscanner.cpp
index 412f126..7e07c20 100644
--- a/app/HGProductionTool/hgscanner.cpp
+++ b/app/HGProductionTool/hgscanner.cpp
@@ -11,6 +11,7 @@ hgscanner::hgscanner(Form_mainInterface *form, Form_BurnMode *burnMode, Dialog_I
, m_burnMode(burnMode)
, m_inputSnDlg(inputSnDlg)
, devHandle_(h)
+ , m_distortValue(0.0)
{
cb_ = nullptr;
}
@@ -24,6 +25,10 @@ parameter* hgscanner::get_user_input(data_from from, value_type type, const wcha
if (from == DATA_FROM_USER)
{
Dialog_UserInput dlg(type, QString::fromStdWString(title), desc, m_interface);
+ if (wcscmp(L"SET_DISTORTION_VAL", title) == 0)
+ {
+ dlg.setDistortValue(m_distortValue);
+ }
if (dlg.exec())
{
return dlg.getParam();
@@ -166,3 +171,8 @@ int hgscanner::io_control(unsigned long code, void* data, unsigned* len)
sane_io_control(devHandle_, code, data, len);
return 0;
}
+
+void hgscanner::setDistortValue(double value)
+{
+ m_distortValue = value;
+}
diff --git a/app/HGProductionTool/hgscanner.h b/app/HGProductionTool/hgscanner.h
index 31f5d5b..470fbfb 100644
--- a/app/HGProductionTool/hgscanner.h
+++ b/app/HGProductionTool/hgscanner.h
@@ -18,10 +18,14 @@ public:
virtual int unregister_sane_callback(sane_callback cb);
virtual int io_control(unsigned long code, void* data, unsigned* len);
sane_callback cb_;
+
+ void setDistortValue(double value);
private:
class Form_mainInterface *m_interface;
class Form_BurnMode *m_burnMode;
class Dialog_InputSerialNum *m_inputSnDlg;
SANE_Handle devHandle_;
+
+ double m_distortValue;
};
diff --git a/app/HGProductionTool/mainwindow.cpp b/app/HGProductionTool/mainwindow.cpp
index 60faf07..ed6d80a 100644
--- a/app/HGProductionTool/mainwindow.cpp
+++ b/app/HGProductionTool/mainwindow.cpp
@@ -28,6 +28,8 @@ MainWindow::MainWindow(HGPdtToolDbUserMgr pdtToolDbuserMgr, Dialog_logIn::LogInT
{
ui->setupUi(this);
+ ui->act_newDevice->setVisible(false);
+
QFont ft;
ft.setPointSize(15);
this->setFont(ft);
@@ -43,7 +45,7 @@ MainWindow::MainWindow(HGPdtToolDbUserMgr pdtToolDbuserMgr, Dialog_logIn::LogInT
{
setWindowTitle(tr("production tool-burn station"));
- ui->act_newDevice->setVisible(false);
+// ui->act_newDevice->setVisible(false);
ui->act_refreshDevice->setVisible(false);
m_formBurnMode = new Form_BurnMode(this, this);
@@ -55,7 +57,7 @@ MainWindow::MainWindow(HGPdtToolDbUserMgr pdtToolDbuserMgr, Dialog_logIn::LogInT
}
else
{
- ui->act_refreshDevice->setVisible(true);
+// ui->act_refreshDevice->setVisible(true);
m_top_splitter = new QSplitter(Qt::Horizontal);
m_bot_splitter = new QSplitter(Qt::Horizontal);
@@ -407,11 +409,11 @@ QString MainWindow::getDevFwNum(SANE_Handle handle)
void MainWindow::on_sane_dev_arrive(QString devName)
{
ui->act_refreshDevice->setEnabled(false);
- QTime curTimer = QTime::currentTime().addMSecs(5000);
- while (QTime::currentTime() < curTimer)
- {
- QCoreApplication::processEvents(QEventLoop::AllEvents, 100);
- }
+// QTime curTimer = QTime::currentTime().addMSecs(5000);
+// while (QTime::currentTime() < curTimer)
+// {
+// QCoreApplication::processEvents(QEventLoop::AllEvents, 100);
+// }
ui->act_refreshDevice->setEnabled(true);
if (m_loginType == Dialog_logIn::LogInType_Burn)
@@ -427,12 +429,12 @@ void MainWindow::on_sane_dev_arrive(QString devName)
return;
}
- QString str = tr("Confirm whether the device is reset");
- Dialog_HGMessageBox dlg(str, this);
- if (!dlg.exec())
- {
- return;
- }
+// QString str = tr("Confirm whether the device is reset");
+// Dialog_HGMessageBox dlg(str, this);
+// if (!dlg.exec())
+// {
+// return;
+// }
SANE_Handle devHandle = nullptr;
sane_open(devName.toStdString().c_str(), &devHandle);