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

微调

This commit is contained in:
yangjiaxuan 2023-04-14 15:30:38 +08:00
parent 8162768886
commit e825602e11
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/scanner/dialog_aquireinto.cpp
View File

@ -22,7 +22,7 @@ Dialog_AquireInto::Dialog_AquireInto(QWidget* parent) :
{
ui->setupUi(this);
#if !defined(OEM_HUAGAO)
#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

14
app/scanner/mainwindow.cpp
View File

@ -138,7 +138,7 @@ MainWindow::MainWindow(const QString& appLang, QWidget *parent)
ui->actionact_update->setVisible(false);
ui->act_feedback->setVisible(false);
#if defined(OEM_HUAGAO)
#if !defined(OEM_HANWANG) && !defined(OEM_LISICHENG) && !defined(OEM_CANGTIAN) && !defined(OEM_ZHONGJING) && !defined(OEM_ZIGUANG)
if (m_versionDll->IsValid())
{
ui->actionact_update->setVisible(true);
@ -394,8 +394,9 @@ 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_HUAGAO)
m_pbtn_push->setVisible(true);
#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)));
@ -1867,7 +1868,7 @@ void MainWindow::updateActionStatus()
m_moveToAction->setEnabled(!selectIndexs.empty() && (!dev_que_.is_online() || !m_isScanning));
#if defined(OEM_HUAGAO)
#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);
@ -4348,10 +4349,9 @@ QString MainWindow::getDevPid()
void MainWindow::initAcquireIntoComboBox()
{
m_cbtn_acquireIntoCfg = new QComboBox;
m_cbtn_acquireIntoCfg->setVisible(false);
#if defined(OEM_HUAGAO)
m_cbtn_acquireIntoCfg->setVisible(true);
#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);