개정판 e1b36bc0
Feature: Grouping 기능 추가(Ctrl+G : Group, Ctrl+Shift+G : Ungroup)
Change-Id: I99a3309acd55799ff7101522feaa035225b80e48
| KCOM/Controls/AdornerFinal.xaml.cs | ||
|---|---|---|
| 72 | 72 |
public double DrawingAngle { get; set; }
|
| 73 | 73 |
public List<MyThumb> ThumbList { get; set; }
|
| 74 | 74 |
public string Symbol_ID { get; set; }
|
| 75 |
public long Group_ID { get; set; }
|
|
| 76 | 75 |
|
| 77 | 76 |
/// <summary> |
| 78 | 77 |
/// update thumb |
| ... | ... | |
| 205 | 204 |
dropCalendar.SelectionChanged += (sen, ea) => |
| 206 | 205 |
{
|
| 207 | 206 |
dropData.IsOpen = false; |
| 208 |
if ((this.Members.First() as AdornerMember).DrawingData.GetType().Name == "DateControl")
|
|
| 207 |
if ((this.Members[0]).DrawingData.GetType().Name == "DateControl")
|
|
| 209 | 208 |
{
|
| 210 |
DateControl data = (this.Members.First() as AdornerMember).DrawingData as DateControl;
|
|
| 209 |
DateControl data = (this.Members[0]).DrawingData as DateControl;
|
|
| 211 | 210 |
data.Text = dropCalendar.SelectedDate.Value.ToShortDateString(); |
| 212 | 211 |
} |
| 213 | 212 |
}; |
| ... | ... | |
| 246 | 245 |
this.Focus(); |
| 247 | 246 |
} |
| 248 | 247 |
|
| 249 |
public AdornerFinal(List<CommentUserInfo> objectData) : this()
|
|
| 248 |
public AdornerFinal(List<CommentUserInfo> comments) : this()
|
|
| 250 | 249 |
{
|
| 251 | 250 |
InitializeComponent(); |
| 252 |
foreach (var item in objectData) |
|
| 251 |
|
|
| 252 |
comments.ForEach(x => x.Index = ViewerDataModel.Instance.MarkupControls_USER.IndexOf(x)); |
|
| 253 |
foreach (var item in comments) |
|
| 253 | 254 |
{
|
| 254 |
//item.IsHitTestVisible = false; |
|
| 255 | 255 |
if (item is ArrowTextControl ArrTextCtrl) |
| 256 | 256 |
{
|
| 257 | 257 |
ArrTextCtrl.Base_TextBox.Focusable = true; |
| 258 | 258 |
} |
| 259 | 259 |
try |
| 260 | 260 |
{
|
| 261 |
///Canvas.SetZIndex(item, 80); |
|
| 262 |
|
|
| 263 |
item.Index = ViewerDataModel.Instance.MarkupControls_USER.IndexOf(item); |
|
| 264 | 261 |
ViewerDataModel.Instance.MarkupControls_USER.Remove(item); |
| 265 | 262 |
this.ContainerContent.Children.Add(item); |
| 266 | 263 |
} |
| ... | ... | |
| 270 | 267 |
} |
| 271 | 268 |
finally |
| 272 | 269 |
{
|
| 273 |
|
|
| 274 | 270 |
} |
| 275 | 271 |
} |
| 276 | 272 |
|
| 277 |
this.SetAdornerMember(objectData);
|
|
| 273 |
this.SetAdornerMember(comments);
|
|
| 278 | 274 |
this.Focus(); |
| 279 | 275 |
} |
| 280 | 276 |
|
| ... | ... | |
| 410 | 406 |
case "OverlapWhiteControl": |
| 411 | 407 |
case "ClipWhiteControl": |
| 412 | 408 |
case "CoordinateControl": |
| 413 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = member.ControlType, ThumbList = new List<MyThumb>(), Symbol_ID = member.SymbolID, Group_ID = member.GroupID });
|
|
| 409 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = member.ControlType, ThumbList = new List<MyThumb>(), Symbol_ID = member.SymbolID });
|
|
| 414 | 410 |
_ActualAngle = AngleValue = member.CommentAngle; |
| 415 | 411 |
break; |
| 416 | 412 |
case "ArrowTextControl": |
| ... | ... | |
| 419 | 415 |
DrawingData = member, |
| 420 | 416 |
Drawingtype = ControlType.ArrowTextControl, |
| 421 | 417 |
ThumbList = new List<MyThumb>(), |
| 422 |
Symbol_ID = member.SymbolID, |
|
| 423 |
Group_ID = member.GroupID, |
|
| 418 |
Symbol_ID = member.SymbolID |
|
| 424 | 419 |
}); |
| 425 | 420 |
(member as ArrowTextControl).Base_TextBox.IsHitTestVisible = false; |
| 426 | 421 |
_ActualAngle = AngleValue = (member as ArrowTextControl).CommentAngle; |
| ... | ... | |
| 428 | 423 |
((ArrowTextControl)member).Base_TextBox.LostFocus += TextControlLostFocus; |
| 429 | 424 |
break; |
| 430 | 425 |
case "ImgControl": |
| 431 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = member.ControlType, ThumbList = new List<MyThumb>(), Symbol_ID = member.SymbolID, Group_ID = member.GroupID });
|
|
| 426 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = member.ControlType, ThumbList = new List<MyThumb>(), Symbol_ID = member.SymbolID});
|
|
| 432 | 427 |
_ActualAngle = AngleValue = (member as ImgControl).CommentAngle; |
| 433 | 428 |
break; |
| 434 | 429 |
case "DateControl": |
| 435 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = member.ControlType, ThumbList = new List<MyThumb>(), Symbol_ID = member.SymbolID, Group_ID = member.GroupID });
|
|
| 430 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = member.ControlType, ThumbList = new List<MyThumb>(), Symbol_ID = member.SymbolID });
|
|
| 436 | 431 |
_ActualAngle = AngleValue = (member as DateControl).CommentAngle; |
| 437 | 432 |
break; |
| 438 | 433 |
case "SignControl": |
| 439 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = member.ControlType, ThumbList = new List<MyThumb>(), Symbol_ID = member.SymbolID, Group_ID = member.GroupID });
|
|
| 434 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = member.ControlType, ThumbList = new List<MyThumb>(), Symbol_ID = member.SymbolID });
|
|
| 440 | 435 |
_ActualAngle = AngleValue = (member as SignControl).CommentAngle; |
| 441 | 436 |
break; |
| 442 | 437 |
case "SymControl": |
| 443 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = member.ControlType, ThumbList = new List<MyThumb>(), Symbol_ID = member.SymbolID, Group_ID = member.GroupID });
|
|
| 438 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = member.ControlType, ThumbList = new List<MyThumb>(), Symbol_ID = member.SymbolID });
|
|
| 444 | 439 |
_ActualAngle = AngleValue = (member as SymControl).CommentAngle; |
| 445 | 440 |
break; |
| 446 | 441 |
case "SymControlN": |
| 447 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = member.ControlType, ThumbList = new List<MyThumb>(), Symbol_ID = member.SymbolID, Group_ID = member.GroupID });
|
|
| 442 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = member.ControlType, ThumbList = new List<MyThumb>(), Symbol_ID = member.SymbolID });
|
|
| 448 | 443 |
_ActualAngle = AngleValue = (member as SymControlN).CommentAngle; |
| 449 | 444 |
break; |
| 450 | 445 |
case "TextControl": |
| 451 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.TextControl, ThumbList = new List<MyThumb>(), Symbol_ID = member.SymbolID, Group_ID = member.GroupID });
|
|
| 446 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.TextControl, ThumbList = new List<MyThumb>(), Symbol_ID = member.SymbolID });
|
|
| 452 | 447 |
RectangleGeometry Data = new RectangleGeometry |
| 453 | 448 |
{
|
| 454 | 449 |
Rect = new Rect() |
| ... | ... | |
| 508 | 503 |
{
|
| 509 | 504 |
#region 컨트롤 조건 |
| 510 | 505 |
case "LineControl": |
| 511 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.SingleLine, ThumbList = new List<MyThumb>(), Symbol_ID = member.SymbolID, Group_ID = member.GroupID });
|
|
| 506 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.SingleLine, ThumbList = new List<MyThumb>(), Symbol_ID = member.SymbolID });
|
|
| 512 | 507 |
break; |
| 513 | 508 |
case "ImgControl": |
| 514 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.ImgControl, ThumbList = new List<MyThumb>(), Symbol_ID = member.SymbolID, Group_ID = member.GroupID });
|
|
| 509 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.ImgControl, ThumbList = new List<MyThumb>(), Symbol_ID = member.SymbolID });
|
|
| 515 | 510 |
break; |
| 516 | 511 |
case "ArrowControl": |
| 517 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.ArrowLine, ThumbList = new List<MyThumb>(), Symbol_ID = member.SymbolID, Group_ID = member.GroupID });
|
|
| 512 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.ArrowLine, ThumbList = new List<MyThumb>(), Symbol_ID = member.SymbolID });
|
|
| 518 | 513 |
break; |
| 519 | 514 |
case "PolygonControl": |
| 520 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.PolygonControl, ThumbList = new List<MyThumb>(), Symbol_ID = member.SymbolID, Group_ID = member.GroupID });
|
|
| 515 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.PolygonControl, ThumbList = new List<MyThumb>(), Symbol_ID = member.SymbolID });
|
|
| 521 | 516 |
break; |
| 522 | 517 |
case "ArrowTextControl": |
| 523 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.ArrowTextControl, ThumbList = new List<MyThumb>(), Symbol_ID = member.SymbolID, Group_ID = member.GroupID });
|
|
| 518 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.ArrowTextControl, ThumbList = new List<MyThumb>(), Symbol_ID = member.SymbolID });
|
|
| 524 | 519 |
(member as ArrowTextControl).Base_TextBox.IsHitTestVisible = false; |
| 525 | 520 |
break; |
| 526 | 521 |
case "ArcControl": |
| 527 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.ArcLine, ThumbList = new List<MyThumb>(), Symbol_ID = member.SymbolID, Group_ID = member.GroupID });
|
|
| 522 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.ArcLine, ThumbList = new List<MyThumb>(), Symbol_ID = member.SymbolID });
|
|
| 528 | 523 |
break; |
| 529 | 524 |
case "ArrowArcControl": |
| 530 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.ArcArrow, ThumbList = new List<MyThumb>(), Symbol_ID = member.SymbolID, Group_ID = member.GroupID });
|
|
| 525 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.ArcArrow, ThumbList = new List<MyThumb>(), Symbol_ID = member.SymbolID });
|
|
| 531 | 526 |
break; |
| 532 | 527 |
case "DateControl": |
| 533 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.Date, ThumbList = new List<MyThumb>(), Symbol_ID = member.SymbolID, Group_ID = member.GroupID });
|
|
| 528 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.Date, ThumbList = new List<MyThumb>(), Symbol_ID = member.SymbolID });
|
|
| 534 | 529 |
break; |
| 535 | 530 |
case "ArrowControl_Multi": |
| 536 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.ArrowMultiLine, ThumbList = new List<MyThumb>(), Symbol_ID = member.SymbolID, Group_ID = member.GroupID });
|
|
| 531 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.ArrowMultiLine, ThumbList = new List<MyThumb>(), Symbol_ID = member.SymbolID });
|
|
| 537 | 532 |
break; |
| 538 | 533 |
case "RectangleControl": |
| 539 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.Rectangle, ThumbList = new List<MyThumb>(), Symbol_ID = member.SymbolID, Group_ID = member.GroupID });
|
|
| 534 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.Rectangle, ThumbList = new List<MyThumb>(), Symbol_ID = member.SymbolID });
|
|
| 540 | 535 |
break; |
| 541 | 536 |
case "TriControl": |
| 542 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.Triangle, ThumbList = new List<MyThumb>(), Symbol_ID = member.SymbolID, Group_ID = member.GroupID });
|
|
| 537 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.Triangle, ThumbList = new List<MyThumb>(), Symbol_ID = member.SymbolID });
|
|
| 543 | 538 |
break; |
| 544 | 539 |
case "CircleControl": |
| 545 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.Circle, ThumbList = new List<MyThumb>(), Symbol_ID = member.SymbolID, Group_ID = member.GroupID });
|
|
| 540 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.Circle, ThumbList = new List<MyThumb>(), Symbol_ID = member.SymbolID });
|
|
| 546 | 541 |
break; |
| 547 | 542 |
case "CloudControl": |
| 548 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.PolygonCloud, ThumbList = new List<MyThumb>(), Symbol_ID = member.SymbolID, Group_ID = member.GroupID });
|
|
| 543 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.PolygonCloud, ThumbList = new List<MyThumb>(), Symbol_ID = member.SymbolID });
|
|
| 549 | 544 |
break; |
| 550 | 545 |
case "RectCloudControl": |
| 551 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.RectCloud, ThumbList = new List<MyThumb>(), Symbol_ID = member.SymbolID, Group_ID = member.GroupID });
|
|
| 546 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.RectCloud, ThumbList = new List<MyThumb>(), Symbol_ID = member.SymbolID });
|
|
| 552 | 547 |
break; |
| 553 | 548 |
case "SignControl": |
| 554 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.Sign, ThumbList = new List<MyThumb>(), Symbol_ID = member.SymbolID, Group_ID = member.GroupID });
|
|
| 549 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.Sign, ThumbList = new List<MyThumb>(), Symbol_ID = member.SymbolID });
|
|
| 555 | 550 |
break; |
| 556 | 551 |
case "SymControl": |
| 557 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.Symbol, ThumbList = new List<MyThumb>(), Symbol_ID = member.SymbolID, Group_ID = member.GroupID });
|
|
| 552 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.Symbol, ThumbList = new List<MyThumb>(), Symbol_ID = member.SymbolID });
|
|
| 558 | 553 |
break; |
| 559 | 554 |
case "SymControlN": |
| 560 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.Stamp, ThumbList = new List<MyThumb>(), Symbol_ID = member.SymbolID, Group_ID = member.GroupID });
|
|
| 555 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.Stamp, ThumbList = new List<MyThumb>(), Symbol_ID = member.SymbolID });
|
|
| 561 | 556 |
break; |
| 562 | 557 |
case "InkControl": |
| 563 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.Ink, ThumbList = new List<MyThumb>(), Symbol_ID = member.SymbolID, Group_ID = member.GroupID });
|
|
| 558 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.Ink, ThumbList = new List<MyThumb>(), Symbol_ID = member.SymbolID });
|
|
| 564 | 559 |
break; |
| 565 | 560 |
case "TextControl": |
| 566 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.TextControl, ThumbList = new List<MyThumb>(), Symbol_ID = member.SymbolID, Group_ID = member.GroupID });
|
|
| 561 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.TextControl, ThumbList = new List<MyThumb>(), Symbol_ID = member.SymbolID });
|
|
| 567 | 562 |
|
| 568 | 563 |
(member as TextControl).PropertyChanged += TextControlPropertyChanged; |
| 569 | 564 |
(member as TextControl).Base_TextBox.SelectionChanged += TextControlSelectionChanged; |
| ... | ... | |
| 591 | 586 |
//}); |
| 592 | 587 |
break; |
| 593 | 588 |
case "InsideWhiteControl": |
| 594 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.InsideWhite, ThumbList = new List<MyThumb>(), Symbol_ID = member.SymbolID, Group_ID = member.GroupID });
|
|
| 589 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.InsideWhite, ThumbList = new List<MyThumb>(), Symbol_ID = member.SymbolID });
|
|
| 595 | 590 |
break; |
| 596 | 591 |
case "OverlapWhiteControl": |
| 597 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.OverlapWhite, ThumbList = new List<MyThumb>(), Symbol_ID = member.SymbolID, Group_ID = member.GroupID });
|
|
| 592 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.OverlapWhite, ThumbList = new List<MyThumb>(), Symbol_ID = member.SymbolID });
|
|
| 598 | 593 |
break; |
| 599 | 594 |
case "ClipWhiteControl": |
| 600 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.ClipWhite, ThumbList = new List<MyThumb>(), Symbol_ID = member.SymbolID, Group_ID = member.GroupID });
|
|
| 595 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.ClipWhite, ThumbList = new List<MyThumb>(), Symbol_ID = member.SymbolID });
|
|
| 601 | 596 |
break; |
| 602 | 597 |
case "CoordinateControl": |
| 603 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.Coordinate, ThumbList = new List<MyThumb>(), Symbol_ID = member.SymbolID, Group_ID = member.GroupID });
|
|
| 598 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.Coordinate, ThumbList = new List<MyThumb>(), Symbol_ID = member.SymbolID });
|
|
| 604 | 599 |
break; |
| 605 | 600 |
default: |
| 606 | 601 |
break; |
| ... | ... | |
| 751 | 746 |
{
|
| 752 | 747 |
List<Point> am = CircleCtrl.PointSet; |
| 753 | 748 |
lineSize = CircleCtrl.LineSize; |
| 754 |
minX = am.Min(x => x.X); |
|
| 755 |
minY = am.Min(x => x.Y); |
|
| 756 |
maxX = am.Max(x => x.X); |
|
| 757 |
maxY = am.Max(x => x.Y); |
|
| 749 |
|
|
| 750 |
List<double> xSet = am.Select(p => p.X).ToList(); |
|
| 751 |
List<double> ySet = am.Select(p => p.Y).ToList(); |
|
| 752 |
if (xSet.Min() < minX) minX = xSet.Min(); |
|
| 753 |
if (ySet.Min() < minY) minY = ySet.Min(); |
|
| 754 |
if (xSet.Max() > maxX) maxX = xSet.Max(); |
|
| 755 |
if (ySet.Max() > maxY) maxY = ySet.Max(); |
|
| 758 | 756 |
} |
| 759 | 757 |
else |
| 760 | 758 |
{
|
| ... | ... | |
| 1552 | 1550 |
{
|
| 1553 | 1551 |
if (e.ClickCount == 2 && this.Members.Count == 1) |
| 1554 | 1552 |
{
|
| 1555 |
if ((this.Members.First() as AdornerMember).DrawingData.GetType().Name == "TextControl")
|
|
| 1553 |
if (this.Members[0].DrawingData.GetType().Name == "TextControl")
|
|
| 1556 | 1554 |
{
|
| 1557 | 1555 |
SelectionSet.Instance.UnSelect(ViewerDataModel.Instance.SystemMain.dzMainMenu); |
| 1558 | 1556 |
TextControlChanger(); |
| 1559 | 1557 |
} |
| 1560 | 1558 |
|
| 1561 |
else if ((this.Members.First() as AdornerMember).DrawingData.GetType().Name == "ArrowTextControl")
|
|
| 1559 |
else if (this.Members[0].DrawingData.GetType().Name == "ArrowTextControl")
|
|
| 1562 | 1560 |
{
|
| 1563 | 1561 |
ArrowTextControl AllControl = (this.Members.First() as AdornerMember).DrawingData as ArrowTextControl; |
| 1564 | 1562 |
Thumb tm = (this.Members.First() as AdornerMember).ThumbList.Last(); |
| ... | ... | |
| 1566 | 1564 |
//ArrowControl TextBox Thumb없애기 |
| 1567 | 1565 |
tm.Visibility = Visibility.Collapsed; |
| 1568 | 1566 |
|
| 1569 |
((this.Members.First() as AdornerMember).DrawingData as ArrowTextControl).Base_TextBox.IsHitTestVisible = true;
|
|
| 1567 |
(this.Members[0].DrawingData as ArrowTextControl).Base_TextBox.IsHitTestVisible = true;
|
|
| 1570 | 1568 |
SelectionSet.Instance.UnSelect(ViewerDataModel.Instance.SystemMain.dzMainMenu); |
| 1571 | 1569 |
|
| 1572 | 1570 |
((ArrowTextControl)AllControl).Base_TextBox.Focus(); |
| ... | ... | |
| 1585 | 1583 |
ps.Add(new Point(Canvas.GetLeft(AllControl.Base_TextBox), Canvas.GetTop(AllControl.Base_TextBox) + AllControl.BoxHeight / 2)); //좌단 |
| 1586 | 1584 |
ps.Add(new Point(Canvas.GetLeft(AllControl.Base_TextBox) + AllControl.BoxWidth, Canvas.GetTop(AllControl.Base_TextBox) + AllControl.BoxHeight / 2)); //우단 |
| 1587 | 1585 |
|
| 1588 |
|
|
| 1589 |
|
|
| 1590 |
|
|
| 1591 | 1586 |
var endP = MathSet.getNearPoint(ps, AllControl.MidPoint); |
| 1592 | 1587 |
var tempP = MathSet.getMiddlePoint(AllControl.StartPoint, endP); |
| 1593 | 1588 |
if (AllControl.isTrans) |
| 1594 | 1589 |
{
|
| 1595 |
Canvas.SetLeft((this.Members.First() as AdornerMember).ThumbList[1], AllControl.MidPoint.X);
|
|
| 1596 |
Canvas.SetTop((this.Members.First() as AdornerMember).ThumbList[1], AllControl.MidPoint.Y);
|
|
| 1590 |
Canvas.SetLeft((this.Members[0]).ThumbList[1], AllControl.MidPoint.X);
|
|
| 1591 |
Canvas.SetTop((this.Members[0]).ThumbList[1], AllControl.MidPoint.Y);
|
|
| 1597 | 1592 |
} |
| 1598 | 1593 |
else |
| 1599 | 1594 |
{
|
| 1600 |
Canvas.SetLeft((this.Members.First() as AdornerMember).ThumbList[1], tempP.X);
|
|
| 1601 |
Canvas.SetTop((this.Members.First() as AdornerMember).ThumbList[1], tempP.Y);
|
|
| 1595 |
Canvas.SetLeft((this.Members[0]).ThumbList[1], tempP.X);
|
|
| 1596 |
Canvas.SetTop((this.Members[0]).ThumbList[1], tempP.Y);
|
|
| 1602 | 1597 |
} |
| 1603 | 1598 |
|
| 1604 | 1599 |
|
| ... | ... | |
| 1606 | 1601 |
|
| 1607 | 1602 |
}; |
| 1608 | 1603 |
} |
| 1609 |
else if ((this.Members.First() as AdornerMember).DrawingData.GetType().Name == "DateControl")
|
|
| 1604 |
else if ((this.Members[0]).DrawingData.GetType().Name == "DateControl")
|
|
| 1610 | 1605 |
{
|
| 1611 |
DateControl data = (this.Members.First() as AdornerMember).DrawingData as DateControl;
|
|
| 1606 |
DateControl data = (this.Members[0]).DrawingData as DateControl;
|
|
| 1612 | 1607 |
CalendarControl instanceCal = new CalendarControl(data.Text); |
| 1613 | 1608 |
//dropData.IsOpen = true; |
| 1614 | 1609 |
RadWindow rc = new RadWindow(); |
| ... | ... | |
| 1630 | 1625 |
rc.ShowDialog(); |
| 1631 | 1626 |
//CalendarControl.xaml |
| 1632 | 1627 |
} |
| 1633 |
else if ((this.Members.First() as AdornerMember).DrawingData.GetType().Name == "ArcControl")
|
|
| 1628 |
else if ((this.Members[0]).DrawingData.GetType().Name == "ArcControl")
|
|
| 1634 | 1629 |
{
|
| 1635 |
ArcControl instance = ((this.Members.First() as AdornerMember).DrawingData as ArcControl);
|
|
| 1630 |
ArcControl instance = ((this.Members[0]).DrawingData as ArcControl);
|
|
| 1636 | 1631 |
if (instance.isTransOn) |
| 1637 | 1632 |
{
|
| 1638 | 1633 |
instance.isTransOn = false; |
| ... | ... | |
| 1644 | 1639 |
///instance.SetArcPath(); |
| 1645 | 1640 |
BorderUpdate(); |
| 1646 | 1641 |
} |
| 1647 |
else if ((this.Members.First() as AdornerMember).DrawingData.GetType().Name == "ArrowArcControl")
|
|
| 1642 |
else if ((this.Members[0]).DrawingData.GetType().Name == "ArrowArcControl")
|
|
| 1648 | 1643 |
{
|
| 1649 |
ArrowArcControl instance = ((this.Members.First() as AdornerMember).DrawingData as ArrowArcControl);
|
|
| 1644 |
ArrowArcControl instance = ((this.Members[0]).DrawingData as ArrowArcControl);
|
|
| 1650 | 1645 |
if (instance.isTransOn) |
| 1651 | 1646 |
{
|
| 1652 | 1647 |
instance.isTransOn = false; |
| ... | ... | |
| 1658 | 1653 |
instance.SetArcPath(); |
| 1659 | 1654 |
BorderUpdate(); |
| 1660 | 1655 |
} |
| 1661 |
|
|
| 1662 | 1656 |
} |
| 1663 |
|
|
| 1664 | 1657 |
} |
| 1665 | 1658 |
#endregion |
| 1666 | 1659 |
|
내보내기 Unified diff
