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

解决国产系统进度指示器扫描张数卡顿、显示不全等问题；BUG-924

This commit is contained in:
yangjiaxuan 2024-03-12 15:53:06 +08:00
parent 7d315ffc88
commit f3dcc88420
2 changed files with 14 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
modules/twainui/dialog_progress_ui.cpp
View File

@ -30,10 +30,8 @@ Dialog_progress_ui::Dialog_progress_ui(class Manager *mgr, std::function<void (u
ui->pbtn_close->setVisible(false); ui->pbtn_close->setVisible(false);
ui->label->setText(tr("start scanning")); ui->label->setText(tr("start scanning"));
ui->label_imgRecived->setVisible(false); ui->label_imgRecived->setText(tr("image recived:") + QString::number(m_imageRecivedCount));
ui->lineEdit_imgRecived->setVisible(false); ui->label_imgRecived->setAlignment(Qt::AlignCenter);
ui->label_totalImgRecived->setVisible(false);
ui->lineEdit_imgRecived->setText(QString::number(m_imageRecivedCount));
m_mgr = mgr; m_mgr = mgr;
m_callback = callback; m_callback = callback;
@ -105,9 +103,6 @@ void Dialog_progress_ui::on_scan_status(QString finishInfo, bool isScanning)
{ {
m_isScanning = isScanning; m_isScanning = isScanning;
ui->label_imgRecived->setVisible(isScanning);
ui->lineEdit_imgRecived->setVisible(isScanning);
ui->label->setText(finishInfo); ui->label->setText(finishInfo);
ui->pbtn_cancelScan->setVisible(isScanning); ui->pbtn_cancelScan->setVisible(isScanning);
ui->pbtn_close->setVisible(!isScanning); ui->pbtn_close->setVisible(!isScanning);
@ -117,8 +112,10 @@ void Dialog_progress_ui::on_scan_finish(int flag, QString finishInfo)
{ {
on_scan_status(finishInfo, false); on_scan_status(finishInfo, false);
ui->label_totalImgRecived->setVisible(true); QString info = tr("Total scanned images: %1").arg(QString::number(m_imageRecivedCount));
ui->label_totalImgRecived->setText(tr("Total scanned images: %1").arg(QString::number(m_imageRecivedCount))); ui->label_imgRecived->setText(info);
ui->label_imgRecived->repaint();
this->repaint();
m_imageRecivedCount = 0; m_imageRecivedCount = 0;
@ -132,7 +129,9 @@ void Dialog_progress_ui::on_scan_finish(int flag, QString finishInfo)
void Dialog_progress_ui::on_image_recived() void Dialog_progress_ui::on_image_recived()
{ {
m_imageRecivedCount++; m_imageRecivedCount++;
ui->lineEdit_imgRecived->setText(QString::number(m_imageRecivedCount)); ui->label_imgRecived->setText(tr("image recived:") + QString::number(m_imageRecivedCount));
ui->label_imgRecived->repaint();
this->repaint();
} }
void HGAPI Dialog_progress_ui::ThreadFunc(HGThread thread, HGPointer param) void HGAPI Dialog_progress_ui::ThreadFunc(HGThread thread, HGPointer param)

56
modules/twainui/dialog_progress_ui.ui
View File

@ -82,21 +82,6 @@
</property> </property>
</spacer> </spacer>
</item> </item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_3">
<item>
<spacer name="horizontalSpacer_6">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item> <item>
<widget class="QLabel" name="label_imgRecived"> <widget class="QLabel" name="label_imgRecived">
<property name="text"> <property name="text">
@ -104,47 +89,6 @@
</property> </property>
</widget> </widget>
</item> </item>
<item>
<widget class="QLineEdit" name="lineEdit_imgRecived">
<property name="minimumSize">
<size>
<width>61</width>
<height>20</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>61</width>
<height>20</height>
</size>
</property>
<property name="readOnly">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="label_totalImgRecived">
<property name="text">
<string>total image recived:</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_5">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item> <item>
<spacer name="verticalSpacer_3"> <spacer name="verticalSpacer_3">
<property name="orientation"> <property name="orientation">