개정판 f5f788c2
issue #0000 저장기능 수정
Change-Id: Iea19dc20c703cb1e07d3d5a2034d419eda6fa5b6
KCOM/Controls/Symbol.xaml.cs | ||
---|---|---|
172 | 172 |
_canvas.Background = Brushes.White; |
173 | 173 |
_canvas.Width = finalItem.BorderSize.Width; |
174 | 174 |
_canvas.Height = finalItem.BorderSize.Height; |
175 |
await MarkupParser.ParseAsync(App.BaseAddress, App.ViewInfo.ProjectNO, data, _canvas, PageAngle, "#FFFF0000", "", ViewerDataModel.Instance.CancellationToken());
|
|
175 |
await MarkupParser.ParseAsync(App.BaseAddress, App.ViewInfo.ProjectNO, data, _canvas, PageAngle, "#FFFF0000", "", ViewerDataModel.Instance.NewMarkupCancelToken());
|
|
176 | 176 |
|
177 | 177 |
BitmapEncoder encoder = new PngBitmapEncoder(); |
178 | 178 |
|
... | ... | |
479 | 479 |
{ |
480 | 480 |
if (parse != "") |
481 | 481 |
{ |
482 |
System.Windows.Controls.Control item = await MarkupParser.ParseExAsync(App.BaseAddress, ViewerDataModel.Instance.CancellationToken(),App.ViewInfo.ProjectNO, parse, ViewerDataModel.Instance.MarkupControls_USER, ViewerDataModel.Instance.PageAngle, string.Empty, string.Empty);
|
|
482 |
System.Windows.Controls.Control item = await MarkupParser.ParseExAsync(App.BaseAddress, ViewerDataModel.Instance.NewMarkupCancelToken(),App.ViewInfo.ProjectNO, parse, ViewerDataModel.Instance.MarkupControls_USER, ViewerDataModel.Instance.PageAngle, string.Empty, string.Empty);
|
|
483 | 483 |
(item as MarkupToPDF.Common.CommentUserInfo).CommentID = Commons.shortGuid(); |
484 | 484 |
(item as MarkupToPDF.Common.CommentUserInfo).SymbolID = id; |
485 | 485 |
//(item as MarkupToPDF.Common.CommentUserInfo).GroupID = group_id; |
내보내기 Unified diff