개정판 079a438a
issue #00000 compare 색상 변경
Change-Id: I8161c1a01fda0d71190f19ef49fe7b058aaec952
KCOM/Views/MainMenu.xaml.cs | ||
---|---|---|
5405 | 5405 |
|
5406 | 5406 |
System.Drawing.Size imageSize = new System.Drawing.Size((int)ViewerDataModel.Instance.ImageViewWidth_C, (int)ViewerDataModel.Instance.ImageViewHeight_C); |
5407 | 5407 |
|
5408 |
var result = await imageCompare.CompareReturnRectsAsync(ViewerDataModel.Instance.ImageViewPath, ViewerDataModel.Instance.ImageViewPath_C, new System.Drawing.Size(10, 10), imageSize); |
|
5408 |
System.Drawing.Size recSize = new System.Drawing.Size(2,2); |
|
5409 |
|
|
5410 |
if(ViewerDataModel.Instance.ImageViewWidth_C > 1000 && ViewerDataModel.Instance.ImageViewHeight_C > 1000) |
|
5411 |
{ |
|
5412 |
recSize = new System.Drawing.Size((int)(ViewerDataModel.Instance.ImageViewWidth_C /1000),(int)(ViewerDataModel.Instance.ImageViewHeight_C/ 1000)); |
|
5413 |
} |
|
5414 |
|
|
5415 |
var result = await imageCompare.CompareReturnRectsAsync(ViewerDataModel.Instance.ImageViewPath, ViewerDataModel.Instance.ImageViewPath_C, recSize, imageSize); |
|
5409 | 5416 |
|
5410 | 5417 |
//borderComprareWait.Visibility = Visibility.Collapsed; |
5411 | 5418 |
|
... | ... | |
5423 | 5430 |
{ |
5424 | 5431 |
rects.ForEach(d => |
5425 | 5432 |
{ |
5426 |
d.Inflate(new Size(10, 10));
|
|
5433 |
d.Inflate(new Size(5, 5));
|
|
5427 | 5434 |
|
5428 | 5435 |
var point = MarkupToPDF.Controls.Common.MathSet.getRectMiddlePoint(d); |
5429 | 5436 |
System.Windows.Shapes.Rectangle myEllipse = new System.Windows.Shapes.Rectangle(); |
5430 |
myEllipse.Fill = new System.Windows.Media.SolidColorBrush(System.Windows.Media.Color.FromArgb(150, 33, 215, 119));
|
|
5431 |
myEllipse.Opacity = 1;
|
|
5437 |
myEllipse.Fill = new System.Windows.Media.SolidColorBrush(System.Windows.Media.Color.FromArgb(255, 244, 15, 126));
|
|
5438 |
//myEllipse.Opacity = 0.2;
|
|
5432 | 5439 |
//myEllipse.Stroke = new System.Windows.Media.SolidColorBrush(System.Windows.Media.Colors.Green); |
5433 |
//myEllipse.StrokeThickness = 2;
|
|
5440 |
//myEllipse.StrokeThickness = 1;
|
|
5434 | 5441 |
myEllipse.Width = d.Width; |
5435 | 5442 |
myEllipse.Height = d.Height; |
5436 | 5443 |
Canvas.SetLeft(myEllipse, d.X - ((point.X - d.X) / 2.0)); |
... | ... | |
5440 | 5447 |
}); |
5441 | 5448 |
|
5442 | 5449 |
canvas_compareBorder.Visibility = Visibility.Visible; |
5443 |
da.From = 1;
|
|
5444 |
da.To = 0.5;
|
|
5450 |
da.From =0.7;
|
|
5451 |
da.To = 0.3;
|
|
5445 | 5452 |
da.Duration = new Duration(TimeSpan.FromSeconds(1)); |
5446 | 5453 |
da.AutoReverse = true; |
5447 | 5454 |
canvas_compareBorder.BeginAnimation(OpacityProperty, da); |
내보내기 Unified diff