개정판 40b3ce25
issue #754 Arc Arrow Line Control 추가
| KCOM/Controls/AdornerFinal.xaml.cs | ||
|---|---|---|
| 191 | 191 |
case "ArcControl": |
| 192 | 192 |
MemberSet.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.ArcLine, ThumbList = new List<Thumb>() });
|
| 193 | 193 |
break; |
| 194 |
case "ArrowArcControl": |
|
| 195 |
MemberSet.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.ArcArrow, ThumbList = new List<Thumb>() });
|
|
| 196 |
break; |
|
| 194 | 197 |
case "ArrowControl_Multi": |
| 195 | 198 |
MemberSet.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.ArrowMultiLine, ThumbList = new List<Thumb>() });
|
| 196 | 199 |
break; |
| ... | ... | |
| 337 | 340 |
case "ArcControl": |
| 338 | 341 |
MemberSet.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.ArcLine, ThumbList = new List<Thumb>() });
|
| 339 | 342 |
break; |
| 343 |
case "ArrowArcControl": |
|
| 344 |
MemberSet.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.ArcArrow, ThumbList = new List<Thumb>() });
|
|
| 345 |
break; |
|
| 340 | 346 |
case "DateControl": |
| 341 | 347 |
MemberSet.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.Date, ThumbList = new List<Thumb>() });
|
| 342 | 348 |
break; |
| ... | ... | |
| 622 | 628 |
|
| 623 | 629 |
MemberSet.Last().ThumbList.Add(tm); |
| 624 | 630 |
|
| 625 |
if (markT == ControlType.ArcLine && list[i] == (member as ArcControl).MidPoint)
|
|
| 631 |
if ((markT == ControlType.ArcLine && list[i] == (member as ArcControl).MidPoint) || (markT == ControlType.ArcArrow && list[i] == (member as ArrowArcControl).MidPoint))
|
|
| 626 | 632 |
{
|
| 627 | 633 |
tm.Style = (Style)this.LayoutRoot.Resources["ThumbArcControlStyle"]; |
| 628 | 634 |
} |
| ... | ... | |
| 832 | 838 |
#region Arc + Line |
| 833 | 839 |
case ControlType.ArrowMultiLine: |
| 834 | 840 |
case ControlType.ArcLine: |
| 841 |
case ControlType.ArcArrow: |
|
| 835 | 842 |
case ControlType.SingleLine: |
| 836 | 843 |
case ControlType.Triangle: |
| 837 | 844 |
if (nearPoint.Equals(AllControl.PointSet[i])) |
| ... | ... | |
| 1211 | 1218 |
foreach (var item in MemberSet) |
| 1212 | 1219 |
{
|
| 1213 | 1220 |
#region 라인 & 아크 |
| 1214 |
if (item.Drawingtype == ControlType.SingleLine || item.Drawingtype == ControlType.ArcLine || item.Drawingtype == ControlType.ArrowMultiLine) |
|
| 1221 |
if (item.Drawingtype == ControlType.SingleLine || item.Drawingtype == ControlType.ArcLine || item.Drawingtype == ControlType.ArrowMultiLine || item.Drawingtype == ControlType.ArcArrow)
|
|
| 1215 | 1222 |
{
|
| 1216 | 1223 |
DynamicThumbUpdate(e, item); |
| 1217 | 1224 |
} |
| ... | ... | |
| 1564 | 1571 |
break; |
| 1565 | 1572 |
case ControlType.ArrowMultiLine: |
| 1566 | 1573 |
case ControlType.ArcLine: |
| 1574 |
case ControlType.ArcArrow: |
|
| 1567 | 1575 |
case ControlType.SingleLine: |
| 1568 | 1576 |
case ControlType.Triangle: |
| 1569 | 1577 |
(item.DrawingData as IPath).updateControl(); |
| ... | ... | |
| 1772 | 1780 |
break; |
| 1773 | 1781 |
case ControlType.ArrowMultiLine: |
| 1774 | 1782 |
case ControlType.ArcLine: |
| 1783 |
case ControlType.ArcArrow: |
|
| 1775 | 1784 |
case ControlType.SingleLine: |
| 1776 | 1785 |
case ControlType.Triangle: |
| 1777 | 1786 |
(item.DrawingData as IPath).updateControl(); |
| ... | ... | |
| 2113 | 2122 |
instance.SetArcPath(); |
| 2114 | 2123 |
BorderUpdate(); |
| 2115 | 2124 |
} |
| 2116 |
|
|
| 2125 |
else if ((MemberSet.First() as AdornerMember).DrawingData.GetType().Name == "ArrowArcControl") |
|
| 2126 |
{
|
|
| 2127 |
ArrowArcControl instance = ((MemberSet.First() as AdornerMember).DrawingData as ArrowArcControl); |
|
| 2128 |
if (instance.isTransOn) |
|
| 2129 |
{
|
|
| 2130 |
instance.isTransOn = false; |
|
| 2131 |
} |
|
| 2132 |
else |
|
| 2133 |
{
|
|
| 2134 |
instance.isTransOn = true; |
|
| 2135 |
} |
|
| 2136 |
instance.SetArcPath(); |
|
| 2137 |
BorderUpdate(); |
|
| 2138 |
} |
|
| 2117 | 2139 |
|
| 2118 | 2140 |
} |
| 2119 | 2141 |
|
내보내기 Unified diff
