개정판 752b18ef
compare 기능 수정
- 현재 문서의 크기와 이전 REVISION 크기를 맞춤
Change-Id: Ie0e7f388c4888625e1d0083d31212af16b412fd0
| KCOM/Services/BaseServices.cs | ||
|---|---|---|
| 134 | 134 |
d.Height = d.Height; |
| 135 | 135 |
var point = MarkupToPDF.Controls.Common.MathSet.getRectMiddlePoint(d); |
| 136 | 136 |
System.Windows.Shapes.Rectangle myEllipse = new System.Windows.Shapes.Rectangle(); |
| 137 |
myEllipse.Fill = new System.Windows.Media.SolidColorBrush(System.Windows.Media.Color.FromArgb(100,255,8,0));
|
|
| 138 |
myEllipse.Opacity = 0.8;
|
|
| 137 |
myEllipse.Fill = new System.Windows.Media.SolidColorBrush(System.Windows.Media.Color.FromArgb(150, 33, 215, 119));
|
|
| 138 |
myEllipse.Opacity = 1;
|
|
| 139 | 139 |
myEllipse.Width = d.Width; |
| 140 | 140 |
myEllipse.Height = d.Height; |
| 141 | 141 |
Canvas.SetLeft(myEllipse, d.X - ((point.X - d.X) / 2.0)); |
| ... | ... | |
| 144 | 144 |
canvas_compareBorder.Children.Add(myEllipse); |
| 145 | 145 |
}); |
| 146 | 146 |
canvas_compareBorder.Visibility = Visibility.Visible; |
| 147 |
da.From = 0.8;
|
|
| 148 |
da.To = 0.1;
|
|
| 147 |
da.From = 1;
|
|
| 148 |
da.To = 0.5;
|
|
| 149 | 149 |
da.Duration = new Duration(TimeSpan.FromSeconds(1)); |
| 150 | 150 |
da.AutoReverse = true; |
| 151 | 151 |
canvas_compareBorder.BeginAnimation(OpacityProperty, da); |
| ... | ... | |
| 451 | 451 |
App.Custom_ViewInfoId = currentUser.MarkupInfoID; |
| 452 | 452 |
} |
| 453 | 453 |
|
| 454 |
ViewerDataModel.Instance.PageNumber = 1; |
|
| 454 |
ViewerDataModel.Instance.SyncPageNumber = 1;
|
|
| 455 | 455 |
|
| 456 | 456 |
/// Consolidation 된 데이터가 최상단에 올 수 있도록 변경 |
| 457 | 457 |
//var markupItem = ViewerDataModel.Instance._markupInfoList.OrderByDescending(p => p.Consolidate == Convert.ToInt32(true)).ToList(); |
| ... | ... | |
| 552 | 552 |
// ViewerDataModel.Instance.PageBalanceNumber = 1; |
| 553 | 553 |
//} |
| 554 | 554 |
|
| 555 |
if (ViewerDataModel.Instance.PageNumber == 0) |
|
| 555 |
if (ViewerDataModel.Instance.SyncPageNumber == 0)
|
|
| 556 | 556 |
{
|
| 557 |
ViewerDataModel.Instance.PageNumber = 1; |
|
| 557 |
ViewerDataModel.Instance.SyncPageNumber = 1;
|
|
| 558 | 558 |
} |
| 559 | 559 |
if (e.AddedItems.Count() > 0) |
| 560 | 560 |
{
|
| ... | ... | |
| 565 | 565 |
// layerControl.markupParse(markupitem.Data, Common.ViewerDataModel.Instance.MarkupControls_Sync, item.DisplayColor, "", item.MarkupInfoID); |
| 566 | 566 |
//}); |
| 567 | 567 |
|
| 568 |
var pageItems = item.MarkupList.Where(pageItem => pageItem.PageNumber == ViewerDataModel.Instance.PageNumber).ToList(); |
|
| 568 |
var pageItems = item.MarkupList.Where(pageItem => pageItem.PageNumber == ViewerDataModel.Instance.SyncPageNumber).ToList();
|
|
| 569 | 569 |
|
| 570 | 570 |
foreach (var markupitem in pageItems) |
| 571 | 571 |
{
|
내보내기 Unified diff
