diff --git a/LeatherProject/.vs/LeatherApp/FileContentIndex/41fb4c62-3b42-4d94-937e-bb187321210b.vsidx b/LeatherProject/.vs/LeatherApp/FileContentIndex/41fb4c62-3b42-4d94-937e-bb187321210b.vsidx deleted file mode 100644 index 962b797..0000000 Binary files a/LeatherProject/.vs/LeatherApp/FileContentIndex/41fb4c62-3b42-4d94-937e-bb187321210b.vsidx and /dev/null differ diff --git a/LeatherProject/.vs/LeatherApp/FileContentIndex/942c9b07-b4df-4ac4-b8a5-18a9e6490559.vsidx b/LeatherProject/.vs/LeatherApp/FileContentIndex/942c9b07-b4df-4ac4-b8a5-18a9e6490559.vsidx deleted file mode 100644 index cabf58c..0000000 Binary files a/LeatherProject/.vs/LeatherApp/FileContentIndex/942c9b07-b4df-4ac4-b8a5-18a9e6490559.vsidx and /dev/null differ diff --git a/LeatherProject/.vs/LeatherApp/FileContentIndex/bb4de0ee-18ca-4131-837f-8bec69c0b5a7.vsidx b/LeatherProject/.vs/LeatherApp/FileContentIndex/bb4de0ee-18ca-4131-837f-8bec69c0b5a7.vsidx new file mode 100644 index 0000000..6146385 Binary files /dev/null and b/LeatherProject/.vs/LeatherApp/FileContentIndex/bb4de0ee-18ca-4131-837f-8bec69c0b5a7.vsidx differ diff --git a/LeatherProject/.vs/LeatherApp/FileContentIndex/c05692fe-d6cc-40e4-9fd0-dc03220e7263.vsidx b/LeatherProject/.vs/LeatherApp/FileContentIndex/c05692fe-d6cc-40e4-9fd0-dc03220e7263.vsidx deleted file mode 100644 index 9b3055d..0000000 Binary files a/LeatherProject/.vs/LeatherApp/FileContentIndex/c05692fe-d6cc-40e4-9fd0-dc03220e7263.vsidx and /dev/null differ diff --git a/LeatherProject/.vs/LeatherApp/FileContentIndex/cecbc0a1-403e-46d8-848e-587f5c2a274e.vsidx b/LeatherProject/.vs/LeatherApp/FileContentIndex/cecbc0a1-403e-46d8-848e-587f5c2a274e.vsidx deleted file mode 100644 index 6f352f8..0000000 Binary files a/LeatherProject/.vs/LeatherApp/FileContentIndex/cecbc0a1-403e-46d8-848e-587f5c2a274e.vsidx and /dev/null differ diff --git a/LeatherProject/.vs/LeatherApp/FileContentIndex/d20df390-676d-4e82-b854-ce3c9d97907a.vsidx b/LeatherProject/.vs/LeatherApp/FileContentIndex/d20df390-676d-4e82-b854-ce3c9d97907a.vsidx deleted file mode 100644 index 307deff..0000000 Binary files a/LeatherProject/.vs/LeatherApp/FileContentIndex/d20df390-676d-4e82-b854-ce3c9d97907a.vsidx and /dev/null differ diff --git a/LeatherProject/GeBoShi/ImageDefect/DefectLib.cs b/LeatherProject/GeBoShi/ImageDefect/DefectLib.cs index 1782749..a59e27b 100644 --- a/LeatherProject/GeBoShi/ImageDefect/DefectLib.cs +++ b/LeatherProject/GeBoShi/ImageDefect/DefectLib.cs @@ -811,14 +811,24 @@ namespace GeBoShi.ImageDefect step++; //1 int penLine = 20; + int DB_W = 0, DB_H = 0; + int kzWidth = 500; + if (DefectLabelInfoList[q].w < kzWidth) + DB_W = kzWidth; + else + DB_W = DefectLabelInfoList[q].w; + if (DefectLabelInfoList[q].h < kzWidth) + DB_H = kzWidth; + else + DB_H = DefectLabelInfoList[q].h; //打标 - var point1 = new OpenCvSharp.Point((DefectLabelInfoList[q].i % colNum) * image_width + DefectLabelInfoList[q].x - penLine / 2, (DefectLabelInfoList[q].i / colNum) * image_hight + DefectLabelInfoList[q].y - penLine / 2); - var point2 = new OpenCvSharp.Point(point1.X + DefectLabelInfoList[q].w + penLine / 2, point1.Y + DefectLabelInfoList[q].h + penLine / 2); + var point1 = new OpenCvSharp.Point((DefectLabelInfoList[q].i % colNum) * image_width + DefectLabelInfoList[q].x - penLine / 2 - (kzWidth /2 - DefectLabelInfoList[q].w/2), (DefectLabelInfoList[q].i / colNum) * image_hight + DefectLabelInfoList[q].y - penLine / 2 - (kzWidth / 2 - DefectLabelInfoList[q].h / 2)); + var point2 = new OpenCvSharp.Point(point1.X + DB_W + penLine / 2, point1.Y + DB_H + penLine / 2); step++;//2 task.resultInfo += $" 转换到大图坐标(px):p1={point1.X},{point1.Y}; p2={point2.X},{point2.Y}\n"; - + //大图打标 Cv2.Rectangle(task.bmpTag, point1, point2, new Scalar(0.0, 0.0, 255.0), penLine);//画打标点 //WarningEvent?.Invoke(DateTime.Now,WarningEnum.Low, $"保存第 {count} 行缺陷信息;");