lmh188
/
code_app
mirror of http://192.168.10.5:8099/sane/code_app.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

OEM版本开放了侧边栏图像处理功能和扫描到配置方案功能

This commit is contained in:
luoliangyi 2023-07-15 14:53:03 +08:00
parent 0d6a034371
commit f49c6a5dd6
4 changed files with 0 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/scanner/dialog_aquireinto.cpp
View File

@ -22,10 +22,8 @@ Dialog_AquireInto::Dialog_AquireInto(QWidget* parent) :
{
ui->setupUi(this);
#if defined(OEM_HANWANG) || defined(OEM_LISICHENG) || defined(OEM_CANGTIAN) || defined(OEM_ZHONGJING) || defined(OEM_ZIGUANG)
ui->groupBox_2->setVisible(false);
this->setFixedWidth(this->width() - ui->groupBox_2->width());
#endif
setWindowFlags(Qt::Dialog | Qt::WindowCloseButtonHint);
QRegExp rx("[^\\\\/:*?\"<>|]+$");

7
app/scanner/mainwindow.cpp
View File

@ -402,10 +402,8 @@ MainWindow::MainWindow(const QString& appLang, QWidget *parent)
m_pbtn_push->setGeometry(0, 0, 25, 50);
m_widget_sideBar = new Widget_Imgproc_SideBar(this);
#if defined(OEM_HANWANG) || defined(OEM_LISICHENG) || defined(OEM_CANGTIAN) || defined(OEM_ZHONGJING) || defined(OEM_ZIGUANG)
m_pbtn_push->setVisible(false);
m_widget_sideBar->setVisible(false);
#endif
connect(m_pbtn_push, SIGNAL(clicked()), this, SLOT(on_m_pbtn_push_clicked()));
connect(m_widget_sideBar, SIGNAL(applyToImage(HGImage,int,int,double,bool)), this, SLOT(on_dialog_sideBar_applyToImage(HGImage,int,int,double,bool)));
connect(m_widget_sideBar, SIGNAL(finish(bool)), this, SLOT(on_dialog_sideBar_finish(bool)));
@ -1898,14 +1896,12 @@ void MainWindow::updateActionStatus()
m_moveToAction->setEnabled(!selectIndexs.empty() && (!dev_que_.is_online() || !m_isScanning));
#if !defined(OEM_HANWANG) && !defined(OEM_LISICHENG) && !defined(OEM_CANGTIAN) && !defined(OEM_ZHONGJING) && !defined(OEM_ZIGUANG)
if (m_pbtn_push != nullptr && m_widget_sideBar!= nullptr)
{
m_pbtn_push->setVisible(nullptr != img);
m_widget_sideBar->setVisible(nullptr != img);
}
m_cbtn_acquireIntoCfg->setEnabled(dev_que_.is_online() && !m_isScanning);
#endif
ui->act_adjust->setEnabled(!m_bSideEditing && nullptr != img);
}
@ -4392,10 +4388,7 @@ QString MainWindow::getDevFwVersionNum()
void MainWindow::initAcquireIntoComboBox()
{
m_cbtn_acquireIntoCfg = new QComboBox;
#if defined(OEM_HANWANG) || defined(OEM_LISICHENG) || defined(OEM_CANGTIAN) || defined(OEM_ZHONGJING) || defined(OEM_ZIGUANG)
m_cbtn_acquireIntoCfg->setVisible(false);
#endif
m_cbtn_acquireIntoCfg->setFixedWidth(150);
ui->toolBar->addWidget(m_cbtn_acquireIntoCfg);

2
app/scanner2/dialog_aquireinto.cpp
View File

@ -22,10 +22,8 @@ Dialog_AquireInto::Dialog_AquireInto(QWidget* parent) :
{
ui->setupUi(this);
#if defined(OEM_HANWANG) || defined(OEM_LISICHENG) || defined(OEM_CANGTIAN) || defined(OEM_ZHONGJING) || defined(OEM_ZIGUANG)
ui->groupBox_2->setVisible(false);
this->setFixedWidth(this->width() - ui->groupBox_2->width());
#endif
setWindowFlags(Qt::Dialog | Qt::WindowCloseButtonHint);
QRegExp rx("[^\\\\/:*?\"<>|]+$");

7
app/scanner2/mainwindow.cpp
View File

@ -375,10 +375,8 @@ MainWindow::MainWindow(const QString& appLang, QWidget *parent)
m_pbtn_push->setGeometry(0, 0, 25, 50);
m_widget_sideBar = new Widget_Imgproc_SideBar(this);
#if defined(OEM_HANWANG) || defined(OEM_LISICHENG) || defined(OEM_CANGTIAN) || defined(OEM_ZHONGJING) || defined(OEM_ZIGUANG)
m_pbtn_push->setVisible(false);
m_widget_sideBar->setVisible(false);
#endif
connect(m_pbtn_push, SIGNAL(clicked()), this, SLOT(on_m_pbtn_push_clicked()));
connect(m_widget_sideBar, SIGNAL(applyToImage(HGImage,int,int,double,bool)), this, SLOT(on_dialog_sideBar_applyToImage(HGImage,int,int,double,bool)));
connect(m_widget_sideBar, SIGNAL(finish(bool)), this, SLOT(on_dialog_sideBar_finish(bool)));
@ -1593,14 +1591,12 @@ void MainWindow::updateActionStatus()
m_moveToAction->setEnabled(!selectIndexs.empty() && (!m_isScanning));
#if !defined(OEM_HANWANG) && !defined(OEM_LISICHENG) && !defined(OEM_CANGTIAN) && !defined(OEM_ZHONGJING) && !defined(OEM_ZIGUANG)
if (m_pbtn_push != nullptr && m_widget_sideBar!= nullptr)
{
m_pbtn_push->setVisible(nullptr != img);
m_widget_sideBar->setVisible(nullptr != img);
}
m_cbtn_acquireIntoCfg->setEnabled(!m_isScanning);
#endif
ui->act_adjust->setEnabled(!m_bSideEditing && nullptr != img);
}
@ -3723,10 +3719,7 @@ void MainWindow::deleteUpgradePkg(const QString &cfgFilePath)
void MainWindow::initAcquireIntoComboBox()
{
m_cbtn_acquireIntoCfg = new QComboBox;
#if defined(OEM_HANWANG) || defined(OEM_LISICHENG) || defined(OEM_CANGTIAN) || defined(OEM_ZHONGJING) || defined(OEM_ZIGUANG)
m_cbtn_acquireIntoCfg->setVisible(false);
#endif
m_cbtn_acquireIntoCfg->setFixedWidth(150);
ui->toolBar->addWidget(m_cbtn_acquireIntoCfg);