개정판 873011c4
Fix: Undo/Redo 수정 진행
Change-Id: I3392d0ebc877626804a7c5d139d0b31a1942df7d
| KCOM/Events/Implementation/TopMenuEvent.cs | ||
|---|---|---|
| 109 | 109 |
|
| 110 | 110 |
if (AdonerList.Count > 0) |
| 111 | 111 |
{
|
| 112 |
Undo_data UndoData = new Undo_data()
|
|
| 112 |
UndoDataGroup UndoData = new UndoDataGroup()
|
|
| 113 | 113 |
{
|
| 114 | 114 |
IsUndo = false, |
| 115 |
Event = Event_Type.Option,
|
|
| 115 |
Event = EventType.Operation,
|
|
| 116 | 116 |
EventTime = DateTime.Now, |
| 117 | 117 |
paint = ViewerDataModel.Instance.paintSet, |
| 118 |
Markup_List = new List<Multi_Undo_data>()
|
|
| 118 |
MarkupDataColl = new List<Multi_UndoData>()
|
|
| 119 | 119 |
}; |
| 120 |
Multi_Undo_data multi_Undo_Data = new Multi_Undo_data();
|
|
| 120 |
Multi_UndoData multi_UndoData = new Multi_UndoData();
|
|
| 121 | 121 |
|
| 122 | 122 |
foreach (AdornerMember InnerItem in AdonerList) |
| 123 | 123 |
{
|
| 124 |
multi_Undo_Data.PointSet = new List<Point>();
|
|
| 124 |
multi_UndoData.PointSet = new List<Point>(); |
|
| 125 | 125 |
|
| 126 | 126 |
if ((InnerItem.DrawingData as MarkupToPDF.Controls.Common.IShapeControl) != null) |
| 127 | 127 |
{
|
| 128 | 128 |
(InnerItem.DrawingData as MarkupToPDF.Controls.Common.IShapeControl).Paint = ViewerDataModel.Instance.paintSet; |
| 129 | 129 |
} |
| 130 | 130 |
|
| 131 |
multi_Undo_Data.Markup = InnerItem.DrawingData as MarkupToPDF.Common.CommentUserInfo;
|
|
| 132 |
UndoData.Markup_List.Add(multi_Undo_Data);
|
|
| 133 |
multi_Undo_Data = new Multi_Undo_data();
|
|
| 131 |
multi_UndoData.Markup = InnerItem.DrawingData as MarkupToPDF.Common.CommentUserInfo; |
|
| 132 |
UndoData.MarkupDataColl.Add(multi_UndoData);
|
|
| 133 |
multi_UndoData = new Multi_UndoData();
|
|
| 134 | 134 |
} |
| 135 | 135 |
|
| 136 | 136 |
ViewerDataModel.Instance.UndoDataList.Where(data => data.IsUndo == true).ToList().ForEach(i => |
| ... | ... | |
| 802 | 802 |
List<AdornerMember> AdonerList = GetAdornerItem(); |
| 803 | 803 |
if(AdonerList.Count > 0) |
| 804 | 804 |
{
|
| 805 |
Undo_data UndoData = new Undo_data()
|
|
| 805 |
UndoDataGroup UndoData = new UndoDataGroup()
|
|
| 806 | 806 |
{
|
| 807 | 807 |
IsUndo = false, |
| 808 |
Event = Event_Type.Option,
|
|
| 808 |
Event = EventType.Operation,
|
|
| 809 | 809 |
EventTime = DateTime.Now, |
| 810 | 810 |
Opacity = ViewerDataModel.Instance.ControlOpacity, |
| 811 |
Markup_List = new List<Multi_Undo_data>()
|
|
| 811 |
MarkupDataColl = new List<Multi_UndoData>()
|
|
| 812 | 812 |
}; |
| 813 |
Multi_Undo_data multi_Undo_Data = new Multi_Undo_data();
|
|
| 813 |
Multi_UndoData multi_UndoData = new Multi_UndoData();
|
|
| 814 | 814 |
|
| 815 | 815 |
foreach (AdornerMember InnerItem in AdonerList) |
| 816 | 816 |
{
|
| 817 | 817 |
InnerItem.DrawingData.Opacity = ViewerDataModel.Instance.ControlOpacity; |
| 818 | 818 |
|
| 819 |
multi_Undo_Data.Markup = InnerItem.DrawingData as MarkupToPDF.Common.CommentUserInfo;
|
|
| 820 |
UndoData.Markup_List.Add(multi_Undo_Data);
|
|
| 821 |
multi_Undo_Data = new Multi_Undo_data();
|
|
| 819 |
multi_UndoData.Markup = InnerItem.DrawingData as MarkupToPDF.Common.CommentUserInfo; |
|
| 820 |
UndoData.MarkupDataColl.Add(multi_UndoData);
|
|
| 821 |
multi_UndoData = new Multi_UndoData();
|
|
| 822 | 822 |
} |
| 823 | 823 |
|
| 824 | 824 |
ViewerDataModel.Instance.UndoDataList.Where(data => data.IsUndo == true).ToList().ForEach(i => |
| ... | ... | |
| 839 | 839 |
List<AdornerMember> AdonerList = GetAdornerItem(); |
| 840 | 840 |
if (AdonerList.Count > 0) |
| 841 | 841 |
{
|
| 842 |
Undo_data UndoData = new Undo_data()
|
|
| 842 |
UndoDataGroup UndoData = new UndoDataGroup()
|
|
| 843 | 843 |
{
|
| 844 | 844 |
IsUndo = false, |
| 845 |
Event = Event_Type.Option,
|
|
| 845 |
Event = EventType.Operation,
|
|
| 846 | 846 |
EventTime = DateTime.Now, |
| 847 | 847 |
LineSize = ViewerDataModel.Instance.LineSize, |
| 848 |
Markup_List = new List<Multi_Undo_data>()
|
|
| 848 |
MarkupDataColl = new List<Multi_UndoData>()
|
|
| 849 | 849 |
}; |
| 850 |
Multi_Undo_data multi_Undo_Data = new Multi_Undo_data();
|
|
| 850 |
Multi_UndoData multi_UndoData = new Multi_UndoData();
|
|
| 851 | 851 |
|
| 852 | 852 |
foreach (AdornerMember InnerItem in AdonerList) |
| 853 | 853 |
{
|
| ... | ... | |
| 937 | 937 |
} |
| 938 | 938 |
|
| 939 | 939 |
|
| 940 |
multi_Undo_Data.Markup = InnerItem.DrawingData as MarkupToPDF.Common.CommentUserInfo;
|
|
| 941 |
UndoData.Markup_List.Add(multi_Undo_Data);
|
|
| 942 |
multi_Undo_Data = new Multi_Undo_data();
|
|
| 940 |
multi_UndoData.Markup = InnerItem.DrawingData as MarkupToPDF.Common.CommentUserInfo; |
|
| 941 |
UndoData.MarkupDataColl.Add(multi_UndoData);
|
|
| 942 |
multi_UndoData = new Multi_UndoData();
|
|
| 943 | 943 |
} |
| 944 | 944 |
|
| 945 | 945 |
ViewerDataModel.Instance.UndoDataList.Where(data => data.IsUndo == true).ToList().ForEach(i => |
| ... | ... | |
| 965 | 965 |
if (AdonerList.Count > 0) |
| 966 | 966 |
{
|
| 967 | 967 |
|
| 968 |
Undo_data UndoData = new Undo_data()
|
|
| 968 |
UndoDataGroup UndoData = new UndoDataGroup()
|
|
| 969 | 969 |
{
|
| 970 | 970 |
IsUndo = false, |
| 971 |
Event = Event_Type.Option,
|
|
| 971 |
Event = EventType.Operation,
|
|
| 972 | 972 |
EventTime = DateTime.Now, |
| 973 | 973 |
Interval = ViewerDataModel.Instance.Interval, |
| 974 |
Markup_List = new List<Multi_Undo_data>()
|
|
| 974 |
MarkupDataColl = new List<Multi_UndoData>()
|
|
| 975 | 975 |
}; |
| 976 |
Multi_Undo_data multi_Undo_Data = new Multi_Undo_data();
|
|
| 976 |
Multi_UndoData multi_UndoData = new Multi_UndoData();
|
|
| 977 | 977 |
|
| 978 | 978 |
foreach (AdornerMember InnerItem in AdonerList) |
| 979 | 979 |
{
|
| ... | ... | |
| 983 | 983 |
{
|
| 984 | 984 |
(InnerItem.DrawingData as MarkupToPDF.Controls.Line.LineControl).Interval = ViewerDataModel.Instance.Interval; |
| 985 | 985 |
|
| 986 |
multi_Undo_Data.Markup = InnerItem.DrawingData as MarkupToPDF.Common.CommentUserInfo;
|
|
| 987 |
UndoData.Markup_List.Add(multi_Undo_Data);
|
|
| 988 |
multi_Undo_Data = new Multi_Undo_data();
|
|
| 986 |
multi_UndoData.Markup = InnerItem.DrawingData as MarkupToPDF.Common.CommentUserInfo; |
|
| 987 |
UndoData.MarkupDataColl.Add(multi_UndoData);
|
|
| 988 |
multi_UndoData = new Multi_UndoData();
|
|
| 989 | 989 |
} |
| 990 | 990 |
break; |
| 991 | 991 |
} |
| ... | ... | |
| 1011 | 1011 |
if (AdonerList.Count > 0) |
| 1012 | 1012 |
{
|
| 1013 | 1013 |
|
| 1014 |
//Undo_data UndoData = new Undo_data()
|
|
| 1014 |
//UndoData UndoData = new UndoData()
|
|
| 1015 | 1015 |
//{
|
| 1016 | 1016 |
// IsUndo = false, |
| 1017 |
// Event = Event_Type.Option,
|
|
| 1017 |
// Event = EventType.Option, |
|
| 1018 | 1018 |
// EventTime = DateTime.Now, |
| 1019 | 1019 |
// Interval = ViewerDataModel.Instance.Interval, |
| 1020 |
// Markup_List = new List<Multi_Undo_data>()
|
|
| 1020 |
// MarkupDataColl = new List<Multi_UndoData>()
|
|
| 1021 | 1021 |
//}; |
| 1022 |
Multi_Undo_data multi_Undo_Data = new Multi_Undo_data();
|
|
| 1022 |
Multi_UndoData multi_UndoData = new Multi_UndoData();
|
|
| 1023 | 1023 |
|
| 1024 | 1024 |
foreach (AdornerMember InnerItem in AdonerList) |
| 1025 | 1025 |
{
|
| ... | ... | |
| 1029 | 1029 |
{
|
| 1030 | 1030 |
(InnerItem.DrawingData as MarkupToPDF.Controls.Shape.RectCloudControl).ArcLength = ViewerDataModel.Instance.ArcLength; |
| 1031 | 1031 |
|
| 1032 |
//multi_Undo_Data.Markup = InnerItem.DrawingData as MarkupToPDF.Common.CommentUserInfo;
|
|
| 1033 |
//UndoData.Markup_List.Add(multi_Undo_Data);
|
|
| 1034 |
//multi_Undo_Data = new Multi_Undo_data();
|
|
| 1032 |
//multi_UndoData.Markup = InnerItem.DrawingData as MarkupToPDF.Common.CommentUserInfo; |
|
| 1033 |
//UndoData.MarkupDataColl.Add(multi_UndoData);
|
|
| 1034 |
//multi_UndoData = new Multi_UndoData();
|
|
| 1035 | 1035 |
} |
| 1036 | 1036 |
break; |
| 1037 | 1037 |
case ("CloudControl"):
|
| 1038 | 1038 |
{
|
| 1039 | 1039 |
(InnerItem.DrawingData as MarkupToPDF.Controls.Polygon.CloudControl).ArcLength = ViewerDataModel.Instance.ArcLength; |
| 1040 | 1040 |
|
| 1041 |
//multi_Undo_Data.Markup = InnerItem.DrawingData as MarkupToPDF.Common.CommentUserInfo;
|
|
| 1042 |
//UndoData.Markup_List.Add(multi_Undo_Data);
|
|
| 1043 |
//multi_Undo_Data = new Multi_Undo_data();
|
|
| 1041 |
//multi_UndoData.Markup = InnerItem.DrawingData as MarkupToPDF.Common.CommentUserInfo; |
|
| 1042 |
//UndoData.MarkupDataColl.Add(multi_UndoData);
|
|
| 1043 |
//multi_UndoData = new Multi_UndoData();
|
|
| 1044 | 1044 |
} |
| 1045 | 1045 |
break; |
| 1046 | 1046 |
} |
| ... | ... | |
| 1066 | 1066 |
ViewerDataModel.Instance.DashSize = (cbDashStyle.SelectedValue as DashStyle).dashData; |
| 1067 | 1067 |
if (this.ParentOfType<MainWindow>().dzMainMenu.SelectLayer.Children.Count > 0) |
| 1068 | 1068 |
{
|
| 1069 |
Undo_data UndoData = new Undo_data()
|
|
| 1069 |
UndoDataGroup UndoData = new UndoDataGroup()
|
|
| 1070 | 1070 |
{
|
| 1071 | 1071 |
IsUndo = false, |
| 1072 |
Event = Event_Type.Option,
|
|
| 1072 |
Event = EventType.Operation,
|
|
| 1073 | 1073 |
EventTime = DateTime.Now, |
| 1074 | 1074 |
DashSize = (cbDashStyle.SelectedValue as DashStyle).dashData, |
| 1075 |
Markup_List = new List<Multi_Undo_data>()
|
|
| 1075 |
MarkupDataColl = new List<Multi_UndoData>()
|
|
| 1076 | 1076 |
}; |
| 1077 |
Multi_Undo_data multi_Undo_Data = new Multi_Undo_data();
|
|
| 1077 |
Multi_UndoData multi_UndoData = new Multi_UndoData();
|
|
| 1078 | 1078 |
|
| 1079 | 1079 |
foreach (var item in this.ParentOfType<MainWindow>().dzMainMenu.SelectLayer.Children) |
| 1080 | 1080 |
{
|
| ... | ... | |
| 1156 | 1156 |
break; |
| 1157 | 1157 |
} |
| 1158 | 1158 |
|
| 1159 |
multi_Undo_Data.Markup = InnerItem.DrawingData as MarkupToPDF.Common.CommentUserInfo;
|
|
| 1160 |
UndoData.Markup_List.Add(multi_Undo_Data);
|
|
| 1161 |
multi_Undo_Data = new Multi_Undo_data();
|
|
| 1159 |
multi_UndoData.Markup = InnerItem.DrawingData as MarkupToPDF.Common.CommentUserInfo; |
|
| 1160 |
UndoData.MarkupDataColl.Add(multi_UndoData);
|
|
| 1161 |
multi_UndoData = new Multi_UndoData();
|
|
| 1162 | 1162 |
} |
| 1163 | 1163 |
|
| 1164 | 1164 |
ViewerDataModel.Instance.UndoDataList.Where(data => data.IsUndo == true).ToList().ForEach(i => |
| ... | ... | |
| 2788 | 2788 |
|
| 2789 | 2789 |
} |
| 2790 | 2790 |
|
| 2791 |
Multi_Undo_data multi_Undo_Data = new Multi_Undo_data();
|
|
| 2791 |
Multi_UndoData multi_UndoData = new Multi_UndoData();
|
|
| 2792 | 2792 |
CommentUserInfo currentControl { get; set; }
|
| 2793 | 2793 |
private void Check_Closed(object sender, EventArgs e) |
| 2794 | 2794 |
{
|
| ... | ... | |
| 3108 | 3108 |
|
| 3109 | 3109 |
SelectionSet.Instance.UnSelect(this.ParentOfType<MainWindow>().dzMainMenu); |
| 3110 | 3110 |
|
| 3111 |
Multi_Undo_data multi_Undo_Data = new Multi_Undo_data();
|
|
| 3111 |
Multi_UndoData multi_UndoData = new Multi_UndoData();
|
|
| 3112 | 3112 |
|
| 3113 | 3113 |
//강인구 Undo/Redo 보류 |
| 3114 |
MarkupToPDF.Common.Undo_data UndoData = new Undo_data()
|
|
| 3114 |
MarkupToPDF.Common.UndoDataGroup UndoData = new UndoDataGroup()
|
|
| 3115 | 3115 |
{
|
| 3116 | 3116 |
IsUndo = false, |
| 3117 |
Event = Event_Type.Create,
|
|
| 3117 |
Event = EventType.Create, |
|
| 3118 | 3118 |
EventTime = DateTime.Now, |
| 3119 |
Markup_List = new List<Multi_Undo_data>()
|
|
| 3119 |
MarkupDataColl = new List<Multi_UndoData>()
|
|
| 3120 | 3120 |
}; |
| 3121 | 3121 |
|
| 3122 | 3122 |
ViewerDataModel.Instance.UndoDataList.Where(data1 => data1.IsUndo == true).ToList().ForEach(i => |
| ... | ... | |
| 3136 | 3136 |
|
| 3137 | 3137 |
adornerSet.Add(item as MarkupToPDF.Common.CommentUserInfo); |
| 3138 | 3138 |
|
| 3139 |
multi_Undo_Data = this.ParentOfType<MainWindow>().dzMainMenu.Control_Style(item as MarkupToPDF.Common.CommentUserInfo);
|
|
| 3139 |
multi_UndoData = this.ParentOfType<MainWindow>().dzMainMenu.Control_Style(item as MarkupToPDF.Common.CommentUserInfo); |
|
| 3140 | 3140 |
|
| 3141 |
UndoData.Markup_List.Add(multi_Undo_Data);
|
|
| 3141 |
UndoData.MarkupDataColl.Add(multi_UndoData);
|
|
| 3142 | 3142 |
ViewerDataModel.Instance.UndoDataList.Add(UndoData); |
| 3143 | 3143 |
} |
| 3144 | 3144 |
} |
| ... | ... | |
| 3168 | 3168 |
{
|
| 3169 | 3169 |
try |
| 3170 | 3170 |
{
|
| 3171 |
Multi_Undo_data multi_Undo_Data = new Multi_Undo_data();
|
|
| 3171 |
Multi_UndoData multi_UndoData = new Multi_UndoData();
|
|
| 3172 | 3172 |
|
| 3173 | 3173 |
//강인구 Undo/Redo 보류 |
| 3174 |
MarkupToPDF.Common.Undo_data UndoData = new Undo_data()
|
|
| 3174 |
MarkupToPDF.Common.UndoDataGroup UndoData = new UndoDataGroup()
|
|
| 3175 | 3175 |
{
|
| 3176 | 3176 |
IsUndo = false, |
| 3177 |
Event = Event_Type.Create,
|
|
| 3177 |
Event = EventType.Create, |
|
| 3178 | 3178 |
EventTime = DateTime.Now, |
| 3179 |
Markup_List = new List<Multi_Undo_data>()
|
|
| 3179 |
MarkupDataColl = new List<Multi_UndoData>()
|
|
| 3180 | 3180 |
}; |
| 3181 | 3181 |
|
| 3182 | 3182 |
|
| ... | ... | |
| 3251 | 3251 |
currentControl.TopRightPoint, |
| 3252 | 3252 |
}; |
| 3253 | 3253 |
|
| 3254 |
multi_Undo_Data = this.ParentOfType<MainWindow>().dzMainMenu.Control_Style(currentControl as MarkupToPDF.Common.CommentUserInfo);
|
|
| 3255 |
UndoData.Markup_List.Add(multi_Undo_Data);
|
|
| 3254 |
multi_UndoData = this.ParentOfType<MainWindow>().dzMainMenu.Control_Style(currentControl as MarkupToPDF.Common.CommentUserInfo); |
|
| 3255 |
UndoData.MarkupDataColl.Add(multi_UndoData);
|
|
| 3256 | 3256 |
ViewerDataModel.Instance.UndoDataList.Add(UndoData); |
| 3257 | 3257 |
|
| 3258 | 3258 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl as MarkupToPDF.Common.CommentUserInfo); |
내보내기 Unified diff
