개정판 873011c4
Fix: Undo/Redo 수정 진행
Change-Id: I3392d0ebc877626804a7c5d139d0b31a1942df7d
| KCOM/Views/MainMenu.xaml.cs | ||
|---|---|---|
| 118 | 118 |
|
| 119 | 119 |
private BitmapFrame tempPageImage =null; |
| 120 | 120 |
|
| 121 |
public Undo_data UndoData { get; set; }
|
|
| 121 |
public UndoDataGroup UndoDataGroup { get; set; }
|
|
| 122 | 122 |
public CommentUserInfo previousControl { get; set; }
|
| 123 | 123 |
public CommentUserInfo currentControl { get; set; }
|
| 124 | 124 |
public ControlType controlType { get; set; }
|
| ... | ... | |
| 151 | 151 |
public string Filename_ { get; set; }
|
| 152 | 152 |
public double L_Size = 0; |
| 153 | 153 |
public AdornerFinal adorner_; |
| 154 |
public Multi_Undo_data multi_Undo_Data;
|
|
| 154 |
public Multi_UndoData multi_UndoData;
|
|
| 155 | 155 |
public string Symbol_ID = ""; |
| 156 | 156 |
|
| 157 | 157 |
/// <summary> |
| ... | ... | |
| 399 | 399 |
{
|
| 400 | 400 |
ViewerDataModel.Instance.MarkupControls_USER.Remove(a); |
| 401 | 401 |
ViewerDataModel.Instance.SystemMain.dzMainMenu.pageNavigator.MarkupListUpdate( |
| 402 |
null, Event_Type.Delete, a.CommentID, null);
|
|
| 402 |
null, EventType.Delete, a.CommentID, null); |
|
| 403 | 403 |
}); |
| 404 | 404 |
|
| 405 | 405 |
ViewerDataModel.Instance.MyMarkupList.Where(data => data.MarkupInfoID == item.MarkupInfoID).ToList().ForEach(a => |
| ... | ... | |
| 944 | 944 |
//SetTextControl(txtOriginator); |
| 945 | 945 |
//SetTextControl(txtDate); |
| 946 | 946 |
|
| 947 |
//multi_Undo_Data = new Multi_Undo_data();
|
|
| 947 |
//multi_UndoData = new Multi_UndoData();
|
|
| 948 | 948 |
|
| 949 |
//MarkupToPDF.Common.Undo_data UndoData = new Undo_data()
|
|
| 949 |
//MarkupToPDF.Common.UndoData UndoData = new UndoData()
|
|
| 950 | 950 |
//{
|
| 951 | 951 |
// IsUndo = false, |
| 952 |
// Event = Event_Type.Create,
|
|
| 952 |
// Event = EventType.Create, |
|
| 953 | 953 |
// EventTime = DateTime.Now, |
| 954 |
// Markup_List = new List<Multi_Undo_data>()
|
|
| 954 |
// MarkupDataColl = new List<Multi_UndoData>()
|
|
| 955 | 955 |
//}; |
| 956 | 956 |
|
| 957 |
//multi_Undo_Data = Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.Control_Style(symCtrl as MarkupToPDF.Common.CommentUserInfo);
|
|
| 958 |
//UndoData.Markup_List.Add(multi_Undo_Data);
|
|
| 957 |
//multi_UndoData = Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.Control_Style(symCtrl as MarkupToPDF.Common.CommentUserInfo); |
|
| 958 |
//UndoData.MarkupDataColl.Add(multi_UndoData);
|
|
| 959 | 959 |
|
| 960 |
////multi_Undo_Data = Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.Control_Style(txtApproved as MarkupToPDF.Common.CommentUserInfo);
|
|
| 961 |
////UndoData.Markup_List.Add(multi_Undo_Data);
|
|
| 960 |
////multi_UndoData = Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.Control_Style(txtApproved as MarkupToPDF.Common.CommentUserInfo); |
|
| 961 |
////UndoData.MarkupDataColl.Add(multi_UndoData);
|
|
| 962 | 962 |
|
| 963 |
////multi_Undo_Data = Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.Control_Style(txtCreator as MarkupToPDF.Common.CommentUserInfo);
|
|
| 964 |
////UndoData.Markup_List.Add(multi_Undo_Data);
|
|
| 963 |
////multi_UndoData = Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.Control_Style(txtCreator as MarkupToPDF.Common.CommentUserInfo); |
|
| 964 |
////UndoData.MarkupDataColl.Add(multi_UndoData);
|
|
| 965 | 965 |
|
| 966 |
//multi_Undo_Data = Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.Control_Style(txtOriginator as MarkupToPDF.Common.CommentUserInfo);
|
|
| 967 |
//UndoData.Markup_List.Add(multi_Undo_Data);
|
|
| 966 |
//multi_UndoData = Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.Control_Style(txtOriginator as MarkupToPDF.Common.CommentUserInfo); |
|
| 967 |
//UndoData.MarkupDataColl.Add(multi_UndoData);
|
|
| 968 | 968 |
|
| 969 |
//multi_Undo_Data = Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.Control_Style(txtDate as MarkupToPDF.Common.CommentUserInfo);
|
|
| 970 |
//UndoData.Markup_List.Add(multi_Undo_Data);
|
|
| 969 |
//multi_UndoData = Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.Control_Style(txtDate as MarkupToPDF.Common.CommentUserInfo); |
|
| 970 |
//UndoData.MarkupDataColl.Add(multi_UndoData);
|
|
| 971 | 971 |
|
| 972 | 972 |
//ViewerDataModel.Instance.UndoDataList.Add(UndoData); |
| 973 | 973 |
|
| ... | ... | |
| 2775 | 2775 |
currentControl.EndPoint, |
| 2776 | 2776 |
currentControl.TopRightPoint, |
| 2777 | 2777 |
}; |
| 2778 |
Multi_Undo_data multi_Undo_Data = new Multi_Undo_data();
|
|
| 2779 |
UndoData = new Undo_data()
|
|
| 2778 |
Multi_UndoData multi_UndoData = new Multi_UndoData();
|
|
| 2779 |
UndoDataGroup = new UndoDataGroup()
|
|
| 2780 | 2780 |
{
|
| 2781 | 2781 |
IsUndo = false, |
| 2782 |
Event = Event_Type.Create,
|
|
| 2782 |
Event = EventType.Create, |
|
| 2783 | 2783 |
EventTime = DateTime.Now, |
| 2784 |
Markup_List = new List<Multi_Undo_data>()
|
|
| 2784 |
MarkupDataColl = new List<Multi_UndoData>()
|
|
| 2785 | 2785 |
}; |
| 2786 | 2786 |
ViewerDataModel.Instance.UndoDataList.Where(data1 => data1.IsUndo == true).ToList().ForEach(i => |
| 2787 | 2787 |
{
|
| 2788 | 2788 |
ViewerDataModel.Instance.UndoDataList.Remove(i); |
| 2789 | 2789 |
}); |
| 2790 | 2790 |
|
| 2791 |
//multi_Undo_Data = dzMainMenu.Control_Style(currentControl as MarkupToPDF.Common.CommentUserInfo);
|
|
| 2792 |
multi_Undo_Data = Control_Style(currentControl as MarkupToPDF.Common.CommentUserInfo);
|
|
| 2793 |
UndoData.Markup_List.Add(multi_Undo_Data);
|
|
| 2794 |
ViewerDataModel.Instance.UndoDataList.Add(UndoData); |
|
| 2791 |
//multi_UndoData = dzMainMenu.Control_Style(currentControl as MarkupToPDF.Common.CommentUserInfo); |
|
| 2792 |
multi_UndoData = Control_Style(currentControl as MarkupToPDF.Common.CommentUserInfo); |
|
| 2793 |
UndoDataGroup.MarkupDataColl.Add(multi_UndoData);
|
|
| 2794 |
ViewerDataModel.Instance.UndoDataList.Add(UndoDataGroup);
|
|
| 2795 | 2795 |
|
| 2796 | 2796 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl as MarkupToPDF.Common.CommentUserInfo); |
| 2797 | 2797 |
currentControl.CommentID = Commons.shortGuid(); |
| ... | ... | |
| 6140 | 6140 |
|
| 6141 | 6141 |
#endregion 캡쳐 기능 |
| 6142 | 6142 |
|
| 6143 |
public Multi_Undo_data Control_Style(CommentUserInfo control)
|
|
| 6143 |
public Multi_UndoData Control_Style(CommentUserInfo control)
|
|
| 6144 | 6144 |
{
|
| 6145 |
multi_Undo_Data = new Multi_Undo_data();
|
|
| 6145 |
multi_UndoData = new Multi_UndoData();
|
|
| 6146 | 6146 |
|
| 6147 |
multi_Undo_Data.Markup = control;
|
|
| 6147 |
multi_UndoData.Markup = control; |
|
| 6148 | 6148 |
|
| 6149 | 6149 |
if (control is IShapeControl) |
| 6150 | 6150 |
{
|
| 6151 |
multi_Undo_Data.paint = (control as IShapeControl).Paint;
|
|
| 6151 |
multi_UndoData.paint = (control as IShapeControl).Paint; |
|
| 6152 | 6152 |
} |
| 6153 | 6153 |
if (control is IDashControl) |
| 6154 | 6154 |
{
|
| 6155 |
multi_Undo_Data.DashSize = (control as IDashControl).DashSize;
|
|
| 6155 |
multi_UndoData.DashSize = (control as IDashControl).DashSize; |
|
| 6156 | 6156 |
} |
| 6157 | 6157 |
if (control is IPath) |
| 6158 | 6158 |
{
|
| 6159 |
multi_Undo_Data.LineSize = (control as IPath).LineSize;
|
|
| 6159 |
multi_UndoData.LineSize = (control as IPath).LineSize; |
|
| 6160 | 6160 |
} |
| 6161 | 6161 |
if ((control as UIElement) != null) |
| 6162 | 6162 |
{
|
| 6163 |
multi_Undo_Data.Opacity = (control as UIElement).Opacity;
|
|
| 6163 |
multi_UndoData.Opacity = (control as UIElement).Opacity; |
|
| 6164 | 6164 |
} |
| 6165 | 6165 |
|
| 6166 |
return multi_Undo_Data;
|
|
| 6166 |
return multi_UndoData; |
|
| 6167 | 6167 |
} |
| 6168 | 6168 |
|
| 6169 | 6169 |
private async void Comment_Move(object sender, MouseButtonEventArgs e) |
내보내기 Unified diff
