diff --git a/src/lpCoreCtrl/CoreCtrl.cpp b/src/lpCoreCtrl/CoreCtrl.cpp index d052fe7..f466103 100644 --- a/src/lpCoreCtrl/CoreCtrl.cpp +++ b/src/lpCoreCtrl/CoreCtrl.cpp @@ -325,8 +325,8 @@ bool CCoreCtrl::onTaskFunc() int span = timespan.elapsed(); if (span > 100) { - qWarning() << "Pop image from poll cost " << span << " MSecs" - << " - " __FUNCTION__; +// qWarning() << "Pop image from poll cost " << span << " MSecs" +// << " - " __FUNCTION__; } if (NULL != pCamImage) @@ -338,9 +338,9 @@ bool CCoreCtrl::onTaskFunc() timespan.restart(); m_objImage.SetCameraImage(pCamImage); m_gpImgProc->IImageProcess(&m_objImage, m_pDE); - qDebug() << "Process Image(ID:" << pCamImage->FrameNumber() - << ") cost " << timespan.elapsed() << " MSecs" - << " - " __FUNCTION__; +// qDebug() << "Process Image(ID:" << pCamImage->FrameNumber() +// << ") cost " << timespan.elapsed() << " MSecs" +// << " - " __FUNCTION__; } //release CameraImage m_objImage.SetCameraImage(NULL); diff --git a/src/lpCoreCtrl/tpImgProc/ImgProc.cpp b/src/lpCoreCtrl/tpImgProc/ImgProc.cpp index 4425f12..0555bff 100644 --- a/src/lpCoreCtrl/tpImgProc/ImgProc.cpp +++ b/src/lpCoreCtrl/tpImgProc/ImgProc.cpp @@ -93,15 +93,10 @@ int CImgProc::IImageProcess(class IImageObject* pImgObj, class IDetectorEngine* m_threadAlgorithms[h].insert(dllSuffix, pApiNode);//存储当前线程用到的类对象 } - //qWarning() << "ImageAnalysis Start: " << QDateTime::currentMSecsSinceEpoch() - // << " Image ID : " << pImgObj->IGetFrameNum() - // << " Thread ID : " << QThread::currentThreadId() - // << endl; - - int nRet = pApiNode->pApi->IImageAnalysis(pImgObj, &algOption, pDE); + int nRet = 0;// pApiNode->pApi->IImageAnalysis(pImgObj, &algOption, pDE); try { - // nRet = pApiNode->pApi->IImageAnalysis(pImgObj, &algOption, pDE); + nRet = pApiNode->pApi->IImageAnalysis(pImgObj, &algOption, pDE); } catch (...) { @@ -113,13 +108,6 @@ int CImgProc::IImageProcess(class IImageObject* pImgObj, class IDetectorEngine* vMap.insert("ui_error", "ERROR: Algorithm Crash!!! Image URL:" + QString(pImgObj->IGetImageUtf8String())); pImgObj->IVariantMapToUI(vMap); } - - //qWarning() << "ImageAnalysis Over: " << QDateTime::currentMSecsSinceEpoch() - // << " Image ID : " << pImgObj->IGetFrameNum() - // << " Thread ID : " << QThread::currentThreadId() - // << endl; - - //pAlgOpt->Save(); return nRet; } diff --git a/src/lpbengine/Solution.cpp b/src/lpbengine/Solution.cpp index c001c9a..b990ff6 100644 --- a/src/lpbengine/Solution.cpp +++ b/src/lpbengine/Solution.cpp @@ -352,12 +352,12 @@ bool CDetectorSolution::LoadFileEx(const QString& strPath) if (!file.open(QFile::ReadOnly)) { - return false; + continue; } byteArray = file.readAll(); if (byteArray.isEmpty()) { - return false; + continue; } if (fileList.at(i).fileName() == "info.json") @@ -390,7 +390,7 @@ bool CDetectorSolution::LoadFileEx(const QString& strPath) qWarning("load task: %s fail", strFile); DeleteTask(pTask->GetID()); pTask = NULL; - return false; + continue; } if (pTask)