개정판 51c6ce90
Fix: 심볼을 추가할때 맨 위로 오도록 수정
Change-Id: I40040e444d0378de6bae0e4118e580eda4766801
| FinalService/KCOM_FinalService/MarkupToPDF/MarkupToPDF.cs | ||
|---|---|---|
| 596 | 596 |
StringBuilder strLog = new StringBuilder(); |
| 597 | 597 |
int lastPageNo = 0; |
| 598 | 598 |
|
| 599 |
//strLog.Append($"Write {DateTime.Now.ToString("yyyy-MM-dd hh:mm:ss")} markup Count : {MarkupDataSet.Count()} / ");
|
|
| 600 |
|
|
| 601 | 599 |
var groups = MarkupDataSet.GroupBy(x => x.PAGENUMBER); |
| 602 | 600 |
foreach (var group in groups) |
| 603 | 601 |
{
|
| KCOM/Controls/Symbol.xaml.cs | ||
|---|---|---|
| 532 | 532 |
comment.CommentID = Commons.ShortGuid(); |
| 533 | 533 |
comment.SymbolID = id; |
| 534 | 534 |
comment.GroupID = GroupID; |
| 535 |
comment.ZIndex = CommentUserInfo.MaxZIndex; |
|
| 535 |
comment.ZIndex = CommentUserInfo.MaxZIndex; |
|
| 536 |
#region 리스트의 맨 끝에 추가 |
|
| 537 |
int index = ViewerDataModel.Instance.MarkupControls_USER.ToList().FindIndex(x => x == comment); |
|
| 538 |
ViewerDataModel.Instance.MarkupControls_USER.RemoveAt(index); |
|
| 539 |
ViewerDataModel.Instance.MarkupControls_USER.Add(comment); |
|
| 540 |
comment.Index = ViewerDataModel.Instance.MarkupControls_USER.ToList().FindIndex(x => x == comment); |
|
| 541 |
#endregion |
|
| 536 | 542 |
|
| 537 | 543 |
adornerSet.Add(comment); |
| 538 | 544 |
|
| KCOM/Events/PasteCommand.cs | ||
|---|---|---|
| 87 | 87 |
int index = ViewerDataModel.Instance.MarkupControls_USER.ToList().FindIndex(x => x == control); |
| 88 | 88 |
ViewerDataModel.Instance.MarkupControls_USER.RemoveAt(index); |
| 89 | 89 |
ViewerDataModel.Instance.MarkupControls_USER.Add(control); |
| 90 |
control.Index = ViewerDataModel.Instance.MarkupControls_USER.ToList().FindIndex(x => x == control); |
|
| 90 | 91 |
#endregion |
| 91 | 92 |
|
| 92 | 93 |
control.CommentID = Commons.ShortGuid(); |
| ... | ... | |
| 99 | 100 |
control.SymbolID = data2[1]; |
| 100 | 101 |
} |
| 101 | 102 |
|
| 102 |
//CreateCommand.Instance.Execute(control); |
|
| 103 | 103 |
adornerSet.Add(control); |
| 104 | 104 |
var UndoData = new UndoData(control); |
| 105 | 105 |
UndoDataGrp.MarkupDataColl.Add(UndoData); |
| 106 | 106 |
ViewerDataModel.Instance.UndoDataList.Add(UndoDataGrp); |
| 107 | 107 |
|
| 108 | 108 |
Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.UpdateMyMarkupList(); |
| 109 |
//ViewerDataModel.Instance.MarkupControls_USER.Remove(control); |
|
| 110 | 109 |
|
| 111 | 110 |
ViewerDataModel.Instance.SystemMain.dzMainMenu.pageNavigator.MarkupListUpdate( |
| 112 | 111 |
MarkupParser.MarkupToString(UndoData.Markup, App.ViewInfo.UserID), EventType.Create, null, null); |
내보내기 Unified diff
