개정판 53deabaf
- markup list 전체 선택 체크박스 추가
- Export 기능 수정
Change-Id: Id37ea925d0296c7bb2115ff00df280b13258f9bd
KCOM/Controls/PrintControl.xaml.cs | ||
---|---|---|
286 | 286 |
{ |
287 | 287 |
this.CurrentPageNo = (int)this.sliderPages.Value; |
288 | 288 |
|
289 |
await PageChangeAsync(this.CurrentPageNo);
|
|
290 |
|
|
289 |
await App.PageStorage.GetPageUriAsync(this.CurrentPageNo);
|
|
290 |
|
|
291 | 291 |
if (_ButtonName == "Current") |
292 | 292 |
{ |
293 | 293 |
stPageNo.Value = CurrentPageNo; |
... | ... | |
415 | 415 |
|
416 | 416 |
public async System.Threading.Tasks.Task<bool> PageChangeAsync(int PageNo, bool Flag = false) |
417 | 417 |
{ |
418 |
System.Diagnostics.Debug.WriteLine("PageChangeAsync " + PageNo); |
|
418 | 419 |
bool result = false; |
419 | 420 |
//Dispatcher.Invoke(System.Windows.Threading.DispatcherPriority.Normal, new Action(delegate |
420 | 421 |
//{ |
... | ... | |
444 | 445 |
printCanvas.Children.Clear(); |
445 | 446 |
var bitmapframe = await App.PageStorage.GetPageImageAsync(PageNo); |
446 | 447 |
Image bitmap = new Image(); |
447 |
|
|
448 |
bitmap.Stretch = Stretch.Fill; |
|
448 | 449 |
bitmap.Source = bitmapframe; |
450 |
bitmap.Width = Convert.ToDouble(currentPage.PAGE_WIDTH); |
|
451 |
bitmap.Height = Convert.ToDouble(currentPage.PAGE_HEIGHT); |
|
449 | 452 |
printCanvas.Children.Add(bitmap); |
450 | 453 |
|
451 | 454 |
//ImageBrush background = new ImageBrush(bitmap); |
... | ... | |
478 | 481 |
|
479 | 482 |
//System.Drawing.Image.FromFile() |
480 | 483 |
//Printimg = System.Drawing.Image.FromStream(stream); |
481 |
await System.Threading.Tasks.Task.Run(() => |
|
482 |
{ |
|
483 |
Dispatcher.InvokeAsync(() => |
|
484 |
//await System.Threading.Tasks.Task.Run(() =>
|
|
485 |
//{
|
|
486 |
await Dispatcher.InvokeAsync(() =>
|
|
484 | 487 |
{ |
485 |
|
|
486 | 488 |
Export export = new Export(); |
487 | 489 |
p_img = export.Exporting(PrintView, printCanvas.Width, printCanvas.Height); |
488 | 490 |
Printimg_List.Add(Printimg_List.Count() + 1, p_img); |
489 | 491 |
}); |
490 |
}); |
|
492 |
//});
|
|
491 | 493 |
} |
492 | 494 |
|
493 | 495 |
result = true; |
... | ... | |
622 | 624 |
{ |
623 | 625 |
sliderPages.Value = PageNo; |
624 | 626 |
}); |
627 |
|
|
625 | 628 |
await PageChangeAsync(PageNo, true); |
626 |
|
|
629 |
System.Diagnostics.Debug.WriteLine("Export Page : " + PageNo); |
|
627 | 630 |
} |
628 | 631 |
|
629 | 632 |
//using (FileStream fs = new FileStream(@"D:\Temp\Text.pdf", FileMode.OpenOrCreate, FileAccess.Write, FileShare.None)) |
내보내기 Unified diff