Merge branch 'master' of http://192.168.10.5:8099/sane/code_production
This commit is contained in:
commit
061b52a06a
Binary file not shown.
|
@ -874,7 +874,7 @@
|
|||
<location filename="form_maininterface.cpp" line="208"/>
|
||||
<location filename="form_maininterface.cpp" line="490"/>
|
||||
<source>image pixel: </source>
|
||||
<translation>标准圆宽高: </translation>
|
||||
<translation>标准圆:宽 * 高: </translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="form_maininterface.cpp" line="519"/>
|
||||
|
|
|
@ -576,12 +576,12 @@ void Form_mainInterface::on_tableWidget_currentItemChanged(QTableWidgetItem *cur
|
|||
// ui->pbtn_showImg->setVisible(true);
|
||||
}
|
||||
|
||||
m_multiIndex = -1;
|
||||
m_curNameIndex = 1;
|
||||
m_list_images.clear();
|
||||
QDir dir(getCachePath());
|
||||
if (dir.exists())
|
||||
dir.removeRecursively();
|
||||
// m_multiIndex = -1;
|
||||
// m_curNameIndex = 1;
|
||||
// m_list_images.clear();
|
||||
// QDir dir(getCachePath());
|
||||
// if (dir.exists())
|
||||
// dir.removeRecursively();
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -590,7 +590,13 @@ void Form_mainInterface::on_pbtn_start_clicked()
|
|||
m_multiIndex = -1;
|
||||
m_curNameIndex = 1;
|
||||
m_list_images.clear();
|
||||
QDir dir(getCachePath());
|
||||
|
||||
QString cachePath = getCachePath();
|
||||
cachePath.append(m_serialNum);
|
||||
cachePath.append("/");
|
||||
cachePath.append(m_curItemName);
|
||||
cachePath.append("/");
|
||||
QDir dir(getStdString(getStdFileName(cachePath)).c_str());
|
||||
if (dir.exists())
|
||||
dir.removeRecursively();
|
||||
|
||||
|
|
Loading…
Reference in New Issue