修复lpbengine模块因solution.json文件内容为空导致整个solution加载失败的问题

master
bobpan 5 years ago
parent 04997ee7f6
commit 50df55bcaf

@ -325,8 +325,8 @@ bool CCoreCtrl::onTaskFunc()
int span = timespan.elapsed(); int span = timespan.elapsed();
if (span > 100) if (span > 100)
{ {
qWarning() << "Pop image from poll cost " << span << " MSecs" // qWarning() << "Pop image from poll cost " << span << " MSecs"
<< " - " __FUNCTION__; // << " - " __FUNCTION__;
} }
if (NULL != pCamImage) if (NULL != pCamImage)
@ -338,9 +338,9 @@ bool CCoreCtrl::onTaskFunc()
timespan.restart(); timespan.restart();
m_objImage.SetCameraImage(pCamImage); m_objImage.SetCameraImage(pCamImage);
m_gpImgProc->IImageProcess(&m_objImage, m_pDE); m_gpImgProc->IImageProcess(&m_objImage, m_pDE);
qDebug() << "Process Image(ID:" << pCamImage->FrameNumber() // qDebug() << "Process Image(ID:" << pCamImage->FrameNumber()
<< ") cost " << timespan.elapsed() << " MSecs" // << ") cost " << timespan.elapsed() << " MSecs"
<< " - " __FUNCTION__; // << " - " __FUNCTION__;
} }
//release CameraImage //release CameraImage
m_objImage.SetCameraImage(NULL); m_objImage.SetCameraImage(NULL);

@ -93,15 +93,10 @@ int CImgProc::IImageProcess(class IImageObject* pImgObj, class IDetectorEngine*
m_threadAlgorithms[h].insert(dllSuffix, pApiNode);//存储当前线程用到的类对象 m_threadAlgorithms[h].insert(dllSuffix, pApiNode);//存储当前线程用到的类对象
} }
//qWarning() << "ImageAnalysis Start: " << QDateTime::currentMSecsSinceEpoch() int nRet = 0;// pApiNode->pApi->IImageAnalysis(pImgObj, &algOption, pDE);
// << " Image ID : " << pImgObj->IGetFrameNum()
// << " Thread ID : " << QThread::currentThreadId()
// << endl;
int nRet = pApiNode->pApi->IImageAnalysis(pImgObj, &algOption, pDE);
try try
{ {
// nRet = pApiNode->pApi->IImageAnalysis(pImgObj, &algOption, pDE); nRet = pApiNode->pApi->IImageAnalysis(pImgObj, &algOption, pDE);
} }
catch (...) 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())); vMap.insert("ui_error", "ERROR: Algorithm Crash!!! Image URL:" + QString(pImgObj->IGetImageUtf8String()));
pImgObj->IVariantMapToUI(vMap); pImgObj->IVariantMapToUI(vMap);
} }
//qWarning() << "ImageAnalysis Over: " << QDateTime::currentMSecsSinceEpoch()
// << " Image ID : " << pImgObj->IGetFrameNum()
// << " Thread ID : " << QThread::currentThreadId()
// << endl;
//pAlgOpt->Save();
return nRet; return nRet;
} }

@ -352,12 +352,12 @@ bool CDetectorSolution::LoadFileEx(const QString& strPath)
if (!file.open(QFile::ReadOnly)) if (!file.open(QFile::ReadOnly))
{ {
return false; continue;
} }
byteArray = file.readAll(); byteArray = file.readAll();
if (byteArray.isEmpty()) if (byteArray.isEmpty())
{ {
return false; continue;
} }
if (fileList.at(i).fileName() == "info.json") if (fileList.at(i).fileName() == "info.json")
@ -390,7 +390,7 @@ bool CDetectorSolution::LoadFileEx(const QString& strPath)
qWarning("load task: %s fail", strFile); qWarning("load task: %s fail", strFile);
DeleteTask(pTask->GetID()); DeleteTask(pTask->GetID());
pTask = NULL; pTask = NULL;
return false; continue;
} }
if (pTask) if (pTask)

Loading…
Cancel
Save