개정판 e5bd2147
Undo push method 수정
font size 수정
Change-Id: Ib02186683c56b454c0a50bdb8dddb8165111d5e3
| KCOM/Controls/AdornerFinal.xaml.cs | ||
|---|---|---|
| 1227 | 1227 |
|
| 1228 | 1228 |
var comments = (from drawing in this.Members |
| 1229 | 1229 |
select drawing.DrawingData as CommentUserInfo).ToList(); |
| 1230 |
UndoCommand.Instance.Push(comments, this.AngleValue, 0, lstPointTemp); |
|
| 1230 |
//UndoCommand.Instance.Push(comments, this.AngleValue, 0, lstPointTemp);
|
|
| 1231 | 1231 |
ViewerDataModel.Instance.IsMarkupUpdate = true; |
| 1232 | 1232 |
} |
| 1233 | 1233 |
|
| ... | ... | |
| 1246 | 1246 |
return; |
| 1247 | 1247 |
} |
| 1248 | 1248 |
|
| 1249 |
if (lstBeforePointSet == null) |
|
| 1250 |
lstBeforePointSet = new List<Point>(); |
|
| 1251 |
|
|
| 1252 |
lstBeforePointSet.Clear(); |
|
| 1253 |
foreach(var vPoint in ((dynamic)this.Members.FirstOrDefault().DrawingData).PointSet) |
|
| 1254 |
{
|
|
| 1255 |
lstBeforePointSet.Add(vPoint); |
|
| 1256 |
} |
|
| 1257 |
|
|
| 1258 |
//lstBeforePointSet = ((dynamic)this.Members.FirstOrDefault().DrawingData).PointSet; |
|
| 1259 |
|
|
| 1260 |
if ((null != ViewerDataModel.Instance.UndoDataList.LastOrDefault()) && (ViewerDataModel.Instance.UndoDataList.LastOrDefault().Event == Event_Type.Thumb)) |
|
| 1261 |
{
|
|
| 1262 |
return; |
|
| 1263 |
} |
|
| 1249 |
|
|
| 1250 |
//if ((null != ViewerDataModel.Instance.UndoDataList.LastOrDefault()) && (ViewerDataModel.Instance.UndoDataList.LastOrDefault().Event == Event_Type.Thumb)) |
|
| 1251 |
//{
|
|
| 1252 |
// return; |
|
| 1253 |
//} |
|
| 1264 | 1254 |
|
| 1265 |
if ((null != ViewerDataModel.Instance.UndoDataList.LastOrDefault()) && (ViewerDataModel.Instance.UndoDataList.LastOrDefault().Markup_List != null)) |
|
| 1266 |
{
|
|
| 1267 |
if (ViewerDataModel.Instance.UndoDataList.LastOrDefault().Markup_List.Count > 0) |
|
| 1268 |
{
|
|
| 1269 |
if (ViewerDataModel.Instance.UndoDataList.LastOrDefault().Markup_List.FirstOrDefault().PointSet != null) |
|
| 1270 |
{
|
|
| 1271 |
return; |
|
| 1272 |
} |
|
| 1273 |
} |
|
| 1274 |
} |
|
| 1255 |
//if ((null != ViewerDataModel.Instance.UndoDataList.LastOrDefault()) && (ViewerDataModel.Instance.UndoDataList.LastOrDefault().Markup_List != null))
|
|
| 1256 |
//{
|
|
| 1257 |
// if (ViewerDataModel.Instance.UndoDataList.LastOrDefault().Markup_List.Count > 0)
|
|
| 1258 |
// {
|
|
| 1259 |
// if (ViewerDataModel.Instance.UndoDataList.LastOrDefault().Markup_List.FirstOrDefault().PointSet != null)
|
|
| 1260 |
// {
|
|
| 1261 |
// return;
|
|
| 1262 |
// }
|
|
| 1263 |
// }
|
|
| 1264 |
//}
|
|
| 1275 | 1265 |
|
| 1276 | 1266 |
var comments = (from drawing in this.Members |
| 1277 | 1267 |
select drawing.DrawingData as CommentUserInfo).ToList(); |
| 1278 |
UndoCommand.Instance.Push(comments, this.AngleValue, 0, lstBeforePointSet); |
|
| 1268 |
//UndoCommand.Instance.Push(comments, this.AngleValue, 0, lstBeforePointSet); |
|
| 1269 |
UndoCommand.Instance.Push(comments); |
|
| 1279 | 1270 |
} |
| 1280 | 1271 |
|
| 1281 | 1272 |
private void rotate_MouseMove(object sender, MouseEventArgs e) |
| ... | ... | |
| 1313 | 1304 |
{
|
| 1314 | 1305 |
return; |
| 1315 | 1306 |
} |
| 1316 |
if ((null != ViewerDataModel.Instance.UndoDataList.LastOrDefault()) && (ViewerDataModel.Instance.UndoDataList.LastOrDefault().Event == Event_Type.Thumb)) |
|
| 1317 |
{
|
|
| 1318 |
return; |
|
| 1319 |
} |
|
| 1320 |
if ((null != ViewerDataModel.Instance.UndoDataList.LastOrDefault()) && (ViewerDataModel.Instance.UndoDataList.LastOrDefault().Markup_List != null)) |
|
| 1321 |
{
|
|
| 1322 |
if (ViewerDataModel.Instance.UndoDataList.LastOrDefault().Markup_List.Count > 0) |
|
| 1323 |
{
|
|
| 1324 |
if (ViewerDataModel.Instance.UndoDataList.LastOrDefault().Markup_List.FirstOrDefault().PointSet != null) |
|
| 1325 |
{
|
|
| 1326 |
return; |
|
| 1327 |
} |
|
| 1328 |
} |
|
| 1329 |
} |
|
| 1307 |
//if ((null != ViewerDataModel.Instance.UndoDataList.LastOrDefault()) && (ViewerDataModel.Instance.UndoDataList.LastOrDefault().Event == Event_Type.Thumb))
|
|
| 1308 |
//{
|
|
| 1309 |
// return;
|
|
| 1310 |
//}
|
|
| 1311 |
//if ((null != ViewerDataModel.Instance.UndoDataList.LastOrDefault()) && (ViewerDataModel.Instance.UndoDataList.LastOrDefault().Markup_List != null))
|
|
| 1312 |
//{
|
|
| 1313 |
// if (ViewerDataModel.Instance.UndoDataList.LastOrDefault().Markup_List.Count > 0)
|
|
| 1314 |
// {
|
|
| 1315 |
// if (ViewerDataModel.Instance.UndoDataList.LastOrDefault().Markup_List.FirstOrDefault().PointSet != null)
|
|
| 1316 |
// {
|
|
| 1317 |
// return;
|
|
| 1318 |
// }
|
|
| 1319 |
// }
|
|
| 1320 |
//}
|
|
| 1330 | 1321 |
|
| 1331 | 1322 |
var comments = (from drawing in this.Members |
| 1332 | 1323 |
select drawing.DrawingData as CommentUserInfo).ToList(); |
| 1333 |
UndoCommand.Instance.Push(comments, this.AngleValue); |
|
| 1324 |
//UndoCommand.Instance.Push(comments, this.AngleValue); |
|
| 1325 |
UndoCommand.Instance.Push(comments); |
|
| 1334 | 1326 |
} |
| 1335 | 1327 |
|
| 1336 | 1328 |
private void drag_DragCompleted(object sender, DragCompletedEventArgs e) |
| ... | ... | |
| 1339 | 1331 |
|
| 1340 | 1332 |
var comments = (from drawing in this.Members |
| 1341 | 1333 |
select drawing.DrawingData as CommentUserInfo).ToList(); |
| 1342 |
UndoCommand.Instance.Push(comments, this.AngleValue); |
|
| 1334 |
//UndoCommand.Instance.Push(comments, this.AngleValue);
|
|
| 1343 | 1335 |
} |
| 1344 | 1336 |
|
| 1345 | 1337 |
private void DragThumb_DragDelta(object sender, DragDeltaEventArgs e) |
| ... | ... | |
| 1569 | 1561 |
} |
| 1570 | 1562 |
/// up to here |
| 1571 | 1563 |
|
| 1572 |
dBeforeAngle = this.angleValue; |
|
| 1564 |
//dBeforeAngle = this.angleValue;
|
|
| 1573 | 1565 |
|
| 1574 | 1566 |
if (ViewerDataModel.Instance.UndoDataList == null) |
| 1575 | 1567 |
{
|
| 1576 | 1568 |
return; |
| 1577 | 1569 |
} |
| 1578 | 1570 |
|
| 1579 |
if ((ViewerDataModel.Instance.UndoDataList.Count > 0) && ViewerDataModel.Instance.UndoDataList.LastOrDefault().Event == Event_Type.Thumb) |
|
| 1580 |
{
|
|
| 1581 |
return; |
|
| 1582 |
} |
|
| 1571 |
//if ((ViewerDataModel.Instance.UndoDataList.Count > 0) && ViewerDataModel.Instance.UndoDataList.LastOrDefault().Event == Event_Type.Thumb)
|
|
| 1572 |
//{
|
|
| 1573 |
// return;
|
|
| 1574 |
//}
|
|
| 1583 | 1575 |
|
| 1584 |
if ((ViewerDataModel.Instance.UndoDataList.Count > 0) && ViewerDataModel.Instance.UndoDataList.LastOrDefault().Markup_List != null) |
|
| 1585 |
{
|
|
| 1586 |
if (ViewerDataModel.Instance.UndoDataList.LastOrDefault().Markup_List.Count > 0) |
|
| 1587 |
{
|
|
| 1588 |
if (ViewerDataModel.Instance.UndoDataList.LastOrDefault().Markup_List.FirstOrDefault().PointSet != null) |
|
| 1589 |
{
|
|
| 1590 |
return; |
|
| 1591 |
} |
|
| 1592 |
} |
|
| 1593 |
} |
|
| 1576 |
//if ((ViewerDataModel.Instance.UndoDataList.Count > 0) && ViewerDataModel.Instance.UndoDataList.LastOrDefault().Markup_List != null)
|
|
| 1577 |
//{
|
|
| 1578 |
// if (ViewerDataModel.Instance.UndoDataList.LastOrDefault().Markup_List.Count > 0)
|
|
| 1579 |
// {
|
|
| 1580 |
// if (ViewerDataModel.Instance.UndoDataList.LastOrDefault().Markup_List.FirstOrDefault().PointSet != null)
|
|
| 1581 |
// {
|
|
| 1582 |
// return;
|
|
| 1583 |
// }
|
|
| 1584 |
// }
|
|
| 1585 |
//}
|
|
| 1594 | 1586 |
|
| 1595 | 1587 |
var comments = (from drawing in this.Members |
| 1596 | 1588 |
select drawing.DrawingData as CommentUserInfo).ToList(); |
| 1597 |
UndoCommand.Instance.Push(comments, this.AngleValue, this.angleValue); |
|
| 1589 |
//UndoCommand.Instance.Push(comments, this.AngleValue, this.angleValue); |
|
| 1590 |
UndoCommand.Instance.Push(comments); |
|
| 1598 | 1591 |
} |
| 1599 | 1592 |
|
| 1600 | 1593 |
private void rotate_DragCompleted(object sender, DragCompletedEventArgs e) |
| ... | ... | |
| 1605 | 1598 |
|
| 1606 | 1599 |
var comments = (from drawing in this.Members |
| 1607 | 1600 |
select drawing.DrawingData as CommentUserInfo).ToList(); |
| 1608 |
UndoCommand.Instance.Push(comments, this.AngleValue, dBeforeAngle); |
|
| 1601 |
//UndoCommand.Instance.Push(comments, this.AngleValue, dBeforeAngle);
|
|
| 1609 | 1602 |
} |
| 1610 | 1603 |
|
| 1611 | 1604 |
public void ControlPointMouseLeftButtonDown(object sender, MouseButtonEventArgs e) |
내보내기 Unified diff
