개정판 24c5e56c
- final pdf Font 추가
- Markus navi 속도 최적화 Key input 최적화
Change-Id: I7f2cf1933e86017d7b1df9ef4bd3048a8e80a653
KCOM/Services/BaseServices.cs | ||
---|---|---|
452 | 452 |
|
453 | 453 |
gridViewMarkup.ItemsSource = ViewerDataModel.Instance._markupInfoList; |
454 | 454 |
|
455 |
SetCommentPages(); |
|
455 |
SetCommentPages(null);
|
|
456 | 456 |
|
457 | 457 |
// GRIDVIEW에서 팀별 GROUPING |
458 | 458 |
// 효성은 안함 |
... | ... | |
558 | 558 |
|
559 | 559 |
foreach (var markupitem in pageItems) |
560 | 560 |
{ |
561 |
await MarkupParser.ParseExAsync(App.ViewInfo.ProjectNO, markupitem.Data, Common.ViewerDataModel.Instance.MarkupControls_Sync, item.DisplayColor, "", item.MarkupInfoID); |
|
561 |
await MarkupParser.ParseExAsync(ViewerDataModel.Instance.CancellationToken(), App.ViewInfo.ProjectNO, markupitem.Data, Common.ViewerDataModel.Instance.MarkupControls_Sync, item.DisplayColor, "", item.MarkupInfoID);
|
|
562 | 562 |
} |
563 | 563 |
} |
564 | 564 |
} |
... | ... | |
663 | 663 |
|
664 | 664 |
foreach (var markup in instance) |
665 | 665 |
{ |
666 |
await MarkupParser.ParseExAsync(App.ViewInfo.ProjectNO, markup.Data, Common.ViewerDataModel.Instance.MarkupControls_USER, item.DisplayColor, "", |
|
666 |
await MarkupParser.ParseExAsync(ViewerDataModel.Instance.CancellationToken(), App.ViewInfo.ProjectNO, markup.Data, Common.ViewerDataModel.Instance.MarkupControls_USER, item.DisplayColor, "",
|
|
667 | 667 |
item.MarkupInfoID, markup.ID); |
668 | 668 |
} |
669 | 669 |
} |
... | ... | |
683 | 683 |
var instance = ViewerDataModel.Instance.MarkupList_Pre.Where(d => d.PageNumber == this.pageNavigator.CurrentPage.PageNumber && d.MarkupInfoID == item.MarkupInfoID).ToList(); |
684 | 684 |
foreach (var markup in instance) |
685 | 685 |
{ |
686 |
await MarkupParser.ParseExAsync(App.ViewInfo.ProjectNO, markup.Data, Common.ViewerDataModel.Instance.MarkupControls, item.DisplayColor, "", |
|
686 |
await MarkupParser.ParseExAsync(ViewerDataModel.Instance.CancellationToken(), App.ViewInfo.ProjectNO, markup.Data, Common.ViewerDataModel.Instance.MarkupControls, item.DisplayColor, "",
|
|
687 | 687 |
item.MarkupInfoID, markup.ID); |
688 | 688 |
} |
689 | 689 |
} |
... | ... | |
998 | 998 |
|
999 | 999 |
foreach (var markupitem in markupItems) |
1000 | 1000 |
{ |
1001 |
await MarkupParser.ParseExAsync(App.ViewInfo.ProjectNO, markupitem.Data, Common.ViewerDataModel.Instance.MarkupControls_USER, item.DisplayColor, "", |
|
1001 |
await MarkupParser.ParseExAsync(ViewerDataModel.Instance.CancellationToken(), App.ViewInfo.ProjectNO, markupitem.Data, Common.ViewerDataModel.Instance.MarkupControls_USER, item.DisplayColor, "",
|
|
1002 | 1002 |
item.MarkupInfoID, markupitem.ID); |
1003 | 1003 |
} |
1004 | 1004 |
} |
... | ... | |
1008 | 1008 |
|
1009 | 1009 |
foreach (var markupitem in markupItems) |
1010 | 1010 |
{ |
1011 |
await MarkupParser.ParseExAsync(App.ViewInfo.ProjectNO, markupitem.Data, Common.ViewerDataModel.Instance.MarkupControls, item.DisplayColor, "", item.MarkupInfoID); |
|
1011 |
await MarkupParser.ParseExAsync(ViewerDataModel.Instance.CancellationToken(), App.ViewInfo.ProjectNO, markupitem.Data, Common.ViewerDataModel.Instance.MarkupControls, item.DisplayColor, "", item.MarkupInfoID);
|
|
1012 | 1012 |
} |
1013 | 1013 |
} |
1014 | 1014 |
} |
내보내기 Unified diff