개정판 38d69491
issue #00000 ctrl+S입력시 텍스트박스 입력 완료 되도록 수정
Change-Id: Id4ab97a53ab61022f5a2ac4d5ae63cd14338c2a7
| ImageComparer/Markus.ImageCompare/ImageCompare.cs | ||
|---|---|---|
| 23 | 23 |
|
| 24 | 24 |
if (rects.Count != 0) |
| 25 | 25 |
{
|
| 26 |
if(Originalbitmap.PixelFormat == PixelFormat.Format8bppIndexed) |
|
| 27 |
{
|
|
| 28 |
Originalbitmap = ChangeBitmapFormatAndSize(Originalbitmap, Originalbitmap.Size, PixelFormat.Format24bppRgb); |
|
| 29 |
//Originalbitmap = To24Bpp(Originalbitmap, Originalbitmap.Size); |
|
| 30 |
} |
|
| 31 |
|
|
| 26 | 32 |
using (Graphics g = Graphics.FromImage(Originalbitmap)) |
| 27 | 33 |
{
|
| 28 | 34 |
var rect = rects.Select(x => new System.Drawing.Rectangle((int)x.X, (int)x.Y, (int)x.Width, (int)x.Height)).ToList(); |
| ... | ... | |
| 103 | 109 |
List<System.Windows.Rect> rects = new List<System.Windows.Rect>(); |
| 104 | 110 |
|
| 105 | 111 |
var data = MathchesImageData(Originalbitmap, TargatBitmap); |
| 106 |
|
|
| 112 |
//OpenCvSharp.Cv2.ImShow("Result data : ", data);
|
|
| 107 | 113 |
result = GetMatchPixels(data, ResultRectSize); |
| 108 | 114 |
|
| 109 | 115 |
//if (rects.Count() > 0) |
| ... | ... | |
| 141 | 147 |
|
| 142 | 148 |
if (rects.Count != 0) |
| 143 | 149 |
{
|
| 150 |
if (cloneOriginal.PixelFormat == PixelFormat.Format8bppIndexed) |
|
| 151 |
{
|
|
| 152 |
cloneOriginal = ChangeBitmapFormatAndSize(cloneOriginal, cloneOriginal.Size, PixelFormat.Format24bppRgb); |
|
| 153 |
//cloneOriginal = To24Bpp(cloneOriginal, cloneOriginal.Size); |
|
| 154 |
} |
|
| 155 |
|
|
| 144 | 156 |
using (Graphics g = Graphics.FromImage(cloneOriginal)) |
| 145 | 157 |
{
|
| 146 | 158 |
|
내보내기 Unified diff
