개정판 85132173
Fix: Delete에 대한 Undo/Redo 기능 수정(R1)
Change-Id: I07fb5c5ee82c8db1fc8b4b0bbeefeb3e8f989d3a
| KCOM/Common/SelectionSet.cs | ||
|---|---|---|
| 104 | 104 |
from comment in ViewerDataModel.Instance.MarkupControls_USER |
| 105 | 105 |
where comment.Visibility != Visibility.Hidden && rect.Contains(comment.ItemRect) |
| 106 | 106 |
select comment; |
| 107 |
if (selected.Count() > 0)
|
|
| 107 |
if (selected.Any())
|
|
| 108 | 108 |
{
|
| 109 | 109 |
this.UnSelect(mainMenu); /// unselect alreay selected items |
| 110 | 110 |
|
| KCOM/Events/Event_KeyEvent.cs | ||
|---|---|---|
| 232 | 232 |
case Key.Delete: |
| 233 | 233 |
{
|
| 234 | 234 |
List<CommentUserInfo> selectItems = SelectionSet.Instance.SelectedItems; |
| 235 |
///SelectionSet.Instance.UnSelect(Common.ViewerDataModel.Instance.SystemMain.dzMainMenu);
|
|
| 235 |
SelectionSet.Instance.UnSelect(Common.ViewerDataModel.Instance.SystemMain.dzMainMenu); |
|
| 236 | 236 |
this.dzMainMenu.SelectLayer.Children.Clear(); |
| 237 | 237 |
|
| 238 | 238 |
UndoCommand.Instance.Push(EventType.Delete, selectItems); |
| KCOM/Events/UndoCommand.cs | ||
|---|---|---|
| 118 | 118 |
break; |
| 119 | 119 |
case (EventType.Delete): |
| 120 | 120 |
{
|
| 121 |
List<CommentUserInfo> comment = new List<CommentUserInfo>(); |
|
| 121 |
List<CommentUserInfo> comments = new List<CommentUserInfo>();
|
|
| 122 | 122 |
foreach (var item in undo.MarkupDataColl) |
| 123 | 123 |
{
|
| 124 |
ViewerDataModel.Instance.MarkupControls_USER.Add(item.Markup); |
|
| 125 | 124 |
item.Markup.Load(); |
| 126 | 125 |
item.Markup.UpdateControl(); |
| 127 |
comment.Add(item.Markup); |
|
| 128 |
|
|
| 129 |
///ViewerDataModel.Instance.SystemMain.dzMainMenu.pageNavigator.MarkupListUpdate( |
|
| 130 |
///MarkupParser.MarkupToString(item.Markup, App.ViewInfo.UserID), EventType.Create, null, null); |
|
| 126 |
comments.Add(item.Markup); |
|
| 131 | 127 |
} |
| 132 | 128 |
|
| 133 |
final = new AdornerFinal(comment); |
|
| 134 |
Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.SelectLayer.Children.Add(final); |
|
| 129 |
var adorner = new AdornerFinal(comments); |
|
| 130 |
Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.SelectLayer.Children.Add(adorner); |
|
| 131 |
///SelectionSet.Instance.UnSelect(Common.ViewerDataModel.Instance.SystemMain.dzMainMenu); |
|
| 135 | 132 |
} |
| 136 | 133 |
break; |
| 137 | 134 |
case (EventType.Operation): |
| ... | ... | |
| 149 | 146 |
|
| 150 | 147 |
comment.Add(item.Markup); |
| 151 | 148 |
} |
| 152 |
final = new AdornerFinal(comment);
|
|
| 153 |
Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.SelectLayer.Children.Add(final);
|
|
| 149 |
var adoner = new AdornerFinal(comment);
|
|
| 150 |
Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.SelectLayer.Children.Add(adoner);
|
|
| 154 | 151 |
///SelectionSet.Instance.UnSelect(Common.ViewerDataModel.Instance.SystemMain.dzMainMenu); |
| 155 | 152 |
} |
| 156 | 153 |
break; |
내보내기 Unified diff
