개정판 a7bd032b
issue #000: boxsize 수정, 대림 테스트 접속 정보 작성
Change-Id: I216bb625f3695a48ade80330f26a4cb68f4f455d
| KCOM/Controls/AdornerFinal.xaml.cs | ||
|---|---|---|
| 638 | 638 |
double minX = double.MaxValue; |
| 639 | 639 |
double minY = double.MaxValue; |
| 640 | 640 |
double maxX = double.MinValue; |
| 641 |
double maxY = double.MinValue; |
|
| 642 |
|
|
| 641 |
double maxY = double.MinValue;
|
|
| 642 |
double LineSize = 0; |
|
| 643 | 643 |
if (this.Members.Count == 1) |
| 644 | 644 |
{
|
| 645 | 645 |
if (this.Members[0].DrawingData.GetType().Name == "TextControl") |
| ... | ... | |
| 660 | 660 |
foreach (var item in this.Members) |
| 661 | 661 |
{
|
| 662 | 662 |
UIElement currentControl = (item as AdornerMember).DrawingData; |
| 663 |
|
|
| 663 |
|
|
| 664 | 664 |
Point startP = (currentControl as IPath).StartPoint; |
| 665 | 665 |
Point endP = (currentControl as IPath).EndPoint; |
| 666 | 666 |
|
| ... | ... | |
| 747 | 747 |
else if (currentControl is CircleControl CircleCtrl) |
| 748 | 748 |
{
|
| 749 | 749 |
List<Point> am = CircleCtrl.PointSet; |
| 750 |
LineSize = CircleCtrl.LineSize; |
|
| 750 | 751 |
minX = am.Min(x => x.X); |
| 751 | 752 |
minY = am.Min(x => x.Y); |
| 752 | 753 |
maxX = am.Max(x => x.X); |
| 753 | 754 |
maxY = am.Max(x => x.Y); |
| 754 | 755 |
} |
| 755 |
else |
|
| 756 |
else
|
|
| 756 | 757 |
{
|
| 758 |
if(item.DrawingData.GetType().Name == "TriControl") |
|
| 759 |
LineSize = ((MarkupToPDF.Controls.Shape.TriControl)currentControl).LineSize; |
|
| 760 |
else if(item.DrawingData.GetType().Name == "RectangleControl") |
|
| 761 |
LineSize = ((MarkupToPDF.Controls.Shape.RectangleControl)currentControl).LineSize; |
|
| 762 |
else if (item.DrawingData.GetType().Name == "RectCloudControl") |
|
| 763 |
LineSize = ((MarkupToPDF.Controls.Shape.RectCloudControl)currentControl).LineSize; |
|
| 764 |
else if (item.DrawingData.GetType().Name == "CloudControl") |
|
| 765 |
LineSize = ((MarkupToPDF.Controls.Polygon.CloudControl)currentControl).LineSize; |
|
| 766 |
else if (item.DrawingData.GetType().Name == "PolygonControl") |
|
| 767 |
LineSize = ((MarkupToPDF.Controls.Polygon.PolygonControl)currentControl).LineSize; |
|
| 768 |
|
|
| 757 | 769 |
if ((currentControl as IPath).PathData.Bounds.Left < minX) minX = (currentControl as IPath).PathData.Bounds.Left; |
| 758 | 770 |
if ((currentControl as IPath).PathData.Bounds.Top < minY) minY = (currentControl as IPath).PathData.Bounds.Top; |
| 759 | 771 |
if ((currentControl as IPath).PathData.Bounds.Right > maxX) maxX = (currentControl as IPath).PathData.Bounds.Right; |
| ... | ... | |
| 775 | 787 |
addHeightSize = true; |
| 776 | 788 |
} |
| 777 | 789 |
BorderSize = ac; |
| 790 |
ac.Width += LineSize; |
|
| 791 |
ac.Height += LineSize; |
|
| 778 | 792 |
AdornerBorder.MinWidth = 10; |
| 779 | 793 |
AdornerBorder.MinHeight = 10; |
| 780 | 794 |
AdornerBorder.Width = ac.Width; |
| 781 | 795 |
AdornerBorder.Height = ac.Height; |
| 796 |
|
|
| 797 |
minX -= LineSize / 2; |
|
| 798 |
minY -= LineSize / 2; |
|
| 782 | 799 |
Canvas.SetLeft(AdornerBorder, minX); |
| 783 | 800 |
Canvas.SetTop(AdornerBorder, minY); |
| 784 | 801 |
|
| KCOM/Views/MainMenu.xaml.cs | ||
|---|---|---|
| 2902 | 2902 |
if (e.LeftButton == MouseButtonState.Pressed) |
| 2903 | 2903 |
{
|
| 2904 | 2904 |
CanvasDrawingMouseDownPoint = e.GetPosition(drawingRotateCanvas); |
| 2905 |
canvasZoomPanningMouseDownPoint = e.GetPosition(zoomAndPanCanvas);
|
|
| 2906 |
|
|
| 2905 |
Point point = e.GetPosition(zoomAndPanCanvas);
|
|
| 2906 |
canvasZoomPanningMouseDownPoint = new Point(point.X - 99, point.Y - 99); |
|
| 2907 | 2907 |
this.cursor = new Cursor(App.DefaultArrowCursorStream); |
| 2908 | 2908 |
SetCursor(); |
| 2909 | 2909 |
|
| ... | ... | |
| 3458 | 3458 |
{
|
| 3459 | 3459 |
currentControl = new TriControl |
| 3460 | 3460 |
{
|
| 3461 |
StartPoint = new Point(CanvasDrawingMouseDownPoint.X, CanvasDrawingMouseDownPoint.Y),
|
|
| 3461 |
StartPoint = new Point(CanvasDrawingMouseDownPoint.X - 100, CanvasDrawingMouseDownPoint.Y-100),
|
|
| 3462 | 3462 |
Background = new SolidColorBrush(Colors.Black), |
| 3463 | 3463 |
}; |
| 3464 | 3464 |
|
내보내기 Unified diff
