개정판 a1e2ba68
markus 외부주소 오류 수정
Change-Id: I03bd3df4edb78472d7d45f7a8c5db87fdfda226b
| KCOM/Views/MainMenu.xaml.cs | ||
|---|---|---|
| 1088 | 1088 |
string sColor = (info.UserID == App.ViewInfo.UserID) ? "#FFFF0000" : info.DisplayColor; |
| 1089 | 1089 |
if (info.UserID == App.ViewInfo.UserID) |
| 1090 | 1090 |
{
|
| 1091 |
var control = await MarkupParser.ParseExAsync(cts, App.ViewInfo.ProjectNO, markup.Data, Common.ViewerDataModel.Instance.MarkupControls_USER, PageAngle, sColor, "", |
|
| 1091 |
var control = await MarkupParser.ParseExAsync(App.BaseAddress, cts, App.ViewInfo.ProjectNO, markup.Data, Common.ViewerDataModel.Instance.MarkupControls_USER, PageAngle, sColor, "",
|
|
| 1092 | 1092 |
markup.MarkupInfoID, markup.ID); |
| 1093 | 1093 |
control.Visibility = Visibility.Hidden; |
| 1094 | 1094 |
} |
| 1095 | 1095 |
else |
| 1096 | 1096 |
{
|
| 1097 |
var control = await MarkupParser.ParseExAsync(cts, App.ViewInfo.ProjectNO, markup.Data, Common.ViewerDataModel.Instance.MarkupControls, PageAngle, sColor, "", |
|
| 1097 |
var control = await MarkupParser.ParseExAsync(App.BaseAddress, cts, App.ViewInfo.ProjectNO, markup.Data, Common.ViewerDataModel.Instance.MarkupControls, PageAngle, sColor, "",
|
|
| 1098 | 1098 |
markup.MarkupInfoID, markup.ID); |
| 1099 | 1099 |
control.Visibility = Visibility.Hidden; |
| 1100 | 1100 |
} |
| ... | ... | |
| 1125 | 1125 |
|
| 1126 | 1126 |
foreach (var markupitem in markupitems) |
| 1127 | 1127 |
{
|
| 1128 |
await MarkupParser.ParseExAsync(ViewerDataModel.Instance.CancellationToken(), App.ViewInfo.ProjectNO, markupitem.Data, Common.ViewerDataModel.Instance.MarkupControls_Sync,PageAngle, item.DisplayColor, "", item.MarkupInfoID); |
|
| 1128 |
await MarkupParser.ParseExAsync(App.BaseAddress, ViewerDataModel.Instance.CancellationToken(), App.ViewInfo.ProjectNO, markupitem.Data, Common.ViewerDataModel.Instance.MarkupControls_Sync,PageAngle, item.DisplayColor, "", item.MarkupInfoID);
|
|
| 1129 | 1129 |
|
| 1130 | 1130 |
if (cts.IsCancellationRequested) |
| 1131 | 1131 |
{
|
| ... | ... | |
| 4615 | 4615 |
|
| 4616 | 4616 |
private void FinalPDFEvent(object sender, RoutedEventArgs e) |
| 4617 | 4617 |
{
|
| 4618 |
var item = gridViewMarkup.Items.Cast<MarkupInfoItem>().Where(d => d.Consolidate == 1 && d.AvoidConsolidate == 0).FirstOrDefault(); |
|
| 4619 |
if (item != null) |
|
| 4618 |
Common.ViewerDataModel.Instance.SystemMain.dzTopMenu._SaveEvent(null, null); |
|
| 4619 |
|
|
| 4620 |
var item = gridViewMarkup.Items.Cast<MarkupInfoItem>().Where(d => d.Consolidate == 1 && d.AvoidConsolidate == 0).FirstOrDefault(); |
|
| 4621 |
|
|
| 4622 |
if (item != null) |
|
| 4620 | 4623 |
{
|
| 4621 | 4624 |
if (BaseClient.FinalPDF_GetFinalPDFStatus(_DocInfo.ID, item.MarkupInfoID, _ViewInfo.UserID)) |
| 4622 | 4625 |
{
|
| 4623 |
//Logger.sendReqLog("SetFinalPDFAsync", _ViewInfo.ProjectNO + "," + _DocInfo.ID + "," + item.MarkupInfoID + "," + _ViewInfo.UserID, 1);
|
|
| 4624 |
BaseClient.SetFinalPDFAsync(_ViewInfo.ProjectNO, _DocInfo.ID, item.MarkupInfoID, _ViewInfo.UserID); |
|
| 4626 |
//Logger.sendReqLog("SetFinalPDFAsync", _ViewInfo.ProjectNO + "," + _DocInfo.ID + "," + item.MarkupInfoID + "," + _ViewInfo.UserID, 1);
|
|
| 4627 |
|
|
| 4628 |
BaseClient.SetFinalPDFAsync(_ViewInfo.ProjectNO, _DocInfo.ID, item.MarkupInfoID, _ViewInfo.UserID); |
|
| 4625 | 4629 |
} |
| 4626 | 4630 |
else |
| 4627 | 4631 |
{
|
| ... | ... | |
| 4841 | 4845 |
var markupitems = item.MarkupList.Where(pageItem => pageItem.PageNumber == ViewerDataModel.Instance.SyncPageNumber).ToList(); |
| 4842 | 4846 |
foreach (var markupitem in markupitems) |
| 4843 | 4847 |
{
|
| 4844 |
await MarkupParser.ParseExAsync(ViewerDataModel.Instance.CancellationToken(), App.ViewInfo.ProjectNO, markupitem.Data, Common.ViewerDataModel.Instance.MarkupControls_Sync,0, item.DisplayColor, "", item.MarkupInfoID); |
|
| 4848 |
await MarkupParser.ParseExAsync(App.BaseAddress, ViewerDataModel.Instance.CancellationToken(), App.ViewInfo.ProjectNO, markupitem.Data, Common.ViewerDataModel.Instance.MarkupControls_Sync,0, item.DisplayColor, "", item.MarkupInfoID);
|
|
| 4845 | 4849 |
} |
| 4846 | 4850 |
} |
| 4847 | 4851 |
|
| ... | ... | |
| 5501 | 5505 |
_canvas.Background = Brushes.White; |
| 5502 | 5506 |
_canvas.Width = adorner_.BorderSize.Width; |
| 5503 | 5507 |
_canvas.Height = adorner_.BorderSize.Height; |
| 5504 |
await MarkupParser.ParseAsync(App.ViewInfo.ProjectNO, data, _canvas,ViewerDataModel.Instance.PageAngle, "#FFFF0000", "", ViewerDataModel.Instance.CancellationToken()); |
|
| 5508 |
await MarkupParser.ParseAsync(App.BaseAddress, App.ViewInfo.ProjectNO, data, _canvas,ViewerDataModel.Instance.PageAngle, "#FFFF0000", "", ViewerDataModel.Instance.CancellationToken());
|
|
| 5505 | 5509 |
|
| 5506 | 5510 |
BitmapEncoder encoder = new PngBitmapEncoder(); |
| 5507 | 5511 |
|
| ... | ... | |
| 5794 | 5798 |
{
|
| 5795 | 5799 |
if (item.PageNumber == pageNavigator.CurrentPage.PageNumber) |
| 5796 | 5800 |
{
|
| 5797 |
await MarkupParser.ParseExAsync(ViewerDataModel.Instance.CancellationToken(), App.ViewInfo.ProjectNO, item.Data, Common.ViewerDataModel.Instance.MarkupControls_USER,ViewerDataModel.Instance.PageAngle, "#FFFF0000", "", |
|
| 5801 |
await MarkupParser.ParseExAsync(App.BaseAddress, ViewerDataModel.Instance.CancellationToken(), App.ViewInfo.ProjectNO, item.Data, Common.ViewerDataModel.Instance.MarkupControls_USER,ViewerDataModel.Instance.PageAngle, "#FFFF0000", "",
|
|
| 5798 | 5802 |
items.MarkupInfoID, Commons.shortGuid()); |
| 5799 | 5803 |
} |
| 5800 | 5804 |
} |
내보내기 Unified diff
