V20251231-2.3.3

增加了rpcFIns的boos改版,在发送数据量较多时表现良好。(测试)
增加了存图时会将路径写入到单独的数据库中。(测试)
 增加了chainWatcher用于监控线程是否异常退出或未启动。(测试)
在赢合预设中进站ng之类的会发送4到结果地址。
TextRendererZH类修改为可暂存需要绘画/打印的内容,并在需要的时候统一打印。
参数修改界面新增能隐藏预览中部分分类的功能。
优化程序结构。
This commit is contained in:
2026-01-01 00:49:11 +08:00
parent 49c3dc92ae
commit 3c5e6487f4
79 changed files with 3583 additions and 4552 deletions
@@ -50,7 +50,7 @@ void myCallbackFunc(LJX8IF_PROFILE_HEADER* pProfileHeaderArray, WORD* pHeightPro
{
qDebug() << __FUNCTION__ << " line:" << __LINE__ << " --> Enter callback function";
qDebug() << __FUNCTION__ << " line:" << __LINE__ << "dwProfileDataCount = " << dwProfileDataCount;
qDebug() << __FUNCTION__ << " line:" << __LINE__ << "dwCount = " << dwCount;
qDebug() << __FUNCTION__ << " line:" << __LINE__ << "dwCount = " << dwCount<< dwUser;
std::cout << "dwCount->" << dwCount <<" dwProfileDataCount"<< dwProfileDataCount << "dwNotify = " << dwNotify<< std::endl;
qDebug() << __FUNCTION__ << " line:" << __LINE__ << "dwNotify = " << dwNotify;
//if (dwCount < 1000)return;
@@ -89,8 +89,8 @@ void myCallbackFunc(LJX8IF_PROFILE_HEADER* pProfileHeaderArray, WORD* pHeightPro
return;
}
qDebug() << __FUNCTION__ << " line:" << __LINE__ << "_heightBuf[dwUser]: " << _heightBuf[dwUser];
qDebug() << __FUNCTION__ << " line:" << __LINE__ << "pHeightProfileArray: " << pHeightProfileArray;
// qDebug() << __FUNCTION__ << " line:" << __LINE__ << "_heightBuf[dwUser]: " << _heightBuf[dwUser];
//qDebug() << __FUNCTION__ << " line:" << __LINE__ << "pHeightProfileArray: " << pHeightProfileArray;
//判断内存是否重叠
if (_heightBuf[dwUser] <= pHeightProfileArray || (unsigned short*)_heightBuf[dwUser] >= (WORD*)pHeightProfileArray + dwProfileDataCount * dwCount * 2)
@@ -554,9 +554,8 @@ bool Hd_CameraModule_3DKeyence::run()
luminanceMat = cv::Mat(_lastImageSizeHeight[deviceId], xImageSize, CV_16UC1, luminanceImage);
else
luminanceMat = cv::Mat(yImageSize, xImageSize, CV_16UC1, luminanceImage);
cv::normalize(luminanceMat, luminanceMat, 0, 255, cv::NORM_MINMAX);
cv::convertScaleAbs(luminanceMat, luminanceMat);
cv::normalize(luminanceMat, luminanceMat, 0, 255, cv::NORM_MINMAX,CV_8U);
luminanceMatS.enqueue(luminanceMat);
cv::Mat heightImg;