개정판 661b7416
issue #999: Add FromString to all of controls
Change-Id: I64093e34a5f9e8d367cbed769ff4db8d7472cb7a
| KCOM/Services/BaseServices.cs | ||
|---|---|---|
| 413 | 413 |
//}); |
| 414 | 414 |
item.MarkupList.Where(pageItem => pageItem.PageNumber == ViewerDataModel.Instance.PageNumber).ToList().ForEach(delegate (MarkupItem markupitem) |
| 415 | 415 |
{
|
| 416 |
layerControl.markupParse(markupitem.Data, Common.ViewerDataModel.Instance.MarkupControls_Sync, item.DisplayColor, "", item.MarkupInfoID);
|
|
| 416 |
MarkupParser.ParseEx(App.ViewInfo.ProjectNO, markupitem.Data, Common.ViewerDataModel.Instance.MarkupControls_Sync, item.DisplayColor, "", item.MarkupInfoID);
|
|
| 417 | 417 |
}); |
| 418 | 418 |
} |
| 419 | 419 |
} |
| ... | ... | |
| 495 | 495 |
{
|
| 496 | 496 |
foreach (var markup in instance) |
| 497 | 497 |
{
|
| 498 |
layerControl.markupParseEx(markup.Data, Common.ViewerDataModel.Instance.MarkupControls_USER, item.DisplayColor, "", item.MarkupInfoID, markup.ID); |
|
| 498 |
MarkupParser.ParseEx(App.ViewInfo.ProjectNO, markup.Data, Common.ViewerDataModel.Instance.MarkupControls_USER, item.DisplayColor, "", |
|
| 499 |
item.MarkupInfoID, markup.ID); |
|
| 499 | 500 |
} |
| 500 | 501 |
} |
| 501 | 502 |
else |
| ... | ... | |
| 877 | 878 |
List<MarkupInfoItem> gridSelectionItem = gridViewMarkup.SelectedItems.Cast<MarkupInfoItem>().ToList(); //선택 된 마크업 |
| 878 | 879 |
List<MarkupInfoItem> gridNonSelectionItem = gridItem.Except(gridSelectionItem).ToList(); //선택 되지 않은 마크업 |
| 879 | 880 |
//MarkupToPDF.Controls.Parsing.LayerControl layerControl = new MarkupToPDF.Controls.Parsing.LayerControl(); |
| 880 |
layerControl.ProjectNo = App.ViewInfo.ProjectNO; |
|
| 881 | 881 |
Common.ViewerDataModel.Instance.MarkupControls_USER.Clear(); //전체 제거 |
| 882 | 882 |
Common.ViewerDataModel.Instance.MarkupControls.Clear(); //전체 제거 |
| 883 | 883 |
//foreach (var item in gridSelectionItem) |
| ... | ... | |
| 918 | 918 |
{
|
| 919 | 919 |
ViewerDataModel.Instance.MarkupList_USER.Where(data => data.PageNumber == pageNavigator.CurrentPage.PageNumber && data.MarkupInfoID == item.MarkupInfoID).ToList().ForEach(delegate (MarkupItemEx markupitem) |
| 920 | 920 |
{
|
| 921 |
layerControl.markupParseEx(markupitem.Data, Common.ViewerDataModel.Instance.MarkupControls_USER, item.DisplayColor, "", item.MarkupInfoID, markupitem.ID); |
|
| 921 |
MarkupParser.ParseEx(App.ViewInfo.ProjectNO, markupitem.Data, Common.ViewerDataModel.Instance.MarkupControls_USER, item.DisplayColor, "", |
|
| 922 |
item.MarkupInfoID, markupitem.ID); |
|
| 922 | 923 |
}); |
| 923 | 924 |
} |
| 924 | 925 |
else |
| 925 | 926 |
{
|
| 926 | 927 |
ViewerDataModel.Instance.MarkupList_Pre.Where(data => data.PageNumber == pageNavigator.CurrentPage.PageNumber && data.MarkupInfoID == item.MarkupInfoID).ToList().ForEach(delegate (MarkupItemEx markupitem) |
| 927 | 928 |
{
|
| 928 |
layerControl.markupParse(markupitem.Data, Common.ViewerDataModel.Instance.MarkupControls, item.DisplayColor, "", item.MarkupInfoID);
|
|
| 929 |
MarkupParser.ParseEx(App.ViewInfo.ProjectNO, markupitem.Data, Common.ViewerDataModel.Instance.MarkupControls, item.DisplayColor, "", item.MarkupInfoID);
|
|
| 929 | 930 |
}); |
| 930 | 931 |
} |
| 931 | 932 |
} |
내보내기 Unified diff
