From d888f534e7e18badeac16be8ece55a81f9ecde75 Mon Sep 17 00:00:00 2001 From: "pyzhov.egor" <142977368+nxf1ve@users.noreply.github.com> Date: Fri, 9 Feb 2024 23:06:37 +0400 Subject: [PATCH] =?UTF-8?q?=D1=83=D0=BB=D1=83=D1=87=D1=88=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D0=B5=20=D1=80=D0=B8=D1=81=D1=83=D0=BD=D0=BA=D0=B0,=20?= =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20?= =?UTF-8?q?=D0=BF=D0=B0=D1=80=D1=83=D1=81=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Lab01_Java/src/Main.java | 0 .../ProjectCatamaran/DrawingCatamaran.cs | 47 ++++++++++--------- .../ProjectCatamaran/EntityCatamaran.cs | 8 ++-- 3 files changed, 29 insertions(+), 26 deletions(-) delete mode 100644 Lab01_Java/src/Main.java diff --git a/Lab01_Java/src/Main.java b/Lab01_Java/src/Main.java deleted file mode 100644 index e69de29..0000000 diff --git a/ProjectCatamaran/ProjectCatamaran/DrawingCatamaran.cs b/ProjectCatamaran/ProjectCatamaran/DrawingCatamaran.cs index 1b66fe0..10c651b 100644 --- a/ProjectCatamaran/ProjectCatamaran/DrawingCatamaran.cs +++ b/ProjectCatamaran/ProjectCatamaran/DrawingCatamaran.cs @@ -153,6 +153,7 @@ public class DrawingCatamaran }; g.FillPolygon(additionalBrush, Float); + g.DrawPolygon(Pens.Black, Float); } /// /// Прорисовка объекта @@ -167,49 +168,51 @@ public class DrawingCatamaran } Pen pen = new(Color.Black); - Brush additionalBrush = new SolidBrush(EntityCatamaran.AdditionalColor); + Brush BodyBrush = new SolidBrush(EntityCatamaran.BodyColor); + Brush additionalBrush = new SolidBrush(EntityCatamaran.AdditionalColor); + Pen additionalPen = new(EntityCatamaran.AdditionalColor, 2); // границы катамарана Point[] catamaranBorders = new Point[] { new Point(_startPosX.Value + 10, _startPosY.Value + 10), - new Point(_startPosX.Value + 90, _startPosY.Value + 10), - new Point(_startPosX.Value + 117, _startPosY.Value + 25), - new Point(_startPosX.Value + 90, _startPosY.Value + 40), - new Point(_startPosX.Value + 10, _startPosY.Value + 40), + new Point(_startPosX.Value + 80, _startPosY.Value + 10), + new Point(_startPosX.Value + 107, _startPosY.Value + 30), + new Point(_startPosX.Value + 80, _startPosY.Value + 45), + new Point(_startPosX.Value + 10, _startPosY.Value + 45), }; - g.DrawPolygon(pen, catamaranBorders); - - g.DrawEllipse(pen, _startPosX.Value + 15, _startPosY.Value + 14, 73, 22); + g.DrawPolygon(pen, catamaranBorders); + g.FillPolygon(BodyBrush, catamaranBorders); - if(EntityCatamaran.Floats) + g.DrawEllipse(pen, _startPosX.Value + 17, _startPosY.Value + 14, 65, 27); + g.FillEllipse(Brushes.White, _startPosX.Value + 17, _startPosY.Value + 14, 65, 27); + + if(EntityCatamaran.Floaters) { g.DrawLine(pen, _startPosX.Value + 20, _startPosY.Value + 10, _startPosX.Value + 20, _startPosY.Value + 7); g.DrawLine(pen, _startPosX.Value + 80, _startPosY.Value + 10, _startPosX.Value + 80, _startPosY.Value + 7); - g.DrawLine(pen, _startPosX.Value + 20, _startPosY.Value + 40, _startPosX.Value + 20, _startPosY.Value + 43); - g.DrawLine(pen, _startPosX.Value + 80, _startPosY.Value + 40, _startPosX.Value + 80, _startPosY.Value + 43); + g.DrawLine(pen, _startPosX.Value + 20, _startPosY.Value + 45, _startPosX.Value + 20, _startPosY.Value + 48); + g.DrawLine(pen, _startPosX.Value + 80, _startPosY.Value + 45, _startPosX.Value + 80, _startPosY.Value + 48); DrawFloat(1, additionalBrush, g); - DrawFloat(43, additionalBrush, g); + DrawFloat(48, additionalBrush, g); } if (EntityCatamaran.Sail) { - Pen thickPen = new(Color.Black, 3); - g.DrawLine(thickPen, _startPosX.Value + 40, _startPosY.Value + 22, _startPosX.Value + 40, _startPosY.Value + 28); Point[] Sail = new Point[] { - new Point(_startPosX.Value + 41, _startPosY.Value + 8), - new Point(_startPosX.Value + 41, _startPosY.Value + 40), - new Point(_startPosX.Value + 46, _startPosY.Value + 36), - new Point(_startPosX.Value + 46, _startPosY.Value + 12), - new Point(_startPosX.Value + 41, _startPosY.Value + 8), - + new Point(_startPosX.Value + 50, _startPosY.Value + 35), + new Point(_startPosX.Value + 35, _startPosY.Value + 29), + new Point(_startPosX.Value + 35, _startPosY.Value + 14), + new Point(_startPosX.Value + 50, _startPosY.Value + 8), + new Point(_startPosX.Value + 50, _startPosY.Value + 33), }; g.FillPolygon(additionalBrush, Sail); + g.DrawPolygon(pen, Sail); } - - + + } } \ No newline at end of file diff --git a/ProjectCatamaran/ProjectCatamaran/EntityCatamaran.cs b/ProjectCatamaran/ProjectCatamaran/EntityCatamaran.cs index 92ef2df..74968eb 100644 --- a/ProjectCatamaran/ProjectCatamaran/EntityCatamaran.cs +++ b/ProjectCatamaran/ProjectCatamaran/EntityCatamaran.cs @@ -25,7 +25,7 @@ public class EntityCatamaran /// /// Признак наличия поплавков слева и справа /// - public bool Floats { get; private set; } + public bool Floaters { get; private set; } public bool Sail { get; private set; } @@ -41,15 +41,15 @@ public class EntityCatamaran /// вес /// основной цвет /// доп цвет для паурса и поплавков - /// наличие поплавков + /// наличие поплавков /// наличие паруса - public void Init(int speed, double weight, Color bodyColor, Color additionalColor, bool floats, bool sail) + public void Init(int speed, double weight, Color bodyColor, Color additionalColor, bool floaters, bool sail) { Speed = speed; Weight = weight; BodyColor = bodyColor; AdditionalColor = additionalColor; - Floats = floats; + Floaters = floaters; Sail = sail; }