ZIM 1 rok temu
rodzic
commit
eed3c20172

+ 4 - 8
Assets/InfraredProject/WebCamera/Script/ZIM/InfraredLocate/ScreenIdentification.cs

@@ -751,9 +751,9 @@ namespace o0.Project
             if (ScreenLocate.Main.SaveToggle.isOn)
             {
                 var FileDirectory = $"Debug_屏幕定位图片/";
-                ScreenLocate.Main.StartCoroutine(SaveImagesIEnum(FileDirectory,
+                SaveImages(FileDirectory,
                     $"屏幕识别Size: ({Size.x},{Size.y}), 卷积核Size: {conSize}, 最小线段长度: {minLength}",
-                    ScreenLocateTex, allLinesTex, ScreenQuadTex));
+                    ScreenLocateTex, allLinesTex, ScreenQuadTex);
             }
 
             //times.Add(watch.ElapsedMilliseconds);
@@ -772,29 +772,25 @@ namespace o0.Project
             UnityEngine.Object.Destroy(ScreenLocateTex);
         }
 
-        IEnumerator SaveImagesIEnum(string FileDirectory, string log,  Texture2D ScreenLocateTex, Texture2D allLinesTex, Texture2D ScreenQuadTex)
+        void SaveImages(string FileDirectory, string log, Texture2D ScreenLocateTex, Texture2D allLinesTex, Texture2D ScreenQuadTex)
         {
             if (!Directory.Exists(FileDirectory))
                 Directory.CreateDirectory(FileDirectory);
             var time = DateTime.Now.ToString("yyyyMMdd_HHmmss");
 
-            yield return null;
             var pngData = (ScreenLocate.Main.outputTexture2D[7] as Texture2D)?.EncodeToPNG();
             if (pngData != null)
                 File.WriteAllBytes($"{FileDirectory}{time}A屏幕原图.png", pngData);
-            yield return null;
             var pngData1 = ScreenLocateTex.EncodeToPNG();
             if (pngData1 != null)
                 File.WriteAllBytes($"{FileDirectory}{time}B黑白色差.png", pngData1);
-            yield return null;
             var pngData2 = allLinesTex.EncodeToPNG();
             if (pngData2 != null)
                 File.WriteAllBytes($"{FileDirectory}{time}C全部识别线段.png", pngData2);
-            yield return null;
             var pngData3 = ScreenQuadTex.EncodeToPNG();
             if (pngData3 != null)
                 File.WriteAllBytes($"{FileDirectory}{time}D识别结果.png", pngData3);
-            yield return null;
+
             Debug.Log($"<color=aqua>({time}) 屏幕识别图片保存至:程序根目录/{FileDirectory}</color>");
             log += $"\r\n屏幕原图保存{pngData != null}, \r\n黑白色差保存{pngData1 != null}, \r\n全部识别线段保存{pngData2 != null}, \r\n识别结果保存{pngData3 != null}, ";
             File.WriteAllText($"{FileDirectory}{time}_日志.log", log);