개정판 0b75c341
PEMSS의 정합성 코멘트는 제외하고 Export 되도록 수정
Change-Id: I289cc872cf12b9d43fb415d0381271acca61f00a
| KCOM/Controls/PrintControl.xaml.cs | ||
|---|---|---|
| 108 | 108 |
DefinedPages _definePages = null; //인쇄 설정 범위 지정 |
| 109 | 109 |
public bool IsPrint { get; set; }
|
| 110 | 110 |
|
| 111 |
private List<PemssService.Requirement> requirementList = new List<PemssService.Requirement>(); |
|
| 112 |
|
|
| 111 | 113 |
PrintDocument printDocument = new PrintDocument(); //프린터도큐먼트 생성 |
| 112 | 114 |
|
| 113 | 115 |
//LayerControl LayerControl = null; // 레이어 컨트롤 |
| ... | ... | |
| 256 | 258 |
btnWholeExport.Visibility = Visibility.Collapsed; |
| 257 | 259 |
} |
| 258 | 260 |
|
| 261 |
var pemssServiceClient = new PemssService.PemssServiceClient(App._binding, App._PemssEndPoint); |
|
| 262 |
var result = pemssServiceClient.GetrequirementListAsync(App.ViewInfo.ProjectNO, App.ViewInfo.DocumentItemID).ConfigureAwait(false); |
|
| 263 |
|
|
| 264 |
requirementList = result.GetAwaiter().GetResult(); |
|
| 265 |
|
|
| 259 | 266 |
_initializeComponentFinished = true; |
| 260 | 267 |
|
| 261 | 268 |
//timm.Interval = 10; |
| ... | ... | |
| 433 | 440 |
printCanvas.Width = image.Width; |
| 434 | 441 |
printCanvas.Height = image.Height; |
| 435 | 442 |
|
| 443 |
List<string> removeMarkupItems = new List<string>(); |
|
| 444 |
|
|
| 436 | 445 |
foreach (var info in gridViewMarkup.SelectedItems.Cast<IKCOM.MarkupInfoItem>()) |
| 437 | 446 |
{
|
| 447 |
if (IsRequirement.IsChecked != true) |
|
| 448 |
{
|
|
| 449 |
removeMarkupItems =requirementList.SelectMany(x => x.VpComments.SelectMany(c => c.commentId.Split(','))).ToList();
|
|
| 450 |
} |
|
| 451 |
|
|
| 438 | 452 |
load.User_Id = info.UserID; |
| 439 | 453 |
load.document_id = _DocInfo.DOCUMENT_ID; |
| 440 | 454 |
load.Page_No = PageNo; |
| 441 | 455 |
load.DisplayColor = info.DisplayColor; |
| 442 | 456 |
load.Markupinfoid = info.MarkupInfoID; |
| 443 |
load.Markup_Load(printCanvas); |
|
| 457 |
load.Markup_Load(printCanvas, removeMarkupItems);
|
|
| 444 | 458 |
} |
| 445 | 459 |
|
| 446 | 460 |
printCanvas.UpdateLayout(); |
내보내기 Unified diff
