From e2defb681e8923768b7ca454083051cb462decda Mon Sep 17 00:00:00 2001 From: rci <15089880081@gmail.com> Date: Sun, 20 Oct 2024 17:33:05 +0800 Subject: [PATCH] update --- .../Hd_AI_algo_hanHouCeLiang.cpp | 19 +++++++++---------- .../Hd_AI_algo_hanHouCeLiang.cpp | 18 +++++++++--------- 2 files changed, 18 insertions(+), 19 deletions(-) diff --git a/BaseModules/Hd_AI_algo_hanHouCeLiang_L/Hd_AI_algo_hanHouCeLiang.cpp b/BaseModules/Hd_AI_algo_hanHouCeLiang_L/Hd_AI_algo_hanHouCeLiang.cpp index 08fa260..6b79d3d 100644 --- a/BaseModules/Hd_AI_algo_hanHouCeLiang_L/Hd_AI_algo_hanHouCeLiang.cpp +++ b/BaseModules/Hd_AI_algo_hanHouCeLiang_L/Hd_AI_algo_hanHouCeLiang.cpp @@ -8,7 +8,6 @@ #include #include using namespace cv; - //原图保存文件夹s QString oriImgSaveDir = "D:/601线/终焊CCD/焊后测量CCD/相机2/原图/"; //原图class图保存文件夹 @@ -827,7 +826,7 @@ bool Hd_AI_algo_hanHouCeLiang::AIdetect(cv::Mat img2D, QString mysaveKey, QStrin // csvName.close(); //} //sourceImg = cv::imread("D:\\mySN15-46-33-86.bmp",-1); - sourceImg = cv::imread("D:/CCD/Image_20241017202132775.bmp", -1); + //sourceImg = cv::imread("D:/CCD/Image_20241017202132775.bmp", -1); cv::Mat Paint; sourceImg.copyTo(Paint); if(Paint.channels() == 1) @@ -864,12 +863,12 @@ bool Hd_AI_algo_hanHouCeLiang::AIdetect(cv::Mat img2D, QString mysaveKey, QStrin cv::line(Paint, cv::Point(hv_Out_TopLeft_Line[i * 4 + 1].D(), hv_Out_TopLeft_Line[i * 4].D()), cv::Point(hv_Out_TopLeft_Line[i * 4 + 3].D(), hv_Out_TopLeft_Line[i * 4 + 2].D()), cv::Scalar(0, 255, 0), 20); - std::string text1 = "宽:" + std::to_string(hv_Out_TopLeft_Value[0].D()); + std::string text1 = "左间距:" + std::to_string(hv_Out_TopLeft_Value[0].D()); text1 = text1.substr(0, text1.find(".") + 4) + "mm"; putTextHusky(Paint, utf8_to_gbk(text1).c_str(), cv::Point(50, 50), cv::Scalar(0, 0, 255), 280); - std::string text2 = " 高:" + std::to_string(hv_Out_TopLeft_Value[1].D()); + std::string text2 = " 下间距:" + std::to_string(hv_Out_TopLeft_Value[1].D()); text2 = text2.substr(0, text1.find(".") + 4) + "mm"; putTextHusky(Paint, utf8_to_gbk(text2).c_str(), @@ -882,12 +881,12 @@ bool Hd_AI_algo_hanHouCeLiang::AIdetect(cv::Mat img2D, QString mysaveKey, QStrin cv::line(Paint, cv::Point(hv_Out_TopRight_Line[i * 4 + 1].D(), hv_Out_TopRight_Line[i * 4].D()), cv::Point(hv_Out_TopRight_Line[i * 4 + 3].D(), hv_Out_TopRight_Line[i * 4 + 2].D()), cv::Scalar(0, 255, 0), 20); - std::string text1 = "宽:" + std::to_string(hv_Out_TopRight_Value[0].D()); + std::string text1 = "右间距:" + std::to_string(hv_Out_TopRight_Value[0].D()); text1 = text1.substr(0, text1.find(".") + 4) + "mm"; putTextHusky(Paint, utf8_to_gbk(text1).c_str(), cv::Point(3500, 50), cv::Scalar(0, 0, 255), 280); - std::string text2 = " 高:" + std::to_string(hv_Out_TopRight_Value[1].D()); + std::string text2 = "下间距:" + std::to_string(hv_Out_TopRight_Value[1].D()); text2 = text2.substr(0, text1.find(".") + 4) + "mm"; putTextHusky(Paint, utf8_to_gbk(text2).c_str(), @@ -900,12 +899,12 @@ bool Hd_AI_algo_hanHouCeLiang::AIdetect(cv::Mat img2D, QString mysaveKey, QStrin cv::line(Paint, cv::Point(hv_Out_BottomLeft_Line[i * 4 + 1].D(), hv_Out_BottomLeft_Line[i * 4].D()), cv::Point(hv_Out_BottomLeft_Line[i * 4 + 3].D(), hv_Out_BottomLeft_Line[i * 4 + 2].D()), cv::Scalar(0, 255, 0), 20); - std::string text1 = "宽:" + std::to_string(hv_Out_BottomLeft_Value[0].D()); + std::string text1 = "左间距:" + std::to_string(hv_Out_BottomLeft_Value[0].D()); text1 = text1.substr(0, text1.find(".") + 4) + "mm"; putTextHusky(Paint, utf8_to_gbk(text1).c_str(), cv::Point(50, 3000), cv::Scalar(0, 0, 255), 280); - std::string text2 = " 高:" + std::to_string(hv_Out_BottomLeft_Value[1].D()); + std::string text2 = "上间距:" + std::to_string(hv_Out_BottomLeft_Value[1].D()); text2 = text2.substr(0, text1.find(".") + 4) + "mm"; putTextHusky(Paint, utf8_to_gbk(text2).c_str(), @@ -918,12 +917,12 @@ bool Hd_AI_algo_hanHouCeLiang::AIdetect(cv::Mat img2D, QString mysaveKey, QStrin cv::line(Paint, cv::Point(hv_Out_BottomRight_Line[i * 4 + 1].D(), hv_Out_BottomRight_Line[i * 4].D()), cv::Point(hv_Out_BottomRight_Line[i * 4 + 3].D(), hv_Out_BottomRight_Line[i * 4 + 2].D()), cv::Scalar(0, 255, 0), 20); - std::string text1 = "宽:" + std::to_string(hv_Out_BottomRight_Value[0].D()); + std::string text1 = "右间距:" + std::to_string(hv_Out_BottomRight_Value[0].D()); text1 = text1.substr(0, text1.find(".") + 4) + "mm"; putTextHusky(Paint, utf8_to_gbk(text1).c_str(), cv::Point(3500, 3000), cv::Scalar(0, 0, 255), 280); - std::string text2 = " 高:" + std::to_string(hv_Out_BottomRight_Value[1].D()); + std::string text2 = "上间距:" + std::to_string(hv_Out_BottomRight_Value[1].D()); text2 = text2.substr(0, text1.find(".") + 4) + "mm"; putTextHusky(Paint, utf8_to_gbk(text2).c_str(), diff --git a/BaseModules/Hd_AI_algo_hanHouCeLiang_T/Hd_AI_algo_hanHouCeLiang.cpp b/BaseModules/Hd_AI_algo_hanHouCeLiang_T/Hd_AI_algo_hanHouCeLiang.cpp index 1325272..6eff446 100644 --- a/BaseModules/Hd_AI_algo_hanHouCeLiang_T/Hd_AI_algo_hanHouCeLiang.cpp +++ b/BaseModules/Hd_AI_algo_hanHouCeLiang_T/Hd_AI_algo_hanHouCeLiang.cpp @@ -827,7 +827,7 @@ bool Hd_AI_algo_hanHouCeLiang::AIdetect(cv::Mat img2D, QString mysaveKey, QStrin // csvName.close(); //} //sourceImg = cv::imread("D:\\mySN15-46-33-86.bmp",-1); - sourceImg = cv::imread("D:/CCD/Image_20241017203050410.bmp", -1); + //sourceImg = cv::imread("D:/CCD/Image_20241017203050410.bmp", -1); cv::Mat Paint; sourceImg.copyTo(Paint); if(Paint.channels() == 1) @@ -864,12 +864,12 @@ bool Hd_AI_algo_hanHouCeLiang::AIdetect(cv::Mat img2D, QString mysaveKey, QStrin cv::line(Paint, cv::Point(hv_Out_TopLeft_Line[i * 4 + 1].D(), hv_Out_TopLeft_Line[i * 4].D()), cv::Point(hv_Out_TopLeft_Line[i * 4 + 3].D(), hv_Out_TopLeft_Line[i * 4 + 2].D()), cv::Scalar(0, 255, 0), 20); - std::string text1 = "宽:" + std::to_string(hv_Out_TopLeft_Value[0].D()); + std::string text1 = "左间距:" + std::to_string(hv_Out_TopLeft_Value[0].D()); text1 = text1.substr(0, text1.find(".") + 4) + "mm"; putTextHusky(Paint, utf8_to_gbk(text1).c_str(), cv::Point(50, 50), cv::Scalar(0, 0, 255), 280); - std::string text2 = " 高:" + std::to_string(hv_Out_TopLeft_Value[1].D()); + std::string text2 = "下间距:" + std::to_string(hv_Out_TopLeft_Value[1].D()); text2 = text2.substr(0, text1.find(".") + 4) + "mm"; putTextHusky(Paint, utf8_to_gbk(text2).c_str(), @@ -882,12 +882,12 @@ bool Hd_AI_algo_hanHouCeLiang::AIdetect(cv::Mat img2D, QString mysaveKey, QStrin cv::line(Paint, cv::Point(hv_Out_TopRight_Line[i * 4 + 1].D(), hv_Out_TopRight_Line[i * 4].D()), cv::Point(hv_Out_TopRight_Line[i * 4 + 3].D(), hv_Out_TopRight_Line[i * 4 + 2].D()), cv::Scalar(0, 255, 0), 20); - std::string text1 = "宽:" + std::to_string(hv_Out_TopRight_Value[0].D()); + std::string text1 = "右间距:" + std::to_string(hv_Out_TopRight_Value[0].D()); text1 = text1.substr(0, text1.find(".") + 4) + "mm"; putTextHusky(Paint, utf8_to_gbk(text1).c_str(), cv::Point(3500, 50), cv::Scalar(0, 0, 255), 280); - std::string text2 = " 高:" + std::to_string(hv_Out_TopRight_Value[1].D()); + std::string text2 = " 下间距:" + std::to_string(hv_Out_TopRight_Value[1].D()); text2 = text2.substr(0, text1.find(".") + 4) + "mm"; putTextHusky(Paint, utf8_to_gbk(text2).c_str(), @@ -900,12 +900,12 @@ bool Hd_AI_algo_hanHouCeLiang::AIdetect(cv::Mat img2D, QString mysaveKey, QStrin cv::line(Paint, cv::Point(hv_Out_BottomLeft_Line[i * 4 + 1].D(), hv_Out_BottomLeft_Line[i * 4].D()), cv::Point(hv_Out_BottomLeft_Line[i * 4 + 3].D(), hv_Out_BottomLeft_Line[i * 4 + 2].D()), cv::Scalar(0, 255, 0), 20); - std::string text1 = "宽:" + std::to_string(hv_Out_BottomLeft_Value[0].D()); + std::string text1 = "左间距:" + std::to_string(hv_Out_BottomLeft_Value[0].D()); text1 = text1.substr(0, text1.find(".") + 4) + "mm"; putTextHusky(Paint, utf8_to_gbk(text1).c_str(), cv::Point(50, 3000), cv::Scalar(0, 0, 255), 280); - std::string text2 = " 高:" + std::to_string(hv_Out_BottomLeft_Value[1].D()); + std::string text2 = "上间距:" + std::to_string(hv_Out_BottomLeft_Value[1].D()); text2 = text2.substr(0, text1.find(".") + 4) + "mm"; putTextHusky(Paint, utf8_to_gbk(text2).c_str(), @@ -918,12 +918,12 @@ bool Hd_AI_algo_hanHouCeLiang::AIdetect(cv::Mat img2D, QString mysaveKey, QStrin cv::line(Paint, cv::Point(hv_Out_BottomRight_Line[i * 4 + 1].D(), hv_Out_BottomRight_Line[i * 4].D()), cv::Point(hv_Out_BottomRight_Line[i * 4 + 3].D(), hv_Out_BottomRight_Line[i * 4 + 2].D()), cv::Scalar(0, 255, 0), 20); - std::string text1 = "宽:" + std::to_string(hv_Out_BottomRight_Value[0].D()); + std::string text1 = "右间距:" + std::to_string(hv_Out_BottomRight_Value[0].D()); text1 = text1.substr(0, text1.find(".") + 4) + "mm"; putTextHusky(Paint, utf8_to_gbk(text1).c_str(), cv::Point(3500, 3000), cv::Scalar(0, 0, 255), 280); - std::string text2 = " 高:" + std::to_string(hv_Out_BottomRight_Value[1].D()); + std::string text2 = "上间距:" + std::to_string(hv_Out_BottomRight_Value[1].D()); text2 = text2.substr(0, text1.find(".") + 4) + "mm"; putTextHusky(Paint, utf8_to_gbk(text2).c_str(),