From 578c521364d739d167cd61ecd9b93c41ca862806 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9F=D0=B0=D0=B2=D0=B5=D0=BB=20=D0=9F=D1=83=D1=82=D0=B8?= =?UTF-8?q?=D0=BB=D0=B8=D0=BD?= Date: Sun, 30 Oct 2022 13:58:30 +0400 Subject: [PATCH] Fix --- .../AirplaneWithRadar/DrawingAirplane.cs | 37 ++++++++++--------- 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/AirplaneWithRadar/AirplaneWithRadar/DrawingAirplane.cs b/AirplaneWithRadar/AirplaneWithRadar/DrawingAirplane.cs index 263c994..c0a6314 100644 --- a/AirplaneWithRadar/AirplaneWithRadar/DrawingAirplane.cs +++ b/AirplaneWithRadar/AirplaneWithRadar/DrawingAirplane.cs @@ -33,7 +33,7 @@ namespace AirplaneWithRadar /// /// Высота отрисовки самолёта /// - private readonly int _airplaneHeight = 10; + private readonly int _airplaneHeight = 20; /// /// Инициализация свойств /// @@ -120,38 +120,39 @@ namespace AirplaneWithRadar } Pen pen = new(Color.Black); Brush brush = new SolidBrush(Airplane.BodyColor); + int h = 10; + _startPosY += 4; //корпус - g.DrawRectangle(pen, _startPosX, _startPosY + _airplaneHeight-7, - _airplaneWidth-5, _airplaneHeight); + g.DrawRectangle(pen, _startPosX, _startPosY + h - 7, _airplaneWidth - 15, h); //нос PointF[] point = new PointF[3]; - point[0] = new PointF(_startPosX + _airplaneWidth-5, _startPosY + _airplaneHeight / 3); - point[1] = new PointF(_startPosX + _airplaneWidth+10 , _startPosY + _airplaneHeight-3); - point[2] = new PointF(_startPosX + _airplaneWidth-5, _startPosY + _airplaneHeight + (_airplaneHeight / 3)); + point[0] = new PointF(_startPosX + _airplaneWidth - 15, _startPosY + h / 3); + point[1] = new PointF(_startPosX + _airplaneWidth, _startPosY + h - 3); + point[2] = new PointF(_startPosX + _airplaneWidth - 15, _startPosY + h + (h / 3)); g.FillPolygon(brush, point); //хвост point = new PointF[3]; - point[0] = new PointF(_startPosX, _startPosY-10); - point[1] = new PointF(_startPosX, _startPosY + _airplaneHeight / 3); - point[2] = new PointF(_startPosX + 15, _startPosY + _airplaneHeight / 3); + point[0] = new PointF(_startPosX, _startPosY - 10); + point[1] = new PointF(_startPosX, _startPosY + h / 3); + point[2] = new PointF(_startPosX + 15, _startPosY + h / 3); g.FillPolygon(brush, point); //крылья - g.DrawLine(pen, _startPosX + 20, _startPosY + _airplaneHeight - 3, _startPosX + 60, _startPosY + _airplaneHeight - 3); - g.DrawLine(pen, _startPosX + 20, _startPosY + _airplaneHeight - 2, _startPosX + 60, _startPosY + _airplaneHeight - 2); + g.DrawLine(pen, _startPosX + 20, _startPosY + h - 3, _startPosX + 60, _startPosY + h - 3); + g.DrawLine(pen, _startPosX + 20, _startPosY + h - 2, _startPosX + 60, _startPosY + h - 2); - g.DrawLine(pen, _startPosX-1, _startPosY + _airplaneHeight / 3, _startPosX + 15, _startPosY + _airplaneHeight / 3); - g.DrawLine(pen, _startPosX-1, _startPosY + _airplaneHeight / 3 + 1, _startPosX + 15, _startPosY + _airplaneHeight / 3 + 1); - g.DrawLine(pen, _startPosX-1, _startPosY + _airplaneHeight / 3 + 2, _startPosX + 15, _startPosY + _airplaneHeight / 3 + 2); + g.DrawLine(pen, _startPosX - 1, _startPosY + h / 3, _startPosX + 15, _startPosY + h / 3); + g.DrawLine(pen, _startPosX - 1, _startPosY + h / 3 + 1, _startPosX + 15, _startPosY + h / 3 + 1); + g.DrawLine(pen, _startPosX - 1, _startPosY + h / 3 + 2, _startPosX + 15, _startPosY + h / 3 + 2); //колёса - g.DrawRectangle(pen, _startPosX + 20, _startPosY + _airplaneHeight + (_airplaneHeight / 3), 2, 2); - g.DrawRectangle(pen, _startPosX + 24, _startPosY + _airplaneHeight + (_airplaneHeight / 3), 2, 2); - g.DrawRectangle(pen, _startPosX + _airplaneWidth-20, _startPosY + _airplaneHeight + (_airplaneHeight / 3), 2, 2); - + g.DrawRectangle(pen, _startPosX + 20, _startPosY + h + (h / 3), 2, 2); + g.DrawRectangle(pen, _startPosX + 24, _startPosY + h + (h / 3), 2, 2); + g.DrawRectangle(pen, _startPosX + _airplaneWidth - 20, _startPosY + h + (h / 3), 2, 2); + _startPosY -= 4; } /// /// Смена границ формы отрисовки