From 4f24efc6b6980b2479468faa39a5c88947ae9c66 Mon Sep 17 00:00:00 2001 From: jerryzeng Date: Wed, 7 Jan 2026 23:21:23 +0800 Subject: [PATCH] =?UTF-8?q?wheelArchHeigthMeasure=20version=201.3.0=20:=20?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E4=BA=86=E5=AF=BB=E6=89=BE=E4=B8=8A=E4=B8=8B?= =?UTF-8?q?=E7=82=B9=E4=BD=BF=E7=94=A8=E5=9B=BA=E5=AE=9A=E9=97=A8=E9=99=90?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sourceCode/wheelArchHeigthMeasure.cpp | 5 +++-- .../wheelArchHeigthMeasure_test.cpp | 12 ++++++------ 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/sourceCode/wheelArchHeigthMeasure.cpp b/sourceCode/wheelArchHeigthMeasure.cpp index 8b47c72..81f7f7e 100644 --- a/sourceCode/wheelArchHeigthMeasure.cpp +++ b/sourceCode/wheelArchHeigthMeasure.cpp @@ -8,7 +8,8 @@ //version 1.0.0 : base version release to customer //version 1.1.0 : 添加了轮眉到地面高度输出 //version 1.2.0 : 修正了地面调平，防止法向量旋转180度 -std::string m_strVersion = "1.2.0"; +//version 1.3.0 : 修正了寻找上下点使用固定门限的问题 +std::string m_strVersion = "1.3.0"; const char* wd_wheelArchHeigthMeasureVersion(void) { return m_strVersion.c_str(); @@ -430,7 +431,7 @@ WD_wheelArchInfo wd_wheelArchHeigthMeasure( SSG_cornerParam wheelCornerPara; memset(&wheelCornerPara, 0, sizeof(SSG_cornerParam)); wheelCornerPara.scale = 6.0; - wheelCornerPara.cornerTh = 75.0; + wheelCornerPara.cornerTh = cornerPara.cornerTh; for (int line = startLine; line <= endLine; line++) { std::vector cornerFeatures; diff --git a/wheelArchHeigthMeasure_test/wheelArchHeigthMeasure_test.cpp b/wheelArchHeigthMeasure_test/wheelArchHeigthMeasure_test.cpp index a19004f..b47f800 100644 --- a/wheelArchHeigthMeasure_test/wheelArchHeigthMeasure_test.cpp +++ b/wheelArchHeigthMeasure_test/wheelArchHeigthMeasure_test.cpp @@ -2683,7 +2683,7 @@ int main() #if TEST_COMPUTE_CALIB_PARA char _calib_datafile[256]; - sprintf_s(_calib_datafile, "F:/ShangGu/椤圭洰/鍐犻挦_杞湁楂樺害娴嬮噺/娴嬭瘯鏁版嵁/鐜板満鏁版嵁/ground_LaserData.txt"); + sprintf_s(_calib_datafile, "F:/ShangGu/椤圭洰/鍐犻挦_杞湁楂樺害娴嬮噺/娴嬭瘯鏁版嵁/鐜板満鏁版嵁2/ground_LaserData.txt"); std::vector< std::vector> scanLines; vzReadLaserScanPointFromFile_XYZ_vector(_calib_datafile, scanLines); @@ -2704,10 +2704,10 @@ int main() #endif // char calibFile[250]; - sprintf_s(calibFile, "F:/ShangGu/椤圭洰/鍐犻挦_杞湁楂樺害娴嬮噺/娴嬭瘯鏁版嵁/鐜板満鏁版嵁/ground_calib_para.txt"); + sprintf_s(calibFile, "F:/ShangGu/椤圭洰/鍐犻挦_杞湁楂樺害娴嬮噺/娴嬭瘯鏁版嵁/鐜板満鏁版嵁2/ground_calib_para.txt"); _outputCalibPara(calibFile, calibPara); char _out_file[256]; - sprintf_s(_out_file, "F:/ShangGu/椤圭洰/鍐犻挦_杞湁楂樺害娴嬮噺/娴嬭瘯鏁版嵁/鐜板満鏁版嵁/LaserLine_grund_calib.txt"); + sprintf_s(_out_file, "F:/ShangGu/椤圭洰/鍐犻挦_杞湁楂樺害娴嬮噺/娴嬭瘯鏁版嵁/鐜板満鏁版嵁2/LaserLine_grund_calib.txt"); _outputScanDataFile_self(_out_file, scanLines, 0, 0, 0); printf("%s: calib done!\n", _calib_datafile); } @@ -2716,11 +2716,11 @@ int main() #if TEST_COMPUTE_WHEEL_ARCH const char* dataPath[TEST_GROUP] = { - "F:/ShangGu/椤圭洰/鍐犻挦_杞湁楂樺害娴嬮噺/娴嬭瘯鏁版嵁/鐜板満鏁版嵁/", //0 + "F:/ShangGu/椤圭洰/鍐犻挦_杞湁楂樺害娴嬮噺/娴嬭瘯鏁版嵁/鐜板満鏁版嵁2/", //0 }; SVzNLRange fileIdx[TEST_GROUP] = { - {1,2}, + {1,1}, }; SSG_planeCalibPara poseCalibPara; @@ -2776,7 +2776,7 @@ int main() _outputScanDataFile_self(_scan_file, scanData, 0, 0, 0); #endif SSG_cornerParam cornerParam; - cornerParam.cornerTh = 60; //45搴﹁ + cornerParam.cornerTh = 45; //45搴﹁ cornerParam.scale = 50; // algoParam.bagParam.bagH / 8; // 15; // algoParam.bagParam.bagH / 8; cornerParam.minEndingGap = 20; // algoParam.bagParam.bagW / 4; cornerParam.minEndingGap_z = 20;