개정판 90865212
export 오류 수정
Change-Id: I7753645a671bc93e1a4f80979d3e72e9d11e7442
| KCOM/Controls/PrintControl.xaml.cs | ||
|---|---|---|
| 285 | 285 |
if (!_IsDagSlider) |
| 286 | 286 |
{
|
| 287 | 287 |
this.CurrentPageNo = (int)this.sliderPages.Value; |
| 288 |
|
|
| 289 |
await App.PageStorage.GetPageUriAsync(this.CurrentPageNo);
|
|
| 288 |
await PageChangeAsync(this.CurrentPageNo); |
|
| 289 |
//await App.PageStorage.GetPageUriAsync(this.CurrentPageNo);
|
|
| 290 | 290 |
|
| 291 | 291 |
if (_ButtonName == "Current") |
| 292 | 292 |
{
|
| ... | ... | |
| 305 | 305 |
this.CurrentPageNo = (int)this.sliderPages.Value; |
| 306 | 306 |
if (_initializeComponentFinished) |
| 307 | 307 |
{
|
| 308 |
await PageChangeAsync(this.CurrentPageNo); |
|
| 308 |
|
|
| 309 | 309 |
} |
| 310 | 310 |
} |
| 311 | 311 |
|
| ... | ... | |
| 437 | 437 |
//var bitmap = new BitmapImage(); |
| 438 | 438 |
//using (var stream = new MemoryStream(buffer)) |
| 439 | 439 |
//{
|
| 440 |
//bitmap.BeginInit(); |
|
| 441 |
//bitmap.CacheOption = BitmapCacheOption.OnLoad; |
|
| 442 |
//bitmap.StreamSource = stream; |
|
| 443 |
//bitmap.EndInit(); |
|
| 444 |
|
|
| 440 |
//bitmap.BeginInit(); |
|
| 441 |
//bitmap.CacheOption = BitmapCacheOption.OnLoad; |
|
| 442 |
//bitmap.StreamSource = stream; |
|
| 443 |
//bitmap.EndInit(); |
|
| 444 |
|
|
| 445 |
|
|
| 446 |
var uri = await App.PageStorage.GetPageUriAsync(PageNo); |
|
| 447 |
//Image bitmap = new Image(); |
|
| 448 |
//bitmap.Stretch = Stretch.Fill; |
|
| 449 |
//bitmap.Source = bitmapframe; |
|
| 450 |
//bitmap.Width = Convert.ToDouble(currentPage.PAGE_WIDTH); |
|
| 451 |
//bitmap.Height = Convert.ToDouble(currentPage.PAGE_HEIGHT); |
|
| 445 | 452 |
printCanvas.Children.Clear(); |
| 446 |
var bitmapframe = await App.PageStorage.GetPageImageAsync(PageNo); |
|
| 447 |
Image bitmap = new Image(); |
|
| 448 |
bitmap.Stretch = Stretch.Fill; |
|
| 449 |
bitmap.Source = bitmapframe; |
|
| 450 |
bitmap.Width = Convert.ToDouble(currentPage.PAGE_WIDTH); |
|
| 451 |
bitmap.Height = Convert.ToDouble(currentPage.PAGE_HEIGHT); |
|
| 452 |
printCanvas.Children.Add(bitmap); |
|
| 453 |
|
|
| 453 |
printCanvas.Width = Convert.ToDouble(currentPage.PAGE_WIDTH); |
|
| 454 |
printCanvas.Height = Convert.ToDouble(currentPage.PAGE_HEIGHT); |
|
| 455 |
printCanvas.Background = new ImageBrush { ImageSource = new BitmapImage(uri) };
|
|
| 456 |
|
|
| 454 | 457 |
//ImageBrush background = new ImageBrush(bitmap); |
| 455 | 458 |
//printCanvas.Background = background; |
| 456 |
printCanvas.Background = new SolidColorBrush(Colors.Transparent); |
|
| 459 |
//printCanvas.Background = new SolidColorBrush(Colors.Transparent);
|
|
| 457 | 460 |
|
| 458 |
printCanvas.Width = Convert.ToDouble(currentPage.PAGE_WIDTH); |
|
| 459 |
printCanvas.Height = Convert.ToDouble(currentPage.PAGE_HEIGHT); |
|
| 460 | 461 |
|
| 461 | 462 |
foreach (var info in gridViewMarkup.SelectedItems.Cast<IKCOM.MarkupInfoItem>()) |
| 462 | 463 |
{
|
| ... | ... | |
| 468 | 469 |
await load.Markup_LoadAsync(printCanvas); |
| 469 | 470 |
} |
| 470 | 471 |
|
| 471 |
await Dispatcher.InvokeAsync(() => {
|
|
| 472 |
printCanvas.UpdateLayout(); |
|
| 473 |
}); |
|
| 472 |
//await Dispatcher.InvokeAsync(() => {
|
|
| 473 |
// printCanvas.UpdateLayout();
|
|
| 474 |
//});
|
|
| 474 | 475 |
|
| 475 | 476 |
if (Flag) |
| 476 | 477 |
{
|
내보내기 Unified diff
