개정판 d128ceb2
issue #923: add UndoCommand
Change-Id: I7bb9cf1d4276c75e50906b7f4672433afc233e15
| KCOM/Views/MainMenu.xaml.cs | ||
|---|---|---|
| 2871 | 2871 |
/// </summary> |
| 2872 | 2872 |
private void ApplyDragSelectionRect() |
| 2873 | 2873 |
{
|
| 2874 |
/* |
|
| 2874 | 2875 |
multi_Undo_Data = new Multi_Undo_data(); |
| 2875 | 2876 |
|
| 2876 | 2877 |
UndoData = new Undo_data() |
| ... | ... | |
| 2880 | 2881 |
EventTime = DateTime.Now, |
| 2881 | 2882 |
Markup_List = new List<Multi_Undo_data>() |
| 2882 | 2883 |
}; |
| 2884 |
*/ |
|
| 2883 | 2885 |
|
| 2884 | 2886 |
dragSelectionBorder.Visibility = Visibility.Collapsed; |
| 2885 | 2887 |
|
| ... | ... | |
| 2906 | 2908 |
ViewerDataModel.Instance.MarkupControls_USER.Remove(item); |
| 2907 | 2909 |
|
| 2908 | 2910 |
Control_Style(item); |
| 2911 |
/* |
|
| 2909 | 2912 |
UndoData.Markup_List.Add(multi_Undo_Data); |
| 2910 | 2913 |
multi_Undo_Data = new Multi_Undo_data(); |
| 2911 | 2914 |
if (item.GroupID > 0) |
| 2912 | 2915 |
{
|
| 2913 | 2916 |
|
| 2914 | 2917 |
} |
| 2918 |
*/ |
|
| 2915 | 2919 |
} |
| 2916 | 2920 |
} |
| 2917 | 2921 |
if (adornerSet.Count > 0) |
| 2918 | 2922 |
{
|
| 2923 |
/* |
|
| 2919 | 2924 |
ViewerDataModel.Instance.UndoDataList.Where(data => data.IsUndo == true).ToList().ForEach(i => |
| 2920 | 2925 |
{
|
| 2921 | 2926 |
ViewerDataModel.Instance.UndoDataList.Remove(i); |
| 2922 | 2927 |
}); |
| 2923 | 2928 |
ViewerDataModel.Instance.UndoDataList.Add(UndoData); |
| 2929 |
*/ |
|
| 2924 | 2930 |
|
| 2925 | 2931 |
Controls.AdornerFinal final = new Controls.AdornerFinal(adornerSet); |
| 2926 | 2932 |
SelectLayer.Children.Add(final); |
| ... | ... | |
| 5657 | 5663 |
{
|
| 5658 | 5664 |
testPanel2.IsHidden = false; |
| 5659 | 5665 |
|
| 5660 |
ViewerDataModel.Instance._markupInfoRevList = SetDisplayColor(ea.Result, _ViewInfo.UserID); |
|
| 5666 |
ViewerDataModel.Instance._markupInfoRevList.Clear(); |
|
| 5667 |
foreach(var info in ea.Result) |
|
| 5668 |
{
|
|
| 5669 |
if(info.UserID == App.ViewInfo.UserID) |
|
| 5670 |
{
|
|
| 5671 |
info.userDelete = true; |
|
| 5672 |
info.DisplayColor = "FFFF0000"; |
|
| 5673 |
} |
|
| 5674 |
else |
|
| 5675 |
{
|
|
| 5676 |
info.userDelete = false; |
|
| 5677 |
} |
|
| 5678 |
ViewerDataModel.Instance._markupInfoRevList.Add(info); |
|
| 5679 |
} |
|
| 5661 | 5680 |
gridViewRevMarkup.ItemsSource = ViewerDataModel.Instance._markupInfoRevList; |
| 5662 | 5681 |
|
| 5663 | 5682 |
string uri = ""; |
| ... | ... | |
| 5726 | 5745 |
{
|
| 5727 | 5746 |
testPanel2.IsHidden = false; |
| 5728 | 5747 |
|
| 5729 |
ViewerDataModel.Instance._markupInfoRevList = SetDisplayColor(ea.Result, _ViewInfo.UserID); |
|
| 5748 |
ViewerDataModel.Instance._markupInfoRevList.Clear(); |
|
| 5749 |
foreach(var info in ea.Result) |
|
| 5750 |
{
|
|
| 5751 |
if(info.UserID == App.ViewInfo.UserID) |
|
| 5752 |
{
|
|
| 5753 |
info.userDelete = true; |
|
| 5754 |
info.DisplayColor = "FFFF0000"; |
|
| 5755 |
} |
|
| 5756 |
else |
|
| 5757 |
{
|
|
| 5758 |
info.userDelete = false; |
|
| 5759 |
} |
|
| 5760 |
ViewerDataModel.Instance._markupInfoRevList.Add(info); |
|
| 5761 |
} |
|
| 5730 | 5762 |
gridViewRevMarkup.ItemsSource = ViewerDataModel.Instance._markupInfoRevList; |
| 5731 | 5763 |
|
| 5732 | 5764 |
string uri = ""; |
내보내기 Unified diff
