|
|
|
@ -7,11 +7,13 @@
|
|
|
|
|
#include <PLCDevice.h>
|
|
|
|
|
#include "exportData.h"
|
|
|
|
|
#include <QMap>
|
|
|
|
|
#include <ftpManager.h>
|
|
|
|
|
|
|
|
|
|
extern AlgJd alg_jd[NumberOfSupportedCameras]; //检测胶点的AI算法
|
|
|
|
|
extern ConfPath g_conf_path;
|
|
|
|
|
extern SysConf g_sys_conf; //系统配置参数
|
|
|
|
|
extern DisplayLabelConf g_display_label_conf[NumberOfSupportedCameras];
|
|
|
|
|
extern FtpManager ftpManager;
|
|
|
|
|
|
|
|
|
|
extern int rotationAngle[NumberOfSupportedCameras]; //图片旋转角度
|
|
|
|
|
extern bool isNeedRotate[NumberOfSupportedCameras];
|
|
|
|
@ -240,7 +242,12 @@ void WorkThread::run()
|
|
|
|
|
now_ts.toString("yyyy-MM-dd_HH-mm-ss_zzz_") + QString::number(local_camera_number + 1) +
|
|
|
|
|
"#" + "_" + QString::number(index + 1) + "_" + ng_reason_maps[ngReason] +
|
|
|
|
|
".jpg";
|
|
|
|
|
QString remotePath = "/image/ng/" +
|
|
|
|
|
now_ts.toString("yyyy-MM-dd_HH-mm-ss_zzz_") + QString::number(local_camera_number + 1) +
|
|
|
|
|
"#" + "_" + QString::number(index + 1) + "_" + ng_reason_maps[ngReason] +
|
|
|
|
|
".jpg";
|
|
|
|
|
g_save_queue->put(std::make_pair(file_name.toLocal8Bit().constData(), m));
|
|
|
|
|
ftpManager.uploadSingleFile(file_name, remotePath);
|
|
|
|
|
|
|
|
|
|
m = vec_out[index].clone();
|
|
|
|
|
file_name = g_conf_path.save_pics_path + "/ng_result/" +
|
|
|
|
@ -248,9 +255,14 @@ void WorkThread::run()
|
|
|
|
|
+ QString::number(local_camera_number + 1) + "/" + QString::number(index + 1) + "/" +
|
|
|
|
|
now_ts.toString("yyyy-MM-dd_HH-mm-ss_zzz_") + QString::number(local_camera_number + 1) +
|
|
|
|
|
"#" + "_" + QString::number(index + 1) + "_" + ng_reason_maps[ngReason] +
|
|
|
|
|
".bmp";;
|
|
|
|
|
".bmp";
|
|
|
|
|
remotePath = "/image/ng_result/" +
|
|
|
|
|
now_ts.toString("yyyy-MM-dd_HH-mm-ss_zzz_") + QString::number(local_camera_number + 1) +
|
|
|
|
|
"#" + "_" + QString::number(index + 1) + "_" + ng_reason_maps[ngReason] +
|
|
|
|
|
".jpg";
|
|
|
|
|
//g_save_queue->put(std::make_pair(file_name.toStdString(), m));
|
|
|
|
|
g_save_queue->put(std::make_pair(file_name.toLocal8Bit().constData(), m));
|
|
|
|
|
ftpManager.uploadSingleFile(file_name, remotePath);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|