From b6e2b792972b256a3269faebfd0836bdc7fb924e Mon Sep 17 00:00:00 2001 From: KirillFirsof <117719052+KirillFirsof@users.noreply.github.com> Date: Thu, 26 Oct 2023 14:35:36 +0400 Subject: [PATCH 1/4] =?UTF-8?q?=D0=A1=D0=9C=D0=AD=D0=A0=D0=A2=D0=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../RPP_FirstLaba_Tractor/AbstractStrategy.cs | 136 +++++++++++ .../RPP_FirstLaba_Tractor/BuldoserTractor.cs | 51 +++++ .../DrawingBuldoserTractor.cs | 116 ++++++++++ .../DrawingObjectTractor.cs | 37 +++ .../RPP_FirstLaba_Tractor/DrawingTractor.cs | 215 ++++++++++-------- .../RPP_FirstLaba_Tractor/FormTractor.cs | 133 +++++++++-- .../RPP_FirstLaba_Tractor/IMoveableObject.cs | 36 +++ .../RPP_FirstLaba_Tractor/MoveToBorder.cs | 41 ++++ .../RPP_FirstLaba_Tractor/MoveToCenter.cs | 57 +++++ .../RPP_FirstLaba_Tractor/ObjectParameters.cs | 57 +++++ .../RPP_FirstLaba_Tractor/Status.cs | 18 ++ .../RPP_FirstLaba_Tractor/Tractor.cs | 66 +++--- 12 files changed, 827 insertions(+), 136 deletions(-) create mode 100644 RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/AbstractStrategy.cs create mode 100644 RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/BuldoserTractor.cs create mode 100644 RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/DrawingBuldoserTractor.cs create mode 100644 RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/DrawingObjectTractor.cs create mode 100644 RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/IMoveableObject.cs create mode 100644 RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/MoveToBorder.cs create mode 100644 RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/MoveToCenter.cs create mode 100644 RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/ObjectParameters.cs create mode 100644 RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/Status.cs diff --git a/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/AbstractStrategy.cs b/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/AbstractStrategy.cs new file mode 100644 index 0000000..c67d5af --- /dev/null +++ b/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/AbstractStrategy.cs @@ -0,0 +1,136 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using RPP_FirstLaba_Tractor.DrawningObjects; + +namespace RPP_FirstLaba_Tractor.MovementStrategy +{ + /// + /// Класс-стратегия перемещения объекта + /// + public abstract class AbstractStrategy + { + /// + /// Перемещаемый объект + /// + private IMoveableObject? _moveableObject; + /// + /// Статус перемещения + /// + private Status _state = Status.NotInit; + /// + /// Ширина поля + /// + protected int FieldWidth { get; private set; } + /// + /// Высота поля + /// + protected int FieldHeight { get; private set; } + /// + /// Статус перемещения + /// + public Status GetStatus() { return _state; } + /// + /// Установка данных + /// + /// Перемещаемый объект + /// Ширина поля + /// Высота поля + public void SetData(IMoveableObject moveableObject, int width, int + height) + { + if (moveableObject == null) + { + _state = Status.NotInit; + return; + } + _state = Status.InProgress; + _moveableObject = moveableObject; + FieldWidth = width; + FieldHeight = height; + } + /// + /// Шаг перемещения + /// + public void MakeStep() + { + if (_state != Status.InProgress) + { + return; + } + if (IsTargetDestinaion()) + { + _state = Status.Finish; + return; + } + MoveToTarget(); + } + /// + /// Перемещение влево + /// + /// Результат перемещения (true - удалось переместиться, false -неудача) + protected bool MoveLeft() => MoveTo(DirectionType.Left); + /// + /// Перемещение вправо + /// + /// Результат перемещения (true - удалось переместиться,false - неудача) + protected bool MoveRight() => MoveTo(DirectionType.Right); + /// + /// Перемещение вверх + /// + /// Результат перемещения (true - удалось переместиться,false - неудача) + protected bool MoveUp() => MoveTo(DirectionType.Up); + /// + /// Перемещение вниз + /// + /// Результат перемещения (true - удалось переместиться,false - неудача) + protected bool MoveDown() => MoveTo(DirectionType.Down); + /// + /// Параметры объекта + /// + protected ObjectParameters? GetObjectParameters => + _moveableObject?.GetObjectPosition; + /// + /// Шаг объекта + /// + /// + protected int? GetStep() + { + if (_state != Status.InProgress) + { + return null; + } + return _moveableObject?.GetStep; + } + /// + /// Перемещение к цели + /// + protected abstract void MoveToTarget(); + /// + /// Достигнута ли цель + /// + /// + protected abstract bool IsTargetDestinaion(); + /// + /// Попытка перемещения в требуемом направлении + /// + /// Направление + /// Результат попытки (true - удалось переместиться, false -неудача) + private bool MoveTo(DirectionType directionType) + { + if (_state != Status.InProgress) + { + return false; + } + if (_moveableObject?.CheckCanMove(directionType) ?? false) + { + _moveableObject.MoveObject(directionType); + return true; + } + return false; + } + + } +} diff --git a/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/BuldoserTractor.cs b/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/BuldoserTractor.cs new file mode 100644 index 0000000..7a8c053 --- /dev/null +++ b/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/BuldoserTractor.cs @@ -0,0 +1,51 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace RPP_FirstLaba_Tractor.Entities +{ + /// + /// Класс-сущность "Спортивный автомобиль" + /// + public class EntityBuldoserTractor : EntityTractor + { + /// + /// Дополнительный цвет (для опциональных элементов) + /// + public Color AdditionalColor { get; private set; } + /// + /// Признак (опция) наличия обвеса + /// + public bool BodyKit { get; private set; } + /// + /// Признак (опция) наличия антикрыла + /// + public bool Wing { get; private set; } + /// + /// Признак (опция) наличия гоночной полосы + /// + public bool SportLine { get; private set; } + /// + /// Инициализация полей объекта-класса спортивного автомобиля + /// + /// Скорость + /// Вес автомобиля + /// Основной цвет + /// Дополнительный цвет + /// Признак наличия обвеса + /// Признак наличия антикрыла + /// Признак наличия гоночной полосы + public EntityBuldoserTractor(int speed, double weight, Color bodyColor, Color + additionalColor, bool bodyKit, bool wing, bool sportLine): + base(speed, weight, bodyColor) + { + AdditionalColor = additionalColor; + BodyKit = bodyKit; + Wing = wing; + SportLine = sportLine; + } + } + +} diff --git a/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/DrawingBuldoserTractor.cs b/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/DrawingBuldoserTractor.cs new file mode 100644 index 0000000..9e8326f --- /dev/null +++ b/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/DrawingBuldoserTractor.cs @@ -0,0 +1,116 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using RPP_FirstLaba_Tractor.Entities; + +namespace RPP_FirstLaba_Tractor.DrawningObjects +{ + /// + /// Класс, отвечающий за прорисовку и перемещение объекта-сущности + /// + public class DrawningBuldoserTractor : DrawningTractor + { + /// + /// Конструктор + /// + /// Скорость + /// Вес + /// Основной цвет + /// Дополнительный цвет + /// Признак наличия обвеса + /// Признак наличия антикрыла + /// Признак наличия гоночной полосы + /// Ширина картинки + /// Высота картинки + public DrawningBuldoserTractor(int speed, double weight, Color bodyColor, Color + additionalColor, bool bodyKit, bool wing, bool sportLine, int width, int height) : + base(speed, weight, bodyColor, width, height, 110, 60) + { + if (EntityTractor != null) + { + EntityTractor = new EntityBuldoserTractor(speed, weight, bodyColor, + additionalColor, bodyKit, wing, sportLine); + } + } + public override void DrawTransport(Graphics g) + { + if (EntityTractor is not EntityBuldoserTractor sportCar) + { + return; + } + Pen pen = new(Color.Black); + Brush additionalBrush = new + SolidBrush(sportCar.AdditionalColor); + // обвесы + if (sportCar.BodyKit) + { + g.DrawEllipse(pen, _startPosX + 90, _startPosY, 20, 20); + g.DrawEllipse(pen, _startPosX + 90, _startPosY + 40, 20, + 20); + g.DrawRectangle(pen, _startPosX + 90, _startPosY + 10, + 20, 40); + g.DrawRectangle(pen, _startPosX + 90, _startPosY, 15, + 15); + g.DrawRectangle(pen, _startPosX + 90, _startPosY + 45, + 15, 15); + g.FillEllipse(additionalBrush, _startPosX + 90, + _startPosY, 20, 20); + g.FillEllipse(additionalBrush, _startPosX + 90, + _startPosY + 40, 20, 20); + g.FillRectangle(additionalBrush, _startPosX + 90, + _startPosY + 10, 20, 40); + g.FillRectangle(additionalBrush, _startPosX + 90, + _startPosY + 1, 15, 15); + g.FillRectangle(additionalBrush, _startPosX + 90, + _startPosY + 45, 15, 15); + g.DrawEllipse(pen, _startPosX, _startPosY, 20, 20); + g.DrawEllipse(pen, _startPosX, _startPosY + 40, 20, 20); + g.DrawRectangle(pen, _startPosX, _startPosY + 10, 20, + 40); + g.DrawRectangle(pen, _startPosX + 5, _startPosY, 14, + 15); + g.DrawRectangle(pen, _startPosX + 5, _startPosY + 45, + 14, 15); + g.FillEllipse(additionalBrush, _startPosX, _startPosY, + 20, 20); + g.FillEllipse(additionalBrush, _startPosX, _startPosY + + 40, 20, 20); + g.FillRectangle(additionalBrush, _startPosX + 1, + _startPosY + 10, 25, 40); + g.FillRectangle(additionalBrush, _startPosX + 5, + _startPosY + 1, 15, 15); + g.FillRectangle(additionalBrush, _startPosX + 5, + _startPosY + 45, 15, 15); + g.DrawRectangle(pen, _startPosX + 35, _startPosY, 39, + 15); + g.DrawRectangle(pen, _startPosX + 35, _startPosY + 45, + 39, 15); + g.FillRectangle(additionalBrush, _startPosX + 35, + _startPosY + 1, 40, 15); + g.FillRectangle(additionalBrush, _startPosX + 35, + _startPosY + 45, 40, 15); + } + base.DrawTransport(g); + // спортивная линия + if (sportCar.SportLine) + { + g.FillRectangle(additionalBrush, _startPosX + 75, + _startPosY + 23, 25, 15); + g.FillRectangle(additionalBrush, _startPosX + 35, + _startPosY + 23, 35, 15); + g.FillRectangle(additionalBrush, _startPosX + 10, + _startPosY + 23, 20, 15); + } + // крыло + if (sportCar.Wing) + { + g.FillRectangle(additionalBrush, _startPosX, _startPosY + + 5, 10, 50); + g.DrawRectangle(pen, _startPosX, _startPosY + 5, 10, + 50); + } + } + } +} diff --git a/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/DrawingObjectTractor.cs b/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/DrawingObjectTractor.cs new file mode 100644 index 0000000..6f2f121 --- /dev/null +++ b/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/DrawingObjectTractor.cs @@ -0,0 +1,37 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using RPP_FirstLaba_Tractor.DrawningObjects; + +namespace RPP_FirstLaba_Tractor.MovementStrategy +{ +public class DrawingObjectTractor : IMoveableObject + { + private readonly DrawningTractor? _drawningCar = null; + public DrawingObjectTractor(DrawningTractor drawningTractor) + { + _drawningCar = drawningTractor; + } + public ObjectParameters? GetObjectPosition + { + get + { + if (_drawningCar == null || _drawningCar.EntityTractor == + null) + { + return null; + } + return new ObjectParameters(_drawningCar.GetPosX, + _drawningCar.GetPosY, _drawningCar.GetWidth, _drawningCar.GetHeight); + } + } + public int GetStep => (int)(_drawningCar?.EntityTractor?.Step ?? 0); + public bool CheckCanMove(DirectionType direction) => + _drawningCar?.CanMove(direction) ?? false; + public void MoveObject(DirectionType direction) => + _drawningCar?.MoveTransport(direction); + } +} + diff --git a/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/DrawingTractor.cs b/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/DrawingTractor.cs index d354f33..672a97d 100644 --- a/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/DrawingTractor.cs +++ b/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/DrawingTractor.cs @@ -3,15 +3,19 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using RPP_FirstLaba_Tractor.Entities; -namespace RPP_FirstLaba_Tractor +namespace RPP_FirstLaba_Tractor.DrawningObjects { - internal class DrawningTractor + /// + /// Класс, отвечающий за прорисовку и перемещение объекта-сущности + /// + public class DrawningTractor { /// /// Класс-сущность /// - public EntityTractor? EntityTractor { get; private set; } + public EntityTractor? EntityTractor { get; protected set; } /// /// Ширина окна /// @@ -23,46 +27,54 @@ namespace RPP_FirstLaba_Tractor /// /// Левая координата прорисовки автомобиля /// - private int _startPosX; + protected int _startPosX; /// /// Верхняя кооридната прорисовки автомобиля /// - private int _startPosY; + protected int _startPosY; /// /// Ширина прорисовки автомобиля /// - private readonly int _tractorWidth = 80; + protected readonly int _tractorWidth = 100; /// /// Высота прорисовки автомобиля /// - private readonly int _tractorHeight = 60; + protected readonly int _tractorHeight = 55; /// - /// Инициализация свойств + /// Конструктор /// /// Скорость /// Вес - /// Цвет кузова - /// Дополнительный цвет - /// Признак наличия обвеса - /// Признак наличия антикрыла - /// Признак наличия гоночной полосы + /// Основной цвет /// Ширина картинки /// Высота картинки - /// true - объект создан, false - проверка не пройдена,нельзя создать объект в этих размерах - public bool Init(int speed, double weight, Color bodyColor, int width, int height) + public DrawningTractor(int speed, double weight, Color bodyColor, int + width, int height) { - + // TODO: Продумать проверки _pictureWidth = width; _pictureHeight = height; - if (_tractorWidth > _pictureHeight || _tractorHeight > _pictureHeight) - { - _pictureWidth = 2 * _tractorWidth; - _pictureHeight = 2 * _tractorHeight; - - } - EntityTractor = new EntityTractor(); - EntityTractor.Init(speed, weight, bodyColor); - return true; + EntityTractor = new EntityTractor(speed, weight, bodyColor); + } + /// + /// Конструктор + /// + /// Скорость + /// Вес + /// Основной цвет + /// Ширина картинки + /// Высота картинки + /// Ширина прорисовки автомобиля + /// Высота прорисовки автомобиля + protected DrawningTractor(int speed, double weight, Color bodyColor, int + width, int height, int carWidth, int carHeight) + { + // TODO: Продумать проверки + _pictureWidth = width; + _pictureHeight = height; + _tractorWidth = carWidth; + _tractorHeight = carHeight; + EntityTractor = new EntityTractor(speed, weight, bodyColor); } /// /// Установка позиции @@ -71,25 +83,61 @@ namespace RPP_FirstLaba_Tractor /// Координата Y public void SetPosition(int x, int y) { + // TODO: Изменение x, y, если при установке объект выходит заграницы _startPosX = x; _startPosY = y; - - if ((x + _tractorWidth > _pictureWidth) || (y + _pictureHeight > _pictureHeight)) - { - Random random = new(); - x = random.Next(0, _pictureWidth); - x = random.Next(0, _pictureHeight); - } } /// /// Изменение направления перемещения /// /// Направление - /// + /// + /// Координата X объекта + /// + public int GetPosX => _startPosX; + /// + /// Координата Y объекта + /// + public int GetPosY => _startPosY; + /// + /// Ширина объекта + /// + public int GetWidth => _tractorWidth; + /// + /// Высота объекта + /// + public int GetHeight => _tractorHeight; - public void MoveTransport(DirectionType direction) + /// + /// Проверка, что объект может переместится по указанному направлению + /// + /// Направление + /// true - можно переместится по указанномунаправлению + public bool CanMove(DirectionType direction) { if (EntityTractor == null) + { + return false; + } + return direction switch + { + //влево + DirectionType.Left => _startPosX - EntityTractor.Step > 0, + //вверх + DirectionType.Up => _startPosY - EntityTractor.Step > 0, + // вправо + DirectionType.Right => _startPosX + EntityTractor.Step + _tractorWidth < _pictureWidth, + DirectionType.Down => _startPosY + EntityTractor.Step + _tractorHeight < _pictureHeight, + _ => false, + }; + } + /// + /// Изменение направления перемещения + /// + /// Направление + public void MoveTransport(DirectionType direction) + { + if (!CanMove(direction) || EntityTractor == null) { return; } @@ -97,84 +145,73 @@ namespace RPP_FirstLaba_Tractor { //влево case DirectionType.Left: - if (_startPosX - EntityTractor.Step > 0) - { - _startPosX -= (int)EntityTractor.Step; - } + _startPosX -= (int)EntityTractor.Step; break; //вверх case DirectionType.Up: - if (_startPosY - EntityTractor.Step > 0) - { - _startPosY -= (int)EntityTractor.Step; - } + _startPosY -= (int)EntityTractor.Step; break; // вправо case DirectionType.Right: - if (_startPosX + _tractorWidth + EntityTractor.Step < _pictureWidth) - { - _startPosX += (int)EntityTractor.Step; - } + _startPosX += (int)EntityTractor.Step; break; //вниз case DirectionType.Down: - if (_startPosY + _tractorHeight + EntityTractor.Step < _pictureHeight) - { - _startPosY += (int)EntityTractor.Step; - } + _startPosY += (int)EntityTractor.Step; break; } } + /// /// Прорисовка объекта /// /// - public void DrawTransport(Graphics g) + public virtual void DrawTransport(Graphics g) { if (EntityTractor == null) { return; } Pen pen = new(Color.Black); - Brush brGray = new SolidBrush(Color.Gray); - Brush brBlack = new SolidBrush(Color.Black); - Brush additionalBrush = new - SolidBrush(EntityTractor.BodyColor); - - //Гусеницы - g.FillEllipse(brGray, _startPosX, _startPosY + 41, 25, 25); - g.FillEllipse(brGray, _startPosX + 55, _startPosY + 41, 25, 25); - g.FillRectangle(brGray, _startPosX + 13, _startPosY + 41, 54, 25); - //колеса - g.FillEllipse(brBlack, _startPosX, _startPosY + 45, 15, 15); - g.FillEllipse(brBlack, _startPosX + 65, _startPosY + 45, 15, 15); - g.FillEllipse(brBlack, _startPosX + 35, _startPosY + 55, 10, 10); - g.FillEllipse(brBlack, _startPosX + 20, _startPosY + 55, 10, 10); - g.FillEllipse(brBlack, _startPosX + 50, _startPosY + 55, 10, 10); - g.FillEllipse(brBlack, _startPosX + 25, _startPosY + 40, 10, 10); - g.FillEllipse(brBlack, _startPosX + 45, _startPosY + 40, 10, 10); + //границы автомобиля + g.DrawEllipse(pen, _startPosX + 10, _startPosY + 5, 20, 20); + g.DrawEllipse(pen, _startPosX + 10, _startPosY + 35, 20, 20); + g.DrawEllipse(pen, _startPosX + 80, _startPosY + 5, 20, 20); + g.DrawEllipse(pen, _startPosX + 80, _startPosY + 35, 20, 20); + g.DrawRectangle(pen, _startPosX + 9, _startPosY + 15, 10, 30); + g.DrawRectangle(pen, _startPosX + 90, _startPosY + 15, 10,30); + g.DrawRectangle(pen, _startPosX + 20, _startPosY + 4, 70, 52); + //задние фары + Brush brRed = new SolidBrush(Color.Red); + g.FillEllipse(brRed, _startPosX + 10, _startPosY + 5, 20, 20); + g.FillEllipse(brRed, _startPosX + 10, _startPosY + 35, 20,20); + //передние фары + Brush brYellow = new SolidBrush(Color.Yellow); + g.FillEllipse(brYellow, _startPosX + 80, _startPosY + 5, 20,20); + g.FillEllipse(brYellow, _startPosX + 80, _startPosY + 35, 20, + 20); //кузов - g.FillRectangle(additionalBrush, _startPosX, _startPosY + 20, 80, 20); - g.FillRectangle(additionalBrush, _startPosX + 60, _startPosY, 10, 20); - g.FillRectangle(additionalBrush, _startPosX, _startPosY, 40, 20); - - //Окно - Brush brBlue = new SolidBrush(Color.Blue); - g.FillRectangle(brBlue, _startPosX + 10, _startPosY + 3, 25, 15); - - //Колеса - g.FillEllipse(additionalBrush, _startPosX + 2, _startPosY + 47, 11, 11); - g.FillEllipse(additionalBrush, _startPosX + 67, _startPosY + 47, 11, 11); - g.FillEllipse(additionalBrush, _startPosX + 37, _startPosY + 57, 6, 6); - g.FillEllipse(additionalBrush, _startPosX + 22, _startPosY + 57, 6, 6); - g.FillEllipse(additionalBrush, _startPosX + 52, _startPosY + 57, 6, 6); - g.FillEllipse(additionalBrush, _startPosX + 27, _startPosY + 42, 6, 6); - g.FillEllipse(additionalBrush, _startPosX + 47, _startPosY + 42, 6, 6); - - //границы трактора - g.DrawRectangle(pen, _startPosX, _startPosY + 20, 80, 20); - g.DrawRectangle(pen, _startPosX + 60, _startPosY, 10, 20); - g.DrawRectangle(pen, _startPosX, _startPosY, 40, 20); + Brush br = new SolidBrush(EntityTractor.BodyColor); + g.FillRectangle(br, _startPosX + 10, _startPosY + 15, 10, 30); + g.FillRectangle(br, _startPosX + 90, _startPosY + 15, 10, 30); + g.FillRectangle(br, _startPosX + 20, _startPosY + 5, 70, 50); + //стекла + Brush brBlue = new SolidBrush(Color.LightBlue); + g.FillRectangle(brBlue, _startPosX + 70, _startPosY + 10, 5, + 40); + g.FillRectangle(brBlue, _startPosX + 30, _startPosY + 10, 5, + 40); + g.FillRectangle(brBlue, _startPosX + 35, _startPosY + 8, 35, + 2); + g.FillRectangle(brBlue, _startPosX + 35, _startPosY + 51, 35, + 2); + //выделяем рамкой крышу + g.DrawRectangle(pen, _startPosX + 35, _startPosY + 10, 35, + 40); + g.DrawRectangle(pen, _startPosX + 75, _startPosY + 15, 25, + 30); + g.DrawRectangle(pen, _startPosX + 10, _startPosY + 15, 15, + 30); } } } diff --git a/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/FormTractor.cs b/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/FormTractor.cs index 2a7e443..1290570 100644 --- a/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/FormTractor.cs +++ b/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/FormTractor.cs @@ -1,3 +1,6 @@ +using RPP_FirstLaba_Tractor.MovementStrategy; +using RPP_FirstLaba_Tractor.DrawningObjects; + namespace RPP_FirstLaba_Tractor { /// @@ -6,12 +9,20 @@ namespace RPP_FirstLaba_Tractor public partial class FormTractor : Form { private PictureBox pictureBoxTractor; - private Button buttonCreate; + private Button buttonCreateTractor; private Button buttonTop; private Button buttonLeft; private Button buttonDown; + private Button buttonCreateBulldoserTractor; + private Button buttonStep; + private ComboBox comboBoxStrategy; private Button buttonRight; + /// + /// + /// + private AbstractStrategy? _abstractStrategy; + public int getPictureWidth() { return pictureBoxTractor.Width; @@ -55,8 +66,7 @@ namespace RPP_FirstLaba_Tractor private void ButtonCreate_Click(object sender, EventArgs e) { Random random = new(); - _drawningTractor = new DrawningTractor(); - _drawningTractor.Init(random.Next(100, 300), + _drawningTractor = new DrawningTractor(random.Next(100, 300), random.Next(1000, 3000), Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)), @@ -99,11 +109,14 @@ namespace RPP_FirstLaba_Tractor private void InitializeComponent() { this.pictureBoxTractor = new System.Windows.Forms.PictureBox(); - this.buttonCreate = new System.Windows.Forms.Button(); + this.buttonCreateTractor = new System.Windows.Forms.Button(); this.buttonTop = new System.Windows.Forms.Button(); this.buttonLeft = new System.Windows.Forms.Button(); this.buttonDown = new System.Windows.Forms.Button(); this.buttonRight = new System.Windows.Forms.Button(); + this.buttonCreateBulldoserTractor = new System.Windows.Forms.Button(); + this.buttonStep = new System.Windows.Forms.Button(); + this.comboBoxStrategy = new System.Windows.Forms.ComboBox(); ((System.ComponentModel.ISupportInitialize)(this.pictureBoxTractor)).BeginInit(); this.SuspendLayout(); // @@ -117,16 +130,16 @@ namespace RPP_FirstLaba_Tractor this.pictureBoxTractor.TabIndex = 0; this.pictureBoxTractor.TabStop = false; // - // buttonCreate + // buttonCreateTractor // - this.buttonCreate.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.buttonCreate.Location = new System.Drawing.Point(12, 440); - this.buttonCreate.Name = "buttonCreate"; - this.buttonCreate.Size = new System.Drawing.Size(94, 29); - this.buttonCreate.TabIndex = 1; - this.buttonCreate.Text = ""; - this.buttonCreate.UseVisualStyleBackColor = true; - this.buttonCreate.Click += new System.EventHandler(this.ButtonCreate_Click); + this.buttonCreateTractor.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.buttonCreateTractor.Location = new System.Drawing.Point(12, 440); + this.buttonCreateTractor.Name = "buttonCreateTractor"; + this.buttonCreateTractor.Size = new System.Drawing.Size(246, 29); + this.buttonCreateTractor.TabIndex = 1; + this.buttonCreateTractor.Text = " "; + this.buttonCreateTractor.UseVisualStyleBackColor = true; + this.buttonCreateTractor.Click += new System.EventHandler(this.ButtonCreate_Click); // // buttonTop // @@ -176,14 +189,52 @@ namespace RPP_FirstLaba_Tractor this.buttonRight.UseVisualStyleBackColor = true; this.buttonRight.Click += new System.EventHandler(this.ButtonMove_Click); // + // buttonCreateBulldoserTractor + // + this.buttonCreateBulldoserTractor.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.buttonCreateBulldoserTractor.Location = new System.Drawing.Point(264, 440); + this.buttonCreateBulldoserTractor.Name = "buttonCreateBulldoserTractor"; + this.buttonCreateBulldoserTractor.Size = new System.Drawing.Size(199, 29); + this.buttonCreateBulldoserTractor.TabIndex = 6; + this.buttonCreateBulldoserTractor.Text = " "; + this.buttonCreateBulldoserTractor.UseVisualStyleBackColor = true; + this.buttonCreateBulldoserTractor.Click += new System.EventHandler(this.buttonCreateBulldoserTractor_Click); + // + // buttonStep + // + this.buttonStep.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.buttonStep.Location = new System.Drawing.Point(785, 46); + this.buttonStep.Name = "buttonStep"; + this.buttonStep.Size = new System.Drawing.Size(94, 29); + this.buttonStep.TabIndex = 7; + this.buttonStep.Text = "button2"; + this.buttonStep.UseVisualStyleBackColor = true; + this.buttonStep.Click += new System.EventHandler(this.buttonStep_Click); + // + // comboBoxStrategy + // + this.comboBoxStrategy.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.comboBoxStrategy.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.comboBoxStrategy.FormattingEnabled = true; + this.comboBoxStrategy.Items.AddRange(new object[] { + " ", + " "}); + this.comboBoxStrategy.Location = new System.Drawing.Point(728, 12); + this.comboBoxStrategy.Name = "comboBoxStrategy"; + this.comboBoxStrategy.Size = new System.Drawing.Size(151, 28); + this.comboBoxStrategy.TabIndex = 8; + // // FormTractor // this.ClientSize = new System.Drawing.Size(891, 490); + this.Controls.Add(this.comboBoxStrategy); + this.Controls.Add(this.buttonStep); + this.Controls.Add(this.buttonCreateBulldoserTractor); this.Controls.Add(this.buttonRight); this.Controls.Add(this.buttonDown); this.Controls.Add(this.buttonLeft); this.Controls.Add(this.buttonTop); - this.Controls.Add(this.buttonCreate); + this.Controls.Add(this.buttonCreateTractor); this.Controls.Add(this.pictureBoxTractor); this.Name = "FormTractor"; ((System.ComponentModel.ISupportInitialize)(this.pictureBoxTractor)).EndInit(); @@ -192,5 +243,59 @@ namespace RPP_FirstLaba_Tractor } + private void buttonCreateBulldoserTractor_Click(object sender, EventArgs e) + { + Random random = new(); + _drawningTractor = new DrawningBuldoserTractor(random.Next(100, 300), + random.Next(1000, 3000), + Color.FromArgb(random.Next(0, 256), random.Next(0, 256), + random.Next(0, 256)), + Color.FromArgb(random.Next(0, 256), random.Next(0, 256), + random.Next(0, 256)), + Convert.ToBoolean(random.Next(0, 2)), + Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2)), + buttonCreateBulldoserTractor.Width, buttonCreateBulldoserTractor.Height); + _drawningTractor.SetPosition(random.Next(10, 100), random.Next(10, + 100)); + Draw(); + + } + + private void buttonStep_Click(object sender, EventArgs e) + { + if (_drawningTractor == null) + { + return; + } + if (comboBoxStrategy.Enabled) + { + _abstractStrategy = comboBoxStrategy.SelectedIndex + switch + { + 0 => new MoveToCenter(), + 1 => new MoveToBorder(), + _ => null, + }; + if (_abstractStrategy == null) + { + return; + } + _abstractStrategy.SetData(new + DrawingObjectTractor(_drawningTractor), pictureBoxTractor.Width, + pictureBoxTractor.Height); + comboBoxStrategy.Enabled = false; + } + if (_abstractStrategy == null) + { + return; + } + _abstractStrategy.MakeStep(); + Draw(); + if (_abstractStrategy.GetStatus() == Status.Finish) + { + comboBoxStrategy.Enabled = true; + _abstractStrategy = null; + } + } } } \ No newline at end of file diff --git a/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/IMoveableObject.cs b/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/IMoveableObject.cs new file mode 100644 index 0000000..8c19d9c --- /dev/null +++ b/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/IMoveableObject.cs @@ -0,0 +1,36 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +//using RPP_FirstLaba_Tractor.Drawnings; + + +namespace RPP_FirstLaba_Tractor.MovementStrategy +{/// + /// Интерфейс для работы с перемещаемым объектом + /// + public interface IMoveableObject + { + /// + /// Получение координаты X объекта + /// + ObjectParameters? GetObjectPosition { get; } + /// + /// Шаг объекта + /// + int GetStep { get; } + /// + /// Проверка, можно ли переместиться по нужному направлению + /// + /// + /// + bool CheckCanMove(DirectionType direction); + /// + /// Изменение направления пермещения объекта + /// + /// Направление + void MoveObject(DirectionType direction); + } + +} diff --git a/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/MoveToBorder.cs b/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/MoveToBorder.cs new file mode 100644 index 0000000..c54ee1e --- /dev/null +++ b/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/MoveToBorder.cs @@ -0,0 +1,41 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace RPP_FirstLaba_Tractor.MovementStrategy +{ + internal class MoveToBorder: AbstractStrategy + { + protected override bool IsTargetDestinaion() + { + var objParams = GetObjectParameters; + if (objParams == null) + { + return false; + } + return objParams.RightBorder + GetStep() >= FieldWidth && + objParams.DownBorder + GetStep() >= FieldHeight; + } + + protected override void MoveToTarget() + { + var objParams = GetObjectParameters; + if (objParams == null) + { + return; + } + var diffX = FieldWidth - objParams.RightBorder; + if (diffX > GetStep()) + { + MoveRight(); + } + var diffY = FieldHeight - objParams.DownBorder; + if (diffY > GetStep()) + { + MoveDown(); + } + } + } +} diff --git a/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/MoveToCenter.cs b/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/MoveToCenter.cs new file mode 100644 index 0000000..caa4ba2 --- /dev/null +++ b/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/MoveToCenter.cs @@ -0,0 +1,57 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace RPP_FirstLaba_Tractor.MovementStrategy +{ + internal class MoveToCenter: AbstractStrategy + { + protected override bool IsTargetDestinaion() + { + var objParams = GetObjectParameters; + if (objParams == null) + { + return false; + } + return objParams.ObjectMiddleHorizontal <= FieldWidth / 2 && + objParams.ObjectMiddleHorizontal + GetStep() >= FieldWidth / 2 && + objParams.ObjectMiddleVertical <= FieldHeight / 2 && + objParams.ObjectMiddleVertical + GetStep() >= FieldHeight / 2; + } + protected override void MoveToTarget() + { + var objParams = GetObjectParameters; + if (objParams == null) + { + return; + } + var diffX = objParams.ObjectMiddleHorizontal - FieldWidth / 2; + if (Math.Abs(diffX) > GetStep()) + { + if (diffX > 0) + { + MoveLeft(); + } + else + { + MoveRight(); + } + } + var diffY = objParams.ObjectMiddleVertical - FieldHeight / 2; + if (Math.Abs(diffY) > GetStep()) + { + if (diffY > 0) + { + MoveUp(); + } + else + { + MoveDown(); + } + } + } + } +} + diff --git a/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/ObjectParameters.cs b/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/ObjectParameters.cs new file mode 100644 index 0000000..66ea7f7 --- /dev/null +++ b/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/ObjectParameters.cs @@ -0,0 +1,57 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace RPP_FirstLaba_Tractor +{ + /// + /// Параметры-координаты объекта + /// + public class ObjectParameters + { + private readonly int _x; + private readonly int _y; + private readonly int _width; + private readonly int _height; + /// + /// Левая граница + /// + public int LeftBorder => _x; + /// + /// Верхняя граница + /// + public int TopBorder => _y; + /// + /// Правая граница + /// + public int RightBorder => _x + _width; + /// + /// Нижняя граница + /// + public int DownBorder => _y + _height; + /// + /// Середина объекта + /// + public int ObjectMiddleHorizontal => _x + _width / 2; + /// + /// Середина объекта + /// + public int ObjectMiddleVertical => _y + _height / 2; + /// + /// Конструктор + /// + /// Координата X + /// Координата Y + /// Ширина + /// Высота + public ObjectParameters(int x, int y, int width, int height) + { + _x = x; + _y = y; + _width = width; + _height = height; + } + } +} diff --git a/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/Status.cs b/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/Status.cs new file mode 100644 index 0000000..69d15ec --- /dev/null +++ b/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/Status.cs @@ -0,0 +1,18 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace RPP_FirstLaba_Tractor +{ + /// + /// Статус выполнения операции перемещения + /// + public enum Status + { + NotInit, InProgress, + Finish + } + +} diff --git a/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/Tractor.cs b/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/Tractor.cs index 843b95c..f7fab51 100644 --- a/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/Tractor.cs +++ b/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/Tractor.cs @@ -4,40 +4,40 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace RPP_FirstLaba_Tractor +namespace RPP_FirstLaba_Tractor.Entities; + +/// +/// Класс-сущность "Автомобиль" +/// +public class EntityTractor { - public class EntityTractor + /// + /// Скорость + /// + public int Speed { get; private set; } + /// + /// Вес + /// + public double Weight { get; private set; } + /// + /// Основной цвет + /// + public Color BodyColor { get; private set; } + /// + /// Шаг перемещения автомобиля + /// + public double Step => (double)Speed * 100 / Weight; + /// + /// Конструктор с параметрами + /// + /// Скорость + /// Вес автомобиля + /// Основной цвет + public EntityTractor(int speed, double weight, Color bodyColor) { - /// - /// Скорость - /// - public int Speed { get; private set; } - /// - /// Вес - /// - public double Weight { get; private set; } - /// - /// Основной цвет - /// - public Color BodyColor { get; private set; } - - public double Step => (double)Speed * 100 / Weight; - /// - /// Инициализация полей объекта-класса спортивного автомобиля - /// - /// Скорость - /// Вес автомобиля - /// Основной цвет - /// Дополнительный цвет - /// Признак наличия обвеса - /// Признак наличия антикрыла - /// Признак наличия гоночной полосы - public void Init(int speed, double weight, Color bodyColor) - { - Speed = speed; - Weight = weight; - BodyColor = bodyColor; - } - + Speed = speed; + Weight = weight; + BodyColor = bodyColor; } } + -- 2.25.1 From c8f9dead9c2d5ae7c532d0346a985deff2f80682 Mon Sep 17 00:00:00 2001 From: KirillFirsof <117719052+KirillFirsof@users.noreply.github.com> Date: Fri, 27 Oct 2023 08:24:37 +0400 Subject: [PATCH 2/4] =?UTF-8?q?=D0=9D=D0=B0=D0=B4=D0=B5=D1=8E=D1=81=D1=8C?= =?UTF-8?q?=20=D0=B2=D1=81=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../RPP_FirstLaba_Tractor.sln | 2 +- .../RPP_FirstLaba_Tractor/AbstractStrategy.cs | 5 +- .../DrawingBuldoserTractor.cs | 116 --------- .../DrawingObjectTractor.cs | 37 --- .../RPP_FirstLaba_Tractor/DrawingTractor.cs | 217 ----------------- .../DrawningBulldoser.cs | 98 ++++++++ .../DrawningObjectTractor.cs | 40 +++ .../RPP_FirstLaba_Tractor/DrawningTractor.cs | 229 ++++++++++++++++++ ...{BuldoserTractor.cs => EntityBulldoser.cs} | 27 +-- .../RPP_FirstLaba_Tractor/EntityTractor.cs | 44 ++++ .../RPP_FirstLaba_Tractor/FormTractor.cs | 31 +-- .../RPP_FirstLaba_Tractor/IMoveableObject.cs | 9 +- .../RPP_FirstLaba_Tractor/MoveToBorder.cs | 29 ++- .../RPP_FirstLaba_Tractor/MoveToCenter.cs | 6 +- .../RPP_FirstLaba_Tractor/ObjectParameters.cs | 3 +- .../RPP_FirstLaba_Tractor/Status.cs | 5 +- .../RPP_FirstLaba_Tractor/Tractor.cs | 43 ---- 17 files changed, 473 insertions(+), 468 deletions(-) delete mode 100644 RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/DrawingBuldoserTractor.cs delete mode 100644 RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/DrawingObjectTractor.cs delete mode 100644 RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/DrawingTractor.cs create mode 100644 RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/DrawningBulldoser.cs create mode 100644 RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/DrawningObjectTractor.cs create mode 100644 RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/DrawningTractor.cs rename RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/{BuldoserTractor.cs => EntityBulldoser.cs} (58%) create mode 100644 RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/EntityTractor.cs delete mode 100644 RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/Tractor.cs diff --git a/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor.sln b/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor.sln index a1ae33d..f5b346e 100644 --- a/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor.sln +++ b/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor.sln @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.2.32602.215 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RPP_FirstLaba_Tractor", "RPP_FirstLaba_Tractor\RPP_FirstLaba_Tractor.csproj", "{EF413F48-FFBF-4510-BA11-FAEBE7C0142A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RPP_FirstLaba_Tractor", "RPP_FirstLaba_Tractor\RPP_FirstLaba_Tractor.csproj", "{EF413F48-FFBF-4510-BA11-FAEBE7C0142A}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/AbstractStrategy.cs b/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/AbstractStrategy.cs index c67d5af..ac1f0f9 100644 --- a/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/AbstractStrategy.cs +++ b/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/AbstractStrategy.cs @@ -71,7 +71,7 @@ namespace RPP_FirstLaba_Tractor.MovementStrategy /// Перемещение влево /// /// Результат перемещения (true - удалось переместиться, false -неудача) - protected bool MoveLeft() => MoveTo(DirectionType.Left); + protected bool MoveLeft() => MoveTo(DirectionType.Left); /// /// Перемещение вправо /// @@ -131,6 +131,5 @@ namespace RPP_FirstLaba_Tractor.MovementStrategy } return false; } - } -} +} \ No newline at end of file diff --git a/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/DrawingBuldoserTractor.cs b/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/DrawingBuldoserTractor.cs deleted file mode 100644 index 9e8326f..0000000 --- a/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/DrawingBuldoserTractor.cs +++ /dev/null @@ -1,116 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using RPP_FirstLaba_Tractor.Entities; - -namespace RPP_FirstLaba_Tractor.DrawningObjects -{ - /// - /// Класс, отвечающий за прорисовку и перемещение объекта-сущности - /// - public class DrawningBuldoserTractor : DrawningTractor - { - /// - /// Конструктор - /// - /// Скорость - /// Вес - /// Основной цвет - /// Дополнительный цвет - /// Признак наличия обвеса - /// Признак наличия антикрыла - /// Признак наличия гоночной полосы - /// Ширина картинки - /// Высота картинки - public DrawningBuldoserTractor(int speed, double weight, Color bodyColor, Color - additionalColor, bool bodyKit, bool wing, bool sportLine, int width, int height) : - base(speed, weight, bodyColor, width, height, 110, 60) - { - if (EntityTractor != null) - { - EntityTractor = new EntityBuldoserTractor(speed, weight, bodyColor, - additionalColor, bodyKit, wing, sportLine); - } - } - public override void DrawTransport(Graphics g) - { - if (EntityTractor is not EntityBuldoserTractor sportCar) - { - return; - } - Pen pen = new(Color.Black); - Brush additionalBrush = new - SolidBrush(sportCar.AdditionalColor); - // обвесы - if (sportCar.BodyKit) - { - g.DrawEllipse(pen, _startPosX + 90, _startPosY, 20, 20); - g.DrawEllipse(pen, _startPosX + 90, _startPosY + 40, 20, - 20); - g.DrawRectangle(pen, _startPosX + 90, _startPosY + 10, - 20, 40); - g.DrawRectangle(pen, _startPosX + 90, _startPosY, 15, - 15); - g.DrawRectangle(pen, _startPosX + 90, _startPosY + 45, - 15, 15); - g.FillEllipse(additionalBrush, _startPosX + 90, - _startPosY, 20, 20); - g.FillEllipse(additionalBrush, _startPosX + 90, - _startPosY + 40, 20, 20); - g.FillRectangle(additionalBrush, _startPosX + 90, - _startPosY + 10, 20, 40); - g.FillRectangle(additionalBrush, _startPosX + 90, - _startPosY + 1, 15, 15); - g.FillRectangle(additionalBrush, _startPosX + 90, - _startPosY + 45, 15, 15); - g.DrawEllipse(pen, _startPosX, _startPosY, 20, 20); - g.DrawEllipse(pen, _startPosX, _startPosY + 40, 20, 20); - g.DrawRectangle(pen, _startPosX, _startPosY + 10, 20, - 40); - g.DrawRectangle(pen, _startPosX + 5, _startPosY, 14, - 15); - g.DrawRectangle(pen, _startPosX + 5, _startPosY + 45, - 14, 15); - g.FillEllipse(additionalBrush, _startPosX, _startPosY, - 20, 20); - g.FillEllipse(additionalBrush, _startPosX, _startPosY + - 40, 20, 20); - g.FillRectangle(additionalBrush, _startPosX + 1, - _startPosY + 10, 25, 40); - g.FillRectangle(additionalBrush, _startPosX + 5, - _startPosY + 1, 15, 15); - g.FillRectangle(additionalBrush, _startPosX + 5, - _startPosY + 45, 15, 15); - g.DrawRectangle(pen, _startPosX + 35, _startPosY, 39, - 15); - g.DrawRectangle(pen, _startPosX + 35, _startPosY + 45, - 39, 15); - g.FillRectangle(additionalBrush, _startPosX + 35, - _startPosY + 1, 40, 15); - g.FillRectangle(additionalBrush, _startPosX + 35, - _startPosY + 45, 40, 15); - } - base.DrawTransport(g); - // спортивная линия - if (sportCar.SportLine) - { - g.FillRectangle(additionalBrush, _startPosX + 75, - _startPosY + 23, 25, 15); - g.FillRectangle(additionalBrush, _startPosX + 35, - _startPosY + 23, 35, 15); - g.FillRectangle(additionalBrush, _startPosX + 10, - _startPosY + 23, 20, 15); - } - // крыло - if (sportCar.Wing) - { - g.FillRectangle(additionalBrush, _startPosX, _startPosY - + 5, 10, 50); - g.DrawRectangle(pen, _startPosX, _startPosY + 5, 10, - 50); - } - } - } -} diff --git a/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/DrawingObjectTractor.cs b/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/DrawingObjectTractor.cs deleted file mode 100644 index 6f2f121..0000000 --- a/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/DrawingObjectTractor.cs +++ /dev/null @@ -1,37 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using RPP_FirstLaba_Tractor.DrawningObjects; - -namespace RPP_FirstLaba_Tractor.MovementStrategy -{ -public class DrawingObjectTractor : IMoveableObject - { - private readonly DrawningTractor? _drawningCar = null; - public DrawingObjectTractor(DrawningTractor drawningTractor) - { - _drawningCar = drawningTractor; - } - public ObjectParameters? GetObjectPosition - { - get - { - if (_drawningCar == null || _drawningCar.EntityTractor == - null) - { - return null; - } - return new ObjectParameters(_drawningCar.GetPosX, - _drawningCar.GetPosY, _drawningCar.GetWidth, _drawningCar.GetHeight); - } - } - public int GetStep => (int)(_drawningCar?.EntityTractor?.Step ?? 0); - public bool CheckCanMove(DirectionType direction) => - _drawningCar?.CanMove(direction) ?? false; - public void MoveObject(DirectionType direction) => - _drawningCar?.MoveTransport(direction); - } -} - diff --git a/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/DrawingTractor.cs b/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/DrawingTractor.cs deleted file mode 100644 index 672a97d..0000000 --- a/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/DrawingTractor.cs +++ /dev/null @@ -1,217 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using RPP_FirstLaba_Tractor.Entities; - -namespace RPP_FirstLaba_Tractor.DrawningObjects -{ - /// - /// Класс, отвечающий за прорисовку и перемещение объекта-сущности - /// - public class DrawningTractor - { - /// - /// Класс-сущность - /// - public EntityTractor? EntityTractor { get; protected set; } - /// - /// Ширина окна - /// - private int _pictureWidth; - /// - /// Высота окна - /// - private int _pictureHeight; - /// - /// Левая координата прорисовки автомобиля - /// - protected int _startPosX; - /// - /// Верхняя кооридната прорисовки автомобиля - /// - protected int _startPosY; - /// - /// Ширина прорисовки автомобиля - /// - protected readonly int _tractorWidth = 100; - /// - /// Высота прорисовки автомобиля - /// - protected readonly int _tractorHeight = 55; - /// - /// Конструктор - /// - /// Скорость - /// Вес - /// Основной цвет - /// Ширина картинки - /// Высота картинки - public DrawningTractor(int speed, double weight, Color bodyColor, int - width, int height) - { - // TODO: Продумать проверки - _pictureWidth = width; - _pictureHeight = height; - EntityTractor = new EntityTractor(speed, weight, bodyColor); - } - /// - /// Конструктор - /// - /// Скорость - /// Вес - /// Основной цвет - /// Ширина картинки - /// Высота картинки - /// Ширина прорисовки автомобиля - /// Высота прорисовки автомобиля - protected DrawningTractor(int speed, double weight, Color bodyColor, int - width, int height, int carWidth, int carHeight) - { - // TODO: Продумать проверки - _pictureWidth = width; - _pictureHeight = height; - _tractorWidth = carWidth; - _tractorHeight = carHeight; - EntityTractor = new EntityTractor(speed, weight, bodyColor); - } - /// - /// Установка позиции - /// - /// Координата X - /// Координата Y - public void SetPosition(int x, int y) - { - // TODO: Изменение x, y, если при установке объект выходит заграницы - _startPosX = x; - _startPosY = y; - } - /// - /// Изменение направления перемещения - /// - /// Направление - /// - /// Координата X объекта - /// - public int GetPosX => _startPosX; - /// - /// Координата Y объекта - /// - public int GetPosY => _startPosY; - /// - /// Ширина объекта - /// - public int GetWidth => _tractorWidth; - /// - /// Высота объекта - /// - public int GetHeight => _tractorHeight; - - /// - /// Проверка, что объект может переместится по указанному направлению - /// - /// Направление - /// true - можно переместится по указанномунаправлению - public bool CanMove(DirectionType direction) - { - if (EntityTractor == null) - { - return false; - } - return direction switch - { - //влево - DirectionType.Left => _startPosX - EntityTractor.Step > 0, - //вверх - DirectionType.Up => _startPosY - EntityTractor.Step > 0, - // вправо - DirectionType.Right => _startPosX + EntityTractor.Step + _tractorWidth < _pictureWidth, - DirectionType.Down => _startPosY + EntityTractor.Step + _tractorHeight < _pictureHeight, - _ => false, - }; - } - /// - /// Изменение направления перемещения - /// - /// Направление - public void MoveTransport(DirectionType direction) - { - if (!CanMove(direction) || EntityTractor == null) - { - return; - } - switch (direction) - { - //влево - case DirectionType.Left: - _startPosX -= (int)EntityTractor.Step; - break; - //вверх - case DirectionType.Up: - _startPosY -= (int)EntityTractor.Step; - break; - // вправо - case DirectionType.Right: - _startPosX += (int)EntityTractor.Step; - break; - //вниз - case DirectionType.Down: - _startPosY += (int)EntityTractor.Step; - break; - } - } - - /// - /// Прорисовка объекта - /// - /// - public virtual void DrawTransport(Graphics g) - { - if (EntityTractor == null) - { - return; - } - Pen pen = new(Color.Black); - //границы автомобиля - g.DrawEllipse(pen, _startPosX + 10, _startPosY + 5, 20, 20); - g.DrawEllipse(pen, _startPosX + 10, _startPosY + 35, 20, 20); - g.DrawEllipse(pen, _startPosX + 80, _startPosY + 5, 20, 20); - g.DrawEllipse(pen, _startPosX + 80, _startPosY + 35, 20, 20); - g.DrawRectangle(pen, _startPosX + 9, _startPosY + 15, 10, 30); - g.DrawRectangle(pen, _startPosX + 90, _startPosY + 15, 10,30); - g.DrawRectangle(pen, _startPosX + 20, _startPosY + 4, 70, 52); - //задние фары - Brush brRed = new SolidBrush(Color.Red); - g.FillEllipse(brRed, _startPosX + 10, _startPosY + 5, 20, 20); - g.FillEllipse(brRed, _startPosX + 10, _startPosY + 35, 20,20); - //передние фары - Brush brYellow = new SolidBrush(Color.Yellow); - g.FillEllipse(brYellow, _startPosX + 80, _startPosY + 5, 20,20); - g.FillEllipse(brYellow, _startPosX + 80, _startPosY + 35, 20, - 20); - //кузов - Brush br = new SolidBrush(EntityTractor.BodyColor); - g.FillRectangle(br, _startPosX + 10, _startPosY + 15, 10, 30); - g.FillRectangle(br, _startPosX + 90, _startPosY + 15, 10, 30); - g.FillRectangle(br, _startPosX + 20, _startPosY + 5, 70, 50); - //стекла - Brush brBlue = new SolidBrush(Color.LightBlue); - g.FillRectangle(brBlue, _startPosX + 70, _startPosY + 10, 5, - 40); - g.FillRectangle(brBlue, _startPosX + 30, _startPosY + 10, 5, - 40); - g.FillRectangle(brBlue, _startPosX + 35, _startPosY + 8, 35, - 2); - g.FillRectangle(brBlue, _startPosX + 35, _startPosY + 51, 35, - 2); - //выделяем рамкой крышу - g.DrawRectangle(pen, _startPosX + 35, _startPosY + 10, 35, - 40); - g.DrawRectangle(pen, _startPosX + 75, _startPosY + 15, 25, - 30); - g.DrawRectangle(pen, _startPosX + 10, _startPosY + 15, 15, - 30); - } - } -} diff --git a/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/DrawningBulldoser.cs b/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/DrawningBulldoser.cs new file mode 100644 index 0000000..f179a96 --- /dev/null +++ b/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/DrawningBulldoser.cs @@ -0,0 +1,98 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using RPP_FirstLaba_Tractor.Entities; + +namespace RPP_FirstLaba_Tractor.DrawningObjects +{ + /// + /// Класс, отвечающий за прорисовку и перемещение объекта-сущности + /// + public class DrawningBulldoser : DrawningTractor + { + /// + /// Конструктор + /// + /// Скорость + /// Вес + /// Основной цвет + /// Дополнительный цвет + /// Признак наличия орнамента на колесах + /// Признак наличия отвала + /// Ширина картинки + /// Высота картинки + public DrawningBulldoser(int speed, double weight, Color bodyColor, Color + additionalColor, bool wheelsOrnament, bool blade, int width, int height) : + base(speed, weight, bodyColor, width, height, 110, 60) + { + if (EntityTractor != null) + { + EntityTractor = new EntityBulldoser(speed, weight, bodyColor, + additionalColor, wheelsOrnament, blade); + } + } + public override void DrawTransport(Graphics g) + { + if (EntityTractor is not EntityBulldoser bulldoser) + { + return; + } + Pen pen = new(Color.Black); + Brush additionalBrush = new + SolidBrush(bulldoser.AdditionalColor); + + base.DrawTransport(g); + if (bulldoser.WheelsOrnament) + { + g.FillEllipse(additionalBrush, _startPosX + 2, _startPosY + 47, 11, 11); + g.FillEllipse(additionalBrush, _startPosX + 67, _startPosY + 47, 11, 11); + g.FillEllipse(additionalBrush, _startPosX + 37, _startPosY + 57, 6, 6); + g.FillEllipse(additionalBrush, _startPosX + 22, _startPosY + 57, 6, 6); + g.FillEllipse(additionalBrush, _startPosX + 52, _startPosY + 57, 6, 6); + g.FillEllipse(additionalBrush, _startPosX + 27, _startPosY + 42, 6, 6); + g.FillEllipse(additionalBrush, _startPosX + 47, _startPosY + 42, 6, 6); + g.DrawLine(pen, _startPosX + 7, _startPosY + 47, _startPosX + 7, _startPosY + 58); + g.DrawLine(pen, _startPosX + 2, _startPosY + 53, _startPosX + 13, _startPosY + 53); + + g.DrawLine(pen, _startPosX + 73, _startPosY + 47, _startPosX + 73, _startPosY + 58); + g.DrawLine(pen, _startPosX + 67, _startPosY + 53, _startPosX + 78, _startPosY + 53); + + g.DrawLine(pen, _startPosX + 40, _startPosY + 57, _startPosX + 40, _startPosY + 62); + g.DrawLine(pen, _startPosX + 37, _startPosY + 60, _startPosX + 43, _startPosY + 60); + + g.DrawLine(pen, _startPosX + 25, _startPosY + 57, _startPosX + 25, _startPosY + 62); + g.DrawLine(pen, _startPosX + 22, _startPosY + 60, _startPosX + 28, _startPosY + 60); + + g.DrawLine(pen, _startPosX + 55, _startPosY + 57, _startPosX + 55, _startPosY + 62); + g.DrawLine(pen, _startPosX + 52, _startPosY + 60, _startPosX + 58, _startPosY + 60); + + g.DrawLine(pen, _startPosX + 30, _startPosY + 42, _startPosX + 30, _startPosY + 48); + g.DrawLine(pen, _startPosX + 27, _startPosY + 45, _startPosX + 33, _startPosY + 45); + + g.DrawLine(pen, _startPosX + 50, _startPosY + 42, _startPosX + 50, _startPosY + 48); + g.DrawLine(pen, _startPosX + 47, _startPosY + 45, _startPosX + 53, _startPosY + 45); + } + // отвал + if (bulldoser.Blade) + { + g.FillRectangle(additionalBrush, _startPosX + 82, _startPosY + 30, 10, 40); + g.FillRectangle(additionalBrush, _startPosX + 82, _startPosY + 60, 40, 10); + + for (int i = 0; i < 15; i++) + { + g.FillRectangle(additionalBrush, _startPosX + 82, _startPosY + 60 - i * 2, 40 - i * 2, 10); + } + + g.FillRectangle(additionalBrush, _startPosX + 50, _startPosY + 25, 10, 10); + + for (int i = 0; i < 16; i++) + { + g.FillRectangle(additionalBrush, _startPosX + 50 + i * 2, _startPosY + 25 + i, 10, 10); + } + } + } + + } +} diff --git a/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/DrawningObjectTractor.cs b/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/DrawningObjectTractor.cs new file mode 100644 index 0000000..969c4ee --- /dev/null +++ b/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/DrawningObjectTractor.cs @@ -0,0 +1,40 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using RPP_FirstLaba_Tractor.DrawningObjects; + +namespace RPP_FirstLaba_Tractor.MovementStrategy +{ + /// + /// Реализация интерфейса IDrawningObject для работы с объектом DrawningTractor(паттерн Adapter) + /// + public class DrawningObjectTractor : IMoveableObject + { + private readonly DrawningTractor? _drawningTractor = null; + public DrawningObjectTractor(DrawningTractor drawningTractor) + { + _drawningTractor = drawningTractor; + } + public ObjectParameters? GetObjectPosition + { + get + { + if (_drawningTractor == null || _drawningTractor.EntityTractor == + null) + { + return null; + } + return new ObjectParameters(_drawningTractor.GetPosX, + _drawningTractor.GetPosY, _drawningTractor.GetWidth, _drawningTractor.GetHeight); + } + } + public int GetStep => (int)(_drawningTractor?.EntityTractor?.Step ?? 0); + public bool CheckCanMove(DirectionType direction) => + _drawningTractor?.CanMove(direction) ?? false; + public void MoveObject(DirectionType direction) => + _drawningTractor?.MoveTransport(direction); + } + +} diff --git a/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/DrawningTractor.cs b/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/DrawningTractor.cs new file mode 100644 index 0000000..a888485 --- /dev/null +++ b/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/DrawningTractor.cs @@ -0,0 +1,229 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using RPP_FirstLaba_Tractor.Entities; + +namespace RPP_FirstLaba_Tractor.DrawningObjects { + +/// +/// Класс, отвечающий за прорисовку и перемещение объекта-сущности +/// + public class DrawningTractor +{ + /// + /// Класс-сущность + /// + public EntityTractor? EntityTractor { get; protected set; } + /// + /// Ширина окна + /// + private int _pictureWidth; + /// + /// Высота окна + /// + private int _pictureHeight; + /// + /// Левая координата прорисовки автомобиля + /// + protected int _startPosX; + /// + /// Верхняя кооридната прорисовки автомобиля + /// + protected int _startPosY; + /// + /// Ширина прорисовки автомобиля + /// + protected readonly int _tractorWidth = 75; + /// + /// Высота прорисовки автомобиля + /// + protected readonly int _tractorHeight = 60; + /// + /// Конструктор + /// + /// Скорость + /// Вес + /// Основной цвет + /// Ширина картинки + /// Высота картинки + public DrawningTractor(int speed, double weight, Color bodyColor, int + width, int height) + { + if (width <= _tractorWidth || height <= _tractorHeight) + return; + _pictureWidth = width; + _pictureHeight = height; + EntityTractor = new EntityTractor(speed, weight, bodyColor); + } + /// + /// Конструктор + /// + /// Скорость + /// Вес + /// Основной цвет + /// Ширина картинки + /// Высота картинки + /// Ширина прорисовки автомобиля + /// Высота прорисовки автомобиля + protected DrawningTractor(int speed, double weight, Color bodyColor, int + width, int height, int tractorWidth, int tractorHeight) + { + if (width <= _tractorWidth || height <= _tractorHeight) + return; + _pictureWidth = width; + _pictureHeight = height; + _tractorWidth = tractorWidth; + _tractorHeight = tractorHeight; + EntityTractor = new EntityTractor(speed, weight, bodyColor); + } + + + /// + /// Координата X объекта + /// + public int GetPosX => _startPosX; + /// + /// Координата Y объекта + /// + public int GetPosY => _startPosY; + /// + /// Ширина объекта + /// + public int GetWidth => _tractorWidth; + /// + /// Высота объекта + /// + public int GetHeight => _tractorHeight; + /// + /// Проверка, что объект может переместится по указанному направлению + /// + /// Направление + /// true - можно переместится по указанномнаправлению + public bool CanMove(DirectionType direction) + { + if (EntityTractor == null) + { + return false; + } + return direction switch + { + //влево + DirectionType.Left => _startPosX - EntityTractor.Step > 0, + //вверх + DirectionType.Up => _startPosY - EntityTractor.Step > 0, + // вправо + DirectionType.Right => _startPosX + EntityTractor.Step + _tractorWidth < _pictureWidth, + //вниз + DirectionType.Down => _startPosY + EntityTractor.Step + _tractorHeight < _pictureHeight, + _ => false, + }; + } + /// + /// Изменение направления перемещения + /// + /// Направление + public void MoveTransport(DirectionType direction) + { + if (!CanMove(direction) || EntityTractor == null) + { + return; + } + switch (direction) + { + //влево + case DirectionType.Left: + _startPosX -= (int)EntityTractor.Step; + break; + //вверх + case DirectionType.Up: + _startPosY -= (int)EntityTractor.Step; + break; + // вправо + case DirectionType.Right: + _startPosX += (int)EntityTractor.Step; + break; + //вниз + case DirectionType.Down: + _startPosY += (int)EntityTractor.Step; + break; + } + } + + + /// + /// Установка позиции + /// + /// Координата X + /// Координата Y + public void SetPosition(int x, int y) + { + if (EntityTractor == null) + return; + _startPosX = x; + _startPosY = y; + if (x + _tractorWidth >= _pictureWidth || y + _tractorHeight >= _pictureHeight) + { + _startPosX = 1; + _startPosY = (_tractorHeight + _tractorHeight) / 2; + } + } + + /// + /// Прорисовка объекта + /// + /// + public virtual void DrawTransport(Graphics g) + { + if (EntityTractor == null) + { + return; + } + Pen pen = new(Color.Black); + Brush brGray = new SolidBrush(Color.Gray); + Brush brBlack = new SolidBrush(Color.Black); + Brush additionalBrush = new + SolidBrush(EntityTractor.BodyColor); + + //Гусеницы + g.FillEllipse(brGray, _startPosX, _startPosY + 41, 25, 25); + g.FillEllipse(brGray, _startPosX + 55, _startPosY + 41, 25, 25); + g.FillRectangle(brGray, _startPosX + 13, _startPosY + 41, 54, 25); + //колеса + g.FillEllipse(brBlack, _startPosX, _startPosY + 45, 15, 15); + g.FillEllipse(brBlack, _startPosX + 65, _startPosY + 45, 15, 15); + g.FillEllipse(brBlack, _startPosX + 35, _startPosY + 55, 10, 10); + g.FillEllipse(brBlack, _startPosX + 20, _startPosY + 55, 10, 10); + g.FillEllipse(brBlack, _startPosX + 50, _startPosY + 55, 10, 10); + g.FillEllipse(brBlack, _startPosX + 25, _startPosY + 40, 10, 10); + g.FillEllipse(brBlack, _startPosX + 45, _startPosY + 40, 10, 10); + //кузов + g.FillRectangle(additionalBrush, _startPosX, _startPosY + 20, 80, 20); + g.FillRectangle(additionalBrush, _startPosX + 60, _startPosY, 10, 20); + g.FillRectangle(additionalBrush, _startPosX, _startPosY, 40, 20); + + //Окно + Brush brBlue = new SolidBrush(Color.Blue); + g.FillRectangle(brBlue, _startPosX + 10, _startPosY + 3, 25, 15); + + //Колеса + g.FillEllipse(additionalBrush, _startPosX + 2, _startPosY + 47, 11, 11); + g.FillEllipse(additionalBrush, _startPosX + 67, _startPosY + 47, 11, 11); + g.FillEllipse(additionalBrush, _startPosX + 37, _startPosY + 57, 6, 6); + g.FillEllipse(additionalBrush, _startPosX + 22, _startPosY + 57, 6, 6); + g.FillEllipse(additionalBrush, _startPosX + 52, _startPosY + 57, 6, 6); + g.FillEllipse(additionalBrush, _startPosX + 27, _startPosY + 42, 6, 6); + g.FillEllipse(additionalBrush, _startPosX + 47, _startPosY + 42, 6, 6); + + //границы трактора + g.DrawRectangle(pen, _startPosX, _startPosY + 20, 80, 20); + g.DrawRectangle(pen, _startPosX + 60, _startPosY, 10, 20); + g.DrawRectangle(pen, _startPosX, _startPosY, 40, 20); + } +} +} + + + + diff --git a/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/BuldoserTractor.cs b/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/EntityBulldoser.cs similarity index 58% rename from RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/BuldoserTractor.cs rename to RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/EntityBulldoser.cs index 7a8c053..29be4a0 100644 --- a/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/BuldoserTractor.cs +++ b/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/EntityBulldoser.cs @@ -9,7 +9,7 @@ namespace RPP_FirstLaba_Tractor.Entities /// /// Класс-сущность "Спортивный автомобиль" /// - public class EntityBuldoserTractor : EntityTractor + public class EntityBulldoser : EntityTractor { /// /// Дополнительный цвет (для опциональных элементов) @@ -18,15 +18,12 @@ namespace RPP_FirstLaba_Tractor.Entities /// /// Признак (опция) наличия обвеса /// - public bool BodyKit { get; private set; } + public bool WheelsOrnament { get; private set; } /// /// Признак (опция) наличия антикрыла /// - public bool Wing { get; private set; } - /// - /// Признак (опция) наличия гоночной полосы - /// - public bool SportLine { get; private set; } + public bool Blade { get; private set; } + /// /// Инициализация полей объекта-класса спортивного автомобиля /// @@ -34,17 +31,15 @@ namespace RPP_FirstLaba_Tractor.Entities /// Вес автомобиля /// Основной цвет /// Дополнительный цвет - /// Признак наличия обвеса - /// Признак наличия антикрыла - /// Признак наличия гоночной полосы - public EntityBuldoserTractor(int speed, double weight, Color bodyColor, Color - additionalColor, bool bodyKit, bool wing, bool sportLine): - base(speed, weight, bodyColor) + /// Признак наличия обвеса + /// Признак наличия отвала + + public EntityBulldoser(int speed, double weight, Color bodyColor, Color + additionalColor, bool wheelsOrnament, bool blade) : base(speed, weight, bodyColor) { AdditionalColor = additionalColor; - BodyKit = bodyKit; - Wing = wing; - SportLine = sportLine; + WheelsOrnament = wheelsOrnament; + Blade = blade; } } diff --git a/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/EntityTractor.cs b/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/EntityTractor.cs new file mode 100644 index 0000000..8a7e41a --- /dev/null +++ b/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/EntityTractor.cs @@ -0,0 +1,44 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace RPP_FirstLaba_Tractor.Entities +{ + /// + /// Класс-сущность "Автомобиль" + /// + public class EntityTractor + { + /// + /// Скорость + /// + public int Speed { get; private set; } + /// + /// Вес + /// + public double Weight { get; private set; } + /// + /// Основной цвет + /// + public Color BodyColor { get; private set; } + /// + /// Шаг перемещения автомобиля + /// + public double Step => (double)Speed * 100 / Weight; + /// + /// Конструктор с параметрами + /// + /// Скорость + /// Вес автомобиля + /// Основной цвет + public EntityTractor(int speed, double weight, Color bodyColor) + { + Speed = speed; + Weight = weight; + BodyColor = bodyColor; + } + + } +} diff --git a/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/FormTractor.cs b/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/FormTractor.cs index 1290570..551ed9f 100644 --- a/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/FormTractor.cs +++ b/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/FormTractor.cs @@ -1,3 +1,4 @@ + using RPP_FirstLaba_Tractor.MovementStrategy; using RPP_FirstLaba_Tractor.DrawningObjects; @@ -125,7 +126,7 @@ namespace RPP_FirstLaba_Tractor this.pictureBoxTractor.Dock = System.Windows.Forms.DockStyle.Fill; this.pictureBoxTractor.Location = new System.Drawing.Point(0, 0); this.pictureBoxTractor.Name = "pictureBoxTractor"; - this.pictureBoxTractor.Size = new System.Drawing.Size(891, 490); + this.pictureBoxTractor.Size = new System.Drawing.Size(882, 453); this.pictureBoxTractor.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; this.pictureBoxTractor.TabIndex = 0; this.pictureBoxTractor.TabStop = false; @@ -133,7 +134,7 @@ namespace RPP_FirstLaba_Tractor // buttonCreateTractor // this.buttonCreateTractor.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.buttonCreateTractor.Location = new System.Drawing.Point(12, 440); + this.buttonCreateTractor.Location = new System.Drawing.Point(12, 403); this.buttonCreateTractor.Name = "buttonCreateTractor"; this.buttonCreateTractor.Size = new System.Drawing.Size(246, 29); this.buttonCreateTractor.TabIndex = 1; @@ -146,7 +147,7 @@ namespace RPP_FirstLaba_Tractor this.buttonTop.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.buttonTop.BackgroundImage = global::RPP_FirstLaba_Tractor.Properties.Resources.arrowUp; this.buttonTop.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.buttonTop.Location = new System.Drawing.Point(813, 412); + this.buttonTop.Location = new System.Drawing.Point(804, 375); this.buttonTop.Name = "buttonTop"; this.buttonTop.Size = new System.Drawing.Size(30, 30); this.buttonTop.TabIndex = 2; @@ -158,7 +159,7 @@ namespace RPP_FirstLaba_Tractor this.buttonLeft.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.buttonLeft.BackgroundImage = global::RPP_FirstLaba_Tractor.Properties.Resources.arrowLeft; this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.buttonLeft.Location = new System.Drawing.Point(777, 448); + this.buttonLeft.Location = new System.Drawing.Point(768, 411); this.buttonLeft.Name = "buttonLeft"; this.buttonLeft.Size = new System.Drawing.Size(30, 30); this.buttonLeft.TabIndex = 3; @@ -170,7 +171,7 @@ namespace RPP_FirstLaba_Tractor this.buttonDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.buttonDown.BackgroundImage = global::RPP_FirstLaba_Tractor.Properties.Resources.arrowDown; this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.buttonDown.Location = new System.Drawing.Point(813, 448); + this.buttonDown.Location = new System.Drawing.Point(804, 411); this.buttonDown.Name = "buttonDown"; this.buttonDown.Size = new System.Drawing.Size(30, 30); this.buttonDown.TabIndex = 4; @@ -182,7 +183,7 @@ namespace RPP_FirstLaba_Tractor this.buttonRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.buttonRight.BackgroundImage = global::RPP_FirstLaba_Tractor.Properties.Resources.arrowRight; this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.buttonRight.Location = new System.Drawing.Point(849, 448); + this.buttonRight.Location = new System.Drawing.Point(840, 411); this.buttonRight.Name = "buttonRight"; this.buttonRight.Size = new System.Drawing.Size(30, 30); this.buttonRight.TabIndex = 5; @@ -192,7 +193,7 @@ namespace RPP_FirstLaba_Tractor // buttonCreateBulldoserTractor // this.buttonCreateBulldoserTractor.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.buttonCreateBulldoserTractor.Location = new System.Drawing.Point(264, 440); + this.buttonCreateBulldoserTractor.Location = new System.Drawing.Point(264, 403); this.buttonCreateBulldoserTractor.Name = "buttonCreateBulldoserTractor"; this.buttonCreateBulldoserTractor.Size = new System.Drawing.Size(199, 29); this.buttonCreateBulldoserTractor.TabIndex = 6; @@ -203,11 +204,11 @@ namespace RPP_FirstLaba_Tractor // buttonStep // this.buttonStep.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.buttonStep.Location = new System.Drawing.Point(785, 46); + this.buttonStep.Location = new System.Drawing.Point(776, 46); this.buttonStep.Name = "buttonStep"; this.buttonStep.Size = new System.Drawing.Size(94, 29); this.buttonStep.TabIndex = 7; - this.buttonStep.Text = "button2"; + this.buttonStep.Text = ""; this.buttonStep.UseVisualStyleBackColor = true; this.buttonStep.Click += new System.EventHandler(this.buttonStep_Click); // @@ -219,14 +220,14 @@ namespace RPP_FirstLaba_Tractor this.comboBoxStrategy.Items.AddRange(new object[] { " ", " "}); - this.comboBoxStrategy.Location = new System.Drawing.Point(728, 12); + this.comboBoxStrategy.Location = new System.Drawing.Point(719, 12); this.comboBoxStrategy.Name = "comboBoxStrategy"; this.comboBoxStrategy.Size = new System.Drawing.Size(151, 28); this.comboBoxStrategy.TabIndex = 8; // // FormTractor // - this.ClientSize = new System.Drawing.Size(891, 490); + this.ClientSize = new System.Drawing.Size(882, 453); this.Controls.Add(this.comboBoxStrategy); this.Controls.Add(this.buttonStep); this.Controls.Add(this.buttonCreateBulldoserTractor); @@ -246,15 +247,15 @@ namespace RPP_FirstLaba_Tractor private void buttonCreateBulldoserTractor_Click(object sender, EventArgs e) { Random random = new(); - _drawningTractor = new DrawningBuldoserTractor(random.Next(100, 300), + _drawningTractor = new DrawningBulldoser(random.Next(100, 300), random.Next(1000, 3000), Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)), Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)), Convert.ToBoolean(random.Next(0, 2)), - Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2)), - buttonCreateBulldoserTractor.Width, buttonCreateBulldoserTractor.Height); + Convert.ToBoolean(random.Next(0, 2)), + pictureBoxTractor.Width, pictureBoxTractor.Height); _drawningTractor.SetPosition(random.Next(10, 100), random.Next(10, 100)); Draw(); @@ -281,7 +282,7 @@ namespace RPP_FirstLaba_Tractor return; } _abstractStrategy.SetData(new - DrawingObjectTractor(_drawningTractor), pictureBoxTractor.Width, + DrawningObjectTractor(_drawningTractor), pictureBoxTractor.Width, pictureBoxTractor.Height); comboBoxStrategy.Enabled = false; } diff --git a/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/IMoveableObject.cs b/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/IMoveableObject.cs index 8c19d9c..7280b11 100644 --- a/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/IMoveableObject.cs +++ b/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/IMoveableObject.cs @@ -3,13 +3,12 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -//using RPP_FirstLaba_Tractor.Drawnings; - namespace RPP_FirstLaba_Tractor.MovementStrategy -{/// - /// Интерфейс для работы с перемещаемым объектом - /// +{ + /// + /// Интерфейс для работы с перемещаемым объектом + /// public interface IMoveableObject { /// diff --git a/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/MoveToBorder.cs b/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/MoveToBorder.cs index c54ee1e..e199e27 100644 --- a/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/MoveToBorder.cs +++ b/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/MoveToBorder.cs @@ -6,7 +6,10 @@ using System.Threading.Tasks; namespace RPP_FirstLaba_Tractor.MovementStrategy { - internal class MoveToBorder: AbstractStrategy + /// + /// Стратегия перемещения объекта в центр экрана + /// + public class MoveToBorder : AbstractStrategy { protected override bool IsTargetDestinaion() { @@ -15,10 +18,10 @@ namespace RPP_FirstLaba_Tractor.MovementStrategy { return false; } - return objParams.RightBorder + GetStep() >= FieldWidth && - objParams.DownBorder + GetStep() >= FieldHeight; + return objParams.RightBorder <= FieldWidth + && objParams.RightBorder + GetStep() >= FieldWidth + && objParams.DownBorder + GetStep() >= FieldHeight; } - protected override void MoveToTarget() { var objParams = GetObjectParameters; @@ -26,15 +29,21 @@ namespace RPP_FirstLaba_Tractor.MovementStrategy { return; } - var diffX = FieldWidth - objParams.RightBorder; - if (diffX > GetStep()) + var diffX = objParams.RightBorder - (FieldWidth - 1); + if (Math.Abs(diffX) > GetStep()) { - MoveRight(); + if (diffX < 0) + { + MoveRight(); + } } - var diffY = FieldHeight - objParams.DownBorder; - if (diffY > GetStep()) + var diffY = objParams.DownBorder - (FieldHeight - 1); + if (Math.Abs(diffY) > GetStep()) { - MoveDown(); + if (diffY < 0) + { + MoveDown(); + } } } } diff --git a/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/MoveToCenter.cs b/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/MoveToCenter.cs index caa4ba2..1e35672 100644 --- a/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/MoveToCenter.cs +++ b/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/MoveToCenter.cs @@ -6,7 +6,10 @@ using System.Threading.Tasks; namespace RPP_FirstLaba_Tractor.MovementStrategy { - internal class MoveToCenter: AbstractStrategy + /// + /// Стратегия перемещения объекта в центр экрана + /// + public class MoveToCenter : AbstractStrategy { protected override bool IsTargetDestinaion() { @@ -54,4 +57,3 @@ namespace RPP_FirstLaba_Tractor.MovementStrategy } } } - diff --git a/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/ObjectParameters.cs b/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/ObjectParameters.cs index 66ea7f7..0ccabc4 100644 --- a/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/ObjectParameters.cs +++ b/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/ObjectParameters.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace RPP_FirstLaba_Tractor +namespace RPP_FirstLaba_Tractor.MovementStrategy { /// /// Параметры-координаты объекта @@ -54,4 +54,5 @@ namespace RPP_FirstLaba_Tractor _height = height; } } + } diff --git a/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/Status.cs b/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/Status.cs index 69d15ec..9303eda 100644 --- a/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/Status.cs +++ b/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/Status.cs @@ -4,14 +4,15 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace RPP_FirstLaba_Tractor +namespace RPP_FirstLaba_Tractor.MovementStrategy { /// /// Статус выполнения операции перемещения /// public enum Status { - NotInit, InProgress, + NotInit, + InProgress, Finish } diff --git a/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/Tractor.cs b/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/Tractor.cs deleted file mode 100644 index f7fab51..0000000 --- a/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/Tractor.cs +++ /dev/null @@ -1,43 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace RPP_FirstLaba_Tractor.Entities; - -/// -/// Класс-сущность "Автомобиль" -/// -public class EntityTractor -{ - /// - /// Скорость - /// - public int Speed { get; private set; } - /// - /// Вес - /// - public double Weight { get; private set; } - /// - /// Основной цвет - /// - public Color BodyColor { get; private set; } - /// - /// Шаг перемещения автомобиля - /// - public double Step => (double)Speed * 100 / Weight; - /// - /// Конструктор с параметрами - /// - /// Скорость - /// Вес автомобиля - /// Основной цвет - public EntityTractor(int speed, double weight, Color bodyColor) - { - Speed = speed; - Weight = weight; - BodyColor = bodyColor; - } -} - -- 2.25.1 From 679f01efecae25a2a120a6588120c2f028ace446 Mon Sep 17 00:00:00 2001 From: KirillFirsof <117719052+KirillFirsof@users.noreply.github.com> Date: Fri, 27 Oct 2023 08:58:51 +0400 Subject: [PATCH 3/4] =?UTF-8?q?=D0=97=D0=B0=D0=BA=D0=BE=D0=BD=D1=87=D0=B5?= =?UTF-8?q?=D0=BD=D0=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor.sln | 2 +- .../RPP_FirstLaba_Tractor/AbstractStrategy.cs | 4 ++-- .../RPP_FirstLaba_Tractor/DirectionType.cs | 2 +- .../RPP_FirstLaba_Tractor/DrawningBulldoser.cs | 5 +++-- .../DrawningObjectTractor.cs | 9 +++++++-- .../RPP_FirstLaba_Tractor/DrawningTractor.cs | 6 +++--- .../RPP_FirstLaba_Tractor/EntityBulldoser.cs | 2 +- .../RPP_FirstLaba_Tractor/EntityTractor.cs | 2 +- .../RPP_FirstLaba_Tractor/FormTractor.cs | 15 ++++++++------- .../RPP_FirstLaba_Tractor/IMoveableObject.cs | 4 +++- .../RPP_FirstLaba_Tractor/MoveToBorder.cs | 2 +- .../RPP_FirstLaba_Tractor/MoveToCenter.cs | 2 +- .../RPP_FirstLaba_Tractor/ObjectParameters.cs | 2 +- .../RPP_FirstLaba_Tractor/Program.cs | 2 +- ...tLaba_Tractor.csproj => ProjectTractor.csproj} | 0 .../Properties/Resources.Designer.cs | 4 ++-- .../RPP_FirstLaba_Tractor/Status.cs | 2 +- 17 files changed, 37 insertions(+), 28 deletions(-) rename RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/{RPP_FirstLaba_Tractor.csproj => ProjectTractor.csproj} (100%) diff --git a/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor.sln b/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor.sln index f5b346e..0be4f9c 100644 --- a/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor.sln +++ b/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor.sln @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.2.32602.215 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RPP_FirstLaba_Tractor", "RPP_FirstLaba_Tractor\RPP_FirstLaba_Tractor.csproj", "{EF413F48-FFBF-4510-BA11-FAEBE7C0142A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ProjectTractor", "RPP_FirstLaba_Tractor\ProjectTractor.csproj", "{EF413F48-FFBF-4510-BA11-FAEBE7C0142A}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/AbstractStrategy.cs b/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/AbstractStrategy.cs index ac1f0f9..f3605ef 100644 --- a/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/AbstractStrategy.cs +++ b/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/AbstractStrategy.cs @@ -3,9 +3,9 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using RPP_FirstLaba_Tractor.DrawningObjects; +using ProjectTractor.DrawningObjects; -namespace RPP_FirstLaba_Tractor.MovementStrategy +namespace ProjectTractor.MovementStrategy { /// /// Класс-стратегия перемещения объекта diff --git a/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/DirectionType.cs b/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/DirectionType.cs index c561ded..5489883 100644 --- a/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/DirectionType.cs +++ b/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/DirectionType.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace RPP_FirstLaba_Tractor +namespace ProjectTractor { public enum DirectionType { diff --git a/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/DrawningBulldoser.cs b/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/DrawningBulldoser.cs index f179a96..ca3eb8a 100644 --- a/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/DrawningBulldoser.cs +++ b/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/DrawningBulldoser.cs @@ -3,9 +3,9 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using RPP_FirstLaba_Tractor.Entities; +using ProjectTractor.Entities; -namespace RPP_FirstLaba_Tractor.DrawningObjects +namespace ProjectTractor.DrawningObjects { /// /// Класс, отвечающий за прорисовку и перемещение объекта-сущности @@ -44,6 +44,7 @@ namespace RPP_FirstLaba_Tractor.DrawningObjects SolidBrush(bulldoser.AdditionalColor); base.DrawTransport(g); + // орнамент на колесах if (bulldoser.WheelsOrnament) { g.FillEllipse(additionalBrush, _startPosX + 2, _startPosY + 47, 11, 11); diff --git a/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/DrawningObjectTractor.cs b/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/DrawningObjectTractor.cs index 969c4ee..48469c8 100644 --- a/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/DrawningObjectTractor.cs +++ b/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/DrawningObjectTractor.cs @@ -3,9 +3,9 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using RPP_FirstLaba_Tractor.DrawningObjects; +using ProjectTractor.DrawningObjects; -namespace RPP_FirstLaba_Tractor.MovementStrategy +namespace ProjectTractor.MovementStrategy { /// /// Реализация интерфейса IDrawningObject для работы с объектом DrawningTractor(паттерн Adapter) @@ -35,6 +35,11 @@ namespace RPP_FirstLaba_Tractor.MovementStrategy _drawningTractor?.CanMove(direction) ?? false; public void MoveObject(DirectionType direction) => _drawningTractor?.MoveTransport(direction); + + public void getData() + { + + } } } diff --git a/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/DrawningTractor.cs b/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/DrawningTractor.cs index a888485..c5af8d8 100644 --- a/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/DrawningTractor.cs +++ b/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/DrawningTractor.cs @@ -3,9 +3,9 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using RPP_FirstLaba_Tractor.Entities; +using ProjectTractor.Entities; -namespace RPP_FirstLaba_Tractor.DrawningObjects { +namespace ProjectTractor.DrawningObjects { /// /// Класс, отвечающий за прорисовку и перемещение объекта-сущности @@ -115,7 +115,7 @@ namespace RPP_FirstLaba_Tractor.DrawningObjects { DirectionType.Up => _startPosY - EntityTractor.Step > 0, // вправо DirectionType.Right => _startPosX + EntityTractor.Step + _tractorWidth < _pictureWidth, - //вниз + // вниз DirectionType.Down => _startPosY + EntityTractor.Step + _tractorHeight < _pictureHeight, _ => false, }; diff --git a/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/EntityBulldoser.cs b/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/EntityBulldoser.cs index 29be4a0..b71fcd3 100644 --- a/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/EntityBulldoser.cs +++ b/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/EntityBulldoser.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace RPP_FirstLaba_Tractor.Entities +namespace ProjectTractor.Entities { /// /// Класс-сущность "Спортивный автомобиль" diff --git a/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/EntityTractor.cs b/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/EntityTractor.cs index 8a7e41a..17d046f 100644 --- a/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/EntityTractor.cs +++ b/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/EntityTractor.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace RPP_FirstLaba_Tractor.Entities +namespace ProjectTractor.Entities { /// /// Класс-сущность "Автомобиль" diff --git a/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/FormTractor.cs b/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/FormTractor.cs index 551ed9f..4dcb86d 100644 --- a/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/FormTractor.cs +++ b/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/FormTractor.cs @@ -1,9 +1,10 @@ -using RPP_FirstLaba_Tractor.MovementStrategy; -using RPP_FirstLaba_Tractor.DrawningObjects; +using ProjectTractor.MovementStrategy; +using ProjectTractor.DrawningObjects; -namespace RPP_FirstLaba_Tractor +namespace ProjectTractor { + /// /// " " /// @@ -145,7 +146,7 @@ namespace RPP_FirstLaba_Tractor // buttonTop // this.buttonTop.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.buttonTop.BackgroundImage = global::RPP_FirstLaba_Tractor.Properties.Resources.arrowUp; + this.buttonTop.BackgroundImage = global::ProjectTractor.Properties.Resources.arrowUp; this.buttonTop.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; this.buttonTop.Location = new System.Drawing.Point(804, 375); this.buttonTop.Name = "buttonTop"; @@ -157,7 +158,7 @@ namespace RPP_FirstLaba_Tractor // buttonLeft // this.buttonLeft.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.buttonLeft.BackgroundImage = global::RPP_FirstLaba_Tractor.Properties.Resources.arrowLeft; + this.buttonLeft.BackgroundImage = global::ProjectTractor.Properties.Resources.arrowLeft; this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; this.buttonLeft.Location = new System.Drawing.Point(768, 411); this.buttonLeft.Name = "buttonLeft"; @@ -169,7 +170,7 @@ namespace RPP_FirstLaba_Tractor // buttonDown // this.buttonDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.buttonDown.BackgroundImage = global::RPP_FirstLaba_Tractor.Properties.Resources.arrowDown; + this.buttonDown.BackgroundImage = global::ProjectTractor.Properties.Resources.arrowDown; this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; this.buttonDown.Location = new System.Drawing.Point(804, 411); this.buttonDown.Name = "buttonDown"; @@ -181,7 +182,7 @@ namespace RPP_FirstLaba_Tractor // buttonRight // this.buttonRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.buttonRight.BackgroundImage = global::RPP_FirstLaba_Tractor.Properties.Resources.arrowRight; + this.buttonRight.BackgroundImage = global::ProjectTractor.Properties.Resources.arrowRight; this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; this.buttonRight.Location = new System.Drawing.Point(840, 411); this.buttonRight.Name = "buttonRight"; diff --git a/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/IMoveableObject.cs b/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/IMoveableObject.cs index 7280b11..0c9d616 100644 --- a/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/IMoveableObject.cs +++ b/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/IMoveableObject.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace RPP_FirstLaba_Tractor.MovementStrategy +namespace ProjectTractor.MovementStrategy { /// /// Интерфейс для работы с перемещаемым объектом @@ -30,6 +30,8 @@ namespace RPP_FirstLaba_Tractor.MovementStrategy /// /// Направление void MoveObject(DirectionType direction); + + } } diff --git a/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/MoveToBorder.cs b/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/MoveToBorder.cs index e199e27..362ec52 100644 --- a/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/MoveToBorder.cs +++ b/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/MoveToBorder.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace RPP_FirstLaba_Tractor.MovementStrategy +namespace ProjectTractor.MovementStrategy { /// /// Стратегия перемещения объекта в центр экрана diff --git a/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/MoveToCenter.cs b/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/MoveToCenter.cs index 1e35672..48d09d4 100644 --- a/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/MoveToCenter.cs +++ b/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/MoveToCenter.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace RPP_FirstLaba_Tractor.MovementStrategy +namespace ProjectTractor.MovementStrategy { /// /// Стратегия перемещения объекта в центр экрана diff --git a/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/ObjectParameters.cs b/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/ObjectParameters.cs index 0ccabc4..e75f70f 100644 --- a/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/ObjectParameters.cs +++ b/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/ObjectParameters.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace RPP_FirstLaba_Tractor.MovementStrategy +namespace ProjectTractor.MovementStrategy { /// /// Параметры-координаты объекта diff --git a/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/Program.cs b/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/Program.cs index 7556447..61dbba1 100644 --- a/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/Program.cs +++ b/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/Program.cs @@ -1,4 +1,4 @@ -namespace RPP_FirstLaba_Tractor +namespace ProjectTractor { internal static class Program { diff --git a/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor.csproj b/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/ProjectTractor.csproj similarity index 100% rename from RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor.csproj rename to RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/ProjectTractor.csproj diff --git a/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/Properties/Resources.Designer.cs b/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/Properties/Resources.Designer.cs index 86bf022..112e027 100644 --- a/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/Properties/Resources.Designer.cs +++ b/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/Properties/Resources.Designer.cs @@ -8,7 +8,7 @@ // //------------------------------------------------------------------------------ -namespace RPP_FirstLaba_Tractor.Properties { +namespace ProjectTractor.Properties { using System; @@ -39,7 +39,7 @@ namespace RPP_FirstLaba_Tractor.Properties { internal static global::System.Resources.ResourceManager ResourceManager { get { if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("RPP_FirstLaba_Tractor.Properties.Resources", typeof(Resources).Assembly); + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("ProjectTractor.Properties.Resources", typeof(Resources).Assembly); resourceMan = temp; } return resourceMan; diff --git a/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/Status.cs b/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/Status.cs index 9303eda..6cb1b3d 100644 --- a/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/Status.cs +++ b/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/Status.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace RPP_FirstLaba_Tractor.MovementStrategy +namespace ProjectTractor.MovementStrategy { /// /// Статус выполнения операции перемещения -- 2.25.1 From 07e6b5fba6a6aa2da241f92e13b88327dadd038a Mon Sep 17 00:00:00 2001 From: KirillFirsof <117719052+KirillFirsof@users.noreply.github.com> Date: Sat, 28 Oct 2023 22:37:28 +0400 Subject: [PATCH 4/4] =?UTF-8?q?=D0=9A=D0=BE=D0=BC=D0=BC=D0=B8=D1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ..._FirstLaba_Tractor.sln => RPP_Firsov_Kirill_Tractor_basis.sln} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename RPP_FirstLaba_Tractor/{RPP_FirstLaba_Tractor.sln => RPP_Firsov_Kirill_Tractor_basis.sln} (100%) diff --git a/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor.sln b/RPP_FirstLaba_Tractor/RPP_Firsov_Kirill_Tractor_basis.sln similarity index 100% rename from RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor.sln rename to RPP_FirstLaba_Tractor/RPP_Firsov_Kirill_Tractor_basis.sln -- 2.25.1