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:
yangjiaxuan 2023-04-14 13:53:39 +08:00
parent ac21390333
commit 8162768886
3 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/scanner/dialog_aquireinto.cpp
View File

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

4
app/scanner/dialog_aquireinto.ui
View File

@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>731</width>
<height>465</height>
<width>699</width>
<height>398</height>
</rect>
</property>
<property name="sizePolicy">

13
app/scanner/mainwindow.cpp
View File

@ -389,10 +389,14 @@ MainWindow::MainWindow(const QString& appLang, QWidget *parent)
ui->act_driver_log->setEnabled(false);
m_pbtn_push = new QPushButton(this);
m_pbtn_push->setVisible(false);
m_pbtn_push->setText("<<");
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);
#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)));
@ -1862,12 +1866,15 @@ void MainWindow::updateActionStatus()
m_dialogLog->pbtn_export->setEnabled(ui->act_Export->isEnabled());
m_moveToAction->setEnabled(!selectIndexs.empty() && (!dev_que_.is_online() || !m_isScanning));
#if defined(OEM_HUAGAO)
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);
}
@ -4341,6 +4348,12 @@ 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);
#endif
m_cbtn_acquireIntoCfg->setFixedWidth(150);
ui->toolBar->addWidget(m_cbtn_acquireIntoCfg);
m_cbtn_acquireIntoCfg->addItem(tr("default scheme"));