From d3a08b35f7ea71f909c589022f308936427f7233 Mon Sep 17 00:00:00 2001 From: 820689062 <820689062@qq.com> Date: Thu, 27 Jun 2024 18:16:27 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=97=E7=AC=A6=E7=9B=B8?= =?UTF-8?q?=E4=BC=BC=E5=BA=A6=E5=8C=B9=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- HisenceYoloDetection/MainForm.cs | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/HisenceYoloDetection/MainForm.cs b/HisenceYoloDetection/MainForm.cs index da57d3e..4e41ada 100644 --- a/HisenceYoloDetection/MainForm.cs +++ b/HisenceYoloDetection/MainForm.cs @@ -191,9 +191,9 @@ namespace HisenceYoloDetection { string s1 = "0##Ec04060##20¡æ##Rapide15mns"; - string s2 = "ECO4060##20¡ãC##Rapide15mns"; + string s2 = "ECOmns"; - bool st = ManagerModelHelper.StrMatch2(s1, s2); + bool st = ManagerModelHelper.StrMatch(s1, s2); //Rect rect = new Rect(0, 0, 0, 0); //string path2 = "D:\\Hisence\\SQLImages\\W80WXWJ060539V0WW80WX120293\\2\\W80WXWJ060539V0WW80WX120293result.jpg"; @@ -2868,15 +2868,18 @@ namespace HisenceYoloDetection SQLStr = SQlxK_HisenceWord.OneblockMainWord; if (!saveimage) { - OneIF = ManagerModelHelper.StrMatch2(xK_HisenceWord.OneblockMainWord, SQLStr); - if (!OneIF) + bool ssD= ManagerModelHelper.StrMatch(xK_HisenceWord.OneblockMainWord, SQLStr); + bool OneIF1 = ManagerModelHelper.StrMatch2(xK_HisenceWord.OneblockMainWord, SQLStr); + if (!OneIF1||!ssD) { + OneIF = false; //ÏÔʾ´íÎóµÄ°å DisplayResult(mLcut); Defet_OnDetectionDone(mLcut.ResultMap.ToMat(), 1); } else { + OneIF = true; Defet_OnDetectionDone(OKMat, 1); }