개정판 f5f788c2
issue #0000 저장기능 수정
Change-Id: Iea19dc20c703cb1e07d3d5a2034d419eda6fa5b6
KCOM/Controls/Sample.xaml.cs | ||
---|---|---|
781 | 781 |
|
782 | 782 |
GotoPage(selectItem.PageNumber); |
783 | 783 |
|
784 |
var result = await MarkupParser.GetBaseControlAsync(selectItem.Data, ViewerDataModel.Instance.CancellationToken());
|
|
784 |
var result = await MarkupParser.GetBaseControlAsync(selectItem.Data, ViewerDataModel.Instance.NewMarkupCancelToken());
|
|
785 | 785 |
|
786 | 786 |
Rect rect = new Rect(new Point(result.StartPoint.X - 100, result.StartPoint.Y - 100), new Point(result.EndPoint.X + 100, result.EndPoint.Y + 100)); |
787 | 787 |
this.ParentOfType<KCOM.Views.MainMenu>().zoomAndPanControl.ZoomTo(rect); |
... | ... | |
854 | 854 |
MarkupInfoItemSmall gaza = clickButtonItem.CommandParameter as MarkupInfoItemSmall; |
855 | 855 |
GotoPage(Convert.ToInt32(gaza.PageNumber)); |
856 | 856 |
|
857 |
var data = await MarkupToPDF.Serialize.Core.JsonSerializerHelper.UnCompressStringAsync(gaza.Data.ToString(),ViewerDataModel.Instance.CancellationToken()); //언패킹작업
|
|
857 |
var data = await MarkupToPDF.Serialize.Core.JsonSerializerHelper.UnCompressStringAsync(gaza.Data.ToString(),ViewerDataModel.Instance.NewMarkupCancelToken()); //언패킹작업
|
|
858 | 858 |
switch (Enum.Parse(typeof(MarkupToPDF.Controls.Common.ControlType), gaza.Data_Type.ToString())) |
859 | 859 |
{ |
860 | 860 |
case MarkupToPDF.Controls.Common.ControlType.TextControl: |
... | ... | |
1369 | 1369 |
} |
1370 | 1370 |
foreach (var item in list) |
1371 | 1371 |
{ |
1372 |
var data = await MarkupToPDF.Serialize.Core.JsonSerializerHelper.UnCompressStringAsync(item.Data.ToString(), ViewerDataModel.Instance.CancellationToken());
|
|
1372 |
var data = await MarkupToPDF.Serialize.Core.JsonSerializerHelper.UnCompressStringAsync(item.Data.ToString(), ViewerDataModel.Instance.NewMarkupCancelToken());
|
|
1373 | 1373 |
|
1374 | 1374 |
switch (Enum.Parse(typeof(MarkupToPDF.Controls.Common.ControlType), item.Data_Type.ToString())) |
1375 | 1375 |
{ |
내보내기 Unified diff