개정판 d71ee575
issue #682 line control error modify
| KCOM/Views/MainMenu.xaml.cs | ||
|---|---|---|
| 1309 | 1309 |
if (!floatingTip.IsOpen) { floatingTip.IsOpen = true; }
|
| 1310 | 1310 |
|
| 1311 | 1311 |
Point currentPos = e.GetPosition(rect); |
| 1312 |
|
|
| 1312 |
|
|
| 1313 | 1313 |
floatingTip.HorizontalOffset = currentPos.X + 20; |
| 1314 | 1314 |
floatingTip.VerticalOffset = currentPos.Y; |
| 1315 | 1315 |
|
| ... | ... | |
| 1618 | 1618 |
control.TopRightPoint, |
| 1619 | 1619 |
}; |
| 1620 | 1620 |
} |
| 1621 |
//강인구 추가 |
|
| 1621 |
|
|
| 1622 | 1622 |
control.DashSize = ViewerDataModel.Instance.DashSize; |
| 1623 | 1623 |
control.Paint = ViewerDataModel.Instance.paintSet; |
| 1624 | 1624 |
} |
| ... | ... | |
| 1627 | 1627 |
|
| 1628 | 1628 |
case ControlType.SingleLine: |
| 1629 | 1629 |
{
|
| 1630 |
if (currentControl != null) |
|
| 1630 |
var control = currentControl as LineControl; |
|
| 1631 |
if (control != null) |
|
| 1631 | 1632 |
{
|
| 1632 |
var control = currentControl as LineControl; |
|
| 1633 | 1633 |
control.LineStyleSet = LineStyleSet.SingleLine; |
| 1634 | 1634 |
control.ControlType = controlType; |
| 1635 |
if (control != null) |
|
| 1636 |
{
|
|
| 1637 |
control.StartPoint = new Point(canvasDrawingMouseDownPoint.X, canvasDrawingMouseDownPoint.Y); |
|
| 1638 |
control.EndPoint = new Point(currentCanvasDrawingMouseMovePoint.X, currentCanvasDrawingMouseMovePoint.Y); |
|
| 1639 |
Point tempPoint = control.EndPoint; |
|
| 1635 |
control.StartPoint = new Point(canvasDrawingMouseDownPoint.X, canvasDrawingMouseDownPoint.Y); |
|
| 1636 |
control.EndPoint = new Point(currentCanvasDrawingMouseMovePoint.X, currentCanvasDrawingMouseMovePoint.Y); |
|
| 1637 |
Point tempPoint = control.EndPoint; |
|
| 1640 | 1638 |
|
| 1641 |
if (ViewerDataModel.Instance.checkAxis || ViewerDataModel.Instance.IsPressShift)
|
|
| 1642 |
{
|
|
| 1643 |
//var AngleValue = MathSet.returnAngleString(control.StartPoint, ref tempPoint, true);
|
|
| 1644 |
ViewerDataModel.Instance.AngleValue = MathSet.returnAngleString(control.StartPoint, ref tempPoint, true);
|
|
| 1645 |
control.EndPoint = tempPoint;
|
|
| 1646 |
}
|
|
| 1647 |
else
|
|
| 1648 |
{
|
|
| 1649 |
ViewerDataModel.Instance.AngleValue = MathSet.returnAngleString(control.StartPoint, ref tempPoint, false);
|
|
| 1650 |
}
|
|
| 1639 |
if (ViewerDataModel.Instance.checkAxis || ViewerDataModel.Instance.IsPressShift) |
|
| 1640 |
{
|
|
| 1641 |
//var AngleValue = MathSet.returnAngleString(control.StartPoint, ref tempPoint, true); |
|
| 1642 |
ViewerDataModel.Instance.AngleValue = MathSet.returnAngleString(control.StartPoint, ref tempPoint, true); |
|
| 1643 |
control.EndPoint = tempPoint; |
|
| 1644 |
} |
|
| 1645 |
else |
|
| 1646 |
{
|
|
| 1647 |
ViewerDataModel.Instance.AngleValue = MathSet.returnAngleString(control.StartPoint, ref tempPoint, false); |
|
| 1648 |
} |
|
| 1651 | 1649 |
|
| 1652 |
control.PointSet = new List<Point>
|
|
| 1650 |
control.PointSet = new List<Point> |
|
| 1653 | 1651 |
{
|
| 1654 | 1652 |
control.StartPoint, |
| 1655 | 1653 |
control.EndPoint, |
| 1656 | 1654 |
}; |
| 1657 |
//강인구 추가 |
|
| 1658 |
control.DashSize = ViewerDataModel.Instance.DashSize; |
|
| 1659 |
} |
|
| 1655 |
|
|
| 1656 |
control.DashSize = ViewerDataModel.Instance.DashSize; |
|
| 1660 | 1657 |
} |
| 1661 | 1658 |
|
| 1662 | 1659 |
} |
| ... | ... | |
| 1664 | 1661 |
|
| 1665 | 1662 |
case ControlType.CancelLine: |
| 1666 | 1663 |
{
|
| 1667 |
if (currentControl != null) |
|
| 1664 |
var control = currentControl as LineControl; |
|
| 1665 |
if (control != null) |
|
| 1668 | 1666 |
{
|
| 1669 |
var control = currentControl as LineControl; |
|
| 1670 | 1667 |
control.LineStyleSet = LineStyleSet.CancelLine; |
| 1671 | 1668 |
//control.LineStyle = LineControl.LineStyleSet.MultiLine; |
| 1672 | 1669 |
control.ControlType = controlType; |
| 1673 |
if (control != null) |
|
| 1674 |
{
|
|
| 1675 |
control.StartPoint = new Point(canvasDrawingMouseDownPoint.X, canvasDrawingMouseDownPoint.Y); |
|
| 1676 |
control.EndPoint = new Point(currentCanvasDrawingMouseMovePoint.X, currentCanvasDrawingMouseMovePoint.Y); |
|
| 1677 |
Point tempPoint = control.EndPoint; |
|
| 1670 |
control.StartPoint = new Point(canvasDrawingMouseDownPoint.X, canvasDrawingMouseDownPoint.Y); |
|
| 1671 |
control.EndPoint = new Point(currentCanvasDrawingMouseMovePoint.X, currentCanvasDrawingMouseMovePoint.Y); |
|
| 1672 |
Point tempPoint = control.EndPoint; |
|
| 1678 | 1673 |
|
| 1679 |
if (ViewerDataModel.Instance.checkAxis || ViewerDataModel.Instance.IsPressShift)
|
|
| 1680 |
{
|
|
| 1681 |
//var AngleValue = MathSet.returnAngleString(control.StartPoint, ref tempPoint, true);
|
|
| 1682 |
ViewerDataModel.Instance.AngleValue = MathSet.returnAngleString(control.StartPoint, ref tempPoint, true);
|
|
| 1683 |
control.EndPoint = tempPoint;
|
|
| 1684 |
}
|
|
| 1685 |
else
|
|
| 1686 |
{
|
|
| 1687 |
ViewerDataModel.Instance.AngleValue = MathSet.returnAngleString(control.StartPoint, ref tempPoint, false);
|
|
| 1688 |
}
|
|
| 1674 |
if (ViewerDataModel.Instance.checkAxis || ViewerDataModel.Instance.IsPressShift) |
|
| 1675 |
{
|
|
| 1676 |
//var AngleValue = MathSet.returnAngleString(control.StartPoint, ref tempPoint, true); |
|
| 1677 |
ViewerDataModel.Instance.AngleValue = MathSet.returnAngleString(control.StartPoint, ref tempPoint, true); |
|
| 1678 |
control.EndPoint = tempPoint; |
|
| 1679 |
} |
|
| 1680 |
else |
|
| 1681 |
{
|
|
| 1682 |
ViewerDataModel.Instance.AngleValue = MathSet.returnAngleString(control.StartPoint, ref tempPoint, false); |
|
| 1683 |
} |
|
| 1689 | 1684 |
|
| 1690 | 1685 |
|
| 1691 |
control.PointSet = new List<Point>
|
|
| 1686 |
control.PointSet = new List<Point> |
|
| 1692 | 1687 |
{
|
| 1693 | 1688 |
control.StartPoint, |
| 1694 | 1689 |
control.EndPoint, |
| 1695 | 1690 |
}; |
| 1696 |
} |
|
| 1697 |
//강인구 추가 |
|
| 1698 | 1691 |
control.DashSize = ViewerDataModel.Instance.DashSize; |
| 1699 | 1692 |
} |
| 1693 |
|
|
| 1694 |
|
|
| 1700 | 1695 |
} |
| 1701 | 1696 |
break; |
| 1702 | 1697 |
|
| 1703 | 1698 |
case ControlType.ArrowLine: |
| 1704 | 1699 |
{
|
| 1705 |
if (currentControl != null) |
|
| 1700 |
var control = currentControl as LineControl; |
|
| 1701 |
if (control != null) |
|
| 1706 | 1702 |
{
|
| 1707 |
var control = currentControl as LineControl; |
|
| 1708 | 1703 |
control.LineStyleSet = LineStyleSet.ArrowLine; |
| 1709 | 1704 |
control.ControlType = controlType; |
| 1710 |
if (control != null) |
|
| 1711 |
{
|
|
| 1712 |
control.StartPoint = new Point(canvasDrawingMouseDownPoint.X, canvasDrawingMouseDownPoint.Y); |
|
| 1713 |
control.EndPoint = new Point(currentCanvasDrawingMouseMovePoint.X, currentCanvasDrawingMouseMovePoint.Y); |
|
| 1714 |
Point tempPoint = control.EndPoint; |
|
| 1705 |
control.StartPoint = new Point(canvasDrawingMouseDownPoint.X, canvasDrawingMouseDownPoint.Y); |
|
| 1706 |
control.EndPoint = new Point(currentCanvasDrawingMouseMovePoint.X, currentCanvasDrawingMouseMovePoint.Y); |
|
| 1707 |
Point tempPoint = control.EndPoint; |
|
| 1715 | 1708 |
|
| 1716 |
if (ViewerDataModel.Instance.checkAxis || ViewerDataModel.Instance.IsPressShift)
|
|
| 1717 |
{
|
|
| 1718 |
//var AngleValue = MathSet.returnAngleString(control.StartPoint, ref tempPoint, true);
|
|
| 1719 |
ViewerDataModel.Instance.AngleValue = MathSet.returnAngleString(control.StartPoint, ref tempPoint, true);
|
|
| 1720 |
control.EndPoint = tempPoint;
|
|
| 1721 |
}
|
|
| 1722 |
else
|
|
| 1723 |
{
|
|
| 1724 |
ViewerDataModel.Instance.AngleValue = MathSet.returnAngleString(control.StartPoint, ref tempPoint, false);
|
|
| 1725 |
}
|
|
| 1709 |
if (ViewerDataModel.Instance.checkAxis || ViewerDataModel.Instance.IsPressShift) |
|
| 1710 |
{
|
|
| 1711 |
//var AngleValue = MathSet.returnAngleString(control.StartPoint, ref tempPoint, true); |
|
| 1712 |
ViewerDataModel.Instance.AngleValue = MathSet.returnAngleString(control.StartPoint, ref tempPoint, true); |
|
| 1713 |
control.EndPoint = tempPoint; |
|
| 1714 |
} |
|
| 1715 |
else |
|
| 1716 |
{
|
|
| 1717 |
ViewerDataModel.Instance.AngleValue = MathSet.returnAngleString(control.StartPoint, ref tempPoint, false); |
|
| 1718 |
} |
|
| 1726 | 1719 |
|
| 1727 | 1720 |
|
| 1728 |
control.PointSet = new List<Point>
|
|
| 1721 |
control.PointSet = new List<Point> |
|
| 1729 | 1722 |
{
|
| 1730 | 1723 |
control.StartPoint, |
| 1731 | 1724 |
control.EndPoint, |
| 1732 | 1725 |
}; |
| 1733 |
} |
|
| 1734 |
//강인구 추가 |
|
| 1735 | 1726 |
control.DashSize = ViewerDataModel.Instance.DashSize; |
| 1736 | 1727 |
} |
| 1737 |
|
|
| 1738 | 1728 |
} |
| 1739 | 1729 |
break; |
| 1740 | 1730 |
|
| 1741 | 1731 |
case ControlType.TwinLine: |
| 1742 | 1732 |
{
|
| 1743 |
if (currentControl != null) |
|
| 1733 |
var control = currentControl as LineControl; |
|
| 1734 |
if (control != null) |
|
| 1744 | 1735 |
{
|
| 1745 |
var control = currentControl as LineControl; |
|
| 1746 | 1736 |
control.LineStyleSet = LineStyleSet.TwinLine; |
| 1747 | 1737 |
control.ControlType = controlType; |
| 1748 |
if (control != null) |
|
| 1749 |
{
|
|
| 1750 |
control.StartPoint = new Point(canvasDrawingMouseDownPoint.X, canvasDrawingMouseDownPoint.Y); |
|
| 1751 |
control.EndPoint = new Point(currentCanvasDrawingMouseMovePoint.X, currentCanvasDrawingMouseMovePoint.Y); |
|
| 1752 |
Point tempPoint = control.EndPoint; |
|
| 1738 |
control.StartPoint = new Point(canvasDrawingMouseDownPoint.X, canvasDrawingMouseDownPoint.Y); |
|
| 1739 |
control.EndPoint = new Point(currentCanvasDrawingMouseMovePoint.X, currentCanvasDrawingMouseMovePoint.Y); |
|
| 1740 |
Point tempPoint = control.EndPoint; |
|
| 1753 | 1741 |
|
| 1754 |
if (ViewerDataModel.Instance.checkAxis || ViewerDataModel.Instance.IsPressShift)
|
|
| 1755 |
{
|
|
| 1756 |
//var AngleValue = MathSet.returnAngleString(control.StartPoint, ref tempPoint, true);
|
|
| 1757 |
ViewerDataModel.Instance.AngleValue = MathSet.returnAngleString(control.StartPoint, ref tempPoint, true);
|
|
| 1758 |
control.EndPoint = tempPoint;
|
|
| 1759 |
}
|
|
| 1760 |
else
|
|
| 1761 |
{
|
|
| 1762 |
ViewerDataModel.Instance.AngleValue = MathSet.returnAngleString(control.StartPoint, ref tempPoint, false);
|
|
| 1763 |
}
|
|
| 1742 |
if (ViewerDataModel.Instance.checkAxis || ViewerDataModel.Instance.IsPressShift) |
|
| 1743 |
{
|
|
| 1744 |
//var AngleValue = MathSet.returnAngleString(control.StartPoint, ref tempPoint, true); |
|
| 1745 |
ViewerDataModel.Instance.AngleValue = MathSet.returnAngleString(control.StartPoint, ref tempPoint, true); |
|
| 1746 |
control.EndPoint = tempPoint; |
|
| 1747 |
} |
|
| 1748 |
else |
|
| 1749 |
{
|
|
| 1750 |
ViewerDataModel.Instance.AngleValue = MathSet.returnAngleString(control.StartPoint, ref tempPoint, false); |
|
| 1751 |
} |
|
| 1764 | 1752 |
|
| 1765 | 1753 |
|
| 1766 |
control.PointSet = new List<Point>
|
|
| 1754 |
control.PointSet = new List<Point> |
|
| 1767 | 1755 |
{
|
| 1768 | 1756 |
control.StartPoint, |
| 1769 | 1757 |
control.EndPoint, |
| 1770 | 1758 |
}; |
| 1771 |
} |
|
| 1772 |
//강인구 추가 |
|
| 1773 | 1759 |
control.DashSize = ViewerDataModel.Instance.DashSize; |
| 1774 | 1760 |
} |
| 1775 |
|
|
| 1776 | 1761 |
} |
| 1777 | 1762 |
break; |
| 1778 | 1763 |
|
| 1779 | 1764 |
case ControlType.DimLine: |
| 1780 | 1765 |
{
|
| 1781 |
if (currentControl != null) |
|
| 1766 |
var control = currentControl as LineControl; |
|
| 1767 |
if (control != null) |
|
| 1782 | 1768 |
{
|
| 1783 |
var control = currentControl as LineControl; |
|
| 1784 | 1769 |
control.LineStyleSet = LineStyleSet.DimLine; |
| 1785 | 1770 |
control.ControlType = controlType; |
| 1786 |
if (control != null) |
|
| 1787 |
{
|
|
| 1788 |
control.StartPoint = new Point(canvasDrawingMouseDownPoint.X, canvasDrawingMouseDownPoint.Y); |
|
| 1789 |
control.EndPoint = new Point(currentCanvasDrawingMouseMovePoint.X, currentCanvasDrawingMouseMovePoint.Y); |
|
| 1790 |
Point tempPoint = control.EndPoint; |
|
| 1771 |
control.StartPoint = new Point(canvasDrawingMouseDownPoint.X, canvasDrawingMouseDownPoint.Y); |
|
| 1772 |
control.EndPoint = new Point(currentCanvasDrawingMouseMovePoint.X, currentCanvasDrawingMouseMovePoint.Y); |
|
| 1773 |
Point tempPoint = control.EndPoint; |
|
| 1791 | 1774 |
|
| 1792 |
if (ViewerDataModel.Instance.checkAxis || ViewerDataModel.Instance.IsPressShift)
|
|
| 1793 |
{
|
|
| 1794 |
//var AngleValue = MathSet.returnAngleString(control.StartPoint, ref tempPoint, true);
|
|
| 1795 |
ViewerDataModel.Instance.AngleValue = MathSet.returnAngleString(control.StartPoint, ref tempPoint, true);
|
|
| 1796 |
control.EndPoint = tempPoint;
|
|
| 1797 |
}
|
|
| 1798 |
else
|
|
| 1799 |
{
|
|
| 1800 |
ViewerDataModel.Instance.AngleValue = MathSet.returnAngleString(control.StartPoint, ref tempPoint, false);
|
|
| 1801 |
}
|
|
| 1775 |
if (ViewerDataModel.Instance.checkAxis || ViewerDataModel.Instance.IsPressShift) |
|
| 1776 |
{
|
|
| 1777 |
//var AngleValue = MathSet.returnAngleString(control.StartPoint, ref tempPoint, true); |
|
| 1778 |
ViewerDataModel.Instance.AngleValue = MathSet.returnAngleString(control.StartPoint, ref tempPoint, true); |
|
| 1779 |
control.EndPoint = tempPoint; |
|
| 1780 |
} |
|
| 1781 |
else |
|
| 1782 |
{
|
|
| 1783 |
ViewerDataModel.Instance.AngleValue = MathSet.returnAngleString(control.StartPoint, ref tempPoint, false); |
|
| 1784 |
} |
|
| 1802 | 1785 |
|
| 1803 |
control.PointSet = new List<Point>
|
|
| 1786 |
control.PointSet = new List<Point> |
|
| 1804 | 1787 |
{
|
| 1805 | 1788 |
control.StartPoint, |
| 1806 | 1789 |
control.EndPoint, |
| 1807 | 1790 |
}; |
| 1808 |
} |
|
| 1809 |
//강인구 추가 |
|
| 1810 | 1791 |
control.DashSize = ViewerDataModel.Instance.DashSize; |
| 1811 | 1792 |
} |
| 1812 |
|
|
| 1813 | 1793 |
} |
| 1814 | 1794 |
break; |
| 1815 | 1795 |
|
| ... | ... | |
| 1838 | 1818 |
} |
| 1839 | 1819 |
|
| 1840 | 1820 |
control.SetPolyPath(); |
| 1841 |
//movePoint.X = currentCanvasDrawingMouseMovePoint.X; |
|
| 1842 |
//movePoint.Y = currentCanvasDrawingMouseMovePoint.Y; |
|
| 1843 |
//control.PointC.pointSet.Add(new Point(currentCanvasDrawingMouseMovePoint.X,currentCanvasDrawingMouseMovePoint.Y)); |
|
| 1844 | 1821 |
|
| 1845 |
//강인구 추가 |
|
| 1846 | 1822 |
control.DashSize = ViewerDataModel.Instance.DashSize; |
| 1847 | 1823 |
} |
| 1848 | 1824 |
} |
| ... | ... | |
| 1850 | 1826 |
|
| 1851 | 1827 |
case ControlType.ArcLine: |
| 1852 | 1828 |
{
|
| 1853 |
if (currentControl != null) |
|
| 1829 |
var control = currentControl as ArcControl; |
|
| 1830 |
if (control != null) |
|
| 1854 | 1831 |
{
|
| 1855 |
var control = currentControl as ArcControl; |
|
| 1856 | 1832 |
control.isTransOn = false; |
| 1857 | 1833 |
control.ControlType = controlType; |
| 1834 |
control.StartPoint = new Point(canvasDrawingMouseDownPoint.X, canvasDrawingMouseDownPoint.Y); |
|
| 1835 |
control.MidPoint = new Point(0, 0); |
|
| 1836 |
control.EndPoint = new Point(currentCanvasDrawingMouseMovePoint.X, currentCanvasDrawingMouseMovePoint.Y); |
|
| 1837 |
Point tempPoint = control.EndPoint; |
|
| 1858 | 1838 |
|
| 1859 |
if (control != null)
|
|
| 1839 |
if (ViewerDataModel.Instance.checkAxis || ViewerDataModel.Instance.IsPressShift)
|
|
| 1860 | 1840 |
{
|
| 1861 |
control.StartPoint = new Point(canvasDrawingMouseDownPoint.X, canvasDrawingMouseDownPoint.Y); |
|
| 1862 |
control.MidPoint = new Point(0, 0); |
|
| 1863 |
control.EndPoint = new Point(currentCanvasDrawingMouseMovePoint.X, currentCanvasDrawingMouseMovePoint.Y); |
|
| 1864 |
Point tempPoint = control.EndPoint; |
|
| 1865 |
|
|
| 1866 |
if (ViewerDataModel.Instance.checkAxis || ViewerDataModel.Instance.IsPressShift) |
|
| 1867 |
{
|
|
| 1868 |
ViewerDataModel.Instance.AngleValue = MathSet.returnAngleString(control.StartPoint, ref tempPoint, true); |
|
| 1869 |
control.EndPoint = tempPoint; |
|
| 1870 |
} |
|
| 1871 |
else |
|
| 1872 |
{
|
|
| 1873 |
ViewerDataModel.Instance.AngleValue = MathSet.returnAngleString(control.StartPoint, ref tempPoint, false); |
|
| 1874 |
} |
|
| 1841 |
ViewerDataModel.Instance.AngleValue = MathSet.returnAngleString(control.StartPoint, ref tempPoint, true); |
|
| 1842 |
control.EndPoint = tempPoint; |
|
| 1843 |
} |
|
| 1844 |
else |
|
| 1845 |
{
|
|
| 1846 |
ViewerDataModel.Instance.AngleValue = MathSet.returnAngleString(control.StartPoint, ref tempPoint, false); |
|
| 1847 |
} |
|
| 1875 | 1848 |
|
| 1876 | 1849 |
|
| 1877 |
control.PointSet = new List<Point>
|
|
| 1850 |
control.PointSet = new List<Point> |
|
| 1878 | 1851 |
{
|
| 1879 | 1852 |
control.StartPoint, |
| 1880 | 1853 |
control.MidPoint, |
| 1881 | 1854 |
control.EndPoint, |
| 1882 | 1855 |
}; |
| 1883 |
} |
|
| 1884 |
//강인구 추가 |
|
| 1885 | 1856 |
control.DashSize = ViewerDataModel.Instance.DashSize; |
| 1886 | 1857 |
} |
| 1887 | 1858 |
|
| 1859 |
|
|
| 1888 | 1860 |
} |
| 1889 | 1861 |
break; |
| 1890 | 1862 |
|
| 1891 | 1863 |
case ControlType.ArcArrow: |
| 1892 | 1864 |
{
|
| 1893 |
if (currentControl != null) |
|
| 1865 |
var control = currentControl as ArcControl; |
|
| 1866 |
if (control != null) |
|
| 1894 | 1867 |
{
|
| 1895 |
var control = currentControl as ArcControl; |
|
| 1896 | 1868 |
control.isTransOn = true; |
| 1897 | 1869 |
control.ControlType = controlType; |
| 1898 |
|
|
| 1899 |
if (control != null) |
|
| 1870 |
if (move.mousemode == MouseMode.Drawing) |
|
| 1900 | 1871 |
{
|
| 1901 |
if (move.mousemode == MouseMode.Drawing) |
|
| 1902 |
{
|
|
| 1903 |
//move.control_Move(ControlList, true, moveX, moveY); |
|
| 1904 |
} |
|
| 1905 |
else |
|
| 1906 |
{
|
|
| 1907 |
control.StartPoint = new Point(canvasDrawingMouseDownPoint.X, canvasDrawingMouseDownPoint.Y); |
|
| 1908 |
control.MidPoint = new Point(0, 0); |
|
| 1909 |
control.EndPoint = new Point(currentCanvasDrawingMouseMovePoint.X, currentCanvasDrawingMouseMovePoint.Y); |
|
| 1910 |
} |
|
| 1872 |
//move.control_Move(ControlList, true, moveX, moveY); |
|
| 1873 |
} |
|
| 1874 |
else |
|
| 1875 |
{
|
|
| 1876 |
control.StartPoint = new Point(canvasDrawingMouseDownPoint.X, canvasDrawingMouseDownPoint.Y); |
|
| 1877 |
control.MidPoint = new Point(0, 0); |
|
| 1878 |
control.EndPoint = new Point(currentCanvasDrawingMouseMovePoint.X, currentCanvasDrawingMouseMovePoint.Y); |
|
| 1879 |
} |
|
| 1911 | 1880 |
|
| 1912 |
control.PointSet = new List<Point>
|
|
| 1881 |
control.PointSet = new List<Point> |
|
| 1913 | 1882 |
{
|
| 1914 | 1883 |
control.StartPoint, |
| 1915 | 1884 |
control.MidPoint, |
| 1916 | 1885 |
control.EndPoint, |
| 1917 | 1886 |
}; |
| 1918 |
} |
|
| 1919 |
//강인구 추가 |
|
| 1920 | 1887 |
control.DashSize = ViewerDataModel.Instance.DashSize; |
| 1921 | 1888 |
} |
| 1922 | 1889 |
} |
| ... | ... | |
| 1924 | 1891 |
|
| 1925 | 1892 |
case ControlType.ArrowMultiLine: |
| 1926 | 1893 |
{
|
| 1927 |
if (currentControl != null) |
|
| 1894 |
var control = currentControl as ArrowControl_Multi; |
|
| 1895 |
if (control != null) |
|
| 1928 | 1896 |
{
|
| 1929 |
var control = currentControl as ArrowControl_Multi;
|
|
| 1930 |
|
|
| 1931 |
if (control != null)
|
|
| 1897 |
control.EndPoint = new Point(currentCanvasDrawingMouseMovePoint.X, currentCanvasDrawingMouseMovePoint.Y);
|
|
| 1898 |
Point tempPoint = control.EndPoint; |
|
| 1899 |
if (control.MiddlePoint == new Point(0, 0))
|
|
| 1932 | 1900 |
{
|
| 1933 |
control.EndPoint = new Point(currentCanvasDrawingMouseMovePoint.X, currentCanvasDrawingMouseMovePoint.Y); |
|
| 1934 |
Point tempPoint = control.EndPoint; |
|
| 1935 |
if (control.MiddlePoint == new Point(0, 0)) |
|
| 1901 |
if (ViewerDataModel.Instance.checkAxis || ViewerDataModel.Instance.IsPressShift) |
|
| 1936 | 1902 |
{
|
| 1937 |
if (ViewerDataModel.Instance.checkAxis || ViewerDataModel.Instance.IsPressShift) |
|
| 1938 |
{
|
|
| 1939 |
ViewerDataModel.Instance.AngleValue = MathSet.returnAngleString(control.StartPoint, ref tempPoint, true); |
|
| 1940 |
//var AngleValue = MathSet.returnAngleString(control.StartPoint, ref tempPoint, true); |
|
| 1941 |
control.EndPoint = tempPoint; |
|
| 1942 |
} |
|
| 1943 |
else |
|
| 1944 |
{
|
|
| 1945 |
ViewerDataModel.Instance.AngleValue = MathSet.returnAngleString(control.StartPoint, ref tempPoint, false); |
|
| 1946 |
} |
|
| 1903 |
ViewerDataModel.Instance.AngleValue = MathSet.returnAngleString(control.StartPoint, ref tempPoint, true); |
|
| 1904 |
//var AngleValue = MathSet.returnAngleString(control.StartPoint, ref tempPoint, true); |
|
| 1905 |
control.EndPoint = tempPoint; |
|
| 1947 | 1906 |
} |
| 1948 | 1907 |
else |
| 1949 | 1908 |
{
|
| 1950 |
if (ViewerDataModel.Instance.checkAxis || ViewerDataModel.Instance.IsPressShift) |
|
| 1951 |
{
|
|
| 1952 |
//var AngleValue = MathSet.returnAngleString(control.MiddlePoint, ref tempPoint, true); |
|
| 1953 |
ViewerDataModel.Instance.AngleValue = MathSet.returnAngleString(control.MiddlePoint, ref tempPoint, true); |
|
| 1954 |
control.EndPoint = tempPoint; |
|
| 1955 |
} |
|
| 1956 |
else |
|
| 1957 |
{
|
|
| 1958 |
ViewerDataModel.Instance.AngleValue = MathSet.returnAngleString(control.MiddlePoint, ref tempPoint, false); |
|
| 1959 |
} |
|
| 1960 |
|
|
| 1909 |
ViewerDataModel.Instance.AngleValue = MathSet.returnAngleString(control.StartPoint, ref tempPoint, false); |
|
| 1910 |
} |
|
| 1911 |
} |
|
| 1912 |
else |
|
| 1913 |
{
|
|
| 1914 |
if (ViewerDataModel.Instance.checkAxis || ViewerDataModel.Instance.IsPressShift) |
|
| 1915 |
{
|
|
| 1916 |
//var AngleValue = MathSet.returnAngleString(control.MiddlePoint, ref tempPoint, true); |
|
| 1917 |
ViewerDataModel.Instance.AngleValue = MathSet.returnAngleString(control.MiddlePoint, ref tempPoint, true); |
|
| 1918 |
control.EndPoint = tempPoint; |
|
| 1919 |
} |
|
| 1920 |
else |
|
| 1921 |
{
|
|
| 1922 |
ViewerDataModel.Instance.AngleValue = MathSet.returnAngleString(control.MiddlePoint, ref tempPoint, false); |
|
| 1961 | 1923 |
} |
| 1962 | 1924 |
|
| 1963 |
control.PointSet = new List<Point> |
|
| 1925 |
} |
|
| 1926 |
|
|
| 1927 |
control.PointSet = new List<Point> |
|
| 1964 | 1928 |
{
|
| 1965 | 1929 |
control.StartPoint, |
| 1966 | 1930 |
control.MiddlePoint, |
| 1967 | 1931 |
control.EndPoint, |
| 1968 | 1932 |
}; |
| 1969 |
|
|
| 1970 |
} |
|
| 1971 |
//강인구 추가 |
|
| 1972 | 1933 |
control.DashSize = ViewerDataModel.Instance.DashSize; |
| 1973 | 1934 |
} |
| 1974 |
|
|
| 1975 | 1935 |
} |
| 1976 | 1936 |
break; |
| 1977 | 1937 |
|
| ... | ... | |
| 2008 | 1968 |
control.TopRightPoint, |
| 2009 | 1969 |
}; |
| 2010 | 1970 |
} |
| 2011 |
//강인구 추가 |
|
| 1971 |
|
|
| 2012 | 1972 |
control.DashSize = ViewerDataModel.Instance.DashSize; |
| 2013 | 1973 |
control.Paint = ViewerDataModel.Instance.paintSet; |
| 2014 | 1974 |
|
| ... | ... | |
| 2075 | 2035 |
control.EndPoint, |
| 2076 | 2036 |
}; |
| 2077 | 2037 |
} |
| 2078 |
//강인구 추가 |
|
| 2038 |
|
|
| 2079 | 2039 |
control.DashSize = ViewerDataModel.Instance.DashSize; |
| 2080 | 2040 |
control.Paint = ViewerDataModel.Instance.paintSet; |
| 2081 | 2041 |
} |
내보내기 Unified diff
