Merge pull request 'Mochalov D.V. LabWork3' (#3) from LabWork03 into LabWork02

Reviewed-on: http://student.git.athene.tech/Danila_Mochalov/PIbd-23_Mochalov_D.V._Locomotive_Base/pulls/3

Locomotive/Locomotive/Direction.cs

@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 namespace Locomotive
 {
     //Направление перемещения
-    internal enum Direction
+    public enum Direction
     {
         None = 0,
         Up = 1,

Locomotive/Locomotive/DrawningLocomotive.cs

@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 namespace Locomotive
 {
     //Класс, отвечающий за отрисовку 
-    internal class DrawningLocomotive
+    public class DrawningLocomotive
     {
         /// Класс-сущность
         public EntityLocomotive Locomotive { get; protected set; }
@@ -107,11 +107,11 @@ namespace Locomotive
             }
             Pen pen = new(Color.Black);
             //тело
-            g.FillRectangle(new SolidBrush(Color.MediumBlue), _startPosX , _startPosY, 110 - 10, 50 - 10);
+            g.FillRectangle(new SolidBrush(Locomotive?.BodyColor ?? Color.Brown), _startPosX , _startPosY, 110 - 10, 50 - 10);
             //окна
-            g.FillRectangle(new SolidBrush(Locomotive?.BodyColor ?? Color.Black), _startPosX + 10, _startPosY + 10, 10, 10);
+            g.FillRectangle(new SolidBrush(Color.Blue), _startPosX + 10, _startPosY + 10, 10, 10);
-            g.FillRectangle(new SolidBrush(Locomotive?.BodyColor ?? Color.Black), _startPosX + 30, _startPosY + 10, 10, 10);
+            g.FillRectangle(new SolidBrush(Color.Blue), _startPosX + 30, _startPosY + 10, 10, 10);
-            g.FillRectangle(new SolidBrush(Locomotive?.BodyColor ?? Color.Black), _startPosX + 80, _startPosY + 10, 10, 10);
+            g.FillRectangle(new SolidBrush(Color.Blue), _startPosX + 80, _startPosY + 10, 10, 10);
             //дверь
             g.DrawRectangle(pen, _startPosX + 50, _startPosY + 10, 10, 20);
             //колеса

Locomotive/Locomotive/EntityLocomotive.cs

@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 
 namespace Locomotive
 {
-    internal class EntityLocomotive
+    public class EntityLocomotive
     {
         /// Скорость
         public int Speed { get; private set; }

Locomotive/Locomotive/FormLocomotive.Designer.cs

@@ -39,6 +39,7 @@
             this.buttonDown = new System.Windows.Forms.Button();
             this.buttonRight = new System.Windows.Forms.Button();
             this.buttonCreateModified = new System.Windows.Forms.Button();
+            this.buttonSelectLocomotive = new System.Windows.Forms.Button();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBoxLocomotive)).BeginInit();
             this.statusStrip1.SuspendLayout();
             this.SuspendLayout();
@@ -154,11 +155,22 @@
             this.buttonCreateModified.UseVisualStyleBackColor = true;
             this.buttonCreateModified.Click += new System.EventHandler(this.buttonCreateModified_Click);
             // 
+            // buttonSelectLocomotive
+            // 
+            this.buttonSelectLocomotive.Location = new System.Drawing.Point(507, 377);
+            this.buttonSelectLocomotive.Name = "buttonSelectLocomotive";
+            this.buttonSelectLocomotive.Size = new System.Drawing.Size(105, 29);
+            this.buttonSelectLocomotive.TabIndex = 8;
+            this.buttonSelectLocomotive.Text = "Select";
+            this.buttonSelectLocomotive.UseVisualStyleBackColor = true;
+            this.buttonSelectLocomotive.Click += new System.EventHandler(this.buttonSelectLocomotive_Click);
+            // 
             // FormLocomotive
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(778, 442);
+            this.Controls.Add(this.buttonSelectLocomotive);
             this.Controls.Add(this.buttonCreateModified);
             this.Controls.Add(this.buttonRight);
             this.Controls.Add(this.buttonDown);
@@ -190,5 +202,6 @@
         private Button buttonDown;
         private Button buttonRight;
         private Button buttonCreateModified;
+        private Button buttonSelectLocomotive;
     }
 }

Locomotive/Locomotive/FormLocomotive.cs

@@ -4,6 +4,8 @@ namespace Locomotive
     {
         private DrawningLocomotive _locomotive;
 
+        public DrawningLocomotive SelectedLocomotive { get; private set; }
+
         public FormLocomotive()
         {
             InitializeComponent();
@@ -28,7 +30,13 @@ namespace Locomotive
         private void buttonCreate_Click(object sender, EventArgs e)
         {
             Random rnd = new();
-            _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)));
+            Color color = Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256),rnd.Next(0, 256));
+            ColorDialog dialog = new();
+            if (dialog.ShowDialog() == DialogResult.OK)
+            {
+                color = dialog.Color;
+            }
+            _locomotive = new DrawningLocomotive(rnd.Next(100, 300), rnd.Next(1000, 2000), color);
             _locomotive.SetPosition(rnd.Next(10, 100), rnd.Next(10, 100), pictureBoxLocomotive.Width, pictureBoxLocomotive.Height);
             SetData();
             Draw();
@@ -65,9 +73,23 @@ namespace Locomotive
         private void buttonCreateModified_Click(object sender, EventArgs e)
         {
             Random rnd = new();
+
+            Color color = Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256));
+            ColorDialog dialog = new();
+            if (dialog.ShowDialog() == DialogResult.OK)
+            {
+                color = dialog.Color;
+            }
+            Color dopColor = Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256));
+            ColorDialog dialogDop = new();
+            if (dialogDop.ShowDialog() == DialogResult.OK)
+            {
+                dopColor = dialogDop.Color;
+            }
+
             _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)), 
+                color, 
-                Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)),
+                dopColor,
                 Convert.ToBoolean(rnd.Next(0, 2)),
                 Convert.ToBoolean(rnd.Next(0, 2)));
 
@@ -75,5 +97,11 @@ namespace Locomotive
             SetData();
             Draw();
         }
+
+        private void buttonSelectLocomotive_Click(object sender, EventArgs e)
+        {
+            SelectedLocomotive = _locomotive;
+            DialogResult = DialogResult.OK;
+        }
     }
 }

Locomotive/Locomotive/FormMap.Designer.cs

@@ -1,210 +0,0 @@
-namespace Locomotive
-{
-    partial class FormMap
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.pictureBoxLocomotive = new System.Windows.Forms.PictureBox();
-            this.statusStrip1 = new System.Windows.Forms.StatusStrip();
-            this.toolStripStatusLabelSpeed = new System.Windows.Forms.ToolStripStatusLabel();
-            this.toolStripStatusLabelWeight = new System.Windows.Forms.ToolStripStatusLabel();
-            this.toolStripStatusLabelColor = 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.buttonDown = new System.Windows.Forms.Button();
-            this.buttonRight = new System.Windows.Forms.Button();
-            this.buttonCreateModified = new System.Windows.Forms.Button();
-            this.comboBoxSelectorMap = new System.Windows.Forms.ComboBox();
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxLocomotive)).BeginInit();
-            this.statusStrip1.SuspendLayout();
-            this.SuspendLayout();
-            // 
-            // pictureBoxLocomotive
-            // 
-            this.pictureBoxLocomotive.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.pictureBoxLocomotive.Location = new System.Drawing.Point(0, 0);
-            this.pictureBoxLocomotive.Name = "pictureBoxLocomotive";
-            this.pictureBoxLocomotive.Size = new System.Drawing.Size(778, 416);
-            this.pictureBoxLocomotive.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
-            this.pictureBoxLocomotive.TabIndex = 0;
-            this.pictureBoxLocomotive.TabStop = false;
-            // 
-            // statusStrip1
-            // 
-            this.statusStrip1.ImageScalingSize = new System.Drawing.Size(20, 20);
-            this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.toolStripStatusLabelSpeed,
-            this.toolStripStatusLabelWeight,
-            this.toolStripStatusLabelColor});
-            this.statusStrip1.Location = new System.Drawing.Point(0, 416);
-            this.statusStrip1.Name = "statusStrip1";
-            this.statusStrip1.Size = new System.Drawing.Size(778, 26);
-            this.statusStrip1.TabIndex = 1;
-            this.statusStrip1.Text = "statusStrip1";
-            // 
-            // toolStripStatusLabelSpeed
-            // 
-            this.toolStripStatusLabelSpeed.Name = "toolStripStatusLabelSpeed";
-            this.toolStripStatusLabelSpeed.Size = new System.Drawing.Size(51, 20);
-            this.toolStripStatusLabelSpeed.Text = "Speed";
-            // 
-            // toolStripStatusLabelWeight
-            // 
-            this.toolStripStatusLabelWeight.Name = "toolStripStatusLabelWeight";
-            this.toolStripStatusLabelWeight.Size = new System.Drawing.Size(56, 20);
-            this.toolStripStatusLabelWeight.Text = "Weight";
-            // 
-            // toolStripStatusLabelColor
-            // 
-            this.toolStripStatusLabelColor.Name = "toolStripStatusLabelColor";
-            this.toolStripStatusLabelColor.Size = new System.Drawing.Size(45, 20);
-            this.toolStripStatusLabelColor.Text = "Color";
-            // 
-            // 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(12, 377);
-            this.buttonCreate.Name = "buttonCreate";
-            this.buttonCreate.Size = new System.Drawing.Size(94, 29);
-            this.buttonCreate.TabIndex = 2;
-            this.buttonCreate.Text = "Create ";
-            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::Locomotive.Properties.Resources.up_arrow;
-            this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonUp.Location = new System.Drawing.Point(680, 320);
-            this.buttonUp.Name = "buttonUp";
-            this.buttonUp.Size = new System.Drawing.Size(40, 40);
-            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::Locomotive.Properties.Resources.left_arrow;
-            this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonLeft.Location = new System.Drawing.Point(634, 366);
-            this.buttonLeft.Name = "buttonLeft";
-            this.buttonLeft.Size = new System.Drawing.Size(40, 40);
-            this.buttonLeft.TabIndex = 4;
-            this.buttonLeft.UseVisualStyleBackColor = true;
-            this.buttonLeft.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::Locomotive.Properties.Resources.down_arrow;
-            this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonDown.Location = new System.Drawing.Point(680, 366);
-            this.buttonDown.Name = "buttonDown";
-            this.buttonDown.Size = new System.Drawing.Size(40, 40);
-            this.buttonDown.TabIndex = 5;
-            this.buttonDown.UseVisualStyleBackColor = true;
-            this.buttonDown.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::Locomotive.Properties.Resources.right_arrow;
-            this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonRight.Location = new System.Drawing.Point(726, 366);
-            this.buttonRight.Name = "buttonRight";
-            this.buttonRight.Size = new System.Drawing.Size(40, 40);
-            this.buttonRight.TabIndex = 6;
-            this.buttonRight.UseVisualStyleBackColor = true;
-            this.buttonRight.Click += new System.EventHandler(this.ButtonMove_Click);
-            // 
-            // buttonCreateModified
-            // 
-            this.buttonCreateModified.Location = new System.Drawing.Point(112, 377);
-            this.buttonCreateModified.Name = "buttonCreateModified";
-            this.buttonCreateModified.Size = new System.Drawing.Size(94, 29);
-            this.buttonCreateModified.TabIndex = 7;
-            this.buttonCreateModified.Text = "Modified";
-            this.buttonCreateModified.UseVisualStyleBackColor = true;
-            this.buttonCreateModified.Click += new System.EventHandler(this.buttonCreateModified_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(12, 12);
-            this.comboBoxSelectorMap.Name = "comboBoxSelectorMap";
-            this.comboBoxSelectorMap.Size = new System.Drawing.Size(151, 28);
-            this.comboBoxSelectorMap.TabIndex = 8;
-            this.comboBoxSelectorMap.SelectedIndexChanged += new System.EventHandler(this.comboBoxSelectorMap_SelectedIndexChanged);
-            // 
-            // FormMap
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(778, 442);
-            this.Controls.Add(this.comboBoxSelectorMap);
-            this.Controls.Add(this.buttonCreateModified);
-            this.Controls.Add(this.buttonRight);
-            this.Controls.Add(this.buttonDown);
-            this.Controls.Add(this.buttonLeft);
-            this.Controls.Add(this.buttonUp);
-            this.Controls.Add(this.buttonCreate);
-            this.Controls.Add(this.pictureBoxLocomotive);
-            this.Controls.Add(this.statusStrip1);
-            this.Name = "FormMap";
-            this.Text = "Map";
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxLocomotive)).EndInit();
-            this.statusStrip1.ResumeLayout(false);
-            this.statusStrip1.PerformLayout();
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-
-        private PictureBox pictureBoxLocomotive;
-        private StatusStrip statusStrip1;
-        private ToolStripStatusLabel toolStripStatusLabelSpeed;
-        private ToolStripStatusLabel toolStripStatusLabelWeight;
-        private ToolStripStatusLabel toolStripStatusLabelColor;
-        private Button buttonCreate;
-        private Button buttonUp;
-        private Button buttonLeft;
-        private Button buttonDown;
-        private Button buttonRight;
-        private Button buttonCreateModified;
-        private ComboBox comboBoxSelectorMap;
-    }
-}

Locomotive/Locomotive/FormMap.cs

@@ -1,99 +0,0 @@
-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 Locomotive
-{
-    public partial class FormMap : Form
-    {
-        private AbstractMap _abstractMap;
-        public FormMap()
-        {
-            InitializeComponent();
-            _abstractMap = new SimpleMap();
-        }
-
-        /// Заполнение информации по объекту
-        private void SetData(DrawningLocomotive locomotive)
-        {
-            toolStripStatusLabelSpeed.Text = $"Скорость: {locomotive.Locomotive.Speed}";
-            toolStripStatusLabelWeight.Text = $"Вес: {locomotive.Locomotive.Weight}";
-            toolStripStatusLabelColor.Text = $"Цвет: { locomotive.Locomotive.BodyColor.Name}";
-            pictureBoxLocomotive.Image = _abstractMap.CreateMap(pictureBoxLocomotive.Width, pictureBoxLocomotive.Height, 
-                new DrawningObjectLocomotive(locomotive));
-        }
-
-        /// Обработка нажатия кнопки "Создать"
-        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;
-            }
-            pictureBoxLocomotive.Image = _abstractMap?.MoveObject(dir);
-        }
-
-        /// Обработка нажатия кнопки "Модификация"
-        private void buttonCreateModified_Click(object sender, EventArgs e)
-        {
-            Random rnd = new();
-            var car = new DrawningWarmlyLocomotive(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 SpikeMap();
-                    break;
-                case "Карта с рельсами":
-                    _abstractMap = new RailroadMap();
-                    break;
-
-            }
-        }
-    }
-}

Locomotive/Locomotive/FormMapWithSetLocomotives.Designer.cs

@@ -0,0 +1,212 @@
+namespace Locomotive
+{
+    partial class FormMapWithSetLocomotives
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.groupBoxTools = new System.Windows.Forms.GroupBox();
+            this.buttonLeft = new System.Windows.Forms.Button();
+            this.buttonRight = new System.Windows.Forms.Button();
+            this.buttonDown = new System.Windows.Forms.Button();
+            this.buttonUp = new System.Windows.Forms.Button();
+            this.buttonShowOnMap = new System.Windows.Forms.Button();
+            this.buttonShowStorage = new System.Windows.Forms.Button();
+            this.buttonRemoveLocomotive = new System.Windows.Forms.Button();
+            this.maskedTextBoxPosition = new System.Windows.Forms.MaskedTextBox();
+            this.buttonAddLocomotive = new System.Windows.Forms.Button();
+            this.comboBoxSelectorMap = new System.Windows.Forms.ComboBox();
+            this.pictureBox = new System.Windows.Forms.PictureBox();
+            this.groupBoxTools.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // groupBoxTools
+            // 
+            this.groupBoxTools.Controls.Add(this.buttonLeft);
+            this.groupBoxTools.Controls.Add(this.buttonRight);
+            this.groupBoxTools.Controls.Add(this.buttonDown);
+            this.groupBoxTools.Controls.Add(this.buttonUp);
+            this.groupBoxTools.Controls.Add(this.buttonShowOnMap);
+            this.groupBoxTools.Controls.Add(this.buttonShowStorage);
+            this.groupBoxTools.Controls.Add(this.buttonRemoveLocomotive);
+            this.groupBoxTools.Controls.Add(this.maskedTextBoxPosition);
+            this.groupBoxTools.Controls.Add(this.buttonAddLocomotive);
+            this.groupBoxTools.Controls.Add(this.comboBoxSelectorMap);
+            this.groupBoxTools.Dock = System.Windows.Forms.DockStyle.Right;
+            this.groupBoxTools.Location = new System.Drawing.Point(580, 0);
+            this.groupBoxTools.Name = "groupBoxTools";
+            this.groupBoxTools.Size = new System.Drawing.Size(220, 504);
+            this.groupBoxTools.TabIndex = 0;
+            this.groupBoxTools.TabStop = false;
+            this.groupBoxTools.Text = "Tools";
+            // 
+            // buttonLeft
+            // 
+            this.buttonLeft.BackgroundImage = global::Locomotive.Properties.Resources.left_arrow;
+            this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.buttonLeft.Location = new System.Drawing.Point(42, 446);
+            this.buttonLeft.Name = "buttonLeft";
+            this.buttonLeft.Size = new System.Drawing.Size(40, 40);
+            this.buttonLeft.TabIndex = 7;
+            this.buttonLeft.UseVisualStyleBackColor = true;
+            this.buttonLeft.Click += new System.EventHandler(this.buttonMove_Click);
+            // 
+            // buttonRight
+            // 
+            this.buttonRight.BackgroundImage = global::Locomotive.Properties.Resources.right_arrow;
+            this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.buttonRight.Location = new System.Drawing.Point(134, 446);
+            this.buttonRight.Name = "buttonRight";
+            this.buttonRight.Size = new System.Drawing.Size(40, 40);
+            this.buttonRight.TabIndex = 7;
+            this.buttonRight.UseVisualStyleBackColor = true;
+            this.buttonRight.Click += new System.EventHandler(this.buttonMove_Click);
+            // 
+            // buttonDown
+            // 
+            this.buttonDown.BackgroundImage = global::Locomotive.Properties.Resources.down_arrow;
+            this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.buttonDown.Location = new System.Drawing.Point(88, 446);
+            this.buttonDown.Name = "buttonDown";
+            this.buttonDown.Size = new System.Drawing.Size(40, 40);
+            this.buttonDown.TabIndex = 7;
+            this.buttonDown.UseVisualStyleBackColor = true;
+            this.buttonDown.Click += new System.EventHandler(this.buttonMove_Click);
+            // 
+            // buttonUp
+            // 
+            this.buttonUp.BackgroundImage = global::Locomotive.Properties.Resources.up_arrow;
+            this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.buttonUp.Location = new System.Drawing.Point(88, 400);
+            this.buttonUp.Name = "buttonUp";
+            this.buttonUp.Size = new System.Drawing.Size(40, 40);
+            this.buttonUp.TabIndex = 6;
+            this.buttonUp.UseVisualStyleBackColor = true;
+            this.buttonUp.Click += new System.EventHandler(this.buttonMove_Click);
+            // 
+            // buttonShowOnMap
+            // 
+            this.buttonShowOnMap.Location = new System.Drawing.Point(7, 282);
+            this.buttonShowOnMap.Name = "buttonShowOnMap";
+            this.buttonShowOnMap.Size = new System.Drawing.Size(207, 29);
+            this.buttonShowOnMap.TabIndex = 5;
+            this.buttonShowOnMap.Text = "Show on Map";
+            this.buttonShowOnMap.UseVisualStyleBackColor = true;
+            this.buttonShowOnMap.Click += new System.EventHandler(this.buttonShowOnMap_Click);
+            // 
+            // buttonShowStorage
+            // 
+            this.buttonShowStorage.Location = new System.Drawing.Point(7, 247);
+            this.buttonShowStorage.Name = "buttonShowStorage";
+            this.buttonShowStorage.Size = new System.Drawing.Size(207, 29);
+            this.buttonShowStorage.TabIndex = 4;
+            this.buttonShowStorage.Text = "Show Storage";
+            this.buttonShowStorage.UseVisualStyleBackColor = true;
+            this.buttonShowStorage.Click += new System.EventHandler(this.buttonShowStorage_Click);
+            // 
+            // buttonRemoveLocomotive
+            // 
+            this.buttonRemoveLocomotive.Location = new System.Drawing.Point(7, 211);
+            this.buttonRemoveLocomotive.Name = "buttonRemoveLocomotive";
+            this.buttonRemoveLocomotive.Size = new System.Drawing.Size(207, 30);
+            this.buttonRemoveLocomotive.TabIndex = 3;
+            this.buttonRemoveLocomotive.Text = "Remove Locomotive";
+            this.buttonRemoveLocomotive.UseVisualStyleBackColor = true;
+            this.buttonRemoveLocomotive.Click += new System.EventHandler(this.buttonRemoveLocomotive_Click);
+            // 
+            // maskedTextBoxPosition
+            // 
+            this.maskedTextBoxPosition.Location = new System.Drawing.Point(6, 159);
+            this.maskedTextBoxPosition.Mask = "00";
+            this.maskedTextBoxPosition.Name = "maskedTextBoxPosition";
+            this.maskedTextBoxPosition.Size = new System.Drawing.Size(208, 27);
+            this.maskedTextBoxPosition.TabIndex = 2;
+            // 
+            // buttonAddLocomotive
+            // 
+            this.buttonAddLocomotive.Location = new System.Drawing.Point(6, 96);
+            this.buttonAddLocomotive.Name = "buttonAddLocomotive";
+            this.buttonAddLocomotive.Size = new System.Drawing.Size(208, 29);
+            this.buttonAddLocomotive.TabIndex = 1;
+            this.buttonAddLocomotive.Text = "Add Locomotive";
+            this.buttonAddLocomotive.UseVisualStyleBackColor = true;
+            this.buttonAddLocomotive.Click += new System.EventHandler(this.buttonAddLocomotive_Click);
+            // 
+            // comboBoxSelectorMap
+            // 
+            this.comboBoxSelectorMap.FormattingEnabled = true;
+            this.comboBoxSelectorMap.Items.AddRange(new object[] {
+            "Simple Map",
+            "Spike Map",
+            "Rail Map"});
+            this.comboBoxSelectorMap.Location = new System.Drawing.Point(6, 39);
+            this.comboBoxSelectorMap.Name = "comboBoxSelectorMap";
+            this.comboBoxSelectorMap.Size = new System.Drawing.Size(208, 28);
+            this.comboBoxSelectorMap.TabIndex = 0;
+            this.comboBoxSelectorMap.SelectedIndexChanged += new System.EventHandler(this.comboBoxSelectorMap_SelectedIndexChanged);
+            // 
+            // pictureBox
+            // 
+            this.pictureBox.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.pictureBox.Location = new System.Drawing.Point(0, 0);
+            this.pictureBox.Name = "pictureBox";
+            this.pictureBox.Size = new System.Drawing.Size(580, 504);
+            this.pictureBox.TabIndex = 1;
+            this.pictureBox.TabStop = false;
+            // 
+            // FormMapWithSetLocomotives
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(800, 504);
+            this.Controls.Add(this.pictureBox);
+            this.Controls.Add(this.groupBoxTools);
+            this.Name = "FormMapWithSetLocomotives";
+            this.Text = "FormMapWithSetLocomotives";
+            this.groupBoxTools.ResumeLayout(false);
+            this.groupBoxTools.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).EndInit();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private GroupBox groupBoxTools;
+        private PictureBox pictureBox;
+        private ComboBox comboBoxSelectorMap;
+        private Button buttonAddLocomotive;
+        private MaskedTextBox maskedTextBoxPosition;
+        private Button buttonRemoveLocomotive;
+        private Button buttonShowStorage;
+        private Button buttonShowOnMap;
+        private Button buttonUp;
+        private Button buttonDown;
+        private Button buttonRight;
+        private Button buttonLeft;
+    }
+}

Locomotive/Locomotive/FormMapWithSetLocomotives.cs

@@ -0,0 +1,137 @@
+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 Locomotive
+{
+    public partial class FormMapWithSetLocomotives : Form
+    {
+        /// Объект от класса карты с набором объектов
+        private MapWithSetLocomotivesGeneric<DrawningObjectLocomotive, AbstractMap> _mapLocomotivesCollectionGeneric;
+        public FormMapWithSetLocomotives()
+        {
+            InitializeComponent();
+        }
+        /// Выбор карты
+        private void comboBoxSelectorMap_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            AbstractMap map = null;
+            switch (comboBoxSelectorMap.Text)
+            {
+                case "Simple Map":
+                    map = new SimpleMap();
+                    break;
+                case "Spike Map":
+                    map = new SpikeMap();
+                    break;
+                case "Rail Map":
+                    map = new RailroadMap();
+                    break;
+            }
+            if (map != null)
+            {
+                _mapLocomotivesCollectionGeneric = new MapWithSetLocomotivesGeneric<DrawningObjectLocomotive, AbstractMap>
+                    (pictureBox.Width, pictureBox.Height, map);
+            }
+            else
+            {
+                _mapLocomotivesCollectionGeneric = null;
+            }
+        }
+        /// Добавление объекта
+        private void buttonAddLocomotive_Click(object sender, EventArgs e)
+        {
+            if (_mapLocomotivesCollectionGeneric == null)
+            {
+                return;
+            }
+            FormLocomotive form = new();
+            if (form.ShowDialog() == DialogResult.OK)
+            {
+                DrawningObjectLocomotive locomotive = new(form.SelectedLocomotive);
+                if (_mapLocomotivesCollectionGeneric + locomotive != -1)
+                {
+                    MessageBox.Show("Объект добавлен");
+                    pictureBox.Image = _mapLocomotivesCollectionGeneric.ShowSet();
+                }
+                else
+                {
+                    MessageBox.Show("Не удалось добавить объект");
+                }
+            }
+        }
+        /// Удаление объекта
+        private void buttonRemoveLocomotive_Click(object sender, EventArgs e)
+        {
+            if (string.IsNullOrEmpty(maskedTextBoxPosition.Text))
+            {
+                return;
+            }
+            if (MessageBox.Show("Удалить объект?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
+            {
+                return;
+            }
+            int pos = Convert.ToInt32(maskedTextBoxPosition.Text);
+            if (_mapLocomotivesCollectionGeneric - pos is not null)
+            {
+                MessageBox.Show("Объект удален");
+                pictureBox.Image = _mapLocomotivesCollectionGeneric.ShowSet();
+            }
+            else
+            {
+                MessageBox.Show("Не удалось удалить объект");
+            }
+        }
+        /// Вывод набора
+        private void buttonShowStorage_Click(object sender, EventArgs e)
+        {
+            if (_mapLocomotivesCollectionGeneric == null)
+            {
+                return;
+            }
+            pictureBox.Image = _mapLocomotivesCollectionGeneric.ShowSet();
+        }
+        /// Вывод карты
+        private void buttonShowOnMap_Click(object sender, EventArgs e)
+        {
+            if (_mapLocomotivesCollectionGeneric == null)
+            {
+                return;
+            }
+            pictureBox.Image = _mapLocomotivesCollectionGeneric.ShowOnMap();
+        }
+        /// Перемещение
+        private void buttonMove_Click(object sender, EventArgs e)
+        {
+            if (_mapLocomotivesCollectionGeneric == null)
+            {
+                return;
+            }
+            //получаем имя кнопки
+            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;
+            }
+            pictureBox.Image = _mapLocomotivesCollectionGeneric.MoveObject(dir);
+        }
+    }
+}

Locomotive/Locomotive/FormMapWithSetLocomotives.resx

@@ -57,7 +57,4 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="statusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
 </root>

Locomotive/Locomotive/MapWithSetLocomotivesGeneric.cs

@@ -0,0 +1,166 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Locomotive
+{
+    internal class MapWithSetLocomotivesGeneric <T, U>
+        where T : class, IDrawningObject
+        where U : AbstractMap
+    {
+        /// Ширина окна отрисовки
+        private readonly int _pictureWidth;
+        /// Высота окна отрисовки
+        private readonly int _pictureHeight;
+        /// Размер занимаемого объектом места (ширина)
+        private readonly int _placeSizeWidth = 210;
+        /// Размер занимаемого объектом места (высота)
+        private readonly int _placeSizeHeight = 90;
+        /// Набор объектов
+        private readonly SetLocomotivesGeneric<T> _setLocomotives;
+        /// Карта
+        private readonly U _map;
+        /// Конструктор
+        public MapWithSetLocomotivesGeneric(int picWidth, int picHeight, U map)
+        {
+            int width = picWidth / _placeSizeWidth;
+            int height = picHeight / _placeSizeHeight;
+            _setLocomotives = new SetLocomotivesGeneric<T>(width * height);
+            _pictureWidth = picWidth;
+            _pictureHeight = picHeight;
+            _map = map;
+        }
+        /// Перегрузка оператора сложения
+        public static int operator +(MapWithSetLocomotivesGeneric<T, U> map, T locomotive)
+        {
+            return map._setLocomotives.Insert(locomotive);
+        }
+        /// Перегрузка оператора вычитания
+        public static T operator -(MapWithSetLocomotivesGeneric<T, U> map, int position)
+        {
+            return map._setLocomotives.Remove(position);
+        }
+        /// Вывод всего набора объектов
+        public Bitmap ShowSet()
+        {
+            Bitmap bmp = new(_pictureWidth, _pictureHeight);
+            Graphics gr = Graphics.FromImage(bmp);
+            DrawBackground(gr);
+            DrawLocomotives(gr);
+            return bmp;
+        }
+        /// Просмотр объекта на карте
+        public Bitmap ShowOnMap()
+        {
+            Shaking();
+            for (int i = 0; i < _setLocomotives.Count; i++)
+            {
+                var locomotive = _setLocomotives.Get(i);
+                if (locomotive != null)
+                {
+                    return _map.CreateMap(_pictureWidth, _pictureHeight, locomotive);
+                }
+            }
+            return new(_pictureWidth, _pictureHeight);
+        }
+        /// Перемещение объекта по крате
+        public Bitmap MoveObject(Direction direction)
+        {
+            if (_map != null)
+            {
+                return _map.MoveObject(direction);
+            }
+            return new(_pictureWidth, _pictureHeight);
+        }
+        /// "Взбалтываем" набор, чтобы все элементы оказались в начале
+        private void Shaking()
+        {
+            int j = _setLocomotives.Count - 1;
+            for (int i = 0; i < _setLocomotives.Count; i++)
+            {
+                if (_setLocomotives.Get(i) == null)
+                {
+                    for (; j > i; j--)
+                    {
+                        var locomotive = _setLocomotives.Get(j);
+                        if (locomotive != null)
+                        {
+                            _setLocomotives.Insert(locomotive, i);
+                            _setLocomotives.Remove(j);
+                            break;
+                        }
+                    }
+                    if (j <= i)
+                    {
+                        return;
+                    }
+                }
+            }
+        }
+        /// Метод отрисовки фона
+        private void DrawBackground(Graphics g)
+        {
+            Pen pen;
+
+            for (int j = _placeSizeHeight; j < _pictureHeight; j+= _placeSizeHeight)
+            {
+                //нижняя линия рельс
+                pen = new(Color.Black, 5);
+
+                g.DrawLine(pen, 0, j, _pictureWidth, j);
+                for (int i = 0; i < _pictureWidth; i+=20)
+                {
+                    g.DrawLine(pen, i, j, i, j + 10);
+                }
+                g.DrawLine(pen, 0, j + 10, _pictureWidth, j + 10);
+
+                //верхняя линия рельс
+                
+                pen = new(Color.DarkGray, 4);
+
+                g.DrawLine(pen, 0, j - 20, _pictureWidth, j - 20);
+                for (int i = 0; i < _pictureWidth; i += 20)
+                {
+                    g.DrawLine(pen, i, j - 20, i, j - 10);
+                }
+                g.DrawLine(pen, 0, j - 10, _pictureWidth, j - 10);
+
+                //фонари
+                for (int i = _placeSizeWidth; i < _pictureWidth; i += _placeSizeWidth)
+                {
+                    pen = new(Color.Black, 10);
+                    g.DrawLine(pen, i, j - _placeSizeHeight + 20, i, j);
+                    pen = new(Color.Yellow, 20);
+                    g.DrawLine(pen, i, j - _placeSizeHeight + 18, i, j - _placeSizeHeight + 38);
+                }
+            }
+        }
+
+
+        /// Метод прорисовки объектов
+        private void DrawLocomotives(Graphics g)
+        {
+            int width = _pictureWidth / _placeSizeWidth;
+            int height = _pictureHeight / _placeSizeHeight;
+
+            int curWidth = 0;
+            int curHeight = 0;
+
+            for (int i = 0; i < _setLocomotives.Count; i++)
+            {
+                // установка позиции
+                _setLocomotives.Get(i)?.SetObject(curWidth * _placeSizeWidth + 10, curHeight * _placeSizeHeight + 15, _pictureWidth, _pictureHeight);
+                _setLocomotives.Get(i)?.DrawningObject(g);
+                if (curWidth < width) curWidth++;
+                else
+                {
+                    curWidth = 0;
+                    curHeight++;
+                }
+            }
+        }
+
+    }
+}

Locomotive/Locomotive/Program.cs

@@ -11,7 +11,7 @@ namespace Locomotive
             // To customize application configuration such as set high DPI settings or default font,
             // see https://aka.ms/applicationconfiguration.
             ApplicationConfiguration.Initialize();
-            Application.Run(new FormMap());
+            Application.Run(new FormMapWithSetLocomotives());
         }
     }
 }

Locomotive/Locomotive/SetLocomotivesGeneric.cs

@@ -0,0 +1,78 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Locomotive
+{
+    internal class SetLocomotivesGeneric <T> 
+        where T : class
+    {
+        private readonly T[] _places;
+
+        /// Количество объектов в массиве
+        public int Count => _places.Length;
+        /// Конструктор
+        public SetLocomotivesGeneric(int count)
+        {
+            _places = new T[count];
+        }
+        /// Добавление объекта в набор
+        public int Insert(T locomotive)
+        {
+            return Insert(locomotive, 0);
+        }
+        /// Добавление объекта в набор на конкретную позицию
+        public int Insert(T locomotive, int position)
+        {
+            if (position >= _places.Length|| position < 0) return -1;
+
+            if (_places[position] == null)
+            {
+                _places[position] = locomotive;
+                return position;
+            }
+
+            int emptyEl = -1;
+
+            for (int i = position + 1; i < Count; i++)
+            {
+                if (_places[i] == null)
+                {
+                    emptyEl = i;
+                    break;
+                }
+            }
+
+            if (emptyEl == -1)
+            {
+                return -1;
+            }
+
+            for (int i = emptyEl; i > position; i--)
+            {
+                _places[i] = _places[i - 1];
+            }
+            _places[position] = locomotive;
+            return position;
+        }
+        /// Удаление объекта из набора с конкретной позиции
+        public T Remove(int position)
+        {
+            if (position >= _places.Length || position < 0) return null;
+            T result = _places[position];
+            _places[position] = null;
+            return result;
+        }
+        /// Получение объекта из набора по позиции
+        public T Get(int position)
+        {
+            if (position >= _places.Length || position < 0)
+            {
+                return null;
+            }
+            return _places[position];
+        }
+    }
+}