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 2022-11-25 18:35:22 +08:00
parent 47777eb6f1
commit 3cc60d472a
6 changed files with 311 additions and 306 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
app/scanner/Scanner_zh_CN.qm
View File

Binary file not shown.

499
app/scanner/Scanner_zh_CN.ts
View File

File diff suppressed because it is too large Load Diff

34
app/scanner/dialog_exportimagefile.cpp
View File

@ -7,6 +7,7 @@
#include "HGUIGlobal.h"
#include "HGString.h"
#include <QMessageBox>
#include <QFile>
Dialog_ExportImageFile::Dialog_ExportImageFile(const QString &destPath, const QString &destName, const QString &destExt,
bool isSaveAsMulti, int jpegQuality, int tiffCompressionBW, int tiffCompression, int tiffQuality, bool isOcr,
@ -71,10 +72,17 @@ void HGAPI Dialog_ExportImageFile::ThreadFunc(HGThread thread, HGPointer param)
break;
}
QFile file(p->m_srcFiles[i]);
if (!file.exists())
{
ret = HGBASE_ERR_FILENOTEXIST;
break;
}
emit p->updateProgress(i);
HGImgFmtReader imgFmtReader = nullptr;
HGImgFmt_OpenImageReader(getStdString(p->m_srcFiles[i]).c_str(), 0, &imgFmtReader);
ret = HGImgFmt_OpenImageReader(getStdString(p->m_srcFiles[i]).c_str(), 0, &imgFmtReader);
if (nullptr != imgFmtReader)
{
HGUInt count = 0;
@ -87,7 +95,7 @@ void HGAPI Dialog_ExportImageFile::ThreadFunc(HGThread thread, HGPointer param)
}
HGImage img = nullptr;
HGImgFmt_LoadImageFromReader(imgFmtReader, j, nullptr, 0, HGBASE_IMGORIGIN_TOP, &img);
ret = HGImgFmt_LoadImageFromReader(imgFmtReader, j, nullptr, 0, HGBASE_IMGORIGIN_TOP, &img);
if (nullptr != img)
{
ret = HGImgProc_AddToImageOCRList(ocrMgr, img);
@ -128,10 +136,17 @@ void HGAPI Dialog_ExportImageFile::ThreadFunc(HGThread thread, HGPointer param)
break;
}
QFile file(p->m_srcFiles[i]);
if (!file.exists())
{
ret = HGBASE_ERR_FILENOTEXIST;
break;
}
emit p->updateProgress(i);
HGImgFmtReader imgFmtReader = nullptr;
HGImgFmt_OpenImageReader(getStdString(p->m_srcFiles[i]).c_str(), 0, &imgFmtReader);
ret = HGImgFmt_OpenImageReader(getStdString(p->m_srcFiles[i]).c_str(), 0, &imgFmtReader);
if (nullptr != imgFmtReader)
{
HGUInt count = 0;
@ -144,7 +159,7 @@ void HGAPI Dialog_ExportImageFile::ThreadFunc(HGThread thread, HGPointer param)
}
HGImage img = nullptr;
HGImgFmt_LoadImageFromReader(imgFmtReader, j, nullptr, 0, HGBASE_IMGORIGIN_TOP, &img);
ret = HGImgFmt_LoadImageFromReader(imgFmtReader, j, nullptr, 0, HGBASE_IMGORIGIN_TOP, &img);
if (nullptr != img)
{
HGImgFmtSaveInfo saveInfo;
@ -201,10 +216,17 @@ void HGAPI Dialog_ExportImageFile::ThreadFunc(HGThread thread, HGPointer param)
break;
}
QFile file(p->m_srcFiles[i]);
if (!file.exists())
{
ret = HGBASE_ERR_FILENOTEXIST;
break;
}
emit p->updateProgress(i);
HGImgFmtReader imgFmtReader = nullptr;
HGImgFmt_OpenImageReader(getStdString(p->m_srcFiles[i]).c_str(), 0, &imgFmtReader);
ret = HGImgFmt_OpenImageReader(getStdString(p->m_srcFiles[i]).c_str(), 0, &imgFmtReader);
if (nullptr != imgFmtReader)
{
HGUInt count = 0;
@ -217,7 +239,7 @@ void HGAPI Dialog_ExportImageFile::ThreadFunc(HGThread thread, HGPointer param)
}
HGImage img = nullptr;
HGImgFmt_LoadImageFromReader(imgFmtReader, j, nullptr, 0, HGBASE_IMGORIGIN_TOP, &img);
ret = HGImgFmt_LoadImageFromReader(imgFmtReader, j, nullptr, 0, HGBASE_IMGORIGIN_TOP, &img);
if (nullptr != img)
{
char fileName[512];

12
app/scanner/dialog_multirotateimagefile.cpp
View File

@ -4,6 +4,7 @@
#include "HGUIGlobal.h"
#include "mainwindow.h"
#include <QMessageBox>
#include <QFile>
Dialog_MultiRotateImageFile::Dialog_MultiRotateImageFile(const QStringList &fileList, int rotateType, QWidget *parent) :
QDialog(parent),
@ -49,19 +50,26 @@ void HGAPI Dialog_MultiRotateImageFile::ThreadFunc(HGThread thread, HGPointer pa
break;
}
QFile file(p->m_fileList[i]);
if (!file.exists())
{
ret = HGBASE_ERR_FILENOTEXIST;
break;
}
emit p->updateProgress(i);
HGImage img = nullptr;
HGImgFmtReader imgFmtReader = nullptr;
HGImgFmt_OpenImageReader(getStdString(p->m_fileList[i]).c_str(), 0, &imgFmtReader);
ret = HGImgFmt_OpenImageReader(getStdString(p->m_fileList[i]).c_str(), 0, &imgFmtReader);
if (nullptr != imgFmtReader)
{
HGUInt pageCount = 0;
HGImgFmt_GetImagePageCount(imgFmtReader, &pageCount);
if (1 == pageCount)
{
HGImgFmt_LoadImageFromReader(imgFmtReader, 0, nullptr, 0, HGBASE_IMGORIGIN_TOP, &img);
ret = HGImgFmt_LoadImageFromReader(imgFmtReader, 0, nullptr, 0, HGBASE_IMGORIGIN_TOP, &img);
if (nullptr != img)
{
HGImageInfo imgInfo;

12
app/scanner/mainwindow.cpp
View File

@ -3919,6 +3919,18 @@ QString MainWindow::getLogInfo(HGResult ret)
{
str = tr("Ocr failed");
}
else if (HGBASE_ERR_FILENOTEXIST == ret)
{
str = tr("File does not exist");
}
else if (HGBASE_ERR_LOADLIBRARY == ret)
{
str = tr("Failed to load dynamic library");
}
else if (HGBASE_ERR_FILEERROR == ret)
{
str = tr("File data error");
}
else
{
str = tr("Failed");

60
app/scanner/qt_zh_CN.ts
View File

@ -267,14 +267,6 @@
<source>Browse directory</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>OCR-&gt;PDF - Portable Document Format(*.pdf)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>OCR-&gt;OFD - Open Fixed-layout Document(*.ofd)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>GIF - Graphics Interchange Format(*.gif)</source>
<translation type="unfinished"></translation>
@ -1240,22 +1232,6 @@ Please make sure the two passwords are the same.</source>
<source>upgrade the latest version</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>select version</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Detected installable versions:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>install</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>cancel</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>upgrade online</source>
<translation type="unfinished"></translation>
@ -1272,30 +1248,6 @@ Please make sure the two passwords are the same.</source>
<source> ,the current version is : </source>
<translation type="unfinished"></translation>
</message>
<message>
<source>tip</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Already in current version</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>bug description:
</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>upgrade contents:
</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>
bug description:
</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Dialog_upgradeFirmware</name>
@ -2145,6 +2097,18 @@ Are you sure to close?</source>
<source>Please select at least one picture before export</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>File does not exist</source>
<translation type="unfinished">文件不存在</translation>
</message>
<message>
<source>Failed to load dynamic library</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>File data error</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Phonon::</name>