备份

CMakeUserPresets.json

@@ -24,35 +24,17 @@
     {
       "hidden": true,
       "name": "Qt-Default",
-      "inherits": "allenv_qt5",
+      "inherits": null,
       "vendor": {
         "qt-project.org/Default": {
-          "checksum": "Z8G/I2NiO/EJ3GcqVEvZ0lSrMzM="
-        }
-      }
-    },
-    {
-      "hidden": true,
-      "name": "allenv_qt5",
-      "inherits": "Qt",
-      "environment": {
-        "QTDIR": "G:/detSystem/allenv/qt5"
-      },
-      "architecture": {
-        "strategy": "external",
-        "value": "x64"
-      },
-      "generator": "Ninja",
-      "vendor": {
-        "qt-project.org/Version": {
-          "checksum": "fGB5SKr330WkMcI+0sxuX59JXuA="
+          "checksum": "VoalogTkyWuFomeO1TLFx0olLJ4="
         }
       }
     }
   ],
   "vendor": {
     "qt-project.org/Presets": {
-      "checksum": "yQDlwrq4/xeG9pH9UtkSbCWd0/o="
+      "checksum": "DiAwp+JKAQXqWc2tOPE/U9qg77Y="
     }
   }
 }

include/sxGlobal.h

@@ -124,7 +124,6 @@ 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 + "_1");//发送异常结果
+    data->service->_triggerManager->writeShort("D" + address.resultAddr + "_2");//发送异常结果
     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,15 +151,6 @@ 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) {
@@ -192,7 +183,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;
@@ -211,7 +202,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;
@@ -221,7 +212,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);
         //单次触发器条件
@@ -233,15 +224,6 @@ 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/Core/back/imgSaveThreadManager.h

@@ -219,37 +219,34 @@ public:
 		}
 
 	}
-	void saveOri(std::shared_ptr <detData> data) {
+	void saveImage(std::shared_ptr <detData> data) {
 
+		QString oriSavePath= genDirName(data, oriImg, data->_saveMode);//获取文件夹名
+		createDirectoryIfNotExists(oriSavePath);//不存在此文件夹则创建
 		if (data->oriImgs.size() != 0) {
-
-			QString fileSavePath = genDirName(data, oriImg, data->_saveMode);//获取文件夹名
-			createDirectoryIfNotExists(fileSavePath);//不存在此文件夹则创建
 			std::vector<std::string>fileNames = genFileNames(data, oriImg);//按规则为文件创建命名
 			std::shared_ptr<saveJob> job (new saveJob("[ORI_JOB]" + data->SNcode));
-			packageData(job->imgQueue, fileSavePath.toLocal8Bit().toStdString(), fileNames, data->oriImgs);//打包数据
+			packageData(job->imgQueue, oriSavePath.toLocal8Bit().toStdString(), fileNames, data->oriImgs);//打包数据
 			saveThread.addJob(job);
 		}
-	}
-	void saveRes(std::shared_ptr <detData> data) {
 
-		QString fileSavePath = genDirName(data, resImg, data->_saveMode);//获取文件夹名
-		createDirectoryIfNotExists(fileSavePath);//不存在此文件夹则创建
+		QString resultSavePath = genDirName(data, resImg, data->_saveMode);//获取文件夹名
+		createDirectoryIfNotExists(resultSavePath);//不存在此文件夹则创建
 		std::shared_ptr<saveJob> job(new saveJob("[RES_JOB]"+ data->SNcode));
 		//结果图保存
 		if (data->resultImgs.size() != 0) {
 			std::vector<std::string>fileNames = genFileNames(data, resImg);//按规则为文件创建命名
-			packageData(job->imgQueue, fileSavePath.toLocal8Bit().toStdString(),fileNames, data->resultImgs);//打包数据
+			packageData(job->imgQueue, resultSavePath.toLocal8Bit().toStdString(),fileNames, data->resultImgs);//打包数据
 		}
 		//SEG原图
 		if (data->segOriginImgs.size() != 0) {
 			std::vector<std::string>fileNames = genFileNames(data, segImg);//按规则为文件创建命名
-			packageData(job->imgQueue, fileSavePath.toLocal8Bit().toStdString(),fileNames, data->segOriginImgs);//打包数据
+			packageData(job->imgQueue, oriSavePath.toLocal8Bit().toStdString(), fileNames, data->segOriginImgs);//打包数据
 		}
 		//CLS原图
 		if (data->clsOriginImgs.size() != 0) {
 			std::vector<std::string>fileNames = genFileNames(data, clsImg);//按规则为文件创建命名
-			packageData(job->imgQueue, fileSavePath.toLocal8Bit().toStdString(), fileNames, data->clsOriginImgs);//打包数据
+			packageData(job->imgQueue, oriSavePath.toLocal8Bit().toStdString(), fileNames, data->clsOriginImgs);//打包数据
 		}
 		saveThread.addJob(job, imgSaveThread::priority);
 		//额外储存NG文件夹

src/core/back/detCallbackChain.hpp

@@ -99,8 +99,8 @@ public:
 		 data->sqlVec.push_back({ "SN", data->SNcode });
 		 data->sqlVec.push_back({ "totalCt", std::to_string(data->algoTime) + "ms" });
 		// 异步保存检测图像
-		std::thread([this,data] {_imgSaveThreadManager->saveOri(data); }).detach();
-		std::thread([this,data] {_imgSaveThreadManager->saveRes(data); }).detach();
+		std::thread([this,data] {_imgSaveThreadManager->saveImage(data); }).detach();
+		//std::thread([this,data] {_imgSaveThreadManager->saveRes(data); }).detach();
 	}
 #pragma region 注册回调函数
 

src/launcher/GUI/JsonEditorDialog.h

@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 
 #include <QDialog>
 #include <QTableWidget>
@@ -17,11 +17,6 @@
 #include <nlohmannjson.hpp>
 #include <global.h>
 #include <uiModule/components/fancyButton.h>
-#include <QDoubleSpinBox>
-#include <uiModule/components/sliderSwitch.h>
-#include <QTableView>
-#include <QStandardItemModel>
-
 class JsonParamTableEditor : public QDialog {
     Q_OBJECT
     
@@ -40,24 +35,12 @@ public:
         : QDialog(parent) {
         this->setWindowTitle("JSON 表格编辑器");
         this->resize(700, 450);
-        setWindowFlags(this->windowFlags() | Qt::FramelessWindowHint);// 去掉边框
+        setWindowFlags(this->windowFlags() | Qt::FramelessWindowHint);    // 去掉边框    //现在、、
         //setAttribute(Qt::WA_TranslucentBackground); // 背景透明
         this->setObjectName("JsonParamTableEditor");
         this->setStyleSheet(QString("QDialog#JsonParamTableEditor {background-color: rgb(%1);border: 2px solid #000000;border-radius: 6px;}").arg(sColor_Blue));
-        
-        m_tableView = new QTableView(this);
-        m_tableModel = new QStandardItemModel(0, 2, this);// 2列：选项、值
-        m_tableView->setModel(m_tableModel);
-
-        //设置表头
-        m_tableModel->setHorizontalHeaderLabels({ "选项", "值" });
-
-        //设置表格属性
-        m_tableView->setSelectionBehavior(QAbstractItemView::SelectRows);
-        m_tableView->setAlternatingRowColors(true);
-        m_tableView->horizontalHeader()->setStretchLastSection(true);
-        m_tableView->setColumnWidth(1, 200);// 选项列宽度
-
+        m_tableWidget = new QTableWidget(0, 2, this);
+        m_tableWidget->setHorizontalHeaderLabels({ "选项", "值" });
 
         fancyButtonText* okBtn = new fancyButtonText("保存", 70, 22, "");
         fancyButtonText* cancelBtn = new fancyButtonText("取消", 70, 22, "");
@@ -71,94 +54,65 @@ public:
         btnLayout->addWidget(cancelBtn);
 
         QVBoxLayout* mainLayout = new QVBoxLayout(this);
-        mainLayout->addWidget(m_tableView);
+        mainLayout->addWidget(m_tableWidget);
         mainLayout->addLayout(btnLayout);
+
+        // 设置表格样式和属性
+        m_tableWidget->setAlternatingRowColors(true);
+        m_tableWidget->setSelectionBehavior(QAbstractItemView::SelectRows);
+        m_tableWidget->horizontalHeader()->setStretchLastSection(true);
+        m_tableWidget->setColumnWidth(0, 200);  // 选项列宽度
         
-        m_tableView->setStyleSheet(QString(R"(
-        QTableView {
+        m_tableWidget->setStyleSheet(QString(R"(
+        QTableWidget {
             background-color: rgb(%1);
             font-family: "Microsoft YaHei";
             color: #ffffff;
             gridline-color: #555555;
-            alternate-background-color: #3a3a3a;
         }
         QHeaderView::section {
             background-color: #0078d7;
             padding: 4px;
             font-weight: bold;
             color: #ffffff;
-            border: none;
         }
-        QTableView::item {
-            background-color: #2d2d2d;
-            color: #ffffff;
-        }
-        QTableView::item:selected {
+        QTableWidget::item:selected {
             background-color: #0078d7;
-            color: #ffffff;
-        }
-        QTableView::item:alternate {
-            background-color: #3a3a3a;
         }
     )").arg(sColor_Blue));
     }
 
     void setJsonObject(const nlohmann::json& json) {
-        m_tableModel->setRowCount(0);
+        m_tableWidget->setRowCount(0);
         m_originalJson = json;  // 保存原始JSON
         m_originalTypes.clear(); // 清空原始类型映射
-        m_editorWidgets.clear();
         
         if (!json.is_object()) return;
 
-        int row = 0;
         for (auto it = json.begin(); it != json.end(); ++it) {
-            m_tableModel->insertRow(row);
+            int row = m_tableWidget->rowCount();
+            m_tableWidget->insertRow(row);
 
             const std::string& key = it.key();
             const nlohmann::json& value = it.value();
-
-            //// 设置行号（不可编辑）
-            //QStandardItem* rowItem = new QStandardItem(QString::number(row + 1));
-            //rowItem->setEditable(false);
-            //rowItem->setBackground(QColor(60, 60, 60));
-            //rowItem->setForeground(QColor(255, 255, 255));
-            //m_tableModel->setItem(row, 0, rowItem);
-
+            
             // 设置键名（不可编辑）
-            QStandardItem* keyItem = new QStandardItem(QString::fromStdString(key));
-            keyItem->setEditable(false);
-            keyItem->setBackground(QColor(60, 60, 60));
-            keyItem->setForeground(QColor(255, 255, 255));
-            m_tableModel->setItem(row, 0, keyItem);
+            QTableWidgetItem* keyItem = new QTableWidgetItem(QString::fromStdString(key));
+            keyItem->setFlags(keyItem->flags() & ~Qt::ItemIsEditable);
+            keyItem->setBackground(QColor(80, 80, 80));
+            m_tableWidget->setItem(row, 0, keyItem);
 
             // 确定类型（内部使用，不显示）
             JsonValueType valueType = getJsonValueType(value);
             m_originalTypes[key] = valueType;
 
-            ////为所有类型都创建数据项
-            //QString valueText = formatValueForDisplay(value, valueType);
-            //QStandardItem* valueItem = new QStandardItem(valueText);
-            //valueItem->setToolTip(generateTypeHint(valueType));
-            //valueItem->setBackground(QColor(60, 60, 60));
-            //valueItem->setForeground(QColor(255, 255, 255));
-            //m_tableModel->setItem(row, 1, valueItem);
-
-            //为特定类型创建专用编辑器控件
-            QWidget* editorWidget = createEditorWidget(value, valueType);
-            if (editorWidget) {
-                m_tableView->setIndexWidget(m_tableModel->index(row, 1), editorWidget);
-                m_editorWidgets[key] = editorWidget;
-            }
-            else {
-                // 默认为文本显示
-                QString valueText= formatValueForDisplay(value, valueType);
-                QStandardItem* valueItem = new QStandardItem(valueText);
-                valueItem->setToolTip(generateTypeHint(valueType));
-                m_tableModel->setItem(row, 1, valueItem);
-            }
-            row++;
+            // 设置值（可编辑，但需要类型验证）
+            QString valueText = formatValueForDisplay(value, valueType);
+            QTableWidgetItem* valueItem = new QTableWidgetItem(valueText);
+            valueItem->setToolTip(generateTypeHint(valueType));
+            m_tableWidget->setItem(row, 1, valueItem);
         }
+        m_tableWidget->resizeColumnsToContents();
     }
 
 signals:
@@ -168,20 +122,24 @@ private slots:
     void onAccept() {
         nlohmann::json result = nlohmann::json::object();
 
-        for (int row = 0; row < m_tableModel->rowCount(); ++row) {
-            QStandardItem* keyItem = m_tableModel->item(row, 0);
-            if (!keyItem) {
+        for (int row = 0; row < m_tableWidget->rowCount(); ++row) {
+            auto* keyItem = m_tableWidget->item(row, 0);
+            auto* valItem = m_tableWidget->item(row, 1);
+
+            if (!keyItem || !valItem) {
                 QMessageBox::warning(this, "错误", QString("第 %1 行数据不完整").arg(row + 1));
                 return;
             }
 
             QString key = keyItem->text().trimmed();
+            QString valStr = valItem->text().trimmed();
+
             if (key.isEmpty()) {
                 QMessageBox::warning(this, "错误", QString("第 %1 行 key 为空").arg(row + 1));
                 return;
             }
 
-            //获取原始类型
+            // 获取原始类型
             std::string keyStd = key.toStdString();
             if (m_originalTypes.find(keyStd) == m_originalTypes.end()) {
                 QMessageBox::warning(this, "错误", QString("第 %1 行找不到原始类型信息").arg(row + 1));
@@ -190,160 +148,26 @@ private slots:
 
             JsonValueType expectedType = m_originalTypes[keyStd];
             
-            //从编辑器获取值
+            // 验证并转换值
             nlohmann::json convertedValue;
             QString errorMsg;
-            if (!getValueFromEditor(keyStd, expectedType, convertedValue, errorMsg)) {
-                QMessageBox::critical(this, "类型验证失败",QString("第 %1 行值验证失败:\n%2").arg(row + 1).arg(errorMsg));
+            if (!validateAndConvertValue(valStr, expectedType, convertedValue, errorMsg)) {
+                QMessageBox::critical(this, "类型验证失败",
+                    QString("第 %1 行值验证失败:\n%2").arg(row + 1).arg(errorMsg));
                 return;
             }
+
             result[keyStd] = convertedValue;
         }
 
-        qDebug() << "Result JSON: " << QString::fromStdString(result.dump(4));
-
         emit jsonAccepted(result);
         accept();
     }
 
 private:
-    QTableView* m_tableView;
-    QStandardItemModel* m_tableModel;
+    QTableWidget* m_tableWidget;
     nlohmann::json m_originalJson;  // 保存原始JSON以便类型检查
-    std::map<std::string, JsonValueType> m_originalTypes;// 保存每个键的原始类型
-    std::map<std::string, QWidget*> m_editorWidgets;// 保存每个键对应的编辑器控件
-
-    // 根据类型创建不同的编辑器控件
-    QWidget* createEditorWidget(const nlohmann::json& value, JsonValueType type) {
-        switch (type) {
-        case JsonValueType::Boolean: {
-            CircularSwitch* switchBtn = new CircularSwitch();
-            switchBtn->setChecked(value.get<bool>());
-            switchBtn->setToolTip(generateTypeHint(type));
-            return switchBtn;
-        }
-        case JsonValueType::Number: {
-            QDoubleSpinBox* spinBox = new QDoubleSpinBox();
-            spinBox->setRange(-1e18, 1e18);
-            spinBox->setDecimals(3);//显示小位数
-
-            if (value.is_number_integer()) {
-                spinBox->setValue(value.get<int64_t>());
-                spinBox->setDecimals(0);
-            }
-            else {
-                spinBox->setValue(value.get<double>());
-            }
-
-            spinBox->setToolTip(generateTypeHint(type));
-            return spinBox;
-        }
-        case JsonValueType::String: {
-            QLineEdit* lineEdit = new QLineEdit();
-            lineEdit->setText(QString::fromStdString(value.get<std::string>()));
-            lineEdit->setToolTip(generateTypeHint(type));
-            return lineEdit;
-        }
-        // 其他类型仍使用文本显示
-        default:
-            return nullptr;
-        }
-    }
-
-    bool getValueFromEditor(const std::string& key, JsonValueType expectedType, nlohmann::json& result, QString& errorMsg) {
-        auto it = m_editorWidgets.find(key);
-
-        try {
-            if (it != m_editorWidgets.end()) {
-                // 有专用编辑器控件
-                QWidget* widget = it->second;
-                switch (expectedType) {
-                case JsonValueType::Boolean: {
-                    CircularSwitch* switchBtn = qobject_cast<CircularSwitch*>(widget);
-                    if (switchBtn) {
-                        bool value = switchBtn->isChecked();
-                        result = value;
-                        // 更新模型数据
-                        updateModelData(key, value ? "true" : "false");
-                        return true;
-                    }
-                    errorMsg = "布尔值控件类型错误";
-                    return false;
-                }
-                case JsonValueType::Number: {
-                    QDoubleSpinBox* spinBox = qobject_cast<QDoubleSpinBox*>(widget);
-                    if (spinBox) {
-                        double value = spinBox->value();
-                        // 检查是否为整数
-                        if (spinBox->decimals() == 0 && value == floor(value)) {
-                            result = static_cast<int64_t>(value);
-                            updateModelData(key, QString::number(static_cast<int64_t>(value)));
-                        }
-                        else {
-                            result = value;
-                            updateModelData(key, QString::number(value));
-                        }
-                        return true;
-                    }
-                    errorMsg = "数字控件类型错误";
-                    return false;
-                }
-                case JsonValueType::String: {
-                    QLineEdit* lineEdit = qobject_cast<QLineEdit*>(widget);
-                    if (lineEdit) {
-                        QString value = lineEdit->text().trimmed();
-                        result = value.toStdString();
-                        updateModelData(key, value);
-                        return true;
-                    }
-                    errorMsg = "字符串控件类型错误";
-                    return false;
-                }
-                default:
-                    // 其他类型使用默认文本处理
-                    return validateAndConvertValue(getTextFromCell(key), expectedType, result, errorMsg);
-                }
-            }
-            else {
-                // 没有专用编辑器控件，使用默认文本处理
-                return validateAndConvertValue(getTextFromCell(key), expectedType, result, errorMsg);
-            }
-        }
-        catch (const std::exception& e) {
-            errorMsg = QString("获取值错误: %1").arg(e.what());
-            return false;
-        }
-    }
-
-    // 更新模型中的数据项
-    void updateModelData(const std::string& key, const QString& value) {
-        for (int row = 0; row < m_tableModel->rowCount(); ++row) {
-            QStandardItem* keyItem = m_tableModel->item(row, 0);
-            if (keyItem && keyItem->text().toStdString() == key) {
-                QStandardItem* valueItem = m_tableModel->item(row, 1);
-                if (valueItem) {
-                    valueItem->setText(value);
-                }
-                break;
-            }
-        }
-    }
-
-    // 从单元格获取文本值（用于没有专用编辑器的类型）
-    QString getTextFromCell(const std::string& key) {
-        //查找键对应的行
-        for (int row = 0; row < m_tableModel->rowCount(); ++row) {
-            QStandardItem* keyItem = m_tableModel->item(row, 0);
-            if (keyItem && keyItem->text().toStdString() == key) {
-                QStandardItem* valueItem = m_tableModel->item(row, 1);
-                if (valueItem) {
-                    return valueItem->text();
-                }
-                break;
-            }
-        }
-        return "";
-    }
+    std::map<std::string, JsonValueType> m_originalTypes;  // 保存每个键的原始类型
     
     // 获取JSON值的类型
     JsonValueType getJsonValueType(const nlohmann::json& value) {

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

@@ -1,4 +1,4 @@
-#include <qwidget.h>
+#include <qwidget.h>
 #include <qlayout.h>
 #include <qlabel.h>
 #include <qpushbutton.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(32, 32)){
+		const QSize& buttonSize = QSize(100, 60), const QSize& iconSize = QSize(30, 30)){
 		
 		// 参数验证
 		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(32, 32)) {
+		const QSize& buttonSize = QSize(100, 60), const QSize& iconSize = QSize(30, 30)) {
 
 		// 参数验证
 		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->missionJson["backend"]["missionSettings"]);
+						dlg->setJsonObject(m_config->settingJson["backend"]["algorithmSettings"]);
 						dlg->setAttribute(Qt::WA_DeleteOnClose);
 						connect(dlg, &JsonParamTableEditor::jsonAccepted, [this](const nlohmann::json& result) {
-							m_config->missionJson["backend"]["missionSettings"] = result;
+							m_config->settingJson["backend"]["algorithmSettings"] = result;
 							});
 						dlg->show();
 						});
@@ -435,9 +435,9 @@ public:
 			fileManager::getAllFiles("./tools", files, "lnk");
 			for (auto& lnkPath : files) {
 				std::string fileName = fileManager::getFileName(lnkPath);
-				auto exePath = getShortcutTarget(QString::fromLocal8Bit(lnkPath.c_str()));
-				auto icon = getFileIcon(exePath, QSize(32, 32));
-				_toolBarWidget->createToolButton(icon, QString::fromLocal8Bit(fileName.c_str()), [exePath]() {
+				auto exePath = getShortcutTarget(QString::fromStdString(lnkPath));
+				auto icon = getFileIcon(exePath, QSize(30, 30));
+				_toolBarWidget->createToolButton(icon, QString::fromLocal8Bit(fileName.c_str()), [=]() {
 					QProcess::startDetached(exePath);
 					});
 			}

src/launcher/GUI/uiModule/components/sliderSwitch.h

@@ -1,287 +0,0 @@
-#ifndef CIRCULARSWITCH_H
-#define CIRCULARSWITCH_H
-
-#include <QWidget>
-#include <QPainter>
-#include <QMouseEvent>
-#include <QPropertyAnimation>
-#include <QEasingCurve>
-#include <QTimer>
-
-class CircularSwitch : public QWidget
-{
-    Q_OBJECT
-        Q_PROPERTY(int knobPosition READ knobPosition WRITE setKnobPosition NOTIFY knobPositionChanged)
-        Q_PROPERTY(QColor backgroundColor READ backgroundColor WRITE setBackgroundColor NOTIFY backgroundColorChanged)
-
-public:
-    explicit CircularSwitch(QWidget* parent = nullptr)
-        : QWidget(parent)
-        , m_checked(false)
-        , m_knobPosition(0)
-        , m_animationDuration(200)
-        , m_onColor(QColor("#4CD964"))
-        , m_offColor(QColor("#E5E5EA"))
-        , m_knobColor(Qt::white)
-        , m_borderColor(QColor("#CCCCCC"))
-        , m_textColor(Qt::white)
-        , m_knobDiameter(0)
-        , m_padding(3)
-        , m_borderWidth(1)
-        , m_showText(true)
-        , m_trueText("true")
-        , m_falseText("false")
-    {
-        m_animation = new QPropertyAnimation(this, "knobPosition", this);
-        m_animation->setEasingCurve(QEasingCurve::OutCubic);
-        m_animation->setDuration(m_animationDuration);
-
-        setFixedSize(70, 34); // 稍微加宽以容纳文字
-        setCursor(Qt::PointingHandCursor);
-        updateKnobGeometry();
-    }
-
-    // 获取和设置开关状态
-    bool isChecked() const { return m_checked; }
-
-    void setChecked(bool checked) {
-        if (m_checked == checked) return;
-
-        m_checked = checked;
-        update();
-
-        // 启动动画
-        m_animation->stop();
-        m_animation->setStartValue(m_knobPosition);
-        m_animation->setEndValue(checked ? width() - m_knobDiameter - m_padding : m_padding);
-        m_animation->start();
-
-        // 延迟发射信号，让动画先执行
-        QTimer::singleShot(10, this, [this, checked]() {
-            emit toggled(checked);
-            });
-    }
-
-    // 颜色设置
-    QColor onColor() const { return m_onColor; }
-    void setOnColor(const QColor& color) {
-        m_onColor = color;
-        update();
-    }
-
-    QColor offColor() const { return m_offColor; }
-    void setOffColor(const QColor& color) {
-        m_offColor = color;
-        update();
-    }
-
-    QColor knobColor() const { return m_knobColor; }
-    void setKnobColor(const QColor& color) {
-        m_knobColor = color;
-        update();
-    }
-
-    QColor borderColor() const { return m_borderColor; }
-    void setBorderColor(const QColor& color) {
-        m_borderColor = color;
-        update();
-    }
-
-    QColor textColor() const { return m_textColor; }
-    void setTextColor(const QColor& color) {
-        m_textColor = color;
-        update();
-    }
-
-    QColor backgroundColor() const {
-        return m_checked ? m_onColor : m_offColor;
-    }
-
-    void setBackgroundColor(const QColor& color) {
-        if (m_checked) {
-            m_onColor = color;
-        }
-        else {
-            m_offColor = color;
-        }
-        update();
-    }
-
-    // 动画设置
-    int animationDuration() const { return m_animationDuration; }
-    void setAnimationDuration(int duration) {
-        m_animationDuration = duration;
-        m_animation->setDuration(duration);
-    }
-
-    // 边框设置
-    int borderWidth() const { return m_borderWidth; }
-    void setBorderWidth(int width) {
-        m_borderWidth = width;
-        update();
-    }
-
-    // 文字设置
-    bool showText() const { return m_showText; }
-    void setShowText(bool show) {
-        m_showText = show;
-        update();
-    }
-
-    QString trueText() const { return m_trueText; }
-    void setTrueText(const QString& text) {
-        m_trueText = text;
-        update();
-    }
-
-    QString falseText() const { return m_falseText; }
-    void setFalseText(const QString& text) {
-        m_falseText = text;
-        update();
-    }
-
-protected:
-    void paintEvent(QPaintEvent* event) override {
-        Q_UNUSED(event)
-
-            QPainter painter(this);
-        painter.setRenderHint(QPainter::Antialiasing);
-
-        // 绘制背景
-        QRect backgroundRect = rect().adjusted(m_padding, m_padding, -m_padding, -m_padding);
-        QPainterPath backgroundPath;
-        backgroundPath.addRoundedRect(backgroundRect, backgroundRect.height() / 2, backgroundRect.height() / 2);
-
-        // 绘制边框
-        if (m_borderWidth > 0) {
-            painter.setPen(QPen(m_borderColor, m_borderWidth));
-            painter.setBrush(Qt::NoBrush);
-            painter.drawPath(backgroundPath);
-        }
-
-        // 绘制填充背景
-        painter.setPen(Qt::NoPen);
-        painter.setBrush(m_checked ? m_onColor : m_offColor);
-        painter.drawPath(backgroundPath);
-
-        // 绘制背景文字
-        if (m_showText) {
-            painter.setPen(m_textColor);
-            QFont font = painter.font();
-            font.setPointSize(8);
-            font.setBold(true);
-            painter.setFont(font);
-
-            // 计算文字位置
-            QRect textRect = backgroundRect;
-
-            if (m_checked) {
-                // 打开状态，文字在左侧
-                textRect.setRight(width() / 2);
-                painter.drawText(textRect, Qt::AlignCenter, m_trueText);
-            }
-            else {
-                // 关闭状态，文字在右侧
-                textRect.setLeft(width() / 2);
-                painter.drawText(textRect, Qt::AlignCenter, m_falseText);
-            }
-        }
-
-        // 绘制滑块
-        int knobY = height() / 2;
-        QRect knobRect(m_knobPosition, knobY - m_knobDiameter / 2,
-            m_knobDiameter, m_knobDiameter);
-
-        QPainterPath knobPath;
-        knobPath.addEllipse(knobRect);
-
-        // 滑块阴影效果
-        QRadialGradient gradient(knobRect.center(), m_knobDiameter / 2);
-        gradient.setColorAt(0, m_knobColor.lighter(110));
-        gradient.setColorAt(1, m_knobColor);
-
-        painter.setPen(QPen(m_borderColor, 1));
-        painter.setBrush(gradient);
-        painter.drawPath(knobPath);
-
-        // 滑块内阴影效果
-        if (m_checked) {
-            QRect innerKnobRect = knobRect.adjusted(3, 3, -3, -3);
-            QPainterPath innerKnobPath;
-            innerKnobPath.addEllipse(innerKnobRect);
-
-            QRadialGradient innerGradient(innerKnobRect.center(), innerKnobRect.width() / 2);
-            innerGradient.setColorAt(0, QColor(255, 255, 255, 100));
-            innerGradient.setColorAt(1, QColor(255, 255, 255, 0));
-
-            painter.setPen(Qt::NoPen);
-            painter.setBrush(innerGradient);
-            painter.drawPath(innerKnobPath);
-        }
-    }
-
-    void mousePressEvent(QMouseEvent* event) override {
-        if (event->button() == Qt::LeftButton) {
-            event->accept();
-            setChecked(!m_checked);
-        }
-        else {
-            event->ignore();
-        }
-    }
-
-    void resizeEvent(QResizeEvent* event) override {
-        Q_UNUSED(event)
-            updateKnobGeometry();
-        // 更新滑块位置
-        setKnobPosition(m_checked ? width() - m_knobDiameter - m_padding : m_padding);
-    }
-
-private:
-    int knobPosition() const { return m_knobPosition; }
-
-    void setKnobPosition(int position) {
-        if (m_knobPosition != position) {
-            m_knobPosition = position;
-            update();
-            emit knobPositionChanged(position);
-        }
-    }
-
-    void updateKnobGeometry() {
-        m_knobDiameter = height() - 2 * m_padding - 2 * m_borderWidth;
-        // 确保滑块是圆形
-        if (m_knobDiameter > width() / 2 - m_padding) {
-            m_knobDiameter = width() / 2 - m_padding;
-        }
-    }
-
-private:
-    bool m_checked;
-    int m_knobPosition;
-    int m_animationDuration;
-
-    QColor m_onColor;
-    QColor m_offColor;
-    QColor m_knobColor;
-    QColor m_borderColor;
-    QColor m_textColor;
-
-    QPropertyAnimation* m_animation;
-
-    int m_knobDiameter;
-    int m_padding;
-    int m_borderWidth;
-
-    // 文字相关属性
-    bool m_showText;
-    QString m_trueText;
-    QString m_falseText;
-
-signals:
-    void toggled(bool checked);
-    void knobPositionChanged(int position);
-    void backgroundColorChanged(const QColor& color);
-};
-
-#endif // CIRCULARSWITCH_H

src/launcher/appConfig/appConfig.cpp

@@ -5,21 +5,21 @@ namespace fs = std::filesystem;
 void appConfig::parsingSettingJson()
 {
 	fs::path appWorkPath = fs::current_path();
-	settingJson = readJsonFromPath(appWorkPath.string() + "/config/setting.json");
-	jsonVersion = settingJson["jsonVersion"];
+	originJson = readJsonFromPath(appWorkPath.string() + "/config/setting.json");
+	jsonVersion = originJson["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 = settingJson["objectSelect"];
-	loginPassWord = settingJson["loginPassWord"];
+	objectSelect = originJson["objectSelect"];
+	loginPassWord = originJson["loginPassWord"];
 	
-	missionJson = readOrderedJsonFromPath(appWorkPath.string() + "/config/" + objectSelect +".json");
-	softwareTile = missionJson["softwareTile"];
-	imgSavePath = missionJson["backend"]["imgSaveBasePath"];
+	settingJson = readOrderedJsonFromPath(appWorkPath.string() + "/config/" + objectSelect +".json");
+	softwareTile = settingJson["softwareTile"];
+	imgSavePath = settingJson["backend"]["imgSaveBasePath"];
 	//viewer
-	auto viewerData = missionJson["ImageView"];
+	auto viewerData = settingJson["ImageView"];	
 	for (auto data = viewerData.begin(); data != viewerData.end(); data++)
 	{
 		viewerStruct v;
@@ -29,7 +29,6 @@ void appConfig::parsingSettingJson()
 		v.viewers.assign(data.value()["viewer"].begin(), data.value()["viewer"].end());
 		viewDatas.push_back(v);
 	}
-	missionJsonPath = appWorkPath.string() + "/config/" + objectSelect + ".json";
+	settingJsonPath = 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", settingJson);
-		saveOrderedJsonFromPath("./config/"+ objectSelect +".json", missionJson);
+		saveJsonFromPath("./config/setting.json", originJson);
+		saveOrderedJsonFromPath("./config/"+ objectSelect +".json", settingJson);
 		auto trans = &Translation::getInstance();
 		trans->saveToFile("./config/translation.json");
 	}
 
-	std::string missionJsonPath;
-	nlohmann::ordered_json missionJson;
+	std::string settingJsonPath;
+	nlohmann::ordered_json settingJson;
 	std::string imgSavePath;//原图存储路径
 	HWND consoleHandle;
 	SQLiteDB* dataBase = nullptr;
@@ -47,7 +47,7 @@ public:
 
 	Auth::UserManager Authorization;
 private:
-	nlohmann::json settingJson;
+	nlohmann::json originJson;
 	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.missionJson);
+    MainWindow w(&config,&bridge, config.settingJson);
     connectSignalAndSlot(&_core, &w, &bridge); // 连接信号和槽
     w.show();
     QThread::msleep(100);
      // 创建后端对象
-    _core._backEnd.loadCore(config.dataBase,&bridge, config.missionJson["backend"]); // 加载核心功能
+    _core._backEnd.loadCore(config.dataBase,&bridge, config.settingJson["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,15 +37,19 @@ public:
     }
     bool initCustom() {
 #pragma region 注册触发器回调
-        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);
+        //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_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;
     }