From ef97c035adc00117126ade896184d616e1e9f6f3 Mon Sep 17 00:00:00 2001 From: Nikita Date: Thu, 13 Feb 2025 19:47:39 +0400 Subject: [PATCH 1/9] =?UTF-8?q?=D0=BF=D0=BE=D0=BC=D0=B5=D0=BD=D1=8F=20?= =?UTF-8?q?=D0=BD=D0=B0=D0=B7=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D0=BF=D0=B0?= =?UTF-8?q?=D1=80=D0=B0=D0=BC=D0=B5=D1=82=D1=80=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ProjectCatamaran/ProjectCatamaran/DrawningCatamaran.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ProjectCatamaran/ProjectCatamaran/DrawningCatamaran.cs b/ProjectCatamaran/ProjectCatamaran/DrawningCatamaran.cs index 6266ca6..1762aa1 100644 --- a/ProjectCatamaran/ProjectCatamaran/DrawningCatamaran.cs +++ b/ProjectCatamaran/ProjectCatamaran/DrawningCatamaran.cs @@ -47,11 +47,11 @@ public class DrawningCatamaran /// Основной цвет /// Дополнительный цвет(для опциональных элементов) /// Признак (опция) наличие плавников - /// Признак (опция) наличие парус - public void Init(int speed, double weight, Color bodyColor, Color additionalColor, bool floats, bool brush) + /// Признак (опция) наличие парус + public void Init(int speed, double weight, Color bodyColor, Color additionalColor, bool floats, bool sail) { EntityCatamaran = new EntityCatamaran(); - EntityCatamaran.Init(speed, weight, bodyColor, additionalColor, floats, brush); + EntityCatamaran.Init(speed, weight, bodyColor, additionalColor, floats, sail); _pictureWidth = null; _pictureHeight = null; From 4a835f6a164b2c6e282f64e976a03d7ccda93811 Mon Sep 17 00:00:00 2001 From: Nikita Date: Fri, 14 Feb 2025 23:09:02 +0400 Subject: [PATCH 2/9] =?UTF-8?q?=D0=BF=D0=BE=D0=BC=D0=B5=D0=BD=D1=8F=D0=BB?= =?UTF-8?q?=20=D0=BA=D0=BE=D0=BC=D0=BC=D0=BD=D1=82=D0=B0=D1=80=D0=B8=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ProjectCatamaran/ProjectCatamaran/EntityCatamaran.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ProjectCatamaran/ProjectCatamaran/EntityCatamaran.cs b/ProjectCatamaran/ProjectCatamaran/EntityCatamaran.cs index afceb4b..61d027e 100644 --- a/ProjectCatamaran/ProjectCatamaran/EntityCatamaran.cs +++ b/ProjectCatamaran/ProjectCatamaran/EntityCatamaran.cs @@ -1,6 +1,6 @@ namespace ProjectCatamaran; /// -/// Класс-сущность "Авто поезд" +/// Класс-сущность "Катамаран" /// public class EntityCatamaran { From 432fe934aa34b9377b6d39dbdab382def2a6ae7f Mon Sep 17 00:00:00 2001 From: nikskob Date: Sat, 22 Feb 2025 15:37:03 +0400 Subject: [PATCH 3/9] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8=D1=82?= =?UTF-8?q?=D1=8C=20ProjectCatamaran/ProjectCatamaran/MovementStrategy/Mov?= =?UTF-8?q?eableBoat.cs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fix --- .../ProjectCatamaran/MovementStrategy/MoveableBoat.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ProjectCatamaran/ProjectCatamaran/MovementStrategy/MoveableBoat.cs b/ProjectCatamaran/ProjectCatamaran/MovementStrategy/MoveableBoat.cs index b7b8f69..bf63e73 100644 --- a/ProjectCatamaran/ProjectCatamaran/MovementStrategy/MoveableBoat.cs +++ b/ProjectCatamaran/ProjectCatamaran/MovementStrategy/MoveableBoat.cs @@ -12,7 +12,7 @@ namespace ProjectCatamaran.MovementStrategy /// /// Поле-объект класса DrawningBoat или его наследника /// - private DrawningBoat _boat = null; + private readonly DrawningBoat? _boat = null; /// /// Конструктор /// From 7f00fa01bb5c7c71a659e9d74126b0d5624fb789 Mon Sep 17 00:00:00 2001 From: nikskob Date: Sat, 22 Feb 2025 17:35:05 +0400 Subject: [PATCH 4/9] somefixes --- ProjectCatamaran/ProjectCatamaran/Entities/EntityBoat.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ProjectCatamaran/ProjectCatamaran/Entities/EntityBoat.cs b/ProjectCatamaran/ProjectCatamaran/Entities/EntityBoat.cs index ce7a393..442dbc3 100644 --- a/ProjectCatamaran/ProjectCatamaran/Entities/EntityBoat.cs +++ b/ProjectCatamaran/ProjectCatamaran/Entities/EntityBoat.cs @@ -14,11 +14,11 @@ public class EntityBoat /// /// Скорость /// - public int Speed { get; set; } + public int Speed { get;private set; } /// /// Вес авто /// - public double Weight { get; set; } + public double Weight { get;private set; } /// /// Основной цвет /// From 4a4c658554820c82099c5585384ad98bc3b844de Mon Sep 17 00:00:00 2001 From: Nikita Date: Sat, 22 Feb 2025 21:22:03 +0400 Subject: [PATCH 5/9] some fixes --- .../Drawnings/DrawningBoat.cs | 32 +++++++++---------- .../MovementStrategy/MoveToBorder.cs | 4 +-- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/ProjectCatamaran/ProjectCatamaran/Drawnings/DrawningBoat.cs b/ProjectCatamaran/ProjectCatamaran/Drawnings/DrawningBoat.cs index 8bcf450..34ae17d 100644 --- a/ProjectCatamaran/ProjectCatamaran/Drawnings/DrawningBoat.cs +++ b/ProjectCatamaran/ProjectCatamaran/Drawnings/DrawningBoat.cs @@ -32,11 +32,11 @@ public class DrawningBoat /// /// Ширина прорисовки катамарана /// - private readonly int _drawningCatamaranWidth = 60; + private readonly int _drawningBoatWidth = 60; /// /// Высота прорисовки катамарана /// - private readonly int _drawningCatamaranHeight = 25; + private readonly int _drawningBoatHeight = 22; /// /// координата х обьекта /// @@ -48,11 +48,11 @@ public class DrawningBoat /// /// ширина обьекта /// - public int GetWidth => _drawningCatamaranWidth; + public int GetWidth => _drawningBoatWidth; /// /// высота обьекта /// - public int GetHeight => _drawningCatamaranHeight; + public int GetHeight => _drawningBoatHeight; /// /// пустой конструктор @@ -78,12 +78,12 @@ public class DrawningBoat /// /// Конструктор /// - /// Ширина катера - /// высота катера - public DrawningBoat(int drawningCatamaranWidth, int drawningCatamaranHeight) : this() + /// Ширина катера + /// высота катера + public DrawningBoat(int drawningBoatWidth, int drawningBoatHeight) : this() { - _drawningCatamaranWidth = drawningCatamaranWidth; - _drawningCatamaranHeight = drawningCatamaranHeight; + _drawningBoatWidth = drawningBoatWidth; + _drawningBoatHeight = drawningBoatHeight; } /// @@ -94,7 +94,7 @@ public class DrawningBoat /// public bool SetPictureSize(int width, int height) { - if (_drawningCatamaranHeight < height && _drawningCatamaranWidth < width) + if (_drawningBoatHeight < height && _drawningBoatWidth < width) { _pictureHeight = height; _pictureWidth = width; @@ -113,12 +113,12 @@ public class DrawningBoat { return; } - if (x > _pictureWidth - _drawningCatamaranWidth || x < 0) - _startPosX = x < 0 ? 0 : _pictureWidth - _drawningCatamaranWidth; + if (x > _pictureWidth - _drawningBoatWidth || x < 0) + _startPosX = x < 0 ? 0 : _pictureWidth - _drawningBoatWidth; else _startPosX = x; - if (y > _pictureHeight - _drawningCatamaranHeight || y < 0) - _startPosY = y < 0 ? 0 : _pictureHeight - _drawningCatamaranHeight; + if (y > _pictureHeight - _drawningBoatHeight || y < 0) + _startPosY = y < 0 ? 0 : _pictureHeight - _drawningBoatHeight; else _startPosY = y; } @@ -148,13 +148,13 @@ public class DrawningBoat } return true; case DirectionType.Right: - if (_startPosX.Value + (int)EntityBoat.Step + _drawningCatamaranWidth <= _pictureWidth) + if (_startPosX.Value + (int)EntityBoat.Step + _drawningBoatWidth <= _pictureWidth) { _startPosX += (int)EntityBoat.Step; } return true; case DirectionType.Down: - if (_startPosY.Value + (int)EntityBoat.Step + _drawningCatamaranHeight <= _pictureHeight) + if (_startPosY.Value + (int)EntityBoat.Step + _drawningBoatHeight <= _pictureHeight) { _startPosY += (int)EntityBoat.Step; } diff --git a/ProjectCatamaran/ProjectCatamaran/MovementStrategy/MoveToBorder.cs b/ProjectCatamaran/ProjectCatamaran/MovementStrategy/MoveToBorder.cs index ba16109..188f4f3 100644 --- a/ProjectCatamaran/ProjectCatamaran/MovementStrategy/MoveToBorder.cs +++ b/ProjectCatamaran/ProjectCatamaran/MovementStrategy/MoveToBorder.cs @@ -15,9 +15,9 @@ public class MoveToBorder : AbstractStrategy ObjectParameters? objParams = GetObjectParameters; if (objParams == null) return; - if (objParams.RightBorder + GetStep() < FieldWidth) + if (objParams.RightBorder + GetStep() <= FieldWidth) MoveRight(); - if (objParams.DownBorder + GetStep() < FieldHeight) + if (objParams.DownBorder + GetStep() <= FieldHeight) MoveDown(); } From 9fe56faa90fb90ad42a1fbdb5e25b227a04d4f49 Mon Sep 17 00:00:00 2001 From: Nikita Date: Sat, 22 Feb 2025 21:23:34 +0400 Subject: [PATCH 6/9] fixes --- .../ProjectCatamaran/MovementStrategy/MoveableBoat.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ProjectCatamaran/ProjectCatamaran/MovementStrategy/MoveableBoat.cs b/ProjectCatamaran/ProjectCatamaran/MovementStrategy/MoveableBoat.cs index b7b8f69..bf63e73 100644 --- a/ProjectCatamaran/ProjectCatamaran/MovementStrategy/MoveableBoat.cs +++ b/ProjectCatamaran/ProjectCatamaran/MovementStrategy/MoveableBoat.cs @@ -12,7 +12,7 @@ namespace ProjectCatamaran.MovementStrategy /// /// Поле-объект класса DrawningBoat или его наследника /// - private DrawningBoat _boat = null; + private readonly DrawningBoat? _boat = null; /// /// Конструктор /// From d9dff2745f04b46b1be795219fbdca59c50decb3 Mon Sep 17 00:00:00 2001 From: Nikita Date: Sat, 22 Feb 2025 22:43:37 +0400 Subject: [PATCH 7/9] Revert "some fixes" This reverts commit 4a4c658554820c82099c5585384ad98bc3b844de. --- .../Drawnings/DrawningBoat.cs | 32 +++++++++---------- .../MovementStrategy/MoveToBorder.cs | 4 +-- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/ProjectCatamaran/ProjectCatamaran/Drawnings/DrawningBoat.cs b/ProjectCatamaran/ProjectCatamaran/Drawnings/DrawningBoat.cs index 34ae17d..8bcf450 100644 --- a/ProjectCatamaran/ProjectCatamaran/Drawnings/DrawningBoat.cs +++ b/ProjectCatamaran/ProjectCatamaran/Drawnings/DrawningBoat.cs @@ -32,11 +32,11 @@ public class DrawningBoat /// /// Ширина прорисовки катамарана /// - private readonly int _drawningBoatWidth = 60; + private readonly int _drawningCatamaranWidth = 60; /// /// Высота прорисовки катамарана /// - private readonly int _drawningBoatHeight = 22; + private readonly int _drawningCatamaranHeight = 25; /// /// координата х обьекта /// @@ -48,11 +48,11 @@ public class DrawningBoat /// /// ширина обьекта /// - public int GetWidth => _drawningBoatWidth; + public int GetWidth => _drawningCatamaranWidth; /// /// высота обьекта /// - public int GetHeight => _drawningBoatHeight; + public int GetHeight => _drawningCatamaranHeight; /// /// пустой конструктор @@ -78,12 +78,12 @@ public class DrawningBoat /// /// Конструктор /// - /// Ширина катера - /// высота катера - public DrawningBoat(int drawningBoatWidth, int drawningBoatHeight) : this() + /// Ширина катера + /// высота катера + public DrawningBoat(int drawningCatamaranWidth, int drawningCatamaranHeight) : this() { - _drawningBoatWidth = drawningBoatWidth; - _drawningBoatHeight = drawningBoatHeight; + _drawningCatamaranWidth = drawningCatamaranWidth; + _drawningCatamaranHeight = drawningCatamaranHeight; } /// @@ -94,7 +94,7 @@ public class DrawningBoat /// public bool SetPictureSize(int width, int height) { - if (_drawningBoatHeight < height && _drawningBoatWidth < width) + if (_drawningCatamaranHeight < height && _drawningCatamaranWidth < width) { _pictureHeight = height; _pictureWidth = width; @@ -113,12 +113,12 @@ public class DrawningBoat { return; } - if (x > _pictureWidth - _drawningBoatWidth || x < 0) - _startPosX = x < 0 ? 0 : _pictureWidth - _drawningBoatWidth; + if (x > _pictureWidth - _drawningCatamaranWidth || x < 0) + _startPosX = x < 0 ? 0 : _pictureWidth - _drawningCatamaranWidth; else _startPosX = x; - if (y > _pictureHeight - _drawningBoatHeight || y < 0) - _startPosY = y < 0 ? 0 : _pictureHeight - _drawningBoatHeight; + if (y > _pictureHeight - _drawningCatamaranHeight || y < 0) + _startPosY = y < 0 ? 0 : _pictureHeight - _drawningCatamaranHeight; else _startPosY = y; } @@ -148,13 +148,13 @@ public class DrawningBoat } return true; case DirectionType.Right: - if (_startPosX.Value + (int)EntityBoat.Step + _drawningBoatWidth <= _pictureWidth) + if (_startPosX.Value + (int)EntityBoat.Step + _drawningCatamaranWidth <= _pictureWidth) { _startPosX += (int)EntityBoat.Step; } return true; case DirectionType.Down: - if (_startPosY.Value + (int)EntityBoat.Step + _drawningBoatHeight <= _pictureHeight) + if (_startPosY.Value + (int)EntityBoat.Step + _drawningCatamaranHeight <= _pictureHeight) { _startPosY += (int)EntityBoat.Step; } diff --git a/ProjectCatamaran/ProjectCatamaran/MovementStrategy/MoveToBorder.cs b/ProjectCatamaran/ProjectCatamaran/MovementStrategy/MoveToBorder.cs index 188f4f3..ba16109 100644 --- a/ProjectCatamaran/ProjectCatamaran/MovementStrategy/MoveToBorder.cs +++ b/ProjectCatamaran/ProjectCatamaran/MovementStrategy/MoveToBorder.cs @@ -15,9 +15,9 @@ public class MoveToBorder : AbstractStrategy ObjectParameters? objParams = GetObjectParameters; if (objParams == null) return; - if (objParams.RightBorder + GetStep() <= FieldWidth) + if (objParams.RightBorder + GetStep() < FieldWidth) MoveRight(); - if (objParams.DownBorder + GetStep() <= FieldHeight) + if (objParams.DownBorder + GetStep() < FieldHeight) MoveDown(); } From eca2103158cadf22982328a63fa868a05beb1c92 Mon Sep 17 00:00:00 2001 From: Nikita Date: Sat, 22 Feb 2025 22:52:54 +0400 Subject: [PATCH 8/9] test1 --- .../Drawnings/DrawningBoat.cs | 30 +++++++++---------- .../MovementStrategy/MoveToBorder.cs | 4 +-- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/ProjectCatamaran/ProjectCatamaran/Drawnings/DrawningBoat.cs b/ProjectCatamaran/ProjectCatamaran/Drawnings/DrawningBoat.cs index 8bcf450..19fd8ee 100644 --- a/ProjectCatamaran/ProjectCatamaran/Drawnings/DrawningBoat.cs +++ b/ProjectCatamaran/ProjectCatamaran/Drawnings/DrawningBoat.cs @@ -30,13 +30,13 @@ public class DrawningBoat /// protected int? _startPosY; /// - /// Ширина прорисовки катамарана + /// Ширина прорисовки лодки /// - private readonly int _drawningCatamaranWidth = 60; + private readonly int _drawningBoatWidth = 60; /// - /// Высота прорисовки катамарана + /// Высота прорисовки лодки /// - private readonly int _drawningCatamaranHeight = 25; + private readonly int _drawningBoatHeight = 22; /// /// координата х обьекта /// @@ -48,11 +48,11 @@ public class DrawningBoat /// /// ширина обьекта /// - public int GetWidth => _drawningCatamaranWidth; + public int GetWidth => _drawningBoatWidth; /// /// высота обьекта /// - public int GetHeight => _drawningCatamaranHeight; + public int GetHeight => _drawningBoatHeight; /// /// пустой конструктор @@ -82,8 +82,8 @@ public class DrawningBoat /// высота катера public DrawningBoat(int drawningCatamaranWidth, int drawningCatamaranHeight) : this() { - _drawningCatamaranWidth = drawningCatamaranWidth; - _drawningCatamaranHeight = drawningCatamaranHeight; + _drawningBoatWidth = drawningCatamaranWidth; + _drawningBoatHeight = drawningCatamaranHeight; } /// @@ -94,7 +94,7 @@ public class DrawningBoat /// public bool SetPictureSize(int width, int height) { - if (_drawningCatamaranHeight < height && _drawningCatamaranWidth < width) + if (_drawningBoatHeight < height && _drawningBoatWidth < width) { _pictureHeight = height; _pictureWidth = width; @@ -113,12 +113,12 @@ public class DrawningBoat { return; } - if (x > _pictureWidth - _drawningCatamaranWidth || x < 0) - _startPosX = x < 0 ? 0 : _pictureWidth - _drawningCatamaranWidth; + if (x > _pictureWidth - _drawningBoatWidth || x < 0) + _startPosX = x < 0 ? 0 : _pictureWidth - _drawningBoatWidth; else _startPosX = x; - if (y > _pictureHeight - _drawningCatamaranHeight || y < 0) - _startPosY = y < 0 ? 0 : _pictureHeight - _drawningCatamaranHeight; + if (y > _pictureHeight - _drawningBoatHeight || y < 0) + _startPosY = y < 0 ? 0 : _pictureHeight - _drawningBoatHeight; else _startPosY = y; } @@ -148,13 +148,13 @@ public class DrawningBoat } return true; case DirectionType.Right: - if (_startPosX.Value + (int)EntityBoat.Step + _drawningCatamaranWidth <= _pictureWidth) + if (_startPosX.Value + (int)EntityBoat.Step + _drawningBoatWidth <= _pictureWidth) { _startPosX += (int)EntityBoat.Step; } return true; case DirectionType.Down: - if (_startPosY.Value + (int)EntityBoat.Step + _drawningCatamaranHeight <= _pictureHeight) + if (_startPosY.Value + (int)EntityBoat.Step + _drawningBoatHeight <= _pictureHeight) { _startPosY += (int)EntityBoat.Step; } diff --git a/ProjectCatamaran/ProjectCatamaran/MovementStrategy/MoveToBorder.cs b/ProjectCatamaran/ProjectCatamaran/MovementStrategy/MoveToBorder.cs index ba16109..188f4f3 100644 --- a/ProjectCatamaran/ProjectCatamaran/MovementStrategy/MoveToBorder.cs +++ b/ProjectCatamaran/ProjectCatamaran/MovementStrategy/MoveToBorder.cs @@ -15,9 +15,9 @@ public class MoveToBorder : AbstractStrategy ObjectParameters? objParams = GetObjectParameters; if (objParams == null) return; - if (objParams.RightBorder + GetStep() < FieldWidth) + if (objParams.RightBorder + GetStep() <= FieldWidth) MoveRight(); - if (objParams.DownBorder + GetStep() < FieldHeight) + if (objParams.DownBorder + GetStep() <= FieldHeight) MoveDown(); } From a7aa7c41bc30a2752fe0b787619fddfa77934365 Mon Sep 17 00:00:00 2001 From: Nikita Date: Sat, 22 Feb 2025 22:59:39 +0400 Subject: [PATCH 9/9] rename params in ctor --- ProjectCatamaran/ProjectCatamaran/Drawnings/DrawningBoat.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ProjectCatamaran/ProjectCatamaran/Drawnings/DrawningBoat.cs b/ProjectCatamaran/ProjectCatamaran/Drawnings/DrawningBoat.cs index 19fd8ee..34b2b2c 100644 --- a/ProjectCatamaran/ProjectCatamaran/Drawnings/DrawningBoat.cs +++ b/ProjectCatamaran/ProjectCatamaran/Drawnings/DrawningBoat.cs @@ -80,10 +80,10 @@ public class DrawningBoat /// /// Ширина катера /// высота катера - public DrawningBoat(int drawningCatamaranWidth, int drawningCatamaranHeight) : this() + public DrawningBoat(int drawningBoatWidth, int drawningBoatHeight) : this() { - _drawningBoatWidth = drawningCatamaranWidth; - _drawningBoatHeight = drawningCatamaranHeight; + _drawningBoatWidth = drawningBoatWidth; + _drawningBoatHeight = drawningBoatHeight; } ///