개정판 873011c4
Fix: Undo/Redo 수정 진행
Change-Id: I3392d0ebc877626804a7c5d139d0b31a1942df7d
| KCOM/Controls/Symbol.xaml.cs | ||
|---|---|---|
| 498 | 498 |
} |
| 499 | 499 |
#endregion |
| 500 | 500 |
|
| 501 |
public Undo_data UndoData { get; set; }
|
|
| 501 |
public UndoDataGroup UndoData { get; set; }
|
|
| 502 | 502 |
/// <summary> |
| 503 | 503 |
/// place symbol which has given id to original position which is created |
| 504 | 504 |
/// </summary> |
| ... | ... | |
| 543 | 543 |
string[] delimiterChars = { "|DZ|" };
|
| 544 | 544 |
string[] data = Data_.Split(delimiterChars, StringSplitOptions.RemoveEmptyEntries); |
| 545 | 545 |
|
| 546 |
Multi_Undo_data multi_Undo_Data = new Multi_Undo_data();
|
|
| 547 |
UndoData = new Undo_data()
|
|
| 546 |
Multi_UndoData multi_UndoData = new Multi_UndoData();
|
|
| 547 |
UndoData = new UndoDataGroup()
|
|
| 548 | 548 |
{
|
| 549 | 549 |
IsUndo = false, |
| 550 |
Event = Event_Type.Create,
|
|
| 550 |
Event = EventType.Create, |
|
| 551 | 551 |
EventTime = DateTime.Now, |
| 552 |
Markup_List = new List<Multi_Undo_data>()
|
|
| 552 |
MarkupDataColl = new List<Multi_UndoData>()
|
|
| 553 | 553 |
}; |
| 554 | 554 |
ViewerDataModel.Instance.UndoDataList.Where(data1 => data1.IsUndo == true).ToList().ForEach(i => |
| 555 | 555 |
{
|
| ... | ... | |
| 570 | 570 |
|
| 571 | 571 |
adornerSet.Add(item as MarkupToPDF.Common.CommentUserInfo); |
| 572 | 572 |
|
| 573 |
multi_Undo_Data = this.ParentOfType<MainWindow>().dzMainMenu.Control_Style(item as MarkupToPDF.Common.CommentUserInfo);
|
|
| 573 |
multi_UndoData = this.ParentOfType<MainWindow>().dzMainMenu.Control_Style(item as MarkupToPDF.Common.CommentUserInfo); |
|
| 574 | 574 |
|
| 575 |
UndoData.Markup_List.Add(multi_Undo_Data);
|
|
| 575 |
UndoData.MarkupDataColl.Add(multi_UndoData);
|
|
| 576 | 576 |
ViewerDataModel.Instance.UndoDataList.Add(UndoData); |
| 577 | 577 |
} |
| 578 | 578 |
} |
| ... | ... | |
| 686 | 686 |
currentControl.EndPoint, |
| 687 | 687 |
currentControl.TopRightPoint, |
| 688 | 688 |
}; |
| 689 |
Multi_Undo_data multi_Undo_Data = new Multi_Undo_data();
|
|
| 690 |
UndoData = new Undo_data()
|
|
| 689 |
Multi_UndoData multi_UndoData = new Multi_UndoData();
|
|
| 690 |
UndoData = new UndoDataGroup()
|
|
| 691 | 691 |
{
|
| 692 | 692 |
IsUndo = false, |
| 693 |
Event = Event_Type.Create,
|
|
| 693 |
Event = EventType.Create, |
|
| 694 | 694 |
EventTime = DateTime.Now, |
| 695 |
Markup_List = new List<Multi_Undo_data>()
|
|
| 695 |
MarkupDataColl = new List<Multi_UndoData>()
|
|
| 696 | 696 |
}; |
| 697 | 697 |
ViewerDataModel.Instance.UndoDataList.Where(data1 => data1.IsUndo == true).ToList().ForEach(i => |
| 698 | 698 |
{
|
| 699 | 699 |
ViewerDataModel.Instance.UndoDataList.Remove(i); |
| 700 | 700 |
}); |
| 701 | 701 |
|
| 702 |
//multi_Undo_Data = dzMainMenu.Control_Style(currentControl as MarkupToPDF.Common.CommentUserInfo);
|
|
| 703 |
multi_Undo_Data = this.ParentOfType<MainWindow>().dzMainMenu.Control_Style(currentControl as MarkupToPDF.Common.CommentUserInfo);
|
|
| 704 |
UndoData.Markup_List.Add(multi_Undo_Data);
|
|
| 702 |
//multi_UndoData = dzMainMenu.Control_Style(currentControl as MarkupToPDF.Common.CommentUserInfo); |
|
| 703 |
multi_UndoData = this.ParentOfType<MainWindow>().dzMainMenu.Control_Style(currentControl as MarkupToPDF.Common.CommentUserInfo); |
|
| 704 |
UndoData.MarkupDataColl.Add(multi_UndoData);
|
|
| 705 | 705 |
ViewerDataModel.Instance.UndoDataList.Add(UndoData); |
| 706 | 706 |
|
| 707 | 707 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl as MarkupToPDF.Common.CommentUserInfo); |
| ... | ... | |
| 735 | 735 |
} |
| 736 | 736 |
} |
| 737 | 737 |
|
| 738 |
public Multi_Undo_data multi_Undo_Data;
|
|
| 738 |
public Multi_UndoData multi_UndoData;
|
|
| 739 | 739 |
private void ApplyDragSelectionRect() |
| 740 | 740 |
{
|
| 741 |
multi_Undo_Data = new Multi_Undo_data();
|
|
| 741 |
multi_UndoData = new Multi_UndoData();
|
|
| 742 | 742 |
|
| 743 |
UndoData = new Undo_data()
|
|
| 743 |
UndoData = new UndoDataGroup()
|
|
| 744 | 744 |
{
|
| 745 | 745 |
IsUndo = false, |
| 746 |
Event = Event_Type.Select,
|
|
| 746 |
Event = EventType.Operation,
|
|
| 747 | 747 |
EventTime = DateTime.Now, |
| 748 |
Markup_List = new List<Multi_Undo_data>()
|
|
| 748 |
MarkupDataColl = new List<Multi_UndoData>()
|
|
| 749 | 749 |
}; |
| 750 | 750 |
|
| 751 | 751 |
this.ParentOfType<MainWindow>().dzMainMenu.dragSelectionBorder.Visibility = Visibility.Collapsed; |
| ... | ... | |
| 775 | 775 |
ViewerDataModel.Instance.MarkupControls_USER.Remove(item); |
| 776 | 776 |
|
| 777 | 777 |
this.ParentOfType<MainWindow>().dzMainMenu.Control_Style(item); |
| 778 |
UndoData.Markup_List.Add(multi_Undo_Data);
|
|
| 779 |
multi_Undo_Data = new Multi_Undo_data();
|
|
| 778 |
UndoData.MarkupDataColl.Add(multi_UndoData);
|
|
| 779 |
multi_UndoData = new Multi_UndoData();
|
|
| 780 | 780 |
if (item.GroupID > 0) |
| 781 | 781 |
{
|
| 782 | 782 |
|
내보내기 Unified diff
