Merge branch 'master' of http://192.168.10.5:8099/sane/code_production
This commit is contained in:
commit
0f67142d27
|
@ -249,7 +249,8 @@ void Form_mainInterface::on_pbtn_pass_clicked()
|
||||||
QTableWidgetItem *item = ui->tableWidget->item(row, 1);
|
QTableWidgetItem *item = ui->tableWidget->item(row, 1);
|
||||||
QString title = item->text();
|
QString title = item->text();
|
||||||
std::string name = m_map_title_name.value(title).name.toStdString();
|
std::string name = m_map_title_name.value(title).name.toStdString();
|
||||||
ret = HGPdtToolDb_UploadDeviceEntryImage(m_pdtToolDbDevice, name.c_str(), m_mainwnd->m_ftpHost.toStdString().c_str(),
|
HGPdtToolDb_ClearDeviceEntryImage(m_pdtToolDbDevice, name.c_str());
|
||||||
|
HGPdtToolDb_UploadDeviceEntryImage(m_pdtToolDbDevice, name.c_str(), m_mainwnd->m_ftpHost.toStdString().c_str(),
|
||||||
m_mainwnd->m_ftpPort, fileName.toStdString().c_str());
|
m_mainwnd->m_ftpPort, fileName.toStdString().c_str());
|
||||||
QFile file(fileName);
|
QFile file(fileName);
|
||||||
file.remove();
|
file.remove();
|
||||||
|
@ -313,6 +314,8 @@ void Form_mainInterface::initTableWidgetUi()
|
||||||
AnalysisJson::json_node node = list_jsonNode[i];
|
AnalysisJson::json_node node = list_jsonNode[i];
|
||||||
m_map_title_name.insert(node.title, node);
|
m_map_title_name.insert(node.title, node);
|
||||||
|
|
||||||
|
HGPdtToolDb_SetEntryNameCnStr(m_pdtToolDbuserMgr, node.name.toStdString().c_str(), node.title.toStdString().c_str());
|
||||||
|
|
||||||
ui->tableWidget->setItem(i, 0, new QTableWidgetItem(QString::number(i+1)));
|
ui->tableWidget->setItem(i, 0, new QTableWidgetItem(QString::number(i+1)));
|
||||||
ui->tableWidget->item(i, 0)->setTextAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
|
ui->tableWidget->item(i, 0)->setTextAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue