개정판 d04e8ee9
Sync Page 이동 수정
Change-Id: Ib0fbc85754ede89f83c1364ee77dc07f11ada633
| KCOM/Controls/PrintControl.xaml.cs | ||
|---|---|---|
| 465 | 465 |
await load.Markup_LoadAsync(printCanvas); |
| 466 | 466 |
} |
| 467 | 467 |
|
| 468 |
await Dispatcher.InvokeAsync(() => {
|
|
| 468 | 469 |
printCanvas.UpdateLayout(); |
| 470 |
}); |
|
| 469 | 471 |
|
| 470 |
if (Flag)
|
|
| 472 |
if (Flag) |
|
| 471 | 473 |
{
|
| 472 |
//MemoryStream ms = new MemoryStream(); |
|
| 473 |
//BmpBitmapEncoder bbe = new BmpBitmapEncoder(); |
|
| 474 |
//bbe.Frames.Add(BitmapFrame.Create(new Uri(_DefaultTileUri + PageNo + ".png"))); |
|
| 475 |
//bbe.Save(ms); |
|
| 476 |
|
|
| 477 |
//System.Drawing.Image.FromFile() |
|
| 478 |
//Printimg = System.Drawing.Image.FromStream(stream); |
|
| 479 |
Export export = new Export(); |
|
| 480 |
p_img = export.Exporting(PrintView, printCanvas.Width, printCanvas.Height); |
|
| 481 |
Printimg_List.Add(Printimg_List.Count() + 1, p_img); |
|
| 482 |
} |
|
| 474 |
//MemoryStream ms = new MemoryStream(); |
|
| 475 |
//BmpBitmapEncoder bbe = new BmpBitmapEncoder(); |
|
| 476 |
//bbe.Frames.Add(BitmapFrame.Create(new Uri(_DefaultTileUri + PageNo + ".png"))); |
|
| 477 |
//bbe.Save(ms); |
|
| 478 |
|
|
| 479 |
//System.Drawing.Image.FromFile() |
|
| 480 |
//Printimg = System.Drawing.Image.FromStream(stream); |
|
| 481 |
await System.Threading.Tasks.Task.Run(() => |
|
| 482 |
{
|
|
| 483 |
Dispatcher.InvokeAsync(() => |
|
| 484 |
{
|
|
| 485 |
|
|
| 486 |
Export export = new Export(); |
|
| 487 |
p_img = export.Exporting(PrintView, printCanvas.Width, printCanvas.Height); |
|
| 488 |
Printimg_List.Add(Printimg_List.Count() + 1, p_img); |
|
| 489 |
}); |
|
| 490 |
}); |
|
| 491 |
} |
|
| 483 | 492 |
|
| 484 | 493 |
result = true; |
| 485 | 494 |
//} |
| ... | ... | |
| 609 | 618 |
|
| 610 | 619 |
foreach (int PageNo in _lstPrintPageNo) |
| 611 | 620 |
{
|
| 612 |
sliderPages.Value = PageNo; |
|
| 621 |
await Dispatcher.InvokeAsync(() => |
|
| 622 |
{
|
|
| 623 |
sliderPages.Value = PageNo; |
|
| 624 |
}); |
|
| 613 | 625 |
await PageChangeAsync(PageNo, true); |
| 626 |
|
|
| 614 | 627 |
} |
| 615 | 628 |
|
| 616 | 629 |
//using (FileStream fs = new FileStream(@"D:\Temp\Text.pdf", FileMode.OpenOrCreate, FileAccess.Write, FileShare.None)) |
| KCOM/Events/ControlSelectChangeArgs.cs | ||
|---|---|---|
| 1 |
using System; |
|
| 2 |
using System.Collections.Generic; |
|
| 3 |
using System.Linq; |
|
| 4 |
using System.Text; |
|
| 5 |
using System.Threading.Tasks; |
|
| 6 |
|
|
| 7 |
namespace KCOM.Events |
|
| 8 |
{
|
|
| 9 |
public class ControlSelectChangeArgs |
|
| 10 |
{
|
|
| 11 |
public ControlSelectChangeArgs(string controlName) |
|
| 12 |
{
|
|
| 13 |
this.ControlName = controlName; |
|
| 14 |
} |
|
| 15 |
|
|
| 16 |
public string ControlName { get; set; }
|
|
| 17 |
} |
|
| 18 |
} |
|
| KCOM/MainWindow.xaml.cs | ||
|---|---|---|
| 481 | 481 |
smartupdaterpath = System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "SmartUpdate.exe"); |
| 482 | 482 |
Process.Start(smartupdaterpath, updateurl); |
| 483 | 483 |
} |
| 484 |
private void Client_DownloadFileCompleted(object sender, AsyncCompletedEventArgs e) |
|
| 484 |
private async void Client_DownloadFileCompleted(object sender, AsyncCompletedEventArgs e)
|
|
| 485 | 485 |
{
|
| 486 | 486 |
try |
| 487 | 487 |
{
|
| 488 |
Dispatcher.Invoke(System.Windows.Threading.DispatcherPriority.Normal, new Action(delegate |
|
| 489 |
{
|
|
| 490 |
progressControl.splashText.Text = "Download Completed"; |
|
| 491 |
})); |
|
| 488 |
await Dispatcher.InvokeAsync(()=> progressControl.splashText.Text = "Download Completed"); |
|
| 489 |
|
|
| 492 | 490 |
if(progressControl != null) |
| 493 | 491 |
{
|
| 494 | 492 |
progressControl.Close(); |
| KCOM/Views/MainMenu.xaml.cs | ||
|---|---|---|
| 4435 | 4435 |
ViewerDataModel.Instance.PageNumber += balancePoint; |
| 4436 | 4436 |
} |
| 4437 | 4437 |
|
| 4438 |
pageNavigator.GotoPage(ViewerDataModel.Instance.PageNumber); |
|
| 4438 |
//pageNavigator.GotoPage(ViewerDataModel.Instance.PageNumber);
|
|
| 4439 | 4439 |
|
| 4440 | 4440 |
if (!testPanel2.IsHidden) |
| 4441 | 4441 |
{
|
내보내기 Unified diff
