添加文件

runner17/config/camera.json

@@ -5,10 +5,10 @@
             "board_num": 0,
             "board_type": 0,
             "exposure": 26000,
-            "folder": ".\\testimg\\",
+            "folder": "E:\\Leaper\\Documents\\wheel\\WF1\\WF\\DH151079",
             "format": "GRAY8",
             "gain": 8,
-            "height": 1944,
+            "height": 1200,
             "id": 2,
             "loop": 1,
             "rely_on_camera": "",
@@ -16,7 +16,7 @@
             "save_img_suffix": ".BMP",
             "showname": "工位2",
             "type": 100,
-            "width": 2592,
+            "width": 1920,
             "zoom": 1
         },
         "MV-CA050-10GC 00C27808759": {

runner17/user/WorkManager.json

@@ -1,77 +1,31 @@
 {
-    "DefectUse": "default",
+    "DefectUse": "test",
     "items": {
-        "default": {
+        "1": {
             "DefectList": [
-                "12345",
-                "2CQ",
-                "460L",
-                "A111",
-                "B7049",
-                "B8067",
-                "C111",
-                "H002",
-                "H003",
-                "H4030",
-                "H5004",
-                "H6002",
-                "H6005",
-                "H6021",
-                "H6054",
-                "H6059",
-                "H6078",
-                "H6085",
-                "H6105",
-                "H6106",
-                "H7003",
-                "H7026",
-                "H7041",
-                "H7100",
-                "H8025",
-                "H8027",
-                "H8051",
-                "H8090",
-                "H9031",
-                "H9082",
-                "H9095",
-                "H9099",
-                "M6075",
-                "M8023",
-                "MQN",
-                "T010",
-                "T0112",
-                "T5009",
-                "T5069",
-                "T6060",
-                "T6079",
-                "T7028",
-                "T7039",
-                "T7056",
-                "T7058",
-                "T7087",
-                "T7103",
-                "T7AA",
-                "T8081",
-                "T8083",
-                "T9071",
-                "T9084",
-                "T9098",
-                "T9AA",
-                "TAPR",
-                "TARA",
-                "TASC",
-                "TY0A",
-                "V111",
-                "X111",
-                "Z1111",
-                "test"
             ],
             "about": "",
-            "key": "default",
+            "key": "1",
+            "use": true
+        },
+        "test": {
+            "DefectList": [
+                "1",
+                "JC151013",
+                "JK131044",
+                "JZ131011",
+                "JZ131261",
+                "PA131204",
+                "DK151079",
+                "DK151050"
+            ],
+            "about": "",
+            "key": "test",
             "use": true
         }
     },
     "lists": [
-        "default"
+        "test",
+        "1"
     ]
 }

src/algorithm/AlgorithmFluorescence.cpp

@@ -296,9 +296,14 @@ int CAlgorithmFluorescence::IImageAnalysis(class IImageObject* pImgObj, TP_ALGOR
 	else{
 		matMatch = matSrc;
 	}
+
+	Result2Ui *pResult = new Result2Ui;
+	pResult->m_pixSrc = QtCVUtils::cvMatToQPixmap(matSrc);//!>原图像发送值UI 用于保存备份和调试
 	if (matMatch.empty())
 	{
 		rltMap.insert("noCircle", 0);
+		long long varRlt = (long long)pResult;
+		rltMap.insert("result", varRlt);
 		pImgObj->IVariantMapToUI(rltMap);
 		return 0;
 	}
@@ -306,7 +311,6 @@ int CAlgorithmFluorescence::IImageAnalysis(class IImageObject* pImgObj, TP_ALGOR
 	//double dDiameter = dD2H * matMatch.rows;
 	double dDiameter = dD2H * lCircle.fRadius * 2;
 
-	Result2Ui *pResult = new Result2Ui;
 	CLocalWheel wheelLocal;
 	wheelLocal.defectList = strModelList;// *getDefectListPtr(pImgObj);
 	wheelLocal.img = matMatch.clone();
@@ -336,7 +340,6 @@ int CAlgorithmFluorescence::IImageAnalysis(class IImageObject* pImgObj, TP_ALGOR
 
 	}
 	qDebug() << "pull result";
-	pResult->m_pixSrc = QtCVUtils::cvMatToQPixmap(matSrc);//!>原图像发送值UI 用于保存备份和调试
 	QImage img = QtCVUtils::cvMatToQImage(matMatch);
 	pResult->m_pixResult = QtCVUtils::cvMatToQPixmap(matMatch);// .scaled(125, 125);
 	pResult->m_dDiameter = dDiameter;

tpvs17/tpMain/lpMainWin.cpp

@@ -532,7 +532,7 @@ void lpMainWin::INewCameraImage(const QString& camKey, QImage img)
 		m_CamSettingDlg->onShowImage(img);
 	}
 }
-
+`
 /*多线程发送算法结果*/
 void lpMainWin::IVariantMapToUI(const QString& camKey, const QVariantMap& vMap)
 {