개정판 6a19b48d
issue #00000 페이지 이미지 download 로직 수정
Change-Id: I4da03c36b5a135eea80b57b20ada38239afd1082
| KCOM/Views/MainMenu.xaml.cs | ||
|---|---|---|
| 552 | 552 |
|
| 553 | 553 |
private void WcfServer_IpcFileDownloadReceived(object sender, IIpc.IpcDownloadStatusArgs e) |
| 554 | 554 |
{
|
| 555 |
Dispatcher.BeginInvoke((Action)delegate () { ViewerDataModel.Instance.DownloadFileProgress = (int)e.Progress; });
|
|
| 555 |
try |
|
| 556 |
{
|
|
| 557 |
Dispatcher.BeginInvoke((Action)delegate () { ViewerDataModel.Instance.DownloadFileProgress = (int)e.Progress; });
|
|
| 556 | 558 |
|
| 557 |
if (e.IsFinish) |
|
| 559 |
if (e.IsFinish) |
|
| 560 |
{
|
|
| 561 |
ViewerDataModel.Instance.SystemMain.dzMainMenu.searchPanel_Instance.SetSerachPDFFile(instnaceFile); |
|
| 562 |
ViewerDataModel.Instance.IsDownloadOriginal = true; |
|
| 563 |
(sender as IIpc.WcfServer).IpcFileDownloadReceived -= WcfServer_IpcFileDownloadReceived; |
|
| 564 |
//(sender as IIpc.WcfServer).Stop(); |
|
| 565 |
} |
|
| 566 |
} |
|
| 567 |
catch (Exception ex) |
|
| 558 | 568 |
{
|
| 559 |
ViewerDataModel.Instance.SystemMain.dzMainMenu.searchPanel_Instance.SetSerachPDFFile(instnaceFile); |
|
| 560 |
ViewerDataModel.Instance.IsDownloadOriginal = true; |
|
| 561 |
|
|
| 569 |
throw; |
|
| 562 | 570 |
} |
| 563 | 571 |
} |
| 564 | 572 |
|
| ... | ... | |
| 1212 | 1220 |
viewinfo.MarkupList.Clear(); |
| 1213 | 1221 |
viewinfo.MarkupList = null; |
| 1214 | 1222 |
} |
| 1223 |
|
|
| 1215 | 1224 |
viewinfo.MarkupList = new List<MarkupItem>(); |
| 1216 | 1225 |
foreach (var item in dbinfo.MarkupList) |
| 1217 | 1226 |
{
|
| 1227 |
System.Diagnostics.Debug.WriteLine(item.ID); |
|
| 1218 | 1228 |
viewinfo.MarkupList.Add(item); |
| 1219 | 1229 |
} |
| 1220 | 1230 |
} |
| ... | ... | |
| 2668 | 2678 |
} |
| 2669 | 2679 |
} |
| 2670 | 2680 |
|
| 2671 |
private async void zoomAndPanControl_MouseDown(object sender, MouseButtonEventArgs e) |
|
| 2681 |
// 저장전 textbox 입력 완료 때문에 public로 하여 savecommand에서 호출하도록 임시로 함. |
|
| 2682 |
public async void zoomAndPanControl_MouseDown(object sender, MouseButtonEventArgs e) |
|
| 2672 | 2683 |
{
|
| 2673 | 2684 |
var set_option = this.ParentOfType<MainWindow>().dzTopMenu.Parent.ChildrenOfType<RadNumericUpDown>().Where(item => item.IsKeyboardFocusWithin).FirstOrDefault(); |
| 2674 | 2685 |
if (set_option != null && !string.IsNullOrEmpty(set_option.ContentText)) |
| ... | ... | |
| 4615 | 4626 |
|
| 4616 | 4627 |
//if (result) |
| 4617 | 4628 |
//{
|
| 4618 |
btnFinalPDF.IsEnabled = false;
|
|
| 4619 |
|
|
| 4620 |
await ConsolidationMethod();
|
|
| 4629 |
btnFinalPDF.IsEnabled = false; |
|
| 4630 |
btnConsolidate.IsEnabled = false; |
|
| 4631 |
await ConsolidationMethod(); |
|
| 4621 | 4632 |
//} |
| 4622 | 4633 |
//else |
| 4623 | 4634 |
//{
|
내보내기 Unified diff
