개정판 873011c4
Fix: Undo/Redo 수정 진행
Change-Id: I3392d0ebc877626804a7c5d139d0b31a1942df7d
| KCOM/Controls/AdornerFinal.xaml.cs | ||
|---|---|---|
| 1202 | 1202 |
} |
| 1203 | 1203 |
|
| 1204 | 1204 |
|
| 1205 |
//if ((null != ViewerDataModel.Instance.UndoDataList.LastOrDefault()) && (ViewerDataModel.Instance.UndoDataList.LastOrDefault().Event == Event_Type.Thumb))
|
|
| 1205 |
//if ((null != ViewerDataModel.Instance.UndoDataList.LastOrDefault()) && (ViewerDataModel.Instance.UndoDataList.LastOrDefault().Event == EventType.Thumb)) |
|
| 1206 | 1206 |
//{
|
| 1207 | 1207 |
// return; |
| 1208 | 1208 |
//} |
| 1209 | 1209 |
|
| 1210 |
//if ((null != ViewerDataModel.Instance.UndoDataList.LastOrDefault()) && (ViewerDataModel.Instance.UndoDataList.LastOrDefault().Markup_List != null))
|
|
| 1210 |
//if ((null != ViewerDataModel.Instance.UndoDataList.LastOrDefault()) && (ViewerDataModel.Instance.UndoDataList.LastOrDefault().MarkupDataColl != null))
|
|
| 1211 | 1211 |
//{
|
| 1212 |
// if (ViewerDataModel.Instance.UndoDataList.LastOrDefault().Markup_List.Count > 0)
|
|
| 1212 |
// if (ViewerDataModel.Instance.UndoDataList.LastOrDefault().MarkupDataColl.Count > 0)
|
|
| 1213 | 1213 |
// {
|
| 1214 |
// if (ViewerDataModel.Instance.UndoDataList.LastOrDefault().Markup_List.FirstOrDefault().PointSet != null)
|
|
| 1214 |
// if (ViewerDataModel.Instance.UndoDataList.LastOrDefault().MarkupDataColl.FirstOrDefault().PointSet != null)
|
|
| 1215 | 1215 |
// {
|
| 1216 | 1216 |
// return; |
| 1217 | 1217 |
// } |
| ... | ... | |
| 1259 | 1259 |
{
|
| 1260 | 1260 |
return; |
| 1261 | 1261 |
} |
| 1262 |
//if ((null != ViewerDataModel.Instance.UndoDataList.LastOrDefault()) && (ViewerDataModel.Instance.UndoDataList.LastOrDefault().Event == Event_Type.Thumb))
|
|
| 1262 |
//if ((null != ViewerDataModel.Instance.UndoDataList.LastOrDefault()) && (ViewerDataModel.Instance.UndoDataList.LastOrDefault().Event == EventType.Thumb)) |
|
| 1263 | 1263 |
//{
|
| 1264 | 1264 |
// return; |
| 1265 | 1265 |
//} |
| 1266 |
//if ((null != ViewerDataModel.Instance.UndoDataList.LastOrDefault()) && (ViewerDataModel.Instance.UndoDataList.LastOrDefault().Markup_List != null))
|
|
| 1266 |
//if ((null != ViewerDataModel.Instance.UndoDataList.LastOrDefault()) && (ViewerDataModel.Instance.UndoDataList.LastOrDefault().MarkupDataColl != null))
|
|
| 1267 | 1267 |
//{
|
| 1268 |
// if (ViewerDataModel.Instance.UndoDataList.LastOrDefault().Markup_List.Count > 0)
|
|
| 1268 |
// if (ViewerDataModel.Instance.UndoDataList.LastOrDefault().MarkupDataColl.Count > 0)
|
|
| 1269 | 1269 |
// {
|
| 1270 |
// if (ViewerDataModel.Instance.UndoDataList.LastOrDefault().Markup_List.FirstOrDefault().PointSet != null)
|
|
| 1270 |
// if (ViewerDataModel.Instance.UndoDataList.LastOrDefault().MarkupDataColl.FirstOrDefault().PointSet != null)
|
|
| 1271 | 1271 |
// {
|
| 1272 | 1272 |
// return; |
| 1273 | 1273 |
// } |
| ... | ... | |
| 1385 | 1385 |
(item.DrawingData as CommentUserInfo).OnTranslate(delta.X, delta.Y); |
| 1386 | 1386 |
|
| 1387 | 1387 |
ViewerDataModel.Instance.SystemMain.dzMainMenu.pageNavigator.MarkupListUpdate( |
| 1388 |
MarkupParser.MarkupToString((item.DrawingData as CommentUserInfo), App.ViewInfo.UserID), Event_Type.Thumb, null, null);
|
|
| 1388 |
MarkupParser.MarkupToString((item.DrawingData as CommentUserInfo), App.ViewInfo.UserID), EventType.Operation, null, null);
|
|
| 1389 | 1389 |
|
| 1390 | 1390 |
item.UpdateThumb(); |
| 1391 | 1391 |
} |
| ... | ... | |
| 1509 | 1509 |
})); |
| 1510 | 1510 |
} |
| 1511 | 1511 |
|
| 1512 |
/// <summary> |
|
| 1513 |
/// 객체 회전 시작 |
|
| 1514 |
/// </summary> |
|
| 1515 |
/// <param name="sender"></param> |
|
| 1516 |
/// <param name="e"></param> |
|
| 1512 | 1517 |
private void rotate_DragStarted(object sender, DragStartedEventArgs e) |
| 1513 | 1518 |
{
|
| 1514 | 1519 |
this.RotatedPoint = Mouse.GetPosition(this); /// 2018.05.09 added by humkyung |
| ... | ... | |
| 1528 | 1533 |
return; |
| 1529 | 1534 |
} |
| 1530 | 1535 |
|
| 1531 |
//if ((ViewerDataModel.Instance.UndoDataList.Count > 0) && ViewerDataModel.Instance.UndoDataList.LastOrDefault().Event == Event_Type.Thumb)
|
|
| 1536 |
//if ((ViewerDataModel.Instance.UndoDataList.Count > 0) && ViewerDataModel.Instance.UndoDataList.LastOrDefault().Event == EventType.Thumb) |
|
| 1532 | 1537 |
//{
|
| 1533 | 1538 |
// return; |
| 1534 | 1539 |
//} |
| 1535 | 1540 |
|
| 1536 |
//if ((ViewerDataModel.Instance.UndoDataList.Count > 0) && ViewerDataModel.Instance.UndoDataList.LastOrDefault().Markup_List != null)
|
|
| 1541 |
//if ((ViewerDataModel.Instance.UndoDataList.Count > 0) && ViewerDataModel.Instance.UndoDataList.LastOrDefault().MarkupDataColl != null)
|
|
| 1537 | 1542 |
//{
|
| 1538 |
// if (ViewerDataModel.Instance.UndoDataList.LastOrDefault().Markup_List.Count > 0)
|
|
| 1543 |
// if (ViewerDataModel.Instance.UndoDataList.LastOrDefault().MarkupDataColl.Count > 0)
|
|
| 1539 | 1544 |
// {
|
| 1540 |
// if (ViewerDataModel.Instance.UndoDataList.LastOrDefault().Markup_List.FirstOrDefault().PointSet != null)
|
|
| 1545 |
// if (ViewerDataModel.Instance.UndoDataList.LastOrDefault().MarkupDataColl.FirstOrDefault().PointSet != null)
|
|
| 1541 | 1546 |
// {
|
| 1542 | 1547 |
// return; |
| 1543 | 1548 |
// } |
| ... | ... | |
| 1546 | 1551 |
|
| 1547 | 1552 |
var comments = (from drawing in this.Members |
| 1548 | 1553 |
select drawing.DrawingData as CommentUserInfo).ToList(); |
| 1549 |
//UndoCommand.Instance.Push(comments, this.AngleValue, this.angleValue); |
|
| 1550 | 1554 |
UndoCommand.Instance.Push(comments); |
| 1551 | 1555 |
} |
| 1552 | 1556 |
|
내보내기 Unified diff
