개정판 40b3ce25
issue #754 Arc Arrow Line Control 추가
| KCOM/Views/MainMenu.xaml.cs | ||
|---|---|---|
| 1279 | 1279 |
(control as ArcControl).StrokeColor = Brushes.Red; |
| 1280 | 1280 |
} |
| 1281 | 1281 |
break; |
| 1282 |
case "ArrowArcControl": |
|
| 1283 |
{
|
|
| 1284 |
(control as ArrowArcControl).StrokeColor = Brushes.Red; |
|
| 1285 |
} |
|
| 1286 |
break; |
|
| 1282 | 1287 |
case "LineControl": |
| 1283 | 1288 |
{
|
| 1284 | 1289 |
(control as LineControl).StrokeColor = Brushes.Red; |
| ... | ... | |
| 1861 | 1866 |
}; |
| 1862 | 1867 |
control.DashSize = ViewerDataModel.Instance.DashSize; |
| 1863 | 1868 |
} |
| 1864 |
|
|
| 1865 |
|
|
| 1866 | 1869 |
} |
| 1867 | 1870 |
break; |
| 1868 | 1871 |
|
| 1869 | 1872 |
case ControlType.ArcArrow: |
| 1870 | 1873 |
{
|
| 1871 |
var control = currentControl as ArcControl; |
|
| 1874 |
var control = currentControl as ArrowArcControl;
|
|
| 1872 | 1875 |
if (control != null) |
| 1873 | 1876 |
{
|
| 1874 |
control.isTransOn = true;
|
|
| 1877 |
control.isTransOn = false;
|
|
| 1875 | 1878 |
control.ControlType = controlType; |
| 1876 |
if (move.mousemode == MouseMode.Drawing) |
|
| 1879 |
control.StartPoint = new Point(canvasDrawingMouseDownPoint.X, canvasDrawingMouseDownPoint.Y); |
|
| 1880 |
control.MidPoint = new Point(0, 0); |
|
| 1881 |
control.EndPoint = new Point(currentCanvasDrawingMouseMovePoint.X, currentCanvasDrawingMouseMovePoint.Y); |
|
| 1882 |
Point tempPoint = control.EndPoint; |
|
| 1883 |
|
|
| 1884 |
if (ViewerDataModel.Instance.checkAxis || ViewerDataModel.Instance.IsPressShift) |
|
| 1877 | 1885 |
{
|
| 1878 |
//move.control_Move(ControlList, true, moveX, moveY); |
|
| 1886 |
ViewerDataModel.Instance.AngleValue = MathSet.returnAngleString(control.StartPoint, ref tempPoint, true); |
|
| 1887 |
control.EndPoint = tempPoint; |
|
| 1879 | 1888 |
} |
| 1880 | 1889 |
else |
| 1881 | 1890 |
{
|
| 1882 |
control.StartPoint = new Point(canvasDrawingMouseDownPoint.X, canvasDrawingMouseDownPoint.Y); |
|
| 1883 |
control.MidPoint = new Point(0, 0); |
|
| 1884 |
control.EndPoint = new Point(currentCanvasDrawingMouseMovePoint.X, currentCanvasDrawingMouseMovePoint.Y); |
|
| 1891 |
ViewerDataModel.Instance.AngleValue = MathSet.returnAngleString(control.StartPoint, ref tempPoint, false); |
|
| 1885 | 1892 |
} |
| 1886 | 1893 |
|
| 1894 |
|
|
| 1887 | 1895 |
control.PointSet = new List<Point> |
| 1888 | 1896 |
{
|
| 1889 | 1897 |
control.StartPoint, |
| ... | ... | |
| 3801 | 3809 |
{
|
| 3802 | 3810 |
//if (IsDrawingEnable(canvasZoomPanningMouseDownPoint)) |
| 3803 | 3811 |
//{
|
| 3804 |
if (currentControl is ArcControl) |
|
| 3812 |
if (currentControl is ArrowArcControl) |
|
| 3813 |
{
|
|
| 3814 |
//20180906 LJY TEST IsRotationDrawingEnable |
|
| 3815 |
if (IsGetoutpoint((currentControl as ArrowArcControl).PointSet.Where(data => IsRotationDrawingEnable(data) == true).FirstOrDefault())) |
|
| 3805 | 3816 |
{
|
| 3806 |
//20180906 LJY TEST IsRotationDrawingEnable |
|
| 3807 |
if (IsGetoutpoint((currentControl as ArcControl).PointSet.Where(data => IsRotationDrawingEnable(data) == true).FirstOrDefault())) |
|
| 3808 |
{
|
|
| 3809 |
return; |
|
| 3810 |
} |
|
| 3817 |
return; |
|
| 3818 |
} |
|
| 3811 | 3819 |
|
| 3812 |
CreateControl();
|
|
| 3820 |
CreateControl(); |
|
| 3813 | 3821 |
|
| 3814 |
(currentControl as ArcControl).ApplyOverViewData(); |
|
| 3815 |
currentControl = null; |
|
| 3816 |
this.MainAngle.Visibility = Visibility.Collapsed; |
|
| 3817 |
} |
|
| 3818 |
else |
|
| 3822 |
(currentControl as ArrowArcControl).ApplyOverViewData(); |
|
| 3823 |
currentControl = null; |
|
| 3824 |
this.MainAngle.Visibility = Visibility.Collapsed; |
|
| 3825 |
} |
|
| 3826 |
else |
|
| 3827 |
{
|
|
| 3828 |
currentControl = new ArrowArcControl |
|
| 3819 | 3829 |
{
|
| 3820 |
currentControl = new ArcControl |
|
| 3821 |
{
|
|
| 3822 |
Background = new SolidColorBrush(Colors.Red), |
|
| 3823 |
}; |
|
| 3824 |
currentControl.CommentID = Save.shortGuid(); |
|
| 3825 |
currentControl.MarkupInfoID = App.Custom_ViewInfoId; |
|
| 3826 |
currentControl.IsNew = true; |
|
| 3827 |
(currentControl as IMarkupCommonData).ControlType = ControlType.ArcArrow; |
|
| 3828 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl); |
|
| 3829 |
this.MainAngle.Visibility = Visibility.Visible; |
|
| 3830 |
} |
|
| 3830 |
Background = new SolidColorBrush(Colors.Black) |
|
| 3831 |
}; |
|
| 3832 |
currentControl.CommentID = Save.shortGuid(); |
|
| 3833 |
currentControl.MarkupInfoID = App.Custom_ViewInfoId; |
|
| 3834 |
currentControl.IsNew = true; |
|
| 3835 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl); |
|
| 3836 |
this.MainAngle.Visibility = Visibility.Visible; |
|
| 3837 |
} |
|
| 3831 | 3838 |
//} |
| 3832 | 3839 |
} |
| 3833 | 3840 |
else if (mouseButtonDown == MouseButton.Right) |
| 3834 | 3841 |
{
|
| 3835 |
(currentControl as ArcControl).setClock(); |
|
| 3842 |
if (currentControl != null) |
|
| 3843 |
{
|
|
| 3844 |
(currentControl as ArrowArcControl).setClock(); |
|
| 3845 |
(currentControl as ArrowArcControl).MidPoint = new Point(0, 0); |
|
| 3846 |
//(currentControl as ArcControl).ApplyTemplate(); |
|
| 3847 |
} |
|
| 3836 | 3848 |
} |
| 3837 | 3849 |
} |
| 3838 | 3850 |
break; |
내보내기 Unified diff
