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

Compare commits

base: lmh188:bfa51e385cc7282b0c53da692c49d2dc41c3b5f3
Branches Tags
lmh188:master
lmh188:dev
lmh188:twain
lmh188:conservative
lmh188:release
lmh188:v4.52.1
lmh188:v4.52
lmh188:qiming_v.4.51.23297
lmh188:v4.51
lmh188:v4.50
lmh188:hw-2022.0523
..
compare: lmh188:07f129c5349ecb9d0a4f778fe33ecfd4eade0e6b
Branches Tags
lmh188:dev
lmh188:master
lmh188:twain
lmh188:conservative
lmh188:release
lmh188:v4.52.1
lmh188:v4.52
lmh188:qiming_v.4.51.23297
lmh188:v4.51
lmh188:v4.50
lmh188:hw-2022.0523

No commits in common. "bfa51e385cc7282b0c53da692c49d2dc41c3b5f3" and "07f129c5349ecb9d0a4f778fe33ecfd4eade0e6b" have entirely different histories.
bfa51e385c ... 07f129c534

4 changed files with 4 additions and 50 deletions
Show Stats Expand all files Collapse all files

23
app/scanner2/HGImgThumb.cpp
View File

@ -2126,29 +2126,6 @@ HGResult HGImgThumb::refreshAllItems()
return HGBASE_ERR_OK;
}
HGResult HGImgThumb::reloadAllItems()
{
if (MouseStatus_Null != m_mousePressStatus || 0 != m_operate || m_draging || m_frameSelection)
{
return HGBASE_ERR_FAIL;
}
std::vector<int> index;
for (int i = 0; i < m_frontItems.size(); i++)
{
QString fileName = m_frontItems[i]->fileName;
QFile file(fileName);
if (!file.exists())
{
index.push_back(i);
}
}
removeItems(index, ThumbRemoveFlag_NULL);
return HGBASE_ERR_OK;
}
void HGImgThumb::notify_mouse_leave(void)
{
leaveEvent(nullptr);

1
app/scanner2/HGImgThumb.h
View File

@ -74,7 +74,6 @@ public:
HGResult refreshItem(int index);
HGResult refreshItem(const QString &fileName);
HGResult refreshAllItems();
HGResult reloadAllItems();
void notify_mouse_leave(void);

27
app/scanner2/mainwindow.cpp
View File

@ -91,10 +91,6 @@ MainWindow::MainWindow(const QString& appLang, QWidget *parent)
{
ui->setupUi(this);
HGChar cacheUuid[256] = { 0 };
HGBase_GetUuid(cacheUuid, 256);
m_cacheUuid = cacheUuid;
m_lockPreviewImage = nullptr;
HGBase_CreateLock(&m_lockPreviewImage);
m_aquireIntoSaveParam.m_fileNameStartIndex = -1;
@ -996,7 +992,6 @@ void MainWindow::on_currItemChanged(int index)
if (fileInfo.isFile())
{
++m_aquireIntoSaveParam.m_fileNameStartIndex;
saveCfgValue(m_cbtn_acquireIntoCfg->currentText().toLocal8Bit().toStdString().c_str(), "startIndex", m_aquireIntoSaveParam.m_fileNameStartIndex);
}
else
{
@ -1012,7 +1007,6 @@ void MainWindow::on_currItemChanged(int index)
m_thumb->updateItem(*iter, newFileName, false);
m_curBatchFileList.push_back(newFileName);
++m_aquireIntoSaveParam.m_fileNameStartIndex;
saveCfgValue(m_cbtn_acquireIntoCfg->currentText().toLocal8Bit().toStdString().c_str(), "startIndex", m_aquireIntoSaveParam.m_fileNameStartIndex);
}
}
}
@ -1295,7 +1289,6 @@ void MainWindow::on_newImage(void *image)
if (fileInfo.isFile())
{
++m_aquireIntoSaveParam.m_fileNameStartIndex;
saveCfgValue(m_cbtn_acquireIntoCfg->currentText().toLocal8Bit().toStdString().c_str(), "startIndex", m_aquireIntoSaveParam.m_fileNameStartIndex);
}
else
{
@ -1361,10 +1354,7 @@ void MainWindow::on_newImage(void *image)
emit post_new_image(m_scanFileName);
m_scanFileName.clear();
if (-1 == m_scanInsertPos)
{
++m_aquireIntoSaveParam.m_fileNameStartIndex;
saveCfgValue(m_cbtn_acquireIntoCfg->currentText().toLocal8Bit().toStdString().c_str(), "startIndex", m_aquireIntoSaveParam.m_fileNameStartIndex);
}
m_aquireIntoMultiPageCount = 0;
}
else
@ -1430,7 +1420,6 @@ void MainWindow::on_newImage(void *image)
if (fileInfo.isFile())
{
++m_aquireIntoSaveParam.m_fileNameStartIndex;
saveCfgValue(m_cbtn_acquireIntoCfg->currentText().toLocal8Bit().toStdString().c_str(), "startIndex", m_aquireIntoSaveParam.m_fileNameStartIndex);
}
else
{
@ -1480,10 +1469,7 @@ void MainWindow::on_newImage(void *image)
{
emit post_new_image(m_scanFileName);
if (-1 == m_scanInsertPos)
{
++m_aquireIntoSaveParam.m_fileNameStartIndex;
saveCfgValue(m_cbtn_acquireIntoCfg->currentText().toLocal8Bit().toStdString().c_str(), "startIndex", m_aquireIntoSaveParam.m_fileNameStartIndex);
}
}
m_scanFileName.clear();
@ -1506,8 +1492,6 @@ void MainWindow::on_abnormalImage(void *image, HGUInt *result)
void MainWindow::on_scanWorkingEvent()
{
m_thumb->reloadAllItems();
m_view->enableHighQuality(false);
m_isScanning = true;
updateActionStatus();
@ -1540,10 +1524,7 @@ void MainWindow::on_scanFinishEvent()
emit post_new_image(m_scanFileName);
m_scanFileName.clear();
if (-1 == m_scanInsertPos)
{
++m_aquireIntoSaveParam.m_fileNameStartIndex;
saveCfgValue(m_cbtn_acquireIntoCfg->currentText().toLocal8Bit().toStdString().c_str(), "startIndex", m_aquireIntoSaveParam.m_fileNameStartIndex);
}
m_aquireIntoMultiPageCount = 0;
}
@ -1702,7 +1683,6 @@ void MainWindow::on_scanFinishEvent()
if (fileInfo.isFile())
{
++m_aquireIntoSaveParam.m_fileNameStartIndex;
saveCfgValue(m_cbtn_acquireIntoCfg->currentText().toLocal8Bit().toStdString().c_str(), "startIndex", m_aquireIntoSaveParam.m_fileNameStartIndex);
}
else
{
@ -1718,7 +1698,6 @@ void MainWindow::on_scanFinishEvent()
m_thumb->updateItem(*iter, newFileName, false);
m_curBatchFileList.push_back(newFileName);
++m_aquireIntoSaveParam.m_fileNameStartIndex;
saveCfgValue(m_cbtn_acquireIntoCfg->currentText().toLocal8Bit().toStdString().c_str(), "startIndex", m_aquireIntoSaveParam.m_fileNameStartIndex);
}
}
}
@ -1874,7 +1853,7 @@ QString MainWindow::getCacheFileName(HGImage img)
HGImageInfo imgInfo;
HGBase_GetImageInfo(img, &imgInfo);
QString cachePath = Dialog_ClrCache::getCachePath() + m_cacheUuid + "/";
QString cachePath = Dialog_ClrCache::getCachePath();
HGBase_CreateDir(getStdString(cachePath).c_str());
char uuid[256] = {0};
@ -2936,9 +2915,9 @@ void MainWindow::closeEvent(QCloseEvent *e)
}
}
QString cachePath = Dialog_ClrCache::getCachePath() + m_cacheUuid + "/";
QString cachePath = Dialog_ClrCache::getCachePath();
QDir dir = QDir(cachePath);
if (dir.exists())
if (dir.exists() && (cachePath.endsWith("Cache/") || cachePath.endsWith("Cache\\")))
dir.removeRecursively();
m_versionDll->PostUserCloseInfo(HGVERSION_APPNAME_SCANNER, m_oemName);

3
app/scanner2/mainwindow.h
View File

@ -1,4 +1,4 @@
#ifndef MAINWINDOW_H
#ifndef MAINWINDOW_H
#define MAINWINDOW_H
#include <QMainWindow>
@ -275,7 +275,6 @@ private:
private:
Ui::MainWindow *ui;
QString m_cacheUuid;
bool m_canClose;
DeviceUserMgr *m_devUserMgr;
DeviceUser *m_devUser;