개정판 fd19a116
Fix: Conslidate할때 Z정렬이 유지되지 않는 오류 수정
Change-Id: I54e1878e0365f94ede14e366e6e769fe9fd4b4ec
| KCOM/Services/BaseServices.cs | ||
|---|---|---|
| 330 | 330 |
/// <param name="e"></param> |
| 331 | 331 |
private void BaseClient_GetMarkupInfoItemsCompleted(object sender, GetMarkupInfoItemsCompletedEventArgs e) |
| 332 | 332 |
{
|
| 333 |
//Logger.sendResLog("GetMarkupInfoItemsCompleted", "UserState : " + e.UserState + "\r Result :" + e.Result?.Count + "\r Cancelled :" + e.Cancelled + "\r Error :" + e.Error, 1);
|
|
| 334 |
|
|
| 335 | 333 |
ViewerDataModel.Instance.MarkupControls_USER.Clear(); |
| 336 | 334 |
ViewerDataModel.Instance.MarkupControls.Clear(); |
| 337 | 335 |
|
| ... | ... | |
| 820 | 818 |
List<MarkupInfoItem> gridSelectionItem = gridViewMarkup.SelectedItems.Cast<MarkupInfoItem>().ToList(); //선택 된 마크업 |
| 821 | 819 |
List<MarkupInfoItem> gridNonSelectionItem = gridItem.Except(gridSelectionItem).ToList(); //선택 되지 않은 마크업 |
| 822 | 820 |
#region 코멘트 보기 |
| 823 |
if (e.AddedItems.Count() > 0 && this.pageNavigator.CurrentPage != null)
|
|
| 821 |
if (e.AddedItems.Any() && this.pageNavigator.CurrentPage != null)
|
|
| 824 | 822 |
{
|
| 825 | 823 |
foreach (var item in gridSelectionItem) |
| 826 | 824 |
{
|
| ... | ... | |
| 881 | 879 |
}); |
| 882 | 880 |
|
| 883 | 881 |
|
| 884 |
var myComment = _infoItem.Where(d => d.UserID == App.ViewInfo.UserID).FirstOrDefault();
|
|
| 882 |
var myComment = _infoItem.Find(d => d.UserID == App.ViewInfo.UserID);
|
|
| 885 | 883 |
if (myComment != null) |
| 886 | 884 |
{
|
| 887 | 885 |
Common.ViewerDataModel.Instance.MarkupControls_USER.ToList().ForEach(delegate (MarkupToPDF.Common.CommentUserInfo markupitem) |
내보내기 Unified diff
