개정판 873011c4
Fix: Undo/Redo 수정 진행
Change-Id: I3392d0ebc877626804a7c5d139d0b31a1942df7d
| KCOM/Events/RedoCommand.cs | ||
|---|---|---|
| 47 | 47 |
public void Execute() |
| 48 | 48 |
{
|
| 49 | 49 |
AdornerFinal final; |
| 50 |
Undo_data redo = ViewerDataModel.Instance.UndoDataList.Where(data => data.IsUndo).ToList()
|
|
| 50 |
UndoDataGroup redo = ViewerDataModel.Instance.UndoDataList.Where(data => data.IsUndo).ToList()
|
|
| 51 | 51 |
.OrderBy(order => order.EventTime).FirstOrDefault(); |
| 52 | 52 |
if (redo == null) return; |
| 53 | 53 |
|
| 54 | 54 |
SelectionSet.Instance.UnSelect(Common.ViewerDataModel.Instance.SystemMain.dzMainMenu); |
| 55 | 55 |
switch (redo.Event) |
| 56 | 56 |
{
|
| 57 |
case (Event_Type.Create):
|
|
| 57 |
case (EventType.Create): |
|
| 58 | 58 |
{
|
| 59 |
foreach (var item in redo.Markup_List)
|
|
| 59 |
foreach (var item in redo.MarkupDataColl)
|
|
| 60 | 60 |
{
|
| 61 | 61 |
ViewerDataModel.Instance.MarkupControls_USER.Add(item.Markup); |
| 62 | 62 |
ViewerDataModel.Instance.SystemMain.dzMainMenu.pageNavigator.MarkupListUpdate( |
| 63 |
MarkupParser.MarkupToString(item.Markup, App.ViewInfo.UserID), Event_Type.Create, null, null);
|
|
| 63 |
MarkupParser.MarkupToString(item.Markup, App.ViewInfo.UserID), EventType.Create, null, null); |
|
| 64 | 64 |
} |
| 65 | 65 |
} |
| 66 | 66 |
break; |
| 67 |
case (Event_Type.Delete):
|
|
| 67 |
case (EventType.Delete): |
|
| 68 | 68 |
{
|
| 69 |
foreach (var item in redo.Markup_List)
|
|
| 69 |
foreach (var item in redo.MarkupDataColl)
|
|
| 70 | 70 |
{
|
| 71 | 71 |
ViewerDataModel.Instance.MarkupControls_USER.Remove(item.Markup); |
| 72 | 72 |
ViewerDataModel.Instance.SystemMain.dzMainMenu.pageNavigator.MarkupListUpdate( |
| 73 |
null, Event_Type.Delete, item.Markup.CommentID, null);
|
|
| 73 |
null, EventType.Delete, item.Markup.CommentID, null); |
|
| 74 | 74 |
} |
| 75 | 75 |
} |
| 76 | 76 |
break; |
| 77 |
case (Event_Type.Thumb):
|
|
| 77 |
case (EventType.Operation):
|
|
| 78 | 78 |
{
|
| 79 | 79 |
List<CommentUserInfo> comment = new List<CommentUserInfo>(); |
| 80 | 80 |
|
| 81 |
foreach (var item in redo.Markup_List)
|
|
| 81 |
foreach (var item in redo.MarkupDataColl)
|
|
| 82 | 82 |
{
|
| 83 | 83 |
double dOriAngle = 0.0; |
| 84 | 84 |
List<Point> lstOriPointSet = new List<Point>(); |
| ... | ... | |
| 130 | 130 |
SelectionSet.Instance.UnSelect(Common.ViewerDataModel.Instance.SystemMain.dzMainMenu); |
| 131 | 131 |
} |
| 132 | 132 |
break; |
| 133 |
case (Event_Type.Select): |
|
| 133 |
/* |
|
| 134 |
case (EventType.Select): |
|
| 134 | 135 |
{
|
| 135 | 136 |
List<CommentUserInfo> comment = new List<CommentUserInfo>(); |
| 136 | 137 |
|
| 137 |
foreach (var item in redo.Markup_List)
|
|
| 138 |
foreach (var item in redo.MarkupDataColl)
|
|
| 138 | 139 |
{
|
| 139 | 140 |
ViewerDataModel.Instance.MarkupControls_USER.Remove(item.Markup); |
| 140 | 141 |
|
| ... | ... | |
| 161 | 162 |
Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.SelectLayer.Children.Add(final); |
| 162 | 163 |
} |
| 163 | 164 |
break; |
| 164 |
case (Event_Type.Option): |
|
| 165 |
*/ |
|
| 166 |
/* |
|
| 167 |
case (EventType.Option): |
|
| 165 | 168 |
{
|
| 166 | 169 |
List<CommentUserInfo> comment = new List<CommentUserInfo>(); |
| 167 | 170 |
|
| 168 |
foreach (var item in redo.Markup_List)
|
|
| 171 |
foreach (var item in redo.MarkupDataColl)
|
|
| 169 | 172 |
{
|
| 170 | 173 |
ViewerDataModel.Instance.MarkupControls_USER.Remove(item.Markup); |
| 171 | 174 |
if (redo.LineSize != 0 && item.Markup as IPath != null) |
| ... | ... | |
| 194 | 197 |
Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.SelectLayer.Children.Add(final); |
| 195 | 198 |
} |
| 196 | 199 |
break; |
| 200 |
*/ |
|
| 197 | 201 |
} |
| 198 | 202 |
|
| 199 | 203 |
ViewerDataModel.Instance.UndoDataList.Where(data => data.EventTime == redo.EventTime).ToList() |
내보내기 Unified diff
