개정판 43a743e4
print /export 수정
Change-Id: I592bae5fb7319c65014c51df0fd72772182c931c
| KCOM/Controls/PrintControl.xaml.cs | ||
|---|---|---|
| 438 | 438 |
//bitmap.EndInit(); |
| 439 | 439 |
|
| 440 | 440 |
|
| 441 |
var uri = await App.PageStorage.GetPageUriAsync(cts, currentPage.PAGE_NUMBER);
|
|
| 441 |
var uri = await App.PageStorage.GetPageUriAsync(cts, currentPage.PAGE_NUMBER); |
|
| 442 | 442 |
//Image bitmap = new Image(); |
| 443 | 443 |
//bitmap.Stretch = Stretch.Fill; |
| 444 | 444 |
//bitmap.Source = bitmapframe; |
| ... | ... | |
| 485 | 485 |
Export export = new Export(); |
| 486 | 486 |
p_img = export.Exporting(PrintView, printCanvas.Width, printCanvas.Height); |
| 487 | 487 |
Printimg_List.Add(Printimg_List.Count() + 1, p_img); |
| 488 |
},System.Windows.Threading.DispatcherPriority.Render);
|
|
| 488 |
},System.Windows.Threading.DispatcherPriority.SystemIdle);
|
|
| 489 | 489 |
//}); |
| 490 | 490 |
} |
| 491 | 491 |
|
| ... | ... | |
| 554 | 554 |
cnt++; |
| 555 | 555 |
sliderPages.Value = PageNo; |
| 556 | 556 |
await PageChangeAsync(token,PageNo, true); |
| 557 |
await System.Threading.Tasks.Task.Delay(300); |
|
| 557 | 558 |
//PageChanged(cnt, true); |
| 558 | 559 |
} |
| 559 | 560 |
PrintName = cbPrint.SelectedItem.ToString(); |
| ... | ... | |
| 636 | 637 |
sliderPages.Value = PageNo; |
| 637 | 638 |
}); |
| 638 | 639 |
|
| 639 |
await PageChangeAsync(token,PageNo, true); |
|
| 640 |
|
|
| 641 |
await PageChangeAsync(token, PageNo, true); |
|
| 642 |
|
|
| 640 | 643 |
System.Diagnostics.Debug.WriteLine("Export Page : " + PageNo);
|
| 641 | 644 |
} |
| 642 | 645 |
|
| KCOM/KCOM.csproj.user | ||
|---|---|---|
| 28 | 28 |
<StartArguments>eyJEb2N1bWVudEl0ZW1JRCI6IjQwMDAwMTQyIiwiYlBhcnRuZXIiOmZhbHNlLCJDcmVhdGVGaW5hbFBERlBlcm1pc3Npb24iOmZhbHNlLCJOZXdDb21tZW50UGVybWlzc2lvbiI6dHJ1ZSwiUHJvamVjdE5PIjoiMDAwMDAwIiwiVXNlcklEIjoiZG9mdGVjaCIsIk1vZGUiOjB9</StartArguments> |
| 29 | 29 |
</PropertyGroup> |
| 30 | 30 |
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug_HyoSung|AnyCPU'"> |
| 31 |
<StartArguments>eyJEb2N1bWVudEl0ZW1JRCI6IjQzOTMzIiwiYlBhcnRuZXIiOmZhbHNlLCJDcmVhdGVGaW5hbFBERlBlcm1pc3Npb24iOnRydWUsIk5ld0NvbW1lbnRQZXJtaXNzaW9uIjp0cnVlLCJQcm9qZWN0Tk8iOiJPTDEiLCJVc2VySUQiOiJkb2Z0ZWNoIn0=</StartArguments>
|
|
| 31 |
<StartArguments>eyJEb2N1bWVudEl0ZW1JRCI6IjIzMDY4IiwiYlBhcnRuZXIiOmZhbHNlLCJDcmVhdGVGaW5hbFBERlBlcm1pc3Npb24iOnRydWUsIk5ld0NvbW1lbnRQZXJtaXNzaW9uIjp0cnVlLCJQcm9qZWN0Tk8iOiJMUEciLCJVc2VySUQiOiJkb2Z0ZWNoIn0=</StartArguments>
|
|
| 32 | 32 |
</PropertyGroup> |
| 33 | 33 |
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug_HyoSung|x64'"> |
| 34 | 34 |
<StartProgram>C:\Program Files\DOFTECH\MARKUS\KCOM.exe</StartProgram> |
| KCOM/PageManager/PageStorage.cs | ||
|---|---|---|
| 172 | 172 |
|
| 173 | 173 |
} |
| 174 | 174 |
|
| 175 |
/// <summary> |
|
| 176 |
/// |
|
| 177 |
/// </summary> |
|
| 178 |
/// <param name="cts"></param> |
|
| 179 |
/// <param name="PageNo"></param> |
|
| 180 |
/// <param name="IsClone"></param> |
|
| 181 |
/// <param name="IsRestart"></param> |
|
| 182 |
/// <returns></returns> |
|
| 175 | 183 |
public async Task<Uri> GetPageUriAsync(System.Threading.CancellationToken? cts, int PageNo, bool IsRestart = false) |
| 176 | 184 |
{
|
| 177 | 185 |
Uri result = null; |
| ... | ... | |
| 193 | 201 |
|
| 194 | 202 |
DownloadWorkAsync(PageNo + 1, takecount); |
| 195 | 203 |
//var takePageNoList = Enumerable.Range(PageNo + 1, _TakeCount); |
| 196 |
|
|
| 197 |
|
|
| 198 |
|
|
| 199 | 204 |
} |
| 200 | 205 |
|
| 201 | 206 |
result = pageItem.LocalUri; |
| ... | ... | |
| 252 | 257 |
|
| 253 | 258 |
System.Diagnostics.Debug.WriteLine("DownloadPageAsync down");
|
| 254 | 259 |
|
| 255 |
string downloadFilePath = System.IO.Path.Combine(LocalStorage, PageNo.ToString() + "." + _fileExt); |
|
| 260 |
string downloadFilePath = System.IO.Path.Combine(LocalStorage, System.IO.Path.GetRandomFileName()); /// PageNo.ToString() + "." + _fileExt);
|
|
| 256 | 261 |
|
| 257 | 262 |
Uri originalUri = new Uri(_BaseUri.Replace("{PageNo}", PageNo.ToString()));
|
| 258 | 263 |
|
내보내기 Unified diff
