개정판 c0977e97
issue #000 group & dept color 임시 제거. IFinalPDF 를 Final Service 의 프로젝트를 참조하도록 경로 수정.
Change-Id: I03efb63cd9a922a4bda147a13d309b246f865ac3
| KCOM/Controls/Symbol.xaml.cs | ||
|---|---|---|
| 409 | 409 |
} |
| 410 | 410 |
|
| 411 | 411 |
//MARKUP_DATA_GROUP INSERT |
| 412 |
MARKUP_DATA_GROUP mARKUP_DATA_GROUP = new MARKUP_DATA_GROUP |
|
| 413 |
{
|
|
| 414 |
SYMBOL_ID = id,//InnerItem.Symbol_ID |
|
| 415 |
STATE = 0, |
|
| 416 |
}; |
|
| 417 |
long group_id = Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.AddMarkupDataGroup(mARKUP_DATA_GROUP, App.ViewInfo.ProjectNO); |
|
| 418 |
Logger.sendReqLog("AddMarkupDataGroup: ", "", 1);
|
|
| 412 |
//MARKUP_DATA_GROUP mARKUP_DATA_GROUP = new MARKUP_DATA_GROUP
|
|
| 413 |
//{
|
|
| 414 |
// SYMBOL_ID = id,//InnerItem.Symbol_ID
|
|
| 415 |
// STATE = 0,
|
|
| 416 |
//};
|
|
| 417 |
//long group_id = Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.AddMarkupDataGroup(mARKUP_DATA_GROUP, App.ViewInfo.ProjectNO);
|
|
| 418 |
//Logger.sendReqLog("AddMarkupDataGroup: ", "", 1);
|
|
| 419 | 419 |
|
| 420 | 420 |
if (Data_.Contains("|DZ|"))
|
| 421 | 421 |
{
|
| ... | ... | |
| 444 | 444 |
System.Windows.Controls.Control item = MarkupParser.ParseEx(App.ViewInfo.ProjectNO, parse, ViewerDataModel.Instance.MarkupControls_USER, string.Empty, string.Empty); |
| 445 | 445 |
(item as MarkupToPDF.Common.CommentUserInfo).CommentID = Commons.shortGuid(); |
| 446 | 446 |
(item as MarkupToPDF.Common.CommentUserInfo).SymbolID = id; |
| 447 |
(item as MarkupToPDF.Common.CommentUserInfo).GroupID = group_id; |
|
| 447 |
//(item as MarkupToPDF.Common.CommentUserInfo).GroupID = group_id;
|
|
| 448 | 448 |
ViewerDataModel.Instance.MarkupControls.Remove(item as MarkupToPDF.Common.CommentUserInfo); |
| 449 | 449 |
ViewerDataModel.Instance.MarkupControls_USER.Remove(item as MarkupToPDF.Common.CommentUserInfo); |
| 450 | 450 |
|
| ... | ... | |
| 462 | 462 |
} |
| 463 | 463 |
else |
| 464 | 464 |
{
|
| 465 |
PlaceImageSymbol(id, group_id);
|
|
| 465 |
PlaceImageSymbol(id, 0);
|
|
| 466 | 466 |
} |
| 467 | 467 |
} |
| 468 | 468 |
catch (Exception ex) |
| ... | ... | |
| 491 | 491 |
} |
| 492 | 492 |
|
| 493 | 493 |
//MARKUP_DATA_GROUP INSERT |
| 494 |
MARKUP_DATA_GROUP mARKUP_DATA_GROUP = new MARKUP_DATA_GROUP |
|
| 495 |
{
|
|
| 496 |
SYMBOL_ID = id,//InnerItem.Symbol_ID |
|
| 497 |
STATE = 0, |
|
| 498 |
}; |
|
| 494 |
//MARKUP_DATA_GROUP mARKUP_DATA_GROUP = new MARKUP_DATA_GROUP
|
|
| 495 |
//{
|
|
| 496 |
// SYMBOL_ID = id,//InnerItem.Symbol_ID
|
|
| 497 |
// STATE = 0,
|
|
| 498 |
//};
|
|
| 499 | 499 |
//long group_id = Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.AddMarkupDataGroup(mARKUP_DATA_GROUP, App.ViewInfo.ProjectNO); |
| 500 | 500 |
//Logger.sendReqLog("AddMarkupDataGroup: ", "", 1);
|
| 501 | 501 |
|
내보내기 Unified diff
