V20260829-2.6.1
完成框架目录和模块重构;新增核心、单例、工具、加密及框架 SDK;统一任务、相机和 RPC 接口,并增加离线检测、相机标定、备份恢复、版本管理、崩溃守护和心跳监控功能。
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
#include "Hd_25DCameraVJ_module.h"
|
||||
#include "Hd_25DCameraVJ_module.h"
|
||||
#include <QDebug>
|
||||
|
||||
#include "KglDevice.h"
|
||||
@@ -279,7 +279,7 @@ void getStringValue(const std::string sFeatureName, std::string& value)
|
||||
}
|
||||
#pragma endregion
|
||||
|
||||
#pragma region Import XML
|
||||
#pragma region Import XML
|
||||
void ImportDeviceParameters(std::string sFilePath)
|
||||
{
|
||||
setEnumValue("OperationMode", "SetupMode");
|
||||
@@ -802,7 +802,7 @@ bool AcquisitionStartEx_SingleFrame(bool bMultiCaptureUpdateImage, std::string s
|
||||
//}
|
||||
|
||||
//SaveBMP(bmp);
|
||||
|
||||
|
||||
}
|
||||
|
||||
#pragma endregion
|
||||
@@ -828,14 +828,14 @@ void MyThread::run()
|
||||
}
|
||||
else
|
||||
matVecs.clear();
|
||||
|
||||
|
||||
//QThread::msleep(5);
|
||||
}
|
||||
}
|
||||
|
||||
Hd_25DCameraVJ_module* create()
|
||||
{
|
||||
qDebug() << "[info]" << __FUNCTION__ << "line:" << __LINE__ << "Hd_MvCamera_module create success!";
|
||||
qDebug() << __FUNCTION__ << "line:" << __LINE__ << "Hd_MvCamera_module create success!";
|
||||
return new Hd_25DCameraVJ_module;
|
||||
}
|
||||
|
||||
@@ -846,7 +846,7 @@ void destory(Hd_25DCameraVJ_module* ptr)
|
||||
delete ptr;
|
||||
ptr = nullptr;
|
||||
}
|
||||
qDebug() << "[info] " << __FUNCTION__ << " line:" << __LINE__ << "Hd_MvCamera_module destory success!";
|
||||
qDebug() << __FUNCTION__ << " line:" << __LINE__ << "Hd_MvCamera_module destory success!";
|
||||
}
|
||||
|
||||
Hd_25DCameraVJ_module::Hd_25DCameraVJ_module()
|
||||
@@ -875,7 +875,7 @@ Hd_25DCameraVJ_module::~Hd_25DCameraVJ_module()
|
||||
n_mutex = nullptr;
|
||||
}
|
||||
|
||||
qDebug() << "[info]" << __FUNCTION__ << "line:" << __LINE__ << " delete success!";
|
||||
qDebug() << __FUNCTION__ << "line:" << __LINE__ << " delete success!";
|
||||
}
|
||||
|
||||
bool Hd_25DCameraVJ_module::readData(std::vector<cv::Mat>&mat , QByteArray& data)
|
||||
@@ -914,7 +914,7 @@ bool Hd_25DCameraVJ_module::initParas(QByteArray& initData)
|
||||
#if 1
|
||||
QByteArrayList valueList = initData.split('#');
|
||||
if (valueList.size() < 3) {
|
||||
qDebug() << "[Error] Hd_25DCameraVJ_module initParas fail--params error!参数数量不满足";
|
||||
qDebug() << "Hd_25DCameraVJ_module initParas fail--params error!参数数量不满足";
|
||||
lastError = "参数数量不满足";
|
||||
return false;
|
||||
}
|
||||
@@ -957,7 +957,7 @@ bool Hd_25DCameraVJ_module::initParas(QByteArray& initData)
|
||||
std::vector<cv::Mat> matVecs;
|
||||
workThread->start();
|
||||
//workThread->run();
|
||||
|
||||
|
||||
//KglResult res = kgllFeatureNodes->executeCommand("TriggerSoftware");
|
||||
#endif
|
||||
return true;
|
||||
@@ -1006,8 +1006,8 @@ bool Hd_25DCameraVJ_module::run()//软触发
|
||||
}
|
||||
catch (QString ev)
|
||||
{
|
||||
qDebug() << "[info] FUNCTION:" << __FUNCTION__ << " line:" << __LINE__ << " ev:" << ev;
|
||||
qDebug() << "FUNCTION:" << __FUNCTION__ << " line:" << __LINE__ << " ev:" << ev;
|
||||
}
|
||||
//qDebug() << "[info]"<< __FUNCTION__ << " line:" << __LINE__ << " run end" ;
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user