From 41f1398da6ebafb57f6c475c082607794686803c Mon Sep 17 00:00:00 2001 From: "yuliya.mavrina@internet.ru" Date: Sat, 14 Oct 2023 18:26:14 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9B=D0=B0=D0=B1=D0=BE=D1=80=D0=B0=D1=82?= =?UTF-8?q?=D0=BE=D1=80=D0=BD=D0=B0=D1=8F=20=E2=84=962.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DrawningObjects/DrawningBus.cs | 29 +++---------------- .../DrawningDoubleDeckerBus.cs | 1 - 2 files changed, 4 insertions(+), 26 deletions(-) diff --git a/DoubleDeckerBus/DoubleDeckerBus/DrawningObjects/DrawningBus.cs b/DoubleDeckerBus/DoubleDeckerBus/DrawningObjects/DrawningBus.cs index 38d1741..7940935 100644 --- a/DoubleDeckerBus/DoubleDeckerBus/DrawningObjects/DrawningBus.cs +++ b/DoubleDeckerBus/DoubleDeckerBus/DrawningObjects/DrawningBus.cs @@ -113,48 +113,27 @@ namespace DoubleDeckerBus.DrawningObjects Pen pen = new(Color.Black); - //границы автобсуса + g.DrawRectangle(pen, _startPosX - 1, _startPosY + 11, 100, 30); Brush brBodyColor = new SolidBrush(EntityBus.BodyColor); g.FillRectangle(brBodyColor, _startPosX, _startPosY + 10, 100, 30); - //Дверь + g.DrawRectangle(pen, _startPosX + 30, _startPosY + 20, 10, 20); Brush brBlack = new SolidBrush(Color.Black); g.FillRectangle(brBlack, _startPosX + 30, _startPosY + 20, 10, 20); - //Колеса + g.DrawEllipse(pen, _startPosX + 7, _startPosY + 35, 10, 10); g.DrawEllipse(pen, _startPosX + 77, _startPosY + 35, 10, 10); g.FillEllipse(brBlack, _startPosX + 7, _startPosY + 35, 10, 10); g.FillEllipse(brBlack, _startPosX + 77, _startPosY + 35, 10, 10); - //окна Brush brBlue = new SolidBrush(Color.Blue); g.FillEllipse(brBlue, _startPosX + 10, _startPosY + 15, 10, 15); g.FillEllipse(brBlue, _startPosX + 50, _startPosY + 15, 10, 15); g.FillEllipse(brBlue, _startPosX + 70, _startPosY + 15, 10, 15); - g.FillEllipse(brBlue, _startPosX + 90, _startPosY + 15, 10, 15); - - //g.DrawRectangle(pen, _startPosX - 1, _startPosY + 11, 100, 30); - //Brush brBodyColor = new SolidBrush(EntityBus.BodyColor); - //g.FillRectangle(brBodyColor, _startPosX, _startPosY + 10, 100, 30); - - //g.DrawRectangle(pen, _startPosX + 30, _startPosY + 20, 10, 20); - //Brush brBlack = new SolidBrush(Color.Black); - //g.FillRectangle(brBlack, _startPosX + 30, _startPosY + 20, 10, 20); - - //g.DrawEllipse(pen, _startPosX + 7, _startPosY + 35, 10, 10); - //g.DrawEllipse(pen, _startPosX + 77, _startPosY + 35, 10, 10); - //g.FillEllipse(brBlack, _startPosX + 7, _startPosY + 35, 10, 10); - //g.FillEllipse(brBlack, _startPosX + 77, _startPosY + 35, 10, 10); - - //Brush brBlue = new SolidBrush(Color.Blue); - //g.FillEllipse(brBlue, _startPosX + 10, _startPosY + 15, 10, 15); - //g.FillEllipse(brBlue, _startPosX + 50, _startPosY + 15, 10, 15); - //g.FillEllipse(brBlue, _startPosX + 70, _startPosY + 15, 10, 15); - //g.FillEllipse(brBlue, _startPosX + 90, _startPosY + 15, 10, 15); + g.FillEllipse(brBlue, _startPosX + 90, _startPosY + 15, 10, 15); } - } } diff --git a/DoubleDeckerBus/DoubleDeckerBus/DrawningObjects/DrawningDoubleDeckerBus.cs b/DoubleDeckerBus/DoubleDeckerBus/DrawningObjects/DrawningDoubleDeckerBus.cs index 38a86a2..6a7cd3c 100644 --- a/DoubleDeckerBus/DoubleDeckerBus/DrawningObjects/DrawningDoubleDeckerBus.cs +++ b/DoubleDeckerBus/DoubleDeckerBus/DrawningObjects/DrawningDoubleDeckerBus.cs @@ -41,7 +41,6 @@ namespace DoubleDeckerBus.DrawningObjects g.DrawRectangle(pen, _startPosX + 30, _startPosY + 20, 10, 20); g.FillRectangle(brBlack, _startPosX + 30, _startPosY + 20, 10, 20); - g.FillEllipse(brBlue, _startPosX + 10, _startPosY + 15, 10, 15); g.FillEllipse(brBlue, _startPosX + 50, _startPosY + 15, 10, 15); g.FillEllipse(brBlue, _startPosX + 70, _startPosY + 15, 10, 15);