개정판 58dd9e89
Fix: 스탬의 COMPANY_NAME이 실제 회사 이름으로 대체도지 않는 오류 수정
Change-Id: Ief8011c7d7ce974f1881907911f45c8c446a7e98
| KCOM/Views/MainMenu.xaml.cs | ||
|---|---|---|
| 1085 | 1085 |
if (info.UserID == App.ViewInfo.UserID) |
| 1086 | 1086 |
{
|
| 1087 | 1087 |
var control = await MarkupParser.ParseExAsync(App.BaseAddress, cts, App.ViewInfo.ProjectNO, markup.Data, Common.ViewerDataModel.Instance.MarkupControls_USER, PageAngle, sColor, "", |
| 1088 |
markup.MarkupInfoID, markup.ID); |
|
| 1088 |
markup.MarkupInfoID, markup.ID, STAMP_Contents: App.SystemInfo.STAMP_CONTENTS);
|
|
| 1089 | 1089 |
if (control != null) |
| 1090 | 1090 |
{
|
| 1091 | 1091 |
Canvas.SetZIndex(control, (control as CommentUserInfo).ZIndex); |
| ... | ... | |
| 1095 | 1095 |
else |
| 1096 | 1096 |
{
|
| 1097 | 1097 |
var control = await MarkupParser.ParseExAsync(App.BaseAddress, cts, App.ViewInfo.ProjectNO, markup.Data, Common.ViewerDataModel.Instance.MarkupControls, PageAngle, sColor, "", |
| 1098 |
markup.MarkupInfoID, markup.ID); |
|
| 1098 |
markup.MarkupInfoID, markup.ID, STAMP_Contents: App.SystemInfo.STAMP_CONTENTS);
|
|
| 1099 | 1099 |
if (control != null) |
| 1100 | 1100 |
{
|
| 1101 | 1101 |
Canvas.SetZIndex(control, (control as CommentUserInfo).ZIndex); |
| ... | ... | |
| 1128 | 1128 |
|
| 1129 | 1129 |
foreach (var markupitem in markupitems) |
| 1130 | 1130 |
{
|
| 1131 |
await MarkupParser.ParseExAsync(App.BaseAddress, ViewerDataModel.Instance.NewMarkupCancelToken(), App.ViewInfo.ProjectNO, markupitem.Data, Common.ViewerDataModel.Instance.MarkupControls_Sync,PageAngle, item.DisplayColor, "", item.MarkupInfoID); |
|
| 1131 |
await MarkupParser.ParseExAsync(App.BaseAddress, ViewerDataModel.Instance.NewMarkupCancelToken(), App.ViewInfo.ProjectNO, markupitem.Data, Common.ViewerDataModel.Instance.MarkupControls_Sync,PageAngle, item.DisplayColor, "", item.MarkupInfoID, |
|
| 1132 |
STAMP_Contents: App.SystemInfo.STAMP_CONTENTS); |
|
| 1132 | 1133 |
|
| 1133 | 1134 |
//if (cts.IsCancellationRequested) |
| 1134 | 1135 |
//{
|
| ... | ... | |
| 5160 | 5161 |
var markupitems = item.MarkupList.Where(pageItem => pageItem.PageNumber == ViewerDataModel.Instance.SyncPageNumber).ToList(); |
| 5161 | 5162 |
foreach (var markupitem in markupitems) |
| 5162 | 5163 |
{
|
| 5163 |
await MarkupParser.ParseExAsync(App.BaseAddress, ViewerDataModel.Instance.NewMarkupCancelToken(), App.ViewInfo.ProjectNO, markupitem.Data, Common.ViewerDataModel.Instance.MarkupControls_Sync,0, item.DisplayColor, "", item.MarkupInfoID); |
|
| 5164 |
await MarkupParser.ParseExAsync(App.BaseAddress, ViewerDataModel.Instance.NewMarkupCancelToken(), App.ViewInfo.ProjectNO, markupitem.Data, Common.ViewerDataModel.Instance.MarkupControls_Sync,0, item.DisplayColor, "", item.MarkupInfoID, |
|
| 5165 |
STAMP_Contents: App.SystemInfo.STAMP_CONTENTS); |
|
| 5164 | 5166 |
} |
| 5165 | 5167 |
} |
| 5166 | 5168 |
|
| ... | ... | |
| 5820 | 5822 |
_canvas.Background = Brushes.White; |
| 5821 | 5823 |
_canvas.Width = adorner_.BorderSize.Width; |
| 5822 | 5824 |
_canvas.Height = adorner_.BorderSize.Height; |
| 5823 |
await MarkupParser.ParseAsync(App.BaseAddress, App.ViewInfo.ProjectNO, data, _canvas,ViewerDataModel.Instance.PageAngle, "#FFFF0000", "", ViewerDataModel.Instance.NewMarkupCancelToken()); |
|
| 5825 |
await MarkupParser.ParseAsync(App.BaseAddress, App.ViewInfo.ProjectNO, data, _canvas,ViewerDataModel.Instance.PageAngle, "#FFFF0000", "", ViewerDataModel.Instance.NewMarkupCancelToken(), |
|
| 5826 |
STAMP_Contents: App.SystemInfo.STAMP_CONTENTS); |
|
| 5824 | 5827 |
|
| 5825 | 5828 |
BitmapEncoder encoder = new PngBitmapEncoder(); |
| 5826 | 5829 |
|
| ... | ... | |
| 6115 | 6118 |
if (item.PageNumber == pageNavigator.CurrentPage.PageNumber) |
| 6116 | 6119 |
{
|
| 6117 | 6120 |
await MarkupParser.ParseExAsync(App.BaseAddress, ViewerDataModel.Instance.NewMarkupCancelToken(), App.ViewInfo.ProjectNO, item.Data, Common.ViewerDataModel.Instance.MarkupControls_USER,ViewerDataModel.Instance.PageAngle, "#FFFF0000", "", |
| 6118 |
items.MarkupInfoID, Commons.shortGuid()); |
|
| 6121 |
items.MarkupInfoID, Commons.shortGuid(), STAMP_Contents: App.SystemInfo.STAMP_CONTENTS);
|
|
| 6119 | 6122 |
} |
| 6120 | 6123 |
} |
| 6121 | 6124 |
} |
내보내기 Unified diff
