개정판 873011c4
Fix: Undo/Redo 수정 진행
Change-Id: I3392d0ebc877626804a7c5d139d0b31a1942df7d
| KCOM/Events/PasteCommand.cs | ||
|---|---|---|
| 68 | 68 |
{
|
| 69 | 69 |
List<MarkupToPDF.Common.CommentUserInfo> adornerSet = new List<MarkupToPDF.Common.CommentUserInfo>(); |
| 70 | 70 |
|
| 71 |
Multi_Undo_data multi_Undo_Data = new Multi_Undo_data();
|
|
| 71 |
Multi_UndoData multi_UndoData = new Multi_UndoData();
|
|
| 72 | 72 |
|
| 73 | 73 |
//강인구 Undo/Redo 보류 |
| 74 |
MarkupToPDF.Common.Undo_data UndoData = new Undo_data()
|
|
| 74 |
MarkupToPDF.Common.UndoDataGroup UndoData = new UndoDataGroup()
|
|
| 75 | 75 |
{
|
| 76 | 76 |
IsUndo = false, |
| 77 |
Event = Event_Type.Create,
|
|
| 77 |
Event = EventType.Create, |
|
| 78 | 78 |
EventTime = DateTime.Now, |
| 79 |
Markup_List = new List<Multi_Undo_data>()
|
|
| 79 |
MarkupDataColl = new List<Multi_UndoData>()
|
|
| 80 | 80 |
}; |
| 81 | 81 |
|
| 82 | 82 |
foreach (string parse in data) |
| ... | ... | |
| 101 | 101 |
|
| 102 | 102 |
//CreateCommand.Instance.Execute(control); |
| 103 | 103 |
adornerSet.Add(control); |
| 104 |
multi_Undo_Data = Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.Control_Style(control);
|
|
| 105 |
UndoData.Markup_List.Add(multi_Undo_Data);
|
|
| 104 |
multi_UndoData = Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.Control_Style(control); |
|
| 105 |
UndoData.MarkupDataColl.Add(multi_UndoData);
|
|
| 106 | 106 |
ViewerDataModel.Instance.UndoDataList.Add(UndoData); |
| 107 | 107 |
|
| 108 | 108 |
Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.UpdateMyMarkupList(); |
| 109 | 109 |
//ViewerDataModel.Instance.MarkupControls_USER.Remove(control); |
| 110 | 110 |
|
| 111 | 111 |
ViewerDataModel.Instance.SystemMain.dzMainMenu.pageNavigator.MarkupListUpdate( |
| 112 |
MarkupParser.MarkupToString(multi_Undo_Data.Markup, App.ViewInfo.UserID), Event_Type.Create, null, null);
|
|
| 112 |
MarkupParser.MarkupToString(multi_UndoData.Markup, App.ViewInfo.UserID), EventType.Create, null, null);
|
|
| 113 | 113 |
} |
| 114 | 114 |
} |
| 115 | 115 |
|
| ... | ... | |
| 127 | 127 |
{
|
| 128 | 128 |
try |
| 129 | 129 |
{
|
| 130 |
Multi_Undo_data multi_Undo_Data = new Multi_Undo_data();
|
|
| 130 |
Multi_UndoData multi_UndoData = new Multi_UndoData();
|
|
| 131 | 131 |
|
| 132 |
MarkupToPDF.Common.Undo_data UndoData = new Undo_data()
|
|
| 132 |
MarkupToPDF.Common.UndoDataGroup UndoData = new UndoDataGroup()
|
|
| 133 | 133 |
{
|
| 134 | 134 |
IsUndo = false, |
| 135 |
Event = Event_Type.Create,
|
|
| 135 |
Event = EventType.Create, |
|
| 136 | 136 |
EventTime = DateTime.Now, |
| 137 |
Markup_List = new List<Multi_Undo_data>()
|
|
| 137 |
MarkupDataColl = new List<Multi_UndoData>()
|
|
| 138 | 138 |
}; |
| 139 | 139 |
|
| 140 | 140 |
string temppath = System.IO.Path.GetTempPath(); |
| ... | ... | |
| 209 | 209 |
currentControl.TopRightPoint, |
| 210 | 210 |
}; |
| 211 | 211 |
|
| 212 |
multi_Undo_Data = Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.Control_Style(currentControl as MarkupToPDF.Common.CommentUserInfo);
|
|
| 213 |
UndoData.Markup_List.Add(multi_Undo_Data);
|
|
| 212 |
multi_UndoData = Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.Control_Style(currentControl as MarkupToPDF.Common.CommentUserInfo); |
|
| 213 |
UndoData.MarkupDataColl.Add(multi_UndoData);
|
|
| 214 | 214 |
ViewerDataModel.Instance.UndoDataList.Add(UndoData); |
| 215 | 215 |
|
| 216 | 216 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl as MarkupToPDF.Common.CommentUserInfo); |
| ... | ... | |
| 224 | 224 |
Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.SelectLayer.Children.Add(final); |
| 225 | 225 |
|
| 226 | 226 |
ViewerDataModel.Instance.SystemMain.dzMainMenu.pageNavigator.MarkupListUpdate( |
| 227 |
MarkupParser.MarkupToString(multi_Undo_Data.Markup, App.ViewInfo.UserID), Event_Type.Create, null, null);
|
|
| 227 |
MarkupParser.MarkupToString(multi_UndoData.Markup, App.ViewInfo.UserID), EventType.Create, null, null);
|
|
| 228 | 228 |
} |
| 229 | 229 |
catch (Exception ex) |
| 230 | 230 |
{
|
| ... | ... | |
| 246 | 246 |
|
| 247 | 247 |
SelectionSet.Instance.UnSelect(Common.ViewerDataModel.Instance.SystemMain.dzMainMenu); |
| 248 | 248 |
|
| 249 |
Multi_Undo_data multi_Undo_Data = new Multi_Undo_data();
|
|
| 249 |
Multi_UndoData multi_UndoData = new Multi_UndoData();
|
|
| 250 | 250 |
|
| 251 | 251 |
//강인구 Undo/Redo 보류 |
| 252 |
MarkupToPDF.Common.Undo_data UndoData = new Undo_data()
|
|
| 252 |
MarkupToPDF.Common.UndoDataGroup UndoData = new UndoDataGroup()
|
|
| 253 | 253 |
{
|
| 254 | 254 |
IsUndo = false, |
| 255 |
Event = Event_Type.Create,
|
|
| 255 |
Event = EventType.Create, |
|
| 256 | 256 |
EventTime = DateTime.Now, |
| 257 |
Markup_List = new List<Multi_Undo_data>()
|
|
| 257 |
MarkupDataColl = new List<Multi_UndoData>()
|
|
| 258 | 258 |
}; |
| 259 | 259 |
|
| 260 | 260 |
ViewerDataModel.Instance.UndoDataList.Where(data1 => data1.IsUndo == true).ToList().ForEach(i => |
| ... | ... | |
| 284 | 284 |
|
| 285 | 285 |
adornerSet.Add(item as MarkupToPDF.Common.CommentUserInfo); |
| 286 | 286 |
|
| 287 |
multi_Undo_Data = Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.Control_Style(item as MarkupToPDF.Common.CommentUserInfo);
|
|
| 287 |
multi_UndoData = Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.Control_Style(item as MarkupToPDF.Common.CommentUserInfo); |
|
| 288 | 288 |
|
| 289 |
UndoData.Markup_List.Add(multi_Undo_Data);
|
|
| 289 |
UndoData.MarkupDataColl.Add(multi_UndoData);
|
|
| 290 | 290 |
ViewerDataModel.Instance.UndoDataList.Add(UndoData); |
| 291 | 291 |
|
| 292 | 292 |
ViewerDataModel.Instance.SystemMain.dzMainMenu.pageNavigator.MarkupListUpdate( |
| 293 |
MarkupParser.MarkupToString(multi_Undo_Data.Markup, App.ViewInfo.UserID), Event_Type.Create, null, null);
|
|
| 293 |
MarkupParser.MarkupToString(multi_UndoData.Markup, App.ViewInfo.UserID), EventType.Create, null, null);
|
|
| 294 | 294 |
|
| 295 | 295 |
(item as MarkupToPDF.Common.CommentUserInfo).ApplyOverViewData(); |
| 296 | 296 |
} |
| ... | ... | |
| 309 | 309 |
{
|
| 310 | 310 |
try |
| 311 | 311 |
{
|
| 312 |
Multi_Undo_data multi_Undo_Data = new Multi_Undo_data();
|
|
| 312 |
Multi_UndoData multi_UndoData = new Multi_UndoData();
|
|
| 313 | 313 |
|
| 314 |
MarkupToPDF.Common.Undo_data UndoData = new Undo_data()
|
|
| 314 |
MarkupToPDF.Common.UndoDataGroup UndoData = new UndoDataGroup()
|
|
| 315 | 315 |
{
|
| 316 | 316 |
IsUndo = false, |
| 317 |
Event = Event_Type.Create,
|
|
| 317 |
Event = EventType.Create, |
|
| 318 | 318 |
EventTime = DateTime.Now, |
| 319 |
Markup_List = new List<Multi_Undo_data>()
|
|
| 319 |
MarkupDataColl = new List<Multi_UndoData>()
|
|
| 320 | 320 |
}; |
| 321 | 321 |
|
| 322 | 322 |
string temppath = System.IO.Path.GetTempPath(); |
| ... | ... | |
| 391 | 391 |
currentControl.TopRightPoint, |
| 392 | 392 |
}; |
| 393 | 393 |
|
| 394 |
multi_Undo_Data = Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.Control_Style(currentControl as MarkupToPDF.Common.CommentUserInfo);
|
|
| 395 |
UndoData.Markup_List.Add(multi_Undo_Data);
|
|
| 394 |
multi_UndoData = Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.Control_Style(currentControl as MarkupToPDF.Common.CommentUserInfo); |
|
| 395 |
UndoData.MarkupDataColl.Add(multi_UndoData);
|
|
| 396 | 396 |
ViewerDataModel.Instance.UndoDataList.Add(UndoData); |
| 397 | 397 |
|
| 398 | 398 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl as MarkupToPDF.Common.CommentUserInfo); |
| ... | ... | |
| 406 | 406 |
Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.SelectLayer.Children.Add(final); |
| 407 | 407 |
|
| 408 | 408 |
ViewerDataModel.Instance.SystemMain.dzMainMenu.pageNavigator.MarkupListUpdate( |
| 409 |
MarkupParser.MarkupToString(multi_Undo_Data.Markup, App.ViewInfo.UserID), Event_Type.Create, null, null);
|
|
| 409 |
MarkupParser.MarkupToString(multi_UndoData.Markup, App.ViewInfo.UserID), EventType.Create, null, null);
|
|
| 410 | 410 |
} |
| 411 | 411 |
catch (Exception ex) |
| 412 | 412 |
{
|
내보내기 Unified diff
