From bfb0b8064cb51383a70223a217b6a4441f82757f Mon Sep 17 00:00:00 2001 From: "15089880081@163.com" <15089880081@163.com> Date: Wed, 14 Aug 2024 15:56:29 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../HandleAiUi-new/algo/CISCO_APEXSMALL.hpp | 6 +- .../appConfig/sqlManager/sqlManager.cpp | 5 +- HanddleAI/HandleAiUi-new/appCore.hpp | 2 +- .../HandleAiUi-new/appCoreQtFunction.cpp | 6 - HanddleAI/HandleAiUi-new/appCoreQtFunction.h | 2 - .../uiModule/uiModule_backContinueDetDialog.h | 2 +- configBackup/config/productConfig/CS9600.json | 271 ++++++++++++++ .../config/productConfig/MDS9710.json | 341 +++++++++++++++++- lib/Hd_3DCameraLMI_module_PointLazer.exp | Bin 774 -> 772 bytes lib/Hd_DalsaCamera_module.exp | Bin 753 -> 751 bytes lib/Hd_FinsTcp_module.exp | Bin 745 -> 743 bytes lib/Hd_MvCamera_module_GENTL.exp | Bin 758 -> 756 bytes lib/Hd_MvCamera_module_GIGE.exp | Bin 757 -> 755 bytes lib/Hd_ResultsSummary_module.exp | Bin 758 -> 756 bytes lib/Hd_SocketModule_ModbusTcp.exp | Bin 1503 -> 1501 bytes 15 files changed, 619 insertions(+), 16 deletions(-) delete mode 100644 HanddleAI/HandleAiUi-new/appCoreQtFunction.cpp diff --git a/HanddleAI/HandleAiUi-new/algo/CISCO_APEXSMALL.hpp b/HanddleAI/HandleAiUi-new/algo/CISCO_APEXSMALL.hpp index 15966930..4b7bd9f5 100644 --- a/HanddleAI/HandleAiUi-new/algo/CISCO_APEXSMALL.hpp +++ b/HanddleAI/HandleAiUi-new/algo/CISCO_APEXSMALL.hpp @@ -3,7 +3,7 @@ #include #include #include -static double pixACC = 0.01; +static double apexSmallpixACC = 0.01; //输入det切出的连接器图片 cv::Size apexSmallMinPin(30, 30), apexSmallMaxPin(400, 400); static void apexSmallHalconPaint(cv::Mat& out, std::vectorxLines, const std::vector& AllPinsPos, const std::vector& AllPos, double& maxRange) @@ -29,7 +29,7 @@ static void apexSmallHalconPaint(cv::Mat& out, std::vectorxLi for (auto& rectIn : groupedRectangles[i]) { cv::Point mid(rectIn.rect.x, rectIn.rect.y); - double range = pointToLineDistance(mid, xLines[i].start, xLines[i].end) * pixACC; + double range = pointToLineDistance(mid, xLines[i].start, xLines[i].end) * apexSmallpixACC; maxRange = max(maxRange, range); cv::Rect rect(rectIn.rect.x - rectIn.rect.width / 2, rectIn.rect.y - rectIn.rect.height / 2, rectIn.rect.width, rectIn.rect.height); cv::Scalar scolor; @@ -50,7 +50,7 @@ static void apexSmallHalconPaint(cv::Mat& out, std::vectorxLi for (auto& rectIn : PinGroupedRectangles[i]) { cv::Point mid(rectIn.x, rectIn.y); - double range = pointToLineDistance(mid, xLines[i].start, xLines[i].end) * pixACC; + double range = pointToLineDistance(mid, xLines[i].start, xLines[i].end) * apexSmallpixACC; maxRange = max(maxRange, range); cv::Rect rect(rectIn.x - rectIn.width / 2, rectIn.y - rectIn.height / 2, rectIn.width, rectIn.height); cv::Scalar scolor = cv::Scalar(0, 255, 0); diff --git a/HanddleAI/HandleAiUi-new/appConfig/sqlManager/sqlManager.cpp b/HanddleAI/HandleAiUi-new/appConfig/sqlManager/sqlManager.cpp index ba621d7d..59db566f 100644 --- a/HanddleAI/HandleAiUi-new/appConfig/sqlManager/sqlManager.cpp +++ b/HanddleAI/HandleAiUi-new/appConfig/sqlManager/sqlManager.cpp @@ -93,7 +93,7 @@ void sqlManager::initialization(appConfig* _appConfig,std::string dataBasePath, std::cout << "SQL runing Init..." << std::endl; dbPtr = new sqliteModule(dataBasePath);//鍒濆鍖 dbPtr->backup(dataBasePath + getCurrentDate() + ".db");//澶囦唤 - std::vectortables = getFutureDates(180); + std::vectortables = getFutureDates(30); //鏁村悎鎵闇瑕佺殑鏁版嵁鍚 std::vectordataStr; @@ -160,7 +160,10 @@ bool sqlManager::addData(std::string SN,std::vector data) if (res.customType == sqlFalse) { for (auto keyName : data) + { dbPtr->addColumn(currentTableName, keyName.key, "text"); + std::cout << "new col insert" << keyName.key << std::endl; + } dbPtr->Insert(currentTableName, SN, data); } mutex.unlock(); diff --git a/HanddleAI/HandleAiUi-new/appCore.hpp b/HanddleAI/HandleAiUi-new/appCore.hpp index 764eeafa..8edd822e 100644 --- a/HanddleAI/HandleAiUi-new/appCore.hpp +++ b/HanddleAI/HandleAiUi-new/appCore.hpp @@ -10,7 +10,7 @@ #include -#define disableBackEndCheck 0 +#define disableBackEndCheck 1 #define disableeAlgo 0 #define enableHideConsle 1 class detGlobalData diff --git a/HanddleAI/HandleAiUi-new/appCoreQtFunction.cpp b/HanddleAI/HandleAiUi-new/appCoreQtFunction.cpp deleted file mode 100644 index eaf285a2..00000000 --- a/HanddleAI/HandleAiUi-new/appCoreQtFunction.cpp +++ /dev/null @@ -1,6 +0,0 @@ -#include - -void qtFunction::productDetEnded() -{ - -} diff --git a/HanddleAI/HandleAiUi-new/appCoreQtFunction.h b/HanddleAI/HandleAiUi-new/appCoreQtFunction.h index 5e667ec0..e6bd99cd 100644 --- a/HanddleAI/HandleAiUi-new/appCoreQtFunction.h +++ b/HanddleAI/HandleAiUi-new/appCoreQtFunction.h @@ -4,8 +4,6 @@ class qtFunction :public QObject { Q_OBJECT -public slots: - void productDetEnded();//整个检测流程结束 signals: void sendErrorToMainwindow(backEndError); void sendPixmapImageWidget(showImgPack*); diff --git a/HanddleAI/HandleAiUi-new/uiModule/uiModule_backContinueDetDialog.h b/HanddleAI/HandleAiUi-new/uiModule/uiModule_backContinueDetDialog.h index 680cd358..2fc4a80d 100644 --- a/HanddleAI/HandleAiUi-new/uiModule/uiModule_backContinueDetDialog.h +++ b/HanddleAI/HandleAiUi-new/uiModule/uiModule_backContinueDetDialog.h @@ -11,7 +11,7 @@ public: backContinueDetDialog() { timer = new QTimer(this); - _fancyWarnWindow = new fancyWarnWindow(fancyWarnWindow::tip, "是否继续背面检测", "", true); + _fancyWarnWindow = new fancyWarnWindow(fancyWarnWindow::tip, "是否继续背面检测", "", false); _fancyWarnWindow->disableHideAfterClicked(); _fancyWarnWindow->hide(); QObject::connect(_fancyWarnWindow->continueBtn, &QPushButton::clicked, this, &backContinueDetDialog::continueClicked); diff --git a/configBackup/config/productConfig/CS9600.json b/configBackup/config/productConfig/CS9600.json index 0c318d64..daad4e8e 100644 --- a/configBackup/config/productConfig/CS9600.json +++ b/configBackup/config/productConfig/CS9600.json @@ -27,6 +27,277 @@ "codedAlgoIndex":-1, "HandleAi": { + }, + "productSign": { + "1": { + "x": 1565, + "y": 20, + "w": 300, + "h": 170, + "sign": "鍒1琛1" + }, + "2": { + "x": 1300, + "y": 20, + "w": 300, + "h": 170, + "sign": "鍒2琛1" + }, + "3": { + "x": 1050, + "y": 20, + "w": 300, + "h": 170, + "sign": "鍒3琛1" + }, + "4": { + "x": 600, + "y": 20, + "w": 300, + "h": 170, + "sign": "鍒4琛1" + }, + "5": { + "x": 330, + "y": 20, + "w": 300, + "h": 170, + "sign": "鍒5琛1" + }, + "6": { + "x": 55, + "y": 20, + "w": 300, + "h": 170, + "sign": "鍒6琛1" + }, + "7": { + "x": 1565, + "y": 330, + "w": 300, + "h": 170, + "sign": "鍒1琛2" + }, + "8": { + "x": 1300, + "y": 330, + "w": 300, + "h": 170, + "sign": "鍒2琛2" + }, + "9": { + "x": 1050, + "y": 330, + "w": 300, + "h": 170, + "sign": "鍒3琛2" + }, + "10": { + "x": 600, + "y": 330, + "w": 300, + "h": 170, + "sign": "鍒4琛2" + }, + "11": { + "x": 330, + "y": 330, + "w": 300, + "h": 170, + "sign": "鍒5琛2" + }, + "12": { + "x": 55, + "y": 330, + "w": 300, + "h": 170, + "sign": "鍒6琛2" + }, + "13": { + "x": 90, + "y": 575, + "w": 220, + "h": 210, + "sign": "鍒1琛3" + }, + "14": { + "x": 300, + "y": 575, + "w": 240, + "h": 210, + "sign": "鍒2琛3" + }, + "15": { + "x": 550, + "y": 575, + "w": 240, + "h": 210, + "sign": "鍒3琛3" + }, + "16": { + "x": 800, + "y": 575, + "w": 240, + "h": 210, + "sign": "鍒4琛3" + }, + "17": { + "x": 1050, + "y": 575, + "w": 240, + "h": 210, + "sign": "鍒5琛3" + }, + "18": { + "x": 1300, + "y": 575, + "w": 240, + "h": 210, + "sign": "鍒6琛3" + } + , + "19": { + "x": 1550, + "y": 575, + "w": 240, + "h": 210, + "sign": "鍒7琛3" + }, + "20": { + "x": 90, + "y": 880, + "w": 220, + "h": 210, + "sign": "鍒1琛4" + }, + "21": { + "x": 300, + "y": 880, + "w": 240, + "h": 210, + "sign": "鍒2琛4" + }, + "22": { + "x": 550, + "y": 880, + "w": 240, + "h": 210, + "sign": "鍒3琛4" + }, + "23": { + "x": 800, + "y": 880, + "w": 240, + "h": 210, + "sign": "鍒4琛4" + }, + "24": { + "x": 1050, + "y": 880, + "w": 240, + "h": 210, + "sign": "鍒5琛4" + }, + "25": { + "x": 1300, + "y": 880, + "w": 240, + "h": 210, + "sign": "鍒6琛4" + } + , + "26": { + "x": 1550, + "y": 880, + "w": 240, + "h": 210, + "sign": "鍒7琛4" + }, + "27": { + "x": 1565, + "y": 1230, + "w": 300, + "h": 170, + "sign": "鍒1琛5" + }, + "28": { + "x": 1300, + "y": 1230, + "w": 300, + "h": 170, + "sign": "鍒2琛5" + }, + "29": { + "x": 1050, + "y": 1230, + "w": 300, + "h": 170, + "sign": "鍒3琛5" + }, + "30": { + "x": 600, + "y": 1230, + "w": 300, + "h": 170, + "sign": "鍒4琛5" + }, + "31": { + "x": 330, + "y": 1230, + "w": 300, + "h": 170, + "sign": "鍒5琛5" + }, + "32": { + "x": 55, + "y": 1230, + "w": 300, + "h": 170, + "sign": "鍒6琛5" + }, + "33": { + "x": 1565, + "y": 1520, + "w": 300, + "h": 170, + "sign": "鍒1琛6" + }, + "34": { + "x": 1300, + "y": 1520, + "w": 300, + "h": 170, + "sign": "鍒2琛6" + }, + "35": { + "x": 1050, + "y": 1520, + "w": 300, + "h": 170, + "sign": "鍒3琛6" + }, + "36": { + "x": 600, + "y": 1520, + "w": 300, + "h": 170, + "sign": "鍒4琛6" + }, + "37": { + "x": 330, + "y": 1520, + "w": 300, + "h": 170, + "sign": "鍒5琛6" + }, + "38": { + "x": 55, + "y": 1520, + "w": 300, + "h": 170, + "sign": "鍒6琛6" + } + } diff --git a/configBackup/config/productConfig/MDS9710.json b/configBackup/config/productConfig/MDS9710.json index 3289befc..c76f9d08 100644 --- a/configBackup/config/productConfig/MDS9710.json +++ b/configBackup/config/productConfig/MDS9710.json @@ -45,7 +45,344 @@ } } ] - } - + }, + "productSign": { + "1": { + "x": 1305, + "y": 10, + "w": 150, + "h": 160, + "sign": "鍒1琛1" + }, + "2": { + "x": 1305, + "y": 170, + "w": 150, + "h": 160, + "sign": "鍒1琛2" + }, + "3": { + "x": 1305, + "y": 330, + "w": 150, + "h": 160, + "sign": "鍒1琛3" + }, + "4": { + "x": 1305, + "y": 490, + "w": 150, + "h": 160, + "sign": "鍒1琛4" + }, + "5": { + "x": 1305, + "y": 650, + "w": 150, + "h": 160, + "sign": "鍒1琛5" + }, + "6": { + "x": 1305, + "y": 810, + "w": 150, + "h": 160, + "sign": "鍒1琛6" + }, + "7": { + "x": 1305, + "y": 970, + "w": 150, + "h": 160, + "sign": "鍒1琛7" + }, + "8": { + "x": 1305, + "y": 1130, + "w": 150, + "h": 160, + "sign": "鍒1琛8" + }, + "9": { + "x": 1095, + "y": 1130, + "w": 150, + "h": 160, + "sign": "鍒2琛8" + }, + "10": { + "x": 1095, + "y": 970, + "w": 150, + "h": 160, + "sign": "鍒2琛7" + }, + "11": { + "x": 1095, + "y": 810, + "w": 150, + "h": 160, + "sign": "鍒2琛6" + }, + "12": { + "x": 1095, + "y": 650, + "w": 150, + "h": 160, + "sign": "鍒2琛5" + }, + "13": { + "x": 1095, + "y": 490, + "w": 150, + "h": 160, + "sign": "鍒2琛4" + }, + "14": { + "x": 1095, + "y": 330, + "w": 150, + "h": 160, + "sign": "鍒2琛3" + }, + "15": { + "x": 1095, + "y": 170, + "w": 150, + "h": 160, + "sign": "鍒2琛2" + }, + "16": { + "x": 1095, + "y": 10, + "w": 150, + "h": 160, + "sign": "鍒2琛1" + }, + "17": { + "x": 875, + "y": 10, + "w": 150, + "h": 160, + "sign": "鍒3琛1" + }, + "18": { + "x": 875, + "y": 170, + "w": 150, + "h": 160, + "sign": "鍒3琛2" + }, + "19": { + "x": 875, + "y": 330, + "w": 150, + "h": 160, + "sign": "鍒3琛3" + }, + "20": { + "x": 875, + "y": 490, + "w": 150, + "h": 160, + "sign": "鍒3琛4" + }, + "21": { + "x": 875, + "y": 650, + "w": 150, + "h": 160, + "sign": "鍒3琛5" + }, + "22": { + "x": 875, + "y": 810, + "w": 150, + "h": 160, + "sign": "鍒3琛6" + }, + "23": { + "x": 875, + "y": 970, + "w": 150, + "h": 160, + "sign": "鍒3琛7" + }, + "24": { + "x": 875, + "y": 1130, + "w": 150, + "h": 160, + "sign": "鍒3琛8" + }, + "25": { + "x": 655, + "y": 1130, + "w": 150, + "h": 160, + "sign": "鍒4琛8" + }, + "26": { + "x": 655, + "y": 970, + "w": 150, + "h": 160, + "sign": "鍒4琛7" + }, + "27": { + "x": 655, + "y": 810, + "w": 150, + "h": 160, + "sign": "鍒4琛6" + }, + "28": { + "x": 655, + "y": 650, + "w": 150, + "h": 160, + "sign": "鍒4琛5" + }, + "29": { + "x": 655, + "y": 490, + "w": 150, + "h": 160, + "sign": "鍒4琛4" + }, + "30": { + "x": 655, + "y": 330, + "w": 150, + "h": 160, + "sign": "鍒4琛3" + }, + "31": { + "x": 655, + "y": 170, + "w": 150, + "h": 160, + "sign": "鍒4琛2" + }, + "32": { + "x": 655, + "y": 10, + "w": 150, + "h": 160, + "sign": "鍒4琛1" + }, + "33": { + "x": 405, + "y": 10, + "w": 150, + "h": 160, + "sign": "鍒5琛1" + }, + "34": { + "x": 405, + "y": 170, + "w": 150, + "h": 160, + "sign": "鍒5琛2" + }, + "35": { + "x": 405, + "y": 330, + "w": 150, + "h": 160, + "sign": "鍒5琛3" + }, + "36": { + "x": 405, + "y": 490, + "w": 150, + "h": 160, + "sign": "鍒5琛4" + }, + "37": { + "x": 405, + "y": 650, + "w": 150, + "h": 160, + "sign": "鍒5琛5" + }, + "38": { + "x": 405, + "y": 810, + "w": 150, + "h": 160, + "sign": "鍒5琛6" + }, + "39": { + "x": 405, + "y": 970, + "w": 150, + "h": 160, + "sign": "鍒5琛7" + }, + "40": { + "x": 405, + "y": 1130, + "w": 150, + "h": 160, + "sign": "鍒5琛8" + }, + "41": { + "x": 155, + "y": 1130, + "w": 150, + "h": 160, + "sign": "鍒6琛1" + }, + "42": { + "x": 155, + "y": 970, + "w": 150, + "h": 160, + "sign": "鍒6琛2" + }, + "43": { + "x": 155, + "y": 810, + "w": 150, + "h": 160, + "sign": "鍒6琛3" + }, + "44": { + "x": 155, + "y": 650, + "w": 150, + "h": 160, + "sign": "鍒6琛4" + }, + "45": { + "x": 155, + "y": 490, + "w": 150, + "h": 160, + "sign": "鍒6琛5" + }, + "46": { + "x": 155, + "y": 330, + "w": 150, + "h": 160, + "sign": "鍒6琛6" + }, + "47": { + "x": 155, + "y": 170, + "w": 150, + "h": 160, + "sign": "鍒6琛7" + }, + "48": { + "x": 155, + "y": 10, + "w": 150, + "h": 160, + "sign": "鍒6琛8" + } + } } \ No newline at end of file diff --git a/lib/Hd_3DCameraLMI_module_PointLazer.exp b/lib/Hd_3DCameraLMI_module_PointLazer.exp index 4d888b40a9c5375f642662f99829c7d90e8cb894..c128f721899e1a2fd5f5ffe10a0335da718ee8af 100644 GIT binary patch delta 88 zcmZo;YhmL|X=7se4+I($Ih`3pz{lUP%V9UTL2&5R?CR;KlYh^Ro3Nj>@r!cr# p#Uy7IC+9onXNG3RGjB$a07q{LL1ndrKtCY7ddKEY_m2mrOR8>;{S delta 90 zcmZo+Yh&X~X=7se4+L5hIh`5VCi>pz{l&n*V9UTL2&5QXCR;Kl>*O-n3Nj>@r!cr! r#Uy7IC+9onXNG3RGjB$a07q{LL1ndla!=AQM&7B63=C!rjDie6;5ONnDTXVX!B&tVxjY5P TUCkuT>XMpNn!foglMpii56BdX delta 69 zcmcc1eV>~%rHzT