diff --git a/HanddleAI/HandleAiUi-new/algo/ALGO_Correction.h b/HanddleAI/HandleAiUi-new/algo/ALGO_Correction.h index db14da78..62a2f75c 100644 --- a/HanddleAI/HandleAiUi-new/algo/ALGO_Correction.h +++ b/HanddleAI/HandleAiUi-new/algo/ALGO_Correction.h @@ -275,15 +275,15 @@ void test() } CorrectionPoints oldPoints; -double originX = -125, originY = -450, originZ = -202; -double originRx = -0.228863, originRy = 0.142551, originRz = -0.676582; +double originX = -125.3, originY = -450.4, originZ = -233.8; +double originRx = -0.278863, originRy = 0.142551, originRz = -0.676582; //-726.5 -1104.1 -33989.4 -24.6389 14.1795 -0.660849 void createModbusStrs(const int startPos,double& Value, std::shared_ptr data) { data->writeBack("short", startPos, QString::number(Value < 0 ? 2 : 1)); data->writeBack("short", startPos + 1, QString::number(abs(static_cast(Value)))); double pvalue = Value - static_cast(Value); - data->writeBack("short", startPos + 2, QString::number(abs(pvalue * 100))); + data->writeBack("short", startPos + 2, QString::number(static_cast(abs(pvalue * 100)))); } void ALGO_Correction(std::shared_ptr data) @@ -308,7 +308,8 @@ void ALGO_Correction(std::shared_ptr data) double offsetRz = originRz - point.z; //Point3d RPYResult = getRPYOffset(oldPoints, resultPoints); //Point3d oriResult = getOriginPointOffset(oldPoints, resultPoints); - + std::cout << "offsetX:" << offsetX << "offsetY:" << offsetY << "offsetZ:" << offsetZ << std::endl; + std::cout << "offsetRx:" << offsetRx << "offsetRy:" << offsetRy << "offsetRz:" << offsetRz << std::endl; //int pValueBounus = 100; createModbusStrs(310, offsetX,data); createModbusStrs(313, offsetY, data); diff --git a/HanddleAI/HandleAiUi-new/globalStruct.h b/HanddleAI/HandleAiUi-new/globalStruct.h index a7a0ea9a..f1b7b73f 100644 --- a/HanddleAI/HandleAiUi-new/globalStruct.h +++ b/HanddleAI/HandleAiUi-new/globalStruct.h @@ -18,7 +18,7 @@ #define sColor_BlackWithWhite "45, 45, 45" #define enableHandleAiModel 1 -#define disableBackEndCheck 1 +#define disableBackEndCheck 0 //窗口设置 #define windowMoveFreshRate 100//窗口移动每秒的刷新率 diff --git a/HanddleAI/HandleAiUi-new/halconAlgo/Inspection.h b/HanddleAI/HandleAiUi-new/halconAlgo/Inspection.h index add80976..9e742fc8 100644 --- a/HanddleAI/HandleAiUi-new/halconAlgo/Inspection.h +++ b/HanddleAI/HandleAiUi-new/halconAlgo/Inspection.h @@ -1593,20 +1593,20 @@ void Pings_Inspection_2_Front (HObject ho_in_Image, HTuple hv_in_ShapePath, HTup { ////λ // - //Pings_ROI_Rec2(ho_in_Image, hv_in_ShapePath, hv_in_Parameter, &hvec_out_ROI_Row, - // &hvec_out_ROI_Col, &(*hv_out_Flag)); - // HTuple ExpTmpOutVar_0;HTuple ExpTmpOutVar_1; - int x = 3244.74084, y = 1928.88794, w = 503.440155, h = 566.725; - HTuple rows, cols; - cols.Append(x-w); rows.Append(y-h); - cols.Append(x+w); rows.Append(y-h); - cols.Append(x+w); rows.Append(y+h); - cols.Append(x-w); rows.Append(y+h); - hvec_out_ROI_Row[0].T() = rows; - hvec_out_ROI_Col[0].T() = cols; + Pings_ROI_Rec2(ho_in_Image, hv_in_ShapePath, hv_in_Parameter, &hvec_out_ROI_Row, + &hvec_out_ROI_Col, &(*hv_out_Flag)); + //HTuple ExpTmpOutVar_0;HTuple ExpTmpOutVar_1; + // int x = 3244.74084, y = 1928.88794, w = 503.440155, h = 566.725; + // HTuple rows, cols; + // cols.Append(x-w); rows.Append(y-h); + // cols.Append(x+w); rows.Append(y-h); + // cols.Append(x+w); rows.Append(y+h); + // cols.Append(x-w); rows.Append(y+h); + // hvec_out_ROI_Row[0].T() = rows; + // hvec_out_ROI_Col[0].T() = cols; - hvec_out_ROI_Row[1].T() = rows; - hvec_out_ROI_Col[1].T() = cols; + // hvec_out_ROI_Row[1].T() = rows; + // hvec_out_ROI_Col[1].T() = cols; //ȷ hv_Num = (HTuple(hvec_out_ROI_Row.Length()).TupleInt())-1; { diff --git a/env/LMI/dll/msvcp140.dll b/env/LMI/dll/msvcp140.dll index 570be5f9..0a50239a 100644 Binary files a/env/LMI/dll/msvcp140.dll and b/env/LMI/dll/msvcp140.dll differ diff --git a/env/LMI/dll/vcruntime140.dll b/env/LMI/dll/vcruntime140.dll deleted file mode 100644 index 7aeaf836..00000000 Binary files a/env/LMI/dll/vcruntime140.dll and /dev/null differ diff --git a/lib/Hd_3DCameraLMI_module_PointLazer.exp b/lib/Hd_3DCameraLMI_module_PointLazer.exp index 4d888b40..6a8fa414 100644 Binary files a/lib/Hd_3DCameraLMI_module_PointLazer.exp and b/lib/Hd_3DCameraLMI_module_PointLazer.exp differ diff --git a/lib/Hd_3DCameraLMI_module_PointLazer.lib b/lib/Hd_3DCameraLMI_module_PointLazer.lib index b506c2ad..36c75b14 100644 Binary files a/lib/Hd_3DCameraLMI_module_PointLazer.lib and b/lib/Hd_3DCameraLMI_module_PointLazer.lib differ diff --git a/lib/Hd_DalsaCamera_module.exp b/lib/Hd_DalsaCamera_module.exp index aa3d9ca6..da2ea450 100644 Binary files a/lib/Hd_DalsaCamera_module.exp and b/lib/Hd_DalsaCamera_module.exp differ diff --git a/lib/Hd_DalsaCamera_module.lib b/lib/Hd_DalsaCamera_module.lib index c271a24e..cc2d36e5 100644 Binary files a/lib/Hd_DalsaCamera_module.lib and b/lib/Hd_DalsaCamera_module.lib differ diff --git a/lib/Hd_FinsTcp_module.exp b/lib/Hd_FinsTcp_module.exp index 57851410..26d6e581 100644 Binary files a/lib/Hd_FinsTcp_module.exp and b/lib/Hd_FinsTcp_module.exp differ diff --git a/lib/Hd_FinsTcp_module.lib b/lib/Hd_FinsTcp_module.lib index e7784b3e..a50e177e 100644 Binary files a/lib/Hd_FinsTcp_module.lib and b/lib/Hd_FinsTcp_module.lib differ diff --git a/lib/Hd_MvCamera_module_GENTL.exp b/lib/Hd_MvCamera_module_GENTL.exp index baf006bd..6429d839 100644 Binary files a/lib/Hd_MvCamera_module_GENTL.exp and b/lib/Hd_MvCamera_module_GENTL.exp differ diff --git a/lib/Hd_MvCamera_module_GENTL.lib b/lib/Hd_MvCamera_module_GENTL.lib index 4010f0a3..a65c613a 100644 Binary files a/lib/Hd_MvCamera_module_GENTL.lib and b/lib/Hd_MvCamera_module_GENTL.lib differ diff --git a/lib/Hd_MvCamera_module_GIGE.exp b/lib/Hd_MvCamera_module_GIGE.exp index 3f62ab5a..08f548f7 100644 Binary files a/lib/Hd_MvCamera_module_GIGE.exp and b/lib/Hd_MvCamera_module_GIGE.exp differ diff --git a/lib/Hd_MvCamera_module_GIGE.lib b/lib/Hd_MvCamera_module_GIGE.lib index 110ae8d7..b1396b9b 100644 Binary files a/lib/Hd_MvCamera_module_GIGE.lib and b/lib/Hd_MvCamera_module_GIGE.lib differ diff --git a/lib/Hd_ResultsSummary_module.exp b/lib/Hd_ResultsSummary_module.exp index d575f63f..e310258b 100644 Binary files a/lib/Hd_ResultsSummary_module.exp and b/lib/Hd_ResultsSummary_module.exp differ diff --git a/lib/Hd_ResultsSummary_module.lib b/lib/Hd_ResultsSummary_module.lib index 8baafc1c..a61fbd40 100644 Binary files a/lib/Hd_ResultsSummary_module.lib and b/lib/Hd_ResultsSummary_module.lib differ diff --git a/lib/Hd_SocketModule_ModbusTcp.exp b/lib/Hd_SocketModule_ModbusTcp.exp index 525105f5..49ff857d 100644 Binary files a/lib/Hd_SocketModule_ModbusTcp.exp and b/lib/Hd_SocketModule_ModbusTcp.exp differ diff --git a/lib/Hd_SocketModule_ModbusTcp.lib b/lib/Hd_SocketModule_ModbusTcp.lib index b3ff8f19..5ec47732 100644 Binary files a/lib/Hd_SocketModule_ModbusTcp.lib and b/lib/Hd_SocketModule_ModbusTcp.lib differ