Merge branch 'master' of http://192.168.100.140:8099/sane/code_app
This commit is contained in:
commit
fbd58b2713
|
@ -1017,8 +1017,7 @@ void MainWindow::on_new_image(void *img, int statu)
|
||||||
QString scanFileName;
|
QString scanFileName;
|
||||||
while (1)
|
while (1)
|
||||||
{
|
{
|
||||||
scanFileName = QString(tr("%1%2%3.%4")).arg(m_aquireIntoSaveParam.m_savePath)
|
scanFileName = m_aquireIntoSaveParam.m_savePath + m_aquireIntoSaveParam.m_fileNamePrefix + QString("%1.%2")
|
||||||
.arg(m_aquireIntoSaveParam.m_fileNamePrefix)
|
|
||||||
.arg(m_aquireIntoSaveParam.m_fileNameStartIndex, m_aquireIntoSaveParam.m_fileNameDigits, 10, QLatin1Char('0'))
|
.arg(m_aquireIntoSaveParam.m_fileNameStartIndex, m_aquireIntoSaveParam.m_fileNameDigits, 10, QLatin1Char('0'))
|
||||||
.arg(m_aquireIntoSaveParam.m_fileNameExt);
|
.arg(m_aquireIntoSaveParam.m_fileNameExt);
|
||||||
QFileInfo fileInfo(scanFileName);
|
QFileInfo fileInfo(scanFileName);
|
||||||
|
@ -1133,8 +1132,7 @@ void MainWindow::on_new_image(void *img, int statu)
|
||||||
QString scanFileName;
|
QString scanFileName;
|
||||||
while (1)
|
while (1)
|
||||||
{
|
{
|
||||||
scanFileName = QString(tr("%1%2%3.%4")).arg(savePath)
|
scanFileName = savePath + m_aquireIntoSaveParam.m_fileNamePrefix + QString("%1.%2")
|
||||||
.arg(m_aquireIntoSaveParam.m_fileNamePrefix)
|
|
||||||
.arg(m_aquireIntoSaveParam.m_fileNameStartIndex, m_aquireIntoSaveParam.m_fileNameDigits, 10, QLatin1Char('0'))
|
.arg(m_aquireIntoSaveParam.m_fileNameStartIndex, m_aquireIntoSaveParam.m_fileNameDigits, 10, QLatin1Char('0'))
|
||||||
.arg(m_aquireIntoSaveParam.m_fileNameExt);
|
.arg(m_aquireIntoSaveParam.m_fileNameExt);
|
||||||
QFileInfo fileInfo(scanFileName);
|
QFileInfo fileInfo(scanFileName);
|
||||||
|
|
Loading…
Reference in New Issue