개정판 a1cc6e1f
issue #00000 Export&Print에서 Markup이 동시에 출력 되도록 수정
Change-Id: I14b3c64123228dca90259d303139c744d55cd039
| KCOM/Controls/PrintControl.xaml.cs | ||
|---|---|---|
| 514 | 514 |
//printCanvas.Background = background; |
| 515 | 515 |
//printCanvas.Background = new SolidColorBrush(Colors.Transparent); |
| 516 | 516 |
|
| 517 |
Canvas canvas = new Canvas(); |
|
| 517 | 518 |
|
| 518 |
foreach (var info in gridViewMarkup.SelectedItems.Cast<IKCOM.MarkupInfoItem>()) |
|
| 519 |
{
|
|
| 520 |
load.User_Id = info.UserID; |
|
| 521 |
load.document_id = _DocInfo.DOCUMENT_ID; |
|
| 522 |
load.Page_No = PageNo; |
|
| 519 |
//foreach (var info in gridViewMarkup.SelectedItems.Cast<IKCOM.MarkupInfoItem>()) |
|
| 520 |
//{
|
|
| 521 |
// load.User_Id = info.UserID; |
|
| 522 |
// load.document_id = _DocInfo.DOCUMENT_ID; |
|
| 523 |
// load.Page_No = PageNo; |
|
| 524 |
|
|
| 525 |
// if (chkOnlyRedColor.IsChecked == true) |
|
| 526 |
// {
|
|
| 527 |
// load.DisplayColor = "#FFFF0000"; |
|
| 528 |
// } |
|
| 529 |
// else |
|
| 530 |
// {
|
|
| 531 |
// load.DisplayColor = info.DisplayColor; |
|
| 532 |
// } |
|
| 533 |
|
|
| 534 |
// load.Markupinfoid = info.MarkupInfoID; |
|
| 535 |
// var IsLoad = await load.Markup_LoadAsync(canvas, 0); |
|
| 536 |
//} |
|
| 523 | 537 |
|
| 524 |
if (chkOnlyRedColor.IsChecked == true) |
|
| 525 |
{
|
|
| 526 |
load.DisplayColor = "#FFFF0000"; |
|
| 527 |
} |
|
| 528 |
else |
|
| 529 |
{
|
|
| 530 |
load.DisplayColor = info.DisplayColor; |
|
| 531 |
} |
|
| 538 |
var tasks = gridViewMarkup.SelectedItems.Cast<IKCOM.MarkupInfoItem>() |
|
| 539 |
.Select(async info => |
|
| 540 |
{
|
|
| 541 |
load.User_Id = info.UserID; |
|
| 542 |
load.document_id = _DocInfo.DOCUMENT_ID; |
|
| 543 |
load.Page_No = PageNo; |
|
| 544 |
load.DisplayColor = chkOnlyRedColor.IsChecked == true ? "#FFFF0000" : info.DisplayColor; |
|
| 545 |
load.Markupinfoid = info.MarkupInfoID; |
|
| 546 |
return await load.Markup_LoadAsync(canvas, 0); |
|
| 547 |
}); |
|
| 548 |
|
|
| 549 |
var results = await System.Threading.Tasks.Task.WhenAll(tasks); |
|
| 550 |
|
|
| 551 |
//printCanvas.Children.Add(canvas); |
|
| 552 |
|
|
| 553 |
printCanvas.Children.Add(canvas); |
|
| 532 | 554 |
|
| 533 |
load.Markupinfoid = info.MarkupInfoID; |
|
| 534 |
var IsLoad = await load.Markup_LoadAsync(printCanvas, 0); |
|
| 535 |
} |
|
| 536 | 555 |
//await Dispatcher.InvokeAsync(() => {
|
| 537 | 556 |
// printCanvas.UpdateLayout(); |
| 538 | 557 |
//}); |
| KCOM/Events/Load.cs | ||
|---|---|---|
| 63 | 63 |
|
| 64 | 64 |
foreach (string data in markupdata) |
| 65 | 65 |
{
|
| 66 |
result = await MarkupParser.ParseAsync(App.BaseAddress, App.ViewInfo.ProjectNO, data, printCanvas, pageAngle, DisplayColor, "",Common.ViewerDataModel.Instance.NewMarkupCancelToken(),
|
|
| 66 |
result = await MarkupParser.ParseAsync(App.BaseAddress, App.ViewInfo.ProjectNO, data, printCanvas, pageAngle, DisplayColor, "",null,
|
|
| 67 | 67 |
STAMP_Contents: App.SystemInfo.STAMP_CONTENTS); |
| 68 | 68 |
|
| 69 | 69 |
if(!result) |
| MarkupToPDF/Controls/Parsing/MarkupParse.cs | ||
|---|---|---|
| 209 | 209 |
/// </summary> |
| 210 | 210 |
/// <param name="MarkupString"></param> |
| 211 | 211 |
public static async Task<bool> ParseAsync(string baseUri, string sProjectNo, string MarkupString, Canvas Layer,double PageAngle, |
| 212 |
string DisplayColor, string ToolTipMessage, System.Threading.CancellationToken cts, Dictionary<string, string> STAMP_Contents = null) |
|
| 212 |
string DisplayColor, string ToolTipMessage, System.Threading.CancellationToken? cts, Dictionary<string, string> STAMP_Contents = null)
|
|
| 213 | 213 |
{
|
| 214 | 214 |
bool result = false; |
| 215 | 215 |
|
| ... | ... | |
| 220 | 220 |
string[] delimiterChars = { "|DZ|" };
|
| 221 | 221 |
string[] delimiterChars2 = { "|" };
|
| 222 | 222 |
string[] tokens = MarkupString.Split(delimiterChars, StringSplitOptions.RemoveEmptyEntries); |
| 223 |
|
|
| 223 |
|
|
| 224 | 224 |
foreach (var token in tokens) |
| 225 | 225 |
{
|
| 226 | 226 |
var item = await JsonSerializerHelper.UnCompressStringAsync(token,cts); //언패킹작업 |
내보내기 Unified diff
