RCiRoot/eUi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

V20251101-2.1.5

Browse Source 
缩放改为鼠标指向。
更新相机模块。
This commit is contained in:
RCiRoot
2025-11-01 14:03:57 +08:00
parent 216cab1f17
commit 7257693800
4 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
subModule/Hd_CameraModule_3DKeyence/Hd_CameraModule_3DKeyence.cpp
+14 -6
View File
@@ -277,8 +277,8 @@ bool Hd_CameraModule_3DKeyence::readData(std::vector<cv::Mat> &mats,QByteArray &
mats.push_back(heightMatS.dequeue());
}
else {
mats.push_back(cv::Mat(G_xImageSize, G_yImageSize, CV_8UC1, cv::Scalar(0)));
mats.push_back(cv::Mat(G_xImageSize, G_yImageSize, CV_8UC1, cv::Scalar(0)));
mats.push_back(cv::Mat(G_xImageSize, G_yImageSize, CV_8UC1, cv::Scalar(0, 0, 0)));
mats.push_back(cv::Mat(G_xImageSize, G_yImageSize, CV_8UC1, cv::Scalar(0, 0, 0)));
}
}
imgTakeNum = 0;
@@ -528,12 +528,12 @@ bool Hd_CameraModule_3DKeyence::run()
while (imgTakeNum != imgTarget)
{
int timeOutCnt = 0;
while (_imageAvailable[deviceId] != 1 && timeOutCnt < 1200)
while (_imageAvailable[deviceId] != 1 && timeOutCnt < 120)
{
timeOutCnt++;
QThread::msleep(10);
}
if (timeOutCnt >= 1200)
if (timeOutCnt >= 120)
{
heightMatS.push_back(cv::Mat(G_yImageSize, G_xImageSize, CV_8UC1, cv::Scalar(0, 0, 0)));
luminanceMatS.push_back(cv::Mat(G_yImageSize, G_xImageSize, CV_8UC1, cv::Scalar(0, 0, 0)));
@@ -580,13 +580,21 @@ bool Hd_CameraModule_3DKeyence::run()
qDebug() << __FUNCTION__ << " line:" << __LINE__ << " Free memory Finished: ";
m_mutex->lock();
cv::Mat luminanceMat(yImageSize, xImageSize, CV_16UC1, luminanceImage);
cv::Mat luminanceMat;
if(_lastImageSizeHeight[deviceId] != 0)
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);
luminanceMatS.enqueue(luminanceMat);
cv::Mat heightImg;
cv::Mat(yImageSize, xImageSize, CV_16UC1, heightImage).copyTo(heightImg);
if (_lastImageSizeHeight[deviceId] != 0)
cv::Mat(_lastImageSizeHeight[deviceId], xImageSize, CV_16UC1, heightImage).copyTo(heightImg);
else
cv::Mat(yImageSize, xImageSize, CV_16UC1, heightImage).copyTo(heightImg);
heightMatS.enqueue(heightImg);
m_mutex->unlock();
qDebug() << __FUNCTION__ << " line:" << __LINE__ << " success to acquire 3d image! camera_name: " << camera_name;