개정판 26ec6226
issue #00000 copy&Paste 수정
Change-Id: I05c6141221f180d7f53d8f19929ed32d56977085
KCOM/Events/CutCommand.cs | ||
---|---|---|
63 | 63 |
foreach (var item in Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.SelectLayer.Children) |
64 | 64 |
{ |
65 | 65 |
string id = string.Empty; |
66 |
if (item.GetType().Name == "AdornerFinal") |
|
66 |
if (item?.GetType().Name == "AdornerFinal")
|
|
67 | 67 |
{ |
68 |
MarkupToPDF.Common.Undo_data UndoData = new Undo_data() |
|
69 |
{ |
|
70 |
IsUndo = false, |
|
71 |
Event = Event_Type.Delete, |
|
72 |
EventTime = DateTime.Now, |
|
73 |
Markup_List = new List<Multi_Undo_data>() |
|
74 |
}; |
|
75 |
|
|
68 | 76 |
foreach (var InnerItem in (item as Controls.AdornerFinal).Members.Cast<Controls.AdornerMember>()) |
69 | 77 |
{ |
70 |
var data = MarkupParser.MarkupToString(InnerItem.DrawingData as MarkupToPDF.Common.CommentUserInfo, App.ViewInfo.UserID); |
|
78 |
var comment = (InnerItem.DrawingData as MarkupToPDF.Common.CommentUserInfo); |
|
79 |
|
|
80 |
Multi_Undo_data multi_Undo_Data = new Multi_Undo_data() |
|
81 |
{ |
|
82 |
Markup = comment |
|
83 |
}; |
|
84 |
UndoData.Markup_List.Add(multi_Undo_Data); |
|
85 |
|
|
86 |
var data = MarkupParser.MarkupToString(comment, App.ViewInfo.UserID); |
|
87 |
|
|
71 | 88 |
id = (InnerItem.Symbol_ID != null) ? "|SymbolID|" + InnerItem.Symbol_ID : ""; |
72 | 89 |
MarkupData += "|OR|" + data.ConvertData + id; |
73 | 90 |
|
91 |
//Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.UpdateMyMarkupList(); |
|
92 |
ViewerDataModel.Instance.MarkupControls_USER.Remove(comment); |
|
93 |
ViewerDataModel.Instance.MarkupControls.Remove(comment); |
|
94 |
|
|
95 |
var Item_ = ViewerDataModel.Instance.MyMarkupList.Where(d => d.ID == comment.CommentID).FirstOrDefault(); |
|
96 |
ViewerDataModel.Instance.MyMarkupList.Remove(Item_); |
|
97 |
|
|
74 | 98 |
ViewerDataModel.Instance.SystemMain.dzMainMenu.pageNavigator.MarkupListUpdate( |
75 | 99 |
null, Event_Type.Delete, data.CommentID, null); |
76 | 100 |
} |
77 |
|
|
78 |
Clipboard.SetDataObject(MarkupData);
|
|
101 |
ViewerDataModel.Instance.UndoDataList.Add(UndoData); |
|
102 |
Clipboard.SetText(MarkupData,TextDataFormat.Text);
|
|
79 | 103 |
} |
80 | 104 |
} |
81 | 105 |
|
내보내기 Unified diff