diff --git a/workpieceHolePositioning_test/workpieceHolePositioning_test.cpp b/workpieceHolePositioning_test/workpieceHolePositioning_test.cpp index 7f795ca..30f9dbe 100644 --- a/workpieceHolePositioning_test/workpieceHolePositioning_test.cpp +++ b/workpieceHolePositioning_test/workpieceHolePositioning_test.cpp @@ -368,20 +368,27 @@ void _outputRGBDResult_RGBD( size = 2; for (int i = 0; i < objNumber; i++) { + SVzNL3DPoint dirPt; + dirPt = { workpiecePositioning[i].center.x + workpiecePositioning[i].y_dir.x * 10, + workpiecePositioning[i].center.y + workpiecePositioning[i].y_dir.y * 10, + workpiecePositioning[i].center.z + workpiecePositioning[i].y_dir.z * 10 }; sw << "Poly_" << lineIdx << "_2" << std::endl; sw << "{" << workpiecePositioning[i].center.x << "," << workpiecePositioning[i].center.y << "," << workpiecePositioning[i].center.z << "}-"; sw << "{0,0}-{0,0}-"; sw << "{" << (int)rgb.r << "," << (int)rgb.g << "," << (int)rgb.b << "," << size << "}" << std::endl; - sw << "{" << workpiecePositioning[i].y_dir.x << "," << workpiecePositioning[i].y_dir.y << "," << workpiecePositioning[i].y_dir.z << "}-"; + sw << "{" << dirPt.x << "," << dirPt.y << "," << dirPt.z << "}-"; sw << "{0,0}-{0,0}-"; sw << "{" << (int)rgb.r << "," << (int)rgb.g << "," << (int)rgb.b << "," << size << "}" << std::endl; lineIdx++; + dirPt = { workpiecePositioning[i].center.x + workpiecePositioning[i].z_dir.x * 10, + workpiecePositioning[i].center.y + workpiecePositioning[i].z_dir.y * 10, + workpiecePositioning[i].center.z + workpiecePositioning[i].z_dir.z * 10 }; sw << "Poly_" << lineIdx << "_2" << std::endl; sw << "{" << workpiecePositioning[i].center.x << "," << workpiecePositioning[i].center.y << "," << workpiecePositioning[i].center.z << "}-"; sw << "{0,0}-{0,0}-"; sw << "{" << (int)rgb.r << "," << (int)rgb.g << "," << (int)rgb.b << "," << size << "}" << std::endl; - sw << "{" << workpiecePositioning[i].z_dir.x << "," << workpiecePositioning[i].z_dir.y << "," << workpiecePositioning[i].z_dir.z << "}-"; + sw << "{" << dirPt.x << "," << dirPt.y << "," << dirPt.z << "}-"; sw << "{0,0}-{0,0}-"; sw << "{" << (int)rgb.r << "," << (int)rgb.g << "," << (int)rgb.b << "," << size << "}" << std::endl; lineIdx++; @@ -398,15 +405,17 @@ void _outputRGBDResult_RGBD( lineIdx++; } } + SVzNL3DPoint dirPt = { workpiecePositioning[0].center.x + workpiecePositioning[0].y_dir.x * 10, + workpiecePositioning[0].center.y + workpiecePositioning[0].y_dir.y * 10, + workpiecePositioning[0].center.z + workpiecePositioning[0].y_dir.z * 10 }; sw << "Poly_" << lineIdx << "_2" << std::endl; sw << "{" << workpiecePositioning[0].center.x << "," << workpiecePositioning[0].center.y << "," << workpiecePositioning[0].center.z << "}-"; sw << "{0,0}-{0,0}-"; sw << "{" << (int)rgb.r << "," << (int)rgb.g << "," << (int)rgb.b << "," << size << "}" << std::endl; - sw << "{" << workpiecePositioning[0].y_dir.x << "," << workpiecePositioning[0].y_dir.y << "," << workpiecePositioning[0].y_dir.z << "}-"; + sw << "{" << dirPt.x << "," << dirPt.y << "," << dirPt.z << "}-"; sw << "{0,0}-{0,0}-"; sw << "{" << (int)rgb.r << "," << (int)rgb.g << "," << (int)rgb.b << "," << size << "}" << std::endl; - sw.close(); } @@ -433,7 +442,7 @@ int main() }; SVzNLRange fileIdx[TEST_GROUP] = { - {1,4}, + {5,5}, }; const char* ver = wd_workpieceHolePositioningVersion(); @@ -514,7 +523,7 @@ int main() groundCalibPara.invRMatrix[i] = groundCalibPara.planeCalib[i]; char calibFile[250]; sprintf_s(calibFile, "%sground_calib_para.txt", dataPath[grp]); - groundCalibPara = _readCalibPara(calibFile); + //groundCalibPara = _readCalibPara(calibFile); for (int fidx = fileIdx[grp].nMin; fidx <= fileIdx[grp].nMax; fidx++) {