删除之前中晶添加自定义语言包的代码,调整设备日志导出
This commit is contained in:
parent
420027a319
commit
22254e0aaa
|
@ -96,7 +96,8 @@ HGResult DeviceUser::ClearRollerCount()
|
|||
QString DeviceUser::GetDriverLog()
|
||||
{
|
||||
QString fileName = QFileDialog::getSaveFileName(m_wnd, tr("Select log file path"), ".", tr("text(*.txt)"));
|
||||
HGResult ret = HGTwain_GetDSDriverLog(m_twainDS, fileName.toStdString().c_str());
|
||||
std::string f = getStdFileName(fileName).toLocal8Bit().data();
|
||||
HGResult ret = HGTwain_GetDSDriverLog(m_twainDS, f.c_str());
|
||||
if (ret == HGBASE_ERR_OK)
|
||||
return fileName;
|
||||
|
||||
|
@ -111,7 +112,8 @@ HGResult DeviceUser::ClearDriverLog()
|
|||
QString DeviceUser::GetDeviceLog()
|
||||
{
|
||||
QString fileName = QFileDialog::getSaveFileName(m_wnd, tr("Select log file path"), ".", tr("text(*.txt)"));
|
||||
HGResult ret = HGTwain_GetDSDeviceLog(m_twainDS, fileName.toStdString().c_str());
|
||||
std::string f = getStdFileName(fileName).toLocal8Bit().data();
|
||||
HGResult ret = HGTwain_GetDSDeviceLog(m_twainDS, f.c_str());
|
||||
if (ret == HGBASE_ERR_OK)
|
||||
return fileName;
|
||||
|
||||
|
@ -309,7 +311,8 @@ int DeviceUser::GetDeviceRollerLife()
|
|||
QString DeviceUser::GetDriverLog()
|
||||
{
|
||||
QString fileName = QFileDialog::getSaveFileName(m_wnd, tr("Select log file path"), ".", tr("text(*.txt)"));
|
||||
HGResult ret = HGSane_GetDriverLog(m_saneDev, fileName.toStdString().c_str());
|
||||
std::string f = getStdFileName(fileName).toLocal8Bit().data();
|
||||
HGResult ret = HGSane_GetDriverLog(m_saneDev, f.c_str());
|
||||
if (ret == HGBASE_ERR_OK)
|
||||
return fileName;
|
||||
|
||||
|
@ -324,7 +327,8 @@ HGResult DeviceUser::ClearDriverLog()
|
|||
QString DeviceUser::GetDeviceLog()
|
||||
{
|
||||
QString fileName = QFileDialog::getSaveFileName(m_wnd, tr("Select log file path"), ".", tr("text(*.txt)"));
|
||||
HGResult ret = HGSane_GetDeviceLog(m_saneDev, fileName.toStdString().c_str());
|
||||
std::string f = getStdFileName(fileName).toLocal8Bit().data();
|
||||
HGResult ret = HGSane_GetDeviceLog(m_saneDev, f.c_str());
|
||||
if (ret == HGBASE_ERR_OK)
|
||||
return fileName;
|
||||
|
||||
|
|
|
@ -191,11 +191,6 @@ void Dialog_Export::getSaveIndexs(std::vector<int> &indexs)
|
|||
indexs = m_saveIndexs;
|
||||
}
|
||||
|
||||
int Dialog_Export::getOcrLanguageType()
|
||||
{
|
||||
return ui->comboBox_ocrType->currentIndex();// 0-english, 1-chinese_sim, 2-chinese_tra, 3-japanese, 4-korean...
|
||||
}
|
||||
|
||||
void Dialog_Export::on_dialog_accepted()
|
||||
{
|
||||
QString extName(m_supportType[m_suffix].ext);
|
||||
|
|
|
@ -49,7 +49,6 @@ public:
|
|||
bool isOcr();
|
||||
bool isSaveAsMultiPage();
|
||||
void getSaveIndexs(std::vector<int> &indexs);
|
||||
int getOcrLanguageType();
|
||||
|
||||
private slots:
|
||||
void on_dialog_accepted();
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
|
||||
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,
|
||||
int ocrLanguageType, const QStringList &srcFiles, QWidget *parent)
|
||||
const QStringList &srcFiles, QWidget *parent)
|
||||
: QDialog(parent)
|
||||
, ui(new Ui::Dialog_ExportImageFile)
|
||||
, m_destPath(destPath)
|
||||
|
@ -25,7 +25,6 @@ Dialog_ExportImageFile::Dialog_ExportImageFile(const QString &destPath, const QS
|
|||
, m_tiffCompression(tiffCompression)
|
||||
, m_tiffQuality(tiffQuality)
|
||||
, m_isOcr(isOcr)
|
||||
, m_ocrLanguageType(ocrLanguageType)
|
||||
, m_srcFiles(srcFiles)
|
||||
{
|
||||
ui->setupUi(this);
|
||||
|
@ -318,7 +317,7 @@ void HGAPI Dialog_ExportImageFile::ThreadFunc(HGThread thread, HGPointer param)
|
|||
saveInfo.tiffCompression = HGIMGFMT_TIFFCOMP_JPEG;
|
||||
}
|
||||
|
||||
ret = MainWindow::saveImage(img, &saveInfo, p->m_isOcr, p->m_ocrLanguageType, getStdString(saveFileName).c_str());
|
||||
ret = MainWindow::saveImage(img, &saveInfo, p->m_isOcr, getStdString(saveFileName).c_str());
|
||||
HGBase_DestroyImage(img);
|
||||
}
|
||||
|
||||
|
|
|
@ -15,7 +15,7 @@ class Dialog_ExportImageFile : public QDialog
|
|||
public:
|
||||
explicit Dialog_ExportImageFile(const QString &destPath, const QString &destName, const QString &destExt,
|
||||
bool isSaveAsMulti, int jpegQuality, int tiffCompressionBW, int tiffCompression, int tiffQuality, bool isOcr,
|
||||
int ocrLanguageType, const QStringList &srcFiles, QWidget *parent = nullptr);
|
||||
const QStringList &srcFiles, QWidget *parent = nullptr);
|
||||
~Dialog_ExportImageFile();
|
||||
|
||||
private:
|
||||
|
@ -45,7 +45,6 @@ private:
|
|||
int m_tiffCompression;
|
||||
int m_tiffQuality;
|
||||
bool m_isOcr;
|
||||
int m_ocrLanguageType;
|
||||
QStringList m_srcFiles;
|
||||
|
||||
bool m_stopThread;
|
||||
|
|
|
@ -164,11 +164,6 @@ bool Dialog_SaveAs::isOcr()
|
|||
return (m_suffix >= 10);
|
||||
}
|
||||
|
||||
int Dialog_SaveAs::getOcrLanguageType()
|
||||
{
|
||||
return ui->comboBox_ocrType->currentIndex();// 0-english, 1-chinese_sim, 2-chinese_tra, 3-japanese, 4-korean...
|
||||
}
|
||||
|
||||
void Dialog_SaveAs::on_dialog_accepted()
|
||||
{
|
||||
QString extName;
|
||||
|
|
|
@ -22,7 +22,6 @@ public:
|
|||
int getTiffCompression();
|
||||
int getTiffQuality();
|
||||
bool isOcr();
|
||||
int getOcrLanguageType();
|
||||
|
||||
private slots:
|
||||
void on_dialog_accepted();
|
||||
|
|
|
@ -438,7 +438,7 @@ void MainWindow::exitFullScreen()
|
|||
m_dlgFullScreen = nullptr;
|
||||
}
|
||||
|
||||
HGResult MainWindow::saveImage(HGImage image, const HGImgFmtSaveInfo* info, bool ocr, int ocrLanguageType, const HGChar *fileName)
|
||||
HGResult MainWindow::saveImage(HGImage image, const HGImgFmtSaveInfo* info, bool ocr, const HGChar *fileName)
|
||||
{
|
||||
if (!ocr)
|
||||
{
|
||||
|
@ -446,15 +446,6 @@ HGResult MainWindow::saveImage(HGImage image, const HGImgFmtSaveInfo* info, bool
|
|||
}
|
||||
|
||||
HGResult ret = HGBASE_ERR_FAIL;
|
||||
|
||||
#if 0
|
||||
HGChar tmpFileName[256];
|
||||
HGBase_GetTmpFileName("bmp", tmpFileName, 256);
|
||||
ret = HGImgFmt_SaveImage(image, 0, info, tmpFileName);
|
||||
bool result = createOcrPdf(tmpFileName, fileName, ocrLanguageType);
|
||||
QFile::remove(tmpFileName);
|
||||
return (result) ? HGBASE_ERR_OK : HGIMGPROC_ERR_OCR;
|
||||
#else
|
||||
HGOCRMgr ocrMgr = nullptr;
|
||||
ret = HGImgProc_CreateOCRMgr(0, &ocrMgr);
|
||||
if (HGBASE_ERR_OK == ret)
|
||||
|
@ -464,7 +455,6 @@ HGResult MainWindow::saveImage(HGImage image, const HGImgFmtSaveInfo* info, bool
|
|||
}
|
||||
|
||||
return ret;
|
||||
#endif
|
||||
}
|
||||
|
||||
void MainWindow::on_act_90Left_triggered()
|
||||
|
@ -1180,7 +1170,7 @@ void MainWindow::on_newImage(void *image)
|
|||
saveInfo.tiffCompression = HGIMGFMT_TIFFCOMP_JPEG;
|
||||
}
|
||||
|
||||
if (HGBASE_ERR_OK == saveImage((HGImage)image, &saveInfo, m_aquireIntoSaveParam.m_isOcr, 0, getStdString(m_scanFileName).c_str()))
|
||||
if (HGBASE_ERR_OK == HGImgFmt_SaveImage((HGImage)image, 0, &saveInfo, getStdString(m_scanFileName).c_str()))
|
||||
{
|
||||
emit post_new_image(m_scanFileName);
|
||||
++m_aquireIntoSaveParam.m_fileNameStartIndex;
|
||||
|
@ -1941,7 +1931,6 @@ void MainWindow::on_act_save_triggered()
|
|||
int tiffCompression = auto_save_info_.tiffCompression;
|
||||
int tiffQuality = auto_save_info_.tiffQuality;
|
||||
bool isOcr = auto_save_info_.isOcr;
|
||||
int ocrLanguageType = 0;
|
||||
bool find = false;
|
||||
int count = 0;
|
||||
|
||||
|
@ -1975,7 +1964,6 @@ void MainWindow::on_act_save_triggered()
|
|||
tiffQuality = auto_save_info_.tiffQuality = dlg.getTiffQuality();
|
||||
tiffCompression = auto_save_info_.tiffCompression = dlg.getTiffCompression();
|
||||
tiffCompressionBW = auto_save_info_.tiffCompressionBW = dlg.getTiffCompressionBW();
|
||||
ocrLanguageType = dlg.getOcrLanguageType();
|
||||
}
|
||||
if(auto_save_changes_ && save_from_changed_)
|
||||
{
|
||||
|
@ -2033,7 +2021,7 @@ void MainWindow::on_act_save_triggered()
|
|||
saveInfo.tiffCompression = HGIMGFMT_TIFFCOMP_JPEG;
|
||||
}
|
||||
|
||||
ret = saveImage(img, &saveInfo, isOcr, ocrLanguageType, getStdString(savePath).c_str());
|
||||
ret = saveImage(img, &saveInfo, isOcr, getStdString(savePath).c_str());
|
||||
if (HGBASE_ERR_OK == ret)
|
||||
{
|
||||
if (auto_save_changes_)
|
||||
|
@ -2158,7 +2146,6 @@ void MainWindow::on_act_saveAs_triggered()
|
|||
int tiffCompression = dlg.getTiffCompression();
|
||||
int tiffQuality = dlg.getTiffQuality();
|
||||
bool isOcr = dlg.isOcr();
|
||||
int ocrLanguageType = dlg.getOcrLanguageType();
|
||||
|
||||
HGImgFmtSaveInfo saveInfo;
|
||||
saveInfo.jpegQuality = (HGUInt)jpegQuality;
|
||||
|
@ -2182,7 +2169,7 @@ void MainWindow::on_act_saveAs_triggered()
|
|||
saveInfo.tiffCompression = HGIMGFMT_TIFFCOMP_JPEG;
|
||||
}
|
||||
|
||||
HGResult ret = saveImage(img, &saveInfo, isOcr, ocrLanguageType, getStdString(savePath).c_str());
|
||||
HGResult ret = saveImage(img, &saveInfo, isOcr, getStdString(savePath).c_str());
|
||||
if (HGBASE_ERR_OK == ret)
|
||||
{
|
||||
if(!auto_save_changes_)
|
||||
|
@ -2251,10 +2238,9 @@ void MainWindow::on_act_Export_triggered()
|
|||
int tiffCompression = dlg.getTiffCompression();
|
||||
int tiffQuality = dlg.getTiffQuality();
|
||||
bool isOcr = dlg.isOcr();
|
||||
int ocrLanguageType = dlg.getOcrLanguageType();
|
||||
|
||||
Dialog_ExportImageFile dlgExport(savePath, saveName, saveExt, isSaveAsMulti, jpegQuality,
|
||||
tiffCompressionBW, tiffCompression, tiffQuality, isOcr, ocrLanguageType, srcFiles, this);
|
||||
tiffCompressionBW, tiffCompression, tiffQuality, isOcr, srcFiles, this);
|
||||
dlgExport.exec();
|
||||
}
|
||||
}
|
||||
|
|
|
@ -63,7 +63,7 @@ public:
|
|||
virtual ~MainWindow() override;
|
||||
|
||||
void exitFullScreen();
|
||||
static HGResult saveImage(HGImage image, const HGImgFmtSaveInfo* info, bool ocr, int ocrLanguageType, const HGChar *fileName);
|
||||
static HGResult saveImage(HGImage image, const HGImgFmtSaveInfo* info, bool ocr, const HGChar *fileName);
|
||||
static QString getLogInfo(HGResult ret);
|
||||
|
||||
private slots:
|
||||
|
|
Loading…
Reference in New Issue