diff --git a/src/SmokeBoxIdentification.cpp b/src/SmokeBoxIdentification.cpp index 21291cf..557257f 100644 --- a/src/SmokeBoxIdentification.cpp +++ b/src/SmokeBoxIdentification.cpp @@ -535,8 +535,12 @@ void SmokeBoxIdentification::calculate(int stocketID) QFileInfoList fileList = dir.entryInfoList(QStringList() << "*.pcd", QDir::Files | QDir::NoDotAndDotDot); if (fileList.length() > 0) { + //盘点时候的点云地址pclPath pclPath = fileList[0].absolutePath(); - m_pHeightCalculate->LoadPointCould(fileList[0].absolutePath()); + + //入库时的点云地址:.\\storeData\\巷道号\\层高\\列数\\*.pcd + // FILE_INPUTSTORE_PATH \\ m_stocketList[stocketID].streetName\\m_stocketList[stocketID].Floor\\m_stocketList[stocketID].row\\ *.pcd; + str = QString("[%1]:3DCamera %2 -- PointCould = %3").arg(stocket.id) .arg(imgInfo.cameraSn).arg(pclPath); qInfo() << str; @@ -555,27 +559,15 @@ void SmokeBoxIdentification::calculate(int stocketID) qWarning() << str; } - QString basicFile = QString("\\config\\%1.ini").arg(fileInfo.strId); - if (!QFile(basicFile).exists()) - { - str = QString("[%1]:3DCamera %2 -- BasicFile[%3] can't Find!").arg(stocket.id) - .arg(imgInfo.cameraSn).arg(basicFile); - qWarning() << str; - } - m_pHeightCalculate->LoadBasicFile(QString{}); + //数量计算 m_stocketList[stocketID].smokeQuantityRlt = m_stocketList[stocketID].smokeQuantity; - //QFile::copy("C:\\Users\\LENOVO\\Downloads\\30t.pcd",pclPath); - //QFile::rename(".\\Cache\\1.pcd", pclPath); } else { - //CameraControl* cameraCon = CameraControl::instance(); - //m_stocketList[stocketID].pcdSrc = pclPath.replace(".", "").append("\\").append(QString::number((cameraCon->getDeviceId(imgInfo.cameraSn)))).append(".pcd"); - //qDebug() << "pcdSrc:" << m_stocketList[stocketID].pcdSrc; QString str = QString("[%1]:Pre 2D Camera don't Match. Now Camera %2.").arg(stocket.id).arg(imgInfo.cameraSn); qDebug() << str; }