wheelArchHeigthMeasure version 1.3.0 :
修正了寻找上下点使用固定门限的问题
This commit is contained in:
parent
3ddb970acc
commit
4f24efc6b6
@ -8,7 +8,8 @@
|
|||||||
//version 1.0.0 : base version release to customer
|
//version 1.0.0 : base version release to customer
|
||||||
//version 1.1.0 : 添加了轮眉到地面高度输出
|
//version 1.1.0 : 添加了轮眉到地面高度输出
|
||||||
//version 1.2.0 : 修正了地面调平,防止法向量旋转180度
|
//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)
|
const char* wd_wheelArchHeigthMeasureVersion(void)
|
||||||
{
|
{
|
||||||
return m_strVersion.c_str();
|
return m_strVersion.c_str();
|
||||||
@ -430,7 +431,7 @@ WD_wheelArchInfo wd_wheelArchHeigthMeasure(
|
|||||||
SSG_cornerParam wheelCornerPara;
|
SSG_cornerParam wheelCornerPara;
|
||||||
memset(&wheelCornerPara, 0, sizeof(SSG_cornerParam));
|
memset(&wheelCornerPara, 0, sizeof(SSG_cornerParam));
|
||||||
wheelCornerPara.scale = 6.0;
|
wheelCornerPara.scale = 6.0;
|
||||||
wheelCornerPara.cornerTh = 75.0;
|
wheelCornerPara.cornerTh = cornerPara.cornerTh;
|
||||||
for (int line = startLine; line <= endLine; line++)
|
for (int line = startLine; line <= endLine; line++)
|
||||||
{
|
{
|
||||||
std::vector<SSG_basicFeature1D> cornerFeatures;
|
std::vector<SSG_basicFeature1D> cornerFeatures;
|
||||||
|
|||||||
@ -2683,7 +2683,7 @@ int main()
|
|||||||
|
|
||||||
#if TEST_COMPUTE_CALIB_PARA
|
#if TEST_COMPUTE_CALIB_PARA
|
||||||
char _calib_datafile[256];
|
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<SVzNL3DPosition>> scanLines;
|
std::vector< std::vector<SVzNL3DPosition>> scanLines;
|
||||||
vzReadLaserScanPointFromFile_XYZ_vector(_calib_datafile, scanLines);
|
vzReadLaserScanPointFromFile_XYZ_vector(_calib_datafile, scanLines);
|
||||||
@ -2704,10 +2704,10 @@ int main()
|
|||||||
#endif
|
#endif
|
||||||
//
|
//
|
||||||
char calibFile[250];
|
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);
|
_outputCalibPara(calibFile, calibPara);
|
||||||
char _out_file[256];
|
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);
|
_outputScanDataFile_self(_out_file, scanLines, 0, 0, 0);
|
||||||
printf("%s: calib done!\n", _calib_datafile);
|
printf("%s: calib done!\n", _calib_datafile);
|
||||||
}
|
}
|
||||||
@ -2716,11 +2716,11 @@ int main()
|
|||||||
|
|
||||||
#if TEST_COMPUTE_WHEEL_ARCH
|
#if TEST_COMPUTE_WHEEL_ARCH
|
||||||
const char* dataPath[TEST_GROUP] = {
|
const char* dataPath[TEST_GROUP] = {
|
||||||
"F:/ShangGu/项目/冠钦_轮眉高度测量/测试数据/现场数据/", //0
|
"F:/ShangGu/项目/冠钦_轮眉高度测量/测试数据/现场数据2/", //0
|
||||||
};
|
};
|
||||||
|
|
||||||
SVzNLRange fileIdx[TEST_GROUP] = {
|
SVzNLRange fileIdx[TEST_GROUP] = {
|
||||||
{1,2},
|
{1,1},
|
||||||
};
|
};
|
||||||
|
|
||||||
SSG_planeCalibPara poseCalibPara;
|
SSG_planeCalibPara poseCalibPara;
|
||||||
@ -2776,7 +2776,7 @@ int main()
|
|||||||
_outputScanDataFile_self(_scan_file, scanData, 0, 0, 0);
|
_outputScanDataFile_self(_scan_file, scanData, 0, 0, 0);
|
||||||
#endif
|
#endif
|
||||||
SSG_cornerParam cornerParam;
|
SSG_cornerParam cornerParam;
|
||||||
cornerParam.cornerTh = 60; //45度角
|
cornerParam.cornerTh = 45; //45度角
|
||||||
cornerParam.scale = 50; // algoParam.bagParam.bagH / 8; // 15; // algoParam.bagParam.bagH / 8;
|
cornerParam.scale = 50; // algoParam.bagParam.bagH / 8; // 15; // algoParam.bagParam.bagH / 8;
|
||||||
cornerParam.minEndingGap = 20; // algoParam.bagParam.bagW / 4;
|
cornerParam.minEndingGap = 20; // algoParam.bagParam.bagW / 4;
|
||||||
cornerParam.minEndingGap_z = 20;
|
cornerParam.minEndingGap_z = 20;
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user