개정판 a1e2ba68
markus 외부주소 오류 수정
Change-Id: I03bd3df4edb78472d7d45f7a8c5db87fdfda226b
| KCOM/Services/BaseServices.cs | ||
|---|---|---|
| 289 | 289 |
string lastpage = _DocInfo.PAGE_COUNT.ToString(); |
| 290 | 290 |
instanceMain.dzTopMenu.tlcurrentPage.Text = firstpage; |
| 291 | 291 |
instanceMain.dzTopMenu.tlcurrentPage_readonly.Text = lastpage; |
| 292 |
string apptitle = string.Format("MARKUS(ver.{2}) - {0}(Rev.{1})", _DocItem?.DOCUMENT_NO, _DocItem?.REVISION, System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.ToString());
|
|
| 292 |
App.MarkusVersion = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.ToString(); |
|
| 293 |
|
|
| 294 |
string apptitle = string.Format("MARKUS(ver.{2}) - {0}(Rev.{1})", _DocItem?.DOCUMENT_NO, _DocItem?.REVISION, App.MarkusVersion);
|
|
| 293 | 295 |
|
| 294 | 296 |
instanceMain.Title = apptitle; |
| 295 | 297 |
|
| ... | ... | |
| 569 | 571 |
|
| 570 | 572 |
foreach (var markupitem in pageItems) |
| 571 | 573 |
{
|
| 572 |
await MarkupParser.ParseExAsync(ViewerDataModel.Instance.CancellationToken(), App.ViewInfo.ProjectNO, markupitem.Data, Common.ViewerDataModel.Instance.MarkupControls_Sync, ViewerDataModel.Instance.PageAngle, item.DisplayColor, "", item.MarkupInfoID); |
|
| 574 |
await MarkupParser.ParseExAsync(App.BaseAddress, ViewerDataModel.Instance.CancellationToken(), App.ViewInfo.ProjectNO, markupitem.Data, Common.ViewerDataModel.Instance.MarkupControls_Sync, ViewerDataModel.Instance.PageAngle, item.DisplayColor, "", item.MarkupInfoID);
|
|
| 573 | 575 |
} |
| 574 | 576 |
} |
| 575 | 577 |
} |
| ... | ... | |
| 674 | 676 |
|
| 675 | 677 |
foreach (var markup in instance) |
| 676 | 678 |
{
|
| 677 |
await MarkupParser.ParseExAsync(ViewerDataModel.Instance.CancellationToken(), App.ViewInfo.ProjectNO, markup.Data, Common.ViewerDataModel.Instance.MarkupControls_USER, ViewerDataModel.Instance.PageAngle, item.DisplayColor, "", |
|
| 679 |
await MarkupParser.ParseExAsync(App.BaseAddress, ViewerDataModel.Instance.CancellationToken(), App.ViewInfo.ProjectNO, markup.Data, Common.ViewerDataModel.Instance.MarkupControls_USER, ViewerDataModel.Instance.PageAngle, item.DisplayColor, "",
|
|
| 678 | 680 |
item.MarkupInfoID, markup.ID); |
| 679 | 681 |
} |
| 680 | 682 |
} |
| ... | ... | |
| 694 | 696 |
var instance = ViewerDataModel.Instance.MarkupList_Pre.Where(d => d.PageNumber == this.pageNavigator.CurrentPage.PageNumber && d.MarkupInfoID == item.MarkupInfoID).ToList(); |
| 695 | 697 |
foreach (var markup in instance) |
| 696 | 698 |
{
|
| 697 |
await MarkupParser.ParseExAsync(ViewerDataModel.Instance.CancellationToken(), App.ViewInfo.ProjectNO, markup.Data, Common.ViewerDataModel.Instance.MarkupControls, ViewerDataModel.Instance.PageAngle, item.DisplayColor, "", |
|
| 699 |
await MarkupParser.ParseExAsync(App.BaseAddress, ViewerDataModel.Instance.CancellationToken(), App.ViewInfo.ProjectNO, markup.Data, Common.ViewerDataModel.Instance.MarkupControls, ViewerDataModel.Instance.PageAngle, item.DisplayColor, "",
|
|
| 698 | 700 |
item.MarkupInfoID, markup.ID); |
| 699 | 701 |
} |
| 700 | 702 |
} |
| ... | ... | |
| 1011 | 1013 |
|
| 1012 | 1014 |
foreach (var markupitem in markupItems) |
| 1013 | 1015 |
{
|
| 1014 |
await MarkupParser.ParseExAsync(ViewerDataModel.Instance.CancellationToken(), App.ViewInfo.ProjectNO, markupitem.Data, Common.ViewerDataModel.Instance.MarkupControls_USER, ViewerDataModel.Instance.PageAngle, item.DisplayColor, "", |
|
| 1016 |
await MarkupParser.ParseExAsync(App.BaseAddress, ViewerDataModel.Instance.CancellationToken(), App.ViewInfo.ProjectNO, markupitem.Data, Common.ViewerDataModel.Instance.MarkupControls_USER, ViewerDataModel.Instance.PageAngle, item.DisplayColor, "",
|
|
| 1015 | 1017 |
item.MarkupInfoID, markupitem.ID); |
| 1016 | 1018 |
} |
| 1017 | 1019 |
} |
| ... | ... | |
| 1021 | 1023 |
|
| 1022 | 1024 |
foreach (var markupitem in markupItems) |
| 1023 | 1025 |
{
|
| 1024 |
await MarkupParser.ParseExAsync(ViewerDataModel.Instance.CancellationToken(), App.ViewInfo.ProjectNO, markupitem.Data, Common.ViewerDataModel.Instance.MarkupControls, ViewerDataModel.Instance.PageAngle, item.DisplayColor, "", item.MarkupInfoID); |
|
| 1026 |
await MarkupParser.ParseExAsync(App.BaseAddress, ViewerDataModel.Instance.CancellationToken(), App.ViewInfo.ProjectNO, markupitem.Data, Common.ViewerDataModel.Instance.MarkupControls, ViewerDataModel.Instance.PageAngle, item.DisplayColor, "", item.MarkupInfoID);
|
|
| 1025 | 1027 |
} |
| 1026 | 1028 |
} |
| 1027 | 1029 |
} |
내보내기 Unified diff
