From 50df55bcaf536a4d3321e7eb2e4d49da2f38f0fa Mon Sep 17 00:00:00 2001
From: bobpan <bob.pan@hzleaper.com>
Date: Mon, 23 Nov 2020 09:31:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dlpbengine=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=E5=9B=A0solution.json=E6=96=87=E4=BB=B6=E5=86=85=E5=AE=B9?=
 =?UTF-8?q?=E4=B8=BA=E7=A9=BA=E5=AF=BC=E8=87=B4=E6=95=B4=E4=B8=AAsolution?=
 =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E5=A4=B1=E8=B4=A5=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/lpCoreCtrl/CoreCtrl.cpp          | 10 +++++-----
 src/lpCoreCtrl/tpImgProc/ImgProc.cpp | 16 ++--------------
 src/lpbengine/Solution.cpp           |  6 +++---
 3 files changed, 10 insertions(+), 22 deletions(-)

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)