프로젝트

일반

사용자정보

개정판 24c5e56c

ID24c5e56cba9a265a53397a5ffe348514c5f100b8
상위 c206d293
하위 ef22793a

김태성이(가) 4년 이상 전에 추가함

- final pdf Font 추가
- Markus navi 속도 최적화 Key input 최적화

Change-Id: I7f2cf1933e86017d7b1df9ef4bd3048a8e80a653

차이점 보기:

KCOM/Controls/PrintControl.xaml.cs
240 240
                gridViewMarkup.SelectedItems.Add(item);
241 241
            }
242 242

  
243
            PageChangeAsync(_StartPageNo).ConfigureAwait(true);
243
            PageChangeAsync(Common.ViewerDataModel.Instance.NewCancellationToken(), _StartPageNo).ConfigureAwait(true);
244 244

  
245 245
            sliderPages.Maximum = Convert.ToDouble(this._DocInfo.PAGE_COUNT);
246 246
            this.stPageNo.Maximum = Convert.ToDouble(this._DocInfo.PAGE_COUNT);
......
269 269
            //timm.Enabled = true;
270 270
        }
271 271

  
272
        private void _Timer_Elapsed(object sender, ElapsedEventArgs e)
273
        {
274
            timm.Enabled = false;
275
            PageChangeAsync(_StartPageNo);
276
        }
277 272
        #endregion
278 273

  
279 274
        #region Control Event
......
284 279
                if (!_IsDagSlider)
285 280
                {
286 281
                    this.CurrentPageNo = (int)this.sliderPages.Value;
287
                    await PageChangeAsync(this.CurrentPageNo);
282

  
283
                    await PageChangeAsync(Common.ViewerDataModel.Instance.NewCancellationToken(), this.CurrentPageNo);
288 284
                    //await App.PageStorage.GetPageUriAsync(this.CurrentPageNo);
289 285
                
290 286
                    if (_ButtonName == "Current")
......
406 402
        {
407 403
            if (_initializeComponentFinished)
408 404
            {
409
                await PageChangeAsync(this.CurrentPageNo);
405
                await PageChangeAsync(Common.ViewerDataModel.Instance.NewCancellationToken(),this.CurrentPageNo);
410 406
            }
411 407
        }
412 408

  
413 409
        #endregion
414 410

  
415
        public async System.Threading.Tasks.Task<bool> PageChangeAsync(int PageNo, bool Flag = false)
411
        public async System.Threading.Tasks.Task<bool> PageChangeAsync(System.Threading.CancellationToken cts, int PageNo, bool Flag = false)
416 412
        {
417 413
            System.Diagnostics.Debug.WriteLine("PageChangeAsync " + PageNo);
418 414
            bool result = false;
......
442 438
                    //bitmap.EndInit();
443 439

  
444 440
                        
445
                    var uri = await  App.PageStorage.GetPageUriAsync(currentPage.PAGE_NUMBER);
441
                    var uri = await  App.PageStorage.GetPageUriAsync(cts, currentPage.PAGE_NUMBER);
446 442
                    //Image bitmap = new Image();
447 443
                    //bitmap.Stretch = Stretch.Fill;
448 444
                    //bitmap.Source = bitmapframe;
......
520 516
        {
521 517
            try
522 518
            {
519
                var token = Common.ViewerDataModel.Instance.NewCancellationToken();
520

  
523 521
                if (this.printIndy.IsBusy == true)
524 522
                    return;
525 523

  
......
554 552
                {
555 553
                    cnt++;
556 554
                    sliderPages.Value = PageNo;
557
                    await PageChangeAsync(PageNo, true);
555
                    await PageChangeAsync(token,PageNo, true);
558 556
                    //PageChanged(cnt, true);
559 557
                }
560 558
                PrintName = cbPrint.SelectedItem.ToString();
......
585 583
                if (this.printIndy.IsBusy == true)
586 584
                    return;
587 585

  
586
                var token = Common.ViewerDataModel.Instance.NewCancellationToken();
587

  
588 588
                (this.Parent as RadWindow).CanClose = false;
589 589

  
590 590
                this.printIndy.IsBusy = true;
......
634 634
                            sliderPages.Value = PageNo;
635 635
                        });
636 636

  
637
                        await PageChangeAsync(PageNo, true);
637
                        await PageChangeAsync(token,PageNo, true);
638 638
                        System.Diagnostics.Debug.WriteLine("Export Page : " + PageNo);
639 639
                    }
640 640

  
......
721 721
                        printIndy.IsBusy = false;
722 722
                    });
723 723

  
724
                    await PageChangeAsync(_StartPageNo);
724
                    await PageChangeAsync(token,_StartPageNo);
725 725

  
726 726
                    (Application.Current.MainWindow as MainWindow).dzMainMenu.DialogMessage_Alert("Success", "Alert");
727 727
                }else
......
837 837
        #region 프린트 실행
838 838
        public async void Printing()
839 839
        {
840
            await PageChangeAsync(1);
840
            var token = Common.ViewerDataModel.Instance.NewCancellationToken();
841

  
842
            await PageChangeAsync(token,1);
841 843

  
842 844
            if (PrinterSettings.InstalledPrinters != null && PrinterSettings.InstalledPrinters.Count > 0)
843 845
            {

내보내기 Unified diff

클립보드 이미지 추가 (최대 크기: 500 MB)