From 7cfeb2070a2c31263011f4f769f950053f3200f7 Mon Sep 17 00:00:00 2001 From: Sem730 Date: Thu, 22 Dec 2022 18:38:49 +0300 Subject: [PATCH 1/2] =?UTF-8?q?=D0=BA=D0=BE=D0=BC=D0=B8=D1=821?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectLocomotive_Hard/AbstractMap.cs | 145 ++++++++++++ .../ProjectLocomotive_Hard/Direction.cs | 1 + .../DrawningElectroLocomotive.cs | 53 +++++ .../DrawningLocomotive.cs | 43 +++- .../DrawningLocomotiveWheel.cs | 4 +- .../ProjectLocomotive_Hard/DrawningObject.cs | 37 +++ .../EntityElectricLocomotive.cs | 42 ++++ .../EntityLocomotive.cs | 2 +- .../FormLocomotive.Designer.cs | 13 ++ .../ProjectLocomotive_Hard/FormLocomotive.cs | 37 ++- .../FormMap.Designer.cs | 218 ++++++++++++++++++ .../ProjectLocomotive_Hard/FormMap.cs | 105 +++++++++ .../ProjectLocomotive_Hard/FormMap.resx | 120 ++++++++++ .../ProjectLocomotive_Hard/IDrawningObject.cs | 43 ++++ .../ILocomotiveWheel.cs | 14 ++ .../LocomotiveRectangleWheel.cs | 67 ++++++ .../LocomotiveSquareWheel.cs | 67 ++++++ .../ProjectLocomotive_Hard/Program.cs | 2 +- .../Resources/ArrowDown.png | Bin 0 -> 483 bytes .../Resources/ArrowLeft.png | Bin 0 -> 444 bytes .../Resources/ArrowRight.png | Bin 0 -> 464 bytes .../Resources/ArrowUp.png | Bin 0 -> 459 bytes .../ProjectLocomotive_Hard/SeaMap.cs | 52 +++++ .../ProjectLocomotive_Hard/SimpleMap.cs | 56 +++++ 24 files changed, 1097 insertions(+), 24 deletions(-) create mode 100644 ProjectLocomotive_Hard/ProjectLocomotive_Hard/AbstractMap.cs create mode 100644 ProjectLocomotive_Hard/ProjectLocomotive_Hard/DrawningElectroLocomotive.cs create mode 100644 ProjectLocomotive_Hard/ProjectLocomotive_Hard/DrawningObject.cs create mode 100644 ProjectLocomotive_Hard/ProjectLocomotive_Hard/EntityElectricLocomotive.cs create mode 100644 ProjectLocomotive_Hard/ProjectLocomotive_Hard/FormMap.Designer.cs create mode 100644 ProjectLocomotive_Hard/ProjectLocomotive_Hard/FormMap.cs create mode 100644 ProjectLocomotive_Hard/ProjectLocomotive_Hard/FormMap.resx create mode 100644 ProjectLocomotive_Hard/ProjectLocomotive_Hard/IDrawningObject.cs create mode 100644 ProjectLocomotive_Hard/ProjectLocomotive_Hard/ILocomotiveWheel.cs create mode 100644 ProjectLocomotive_Hard/ProjectLocomotive_Hard/LocomotiveRectangleWheel.cs create mode 100644 ProjectLocomotive_Hard/ProjectLocomotive_Hard/LocomotiveSquareWheel.cs create mode 100644 ProjectLocomotive_Hard/ProjectLocomotive_Hard/Resources/ArrowDown.png create mode 100644 ProjectLocomotive_Hard/ProjectLocomotive_Hard/Resources/ArrowLeft.png create mode 100644 ProjectLocomotive_Hard/ProjectLocomotive_Hard/Resources/ArrowRight.png create mode 100644 ProjectLocomotive_Hard/ProjectLocomotive_Hard/Resources/ArrowUp.png create mode 100644 ProjectLocomotive_Hard/ProjectLocomotive_Hard/SeaMap.cs create mode 100644 ProjectLocomotive_Hard/ProjectLocomotive_Hard/SimpleMap.cs diff --git a/ProjectLocomotive_Hard/ProjectLocomotive_Hard/AbstractMap.cs b/ProjectLocomotive_Hard/ProjectLocomotive_Hard/AbstractMap.cs new file mode 100644 index 0000000..e4507ca --- /dev/null +++ b/ProjectLocomotive_Hard/ProjectLocomotive_Hard/AbstractMap.cs @@ -0,0 +1,145 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ProjectLocomotive_Hard +{ + internal abstract class AbstractMap + { + private IDrawningObject _drawningObject = null; + protected int[,] _map = null; + protected int _width; + protected int _height; + protected float _size_x; + protected float _size_y; + protected readonly Random _random = new(); + protected readonly int _freeRoad = 0; + protected readonly int _barrier = 1; + + public Bitmap CreateMap(int width, int height, IDrawningObject drawningObject) + { + _width = width; + _height = height; + _drawningObject = drawningObject; + GenerateMap(); + while (!SetObjectOnMap()) + { + GenerateMap(); + } + return DrawMapWithObject(); + } + public bool CheckAround(float Left, float Right, float Top, float Bottom) + { + int startX = (int)(Left / _size_x); + int startY = (int)(Right / _size_y); + int endX = (int)(Top / _size_x); + int endY = (int)(Bottom / _size_y); + + for (int i = startX; i <= endX; i++) + { + for (int j = startY; j <= endY; j++) + { + if (_map[i, j] == _barrier) + { + return true; + } + } + } + return false; + } + public Bitmap MoveObject(Direction direction) + { + _drawningObject.MoveObject(direction); + (float Left, float Right, float Top, float Bottom) = _drawningObject.GetCurrentPosition(); + + if (CheckAround(Left, Right, Top, Bottom)) + { + _drawningObject.MoveObject(MoveObjectBack(direction)); + } + return DrawMapWithObject(); + + } + private Direction MoveObjectBack(Direction direction) + { + switch (direction) + { + case Direction.Up: + return Direction.Down; + case Direction.Down: + return Direction.Up; + case Direction.Left: + return Direction.Right; + case Direction.Right: + return Direction.Left; + } + return Direction.None; + } + private bool SetObjectOnMap() + { + if (_drawningObject == null || _map == null) + { + return false; + } + int x = _random.Next(0, 10); + int y = _random.Next(0, 10); + _drawningObject.SetObject(x, y, _width, _height); + (float Left, float Right, float Top, float Bottom) = _drawningObject.GetCurrentPosition(); + if (!CheckAround(Left, Right, Top, Bottom)) return true; + float startX = Left; + float startY = Right; + float lengthX = Top - Left; + float lengthY = Bottom - Right; + while (CheckAround(startX, startY, startX + lengthX, startY + lengthY)) + { + bool result; + do + { + result = CheckAround(startX, startY, startX + lengthX, startY + lengthY); + if (!result) + { + _drawningObject.SetObject((int)startX, (int)startY, _width, _height); + return true; + } + else + { + startX += _size_x; + } + } while (result); + startX = x; + startY += _size_y; + } + return false; + } + private Bitmap DrawMapWithObject() + { + Bitmap bmp = new(_width, _height); + if (_drawningObject == null || _map == null) + { + return bmp; + } + Graphics gr = Graphics.FromImage(bmp); + for (int i = 0; i < _map.GetLength(0); ++i) + { + for (int j = 0; j < _map.GetLength(1); ++j) + { + if (_map[i, j] == _freeRoad) + { + DrawRoadPart(gr, i, j); + } + else if (_map[i, j] == _barrier) + { + DrawBarrierPart(gr, i, j); + } + } + } + _drawningObject.DrawningObject(gr); + return bmp; + } + + protected abstract void GenerateMap(); + protected abstract void DrawRoadPart(Graphics g, int i, int j); + protected abstract void DrawBarrierPart(Graphics g, int i, int j); + } +} diff --git a/ProjectLocomotive_Hard/ProjectLocomotive_Hard/Direction.cs b/ProjectLocomotive_Hard/ProjectLocomotive_Hard/Direction.cs index 9ab46d7..1c2a499 100644 --- a/ProjectLocomotive_Hard/ProjectLocomotive_Hard/Direction.cs +++ b/ProjectLocomotive_Hard/ProjectLocomotive_Hard/Direction.cs @@ -8,6 +8,7 @@ namespace ProjectLocomotive_Hard { internal enum Direction { + None = 0, Up = 1, Down = 2, Left = 3, diff --git a/ProjectLocomotive_Hard/ProjectLocomotive_Hard/DrawningElectroLocomotive.cs b/ProjectLocomotive_Hard/ProjectLocomotive_Hard/DrawningElectroLocomotive.cs new file mode 100644 index 0000000..22e3a84 --- /dev/null +++ b/ProjectLocomotive_Hard/ProjectLocomotive_Hard/DrawningElectroLocomotive.cs @@ -0,0 +1,53 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ProjectLocomotive_Hard +{ + internal class DrawningElectroLocomotive : DrawningLocomotive + { + /// + /// Инициализация свойств + /// + /// Скорость + /// Вес автомобиля + /// Цвет кузова + /// Дополнительный цвет + /// Признак наличия "рогов" для подключения + /// Признак наличия отсека электро-батарей + public DrawningElectroLocomotive(int speed, float weight, Color bodyColor, Color + dopColor, bool electroLines, bool electroBattery, ILocomotiveWheel? typeLocomotiveWheel = null) : + base(speed, weight, bodyColor, 110, 60, typeLocomotiveWheel) + { + Locomotivе = new EntityElectricLocomotive(speed, weight, bodyColor, dopColor, electroLines, + electroBattery); + } + public override void DrawTransport(Graphics g) + { + if (Locomotivе is not EntityElectricLocomotive elLocc) + { + return; + } + Pen pen = new(Color.Black); + Brush dopBrush = new SolidBrush(elLocc.DopColor); + if (elLocc.ElectroLines) + { + g.DrawLine(pen, _startPosX + 20, _startPosY, _startPosX + 5, _startPosY - 12); + g.DrawLine(pen, _startPosX + 20, _startPosY, _startPosX + 35, _startPosY - 12); + g.DrawLine(pen, _startPosX + 70, _startPosY, _startPosX + 55, _startPosY - 12); + g.DrawLine(pen, _startPosX + 70, _startPosY, _startPosX + 85, _startPosY - 12); + + } + base.DrawTransport(g); + if (elLocc.ElectroBattery) + { + Brush brblack = new SolidBrush(Color.Black); + g.FillRectangle(brblack, _startPosX + 40, _startPosY + 25, 15, 5); + g.FillRectangle(brblack, _startPosX + 60, _startPosY + 25, 15, 5); + g.FillRectangle(brblack, _startPosX + 5, _startPosY + 25, 15, 5); + } + } + } +} diff --git a/ProjectLocomotive_Hard/ProjectLocomotive_Hard/DrawningLocomotive.cs b/ProjectLocomotive_Hard/ProjectLocomotive_Hard/DrawningLocomotive.cs index 1ef2e13..ed103cb 100644 --- a/ProjectLocomotive_Hard/ProjectLocomotive_Hard/DrawningLocomotive.cs +++ b/ProjectLocomotive_Hard/ProjectLocomotive_Hard/DrawningLocomotive.cs @@ -14,16 +14,18 @@ namespace ProjectLocomotive_Hard /// /// Класс-сущность /// - public EntityLocomotive Locomotivе { private set; get; } - public DrawningLocomotiveWheel DrawningWheel { get; private set; } + public EntityLocomotive Locomotivе { get; protected set; } + // + //public DrawningLocomotiveWheel DrawningWheel { get; private set; } + public ILocomotiveWheel? DrawningWheels { get; private set; } /// /// Левая координата отрисовки локомотива /// - private float _startPosX; + protected float _startPosX; /// /// Верхняя кооридната отрисовки локомотива /// - private float _startPosY; + protected float _startPosY; /// /// Ширина окна отрисовки /// @@ -46,15 +48,28 @@ namespace ProjectLocomotive_Hard /// Скорость /// Вес локомотива /// Цвет кузова - public void Init(int speed, float weight, Color bodyColor) + public DrawningLocomotive(int speed, float weight, Color bodyColor, ILocomotiveWheel? typeLocomotiveWheel = null) { - Locomotivе = new EntityLocomotive(); - Locomotivе.Init(speed, weight, bodyColor); - DrawningWheel = new(); - DrawningWheel.SetCountWheel = 4; + Locomotivе = new EntityLocomotive(speed, weight, bodyColor); + DrawningWheels = typeLocomotiveWheel; } /// - /// Установка позиции автомобиля + /// Инициализация свойств + /// + /// Скорость + /// Вес автомобиля + /// Цвет кузова + /// Ширина отрисовки локомотива + /// Высота отрисовки локомотива + protected DrawningLocomotive(int speed, float weight, Color bodyColor, int + locWidth, int locHeight, ILocomotiveWheel? typeLocomotiveWheel) : + this(speed, weight, bodyColor, typeLocomotiveWheel) + { + _LocWidth = locWidth; + _LocHeight = locHeight; + } + /// + /// Установка позиции локомотива /// /// Координата X /// Координата Y @@ -122,7 +137,7 @@ namespace ProjectLocomotive_Hard /// Отрисовка автомобиля /// /// - public void DrawTransport(Graphics g) + public virtual void DrawTransport(Graphics g) { if (_startPosX < 0 || _startPosY < 0 || !_pictureHeight.HasValue || !_pictureWidth.HasValue) @@ -160,7 +175,7 @@ namespace ProjectLocomotive_Hard g.DrawLine(pen, _startPosX + 140, _startPosY + 25, _startPosX + 140, _startPosY + 10); g.DrawLine(pen, _startPosX + 140, _startPosY + 10, _startPosX + 90, _startPosY + 10); g.DrawLine(pen, _startPosX + 90, _startPosY + 10, _startPosX + 90, _startPosY + 25); - DrawningWheel.DrawningWheel(g, _startPosX, _startPosY); + DrawningWheels?.DrawningWheel(g, Locomotivе.BodyColor, _startPosX, _startPosY); } /// /// Смена границ формы отрисовки @@ -186,5 +201,9 @@ namespace ProjectLocomotive_Hard _startPosY = _pictureHeight.Value - _LocHeight; } } + public (float Left, float Right, float Top, float Bottom) GetCurrentPosition() + { + return (_startPosX, _startPosY, _startPosX + _LocWidth, _startPosY + _LocHeight); + } } } diff --git a/ProjectLocomotive_Hard/ProjectLocomotive_Hard/DrawningLocomotiveWheel.cs b/ProjectLocomotive_Hard/ProjectLocomotive_Hard/DrawningLocomotiveWheel.cs index b902787..a7aa41b 100644 --- a/ProjectLocomotive_Hard/ProjectLocomotive_Hard/DrawningLocomotiveWheel.cs +++ b/ProjectLocomotive_Hard/ProjectLocomotive_Hard/DrawningLocomotiveWheel.cs @@ -39,10 +39,10 @@ namespace ProjectLocomotive_Hard } /// Отрисовывает колёса /// The g. - ///// Цвет колёс. + ///Цвет колёс. /// начальная позиция по x /// начальная позиция по y - public void DrawningWheel(Graphics g, float PosX, float PosY) + public void DrawningWheel(Graphics g, Color bodyColor, float PosX, float PosY) { if ((int)_countWheel == 2) { diff --git a/ProjectLocomotive_Hard/ProjectLocomotive_Hard/DrawningObject.cs b/ProjectLocomotive_Hard/ProjectLocomotive_Hard/DrawningObject.cs new file mode 100644 index 0000000..30e266a --- /dev/null +++ b/ProjectLocomotive_Hard/ProjectLocomotive_Hard/DrawningObject.cs @@ -0,0 +1,37 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ProjectLocomotive_Hard +{ + internal class DrawningObject : IDrawningObject + { + private DrawningLocomotive _loc = null; + public DrawningObject(DrawningLocomotive loc) + { + _loc = loc; + } + public float Step => _loc?.Locomotivе?.Step ?? 0; + + public (float Left, float Right, float Top, float Bottom) GetCurrentPosition() + { + return _loc?.GetCurrentPosition() ?? default; + } + public void MoveObject(Direction direction) + { + _loc?.MoveTransport(direction); + } + public void SetObject(int x, int y, int width, int height) + { + _loc.SetPosition(x, y, width, height); + } + + void IDrawningObject.DrawningObject(Graphics g) + { + // TODO + _loc.DrawTransport(g); + } + } +} diff --git a/ProjectLocomotive_Hard/ProjectLocomotive_Hard/EntityElectricLocomotive.cs b/ProjectLocomotive_Hard/ProjectLocomotive_Hard/EntityElectricLocomotive.cs new file mode 100644 index 0000000..5aee367 --- /dev/null +++ b/ProjectLocomotive_Hard/ProjectLocomotive_Hard/EntityElectricLocomotive.cs @@ -0,0 +1,42 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ProjectLocomotive_Hard +{ + internal class EntityElectricLocomotive : EntityLocomotive + { + /// + /// Дополнительный цвет + /// + public Color DopColor { get; private set; } + /// + /// Признак наличия "рогов" для подключения + /// + public bool ElectroLines { get; private set; } + /// + /// Признак наличия отсека электро-батарей + /// + public bool ElectroBattery { get; private set; } + /// + /// Инициализация свойств + /// + /// Скорость + /// Вес автомобиля + /// Цвет кузова + /// Дополнительный цвет + /// Признак наличия "рогов" для подключения + /// Признак наличия отсека электро-батарей + + public EntityElectricLocomotive(int speed, float weight, Color bodyColor, Color + dopColor, bool electroLines, bool electroBattery) : + base(speed, weight, bodyColor) + { + DopColor = dopColor; + ElectroLines = electroLines = true; + ElectroBattery = electroBattery = true; + } + } +} diff --git a/ProjectLocomotive_Hard/ProjectLocomotive_Hard/EntityLocomotive.cs b/ProjectLocomotive_Hard/ProjectLocomotive_Hard/EntityLocomotive.cs index 6576382..4d9f82f 100644 --- a/ProjectLocomotive_Hard/ProjectLocomotive_Hard/EntityLocomotive.cs +++ b/ProjectLocomotive_Hard/ProjectLocomotive_Hard/EntityLocomotive.cs @@ -31,7 +31,7 @@ namespace ProjectLocomotive_Hard /// /// /// - public void Init(int speed, float weight, Color bodyColor) + public EntityLocomotive(int speed, float weight, Color bodyColor) { Random rnd = new(); Speed = speed <= 0 ? rnd.Next(50, 150) : speed; diff --git a/ProjectLocomotive_Hard/ProjectLocomotive_Hard/FormLocomotive.Designer.cs b/ProjectLocomotive_Hard/ProjectLocomotive_Hard/FormLocomotive.Designer.cs index 7cfdf92..196ab2b 100644 --- a/ProjectLocomotive_Hard/ProjectLocomotive_Hard/FormLocomotive.Designer.cs +++ b/ProjectLocomotive_Hard/ProjectLocomotive_Hard/FormLocomotive.Designer.cs @@ -34,6 +34,7 @@ this.buttonLeft = new System.Windows.Forms.Button(); this.buttonDown = new System.Windows.Forms.Button(); this.buttonRight = new System.Windows.Forms.Button(); + this.buttonCreateModif = new System.Windows.Forms.Button(); this.toolStripStatusLabelSpeed = new System.Windows.Forms.ToolStripStatusLabel(); this.toolStripStatusLabelWeight = new System.Windows.Forms.ToolStripStatusLabel(); this.toolStripStatusLabelBodyColor = new System.Windows.Forms.ToolStripStatusLabel(); @@ -117,7 +118,17 @@ this.buttonRight.UseVisualStyleBackColor = true; this.buttonRight.Click += new System.EventHandler(this.ButtonMove_Click); this.buttonRight.Resize += new System.EventHandler(this.PictureBoxLocomotive_Resize); + // + // buttonCreateModif // + this.buttonCreateModif.Location = new System.Drawing.Point(120, 375); + this.buttonCreateModif.Name = "buttonCreateModif"; + this.buttonCreateModif.Size = new System.Drawing.Size(138, 30); + this.buttonCreateModif.TabIndex = 7; + this.buttonCreateModif.Text = "Модификация"; + this.buttonCreateModif.UseVisualStyleBackColor = true; + this.buttonCreateModif.Click += new System.EventHandler(this.ButtonCreateModif_Click); + // // toolStripStatusLabelSpeed // this.toolStripStatusLabelSpeed.Name = "toolStripStatusLabelSpeed"; @@ -196,6 +207,7 @@ this.Controls.Add(this.buttonDown); this.Controls.Add(this.buttonLeft); this.Controls.Add(this.buttonUp); + this.Controls.Add(this.buttonCreateModif); this.Controls.Add(this.buttonCreate); this.Controls.Add(this.pictureBoxLocomotive); this.Controls.Add(this.statusStrip); @@ -224,5 +236,6 @@ private Label labelDecksCount; private NumericUpDown countDecksBox; private ToolStripStatusLabel toolStripStatusCountDecks; + private Button buttonCreateModif; } } \ No newline at end of file diff --git a/ProjectLocomotive_Hard/ProjectLocomotive_Hard/FormLocomotive.cs b/ProjectLocomotive_Hard/ProjectLocomotive_Hard/FormLocomotive.cs index d62dff1..b35c252 100644 --- a/ProjectLocomotive_Hard/ProjectLocomotive_Hard/FormLocomotive.cs +++ b/ProjectLocomotive_Hard/ProjectLocomotive_Hard/FormLocomotive.cs @@ -28,6 +28,18 @@ namespace ProjectLocomotive_Hard pictureBoxLocomotive.Image = bmp; } /// + /// Метод установки данных + /// + private void SetData() + { + Random rnd = new(); + _elloc.SetPosition(rnd.Next(10, 100), rnd.Next(10, 100), pictureBoxLocomotive.Width, pictureBoxLocomotive.Height); + _elloc.DrawningWheels.SetCountWheel = ((int)countDecksBox.Value); + toolStripStatusLabelSpeed.Text = $"Скорость: {_elloc.Locomotivе.Speed}"; + toolStripStatusLabelWeight.Text = $"Вес: {_elloc.Locomotivе.Weight}"; + toolStripStatusLabelBodyColor.Text = $"Цвет: {_elloc.Locomotivе.BodyColor.Name}"; + } + /// /// Обработка нажатия кнопки "Создать" /// /// @@ -35,14 +47,8 @@ namespace ProjectLocomotive_Hard private void ButtonCreate_Click(object sender, EventArgs e) { Random rnd = new(); - _elloc = new DrawningLocomotive(); - _elloc.Init(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256))); - _elloc.DrawningWheel.SetCountWheel = ((int)countDecksBox.Value); - _elloc.SetPosition(rnd.Next(10, 100), rnd.Next(10, 100), pictureBoxLocomotive.Width, pictureBoxLocomotive.Height); - toolStripStatusLabelSpeed.Text = $"Скорость: {_elloc.Locomotivе.Speed}"; - toolStripStatusLabelWeight.Text = $"Вес: {_elloc.Locomotivе.Weight}"; - toolStripStatusLabelBodyColor.Text = $"Цвет: {_elloc.Locomotivе.BodyColor.Name}"; - toolStripStatusCountDecks.Text = $"Количество колёс: {(int)countDecksBox.Value}"; + _elloc = new DrawningLocomotive(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256))); + SetData(); Draw(); } /// @@ -81,5 +87,20 @@ namespace ProjectLocomotive_Hard _elloc?.ChangeBorders(pictureBoxLocomotive.Width, pictureBoxLocomotive.Height); Draw(); } + /// + /// Обработка нажатия кнопки "Модификация" + /// + /// + /// + private void ButtonCreateModif_Click(object sender, EventArgs e) + { + Random rnd = new(); + _elloc = new DrawningElectroLocomotive(rnd.Next(100, 300), rnd.Next(1000, 2000), + Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)), + Color.FromArgb(rnd.Next(1, 100), rnd.Next(1, 100), rnd.Next(1, 100)), + Convert.ToBoolean(rnd.Next(0, 1)), Convert.ToBoolean(rnd.Next(0, 1))); + SetData(); + Draw(); + } } } diff --git a/ProjectLocomotive_Hard/ProjectLocomotive_Hard/FormMap.Designer.cs b/ProjectLocomotive_Hard/ProjectLocomotive_Hard/FormMap.Designer.cs new file mode 100644 index 0000000..cadcb50 --- /dev/null +++ b/ProjectLocomotive_Hard/ProjectLocomotive_Hard/FormMap.Designer.cs @@ -0,0 +1,218 @@ +namespace ProjectLocomotive_Hard +{ + partial class FormMap + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.pictureBoxCar = new System.Windows.Forms.PictureBox(); + this.statusStrip = new System.Windows.Forms.StatusStrip(); + this.toolStripStatusLabelSpeed = new System.Windows.Forms.ToolStripStatusLabel(); + this.toolStripStatusLabelWeight = new System.Windows.Forms.ToolStripStatusLabel(); + this.toolStripStatusLabelBodyColor = new System.Windows.Forms.ToolStripStatusLabel(); + this.buttonCreate = new System.Windows.Forms.Button(); + this.buttonUp = new System.Windows.Forms.Button(); + this.buttonLeft = new System.Windows.Forms.Button(); + this.buttonRight = new System.Windows.Forms.Button(); + this.buttonDown = new System.Windows.Forms.Button(); + this.buttonCreateModif = new System.Windows.Forms.Button(); + this.comboBoxSelectorMap = new System.Windows.Forms.ComboBox(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBoxCar)).BeginInit(); + this.statusStrip.SuspendLayout(); + this.SuspendLayout(); + // + // pictureBoxCar + // + this.pictureBoxCar.Dock = System.Windows.Forms.DockStyle.Fill; + this.pictureBoxCar.Location = new System.Drawing.Point(0, 0); + this.pictureBoxCar.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.pictureBoxCar.Name = "pictureBoxCar"; + this.pictureBoxCar.Size = new System.Drawing.Size(1143, 718); + this.pictureBoxCar.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; + this.pictureBoxCar.TabIndex = 0; + this.pictureBoxCar.TabStop = false; + // + // statusStrip + // + this.statusStrip.ImageScalingSize = new System.Drawing.Size(24, 24); + this.statusStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.toolStripStatusLabelSpeed, + this.toolStripStatusLabelWeight, + this.toolStripStatusLabelBodyColor}); + this.statusStrip.Location = new System.Drawing.Point(0, 718); + this.statusStrip.Name = "statusStrip"; + this.statusStrip.Padding = new System.Windows.Forms.Padding(1, 0, 20, 0); + this.statusStrip.Size = new System.Drawing.Size(1143, 32); + this.statusStrip.TabIndex = 1; + // + // toolStripStatusLabelSpeed + // + this.toolStripStatusLabelSpeed.Name = "toolStripStatusLabelSpeed"; + this.toolStripStatusLabelSpeed.Size = new System.Drawing.Size(93, 25); + this.toolStripStatusLabelSpeed.Text = "Скорость:"; + // + // toolStripStatusLabelWeight + // + this.toolStripStatusLabelWeight.Name = "toolStripStatusLabelWeight"; + this.toolStripStatusLabelWeight.Size = new System.Drawing.Size(43, 25); + this.toolStripStatusLabelWeight.Text = "Вес:"; + // + // toolStripStatusLabelBodyColor + // + this.toolStripStatusLabelBodyColor.Name = "toolStripStatusLabelBodyColor"; + this.toolStripStatusLabelBodyColor.Size = new System.Drawing.Size(55, 25); + this.toolStripStatusLabelBodyColor.Text = "Цвет:"; + // + // buttonCreate + // + this.buttonCreate.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.buttonCreate.Location = new System.Drawing.Point(17, 650); + this.buttonCreate.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.buttonCreate.Name = "buttonCreate"; + this.buttonCreate.Size = new System.Drawing.Size(107, 38); + this.buttonCreate.TabIndex = 2; + this.buttonCreate.Text = "Создать"; + this.buttonCreate.UseVisualStyleBackColor = true; + this.buttonCreate.Click += new System.EventHandler(this.ButtonCreate_Click); + // + // buttonUp + // + this.buttonUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.buttonUp.BackgroundImage = global::ProjectLocomotive_Hard.Properties.Resources.up; + this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.buttonUp.Location = new System.Drawing.Point(1031, 583); + this.buttonUp.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.buttonUp.Name = "buttonUp"; + this.buttonUp.Size = new System.Drawing.Size(43, 50); + this.buttonUp.TabIndex = 3; + this.buttonUp.UseVisualStyleBackColor = true; + this.buttonUp.Click += new System.EventHandler(this.ButtonMove_Click); + // + // buttonLeft + // + this.buttonLeft.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.buttonLeft.BackgroundImage = global::ProjectLocomotive_Hard.Properties.Resources.left; + this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.buttonLeft.Location = new System.Drawing.Point(980, 643); + this.buttonLeft.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.buttonLeft.Name = "buttonLeft"; + this.buttonLeft.Size = new System.Drawing.Size(43, 50); + this.buttonLeft.TabIndex = 4; + this.buttonLeft.UseVisualStyleBackColor = true; + this.buttonLeft.Click += new System.EventHandler(this.ButtonMove_Click); + // + // buttonRight + // + this.buttonRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.buttonRight.BackgroundImage = global::ProjectLocomotive_Hard.Properties.Resources.right; + this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.buttonRight.Location = new System.Drawing.Point(1083, 643); + this.buttonRight.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.buttonRight.Name = "buttonRight"; + this.buttonRight.Size = new System.Drawing.Size(43, 50); + this.buttonRight.TabIndex = 5; + this.buttonRight.UseVisualStyleBackColor = true; + this.buttonRight.Click += new System.EventHandler(this.ButtonMove_Click); + // + // buttonDown + // + this.buttonDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.buttonDown.BackgroundImage = global::ProjectLocomotive_Hard.Properties.Resources.down; + this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.buttonDown.Location = new System.Drawing.Point(1031, 643); + this.buttonDown.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.buttonDown.Name = "buttonDown"; + this.buttonDown.Size = new System.Drawing.Size(43, 50); + this.buttonDown.TabIndex = 6; + this.buttonDown.UseVisualStyleBackColor = true; + this.buttonDown.Click += new System.EventHandler(this.ButtonMove_Click); + // + // buttonCreateModif + // + this.buttonCreateModif.Location = new System.Drawing.Point(149, 650); + this.buttonCreateModif.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.buttonCreateModif.Name = "buttonCreateModif"; + this.buttonCreateModif.Size = new System.Drawing.Size(157, 38); + this.buttonCreateModif.TabIndex = 7; + this.buttonCreateModif.Text = "Модификация"; + this.buttonCreateModif.UseVisualStyleBackColor = true; + this.buttonCreateModif.Click += new System.EventHandler(this.ButtonCreateModif_Click); + // + // comboBoxSelectorMap + // + this.comboBoxSelectorMap.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.comboBoxSelectorMap.FormattingEnabled = true; + this.comboBoxSelectorMap.Items.AddRange(new object[] { + "Простая карта", + "Море"}); + this.comboBoxSelectorMap.Location = new System.Drawing.Point(17, 20); + this.comboBoxSelectorMap.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.comboBoxSelectorMap.Name = "comboBoxSelectorMap"; + this.comboBoxSelectorMap.Size = new System.Drawing.Size(171, 33); + this.comboBoxSelectorMap.TabIndex = 8; + this.comboBoxSelectorMap.SelectedIndexChanged += new System.EventHandler(this.ComboBoxSelectorMap_SelectedIndexChanged); + // + // FormMap + // + this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 25F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(1143, 750); + this.Controls.Add(this.comboBoxSelectorMap); + this.Controls.Add(this.buttonCreateModif); + this.Controls.Add(this.buttonDown); + this.Controls.Add(this.buttonRight); + this.Controls.Add(this.buttonLeft); + this.Controls.Add(this.buttonUp); + this.Controls.Add(this.buttonCreate); + this.Controls.Add(this.pictureBoxCar); + this.Controls.Add(this.statusStrip); + this.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.Name = "FormMap"; + this.Text = "Карта"; + ((System.ComponentModel.ISupportInitialize)(this.pictureBoxCar)).EndInit(); + this.statusStrip.ResumeLayout(false); + this.statusStrip.PerformLayout(); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private PictureBox pictureBoxCar; + private StatusStrip statusStrip; + private ToolStripStatusLabel toolStripStatusLabelSpeed; + private ToolStripStatusLabel toolStripStatusLabelWeight; + private ToolStripStatusLabel toolStripStatusLabelBodyColor; + private Button buttonCreate; + private Button buttonUp; + private Button buttonLeft; + private Button buttonRight; + private Button buttonDown; + private Button buttonCreateModif; + private ComboBox comboBoxSelectorMap; + } +} \ No newline at end of file diff --git a/ProjectLocomotive_Hard/ProjectLocomotive_Hard/FormMap.cs b/ProjectLocomotive_Hard/ProjectLocomotive_Hard/FormMap.cs new file mode 100644 index 0000000..8e1e8dd --- /dev/null +++ b/ProjectLocomotive_Hard/ProjectLocomotive_Hard/FormMap.cs @@ -0,0 +1,105 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace ProjectLocomotive_Hard +{ + public partial class FormMap : Form + { + private AbstractMap _abstractMap; + + public FormMap() + { + InitializeComponent(); + _abstractMap = new SimpleMap(); + } + /// + /// Заполнение информации по объекту + /// + /// + private void SetData(DrawningLocomotive loc) + { + toolStripStatusLabelSpeed.Text = $"Скорость: {loc.Locomotivе.Speed}"; + toolStripStatusLabelWeight.Text = $"Вес: {loc.Locomotivе.Weight}"; + toolStripStatusLabelBodyColor.Text = $"Цвет: {loc.Locomotivе.BodyColor.Name}"; + pictureBoxCar.Image = _abstractMap.CreateMap(pictureBoxCar.Width, pictureBoxCar.Height, + new DrawningObject(loc)); + } + /// + /// Обработка нажатия кнопки "Создать" + /// + /// + /// + private void ButtonCreate_Click(object sender, EventArgs e) + { + Random rnd = new(); + var car = new DrawningLocomotive(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256))); + SetData(car); + } + /// + /// Изменение размеров формы + /// + /// + /// + private void ButtonMove_Click(object sender, EventArgs e) + { + //получаем имя кнопки + string name = ((Button)sender)?.Name ?? string.Empty; + Direction dir = Direction.None; + switch (name) + { + case "buttonUp": + dir = Direction.Up; + break; + case "buttonDown": + dir = Direction.Down; + break; + case "buttonLeft": + dir = Direction.Left; + break; + case "buttonRight": + dir = Direction.Right; + break; + } + pictureBoxCar.Image = _abstractMap?.MoveObject(dir); + } + /// + /// Обработка нажатия кнопки "Модификация" + /// + /// + /// + private void ButtonCreateModif_Click(object sender, EventArgs e) + { + Random rnd = new(); + var car = new DrawningElectroLocomotive(rnd.Next(100, 300), rnd.Next(1000, 2000), + Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)), + Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)), + Convert.ToBoolean(rnd.Next(0, 2)), Convert.ToBoolean(rnd.Next(0, 2))); + SetData(car); + } + /// + /// Смена карты + /// + /// + /// + private void ComboBoxSelectorMap_SelectedIndexChanged(object sender, EventArgs e) + { + switch (comboBoxSelectorMap.Text) + { + case "Простая карта": + _abstractMap = new SimpleMap(); + break; + + case "Море": + _abstractMap = new SeaMap(); + break; + } + } + } +} diff --git a/ProjectLocomotive_Hard/ProjectLocomotive_Hard/FormMap.resx b/ProjectLocomotive_Hard/ProjectLocomotive_Hard/FormMap.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/ProjectLocomotive_Hard/ProjectLocomotive_Hard/FormMap.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/ProjectLocomotive_Hard/ProjectLocomotive_Hard/IDrawningObject.cs b/ProjectLocomotive_Hard/ProjectLocomotive_Hard/IDrawningObject.cs new file mode 100644 index 0000000..6b43d4b --- /dev/null +++ b/ProjectLocomotive_Hard/ProjectLocomotive_Hard/IDrawningObject.cs @@ -0,0 +1,43 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ProjectLocomotive_Hard +{ + /// + /// Интерфейс для работы с объектом, прорисовываемым на форме + /// + internal interface IDrawningObject + { + /// + /// Шаг перемещения объекта + /// + public float Step { get; } + /// + /// Установка позиции объекта + /// + /// Координата X + /// Координата Y + /// Ширина полотна + /// Высота полотна + void SetObject(int x, int y, int width, int height); + /// + /// Изменение направления пермещения объекта + /// + /// Направление + /// + void MoveObject(Direction direction); + /// + /// Отрисовка объекта + /// + /// + void DrawningObject(Graphics g); + /// + /// Получение текущей позиции объекта + /// + /// + (float Left, float Right, float Top, float Bottom) GetCurrentPosition(); + } +} diff --git a/ProjectLocomotive_Hard/ProjectLocomotive_Hard/ILocomotiveWheel.cs b/ProjectLocomotive_Hard/ProjectLocomotive_Hard/ILocomotiveWheel.cs new file mode 100644 index 0000000..68810c6 --- /dev/null +++ b/ProjectLocomotive_Hard/ProjectLocomotive_Hard/ILocomotiveWheel.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ProjectLocomotive_Hard +{ + internal interface ILocomotiveWheel + { + int SetCountWheel { set; } + public void DrawningWheel(Graphics g, Color bodyColor, float PosX, float PosY); + } +} diff --git a/ProjectLocomotive_Hard/ProjectLocomotive_Hard/LocomotiveRectangleWheel.cs b/ProjectLocomotive_Hard/ProjectLocomotive_Hard/LocomotiveRectangleWheel.cs new file mode 100644 index 0000000..daeeea3 --- /dev/null +++ b/ProjectLocomotive_Hard/ProjectLocomotive_Hard/LocomotiveRectangleWheel.cs @@ -0,0 +1,67 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ProjectLocomotive_Hard +{ + internal class LocomotiveRectangleWheel : ILocomotiveWheel + { + /// Приватное поле содержащие текущее количество палуб + private CountWheel _countWheel; + /// + /// Открытое свойство, через которое можно в поле-перечисление занести значение + /// + public int SetCountWheel + { + set + { + switch (value) + { + case 2: + _countWheel = CountWheel.Two; + break; + case 3: + _countWheel = CountWheel.Three; + break; + case 4: + _countWheel = CountWheel.Four; + break; + default: + _countWheel = CountWheel.Two; + break; + } + } + } + /// Отрисовывает колёса + /// The g. + ///Цвет колёс. + /// начальная позиция по x + /// начальная позиция по y + public void DrawningWheel(Graphics g, Color bodyColor, float PosX, float PosY) + { + if ((int)_countWheel == 2) + { + Brush brr = new SolidBrush(Color.Green); + g.FillEllipse(brr, PosX + 95, PosY + 25, 15, 15); + g.FillEllipse(brr, PosX + 120, PosY + 25, 15, 15); + } + if ((int)_countWheel == 3) + { + Brush brr = new SolidBrush(Color.Blue); + g.FillEllipse(brr, PosX + 92, PosY + 25, 13, 13); + g.FillEllipse(brr, PosX + 110, PosY + 25, 13, 13); + g.FillEllipse(brr, PosX + 128, PosY + 25, 13, 13); + } + if ((int)_countWheel == 4) + { + Brush brr = new SolidBrush(Color.HotPink); + g.FillEllipse(brr, PosX + 90, PosY + 25, 10, 10); + g.FillEllipse(brr, PosX + 103, PosY + 25, 10, 10); + g.FillEllipse(brr, PosX + 116, PosY + 25, 10, 10); + g.FillEllipse(brr, PosX + 129, PosY + 25, 10, 10); + } + } + } +} diff --git a/ProjectLocomotive_Hard/ProjectLocomotive_Hard/LocomotiveSquareWheel.cs b/ProjectLocomotive_Hard/ProjectLocomotive_Hard/LocomotiveSquareWheel.cs new file mode 100644 index 0000000..0ded8c0 --- /dev/null +++ b/ProjectLocomotive_Hard/ProjectLocomotive_Hard/LocomotiveSquareWheel.cs @@ -0,0 +1,67 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ProjectLocomotive_Hard +{ + internal class LocomotiveSquareWheel : ILocomotiveWheel + { + /// Приватное поле содержащие текущее количество палуб + private CountWheel _countWheel; + /// + /// Открытое свойство, через которое можно в поле-перечисление занести значение + /// + public int SetCountWheel + { + set + { + switch (value) + { + case 2: + _countWheel = CountWheel.Two; + break; + case 3: + _countWheel = CountWheel.Three; + break; + case 4: + _countWheel = CountWheel.Four; + break; + default: + _countWheel = CountWheel.Two; + break; + } + } + } + /// Отрисовывает колёса + /// The g. + ///Цвет колёс. + /// начальная позиция по x + /// начальная позиция по y + public void DrawningWheel(Graphics g, Color bodyColor, float PosX, float PosY) + { + if ((int)_countWheel == 2) + { + Brush brr = new SolidBrush(Color.Green); + g.FillEllipse(brr, PosX + 95, PosY + 25, 15, 15); + g.FillEllipse(brr, PosX + 120, PosY + 25, 15, 15); + } + if ((int)_countWheel == 3) + { + Brush brr = new SolidBrush(Color.Blue); + g.FillEllipse(brr, PosX + 92, PosY + 25, 13, 13); + g.FillEllipse(brr, PosX + 110, PosY + 25, 13, 13); + g.FillEllipse(brr, PosX + 128, PosY + 25, 13, 13); + } + if ((int)_countWheel == 4) + { + Brush brr = new SolidBrush(Color.HotPink); + g.FillEllipse(brr, PosX + 90, PosY + 25, 10, 10); + g.FillEllipse(brr, PosX + 103, PosY + 25, 10, 10); + g.FillEllipse(brr, PosX + 116, PosY + 25, 10, 10); + g.FillEllipse(brr, PosX + 129, PosY + 25, 10, 10); + } + } + } +} diff --git a/ProjectLocomotive_Hard/ProjectLocomotive_Hard/Program.cs b/ProjectLocomotive_Hard/ProjectLocomotive_Hard/Program.cs index 89851ce..ad46cd7 100644 --- a/ProjectLocomotive_Hard/ProjectLocomotive_Hard/Program.cs +++ b/ProjectLocomotive_Hard/ProjectLocomotive_Hard/Program.cs @@ -11,7 +11,7 @@ namespace ProjectLocomotive_Hard // To customize application configuration such as set high DPI settings or default font, // see https://aka.ms/applicationconfiguration. ApplicationConfiguration.Initialize(); - Application.Run(new FormLocomotive()); + Application.Run(new FormMap()); } } } \ No newline at end of file diff --git a/ProjectLocomotive_Hard/ProjectLocomotive_Hard/Resources/ArrowDown.png b/ProjectLocomotive_Hard/ProjectLocomotive_Hard/Resources/ArrowDown.png new file mode 100644 index 0000000000000000000000000000000000000000..d540c5754ccb1f745f83c63e06ea3ccb5503cfb5 GIT binary patch literal 483 zcmeAS@N?(olHy`uVBq!ia0vp^av;pX3?zBp#Z3TGjKx9jPK-BC>eK@{oCO|{#S9GG z!XV7ZFl&wkP%uBhC&aa~vhu)z13=!vg9nR>idL^)EhHr5=H|9@=gzHLw>mjF9XfQ# z)zuZKfQ^kUC@ARg;lum(?F$JBVPIXJ^O3!LfJmUUqhN zYinypMn)?ut2JxZaB*>Qa&o%3xUjIW9NM;e8PF`%k|4j}|4s~c|JVKhpH}_f;y(}= z`TqZ(^WWot+5i86ApS}avG{!BU!aCNo-U3d6?1AYy%uUx5MWKPn#$_R8nJB2)UW@} z&u~&Pza78fK2LQTyOY?AwNJa&be}crpCW4AWNRF+`Y2|pG5|jN7UKGF2A|q-rV1Jr+<7jGpQhE zRmlA>$IWUYgoIyDX+6H9d}7##O0M@u=T+ROk-GiZV9z4K_J^uTe22PQE~;&0j%&Z& zS9#0Exi9vI`Pog}`V-S-kM`ZDo6S{hleaJa+@~FtZIyac<*gI12>p-f{_v0Sr>9i1 UVBhBBKz}lLy85}Sb4q9e07q5M8~^|S literal 0 HcmV?d00001 diff --git a/ProjectLocomotive_Hard/ProjectLocomotive_Hard/Resources/ArrowLeft.png b/ProjectLocomotive_Hard/ProjectLocomotive_Hard/Resources/ArrowLeft.png new file mode 100644 index 0000000000000000000000000000000000000000..4012bd92829e350358aa51f89926166a954a61e9 GIT binary patch literal 444 zcmeAS@N?(olHy`uVBq!ia0vp^av;pX3?zBp#Z3TGjKx9jPK-BC>eK@{oCO|{#S9GG z!XV7ZFl&wkP%uBhC&U#4|l zSX*1Ov9aykxzokPg^P=ek&!VdDCqFv!&X*S4h{|+931=i?`LOc=j7zvw{KraNC*oH zi<6Vn)~#C)9z1AiX?f_-p>5l?6%`fbbey~mG*q=D$S;^--T$2b|D6K=1HsDw|II-iBz*&@VXLQ$V@SoE+6lLXnhbbc99>j`j&d(z_3r-n-<+#w zo9FCJ>(kS|t9WjjRI-_AbMC(GLrL+66xp;H8IA`p*=857R?~Y;Z)f3F-akdpbEe<2 ze5)K~ef+u~>jImVWntbvE6rAZ-Kx!4H^*$#){VCkbuYgACEh$WT5bx@hAStcXE#U} zm0AQ|nEz9F@BfbzeWo;@U(Q*wgv(%NhUwvpEe{QLEqeU3UTH$PFt5Jzopr027wAZvX%Q literal 0 HcmV?d00001 diff --git a/ProjectLocomotive_Hard/ProjectLocomotive_Hard/Resources/ArrowRight.png b/ProjectLocomotive_Hard/ProjectLocomotive_Hard/Resources/ArrowRight.png new file mode 100644 index 0000000000000000000000000000000000000000..dac9c8169e23012aede68e85729401b1893ada43 GIT binary patch literal 464 zcmeAS@N?(olHy`uVBq!ia0vp^av;pX3?zBp#Z3TGjKx9jPK-BC>eK@{oCO|{#S9GG z!XV7ZFl&wkP%uBhC&aa=sOZq4LqOiag9n9#gq)n5wr$%6xEfOiBk@8vbtRP zyFM_(`}w5%)w8}!Iq_{UZgKlq*sgd?Kzd*N*oTm45k&zJ>a=Hr$&(5xiv{k zJt;LR|DDU4JyWJ9|7|kV?%&68Y>!Qql7)Fj-yhcW&^XtC-prR4-2!W-UspEEvz;?X z`r!0i+g`uDck(I!^Ou{$udeK@{oCO|{#S9GG z!XV7ZFl&wkP%uBhC&U#<@7uR;@7}#3At82lc3Zb@Wnp1qW@g^8V~3NI6HwOG)%D=P zgPfe4TwGjh)~vC#v}9ytw6?Z(adA0x=+NrbtF5f8+}zwaI5_t2-|yhyaQN`ypr9aj zcJ`e+cW&FZjg5^>NJyxtsOZ3f1C^DP(ws-)fQG7;1o;Is_y+#}U;Y1o&j0`a?f(B? z38em8tOF7r|Be3tPb&kmoc_10>XZj+IO6Hz7*a8(cEW3+CItaEMW>|8L7&5J9ewq8 z{>CRpdXK8=iqfVT%O^9|9N#AJTUT4S^u`6L2OhUgm@Vdd&SiE844T&5*d-n&{LyIR ztd8pscC5Ln_1S85XU=gi8+I2N{SAGOmL9U|x-PIGqVC)_ooVNtxm}&pj(=3Trg3k* z?~&Ix7CpUqYuDRFKaTBxqM3YscE5gej%rMf{hh)+C*N(E6Ds{pEHin+IzXw^5f5c49ge<8dy>~bAkS0@O1TaS?83{1OQgU!n*(f literal 0 HcmV?d00001 diff --git a/ProjectLocomotive_Hard/ProjectLocomotive_Hard/SeaMap.cs b/ProjectLocomotive_Hard/ProjectLocomotive_Hard/SeaMap.cs new file mode 100644 index 0000000..8eed8b9 --- /dev/null +++ b/ProjectLocomotive_Hard/ProjectLocomotive_Hard/SeaMap.cs @@ -0,0 +1,52 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ProjectLocomotive_Hard +{ + internal class SeaMap : AbstractMap + { + private readonly Brush barrierColor = new SolidBrush(Color.White); + + private readonly Brush roadColor = new SolidBrush(Color.Blue); + + protected override void DrawBarrierPart(Graphics g, int i, int j) + { + g.FillRectangle(barrierColor, i * _size_x, j * _size_y, i * (_size_x + 1), j * (_size_y + 1)); + g.FillRectangle(barrierColor, i * _size_x, j * _size_y, i * (_size_x + 1), j * (_size_y + 1)); + } + protected override void DrawRoadPart(Graphics g, int i, int j) + { + g.FillRectangle(roadColor, i * _size_x, j * _size_y, i * (_size_x + 1), j * (_size_y + 1)); + } + protected override void GenerateMap() + { + _map = new int[100, 100]; + _size_x = (float)_width / _map.GetLength(0); + _size_y = (float)_height / _map.GetLength(1); + int counter = 0; + for (int i = 0; i < _map.GetLength(0); ++i) + { + for (int j = 0; j < _map.GetLength(1); ++j) + { + _map[i, j] = _freeRoad; + } + } + while (counter < 25) + { + int x = _random.Next(0, 97); + int y = _random.Next(0, 97); + if (_map[x, y] == _freeRoad) + { + _map[x, y + 1] = _barrier; + _map[x + 1, y + 1] = _barrier; + _map[x + 2, y + 1] = _barrier; + _map[x + 1, y] = _barrier; + counter++; + } + } + } + } +} diff --git a/ProjectLocomotive_Hard/ProjectLocomotive_Hard/SimpleMap.cs b/ProjectLocomotive_Hard/ProjectLocomotive_Hard/SimpleMap.cs new file mode 100644 index 0000000..10fedb4 --- /dev/null +++ b/ProjectLocomotive_Hard/ProjectLocomotive_Hard/SimpleMap.cs @@ -0,0 +1,56 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ProjectLocomotive_Hard +{ + /// + /// Простая реализация абсрактного класса AbstractMap + /// + internal class SimpleMap : AbstractMap + { + /// + /// Цвет участка закрытого + /// + private readonly Brush barrierColor = new SolidBrush(Color.Black); + /// + /// Цвет участка открытого + /// + private readonly Brush roadColor = new SolidBrush(Color.Gray); + + protected override void DrawBarrierPart(Graphics g, int i, int j) + { + g.FillRectangle(barrierColor, i * _size_x, j * _size_y, i * (_size_x + 1), j * (_size_y + 1)); + } + protected override void DrawRoadPart(Graphics g, int i, int j) + { + g.FillRectangle(roadColor, i * _size_x, j * _size_y, i * (_size_x + 1), j * (_size_y + 1)); + } + protected override void GenerateMap() + { + _map = new int[100, 100]; + _size_x = (float)_width / _map.GetLength(0); + _size_y = (float)_height / _map.GetLength(1); + int counter = 0; + for (int i = 0; i < _map.GetLength(0); ++i) + { + for (int j = 0; j < _map.GetLength(1); ++j) + { + _map[i, j] = _freeRoad; + } + } + while (counter < 50) + { + int x = _random.Next(0, 100); + int y = _random.Next(0, 100); + if (_map[x, y] == _freeRoad) + { + _map[x, y] = _barrier; + counter++; + } + } + } + } +} -- 2.25.1 From 5989cec7d6b7ead07ed212878b0069184e7d2167 Mon Sep 17 00:00:00 2001 From: Sem730 Date: Thu, 22 Dec 2022 22:53:48 +0300 Subject: [PATCH 2/2] =?UTF-8?q?=D0=9B=D0=B0=D0=B1=D0=BE=D1=80=D0=BE=D1=82?= =?UTF-8?q?=D0=BE=D1=80=D0=BD=D0=B0=D1=8F=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82?= =?UTF-8?q?=D0=B0=202=20=D0=B4=D0=BE=D0=BF=D0=BE=D0=BB=D0=BD=D0=B8=D1=82?= =?UTF-8?q?=D0=B5=D0=BB=D1=8C=D0=BD=D0=B0=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectLocomotive_Hard/AbstractMap.cs | 230 ++++++++++---- .../DrawningElectroLocomotive.cs | 53 ---- .../DrawningEllipseOrnament.cs | 72 +++++ .../DrawningLocomotive.cs | 180 ++++++----- .../DrawningLocomotiveWheel.cs | 71 ----- .../ProjectLocomotive_Hard/DrawningObject.cs | 37 --- .../DrawningObjectLocomotive.cs | 37 +++ .../DrawningRectOrnament.cs | 72 +++++ .../DrawningWarmlyLocomotive.cs | 63 ++++ .../ProjectLocomotive_Hard/DrawningWheels.cs | 53 ++++ .../EntityElectricLocomotive.cs | 42 --- .../EntityLocomotive.cs | 14 +- .../EntityWarmlyLocomotive.cs | 42 +++ .../FormLocomotive.Designer.cs | 291 ++++++++++-------- .../ProjectLocomotive_Hard/FormLocomotive.cs | 75 +++-- .../FormMap.Designer.cs | 274 ++++++++++++----- .../ProjectLocomotive_Hard/FormMap.cs | 90 ++++-- .../IDrawningAdditionalElements.cs | 31 ++ .../ProjectLocomotive_Hard/IDrawningObject.cs | 11 +- .../ILocomotiveWheel.cs | 14 - .../LocomotiveRectangleWheel.cs | 67 ---- .../LocomotiveSquareWheel.cs | 67 ---- .../Resources/ArrowDown.png | Bin 483 -> 0 bytes .../Resources/ArrowLeft.png | Bin 444 -> 0 bytes .../Resources/ArrowRight.png | Bin 464 -> 0 bytes .../Resources/ArrowUp.png | Bin 459 -> 0 bytes .../{SeaMap.cs => RoadsMap.cs} | 4 +- .../ProjectLocomotive_Hard/SimpleMap.cs | 11 +- .../{CountWheel.cs => WheelsNumber.cs} | 2 +- 29 files changed, 1116 insertions(+), 787 deletions(-) delete mode 100644 ProjectLocomotive_Hard/ProjectLocomotive_Hard/DrawningElectroLocomotive.cs create mode 100644 ProjectLocomotive_Hard/ProjectLocomotive_Hard/DrawningEllipseOrnament.cs delete mode 100644 ProjectLocomotive_Hard/ProjectLocomotive_Hard/DrawningLocomotiveWheel.cs delete mode 100644 ProjectLocomotive_Hard/ProjectLocomotive_Hard/DrawningObject.cs create mode 100644 ProjectLocomotive_Hard/ProjectLocomotive_Hard/DrawningObjectLocomotive.cs create mode 100644 ProjectLocomotive_Hard/ProjectLocomotive_Hard/DrawningRectOrnament.cs create mode 100644 ProjectLocomotive_Hard/ProjectLocomotive_Hard/DrawningWarmlyLocomotive.cs create mode 100644 ProjectLocomotive_Hard/ProjectLocomotive_Hard/DrawningWheels.cs delete mode 100644 ProjectLocomotive_Hard/ProjectLocomotive_Hard/EntityElectricLocomotive.cs create mode 100644 ProjectLocomotive_Hard/ProjectLocomotive_Hard/EntityWarmlyLocomotive.cs create mode 100644 ProjectLocomotive_Hard/ProjectLocomotive_Hard/IDrawningAdditionalElements.cs delete mode 100644 ProjectLocomotive_Hard/ProjectLocomotive_Hard/ILocomotiveWheel.cs delete mode 100644 ProjectLocomotive_Hard/ProjectLocomotive_Hard/LocomotiveRectangleWheel.cs delete mode 100644 ProjectLocomotive_Hard/ProjectLocomotive_Hard/LocomotiveSquareWheel.cs delete mode 100644 ProjectLocomotive_Hard/ProjectLocomotive_Hard/Resources/ArrowDown.png delete mode 100644 ProjectLocomotive_Hard/ProjectLocomotive_Hard/Resources/ArrowLeft.png delete mode 100644 ProjectLocomotive_Hard/ProjectLocomotive_Hard/Resources/ArrowRight.png delete mode 100644 ProjectLocomotive_Hard/ProjectLocomotive_Hard/Resources/ArrowUp.png rename ProjectLocomotive_Hard/ProjectLocomotive_Hard/{SeaMap.cs => RoadsMap.cs} (97%) rename ProjectLocomotive_Hard/ProjectLocomotive_Hard/{CountWheel.cs => WheelsNumber.cs} (87%) diff --git a/ProjectLocomotive_Hard/ProjectLocomotive_Hard/AbstractMap.cs b/ProjectLocomotive_Hard/ProjectLocomotive_Hard/AbstractMap.cs index e4507ca..6e838db 100644 --- a/ProjectLocomotive_Hard/ProjectLocomotive_Hard/AbstractMap.cs +++ b/ProjectLocomotive_Hard/ProjectLocomotive_Hard/AbstractMap.cs @@ -8,16 +8,46 @@ namespace ProjectLocomotive_Hard { internal abstract class AbstractMap { + /// + /// Поле от интерфейса прорисовки + /// private IDrawningObject _drawningObject = null; + /// + /// Массив карты + /// protected int[,] _map = null; + /// + /// Ширина карты (графической панели) + /// protected int _width; + /// + /// Высота карты (графической панели) + /// protected int _height; + /// + /// Ширина ячейки + /// protected float _size_x; + /// + /// Высота ячейки + /// protected float _size_y; protected readonly Random _random = new(); + /// + /// Доступная для движения ячейка + /// protected readonly int _freeRoad = 0; + /// + /// Недоступная для движения ячейка + /// protected readonly int _barrier = 1; - + /// + /// Наполнение графической панели + /// + /// Ширина + /// Высота + /// + /// public Bitmap CreateMap(int width, int height, IDrawningObject drawningObject) { _width = width; @@ -30,88 +60,148 @@ namespace ProjectLocomotive_Hard } return DrawMapWithObject(); } - public bool CheckAround(float Left, float Right, float Top, float Bottom) + /// + /// Получение координат отрисовываемого объекта в массиве + /// + /// + public (int Top, int Bottom, int Left, int Right) GetObjectCoordinates() { - int startX = (int)(Left / _size_x); - int startY = (int)(Right / _size_y); - int endX = (int)(Top / _size_x); - int endY = (int)(Bottom / _size_y); - - for (int i = startX; i <= endX; i++) - { - for (int j = startY; j <= endY; j++) - { - if (_map[i, j] == _barrier) - { - return true; - } - } - } - return false; + return + ( + (int)(_drawningObject.GetCurrentPosition().Top / _size_y), + (int)(_drawningObject.GetCurrentPosition().Bottom / _size_y), + (int)(_drawningObject.GetCurrentPosition().Left / _size_x), + (int)(_drawningObject.GetCurrentPosition().Right / _size_x) + ); } - public Bitmap MoveObject(Direction direction) - { - _drawningObject.MoveObject(direction); - (float Left, float Right, float Top, float Bottom) = _drawningObject.GetCurrentPosition(); - - if (CheckAround(Left, Right, Top, Bottom)) - { - _drawningObject.MoveObject(MoveObjectBack(direction)); - } - return DrawMapWithObject(); - - } - private Direction MoveObjectBack(Direction direction) + /// + /// Проверка возможности движения в данном направлении + /// + /// Направление + /// + private bool AbleToMove(Direction direction) { switch (direction) { case Direction.Up: - return Direction.Down; + if (GetObjectCoordinates().Top - 1 < 0) + { + return false; + } + break; case Direction.Down: - return Direction.Up; + if (GetObjectCoordinates().Bottom + 1 > _map.GetLength(0)) + { + return false; + } + break; case Direction.Left: - return Direction.Right; + if (GetObjectCoordinates().Left - 1 < 0) + { + return false; + } + break; case Direction.Right: - return Direction.Left; + if (GetObjectCoordinates().Right + 1 > _map.GetLength(1)) + { + return false; + } + break; } - return Direction.None; + for (int i = GetObjectCoordinates().Left; i <= GetObjectCoordinates().Right; i++) + { + for (int j = GetObjectCoordinates().Top; j <= GetObjectCoordinates().Bottom; j++) + { + if (i - 1 < 0 || j - 1 < 0 || i + 1 > _map.GetLength(0) || j + 1 > _map.GetLength(1)) + { + return false; + } + switch (direction) + { + case Direction.Up: + if (_map[i, j - 1] == _barrier) + { + return false; + } + break; + case Direction.Down: + if (_map[i, j + 1] == _barrier) + { + return false; + } + break; + case Direction.Left: + if (_map[i - 1, j] == _barrier) + { + return false; + } + break; + case Direction.Right: + if (_map[i + 1, j] == _barrier) + { + return false; + } + break; + } + } + } + return true; } + /// + /// Проверка возможности установить объект на карте + /// + /// + private bool AbleToSetObject() + { + for (int i = GetObjectCoordinates().Left; i <= GetObjectCoordinates().Right; i++) + { + for (int j = GetObjectCoordinates().Top; j <= GetObjectCoordinates().Bottom; j++) + { + if (_map[i, j] == _barrier || i < 0 || j < 0) + { + return false; + } + } + } + return true; + } + /// + /// Передвижение объекта по карте + /// + /// Направление + /// + public Bitmap MoveObject(Direction direction) + { + if (!AbleToMove(direction)) + { + return DrawMapWithObject(); + } + _drawningObject.MoveObject(direction); + return DrawMapWithObject(); + } + /// + /// Создание объекта на карте + /// + /// Возможность создать объект private bool SetObjectOnMap() { if (_drawningObject == null || _map == null) { return false; } - int x = _random.Next(0, 10); - int y = _random.Next(0, 10); + int x = _random.Next(10, 100); + int y = _random.Next(10, 100); _drawningObject.SetObject(x, y, _width, _height); - (float Left, float Right, float Top, float Bottom) = _drawningObject.GetCurrentPosition(); - if (!CheckAround(Left, Right, Top, Bottom)) return true; - float startX = Left; - float startY = Right; - float lengthX = Top - Left; - float lengthY = Bottom - Right; - while (CheckAround(startX, startY, startX + lengthX, startY + lengthY)) + if (!AbleToSetObject()) { - bool result; - do - { - result = CheckAround(startX, startY, startX + lengthX, startY + lengthY); - if (!result) - { - _drawningObject.SetObject((int)startX, (int)startY, _width, _height); - return true; - } - else - { - startX += _size_x; - } - } while (result); - startX = x; - startY += _size_y; + return false; } - return false; + return true; } + /// + /// Отрисовка карты + /// + /// private Bitmap DrawMapWithObject() { Bitmap bmp = new(_width, _height); @@ -137,9 +227,23 @@ namespace ProjectLocomotive_Hard _drawningObject.DrawningObject(gr); return bmp; } - + /// + /// Генерация массива карты + /// protected abstract void GenerateMap(); + /// + /// Отрисовка ячейки со свободным пространством (дорогой) + /// + /// + /// + /// protected abstract void DrawRoadPart(Graphics g, int i, int j); + /// + /// Отрисовка ячейки с барьером + /// + /// + /// + /// protected abstract void DrawBarrierPart(Graphics g, int i, int j); } } diff --git a/ProjectLocomotive_Hard/ProjectLocomotive_Hard/DrawningElectroLocomotive.cs b/ProjectLocomotive_Hard/ProjectLocomotive_Hard/DrawningElectroLocomotive.cs deleted file mode 100644 index 22e3a84..0000000 --- a/ProjectLocomotive_Hard/ProjectLocomotive_Hard/DrawningElectroLocomotive.cs +++ /dev/null @@ -1,53 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace ProjectLocomotive_Hard -{ - internal class DrawningElectroLocomotive : DrawningLocomotive - { - /// - /// Инициализация свойств - /// - /// Скорость - /// Вес автомобиля - /// Цвет кузова - /// Дополнительный цвет - /// Признак наличия "рогов" для подключения - /// Признак наличия отсека электро-батарей - public DrawningElectroLocomotive(int speed, float weight, Color bodyColor, Color - dopColor, bool electroLines, bool electroBattery, ILocomotiveWheel? typeLocomotiveWheel = null) : - base(speed, weight, bodyColor, 110, 60, typeLocomotiveWheel) - { - Locomotivе = new EntityElectricLocomotive(speed, weight, bodyColor, dopColor, electroLines, - electroBattery); - } - public override void DrawTransport(Graphics g) - { - if (Locomotivе is not EntityElectricLocomotive elLocc) - { - return; - } - Pen pen = new(Color.Black); - Brush dopBrush = new SolidBrush(elLocc.DopColor); - if (elLocc.ElectroLines) - { - g.DrawLine(pen, _startPosX + 20, _startPosY, _startPosX + 5, _startPosY - 12); - g.DrawLine(pen, _startPosX + 20, _startPosY, _startPosX + 35, _startPosY - 12); - g.DrawLine(pen, _startPosX + 70, _startPosY, _startPosX + 55, _startPosY - 12); - g.DrawLine(pen, _startPosX + 70, _startPosY, _startPosX + 85, _startPosY - 12); - - } - base.DrawTransport(g); - if (elLocc.ElectroBattery) - { - Brush brblack = new SolidBrush(Color.Black); - g.FillRectangle(brblack, _startPosX + 40, _startPosY + 25, 15, 5); - g.FillRectangle(brblack, _startPosX + 60, _startPosY + 25, 15, 5); - g.FillRectangle(brblack, _startPosX + 5, _startPosY + 25, 15, 5); - } - } - } -} diff --git a/ProjectLocomotive_Hard/ProjectLocomotive_Hard/DrawningEllipseOrnament.cs b/ProjectLocomotive_Hard/ProjectLocomotive_Hard/DrawningEllipseOrnament.cs new file mode 100644 index 0000000..6da122e --- /dev/null +++ b/ProjectLocomotive_Hard/ProjectLocomotive_Hard/DrawningEllipseOrnament.cs @@ -0,0 +1,72 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ProjectLocomotive_Hard +{ + internal class DrawningEllipseOrnament : IDrawningAdditionalElements + { + private WheelsNumber wheelsNumber; + public int WheelsNum + { + set + { + if (value < 2 || value > 4) + { + wheelsNumber = (WheelsNumber)2; + } + else + { + wheelsNumber = (WheelsNumber)value; + } + } + } + public void DrawWheels(Graphics g, float startPosX, float startPosY, Color wheelsColor) + { + Pen pen = new(wheelsColor); + switch (wheelsNumber) + { + case WheelsNumber.Two: + g.DrawEllipse(pen, startPosX + 20, startPosY + 40, 20, 15); + g.DrawEllipse(pen, startPosX + 120, startPosY + 40, 20, 15); + break; + case WheelsNumber.Three: + g.DrawEllipse(pen, startPosX + 20, startPosY + 40, 20, 15); + g.DrawEllipse(pen, startPosX + 90, startPosY + 40, 20, 15); + g.DrawEllipse(pen, startPosX + 120, startPosY + 40, 20, 15); + break; + case WheelsNumber.Four: + g.DrawEllipse(pen, startPosX + 20, startPosY + 40, 20, 15); + g.DrawEllipse(pen, startPosX + 50, startPosY + 40, 20, 15); + g.DrawEllipse(pen, startPosX + 90, startPosY + 40, 20, 15); + g.DrawEllipse(pen, startPosX + 120, startPosY + 40, 20, 15); + break; + } + } + public void DrawOrnament(Graphics g, float startPosX, float startPosY) + { + //рисуем круглый орнамент + Pen pen = new(Color.Red); + switch (wheelsNumber) + { + case WheelsNumber.Two: + g.DrawEllipse(pen, startPosX + 25, startPosY + 45, 10, 7); + g.DrawEllipse(pen, startPosX + 125, startPosY + 45, 10, 7); + break; + case WheelsNumber.Three: + g.DrawEllipse(pen, startPosX + 25, startPosY + 45, 10, 7); + g.DrawEllipse(pen, startPosX + 95, startPosY + 45, 10, 7); + g.DrawEllipse(pen, startPosX + 125, startPosY + 45, 10, 7); + break; + case WheelsNumber.Four: + g.DrawEllipse(pen, startPosX + 25, startPosY + 45, 10, 7); + g.DrawEllipse(pen, startPosX + 55, startPosY + 45, 10, 7); + g.DrawEllipse(pen, startPosX + 95, startPosY + 45, 10, 7); + g.DrawEllipse(pen, startPosX + 125, startPosY + 45, 10, 7); + break; + } + } + } +} diff --git a/ProjectLocomotive_Hard/ProjectLocomotive_Hard/DrawningLocomotive.cs b/ProjectLocomotive_Hard/ProjectLocomotive_Hard/DrawningLocomotive.cs index ed103cb..ff618da 100644 --- a/ProjectLocomotive_Hard/ProjectLocomotive_Hard/DrawningLocomotive.cs +++ b/ProjectLocomotive_Hard/ProjectLocomotive_Hard/DrawningLocomotive.cs @@ -7,81 +7,78 @@ using System.Threading.Tasks; namespace ProjectLocomotive_Hard { /// - /// Класс, отвечающий за прорисовку и перемещение объекта-сущности + /// Класс, отвечающий за отрисовку объекта-сущности /// internal class DrawningLocomotive { /// /// Класс-сущность /// - public EntityLocomotive Locomotivе { get; protected set; } - // - //public DrawningLocomotiveWheel DrawningWheel { get; private set; } - public ILocomotiveWheel? DrawningWheels { get; private set; } + public EntityLocomotive Locomotive { get; protected set; } + /// + /// Класс отрисовки колёс + /// + public IDrawningAdditionalElements AdditionalElements; /// /// Левая координата отрисовки локомотива /// protected float _startPosX; /// - /// Верхняя кооридната отрисовки локомотива + /// Верхняя координата отрисовки локомотива /// protected float _startPosY; /// /// Ширина окна отрисовки /// - private int? _pictureWidth = null; + private int? _pictureWidth; /// /// Высота окна отрисовки /// - private int? _pictureHeight = null; + private int? _pictureHeight; /// - /// Ширина отрисовки локомотива + /// Ширина локомотива /// - private readonly int _LocWidth = 140; + protected readonly int _locomotiveWidth = 160; /// - /// Высота отрисовки локомотива + /// Высота локомотива /// - private readonly int _LocHeight = 50; + protected readonly int _locomotiveHeight = 80; /// - /// Инициализация свойств + /// Инициализация свойств объекта-сущности /// /// Скорость - /// Вес локомотива + /// Вес /// Цвет кузова - public DrawningLocomotive(int speed, float weight, Color bodyColor, ILocomotiveWheel? typeLocomotiveWheel = null) + public DrawningLocomotive(int speed, float weight, Color bodyColor) { - Locomotivе = new EntityLocomotive(speed, weight, bodyColor); - DrawningWheels = typeLocomotiveWheel; + Locomotive = new EntityLocomotive(speed, weight, bodyColor); + AdditionalElements = new DrawningWheels(); } /// - /// Инициализация свойств + /// Конструктор для изменения размеров локомотива /// /// Скорость - /// Вес автомобиля + /// Вес /// Цвет кузова - /// Ширина отрисовки локомотива - /// Высота отрисовки локомотива - protected DrawningLocomotive(int speed, float weight, Color bodyColor, int - locWidth, int locHeight, ILocomotiveWheel? typeLocomotiveWheel) : - this(speed, weight, bodyColor, typeLocomotiveWheel) + /// Ширина локомотива + /// Высота локомотива + protected DrawningLocomotive(int speed, float weight, Color bodyColor, int locomotiveWidth, int locomotiveHeight) + : this(speed, weight, bodyColor) { - _LocWidth = locWidth; - _LocHeight = locHeight; + _locomotiveWidth = locomotiveWidth; + _locomotiveHeight = locomotiveHeight; } /// - /// Установка позиции локомотива + /// Установка начальной позиции локомотива /// - /// Координата X - /// Координата Y - /// Ширина картинки - /// Высота картинки + /// Левая координата + /// Правая координата + /// Ширина + /// Высота public void SetPosition(int x, int y, int width, int height) { - // TODO проверки - if (x < 0 || y < 0 || width < x + _LocWidth || height < y + _LocHeight) + if (x < 0 || y < 0 || x + _locomotiveWidth > width || y + _locomotiveHeight > height) { - _pictureHeight = null; - _pictureWidth = null; return; } _startPosX = x; @@ -90,120 +87,117 @@ namespace ProjectLocomotive_Hard _pictureHeight = height; } /// - /// Изменение направления перемещения + /// Перемещение локомотива в зависимости от направления /// /// Направление - public void MoveTransport(Direction direction) + public void MoveLocomotive(Direction direction) { + if (!_pictureWidth.HasValue || !_pictureHeight.HasValue) + { + return; + } if (!_pictureWidth.HasValue || !_pictureHeight.HasValue) { return; } switch (direction) { - // вправо + //вправо case Direction.Right: - if (_startPosX + _LocWidth + Locomotivе.Step < _pictureWidth) + if (_startPosX + _locomotiveWidth + Locomotive.Step < _pictureWidth) { - _startPosX += Locomotivе.Step; + _startPosX += Locomotive.Step; } break; //влево case Direction.Left: - // TODO: Продумать логику - if (_startPosX - Locomotivе.Step > 0) + if (_startPosX >= Locomotive.Step) { - _startPosX -= Locomotivе.Step; + _startPosX -= Locomotive.Step; } break; //вверх case Direction.Up: - //TODO: Продумать логику - if (_startPosY - Locomotivе.Step > 0) + if (_startPosY >= Locomotive.Step) { - _startPosY -= Locomotivе.Step; + _startPosY -= Locomotive.Step; } break; //вниз case Direction.Down: - if (_startPosY + _LocHeight + Locomotivе.Step < _pictureHeight) + if (_startPosY + _locomotiveHeight + Locomotive.Step < _pictureHeight) { - _startPosY += Locomotivе.Step; + _startPosY += Locomotive.Step; } break; } } /// - /// Отрисовка автомобиля + /// Метод отрисовки локомотива /// - /// + /// Графика public virtual void DrawTransport(Graphics g) { - if (_startPosX < 0 || _startPosY < 0 - || !_pictureHeight.HasValue || !_pictureWidth.HasValue) + if (_startPosX < 0 || _startPosY < 0 || !_pictureHeight.HasValue || !_pictureWidth.HasValue) { return; } + //кузов + Pen penBodyColor = new Pen(Locomotive?.BodyColor ?? Color.Black); + for (int i = (int)_startPosX + 10; i <= _startPosX + 20; i++) + { + g.DrawLine(penBodyColor, _startPosX + 20, _startPosY, i, _startPosY + 20); + } + Brush brBodyColor = new SolidBrush(Locomotive?.BodyColor ?? Color.Black); + g.FillRectangle(brBodyColor, _startPosX + 20, _startPosY, 130, 20);//верхняя часть + g.FillRectangle(brBodyColor, _startPosX + 10, _startPosY + 20, 140, 20);//нижняя часть Pen pen = new(Color.Black); - // кузов электролокомотива (верхняя часть) - g.DrawLine(pen, _startPosX + 7, _startPosY, _startPosX + 80, _startPosY); - g.DrawLine(pen, _startPosX + 80, _startPosY, _startPosX + 80, _startPosY + 15); - g.DrawLine(pen, _startPosX + 80, _startPosY + 15, _startPosX + 2, _startPosY + 15); - g.DrawLine(pen, _startPosX + 2, _startPosY + 15, _startPosX + 7, _startPosY); - // кузов электролокомотива (нижняя часть) - g.DrawLine(pen, _startPosX + 2, _startPosY + 15, _startPosX + 2, _startPosY + 30); - g.DrawLine(pen, _startPosX + 2, _startPosY + 30, _startPosX + 80, _startPosY + 30); - g.DrawLine(pen, _startPosX + 80, _startPosY + 30, _startPosX + 80, _startPosY + 15); - // колёса электролокомотива - Brush br = new SolidBrush(Locomotivе?.BodyColor ?? Color.Black); - g.FillEllipse(br, _startPosX + 3, _startPosY + 30, 15, 15); - g.FillEllipse(br, _startPosX + 22, _startPosY + 30, 15, 15); - g.FillEllipse(br, _startPosX + 42, _startPosY + 30, 15, 15); - g.FillEllipse(br, _startPosX + 62, _startPosY + 30, 15, 15); - // окна электролокомотива - Brush brBlue = new SolidBrush(Color.Blue); - g.FillRectangle(brBlue, _startPosX + 10, _startPosY + 3, 5, 10); - g.FillRectangle(brBlue, _startPosX + 50, _startPosY + 3, 5, 10); - g.FillRectangle(brBlue, _startPosX + 70, _startPosY + 3, 5, 10); - // дверь электролокомотива - g.DrawLine(pen, _startPosX + 20, _startPosY + 6, _startPosX + 30, _startPosY + 6); - g.DrawLine(pen, _startPosX + 30, _startPosY + 8, _startPosX + 30, _startPosY + 25); - g.DrawLine(pen, _startPosX + 30, _startPosY + 25, _startPosX + 20, _startPosY + 25); - g.DrawLine(pen, _startPosX + 20, _startPosY + 25, _startPosX + 20, _startPosY + 6); - //тележка - g.DrawLine(pen, _startPosX + 80, _startPosY + 25, _startPosX + 140, _startPosY + 25); - g.DrawLine(pen, _startPosX + 140, _startPosY + 25, _startPosX + 140, _startPosY + 10); - g.DrawLine(pen, _startPosX + 140, _startPosY + 10, _startPosX + 90, _startPosY + 10); - g.DrawLine(pen, _startPosX + 90, _startPosY + 10, _startPosX + 90, _startPosY + 25); - DrawningWheels?.DrawningWheel(g, Locomotivе.BodyColor, _startPosX, _startPosY); + //окна + Brush brWhite = new SolidBrush(Color.White); + g.FillRectangle(brWhite, _startPosX + 25, _startPosY + 5, 10, 10); + g.DrawRectangle(pen, _startPosX + 25, _startPosY + 5, 10, 10); + g.FillRectangle(brWhite, _startPosX + 40, _startPosY + 5, 10, 10); + g.DrawRectangle(pen, _startPosX + 40, _startPosY + 5, 10, 10); + g.FillRectangle(brWhite, _startPosX + 130, _startPosY + 5, 10, 10); + g.DrawRectangle(pen, _startPosX + 130, _startPosY + 5, 10, 10); + //дверь + g.FillRectangle(brBodyColor, _startPosX + 60, _startPosY + 10, 15, 25); + g.DrawRectangle(pen, _startPosX + 60, _startPosY + 10, 15, 25); + //колёса + AdditionalElements.DrawWheels(g, _startPosX, _startPosY, Color.Black); + AdditionalElements.DrawOrnament(g, _startPosX, _startPosY); } /// - /// Смена границ формы отрисовки + /// Метод перерисовки при изменении границ рисунка /// - /// Ширина картинки - /// Высота картинки + /// Новая ширина + /// Новая высота public void ChangeBorders(int width, int height) { _pictureWidth = width; _pictureHeight = height; - if (_pictureWidth <= _LocWidth || _pictureHeight <= _LocHeight) + if (_pictureWidth <= _locomotiveWidth || _pictureHeight <= _locomotiveHeight) { _pictureWidth = null; _pictureHeight = null; return; } - if (_startPosX + _LocWidth > _pictureWidth) + if (_startPosX + _locomotiveWidth > _pictureWidth) { - _startPosX = _pictureWidth.Value - _LocWidth; + _startPosX = _pictureWidth.Value - _locomotiveWidth; } - if (_startPosY + _LocHeight > _pictureHeight) + if (_startPosY + _locomotiveHeight > _pictureHeight) { - _startPosY = _pictureHeight.Value - _LocHeight; + _startPosY = _pictureHeight.Value - _locomotiveHeight; } } - public (float Left, float Right, float Top, float Bottom) GetCurrentPosition() + /// + /// Получение текущей позиции объекта + /// + /// + public (float Top, float Bottom, float Left, float Right) GetCurrentPosition() { - return (_startPosX, _startPosY, _startPosX + _LocWidth, _startPosY + _LocHeight); + return (_startPosY, _startPosY + _locomotiveHeight, _startPosX, _startPosX + _locomotiveWidth); } } } diff --git a/ProjectLocomotive_Hard/ProjectLocomotive_Hard/DrawningLocomotiveWheel.cs b/ProjectLocomotive_Hard/ProjectLocomotive_Hard/DrawningLocomotiveWheel.cs deleted file mode 100644 index a7aa41b..0000000 --- a/ProjectLocomotive_Hard/ProjectLocomotive_Hard/DrawningLocomotiveWheel.cs +++ /dev/null @@ -1,71 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace ProjectLocomotive_Hard -{ - /// - /// Класс-дополнение к отвечающий за число колёс и их отрисовку - /// - internal class DrawningLocomotiveWheel - { - /// Приватное поле содержащие текущее количество палуб - private CountWheel _countWheel; - /// - /// Открытое свойство, через которое можно в поле-перечисление занести значение - /// - public int SetCountWheel - { - set - { - switch (value) - { - case 2: - _countWheel = CountWheel.Two; - break; - case 3: - _countWheel = CountWheel.Three; - break; - case 4: - _countWheel = CountWheel.Four; - break; - default: - _countWheel = CountWheel.Two; - break; - } - } - } - /// Отрисовывает колёса - /// The g. - ///Цвет колёс. - /// начальная позиция по x - /// начальная позиция по y - public void DrawningWheel(Graphics g, Color bodyColor, float PosX, float PosY) - { - if ((int)_countWheel == 2) - { - Brush brr = new SolidBrush(Color.Green); - g.FillEllipse(brr, PosX + 95, PosY + 25, 15, 15); - g.FillEllipse(brr, PosX + 120, PosY + 25, 15, 15); - } - if ((int)_countWheel == 3) - { - Brush brr = new SolidBrush(Color.Blue); - g.FillEllipse(brr, PosX + 92, PosY + 25, 13, 13); - g.FillEllipse(brr, PosX + 110, PosY + 25, 13, 13); - g.FillEllipse(brr, PosX + 128, PosY + 25, 13, 13); - } - if ((int)_countWheel == 4) - { - Brush brr = new SolidBrush(Color.HotPink); - g.FillEllipse(brr, PosX + 90, PosY + 25, 10, 10); - g.FillEllipse(brr, PosX + 103, PosY + 25, 10, 10); - g.FillEllipse(brr, PosX + 116, PosY + 25, 10, 10); - g.FillEllipse(brr, PosX + 129, PosY + 25, 10, 10); - } - } - - } -} diff --git a/ProjectLocomotive_Hard/ProjectLocomotive_Hard/DrawningObject.cs b/ProjectLocomotive_Hard/ProjectLocomotive_Hard/DrawningObject.cs deleted file mode 100644 index 30e266a..0000000 --- a/ProjectLocomotive_Hard/ProjectLocomotive_Hard/DrawningObject.cs +++ /dev/null @@ -1,37 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace ProjectLocomotive_Hard -{ - internal class DrawningObject : IDrawningObject - { - private DrawningLocomotive _loc = null; - public DrawningObject(DrawningLocomotive loc) - { - _loc = loc; - } - public float Step => _loc?.Locomotivе?.Step ?? 0; - - public (float Left, float Right, float Top, float Bottom) GetCurrentPosition() - { - return _loc?.GetCurrentPosition() ?? default; - } - public void MoveObject(Direction direction) - { - _loc?.MoveTransport(direction); - } - public void SetObject(int x, int y, int width, int height) - { - _loc.SetPosition(x, y, width, height); - } - - void IDrawningObject.DrawningObject(Graphics g) - { - // TODO - _loc.DrawTransport(g); - } - } -} diff --git a/ProjectLocomotive_Hard/ProjectLocomotive_Hard/DrawningObjectLocomotive.cs b/ProjectLocomotive_Hard/ProjectLocomotive_Hard/DrawningObjectLocomotive.cs new file mode 100644 index 0000000..65c32ca --- /dev/null +++ b/ProjectLocomotive_Hard/ProjectLocomotive_Hard/DrawningObjectLocomotive.cs @@ -0,0 +1,37 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ProjectLocomotive_Hard +{ + internal class DrawningObjectLocomotive : IDrawningObject + { + /// + /// Объект от класса отрисовки локомотива + /// + private DrawningLocomotive _locomotive = null; + public DrawningObjectLocomotive(DrawningLocomotive locomotive) + { + _locomotive = locomotive; + } + public float Step => _locomotive?.Locomotive?.Step ?? 0; + public (float Top, float Bottom, float Left, float Right) GetCurrentPosition() + { + return _locomotive?.GetCurrentPosition() ?? default; + } + public void MoveObject(Direction direction) + { + _locomotive?.MoveLocomotive(direction); + } + public void SetObject(int x, int y, int width, int height) + { + _locomotive.SetPosition(x, y, width, height); + } + public void DrawningObject(Graphics g) + { + _locomotive.DrawTransport(g); + } + } +} diff --git a/ProjectLocomotive_Hard/ProjectLocomotive_Hard/DrawningRectOrnament.cs b/ProjectLocomotive_Hard/ProjectLocomotive_Hard/DrawningRectOrnament.cs new file mode 100644 index 0000000..2a79eec --- /dev/null +++ b/ProjectLocomotive_Hard/ProjectLocomotive_Hard/DrawningRectOrnament.cs @@ -0,0 +1,72 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ProjectLocomotive_Hard +{ + internal class DrawningRectOrnament : IDrawningAdditionalElements + { + private WheelsNumber wheelsNumber; + public int WheelsNum + { + set + { + if (value < 2 || value > 4) + { + wheelsNumber = (WheelsNumber)2; + } + else + { + wheelsNumber = (WheelsNumber)value; + } + } + } + public void DrawWheels(Graphics g, float startPosX, float startPosY, Color wheelsColor) + { + Pen pen = new(wheelsColor); + switch (wheelsNumber) + { + case WheelsNumber.Two: + g.DrawEllipse(pen, startPosX + 20, startPosY + 40, 20, 15); + g.DrawEllipse(pen, startPosX + 120, startPosY + 40, 20, 15); + break; + case WheelsNumber.Three: + g.DrawEllipse(pen, startPosX + 20, startPosY + 40, 20, 15); + g.DrawEllipse(pen, startPosX + 90, startPosY + 40, 20, 15); + g.DrawEllipse(pen, startPosX + 120, startPosY + 40, 20, 15); + break; + case WheelsNumber.Four: + g.DrawEllipse(pen, startPosX + 20, startPosY + 40, 20, 15); + g.DrawEllipse(pen, startPosX + 50, startPosY + 40, 20, 15); + g.DrawEllipse(pen, startPosX + 90, startPosY + 40, 20, 15); + g.DrawEllipse(pen, startPosX + 120, startPosY + 40, 20, 15); + break; + } + } + public void DrawOrnament(Graphics g, float startPosX, float startPosY) + { + //рисуем прямоугольный орнамент + Brush brush = new SolidBrush(Color.Blue); + switch (wheelsNumber) + { + case WheelsNumber.Two: + g.FillRectangle(brush, startPosX + 25, startPosY + 45, 10, 7); + g.FillRectangle(brush, startPosX + 125, startPosY + 45, 10, 7); + break; + case WheelsNumber.Three: + g.FillRectangle(brush, startPosX + 25, startPosY + 45, 10, 7); + g.FillRectangle(brush, startPosX + 95, startPosY + 45, 10, 7); + g.FillRectangle(brush, startPosX + 125, startPosY + 45, 10, 7); + break; + case WheelsNumber.Four: + g.FillRectangle(brush, startPosX + 25, startPosY + 45, 10, 7); + g.FillRectangle(brush, startPosX + 55, startPosY + 45, 10, 7); + g.FillRectangle(brush, startPosX + 95, startPosY + 45, 10, 7); + g.FillRectangle(brush, startPosX + 125, startPosY + 45, 10, 7); + break; + } + } + } +} diff --git a/ProjectLocomotive_Hard/ProjectLocomotive_Hard/DrawningWarmlyLocomotive.cs b/ProjectLocomotive_Hard/ProjectLocomotive_Hard/DrawningWarmlyLocomotive.cs new file mode 100644 index 0000000..008ad0d --- /dev/null +++ b/ProjectLocomotive_Hard/ProjectLocomotive_Hard/DrawningWarmlyLocomotive.cs @@ -0,0 +1,63 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ProjectLocomotive_Hard +{ + internal class DrawningWarmlyLocomotive : DrawningLocomotive + { + /// + /// Конструктор, передаём в protected конструктор базового класса обычные параметры и вводим новые + /// + /// Скорость + /// Вес + /// Цвет кузова + /// Ширина локомотива + /// Высота локомотива + /// Дополнительный цвет + /// Признак наличия трубы + /// Признак наличия топливного бака + public DrawningWarmlyLocomotive(int speed, float weight, Color bodyColor, int locomotiveWidth, int locomotiveHeight, Color additionalColor, bool hasPipe, bool hasFuelTank) : base(speed, weight, bodyColor, locomotiveWidth, locomotiveHeight) + { + Locomotive = new EntityWarmlyLocomotive(speed, weight, bodyColor, additionalColor, hasPipe, hasFuelTank); + } + /// + /// Отрисовываем базовую часть локомотива и добавляем дополнительные элементы, если они есть + /// + /// + public override void DrawTransport(Graphics g) + { + if (Locomotive is not EntityWarmlyLocomotive warmlyLocomotive) + { + return; + } + //Прорисовка рогов + if (warmlyLocomotive.HasPipe) + { + Pen pen = new Pen(Color.Black); + Brush brAdditionalColor = new SolidBrush(warmlyLocomotive.AdditionalColor); + g.FillRectangle(brAdditionalColor, _startPosX + 20, _startPosY, 25, 10); + g.DrawRectangle(pen, _startPosX + 20, _startPosY, 25, 10); + g.FillRectangle(brAdditionalColor, _startPosX + 25, _startPosY + 10, 15, 20); + g.DrawRectangle(pen, _startPosX + 25, _startPosY + 10, 15, 20); + g.FillRectangle(brAdditionalColor, _startPosX + 100, _startPosY, 25, 10); + g.DrawRectangle(pen, _startPosX + 100, _startPosY, 25, 10); + g.FillRectangle(brAdditionalColor, _startPosX + 105, _startPosY + 10, 15, 20); + g.DrawRectangle(pen, _startPosX + 105, _startPosY + 10, 15, 20); + } + _startPosY += 30; + base.DrawTransport(g); + _startPosY -= 30; + //Прорисовка топливного бака + if (warmlyLocomotive.HasFuelTank) + { + Brush brblack = new SolidBrush(Color.Black); + g.FillRectangle(brblack, _startPosX + 120, _startPosY + 60, 15, 5); + g.FillRectangle(brblack, _startPosX + 90, _startPosY + 60, 15, 5); + g.FillRectangle(brblack, _startPosX + 40, _startPosY + 60, 15, 5); + } + } + } +} diff --git a/ProjectLocomotive_Hard/ProjectLocomotive_Hard/DrawningWheels.cs b/ProjectLocomotive_Hard/ProjectLocomotive_Hard/DrawningWheels.cs new file mode 100644 index 0000000..0508c35 --- /dev/null +++ b/ProjectLocomotive_Hard/ProjectLocomotive_Hard/DrawningWheels.cs @@ -0,0 +1,53 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ProjectLocomotive_Hard +{ + internal class DrawningWheels : IDrawningAdditionalElements + { + private WheelsNumber wheelsNumber; + public int WheelsNum + { + set + { + if (value < 2 || value > 4) + { + wheelsNumber = (WheelsNumber)2; + } + else + { + wheelsNumber = (WheelsNumber)value; + } + } + } + public void DrawWheels(Graphics g, float startPosX, float startPosY, Color wheelsColor) + { + Pen pen = new(wheelsColor); + switch (wheelsNumber) + { + case WheelsNumber.Two: + g.DrawEllipse(pen, startPosX + 20, startPosY + 40, 20, 15); + g.DrawEllipse(pen, startPosX + 120, startPosY + 40, 20, 15); + break; + case WheelsNumber.Three: + g.DrawEllipse(pen, startPosX + 20, startPosY + 40, 20, 15); + g.DrawEllipse(pen, startPosX + 90, startPosY + 40, 20, 15); + g.DrawEllipse(pen, startPosX + 120, startPosY + 40, 20, 15); + break; + case WheelsNumber.Four: + g.DrawEllipse(pen, startPosX + 20, startPosY + 40, 20, 15); + g.DrawEllipse(pen, startPosX + 50, startPosY + 40, 20, 15); + g.DrawEllipse(pen, startPosX + 90, startPosY + 40, 20, 15); + g.DrawEllipse(pen, startPosX + 120, startPosY + 40, 20, 15); + break; + } + } + public void DrawOrnament(Graphics g, float startPosX, float startPosY) + { + //ничего не рисуем, т.к. орнамента нет + } + } +} diff --git a/ProjectLocomotive_Hard/ProjectLocomotive_Hard/EntityElectricLocomotive.cs b/ProjectLocomotive_Hard/ProjectLocomotive_Hard/EntityElectricLocomotive.cs deleted file mode 100644 index 5aee367..0000000 --- a/ProjectLocomotive_Hard/ProjectLocomotive_Hard/EntityElectricLocomotive.cs +++ /dev/null @@ -1,42 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace ProjectLocomotive_Hard -{ - internal class EntityElectricLocomotive : EntityLocomotive - { - /// - /// Дополнительный цвет - /// - public Color DopColor { get; private set; } - /// - /// Признак наличия "рогов" для подключения - /// - public bool ElectroLines { get; private set; } - /// - /// Признак наличия отсека электро-батарей - /// - public bool ElectroBattery { get; private set; } - /// - /// Инициализация свойств - /// - /// Скорость - /// Вес автомобиля - /// Цвет кузова - /// Дополнительный цвет - /// Признак наличия "рогов" для подключения - /// Признак наличия отсека электро-батарей - - public EntityElectricLocomotive(int speed, float weight, Color bodyColor, Color - dopColor, bool electroLines, bool electroBattery) : - base(speed, weight, bodyColor) - { - DopColor = dopColor; - ElectroLines = electroLines = true; - ElectroBattery = electroBattery = true; - } - } -} diff --git a/ProjectLocomotive_Hard/ProjectLocomotive_Hard/EntityLocomotive.cs b/ProjectLocomotive_Hard/ProjectLocomotive_Hard/EntityLocomotive.cs index 4d9f82f..66ea3ff 100644 --- a/ProjectLocomotive_Hard/ProjectLocomotive_Hard/EntityLocomotive.cs +++ b/ProjectLocomotive_Hard/ProjectLocomotive_Hard/EntityLocomotive.cs @@ -6,6 +6,9 @@ using System.Threading.Tasks; namespace ProjectLocomotive_Hard { + /// + /// Класс-сущность локомотив + /// internal class EntityLocomotive { /// @@ -21,16 +24,15 @@ namespace ProjectLocomotive_Hard /// public Color BodyColor { get; private set; } /// - /// Шаг передвижения локомотива + /// Шаг перемещения /// public float Step => Speed * 100 / Weight; /// - /// Инициализация полей объекта-класса локомотива + /// Конструктор (инициализация полей объекта-класса локомотива) /// - /// - /// - /// - /// + /// скорость + /// вес + /// цвет кузова public EntityLocomotive(int speed, float weight, Color bodyColor) { Random rnd = new(); diff --git a/ProjectLocomotive_Hard/ProjectLocomotive_Hard/EntityWarmlyLocomotive.cs b/ProjectLocomotive_Hard/ProjectLocomotive_Hard/EntityWarmlyLocomotive.cs new file mode 100644 index 0000000..2a9f564 --- /dev/null +++ b/ProjectLocomotive_Hard/ProjectLocomotive_Hard/EntityWarmlyLocomotive.cs @@ -0,0 +1,42 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ProjectLocomotive_Hard +{ + /// + /// Класс-наследник от класса-сущности локомотива (усложнённый локомотив/тепловоз) + /// + internal class EntityWarmlyLocomotive : EntityLocomotive + { + /// + /// Дополнительный цвет + /// + public Color AdditionalColor { get; private set; } + /// + /// Признак наличия трубы + /// + public bool HasPipe { get; private set; } + /// + /// Признак наличия топливного бака + /// + public bool HasFuelTank { get; private set; } + /// + /// Инициализация свойств усложнённого локомотива (тепловоза) + /// + /// Скорость + /// Вес + /// Цвет кузова + /// Дополнительный цвет + /// Признак наличия трубы + /// Признак наличия топливного бака + public EntityWarmlyLocomotive(int speed, float weight, Color bodyColor, Color additionalColor, bool hasPipe, bool hasFuelTank) : base(speed, weight, bodyColor) + { + AdditionalColor = additionalColor; + HasPipe = hasPipe; + HasFuelTank = hasFuelTank; + } + } +} diff --git a/ProjectLocomotive_Hard/ProjectLocomotive_Hard/FormLocomotive.Designer.cs b/ProjectLocomotive_Hard/ProjectLocomotive_Hard/FormLocomotive.Designer.cs index 196ab2b..c243f0f 100644 --- a/ProjectLocomotive_Hard/ProjectLocomotive_Hard/FormLocomotive.Designer.cs +++ b/ProjectLocomotive_Hard/ProjectLocomotive_Hard/FormLocomotive.Designer.cs @@ -6,7 +6,6 @@ /// Required designer variable. /// private System.ComponentModel.IContainer components = null; - /// /// Clean up any resources being used. /// @@ -19,9 +18,7 @@ } base.Dispose(disposing); } - #region Windows Form Designer generated code - /// /// Required method for Designer support - do not modify /// the contents of this method with the code editor. @@ -29,194 +26,214 @@ private void InitializeComponent() { this.pictureBoxLocomotive = new System.Windows.Forms.PictureBox(); - this.buttonCreate = new System.Windows.Forms.Button(); - this.buttonUp = 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.buttonCreateModif = new System.Windows.Forms.Button(); + this.statusStrip = new System.Windows.Forms.StatusStrip(); this.toolStripStatusLabelSpeed = new System.Windows.Forms.ToolStripStatusLabel(); this.toolStripStatusLabelWeight = new System.Windows.Forms.ToolStripStatusLabel(); this.toolStripStatusLabelBodyColor = new System.Windows.Forms.ToolStripStatusLabel(); - this.statusStrip = new System.Windows.Forms.StatusStrip(); - this.labelDecksCount = new System.Windows.Forms.Label(); - this.countDecksBox = new System.Windows.Forms.NumericUpDown(); - this.toolStripStatusCountDecks = new System.Windows.Forms.ToolStripStatusLabel(); + this.buttonCreate = new System.Windows.Forms.Button(); + this.buttonRight = new System.Windows.Forms.Button(); + this.buttonLeft = new System.Windows.Forms.Button(); + this.buttonDown = new System.Windows.Forms.Button(); + this.buttonUp = new System.Windows.Forms.Button(); + this.numericUpDownWheelsNumber = new System.Windows.Forms.NumericUpDown(); + this.labelWheelsNumber = new System.Windows.Forms.Label(); + this.buttonCreateModif = new System.Windows.Forms.Button(); + this.toolStripStatusLabelAdditionalColor = new System.Windows.Forms.ToolStripStatusLabel(); + this.toolStripStatusLabelHasPipe = new System.Windows.Forms.ToolStripStatusLabel(); + this.toolStripStatusLabelHasFuelTank = new System.Windows.Forms.ToolStripStatusLabel(); ((System.ComponentModel.ISupportInitialize)(this.pictureBoxLocomotive)).BeginInit(); this.statusStrip.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.countDecksBox)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownWheelsNumber)).BeginInit(); this.SuspendLayout(); // // pictureBoxLocomotive // this.pictureBoxLocomotive.Dock = System.Windows.Forms.DockStyle.Fill; this.pictureBoxLocomotive.Location = new System.Drawing.Point(0, 0); + this.pictureBoxLocomotive.MinimumSize = new System.Drawing.Size(1, 1); this.pictureBoxLocomotive.Name = "pictureBoxLocomotive"; - this.pictureBoxLocomotive.Size = new System.Drawing.Size(959, 418); + this.pictureBoxLocomotive.Size = new System.Drawing.Size(800, 450); this.pictureBoxLocomotive.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; this.pictureBoxLocomotive.TabIndex = 0; this.pictureBoxLocomotive.TabStop = false; + this.pictureBoxLocomotive.Resize += new System.EventHandler(this.PictureBoxLocomotive_Resize); + // + // statusStrip + // + this.statusStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.toolStripStatusLabelSpeed, + this.toolStripStatusLabelWeight, + this.toolStripStatusLabelBodyColor, + this.toolStripStatusLabelAdditionalColor, + this.toolStripStatusLabelHasPipe, + this.toolStripStatusLabelHasFuelTank}); + this.statusStrip.Location = new System.Drawing.Point(0, 428); + this.statusStrip.Name = "statusStrip"; + this.statusStrip.Size = new System.Drawing.Size(800, 22); + this.statusStrip.TabIndex = 1; + this.statusStrip.Text = "statusStrip1"; + // + // toolStripStatusLabelSpeed + // + this.toolStripStatusLabelSpeed.Name = "toolStripStatusLabelSpeed"; + this.toolStripStatusLabelSpeed.Size = new System.Drawing.Size(65, 17); + this.toolStripStatusLabelSpeed.Text = "Скорость: "; + // + // toolStripStatusLabelWeight + // + this.toolStripStatusLabelWeight.Name = "toolStripStatusLabelWeight"; + this.toolStripStatusLabelWeight.Size = new System.Drawing.Size(32, 17); + this.toolStripStatusLabelWeight.Text = "Вес: "; + // + // toolStripStatusLabelBodyColor + // + this.toolStripStatusLabelBodyColor.Name = "toolStripStatusLabelBodyColor"; + this.toolStripStatusLabelBodyColor.Size = new System.Drawing.Size(39, 17); + this.toolStripStatusLabelBodyColor.Text = "Цвет: "; // // buttonCreate // - this.buttonCreate.Location = new System.Drawing.Point(404, 370); + 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, 395); this.buttonCreate.Name = "buttonCreate"; - this.buttonCreate.Size = new System.Drawing.Size(93, 30); + this.buttonCreate.Size = new System.Drawing.Size(90, 30); this.buttonCreate.TabIndex = 2; this.buttonCreate.Text = "Создать"; this.buttonCreate.UseVisualStyleBackColor = true; this.buttonCreate.Click += new System.EventHandler(this.ButtonCreate_Click); // - // buttonUp - // - this.buttonUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.buttonUp.BackgroundImage = global::ProjectLocomotive_Hard.Properties.Resources.up; - this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.buttonUp.Location = new System.Drawing.Point(834, 339); - this.buttonUp.Name = "buttonUp"; - this.buttonUp.Size = new System.Drawing.Size(30, 30); - this.buttonUp.TabIndex = 3; - this.buttonUp.UseVisualStyleBackColor = true; - this.buttonUp.Click += new System.EventHandler(this.ButtonMove_Click); - this.buttonUp.Resize += new System.EventHandler(this.PictureBoxLocomotive_Resize); - // - // buttonLeft - // - this.buttonLeft.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.buttonLeft.BackgroundImage = global::ProjectLocomotive_Hard.Properties.Resources.left; - this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.buttonLeft.Location = new System.Drawing.Point(798, 374); - this.buttonLeft.Name = "buttonLeft"; - this.buttonLeft.Size = new System.Drawing.Size(30, 30); - this.buttonLeft.TabIndex = 4; - this.buttonLeft.UseVisualStyleBackColor = true; - this.buttonLeft.Click += new System.EventHandler(this.ButtonMove_Click); - this.buttonLeft.Resize += new System.EventHandler(this.PictureBoxLocomotive_Resize); - // - // buttonDown - // - this.buttonDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.buttonDown.BackgroundImage = global::ProjectLocomotive_Hard.Properties.Resources.down; - this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.buttonDown.Location = new System.Drawing.Point(834, 373); - this.buttonDown.Name = "buttonDown"; - this.buttonDown.Size = new System.Drawing.Size(30, 30); - this.buttonDown.TabIndex = 6; - this.buttonDown.UseVisualStyleBackColor = true; - this.buttonDown.Click += new System.EventHandler(this.ButtonMove_Click); - this.buttonDown.Resize += new System.EventHandler(this.PictureBoxLocomotive_Resize); - // // buttonRight // this.buttonRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.buttonRight.BackgroundImage = global::ProjectLocomotive_Hard.Properties.Resources.right; this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.buttonRight.Location = new System.Drawing.Point(870, 375); + this.buttonRight.Location = new System.Drawing.Point(758, 395); this.buttonRight.Name = "buttonRight"; this.buttonRight.Size = new System.Drawing.Size(30, 30); - this.buttonRight.TabIndex = 5; + this.buttonRight.TabIndex = 3; this.buttonRight.UseVisualStyleBackColor = true; this.buttonRight.Click += new System.EventHandler(this.ButtonMove_Click); - this.buttonRight.Resize += new System.EventHandler(this.PictureBoxLocomotive_Resize); - // - // buttonCreateModif // - this.buttonCreateModif.Location = new System.Drawing.Point(120, 375); - this.buttonCreateModif.Name = "buttonCreateModif"; - this.buttonCreateModif.Size = new System.Drawing.Size(138, 30); - this.buttonCreateModif.TabIndex = 7; - this.buttonCreateModif.Text = "Модификация"; - this.buttonCreateModif.UseVisualStyleBackColor = true; - this.buttonCreateModif.Click += new System.EventHandler(this.ButtonCreateModif_Click); - // - // toolStripStatusLabelSpeed + // buttonLeft // - this.toolStripStatusLabelSpeed.Name = "toolStripStatusLabelSpeed"; - this.toolStripStatusLabelSpeed.Size = new System.Drawing.Size(93, 25); - this.toolStripStatusLabelSpeed.Text = "Скорость:"; + this.buttonLeft.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.buttonLeft.BackgroundImage = global::ProjectLocomotive_Hard.Properties.Resources.left; + this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.buttonLeft.Location = new System.Drawing.Point(686, 395); + this.buttonLeft.Name = "buttonLeft"; + this.buttonLeft.Size = new System.Drawing.Size(30, 30); + this.buttonLeft.TabIndex = 4; + this.buttonLeft.UseVisualStyleBackColor = true; + this.buttonLeft.Click += new System.EventHandler(this.ButtonMove_Click); // - // toolStripStatusLabelWeight + // buttonDown // - this.toolStripStatusLabelWeight.Name = "toolStripStatusLabelWeight"; - this.toolStripStatusLabelWeight.Size = new System.Drawing.Size(43, 25); - this.toolStripStatusLabelWeight.Text = "Вес:"; + this.buttonDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.buttonDown.BackgroundImage = global::ProjectLocomotive_Hard.Properties.Resources.down; + this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.buttonDown.Location = new System.Drawing.Point(722, 395); + this.buttonDown.Name = "buttonDown"; + this.buttonDown.Size = new System.Drawing.Size(30, 30); + this.buttonDown.TabIndex = 5; + this.buttonDown.UseVisualStyleBackColor = true; + this.buttonDown.Click += new System.EventHandler(this.ButtonMove_Click); // - // toolStripStatusLabelBodyColor + // buttonUp // - this.toolStripStatusLabelBodyColor.Name = "toolStripStatusLabelBodyColor"; - this.toolStripStatusLabelBodyColor.Size = new System.Drawing.Size(55, 25); - this.toolStripStatusLabelBodyColor.Text = "Цвет:"; + this.buttonUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.buttonUp.BackgroundImage = global::ProjectLocomotive_Hard.Properties.Resources.up; + this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.buttonUp.Location = new System.Drawing.Point(722, 359); + this.buttonUp.Name = "buttonUp"; + this.buttonUp.Size = new System.Drawing.Size(30, 30); + this.buttonUp.TabIndex = 6; + this.buttonUp.UseVisualStyleBackColor = true; + this.buttonUp.Click += new System.EventHandler(this.ButtonMove_Click); // - // statusStrip + // numericUpDownWheelsNumber // - this.statusStrip.ImageScalingSize = new System.Drawing.Size(24, 24); - this.statusStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.toolStripStatusLabelSpeed, - this.toolStripStatusLabelWeight, - this.toolStripStatusLabelBodyColor, - this.toolStripStatusCountDecks}); - this.statusStrip.Location = new System.Drawing.Point(0, 418); - this.statusStrip.Name = "statusStrip"; - this.statusStrip.Size = new System.Drawing.Size(959, 32); - this.statusStrip.TabIndex = 1; - // - // labelDecksCount - // - this.labelDecksCount.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.labelDecksCount.AutoSize = true; - this.labelDecksCount.Location = new System.Drawing.Point(13, 373); - this.labelDecksCount.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - this.labelDecksCount.Name = "labelDecksCount"; - this.labelDecksCount.Size = new System.Drawing.Size(162, 25); - this.labelDecksCount.TabIndex = 9; - this.labelDecksCount.Text = "Количество колёс:"; - // - // countDecksBox - // - this.countDecksBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.countDecksBox.Location = new System.Drawing.Point(195, 367); - this.countDecksBox.Margin = new System.Windows.Forms.Padding(4); - this.countDecksBox.Maximum = new decimal(new int[] { + this.numericUpDownWheelsNumber.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.numericUpDownWheelsNumber.Location = new System.Drawing.Point(651, 402); + this.numericUpDownWheelsNumber.Maximum = new decimal(new int[] { 4, 0, 0, 0}); - this.countDecksBox.Name = "countDecksBox"; - this.countDecksBox.Size = new System.Drawing.Size(188, 31); - this.countDecksBox.TabIndex = 10; - this.countDecksBox.Value = new decimal(new int[] { + this.numericUpDownWheelsNumber.Minimum = new decimal(new int[] { + 2, + 0, + 0, + 0}); + this.numericUpDownWheelsNumber.Name = "numericUpDownWheelsNumber"; + this.numericUpDownWheelsNumber.ReadOnly = true; + this.numericUpDownWheelsNumber.Size = new System.Drawing.Size(29, 23); + this.numericUpDownWheelsNumber.TabIndex = 7; + this.numericUpDownWheelsNumber.Value = new decimal(new int[] { 2, 0, 0, 0}); // - // toolStripStatusCountDecks + // labelWheelsNumber // - this.toolStripStatusCountDecks.Name = "toolStripStatusCountDecks"; - this.toolStripStatusCountDecks.Size = new System.Drawing.Size(162, 25); - this.toolStripStatusCountDecks.Text = "Количество колёс:"; + this.labelWheelsNumber.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.labelWheelsNumber.AutoSize = true; + this.labelWheelsNumber.Location = new System.Drawing.Point(565, 404); + this.labelWheelsNumber.Name = "labelWheelsNumber"; + this.labelWheelsNumber.Size = new System.Drawing.Size(80, 15); + this.labelWheelsNumber.TabIndex = 8; + this.labelWheelsNumber.Text = "Число колёс:"; + // + // buttonCreateModif + // + this.buttonCreateModif.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.buttonCreateModif.Location = new System.Drawing.Point(108, 395); + this.buttonCreateModif.Name = "buttonCreateModif"; + this.buttonCreateModif.Size = new System.Drawing.Size(98, 30); + this.buttonCreateModif.TabIndex = 9; + this.buttonCreateModif.Text = "Модификация"; + this.buttonCreateModif.UseVisualStyleBackColor = true; + this.buttonCreateModif.Click += new System.EventHandler(this.ButtonCreateModif_Click); + // + // toolStripStatusLabelAdditionalColor + // + this.toolStripStatusLabelAdditionalColor.Name = "toolStripStatusLabelAdditionalColor"; + this.toolStripStatusLabelAdditionalColor.Size = new System.Drawing.Size(137, 17); + this.toolStripStatusLabelAdditionalColor.Text = "Дополнительный цвет: "; + // + // toolStripStatusLabelHasPipe + // + this.toolStripStatusLabelHasPipe.Name = "toolStripStatusLabelHasPipe"; + this.toolStripStatusLabelHasPipe.Size = new System.Drawing.Size(99, 17); + this.toolStripStatusLabelHasPipe.Text = "Наличие трубы: "; + // + // toolStripStatusLabelHasFuelTank + // + this.toolStripStatusLabelHasFuelTank.Name = "toolStripStatusLabelHasFuelTank"; + this.toolStripStatusLabelHasFuelTank.Size = new System.Drawing.Size(158, 17); + this.toolStripStatusLabelHasFuelTank.Text = "Наличие топливного бака: "; // // FormLocomotive // - this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 25F); + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(959, 450); - this.Controls.Add(this.countDecksBox); - this.Controls.Add(this.labelDecksCount); - this.Controls.Add(this.buttonRight); + this.ClientSize = new System.Drawing.Size(800, 450); + this.Controls.Add(this.buttonCreateModif); + this.Controls.Add(this.labelWheelsNumber); + this.Controls.Add(this.numericUpDownWheelsNumber); + this.Controls.Add(this.buttonUp); this.Controls.Add(this.buttonDown); this.Controls.Add(this.buttonLeft); - this.Controls.Add(this.buttonUp); - this.Controls.Add(this.buttonCreateModif); + this.Controls.Add(this.buttonRight); this.Controls.Add(this.buttonCreate); - this.Controls.Add(this.pictureBoxLocomotive); this.Controls.Add(this.statusStrip); + this.Controls.Add(this.pictureBoxLocomotive); this.Name = "FormLocomotive"; this.Text = "Локомотив"; ((System.ComponentModel.ISupportInitialize)(this.pictureBoxLocomotive)).EndInit(); this.statusStrip.ResumeLayout(false); this.statusStrip.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.countDecksBox)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownWheelsNumber)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); } @@ -224,18 +241,20 @@ #endregion private PictureBox pictureBoxLocomotive; - private Button buttonCreate; - private Button buttonUp; - private Button buttonLeft; - private Button buttonDown; - private Button buttonRight; + private StatusStrip statusStrip; private ToolStripStatusLabel toolStripStatusLabelSpeed; private ToolStripStatusLabel toolStripStatusLabelWeight; private ToolStripStatusLabel toolStripStatusLabelBodyColor; - private StatusStrip statusStrip; - private Label labelDecksCount; - private NumericUpDown countDecksBox; - private ToolStripStatusLabel toolStripStatusCountDecks; + private Button buttonCreate; + private Button buttonRight; + private Button buttonLeft; + private Button buttonDown; + private Button buttonUp; + private NumericUpDown numericUpDownWheelsNumber; + private Label labelWheelsNumber; private Button buttonCreateModif; + private ToolStripStatusLabel toolStripStatusLabelAdditionalColor; + private ToolStripStatusLabel toolStripStatusLabelHasPipe; + private ToolStripStatusLabel toolStripStatusLabelHasFuelTank; } } \ No newline at end of file diff --git a/ProjectLocomotive_Hard/ProjectLocomotive_Hard/FormLocomotive.cs b/ProjectLocomotive_Hard/ProjectLocomotive_Hard/FormLocomotive.cs index b35c252..d6460be 100644 --- a/ProjectLocomotive_Hard/ProjectLocomotive_Hard/FormLocomotive.cs +++ b/ProjectLocomotive_Hard/ProjectLocomotive_Hard/FormLocomotive.cs @@ -12,47 +12,68 @@ namespace ProjectLocomotive_Hard { public partial class FormLocomotive : Form { - private DrawningLocomotive _elloc; + /// + /// Объект от класса отрисовки локомотива + /// + private DrawningLocomotive _locomotive; public FormLocomotive() { InitializeComponent(); } /// - /// Метод прорисовки электролокомотива + /// Метод отрисовки локомотива /// private void Draw() { Bitmap bmp = new(pictureBoxLocomotive.Width, pictureBoxLocomotive.Height); Graphics gr = Graphics.FromImage(bmp); - _elloc?.DrawTransport(gr); + _locomotive?.DrawTransport(gr); pictureBoxLocomotive.Image = bmp; } /// - /// Метод установки данных + /// Заполнение информации по объекту /// - private void SetData() + /// Объект от класса отрисовки или его наследника + private void SetData(DrawningLocomotive locomotive) { Random rnd = new(); - _elloc.SetPosition(rnd.Next(10, 100), rnd.Next(10, 100), pictureBoxLocomotive.Width, pictureBoxLocomotive.Height); - _elloc.DrawningWheels.SetCountWheel = ((int)countDecksBox.Value); - toolStripStatusLabelSpeed.Text = $"Скорость: {_elloc.Locomotivе.Speed}"; - toolStripStatusLabelWeight.Text = $"Вес: {_elloc.Locomotivе.Weight}"; - toolStripStatusLabelBodyColor.Text = $"Цвет: {_elloc.Locomotivе.BodyColor.Name}"; + toolStripStatusLabelSpeed.Text = $"Скорость: {locomotive.Locomotive.Speed}"; + toolStripStatusLabelWeight.Text = $"Вес: {locomotive.Locomotive.Weight}"; + toolStripStatusLabelBodyColor.Text = $"Цвет: {locomotive.Locomotive.BodyColor.Name}"; + toolStripStatusLabelAdditionalColor.Text = $"Дополнительный цвет: н/д"; + toolStripStatusLabelHasPipe.Text = $"Наличие трубы: н/д"; + toolStripStatusLabelHasFuelTank.Text = $"Наличие топливного бака: н/д"; + _locomotive.SetPosition(rnd.Next(10, 100), rnd.Next(10, 100), pictureBoxLocomotive.Width, pictureBoxLocomotive.Height); } /// - /// Обработка нажатия кнопки "Создать" + /// Заполнение дополнительной информации по объекту (только для усложнённого объекта) + /// + /// Объект от наследника класса отрисовки + private void SetAdditionalData(DrawningWarmlyLocomotive warmlylocomotive) + { + if (warmlylocomotive.Locomotive is EntityWarmlyLocomotive entityWarmlyLocomotive) + { + toolStripStatusLabelAdditionalColor.Text = $"Дополнительный цвет: {entityWarmlyLocomotive.AdditionalColor.Name}"; + toolStripStatusLabelHasPipe.Text = $"Наличие трубы: {entityWarmlyLocomotive.HasPipe}"; + toolStripStatusLabelHasFuelTank.Text = $"Наличие топливного бака: {entityWarmlyLocomotive.HasFuelTank}"; + } + } + /// + /// Метод обработки нажатия на кнопку "Создать" /// /// /// private void ButtonCreate_Click(object sender, EventArgs e) { Random rnd = new(); - _elloc = new DrawningLocomotive(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256))); - SetData(); + _locomotive = new DrawningLocomotive(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256))); + _locomotive.SetPosition(rnd.Next(10, 100), rnd.Next(10, 100), pictureBoxLocomotive.Width, pictureBoxLocomotive.Height); + SetData(_locomotive); + _locomotive.AdditionalElements.WheelsNum = (int)numericUpDownWheelsNumber.Value; Draw(); } /// - /// Изменение размеров формы + /// Метод обработки нажатия на кнопки перемещения /// /// /// @@ -63,16 +84,16 @@ namespace ProjectLocomotive_Hard switch (name) { case "buttonUp": - _elloc?.MoveTransport(Direction.Up); + _locomotive?.MoveLocomotive(Direction.Up); break; case "buttonDown": - _elloc?.MoveTransport(Direction.Down); + _locomotive?.MoveLocomotive(Direction.Down); break; case "buttonLeft": - _elloc?.MoveTransport(Direction.Left); + _locomotive?.MoveLocomotive(Direction.Left); break; case "buttonRight": - _elloc?.MoveTransport(Direction.Right); + _locomotive?.MoveLocomotive(Direction.Right); break; } Draw(); @@ -84,22 +105,26 @@ namespace ProjectLocomotive_Hard /// private void PictureBoxLocomotive_Resize(object sender, EventArgs e) { - _elloc?.ChangeBorders(pictureBoxLocomotive.Width, pictureBoxLocomotive.Height); + _locomotive?.ChangeBorders(pictureBoxLocomotive.Width, pictureBoxLocomotive.Height); Draw(); } /// - /// Обработка нажатия кнопки "Модификация" + /// Метод обработки нажатия на кнопку "Модификация" /// /// /// private void ButtonCreateModif_Click(object sender, EventArgs e) { Random rnd = new(); - _elloc = new DrawningElectroLocomotive(rnd.Next(100, 300), rnd.Next(1000, 2000), - Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)), - Color.FromArgb(rnd.Next(1, 100), rnd.Next(1, 100), rnd.Next(1, 100)), - Convert.ToBoolean(rnd.Next(0, 1)), Convert.ToBoolean(rnd.Next(0, 1))); - SetData(); + _locomotive = new DrawningWarmlyLocomotive(rnd.Next(100, 300), rnd.Next(1000, 2000), + Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)), + 160, 115, + Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)), + Convert.ToBoolean(rnd.Next(0, 2)), + Convert.ToBoolean(rnd.Next(0, 2))); + SetData(_locomotive); + SetAdditionalData((DrawningWarmlyLocomotive)_locomotive); + _locomotive.AdditionalElements.WheelsNum = (int)numericUpDownWheelsNumber.Value; Draw(); } } diff --git a/ProjectLocomotive_Hard/ProjectLocomotive_Hard/FormMap.Designer.cs b/ProjectLocomotive_Hard/ProjectLocomotive_Hard/FormMap.Designer.cs index cadcb50..aa0083d 100644 --- a/ProjectLocomotive_Hard/ProjectLocomotive_Hard/FormMap.Designer.cs +++ b/ProjectLocomotive_Hard/ProjectLocomotive_Hard/FormMap.Designer.cs @@ -6,7 +6,6 @@ /// Required designer variable. /// private System.ComponentModel.IContainer components = null; - /// /// Clean up any resources being used. /// @@ -19,41 +18,49 @@ } base.Dispose(disposing); } - #region Windows Form Designer generated code - /// /// Required method for Designer support - do not modify /// the contents of this method with the code editor. /// private void InitializeComponent() { - this.pictureBoxCar = new System.Windows.Forms.PictureBox(); + this.pictureBoxLocomotive = new System.Windows.Forms.PictureBox(); this.statusStrip = new System.Windows.Forms.StatusStrip(); this.toolStripStatusLabelSpeed = new System.Windows.Forms.ToolStripStatusLabel(); this.toolStripStatusLabelWeight = new System.Windows.Forms.ToolStripStatusLabel(); this.toolStripStatusLabelBodyColor = new System.Windows.Forms.ToolStripStatusLabel(); + this.toolStripStatusLabelAdditionalColor = new System.Windows.Forms.ToolStripStatusLabel(); + this.toolStripStatusLabelHasPipe = new System.Windows.Forms.ToolStripStatusLabel(); + this.toolStripStatusLabelHasFuelTank = new System.Windows.Forms.ToolStripStatusLabel(); this.buttonCreate = new System.Windows.Forms.Button(); - this.buttonUp = new System.Windows.Forms.Button(); - this.buttonLeft = new System.Windows.Forms.Button(); this.buttonRight = new System.Windows.Forms.Button(); + this.buttonLeft = new System.Windows.Forms.Button(); this.buttonDown = new System.Windows.Forms.Button(); - this.buttonCreateModif = new System.Windows.Forms.Button(); + this.buttonUp = new System.Windows.Forms.Button(); this.comboBoxSelectorMap = new System.Windows.Forms.ComboBox(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBoxCar)).BeginInit(); + this.buttonCreateModif = new System.Windows.Forms.Button(); + this.labelWheelsNumber = new System.Windows.Forms.Label(); + this.numericUpDownWheelsNumber = new System.Windows.Forms.NumericUpDown(); + this.radioButtonNoOrnament = new System.Windows.Forms.RadioButton(); + this.radioButtonRectOrnament = new System.Windows.Forms.RadioButton(); + this.radioButtonEllipseOrnament = new System.Windows.Forms.RadioButton(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBoxLocomotive)).BeginInit(); this.statusStrip.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownWheelsNumber)).BeginInit(); this.SuspendLayout(); // - // pictureBoxCar + // pictureBoxLocomotive // - this.pictureBoxCar.Dock = System.Windows.Forms.DockStyle.Fill; - this.pictureBoxCar.Location = new System.Drawing.Point(0, 0); - this.pictureBoxCar.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.pictureBoxCar.Name = "pictureBoxCar"; - this.pictureBoxCar.Size = new System.Drawing.Size(1143, 718); - this.pictureBoxCar.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; - this.pictureBoxCar.TabIndex = 0; - this.pictureBoxCar.TabStop = false; + this.pictureBoxLocomotive.Dock = System.Windows.Forms.DockStyle.Fill; + this.pictureBoxLocomotive.Location = new System.Drawing.Point(0, 0); + this.pictureBoxLocomotive.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.pictureBoxLocomotive.MinimumSize = new System.Drawing.Size(1, 1); + this.pictureBoxLocomotive.Name = "pictureBoxLocomotive"; + this.pictureBoxLocomotive.Size = new System.Drawing.Size(1143, 750); + this.pictureBoxLocomotive.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; + this.pictureBoxLocomotive.TabIndex = 0; + this.pictureBoxLocomotive.TabStop = false; // // statusStrip // @@ -61,62 +68,84 @@ this.statusStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.toolStripStatusLabelSpeed, this.toolStripStatusLabelWeight, - this.toolStripStatusLabelBodyColor}); + this.toolStripStatusLabelBodyColor, + this.toolStripStatusLabelAdditionalColor, + this.toolStripStatusLabelHasPipe, + this.toolStripStatusLabelHasFuelTank}); this.statusStrip.Location = new System.Drawing.Point(0, 718); this.statusStrip.Name = "statusStrip"; this.statusStrip.Padding = new System.Windows.Forms.Padding(1, 0, 20, 0); this.statusStrip.Size = new System.Drawing.Size(1143, 32); this.statusStrip.TabIndex = 1; + this.statusStrip.Text = "statusStrip1"; // // toolStripStatusLabelSpeed // this.toolStripStatusLabelSpeed.Name = "toolStripStatusLabelSpeed"; - this.toolStripStatusLabelSpeed.Size = new System.Drawing.Size(93, 25); - this.toolStripStatusLabelSpeed.Text = "Скорость:"; + this.toolStripStatusLabelSpeed.Size = new System.Drawing.Size(98, 25); + this.toolStripStatusLabelSpeed.Text = "Скорость: "; // // toolStripStatusLabelWeight // this.toolStripStatusLabelWeight.Name = "toolStripStatusLabelWeight"; - this.toolStripStatusLabelWeight.Size = new System.Drawing.Size(43, 25); - this.toolStripStatusLabelWeight.Text = "Вес:"; + this.toolStripStatusLabelWeight.Size = new System.Drawing.Size(48, 25); + this.toolStripStatusLabelWeight.Text = "Вес: "; // // toolStripStatusLabelBodyColor // this.toolStripStatusLabelBodyColor.Name = "toolStripStatusLabelBodyColor"; - this.toolStripStatusLabelBodyColor.Size = new System.Drawing.Size(55, 25); - this.toolStripStatusLabelBodyColor.Text = "Цвет:"; + this.toolStripStatusLabelBodyColor.Size = new System.Drawing.Size(60, 25); + this.toolStripStatusLabelBodyColor.Text = "Цвет: "; + // + // toolStripStatusLabelAdditionalColor + // + this.toolStripStatusLabelAdditionalColor.Name = "toolStripStatusLabelAdditionalColor"; + this.toolStripStatusLabelAdditionalColor.Size = new System.Drawing.Size(203, 25); + this.toolStripStatusLabelAdditionalColor.Text = "Дополнительный цвет: "; + // + // toolStripStatusLabelHasPipe + // + this.toolStripStatusLabelHasPipe.Name = "toolStripStatusLabelHasPipe"; + this.toolStripStatusLabelHasPipe.Size = new System.Drawing.Size(146, 25); + this.toolStripStatusLabelHasPipe.Text = "Наличие трубы: "; + // + // toolStripStatusLabelHasFuelTank + // + this.toolStripStatusLabelHasFuelTank.Name = "toolStripStatusLabelHasFuelTank"; + this.toolStripStatusLabelHasFuelTank.Size = new System.Drawing.Size(234, 25); + this.toolStripStatusLabelHasFuelTank.Text = "Наличие топливного бака: "; // // buttonCreate // this.buttonCreate.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.buttonCreate.Location = new System.Drawing.Point(17, 650); + this.buttonCreate.Location = new System.Drawing.Point(17, 658); this.buttonCreate.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.buttonCreate.Name = "buttonCreate"; - this.buttonCreate.Size = new System.Drawing.Size(107, 38); + this.buttonCreate.Size = new System.Drawing.Size(129, 50); this.buttonCreate.TabIndex = 2; this.buttonCreate.Text = "Создать"; this.buttonCreate.UseVisualStyleBackColor = true; this.buttonCreate.Click += new System.EventHandler(this.ButtonCreate_Click); // - // buttonUp + // buttonRight // - this.buttonUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.buttonUp.BackgroundImage = global::ProjectLocomotive_Hard.Properties.Resources.up; - this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.buttonUp.Location = new System.Drawing.Point(1031, 583); - this.buttonUp.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.buttonUp.Name = "buttonUp"; - this.buttonUp.Size = new System.Drawing.Size(43, 50); - this.buttonUp.TabIndex = 3; - this.buttonUp.UseVisualStyleBackColor = true; - this.buttonUp.Click += new System.EventHandler(this.ButtonMove_Click); + this.buttonRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.buttonRight.BackgroundImage = global::ProjectLocomotive_Hard.Properties.Resources.right; + this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.buttonRight.Location = new System.Drawing.Point(1083, 658); + this.buttonRight.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.buttonRight.Name = "buttonRight"; + this.buttonRight.Size = new System.Drawing.Size(43, 50); + this.buttonRight.TabIndex = 3; + this.buttonRight.UseVisualStyleBackColor = true; + this.buttonRight.Click += new System.EventHandler(this.ButtonMove_Click); // // buttonLeft // this.buttonLeft.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.buttonLeft.BackgroundImage = global::ProjectLocomotive_Hard.Properties.Resources.left; this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.buttonLeft.Location = new System.Drawing.Point(980, 643); + this.buttonLeft.Location = new System.Drawing.Point(980, 658); this.buttonLeft.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.buttonLeft.Name = "buttonLeft"; this.buttonLeft.Size = new System.Drawing.Size(43, 50); @@ -124,42 +153,31 @@ this.buttonLeft.UseVisualStyleBackColor = true; this.buttonLeft.Click += new System.EventHandler(this.ButtonMove_Click); // - // buttonRight - // - this.buttonRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.buttonRight.BackgroundImage = global::ProjectLocomotive_Hard.Properties.Resources.right; - this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.buttonRight.Location = new System.Drawing.Point(1083, 643); - this.buttonRight.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.buttonRight.Name = "buttonRight"; - this.buttonRight.Size = new System.Drawing.Size(43, 50); - this.buttonRight.TabIndex = 5; - this.buttonRight.UseVisualStyleBackColor = true; - this.buttonRight.Click += new System.EventHandler(this.ButtonMove_Click); - // // buttonDown // this.buttonDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.buttonDown.BackgroundImage = global::ProjectLocomotive_Hard.Properties.Resources.down; this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.buttonDown.Location = new System.Drawing.Point(1031, 643); + this.buttonDown.Location = new System.Drawing.Point(1031, 658); this.buttonDown.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.buttonDown.Name = "buttonDown"; this.buttonDown.Size = new System.Drawing.Size(43, 50); - this.buttonDown.TabIndex = 6; + this.buttonDown.TabIndex = 5; this.buttonDown.UseVisualStyleBackColor = true; this.buttonDown.Click += new System.EventHandler(this.ButtonMove_Click); // - // buttonCreateModif + // buttonUp // - this.buttonCreateModif.Location = new System.Drawing.Point(149, 650); - this.buttonCreateModif.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.buttonCreateModif.Name = "buttonCreateModif"; - this.buttonCreateModif.Size = new System.Drawing.Size(157, 38); - this.buttonCreateModif.TabIndex = 7; - this.buttonCreateModif.Text = "Модификация"; - this.buttonCreateModif.UseVisualStyleBackColor = true; - this.buttonCreateModif.Click += new System.EventHandler(this.ButtonCreateModif_Click); + this.buttonUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.buttonUp.BackgroundImage = global::ProjectLocomotive_Hard.Properties.Resources.up; + this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.buttonUp.Location = new System.Drawing.Point(1031, 598); + this.buttonUp.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.buttonUp.Name = "buttonUp"; + this.buttonUp.Size = new System.Drawing.Size(43, 50); + this.buttonUp.TabIndex = 6; + this.buttonUp.UseVisualStyleBackColor = true; + this.buttonUp.Click += new System.EventHandler(this.ButtonMove_Click); // // comboBoxSelectorMap // @@ -167,52 +185,154 @@ this.comboBoxSelectorMap.FormattingEnabled = true; this.comboBoxSelectorMap.Items.AddRange(new object[] { "Простая карта", - "Море"}); + "Карта с морем"}); this.comboBoxSelectorMap.Location = new System.Drawing.Point(17, 20); this.comboBoxSelectorMap.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.comboBoxSelectorMap.Name = "comboBoxSelectorMap"; - this.comboBoxSelectorMap.Size = new System.Drawing.Size(171, 33); - this.comboBoxSelectorMap.TabIndex = 8; + this.comboBoxSelectorMap.Size = new System.Drawing.Size(200, 33); + this.comboBoxSelectorMap.TabIndex = 7; this.comboBoxSelectorMap.SelectedIndexChanged += new System.EventHandler(this.ComboBoxSelectorMap_SelectedIndexChanged); // + // buttonCreateModif + // + this.buttonCreateModif.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.buttonCreateModif.Location = new System.Drawing.Point(154, 658); + this.buttonCreateModif.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.buttonCreateModif.Name = "buttonCreateModif"; + this.buttonCreateModif.Size = new System.Drawing.Size(156, 50); + this.buttonCreateModif.TabIndex = 8; + this.buttonCreateModif.Text = "Модификация"; + this.buttonCreateModif.UseVisualStyleBackColor = true; + this.buttonCreateModif.Click += new System.EventHandler(this.ButtonCreateModif_Click); + // + // labelWheelsNumber + // + this.labelWheelsNumber.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.labelWheelsNumber.AutoSize = true; + this.labelWheelsNumber.Location = new System.Drawing.Point(800, 672); + this.labelWheelsNumber.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.labelWheelsNumber.Name = "labelWheelsNumber"; + this.labelWheelsNumber.Size = new System.Drawing.Size(117, 25); + this.labelWheelsNumber.TabIndex = 10; + this.labelWheelsNumber.Text = "Число колёс:"; + // + // numericUpDownWheelsNumber + // + this.numericUpDownWheelsNumber.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.numericUpDownWheelsNumber.Location = new System.Drawing.Point(923, 668); + this.numericUpDownWheelsNumber.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.numericUpDownWheelsNumber.Maximum = new decimal(new int[] { + 4, + 0, + 0, + 0}); + this.numericUpDownWheelsNumber.Minimum = new decimal(new int[] { + 2, + 0, + 0, + 0}); + this.numericUpDownWheelsNumber.Name = "numericUpDownWheelsNumber"; + this.numericUpDownWheelsNumber.ReadOnly = true; + this.numericUpDownWheelsNumber.Size = new System.Drawing.Size(41, 31); + this.numericUpDownWheelsNumber.TabIndex = 9; + this.numericUpDownWheelsNumber.Value = new decimal(new int[] { + 2, + 0, + 0, + 0}); + // + // radioButtonNoOrnament + // + this.radioButtonNoOrnament.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.radioButtonNoOrnament.AutoSize = true; + this.radioButtonNoOrnament.Checked = true; + this.radioButtonNoOrnament.Location = new System.Drawing.Point(319, 668); + this.radioButtonNoOrnament.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.radioButtonNoOrnament.Name = "radioButtonNoOrnament"; + this.radioButtonNoOrnament.Size = new System.Drawing.Size(160, 29); + this.radioButtonNoOrnament.TabIndex = 11; + this.radioButtonNoOrnament.TabStop = true; + this.radioButtonNoOrnament.Text = "Нет орнамента"; + this.radioButtonNoOrnament.UseVisualStyleBackColor = true; + this.radioButtonNoOrnament.CheckedChanged += new System.EventHandler(this.RadioButtonOrnament_CheckedChanged); + // + // radioButtonRectOrnament + // + this.radioButtonRectOrnament.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.radioButtonRectOrnament.AutoSize = true; + this.radioButtonRectOrnament.Location = new System.Drawing.Point(481, 668); + this.radioButtonRectOrnament.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.radioButtonRectOrnament.Name = "radioButtonRectOrnament"; + this.radioButtonRectOrnament.Size = new System.Drawing.Size(136, 29); + this.radioButtonRectOrnament.TabIndex = 12; + this.radioButtonRectOrnament.Text = "Квадратный"; + this.radioButtonRectOrnament.UseVisualStyleBackColor = true; + this.radioButtonRectOrnament.CheckedChanged += new System.EventHandler(this.RadioButtonOrnament_CheckedChanged); + // + // radioButtonEllipseOrnament + // + this.radioButtonEllipseOrnament.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.radioButtonEllipseOrnament.AutoSize = true; + this.radioButtonEllipseOrnament.Location = new System.Drawing.Point(624, 668); + this.radioButtonEllipseOrnament.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.radioButtonEllipseOrnament.Name = "radioButtonEllipseOrnament"; + this.radioButtonEllipseOrnament.Size = new System.Drawing.Size(106, 29); + this.radioButtonEllipseOrnament.TabIndex = 13; + this.radioButtonEllipseOrnament.Text = "Круглый"; + this.radioButtonEllipseOrnament.UseVisualStyleBackColor = true; + this.radioButtonEllipseOrnament.CheckedChanged += new System.EventHandler(this.RadioButtonOrnament_CheckedChanged); + // // FormMap // this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 25F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(1143, 750); - this.Controls.Add(this.comboBoxSelectorMap); + this.Controls.Add(this.radioButtonEllipseOrnament); + this.Controls.Add(this.radioButtonRectOrnament); + this.Controls.Add(this.radioButtonNoOrnament); + this.Controls.Add(this.labelWheelsNumber); + this.Controls.Add(this.numericUpDownWheelsNumber); this.Controls.Add(this.buttonCreateModif); - this.Controls.Add(this.buttonDown); - this.Controls.Add(this.buttonRight); - this.Controls.Add(this.buttonLeft); + this.Controls.Add(this.comboBoxSelectorMap); this.Controls.Add(this.buttonUp); + this.Controls.Add(this.buttonDown); + this.Controls.Add(this.buttonLeft); + this.Controls.Add(this.buttonRight); this.Controls.Add(this.buttonCreate); - this.Controls.Add(this.pictureBoxCar); this.Controls.Add(this.statusStrip); + this.Controls.Add(this.pictureBoxLocomotive); this.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.Name = "FormMap"; - this.Text = "Карта"; - ((System.ComponentModel.ISupportInitialize)(this.pictureBoxCar)).EndInit(); + this.Text = "Локомотив"; + ((System.ComponentModel.ISupportInitialize)(this.pictureBoxLocomotive)).EndInit(); this.statusStrip.ResumeLayout(false); this.statusStrip.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownWheelsNumber)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); - } #endregion - private PictureBox pictureBoxCar; + private PictureBox pictureBoxLocomotive; private StatusStrip statusStrip; private ToolStripStatusLabel toolStripStatusLabelSpeed; private ToolStripStatusLabel toolStripStatusLabelWeight; private ToolStripStatusLabel toolStripStatusLabelBodyColor; private Button buttonCreate; - private Button buttonUp; - private Button buttonLeft; private Button buttonRight; + private Button buttonLeft; private Button buttonDown; - private Button buttonCreateModif; + private Button buttonUp; private ComboBox comboBoxSelectorMap; + private Button buttonCreateModif; + private ToolStripStatusLabel toolStripStatusLabelAdditionalColor; + private ToolStripStatusLabel toolStripStatusLabelHasPipe; + private ToolStripStatusLabel toolStripStatusLabelHasFuelTank; + private Label labelWheelsNumber; + private NumericUpDown numericUpDownWheelsNumber; + private RadioButton radioButtonNoOrnament; + private RadioButton radioButtonRectOrnament; + private RadioButton radioButtonEllipseOrnament; } } \ No newline at end of file diff --git a/ProjectLocomotive_Hard/ProjectLocomotive_Hard/FormMap.cs b/ProjectLocomotive_Hard/ProjectLocomotive_Hard/FormMap.cs index 8e1e8dd..a944a99 100644 --- a/ProjectLocomotive_Hard/ProjectLocomotive_Hard/FormMap.cs +++ b/ProjectLocomotive_Hard/ProjectLocomotive_Hard/FormMap.cs @@ -12,8 +12,10 @@ namespace ProjectLocomotive_Hard { public partial class FormMap : Form { + /// + /// Создание объекта от абстрактного класса карты + /// private AbstractMap _abstractMap; - public FormMap() { InitializeComponent(); @@ -22,14 +24,30 @@ namespace ProjectLocomotive_Hard /// /// Заполнение информации по объекту /// - /// - private void SetData(DrawningLocomotive loc) + /// Объект от класса отрисовки или его наследника + private void SetData(DrawningLocomotive locomotive) { - toolStripStatusLabelSpeed.Text = $"Скорость: {loc.Locomotivе.Speed}"; - toolStripStatusLabelWeight.Text = $"Вес: {loc.Locomotivе.Weight}"; - toolStripStatusLabelBodyColor.Text = $"Цвет: {loc.Locomotivе.BodyColor.Name}"; - pictureBoxCar.Image = _abstractMap.CreateMap(pictureBoxCar.Width, pictureBoxCar.Height, - new DrawningObject(loc)); + toolStripStatusLabelSpeed.Text = $"Скорость: {locomotive.Locomotive.Speed}"; + toolStripStatusLabelWeight.Text = $"Вес: {locomotive.Locomotive.Weight}"; + toolStripStatusLabelBodyColor.Text = $"Цвет: {locomotive.Locomotive.BodyColor.Name}"; + toolStripStatusLabelAdditionalColor.Text = $"Дополнительный цвет: н/д"; + toolStripStatusLabelHasPipe.Text = $"Наличие трубы: н/д"; + toolStripStatusLabelHasFuelTank.Text = $"Наличие топливного бака: н/д"; + pictureBoxLocomotive.Image = _abstractMap.CreateMap(pictureBoxLocomotive.Width, pictureBoxLocomotive.Height, + new DrawningObjectLocomotive(locomotive)); + } + /// + /// Заполнение дополнительной информации по объекту (только для усложнённого объекта) + /// + /// Объект от наследника класса отрисовки + private void SetAdditionalData(DrawningWarmlyLocomotive warmlylocomotive) + { + if (warmlylocomotive.Locomotive is EntityWarmlyLocomotive entityWarmlyLocomotive) + { + toolStripStatusLabelAdditionalColor.Text = $"Дополнительный цвет: {entityWarmlyLocomotive.AdditionalColor.Name}"; + toolStripStatusLabelHasPipe.Text = $"Наличие трубы: {entityWarmlyLocomotive.HasPipe}"; + toolStripStatusLabelHasFuelTank.Text = $"Наличие топливного бака: {entityWarmlyLocomotive.HasFuelTank}"; + } } /// /// Обработка нажатия кнопки "Создать" @@ -39,11 +57,14 @@ namespace ProjectLocomotive_Hard private void ButtonCreate_Click(object sender, EventArgs e) { Random rnd = new(); - var car = new DrawningLocomotive(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256))); - SetData(car); + var locomotive = new DrawningLocomotive(rnd.Next(100, 300), rnd.Next(1000, 2000), + Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256))); + SetOrnament(locomotive); + locomotive.AdditionalElements.WheelsNum = (int)numericUpDownWheelsNumber.Value; + SetData(locomotive); } /// - /// Изменение размеров формы + /// Перемещение объекта по форме /// /// /// @@ -67,7 +88,7 @@ namespace ProjectLocomotive_Hard dir = Direction.Right; break; } - pictureBoxCar.Image = _abstractMap?.MoveObject(dir); + pictureBoxLocomotive.Image = _abstractMap?.MoveObject(dir); } /// /// Обработка нажатия кнопки "Модификация" @@ -77,11 +98,16 @@ namespace ProjectLocomotive_Hard private void ButtonCreateModif_Click(object sender, EventArgs e) { Random rnd = new(); - var car = new DrawningElectroLocomotive(rnd.Next(100, 300), rnd.Next(1000, 2000), - Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)), - Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)), - Convert.ToBoolean(rnd.Next(0, 2)), Convert.ToBoolean(rnd.Next(0, 2))); - SetData(car); + var locomotive = new DrawningWarmlyLocomotive(rnd.Next(100, 300), rnd.Next(1000, 2000), + Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)), + 160, 85, + Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)), + Convert.ToBoolean(rnd.Next(0, 2)), + Convert.ToBoolean(rnd.Next(0, 2))); + SetOrnament(locomotive); + locomotive.AdditionalElements.WheelsNum = (int)numericUpDownWheelsNumber.Value; + SetData(locomotive); + SetAdditionalData(locomotive); } /// /// Смена карты @@ -95,9 +121,33 @@ namespace ProjectLocomotive_Hard case "Простая карта": _abstractMap = new SimpleMap(); break; - - case "Море": - _abstractMap = new SeaMap(); + case "Карта с морем": + _abstractMap = new RoadsMap(); + break; + default: + break; + } + } + string CurrentOrnament = ""; + private void RadioButtonOrnament_CheckedChanged(object sender, EventArgs e) + { + if (((RadioButton)sender).Checked) + { + CurrentOrnament = ((RadioButton)sender).Name; + } + } + private void SetOrnament(DrawningLocomotive locomotive) + { + switch (CurrentOrnament) + { + case "radioButtonNoOrnament": + locomotive.AdditionalElements = new DrawningWheels(); + break; + case "radioButtonRectOrnament": + locomotive.AdditionalElements = new DrawningRectOrnament(); + break; + case "radioButtonEllipseOrnament": + locomotive.AdditionalElements = new DrawningEllipseOrnament(); break; } } diff --git a/ProjectLocomotive_Hard/ProjectLocomotive_Hard/IDrawningAdditionalElements.cs b/ProjectLocomotive_Hard/ProjectLocomotive_Hard/IDrawningAdditionalElements.cs new file mode 100644 index 0000000..9d3a074 --- /dev/null +++ b/ProjectLocomotive_Hard/ProjectLocomotive_Hard/IDrawningAdditionalElements.cs @@ -0,0 +1,31 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ProjectLocomotive_Hard +{ + internal interface IDrawningAdditionalElements + { + /// + /// Свойство получения количества колёс + /// + public int WheelsNum { set; } + /// + /// Отрисовка колёс + /// + /// + /// + /// + /// + public void DrawWheels(Graphics g, float startPosX, float startPosY, Color wheelsColor); + /// + /// Отрисовка орнамента (если есть) + /// + /// + /// + /// + public void DrawOrnament(Graphics g, float startPosX, float startPosY); + } +} diff --git a/ProjectLocomotive_Hard/ProjectLocomotive_Hard/IDrawningObject.cs b/ProjectLocomotive_Hard/ProjectLocomotive_Hard/IDrawningObject.cs index 6b43d4b..bc2fe32 100644 --- a/ProjectLocomotive_Hard/ProjectLocomotive_Hard/IDrawningObject.cs +++ b/ProjectLocomotive_Hard/ProjectLocomotive_Hard/IDrawningObject.cs @@ -7,14 +7,14 @@ using System.Threading.Tasks; namespace ProjectLocomotive_Hard { /// - /// Интерфейс для работы с объектом, прорисовываемым на форме + /// Интерфейс для отрисовки /// internal interface IDrawningObject { /// - /// Шаг перемещения объекта - /// - public float Step { get; } + /// Шаг перемещения объекта + /// + public float Step { get; } /// /// Установка позиции объекта /// @@ -27,7 +27,6 @@ namespace ProjectLocomotive_Hard /// Изменение направления пермещения объекта /// /// Направление - /// void MoveObject(Direction direction); /// /// Отрисовка объекта @@ -38,6 +37,6 @@ namespace ProjectLocomotive_Hard /// Получение текущей позиции объекта /// /// - (float Left, float Right, float Top, float Bottom) GetCurrentPosition(); + (float Top, float Bottom, float Left, float Right) GetCurrentPosition(); } } diff --git a/ProjectLocomotive_Hard/ProjectLocomotive_Hard/ILocomotiveWheel.cs b/ProjectLocomotive_Hard/ProjectLocomotive_Hard/ILocomotiveWheel.cs deleted file mode 100644 index 68810c6..0000000 --- a/ProjectLocomotive_Hard/ProjectLocomotive_Hard/ILocomotiveWheel.cs +++ /dev/null @@ -1,14 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace ProjectLocomotive_Hard -{ - internal interface ILocomotiveWheel - { - int SetCountWheel { set; } - public void DrawningWheel(Graphics g, Color bodyColor, float PosX, float PosY); - } -} diff --git a/ProjectLocomotive_Hard/ProjectLocomotive_Hard/LocomotiveRectangleWheel.cs b/ProjectLocomotive_Hard/ProjectLocomotive_Hard/LocomotiveRectangleWheel.cs deleted file mode 100644 index daeeea3..0000000 --- a/ProjectLocomotive_Hard/ProjectLocomotive_Hard/LocomotiveRectangleWheel.cs +++ /dev/null @@ -1,67 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace ProjectLocomotive_Hard -{ - internal class LocomotiveRectangleWheel : ILocomotiveWheel - { - /// Приватное поле содержащие текущее количество палуб - private CountWheel _countWheel; - /// - /// Открытое свойство, через которое можно в поле-перечисление занести значение - /// - public int SetCountWheel - { - set - { - switch (value) - { - case 2: - _countWheel = CountWheel.Two; - break; - case 3: - _countWheel = CountWheel.Three; - break; - case 4: - _countWheel = CountWheel.Four; - break; - default: - _countWheel = CountWheel.Two; - break; - } - } - } - /// Отрисовывает колёса - /// The g. - ///Цвет колёс. - /// начальная позиция по x - /// начальная позиция по y - public void DrawningWheel(Graphics g, Color bodyColor, float PosX, float PosY) - { - if ((int)_countWheel == 2) - { - Brush brr = new SolidBrush(Color.Green); - g.FillEllipse(brr, PosX + 95, PosY + 25, 15, 15); - g.FillEllipse(brr, PosX + 120, PosY + 25, 15, 15); - } - if ((int)_countWheel == 3) - { - Brush brr = new SolidBrush(Color.Blue); - g.FillEllipse(brr, PosX + 92, PosY + 25, 13, 13); - g.FillEllipse(brr, PosX + 110, PosY + 25, 13, 13); - g.FillEllipse(brr, PosX + 128, PosY + 25, 13, 13); - } - if ((int)_countWheel == 4) - { - Brush brr = new SolidBrush(Color.HotPink); - g.FillEllipse(brr, PosX + 90, PosY + 25, 10, 10); - g.FillEllipse(brr, PosX + 103, PosY + 25, 10, 10); - g.FillEllipse(brr, PosX + 116, PosY + 25, 10, 10); - g.FillEllipse(brr, PosX + 129, PosY + 25, 10, 10); - } - } - } -} diff --git a/ProjectLocomotive_Hard/ProjectLocomotive_Hard/LocomotiveSquareWheel.cs b/ProjectLocomotive_Hard/ProjectLocomotive_Hard/LocomotiveSquareWheel.cs deleted file mode 100644 index 0ded8c0..0000000 --- a/ProjectLocomotive_Hard/ProjectLocomotive_Hard/LocomotiveSquareWheel.cs +++ /dev/null @@ -1,67 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace ProjectLocomotive_Hard -{ - internal class LocomotiveSquareWheel : ILocomotiveWheel - { - /// Приватное поле содержащие текущее количество палуб - private CountWheel _countWheel; - /// - /// Открытое свойство, через которое можно в поле-перечисление занести значение - /// - public int SetCountWheel - { - set - { - switch (value) - { - case 2: - _countWheel = CountWheel.Two; - break; - case 3: - _countWheel = CountWheel.Three; - break; - case 4: - _countWheel = CountWheel.Four; - break; - default: - _countWheel = CountWheel.Two; - break; - } - } - } - /// Отрисовывает колёса - /// The g. - ///Цвет колёс. - /// начальная позиция по x - /// начальная позиция по y - public void DrawningWheel(Graphics g, Color bodyColor, float PosX, float PosY) - { - if ((int)_countWheel == 2) - { - Brush brr = new SolidBrush(Color.Green); - g.FillEllipse(brr, PosX + 95, PosY + 25, 15, 15); - g.FillEllipse(brr, PosX + 120, PosY + 25, 15, 15); - } - if ((int)_countWheel == 3) - { - Brush brr = new SolidBrush(Color.Blue); - g.FillEllipse(brr, PosX + 92, PosY + 25, 13, 13); - g.FillEllipse(brr, PosX + 110, PosY + 25, 13, 13); - g.FillEllipse(brr, PosX + 128, PosY + 25, 13, 13); - } - if ((int)_countWheel == 4) - { - Brush brr = new SolidBrush(Color.HotPink); - g.FillEllipse(brr, PosX + 90, PosY + 25, 10, 10); - g.FillEllipse(brr, PosX + 103, PosY + 25, 10, 10); - g.FillEllipse(brr, PosX + 116, PosY + 25, 10, 10); - g.FillEllipse(brr, PosX + 129, PosY + 25, 10, 10); - } - } - } -} diff --git a/ProjectLocomotive_Hard/ProjectLocomotive_Hard/Resources/ArrowDown.png b/ProjectLocomotive_Hard/ProjectLocomotive_Hard/Resources/ArrowDown.png deleted file mode 100644 index d540c5754ccb1f745f83c63e06ea3ccb5503cfb5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 483 zcmeAS@N?(olHy`uVBq!ia0vp^av;pX3?zBp#Z3TGjKx9jPK-BC>eK@{oCO|{#S9GG z!XV7ZFl&wkP%uBhC&aa~vhu)z13=!vg9nR>idL^)EhHr5=H|9@=gzHLw>mjF9XfQ# z)zuZKfQ^kUC@ARg;lum(?F$JBVPIXJ^O3!LfJmUUqhN zYinypMn)?ut2JxZaB*>Qa&o%3xUjIW9NM;e8PF`%k|4j}|4s~c|JVKhpH}_f;y(}= z`TqZ(^WWot+5i86ApS}avG{!BU!aCNo-U3d6?1AYy%uUx5MWKPn#$_R8nJB2)UW@} z&u~&Pza78fK2LQTyOY?AwNJa&be}crpCW4AWNRF+`Y2|pG5|jN7UKGF2A|q-rV1Jr+<7jGpQhE zRmlA>$IWUYgoIyDX+6H9d}7##O0M@u=T+ROk-GiZV9z4K_J^uTe22PQE~;&0j%&Z& zS9#0Exi9vI`Pog}`V-S-kM`ZDo6S{hleaJa+@~FtZIyac<*gI12>p-f{_v0Sr>9i1 UVBhBBKz}lLy85}Sb4q9e07q5M8~^|S diff --git a/ProjectLocomotive_Hard/ProjectLocomotive_Hard/Resources/ArrowLeft.png b/ProjectLocomotive_Hard/ProjectLocomotive_Hard/Resources/ArrowLeft.png deleted file mode 100644 index 4012bd92829e350358aa51f89926166a954a61e9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 444 zcmeAS@N?(olHy`uVBq!ia0vp^av;pX3?zBp#Z3TGjKx9jPK-BC>eK@{oCO|{#S9GG z!XV7ZFl&wkP%uBhC&U#4|l zSX*1Ov9aykxzokPg^P=ek&!VdDCqFv!&X*S4h{|+931=i?`LOc=j7zvw{KraNC*oH zi<6Vn)~#C)9z1AiX?f_-p>5l?6%`fbbey~mG*q=D$S;^--T$2b|D6K=1HsDw|II-iBz*&@VXLQ$V@SoE+6lLXnhbbc99>j`j&d(z_3r-n-<+#w zo9FCJ>(kS|t9WjjRI-_AbMC(GLrL+66xp;H8IA`p*=857R?~Y;Z)f3F-akdpbEe<2 ze5)K~ef+u~>jImVWntbvE6rAZ-Kx!4H^*$#){VCkbuYgACEh$WT5bx@hAStcXE#U} zm0AQ|nEz9F@BfbzeWo;@U(Q*wgv(%NhUwvpEe{QLEqeU3UTH$PFt5Jzopr027wAZvX%Q diff --git a/ProjectLocomotive_Hard/ProjectLocomotive_Hard/Resources/ArrowRight.png b/ProjectLocomotive_Hard/ProjectLocomotive_Hard/Resources/ArrowRight.png deleted file mode 100644 index dac9c8169e23012aede68e85729401b1893ada43..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 464 zcmeAS@N?(olHy`uVBq!ia0vp^av;pX3?zBp#Z3TGjKx9jPK-BC>eK@{oCO|{#S9GG z!XV7ZFl&wkP%uBhC&aa=sOZq4LqOiag9n9#gq)n5wr$%6xEfOiBk@8vbtRP zyFM_(`}w5%)w8}!Iq_{UZgKlq*sgd?Kzd*N*oTm45k&zJ>a=Hr$&(5xiv{k zJt;LR|DDU4JyWJ9|7|kV?%&68Y>!Qql7)Fj-yhcW&^XtC-prR4-2!W-UspEEvz;?X z`r!0i+g`uDck(I!^Ou{$udeK@{oCO|{#S9GG z!XV7ZFl&wkP%uBhC&U#<@7uR;@7}#3At82lc3Zb@Wnp1qW@g^8V~3NI6HwOG)%D=P zgPfe4TwGjh)~vC#v}9ytw6?Z(adA0x=+NrbtF5f8+}zwaI5_t2-|yhyaQN`ypr9aj zcJ`e+cW&FZjg5^>NJyxtsOZ3f1C^DP(ws-)fQG7;1o;Is_y+#}U;Y1o&j0`a?f(B? z38em8tOF7r|Be3tPb&kmoc_10>XZj+IO6Hz7*a8(cEW3+CItaEMW>|8L7&5J9ewq8 z{>CRpdXK8=iqfVT%O^9|9N#AJTUT4S^u`6L2OhUgm@Vdd&SiE844T&5*d-n&{LyIR ztd8pscC5Ln_1S85XU=gi8+I2N{SAGOmL9U|x-PIGqVC)_ooVNtxm}&pj(=3Trg3k* z?~&Ix7CpUqYuDRFKaTBxqM3YscE5gej%rMf{hh)+C*N(E6Ds{pEHin+IzXw^5f5c49ge<8dy>~bAkS0@O1TaS?83{1OQgU!n*(f diff --git a/ProjectLocomotive_Hard/ProjectLocomotive_Hard/SeaMap.cs b/ProjectLocomotive_Hard/ProjectLocomotive_Hard/RoadsMap.cs similarity index 97% rename from ProjectLocomotive_Hard/ProjectLocomotive_Hard/SeaMap.cs rename to ProjectLocomotive_Hard/ProjectLocomotive_Hard/RoadsMap.cs index 8eed8b9..6091d24 100644 --- a/ProjectLocomotive_Hard/ProjectLocomotive_Hard/SeaMap.cs +++ b/ProjectLocomotive_Hard/ProjectLocomotive_Hard/RoadsMap.cs @@ -6,12 +6,10 @@ using System.Threading.Tasks; namespace ProjectLocomotive_Hard { - internal class SeaMap : AbstractMap + internal class RoadsMap : AbstractMap { private readonly Brush barrierColor = new SolidBrush(Color.White); - private readonly Brush roadColor = new SolidBrush(Color.Blue); - protected override void DrawBarrierPart(Graphics g, int i, int j) { g.FillRectangle(barrierColor, i * _size_x, j * _size_y, i * (_size_x + 1), j * (_size_y + 1)); diff --git a/ProjectLocomotive_Hard/ProjectLocomotive_Hard/SimpleMap.cs b/ProjectLocomotive_Hard/ProjectLocomotive_Hard/SimpleMap.cs index 10fedb4..d221408 100644 --- a/ProjectLocomotive_Hard/ProjectLocomotive_Hard/SimpleMap.cs +++ b/ProjectLocomotive_Hard/ProjectLocomotive_Hard/SimpleMap.cs @@ -7,7 +7,7 @@ using System.Threading.Tasks; namespace ProjectLocomotive_Hard { /// - /// Простая реализация абсрактного класса AbstractMap + /// Карта простая /// internal class SimpleMap : AbstractMap { @@ -19,14 +19,13 @@ namespace ProjectLocomotive_Hard /// Цвет участка открытого /// private readonly Brush roadColor = new SolidBrush(Color.Gray); - protected override void DrawBarrierPart(Graphics g, int i, int j) { - g.FillRectangle(barrierColor, i * _size_x, j * _size_y, i * (_size_x + 1), j * (_size_y + 1)); + g.FillRectangle(barrierColor, i * _size_x, j * _size_y, _size_x, _size_y); } protected override void DrawRoadPart(Graphics g, int i, int j) { - g.FillRectangle(roadColor, i * _size_x, j * _size_y, i * (_size_x + 1), j * (_size_y + 1)); + g.FillRectangle(roadColor, i * _size_x, j * _size_y, _size_x, _size_y); } protected override void GenerateMap() { @@ -34,9 +33,9 @@ namespace ProjectLocomotive_Hard _size_x = (float)_width / _map.GetLength(0); _size_y = (float)_height / _map.GetLength(1); int counter = 0; - for (int i = 0; i < _map.GetLength(0); ++i) + for (int i = 0; i < _map.GetLength(0); i++) { - for (int j = 0; j < _map.GetLength(1); ++j) + for (int j = 0; j < _map.GetLength(1); j++) { _map[i, j] = _freeRoad; } diff --git a/ProjectLocomotive_Hard/ProjectLocomotive_Hard/CountWheel.cs b/ProjectLocomotive_Hard/ProjectLocomotive_Hard/WheelsNumber.cs similarity index 87% rename from ProjectLocomotive_Hard/ProjectLocomotive_Hard/CountWheel.cs rename to ProjectLocomotive_Hard/ProjectLocomotive_Hard/WheelsNumber.cs index 407b254..0155087 100644 --- a/ProjectLocomotive_Hard/ProjectLocomotive_Hard/CountWheel.cs +++ b/ProjectLocomotive_Hard/ProjectLocomotive_Hard/WheelsNumber.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; namespace ProjectLocomotive_Hard { - internal enum CountWheel + internal enum WheelsNumber { Two = 2, Three = 3, -- 2.25.1