bug fixed

include/sxGlobal.h

@@ -124,6 +124,7 @@ public:
             _serviceManager->_triggerManager->registerPlcValueViewer(viewerNameIN + "_" + QString::number(i),
                 { {"触发",address[i].triggerAddr },
                 {"反馈",address[i].completeAddr.toInt()},
+                {"结果",address[i].resultAddr.toInt()},
                 {"数值1",address[i].valueOffsetAddr},
                 {"数值2",address[i].valueOffsetAddr + 2},
                 {"数值3",address[i].valueOffsetAddr + 4} });

include/yhGlobal.h

@@ -91,7 +91,7 @@ static bool generalAlgoTest(std::shared_ptr <detData> data, detParams* _detParam
         return true;
     }
     CATCH_EXCEPTIONS
-    data->service->_triggerManager->writeShort("D" + address.resultAddr + "_2");//发送异常结果
+    data->service->_triggerManager->writeShort("D" + address.resultAddr + "_1");//发送异常结果
     return false;
 }
 template <typename paramTemplte>
@@ -100,7 +100,7 @@ template <typename paramTemplte>
 //例触发地址有4个，输入信号为 1 0 0 1 则触发1和4的地址拍照检测，2和3拍照取图并废弃
 class _581_Union_triggerTemplate {
 public:
-    paramTemplte _detParams;
+    paramTemplte* _detParams;
     detCallbackChain<paramTemplte, yh_581_address>* generalDet;
     std::string cameraName;
     QString viewerName;
@@ -119,7 +119,7 @@ public:
     /// <param name="_processAlgoCallback">算法函数</param>
     /// <param name="resultHandlerIn"></param>
     void init(std::string cameraNameIn, QString viewerNameIN, int startAddr, int triggerCount,int oneTriggerCaptrueTimes,
-        paramTemplte& detParamsIn, ServiceManager* _serviceManagerIn, qtFuncBridge* bridgeIn,
+        paramTemplte* detParamsIn, ServiceManager* _serviceManagerIn, qtFuncBridge* bridgeIn,
         typename detCallbackChain<paramTemplte, yh_581_address>::processAlgoCallback _processAlgoCallback,
         QString saveObjectNameIN = "") {
         viewerName = viewerNameIN;
@@ -129,7 +129,7 @@ public:
         bridge = bridgeIn;
 
         saveObjectName = saveObjectNameIN;
-        generalDet = new detCallbackChain<paramTemplte, yh_581_address>(_serviceManager, &_detParams, bridge);
+        generalDet = new detCallbackChain<paramTemplte, yh_581_address>(_serviceManager, _detParams, bridge);
         generalDet->registerProcessAlgoCallback(_processAlgoCallback);
         address = generateYh581AddressMap(startAddr, triggerCount);
 		//联合触发器条件
@@ -151,6 +151,15 @@ public:
                     cnt++;
                 }
             }, "");
+        for (int i = 0; i < address.size(); i++) {
+            _serviceManager->_triggerManager->registerPlcValueViewer(viewerNameIN + "_" + QString::number(i),
+                { {"触发",address[i].triggerAddr },
+                {"反馈",address[i].completeAddr.toInt()},
+                {"结果",address[i].resultAddr.toInt()},
+                {"数值1",address[i].valueOffsetAddr},
+                {"数值2",address[i].valueOffsetAddr + 2},
+                {"数值3",address[i].valueOffsetAddr + 4} });
+        }
     }
     //获取图片并进行检测
     void evaluate(int batteryOffset, QByteArray& byteArray) {
@@ -183,7 +192,7 @@ template <typename paramTemplte2>
 //例触发地址有4个，输入信号为 1 0 0 1 则按顺序触发1和4的地址拍照检测，2和3不做处理
 class _581_Single_triggerTemplate {
 public:
-    paramTemplte2 _detParams;
+    paramTemplte2* _detParams;
     detCallbackChain<paramTemplte2, yh_581_address>* generalDet;
     std::string cameraName;
     QString viewerName;
@@ -202,7 +211,7 @@ public:
     /// <param name="_processAlgoCallback">算法函数</param>
     /// <param name="resultHandlerIn"></param>
     void init(std::string cameraNameIn, QString viewerNameIN, int startAddr, int triggerCount, int oneTriggerCaptrueTimes,
-        paramTemplte2& detParamsIn, ServiceManager* _serviceManagerIn, qtFuncBridge* bridgeIn,
+        paramTemplte2* detParamsIn, ServiceManager* _serviceManagerIn, qtFuncBridge* bridgeIn,
         typename detCallbackChain<paramTemplte2, yh_581_address>::processAlgoCallback _processAlgoCallback,
         QString saveObjectNameIN = "") {
         viewerName = viewerNameIN;
@@ -212,7 +221,7 @@ public:
         bridge = bridgeIn;
 
         saveObjectName = saveObjectNameIN;
-        generalDet = new detCallbackChain<paramTemplte2, yh_581_address>(_serviceManager, &_detParams, bridge);
+        generalDet = new detCallbackChain<paramTemplte2, yh_581_address>(_serviceManager, _detParams, bridge);
         generalDet->registerProcessAlgoCallback(_processAlgoCallback);
         address = generateYh581AddressMap(startAddr, triggerCount);
         //单次触发器条件
@@ -224,6 +233,15 @@ public:
             _serviceManager->_triggerManager->registerCallback(address[i].triggerAddr, 0, [this, i](int triggerPos, int triggerValue, QByteArray& byteArray) {
                 _serviceManager->_triggerManager->writeShort("D" + address[0].completeAddr + "_0"); }, "D" + address[0].completeAddr.toStdString() + "清零");
         }
+        for (int i = 0; i < address.size(); i++) {
+            _serviceManager->_triggerManager->registerPlcValueViewer(viewerNameIN + "_" + QString::number(i),
+                { {"触发",address[i].triggerAddr },
+                {"反馈",address[i].completeAddr.toInt()},
+                {"结果",address[i].resultAddr.toInt()},
+                {"数值1",address[i].valueOffsetAddr},
+                {"数值2",address[i].valueOffsetAddr + 2},
+                {"数值3",address[i].valueOffsetAddr + 4} });
+        }
         
     }
     //获取图片并进行检测

src/launcher/GUI/front/pages/displayPageWidget.h

@@ -74,7 +74,7 @@ public:
 	// 通用的创建工具按钮函数实现
 	bool createToolButton(const QString& iconPath, const QString& text,
 		std::function<void()> clickHandler,
-		const QSize& buttonSize = QSize(100, 60), const QSize& iconSize = QSize(30, 30)){
+		const QSize& buttonSize = QSize(100, 60), const QSize& iconSize = QSize(32, 32)){
 		
 		// 参数验证
 		if (iconPath.isEmpty() || text.isEmpty() || !clickHandler) {
@@ -145,7 +145,7 @@ public:
 	}
 	bool createToolButton(QIcon icon, const QString& text,
 		std::function<void()> clickHandler,
-		const QSize& buttonSize = QSize(100, 60), const QSize& iconSize = QSize(30, 30)) {
+		const QSize& buttonSize = QSize(100, 60), const QSize& iconSize = QSize(32, 32)) {
 
 		// 参数验证
 		if (text.isEmpty() || !clickHandler) {
@@ -408,10 +408,10 @@ public:
 				[=]() {
 					config->Authorization.executeWithPermission(Auth::UserLevel::ADMIN,[this]() {
 						JsonParamTableEditor* dlg = new JsonParamTableEditor(this);
-						dlg->setJsonObject(m_config->settingJson["backend"]["algorithmSettings"]);
+						dlg->setJsonObject(m_config->missionJson["backend"]["missionSettings"]);
 						dlg->setAttribute(Qt::WA_DeleteOnClose);
 						connect(dlg, &JsonParamTableEditor::jsonAccepted, [this](const nlohmann::json& result) {
-							m_config->settingJson["backend"]["algorithmSettings"] = result;
+							m_config->missionJson["backend"]["missionSettings"] = result;
 							});
 						dlg->show();
 						});
@@ -436,7 +436,7 @@ public:
 			for (auto& lnkPath : files) {
 				std::string fileName = fileManager::getFileName(lnkPath);
 				auto exePath = getShortcutTarget(QString::fromLocal8Bit(lnkPath.c_str()));
-				auto icon = getFileIcon(exePath, QSize(30, 30));
+				auto icon = getFileIcon(exePath, QSize(32, 32));
 				_toolBarWidget->createToolButton(icon, QString::fromLocal8Bit(fileName.c_str()), [exePath]() {
 					QProcess::startDetached(exePath);
 					});

src/launcher/appConfig/appConfig.cpp

@@ -5,21 +5,21 @@ namespace fs = std::filesystem;
 void appConfig::parsingSettingJson()
 {
 	fs::path appWorkPath = fs::current_path();
-	originJson = readJsonFromPath(appWorkPath.string() + "/config/setting.json");
-	jsonVersion = originJson["jsonVersion"];
+	settingJson = readJsonFromPath(appWorkPath.string() + "/config/setting.json");
+	jsonVersion = settingJson["jsonVersion"];
 	if(jsonVersion != euiJsonVersion){
 		std::cout << "Json version mismatch, please update the config file." << std::endl;
 		std::cout << "Json版本不匹配，请检查json配置文件" << std::endl;
 		exit(1);
 	}
-	objectSelect = originJson["objectSelect"];
-	loginPassWord = originJson["loginPassWord"];
+	objectSelect = settingJson["objectSelect"];
+	loginPassWord = settingJson["loginPassWord"];
 	
-	settingJson = readOrderedJsonFromPath(appWorkPath.string() + "/config/" + objectSelect +".json");
-	softwareTile = settingJson["softwareTile"];
-	imgSavePath = settingJson["backend"]["imgSaveBasePath"];
+	missionJson = readOrderedJsonFromPath(appWorkPath.string() + "/config/" + objectSelect +".json");
+	softwareTile = missionJson["softwareTile"];
+	imgSavePath = missionJson["backend"]["imgSaveBasePath"];
 	//viewer
-	auto viewerData = settingJson["ImageView"];	
+	auto viewerData = missionJson["ImageView"];
 	for (auto data = viewerData.begin(); data != viewerData.end(); data++)
 	{
 		viewerStruct v;
@@ -29,6 +29,7 @@ void appConfig::parsingSettingJson()
 		v.viewers.assign(data.value()["viewer"].begin(), data.value()["viewer"].end());
 		viewDatas.push_back(v);
 	}
-	settingJsonPath = appWorkPath.string() + "/config/" + objectSelect + ".json";
+	missionJsonPath = appWorkPath.string() + "/config/" + objectSelect + ".json";
 
+	//if(missionJson["backend"]["missionSettings"].at)
 }

src/launcher/appConfig/appConfig.h

@@ -31,14 +31,14 @@ public:
 		}
 	}
 	void saveSettingJson() {
-		saveJsonFromPath("./config/setting.json", originJson);
-		saveOrderedJsonFromPath("./config/"+ objectSelect +".json", settingJson);
+		saveJsonFromPath("./config/setting.json", settingJson);
+		saveOrderedJsonFromPath("./config/"+ objectSelect +".json", missionJson);
 		auto trans = &Translation::getInstance();
 		trans->saveToFile("./config/translation.json");
 	}
 
-	std::string settingJsonPath;
-	nlohmann::ordered_json settingJson;
+	std::string missionJsonPath;
+	nlohmann::ordered_json missionJson;
 	std::string imgSavePath;//原图存储路径
 	HWND consoleHandle;
 	SQLiteDB* dataBase = nullptr;
@@ -47,7 +47,7 @@ public:
 
 	Auth::UserManager Authorization;
 private:
-	nlohmann::json originJson;
+	nlohmann::json settingJson;
 	std::string jsonVersion;
 	std::string objectSelect;
 	std::string loginPassWord;

src/launcher/main.cpp

@@ -217,12 +217,12 @@ int main(int argc, char* argv[])
 	_core.initDatabase(); // 初始化数据库
     QCoreApplication::addLibraryPath(QCoreApplication::applicationDirPath() + "/sqldrivers");
     QCoreApplication::addLibraryPath(QCoreApplication::applicationDirPath());
-    MainWindow w(&config,&bridge, config.settingJson);
+    MainWindow w(&config,&bridge, config.missionJson);
     connectSignalAndSlot(&_core, &w, &bridge); // 连接信号和槽
     w.show();
     QThread::msleep(100);
      // 创建后端对象
-    _core._backEnd.loadCore(config.dataBase,&bridge, config.settingJson["backend"]); // 加载核心功能
+    _core._backEnd.loadCore(config.dataBase,&bridge, config.missionJson["backend"]); // 加载核心功能
 #if HIDE_CONSOLE
     if (config.consoleHandle) {
         ShowWindow(config.consoleHandle, SW_HIDE);

src/mission/581-BaoMo-Cam1213/581-BaoMo.h

@@ -26,8 +26,8 @@ public:
         //    ([=](yh_581_address address, _581_Result resultData, std::shared_ptr <detData> data) {
         //    _serviceManager->_triggerManager->writeShort("D" + address.resultAddr + "_1");//发送结果
         //        });
-        _station_1.init("Camera1","包膜后底托位置度检测相机12",20200,2,1, _params,_serviceManager,bridge, generalAlgoTest);
-        _station_2.init("Camera2", "包膜后底托位置度检测相机13",20400,2,1,_params, _serviceManager, bridge, generalAlgoTest);
+        _station_1.init("Camera1","包膜后底托位置度检测相机12",20200,2,1, &_params,_serviceManager,bridge, generalAlgoTest);
+        _station_2.init("Camera2", "包膜后底托位置度检测相机13",20400,2,1,&_params, _serviceManager, bridge, generalAlgoTest);
 #pragma endregion
         return true;
     }

src/mission/581-BaoMo-Cam1234/581-BaoMo.h

@@ -244,11 +244,11 @@ public:
     }
     bool initCustom() {
 #pragma region 注册触发器回调
-        _station_1.init("Camera1","包膜前外观检测大面相机1（上大面）", 18000,2, 1, _baoMoHouDaMianDetParams,_serviceManager, bridge, ALGO_BaoMoHouDaMian);
-        _station_2.init("Camera2", "包膜前外观检测大面相机2（下大面）", 18200,2, 1, _baoMoHouDaMianDetParams, _serviceManager,bridge, ALGO_BaoMoHouDaMian);
+        _station_1.init("Camera1","包膜前外观检测大面相机1（上大面）", 18000,2, 1, &_baoMoHouDaMianDetParams,_serviceManager, bridge, ALGO_BaoMoHouDaMian);
+        _station_2.init("Camera2", "包膜前外观检测大面相机2（下大面）", 18200,2, 1, &_baoMoHouDaMianDetParams, _serviceManager,bridge, ALGO_BaoMoHouDaMian);
 
-        _station_3.init("Camera3", "包膜前产品边缘检测大面相机3（下大面2）", 18400,2, 2, _detParams,_serviceManager,bridge, generalAlgoTest);
-        _station_4.init("Camera4", "包膜前前产品边缘检测大面相机4（下大面2）", 18600 ,2, 2, _detParams, _serviceManager, bridge, generalAlgoTest);
+        _station_3.init("Camera3", "包膜前产品边缘检测大面相机3（下大面2）", 18400,2, 2, &_detParams,_serviceManager,bridge, generalAlgoTest);
+        _station_4.init("Camera4", "包膜前前产品边缘检测大面相机4（下大面2）", 18600 ,2, 2, &_detParams, _serviceManager, bridge, generalAlgoTest);
 #pragma endregion
         return true;
     }

src/mission/581-BaoMo-Cam5678/581-BaoMo.h

@@ -131,7 +131,7 @@ static bool BaoMoHou_ShangDaMian(std::shared_ptr <detData> data, baoMoHouDaMianD
     }
 
     data->resultImgs.push_back(Paint);
-    data->service->_missionResultHandle->handleAllResult(data->SNcode, !defects.size() > 0, defects);
+    data->service->_missionResultHandle->handleAllResult(data->SNcode, defects.size() == 0, defects);
     data->service->_triggerManager->writeFloat("D" + address.resultAddr + "_1");//发送OK
     return true;
 }
@@ -331,16 +331,16 @@ public:
         //    _serviceManager->_triggerManager->writeShort("D" + address.resultAddr + "_1");//发送结果
         //    _serviceManager->_missionResultHandle->handleAllResult(data->SNcode, resultData.result, resultData.defects);
         //        });
-        _station_1.init("Camera1", "包膜后大面外观检测相机5（上大面1）",18800,2,1, _baoMoHouDaMianDetParams, _serviceManager,bridge, BaoMoHou_ShangDaMian);
-        _station_3.init("Camera3", "包膜后大面外观检测相机7（上大面2）", 19200, 2, 1, _baoMoHouDaMianDetParams, _serviceManager, bridge, BaoMoHou_ShangDaMian);
+        _station_1.init("Camera1", "包膜后大面外观检测相机5（上大面1）",18800,2,1, &_baoMoHouDaMianDetParams, _serviceManager,bridge, BaoMoHou_ShangDaMian);
+        _station_3.init("Camera3", "包膜后大面外观检测相机7（上大面2）", 19200, 2, 1, &_baoMoHouDaMianDetParams, _serviceManager, bridge, BaoMoHou_ShangDaMian);
 
         //baoMoHouXiaDaMianTrigger::resultHandleCallback resultCallback_BaoMoHouXiaDaMian =
         //    ([=](yh_581_address address, _581_BaoMoResult resultData, std::shared_ptr <detData> data) {
         //    _serviceManager->_triggerManager->writeShort("D" + address.resultAddr + "_1");//发送结果
         //    _serviceManager->_missionResultHandle->handleAllResult(data->SNcode, resultData.result, resultData.defects);
         //        });
-        _station_2.init("Camera2", "包膜后大面外观检测相机6（下大面四角1）", 19000, 2, 1, _baoMoHouDaMianDetParams, _serviceManager, bridge, BaoMoHou_XiaDaMian);
-        _station_4.init("Camera4", "包膜后大面外观检测相机8（下大面四角2）",19400,2,1, _baoMoHouDaMianDetParams, _serviceManager, bridge, BaoMoHou_XiaDaMian);
+        _station_2.init("Camera2", "包膜后大面外观检测相机6（下大面四角1）", 19000, 2, 1, &_baoMoHouDaMianDetParams, _serviceManager, bridge, BaoMoHou_XiaDaMian);
+        _station_4.init("Camera4", "包膜后大面外观检测相机8（下大面四角2）",19400,2,1, &_baoMoHouDaMianDetParams, _serviceManager, bridge, BaoMoHou_XiaDaMian);
 #pragma endregion
         return true;
     }

src/mission/581-BaoMo-Cam91011/581-BaoMo.h

@@ -42,14 +42,14 @@ public:
         //    ([=](yh_581_address address, _581_BaoMoResult, std::shared_ptr <detData>) {
         //    _serviceManager->_triggerManager->writeShort("D" + address.resultAddr + "_1");//发送结果
         //        });
-        _station_1.init("Camera1","包膜后侧面贴胶错位检测相机9",19600,2,1,_baoMoHouDaMianDetParams,_serviceManager, bridge, ALGO_BaoMoHouCeMian);
-        _station_2.init("Camera2", "包膜后侧面贴胶错位检测相机10",19800,2,1, _baoMoHouDaMianDetParams, _serviceManager, bridge, ALGO_BaoMoHouCeMian);
+        _station_1.init("Camera1","包膜后侧面贴胶错位检测相机9",19600,2,1,&_baoMoHouDaMianDetParams,_serviceManager, bridge, ALGO_BaoMoHouCeMian);
+        _station_2.init("Camera2", "包膜后侧面贴胶错位检测相机10",19800,2,1, &_baoMoHouDaMianDetParams, _serviceManager, bridge, ALGO_BaoMoHouCeMian);
 
         //generalTrigger::resultHandleCallback resultCallback_general =
         //    ([=](yh_581_address address, _581_Result, std::shared_ptr <detData>) {
         //    _serviceManager->_triggerManager->writeShort("D" + address.resultAddr + "_1");//发送结果
         //        });
-        _station_3.init("Camera3", "包膜后外观检测大面相机11(下大面)",20000,2,1, _detParams, _serviceManager, bridge, generalAlgoTest);
+        _station_3.init("Camera3", "包膜后外观检测大面相机11(下大面)",20000,2,1, &_detParams, _serviceManager, bridge, generalAlgoTest);
 #pragma endregion
         return true;
     }

src/mission/581-Dgh-CB-1/581-Dgh-CB-1.h

@@ -37,19 +37,15 @@ public:
     }
     bool initCustom() {
 #pragma region 注册触发器回调
-        //generalTrigger::resultHandleCallback resultCallback_general =
-        //    ([=](yh_581_address address, _581_Result, std::shared_ptr <detData>) {
-        //    _serviceManager->_triggerManager->writeShort("D" + address.resultAddr + "_1");//发送结果
-        //        });
-        dgh_cb_yh_3d_1.init("Camera1", "长边预焊前3D-1", 18000,2,1, _params, _serviceManager, bridge, generalAlgoTest);
-        dgh_cb_yh_3d_2.init("Camera2", "长边预焊前3D-2", 18200,2,1, _params, _serviceManager, bridge, generalAlgoTest);
-        dgh_cb_yh_3d_3.init("Camera3", "长边预焊前3D-3", 18400,2,1, _params, _serviceManager, bridge, generalAlgoTest);
-        dgh_cb_yh_3d_4.init("Camera4", "长边预焊前3D-4", 18600,2,1, _params, _serviceManager, bridge, generalAlgoTest);
+        dgh_cb_yh_3d_1.init("Camera1", "长边预焊前3D-1", 18000,2,1, &_params, _serviceManager, bridge, generalAlgoTest);
+        dgh_cb_yh_3d_2.init("Camera2", "长边预焊前3D-2", 18200,2,1, &_params, _serviceManager, bridge, generalAlgoTest);
+        dgh_cb_yh_3d_3.init("Camera3", "长边预焊前3D-3", 18400,2,1, &_params, _serviceManager, bridge, generalAlgoTest);
+        dgh_cb_yh_3d_4.init("Camera4", "长边预焊前3D-4", 18600,2,1, &_params, _serviceManager, bridge, generalAlgoTest);
         
-        dgh_cb_mh_3d_1.init("Camera5", "长边满焊前3D-1", 19600,2,1, _params, _serviceManager, bridge, generalAlgoTest);
-        dgh_cb_mh_3d_2.init("Camera6", "长边满焊前3D-2", 19800,2,1, _params, _serviceManager, bridge, generalAlgoTest);
-        dgh_cb_mh_3d_3.init("Camera7", "长边满焊前3D-3", 20000,2,1, _params, _serviceManager, bridge, generalAlgoTest);
-        dgh_cb_mh_3d_4.init("Camera8", "长边满焊前3D-4", 20200,2,1, _params, _serviceManager, bridge, generalAlgoTest);
+        dgh_cb_mh_3d_1.init("Camera5", "长边满焊前3D-1", 19600,2,1, &_params, _serviceManager, bridge, generalAlgoTest);
+        dgh_cb_mh_3d_2.init("Camera6", "长边满焊前3D-2", 19800,2,1, &_params, _serviceManager, bridge, generalAlgoTest);
+        dgh_cb_mh_3d_3.init("Camera7", "长边满焊前3D-3", 20000,2,1, &_params, _serviceManager, bridge, generalAlgoTest);
+        dgh_cb_mh_3d_4.init("Camera8", "长边满焊前3D-4", 20200,2,1, &_params, _serviceManager, bridge, generalAlgoTest);
 #pragma endregion
         return true;
     }

src/mission/581-Dgh-CB-2/581-Dgh-CB-2.h

@@ -39,20 +39,20 @@ public:
         //    ([=](yh_581_address address, _581_Result, std::shared_ptr <detData>) {
         //    _serviceManager->_triggerManager->writeShort("D" + address.resultAddr + "_1");//发送结果
         //        });
-        dgh_cb_mh_2d_1.init("Camera1", "长边满焊前2D-1",18800, 2,1, _params, _serviceManager, bridge, generalAlgoTest);
-        dgh_cb_mh_2d_2.init("Camera2", "长边满焊前2D-2", 19000, 2,1, _params, _serviceManager, bridge, generalAlgoTest);
-        dgh_cb_mh_2d_3.init("Camera3", "长边满焊前2D-3", 19200, 2,1, _params, _serviceManager, bridge, generalAlgoTest);
-        dgh_cb_mh_2d_4.init("Camera4", "长边满焊前2D-4", 19400, 2,1, _params, _serviceManager, bridge, generalAlgoTest);
+        dgh_cb_mh_2d_1.init("Camera1", "长边满焊前2D-1",18800, 2,1, &_params, _serviceManager, bridge, generalAlgoTest);
+        dgh_cb_mh_2d_2.init("Camera2", "长边满焊前2D-2", 19000, 2,1, &_params, _serviceManager, bridge, generalAlgoTest);
+        dgh_cb_mh_2d_3.init("Camera3", "长边满焊前2D-3", 19200, 2,1, &_params, _serviceManager, bridge, generalAlgoTest);
+        dgh_cb_mh_2d_4.init("Camera4", "长边满焊前2D-4", 19400, 2,1, &_params, _serviceManager, bridge, generalAlgoTest);
 
-        dgh_cb_gy_2d_1.init("Camera5", "长边滚压后2D-1", 20400, 2,1, _params, _serviceManager, bridge, generalAlgoTest);
-        dgh_cb_gy_2d_2.init("Camera6", "长边滚压后2D-2", 20600, 2,1, _params, _serviceManager, bridge, generalAlgoTest);
-        dgh_cb_gy_2d_3.init("Camera7", "长边滚压后2D-3", 20800, 2,1, _params, _serviceManager, bridge, generalAlgoTest);
-        dgh_cb_gy_2d_4.init("Camera8", "长边滚压后2D-4", 21000, 2,1, _params, _serviceManager, bridge, generalAlgoTest);
+        dgh_cb_gy_2d_1.init("Camera5", "长边滚压后2D-1", 20400, 2,1, &_params, _serviceManager, bridge, generalAlgoTest);
+        dgh_cb_gy_2d_2.init("Camera6", "长边滚压后2D-2", 20600, 2,1, &_params, _serviceManager, bridge, generalAlgoTest);
+        dgh_cb_gy_2d_3.init("Camera7", "长边滚压后2D-3", 20800, 2,1, &_params, _serviceManager, bridge, generalAlgoTest);
+        dgh_cb_gy_2d_4.init("Camera8", "长边滚压后2D-4", 21000, 2,1, &_params, _serviceManager, bridge, generalAlgoTest);
 
-        dgh_cb_gy_3d_1.init("Camera9", "长边滚压后3D-1", 21200, 2,1, _params, _serviceManager, bridge, generalAlgoTest);
-        dgh_cb_gy_3d_2.init("Camera10", "长边滚压后3D-2", 21400, 2,1, _params, _serviceManager, bridge, generalAlgoTest);
-        dgh_cb_gy_3d_3.init("Camera11", "长边滚压后3D-3", 21600, 2,1, _params, _serviceManager, bridge, generalAlgoTest);
-        dgh_cb_gy_3d_4.init("Camera12", "长边滚压后3D-4", 21800, 2,1, _params, _serviceManager, bridge, generalAlgoTest);
+        dgh_cb_gy_3d_1.init("Camera9", "长边滚压后3D-1", 21200, 2,1, &_params, _serviceManager, bridge, generalAlgoTest);
+        dgh_cb_gy_3d_2.init("Camera10", "长边滚压后3D-2", 21400, 2,1, &_params, _serviceManager, bridge, generalAlgoTest);
+        dgh_cb_gy_3d_3.init("Camera11", "长边滚压后3D-3", 21600, 2,1, &_params, _serviceManager, bridge, generalAlgoTest);
+        dgh_cb_gy_3d_4.init("Camera12", "长边滚压后3D-4", 21800, 2,1, &_params, _serviceManager, bridge, generalAlgoTest);
 #pragma endregion
         return true;
     }

src/mission/581-Dgh-DB-1/581-Dgh-DB-1.h

@@ -25,10 +25,10 @@ public:
     }
     bool initCustom() {
 #pragma region 注册触发器回调
-        dgh_db_yh_3d_1.init("Camera1", "短边预焊前3D-1", 18000,4,1, _params, _serviceManager, bridge, generalAlgoTest);
-        dgh_db_yh_3d_2.init("Camera2", "短边预焊前3D-2", 18200,4,1, _params, _serviceManager, bridge, generalAlgoTest);
-        dgh_db_mh_3d_1.init("Camera3", "短边满焊前3D-1", 18800,4,1, _params, _serviceManager, bridge, generalAlgoTest);
-        dgh_db_mh_3d_2.init("Camera4", "短边满焊前3D-2", 19000,4,1, _params, _serviceManager, bridge, generalAlgoTest);
+        dgh_db_yh_3d_1.init("Camera1", "短边预焊前3D-1", 18000,4,1, &_params, _serviceManager, bridge, generalAlgoTest);
+        dgh_db_yh_3d_2.init("Camera2", "短边预焊前3D-2", 18200,4,1, &_params, _serviceManager, bridge, generalAlgoTest);
+        dgh_db_mh_3d_1.init("Camera3", "短边满焊前3D-1", 18800,4,1, &_params, _serviceManager, bridge, generalAlgoTest);
+        dgh_db_mh_3d_2.init("Camera4", "短边满焊前3D-2", 19000,4,1, &_params, _serviceManager, bridge, generalAlgoTest);
 #pragma endregion
         return true;
     }

src/mission/581-Dgh-DB-2/581-Dgh-DB-2.h

@@ -29,12 +29,12 @@ public:
     }
     bool initCustom(){
 #pragma region 注册触发器回调 满焊
-        dgh_db_mh_2d_1.init("Camera1", "短边满焊前2D-1", 18400,4,1, _params, _serviceManager, bridge, generalAlgoTest);
-        dgh_db_mh_2d_2.init("Camera2", "短边满焊前2D-2", 18600,4,1, _params, _serviceManager, bridge, generalAlgoTest);
-        dgh_db_gy_2d_1.init("Camera3", "短边滚压后2D-1", 19200,4,1, _params, _serviceManager, bridge, generalAlgoTest);
-        dgh_db_gy_2d_2.init("Camera4", "短边滚压后2D-2", 19400,4,1, _params, _serviceManager, bridge, generalAlgoTest);
-        dgh_db_gy_3d_1.init("Camera5", "短边滚压后3D-1", 19600,4,1, _params, _serviceManager, bridge, generalAlgoTest);
-        dgh_db_gy_3d_2.init("Camera6", "短边滚压后3D-2", 19800,4,1, _params, _serviceManager, bridge, generalAlgoTest);
+        dgh_db_mh_2d_1.init("Camera1", "短边满焊前2D-1", 18400,4,1, &_params, _serviceManager, bridge, generalAlgoTest);
+        dgh_db_mh_2d_2.init("Camera2", "短边满焊前2D-2", 18600,4,1, &_params, _serviceManager, bridge, generalAlgoTest);
+        dgh_db_gy_2d_1.init("Camera3", "短边滚压后2D-1", 19200,4,1, &_params, _serviceManager, bridge, generalAlgoTest);
+        dgh_db_gy_2d_2.init("Camera4", "短边滚压后2D-2", 19400,4,1, &_params, _serviceManager, bridge, generalAlgoTest);
+        dgh_db_gy_3d_1.init("Camera5", "短边滚压后3D-1", 19600,4,1, &_params, _serviceManager, bridge, generalAlgoTest);
+        dgh_db_gy_3d_2.init("Camera6", "短边滚压后3D-2", 19800,4,1, &_params, _serviceManager, bridge, generalAlgoTest);
 #pragma endregion
         return true;
     }

src/mission/581-Mfd_djy_sd/581-Mfd.h

@@ -5,7 +5,7 @@
 #include <hdevengine/HDevEngineCpp.h>
 #include <opencvPaintAlgo.hpp>
 using namespace HDevEngineCpp;
-static bool ShangDing(std::shared_ptr <detData> data, detParams* _detParams, yh_581_address address){;
+static bool ShangDing(std::shared_ptr <detData> data, detParams* &_detParams, yh_581_address address){;
     qDebug() << "SN" << QString::fromStdString(data->SNcode) << "algo start";
     std::map<QString, QVariant> sqlMapData;
     sqlMapData["项目"] = "上钉";
@@ -145,15 +145,15 @@ public:
     }
     bool initCustom() {
 #pragma region 注册触发器回调
-        djy_1.init("Camera1", "电解液1", 18000, 2, 1, _detParams, _serviceManager, bridge, generalAlgoTest);
-        djy_2.init("Camera2", "电解液2", 18200, 2, 1, _detParams, _serviceManager, bridge, generalAlgoTest);
-        djy_3.init("Camera3", "电解液3", 18400, 2, 1, _detParams, _serviceManager, bridge, generalAlgoTest);
-        djy_4.init("Camera4", "电解液4", 18600, 2, 1, _detParams, _serviceManager, bridge, generalAlgoTest);
+        djy_1.init("Camera1", "电解液1", 18000, 2, 1, &_detParams, _serviceManager, bridge, generalAlgoTest);
+        djy_2.init("Camera2", "电解液2", 18200, 2, 1, &_detParams, _serviceManager, bridge, generalAlgoTest);
+        djy_3.init("Camera3", "电解液3", 18400, 2, 1, &_detParams, _serviceManager, bridge, generalAlgoTest);
+        djy_4.init("Camera4", "电解液4", 18600, 2, 1, &_detParams, _serviceManager, bridge, generalAlgoTest);
 
-        sd_1.init("Camera5", "上钉1", 18800, 1, 1, _detParams, _serviceManager, bridge, generalAlgoTest);
-        sd_2.init("Camera6", "上钉2", 19000, 1, 1, _detParams, _serviceManager, bridge, generalAlgoTest);
-        sd_3.init("Camera7", "上钉3", 19200, 1, 1, _detParams, _serviceManager, bridge, generalAlgoTest);
-        sd_4.init("Camera8", "上钉4", 19400, 1, 1, _detParams, _serviceManager, bridge, generalAlgoTest);
+        sd_1.init("Camera5", "上钉1", 18800, 1, 1, &_detParams, _serviceManager, bridge, generalAlgoTest);
+        sd_2.init("Camera6", "上钉2", 19000, 1, 1, &_detParams, _serviceManager, bridge, generalAlgoTest);
+        sd_3.init("Camera7", "上钉3", 19200, 1, 1, &_detParams, _serviceManager, bridge, generalAlgoTest);
+        sd_4.init("Camera8", "上钉4", 19400, 1, 1, &_detParams, _serviceManager, bridge, generalAlgoTest);
 #pragma endregion
         return true;
     }

src/mission/581-Mfd_yh_mh_hh/581-Mfd.h

@@ -352,16 +352,16 @@ public:
     }
     bool initCustom() {
 #pragma region 注册触发器回调
-        yh_1.init("Camera1", "预焊1", 19600, 2, 1, _params, _serviceManager, bridge, YuHan);
-        yh_2.init("Camera2", "预焊2", 19800, 2, 1, _params, _serviceManager, bridge, YuHan);
+        yh_1.init("Camera1", "预焊1", 19600, 2, 1, &_params, _serviceManager, bridge, YuHan);
+        yh_2.init("Camera2", "预焊2", 19800, 2, 1, &_params, _serviceManager, bridge, YuHan);
 
-        mh_1.init("Camera3", "满焊1", 20000, 2, 1, _params, _serviceManager, bridge, ManHan);
-        mh_2.init("Camera4", "满焊2", 20200, 2, 1, _params, _serviceManager, bridge, ManHan);
-        mh_3.init("Camera5", "满焊3", 20400, 2, 1, _params, _serviceManager, bridge, ManHan);
-        mh_4.init("Camera6", "满焊4", 20600, 2, 1, _params, _serviceManager, bridge, ManHan);
+        mh_1.init("Camera3", "满焊1", 20000, 2, 1, &_params, _serviceManager, bridge, ManHan);
+        mh_2.init("Camera4", "满焊2", 20200, 2, 1, &_params, _serviceManager, bridge, ManHan);
+        mh_3.init("Camera5", "满焊3", 20400, 2, 1, &_params, _serviceManager, bridge, ManHan);
+        mh_4.init("Camera6", "满焊4", 20600, 2, 1, &_params, _serviceManager, bridge, ManHan);
 
-        hh_2D.init("Camera7", "焊后2d", 20800, 2, 1, _detParams, _serviceManager, bridge, generalAlgoTest);
-        hh_3D.init("Camera8", "焊后3d", 21000, 2, 1, _detParams, _serviceManager, bridge, generalAlgoTest);
+        hh_2D.init("Camera7", "焊后2d", 20800, 2, 1, &_detParams, _serviceManager, bridge, generalAlgoTest);
+        hh_3D.init("Camera8", "焊后3d", 21000, 2, 1, &_detParams, _serviceManager, bridge, generalAlgoTest);
 #pragma endregion
         return true;
     }

src/mission/581-Ruke/581-Ruke.h

@@ -22,10 +22,10 @@ public:
     }
     bool initCustom() {
 #pragma region 注册触发器回调
-        ruke_cam1_3.init("Camera1","入壳相机1下",18000, 2, 3, _params,_serviceManager, bridge, generalAlgoTest);
-        ruke_cam2_1.init("Camera2", "入壳相机2左",18200 , 2, 1, _params, _serviceManager, bridge, generalAlgoTest);
-        ruke_cam3_3.init("Camera3", "入壳相机3上",18400, 2, 3, _params, _serviceManager, bridge, generalAlgoTest);
-        ruke_cam4_1.init("Camera4", "入壳相机4右",18600, 2, 1, _params, _serviceManager, bridge, generalAlgoTest);
+        ruke_cam1_3.init("Camera1","入壳相机1下",18000, 2, 3, &_params,_serviceManager, bridge, generalAlgoTest);
+        ruke_cam2_1.init("Camera2", "入壳相机2左",18200 , 2, 1,& _params, _serviceManager, bridge, generalAlgoTest);
+        ruke_cam3_3.init("Camera3", "入壳相机3上",18400, 2, 3, &_params, _serviceManager, bridge, generalAlgoTest);
+        ruke_cam4_1.init("Camera4", "入壳相机4右",18600, 2, 1, &_params, _serviceManager, bridge, generalAlgoTest);
 #pragma endregion
         return true;
     }