개정판 58dd9e89
Fix: 스탬의 COMPANY_NAME이 실제 회사 이름으로 대체도지 않는 오류 수정
Change-Id: Ief8011c7d7ce974f1881907911f45c8c446a7e98
| KCOM/Controls/Symbol.xaml.cs | ||
|---|---|---|
| 171 | 171 |
_canvas.Background = Brushes.White; |
| 172 | 172 |
_canvas.Width = finalItem.BorderSize.Width; |
| 173 | 173 |
_canvas.Height = finalItem.BorderSize.Height; |
| 174 |
await MarkupParser.ParseAsync(App.BaseAddress, App.ViewInfo.ProjectNO, data, _canvas, PageAngle, "#FFFF0000", "", ViewerDataModel.Instance.NewMarkupCancelToken()); |
|
| 174 |
await MarkupParser.ParseAsync(App.BaseAddress, App.ViewInfo.ProjectNO, data, _canvas, PageAngle, "#FFFF0000", "", ViewerDataModel.Instance.NewMarkupCancelToken(), |
|
| 175 |
STAMP_Contents: App.SystemInfo.STAMP_CONTENTS); |
|
| 175 | 176 |
|
| 176 | 177 |
BitmapEncoder encoder = new PngBitmapEncoder(); |
| 177 | 178 |
|
| ... | ... | |
| 235 | 236 |
_canvas.Width = rect.Width; |
| 236 | 237 |
_canvas.Height = rect.Height; |
| 237 | 238 |
|
| 238 |
await MarkupParser.ParseAsync(App.BaseAddress, App.ViewInfo.ProjectNO, data, _canvas, PageAngle, "#FFFF0000", "", ViewerDataModel.Instance.NewMarkupCancelToken()); |
|
| 239 |
await MarkupParser.ParseAsync(App.BaseAddress, App.ViewInfo.ProjectNO, data, _canvas, PageAngle, "#FFFF0000", "", ViewerDataModel.Instance.NewMarkupCancelToken(), |
|
| 240 |
STAMP_Contents: App.SystemInfo.STAMP_CONTENTS); |
|
| 239 | 241 |
|
| 240 | 242 |
BitmapEncoder encoder = new PngBitmapEncoder(); |
| 241 | 243 |
RenderTargetBitmap renderBitmap = new RenderTargetBitmap((int)rect.Width, (int)rect.Height, 96d, 96d, PixelFormats.Pbgra32); |
| ... | ... | |
| 560 | 562 |
{
|
| 561 | 563 |
if (parse != "") |
| 562 | 564 |
{
|
| 563 |
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); |
|
| 565 |
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, |
|
| 566 |
STAMP_Contents: App.SystemInfo.STAMP_CONTENTS); |
|
| 564 | 567 |
(item as MarkupToPDF.Common.CommentUserInfo).CommentID = Commons.shortGuid(); |
| 565 | 568 |
(item as MarkupToPDF.Common.CommentUserInfo).SymbolID = id; |
| 566 | 569 |
//(item as MarkupToPDF.Common.CommentUserInfo).GroupID = group_id; |
내보내기 Unified diff
