개정판 0b75c341
PEMSS의 정합성 코멘트는 제외하고 Export 되도록 수정
Change-Id: I289cc872cf12b9d43fb415d0381271acca61f00a
| KCOM/Events/Load.cs | ||
|---|---|---|
| 42 | 42 |
} |
| 43 | 43 |
|
| 44 | 44 |
//마크업 불러오기 |
| 45 |
public void Markup_Load(Canvas printCanvas) |
|
| 45 |
public void Markup_Load(Canvas printCanvas,List<string> removeId)
|
|
| 46 | 46 |
{
|
| 47 |
List<string> markupdata = new List<string>(); |
|
| 47 |
if (removeId == null) |
|
| 48 |
{
|
|
| 49 |
removeId = new List<string>(); |
|
| 50 |
} |
|
| 51 |
|
|
| 52 |
|
|
| 53 |
List<ServiceDeepView.MarkupKeyValue> markupdata = new List<ServiceDeepView.MarkupKeyValue>(); |
|
| 48 | 54 |
|
| 49 | 55 |
Logger.sendReqLog("GetMarkupDataListperPage: ", App.ViewInfo.ProjectNO + "," + Markupinfoid + "," + Page_No, 1);
|
| 50 |
markupdata = Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.GetMarkupDataListperPage(App.ViewInfo.ProjectNO, Markupinfoid, Page_No);
|
|
| 56 |
markupdata = Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.GetMarkupDataForPage(App.ViewInfo.ProjectNO, Markupinfoid, Page_No);
|
|
| 51 | 57 |
|
| 52 | 58 |
if (markupdata.Count() > 0) |
| 53 | 59 |
{
|
| ... | ... | |
| 58 | 64 |
Logger.sendResLog("GetMarkupDataListperPage", "FALSE", 1);
|
| 59 | 65 |
} |
| 60 | 66 |
|
| 61 |
foreach (string data in markupdata) |
|
| 62 |
{
|
|
| 63 |
MarkupParser.Parse(App.ViewInfo.ProjectNO, data, printCanvas, DisplayColor, ""); |
|
| 67 |
foreach (var data in markupdata) |
|
| 68 |
{
|
|
| 69 |
if (!removeId.Contains(data.ID)) |
|
| 70 |
{
|
|
| 71 |
MarkupParser.Parse(App.ViewInfo.ProjectNO, data.Data, printCanvas, DisplayColor, ""); |
|
| 72 |
} |
|
| 64 | 73 |
} |
| 65 | 74 |
} |
| 66 | 75 |
} |
내보내기 Unified diff
