/ImageComparer/Markus.ImageCompare/ImageCompareBase.cs - Diff - MARKUS - 일정관리

개정판 38d69491

ID	38d69491020d2a565b7158e53b39c70500b84548
상위	3276cb1c
하위	92c9cab8

김태성이(가) 약 일년 전에 추가함

issue #00000 ctrl+S입력시 텍스트박스 입력 완료 되도록 수정

Change-Id: Id4ab97a53ab61022f5a2ac4d5ae63cd14338c2a7

     using OpenCvSharp;
     using OpenCvSharp.Extensions;
     using System;
     using System.Collections.Generic;
     using System.Drawing;
-...
     using System.Net;
     using System.Runtime.InteropServices;
     using System.Text;
     using System.Threading;
     using System.Threading.Tasks;
     using static System.Net.Mime.MediaTypeNames;
     using Point = System.Drawing.Point;
     using Size = System.Drawing.Size;
-...
+                {
                     SetStatus("Image Load", 0, CompareStatus.Loading);
                     //Originalbitmap = To24Bpp(Originalbitmap, Originalbitmap.Size);
                     //TargatBitmap = To24Bpp(TargatBitmap, Originalbitmap.Size);
                     Originalbitmap = ChangeBitmapFormatAndSize(Originalbitmap, Originalbitmap.Size, PixelFormat.Format24bppRgb);
                     TargatBitmap = ChangeBitmapFormatAndSize(TargatBitmap, Originalbitmap.Size, PixelFormat.Format24bppRgb);
                     // 원본이미지의 크키와 Format24bppRgb로 타켓 이미지를 변경
                     // 크기가 틀린 경우 비교시 바이트배열 오류 발생
                     OriginalImageData = OpenCvSharp.Extensions.BitmapConverter.ToMat(Originalbitmap);
                     TargatImageData = OpenCvSharp.Extensions.BitmapConverter.ToMat(TargatBitmap);
                     var grayOriginal = new OpenCvSharp.Mat();
                     var grayTargat = new OpenCvSharp.Mat();
                     if (OriginalImageData.Size() != TargatImageData.Size())
+                    {
                         Cv2.Resize(TargatImageData, TargatImageData, OriginalImageData.Size());
+                    }
                     Cv2.CvtColor(OriginalImageData, OriginalImageData, ColorConversionCodes.BGR2GRAY);
                     Cv2.CvtColor(TargatImageData, TargatImageData, ColorConversionCodes.BGR2GRAY);
                     Cv2.CvtColor(OriginalImageData, grayOriginal, ColorConversionCodes.BGR2GRAY);
                     Cv2.CvtColor(TargatImageData, grayTargat, ColorConversionCodes.BGR2GRAY);
                     //Cv2.ImShow("grayOriginal", grayOriginal);
                     //Cv2.ImShow("grayTargat", grayTargat);
                     Mat outputData = new Mat(TargatImageData.Size(), MatType.CV_8UC1);
                     Mat outputData = new Mat(grayTargat.Size(), MatType.CV_8UC1);
                     Cv2.Absdiff(OriginalImageData, TargatImageData, outputData);
                     Cv2.Absdiff(grayOriginal, grayTargat, outputData);
                     // 틀린부분을 반환
                     Cv2.BitwiseNot(outputData, result);
                     //Cv2.ImShow("result", result);
+                }
                 catch (Exception ex)
+                {
-...
                 return result;
+            }
             protected System.Drawing.Bitmap ChangeBitmapFormatAndSize(System.Drawing.Bitmap bitmap, Size newSize, PixelFormat pixelFormat)
             public System.Drawing.Bitmap ChangeBitmapFormatAndSize(System.Drawing.Bitmap bitmap, Size newSize, PixelFormat pixelFormat)
+            {
                 Bitmap result = bitmap;
                 if (pixelFormat != bitmap.PixelFormat)
+                {
                     Point originPoint = new Point(0, 0);
                     Rectangle rect = new Rectangle(originPoint, bitmap.Size);
                     result = bitmap.Clone(rect, pixelFormat);
+                }
                 if (bitmap.Size != newSize)
+                {
                     result = new Bitmap(newSize.Width, newSize.Height);
                     using (Graphics g = Graphics.FromImage(result))
+                    {
                         g.DrawImage(bitmap, 0, 0, newSize.Width, newSize.Height);
                         g.Dispose();
+                    }
+                }
                 Bitmap result;
                 result = new Bitmap(newSize.Width, newSize.Height, pixelFormat);
                 Graphics g = Graphics.FromImage(result);
                 g.DrawImage(bitmap, new Rectangle(0, 0, newSize.Width, newSize.Height), 0, 0, newSize.Width, newSize.Height, GraphicsUnit.Pixel);
                 //g.DrawImage(bitmap, 0, 0, newSize.Width, newSize.Height);
                 g.Save();
                 g.Dispose();
                 return result;
+            }
-...
                 OpenCvSharp.Point testpoint = new OpenCvSharp.Point();
                 Cv2.Threshold(data, data, 0, 30,ThresholdTypes.BinaryInv);
                 Cv2.Threshold(data, data, 0, 255, ThresholdTypes.Binary | ThresholdTypes.Otsu);
                 Cv2.FindContours(data, out contours, out hierarchy,RetrievalModes.List,ContourApproximationModes.ApproxNone, testpoint);
                 SetStatus("Comparison", 0, CompareStatus.Comparison);
                 contoursLongCount = contours.Sum(x => x.Count());
                 var rects = contours.AsParallel()
                                     .Select(points => GetRectList(points, block))
                                     .SelectMany(x => x);
                 results.AddRange(rects);
                 System.Diagnostics.Debug.WriteLine(new TimeSpan(stopwatch.ElapsedTicks));
                 return results;
+            }
             private List<System.Windows.Rect> GetRectList(OpenCvSharp.Point[] points, Size block)
+            {
                 List<System.Windows.Rect> result = new List<System.Windows.Rect>();
                 Parallel.ForEach(points, point =>
+                {
                     var rect = new System.Windows.Rect
+                    {
                         X = point.X - block.Width / 2,
                         Y = point.Y - block.Height / 2,
                         Width = block.Width,
                         Height = block.Height
                     };
                     lock (result)
+                    {
                         if (!result.Any(r => r.IntersectsWith(rect)))
+                        {
                             result.Add(rect);
+                        }
+                    }
                     //ComparisonCount++;
                     //Interlocked.Increment(ref ComparisonCount);
                     //SetStatus("Comparison", ComparisonCount / contoursLongCount * 100, CompareStatus.Comparison);
                 });
                 return result;
+            }
             private List<System.Windows.Rect> GetRectList(OpenCvSharp.Point[] points,Size block)
             private List<System.Windows.Rect> GetRectList_old(OpenCvSharp.Point[] points,Size block)
+            {
                 List<System.Windows.Rect> result = new List<System.Windows.Rect>();
-...
                     ComparisonCount++;
                     SetStatus("Comparison", ComparisonCount/contoursLongCount*100, CompareStatus.Comparison);
                     //SetStatus("Comparison", ComparisonCount/contoursLongCount*100, CompareStatus.Comparison);
+                }
                 return result;

내보내기 Unified diff

프로젝트

일반

사용자정보

MARKUS

개정판 38d69491