Merge pull request 'DozorovaA.A_SecondLabWork' (#2) from SecondLabWork into FirstLabWork

Reviewed-on: http://student.git.athene.tech/DozorovaA.A/PIbd-22_DozorovaAA_ArmoredVehicle_Simple/pulls/2

ArmoredVehicle/ArmoredVehicleEntity.cs

@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 
 namespace ArmoredVehicle
 {
-    public class ArmoredVehicleEntity
+    internal class ArmoredVehicleEntity
     {
         public ArmoredVehicleEntity(int speed, float weight, Color bodyColor)
         {

ArmoredVehicle/Direction.cs

@@ -9,7 +9,7 @@ namespace ArmoredVehicle
     /// <summary>
     /// Направление перемещения
     /// </summary>
-    public enum Direction
+    internal enum Direction
     {
         None = 0,
         Up = 1,

ArmoredVehicle/DrawingArmoredVehicle.cs

@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 
 namespace ArmoredVehicle
 {
-    public class DrawingArmoredVehicle
+    internal class DrawingArmoredVehicle
     {
         /// <summary>
         /// Класс-сущность

ArmoredVehicle/FormMap.Designer.cs

@@ -0,0 +1,212 @@
+namespace ArmoredVehicle
+{
+    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.ButtonDown = new System.Windows.Forms.Button();
+            this.ButtonRight = new System.Windows.Forms.Button();
+            this.ButtonLeft = new System.Windows.Forms.Button();
+            this.ButtonUp = new System.Windows.Forms.Button();
+            this.CreateButton = new System.Windows.Forms.Button();
+            this.DrawingPictureBox = new System.Windows.Forms.PictureBox();
+            this.toolStripStatusLabelSpeed = new System.Windows.Forms.ToolStripStatusLabel();
+            this.toolStripStatusLabelWeight = new System.Windows.Forms.ToolStripStatusLabel();
+            this.toolStripStatusLabelColor = new System.Windows.Forms.ToolStripStatusLabel();
+            this.statusStrip = new System.Windows.Forms.StatusStrip();
+            this.TankButton = new System.Windows.Forms.Button();
+            this.comboBoxSelectorMap = new System.Windows.Forms.ComboBox();
+            ((System.ComponentModel.ISupportInitialize)(this.DrawingPictureBox)).BeginInit();
+            this.statusStrip.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // ButtonDown
+            // 
+            this.ButtonDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.ButtonDown.BackgroundImage = global::ArmoredVehicle.Properties.Resources.arrowDown;
+            this.ButtonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.ButtonDown.Location = new System.Drawing.Point(711, 373);
+            this.ButtonDown.Name = "ButtonDown";
+            this.ButtonDown.Size = new System.Drawing.Size(30, 30);
+            this.ButtonDown.TabIndex = 13;
+            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::ArmoredVehicle.Properties.Resources.arrowRight;
+            this.ButtonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.ButtonRight.Location = new System.Drawing.Point(754, 326);
+            this.ButtonRight.Name = "ButtonRight";
+            this.ButtonRight.Size = new System.Drawing.Size(30, 30);
+            this.ButtonRight.TabIndex = 12;
+            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::ArmoredVehicle.Properties.Resources.arrowLeft;
+            this.ButtonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.ButtonLeft.Location = new System.Drawing.Point(671, 328);
+            this.ButtonLeft.Name = "ButtonLeft";
+            this.ButtonLeft.Size = new System.Drawing.Size(30, 30);
+            this.ButtonLeft.TabIndex = 11;
+            this.ButtonLeft.UseVisualStyleBackColor = true;
+            this.ButtonLeft.Click += new System.EventHandler(this.ButtonMove_Click);
+            // 
+            // ButtonUp
+            // 
+            this.ButtonUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.ButtonUp.BackgroundImage = global::ArmoredVehicle.Properties.Resources.arrowUp;
+            this.ButtonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.ButtonUp.Location = new System.Drawing.Point(711, 278);
+            this.ButtonUp.Name = "ButtonUp";
+            this.ButtonUp.Size = new System.Drawing.Size(30, 30);
+            this.ButtonUp.TabIndex = 10;
+            this.ButtonUp.UseVisualStyleBackColor = true;
+            this.ButtonUp.Click += new System.EventHandler(this.ButtonMove_Click);
+            // 
+            // CreateButton
+            // 
+            this.CreateButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.CreateButton.Location = new System.Drawing.Point(12, 362);
+            this.CreateButton.Name = "CreateButton";
+            this.CreateButton.Size = new System.Drawing.Size(112, 34);
+            this.CreateButton.TabIndex = 9;
+            this.CreateButton.Text = "Создать";
+            this.CreateButton.UseVisualStyleBackColor = true;
+            this.CreateButton.Click += new System.EventHandler(this.ButtonCreate_Click);
+            // 
+            // DrawingPictureBox
+            // 
+            this.DrawingPictureBox.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.DrawingPictureBox.Location = new System.Drawing.Point(0, 0);
+            this.DrawingPictureBox.Name = "DrawingPictureBox";
+            this.DrawingPictureBox.Size = new System.Drawing.Size(800, 418);
+            this.DrawingPictureBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
+            this.DrawingPictureBox.TabIndex = 7;
+            this.DrawingPictureBox.TabStop = false;
+            // 
+            // toolStripStatusLabelSpeed
+            // 
+            this.toolStripStatusLabelSpeed.Name = "toolStripStatusLabelSpeed";
+            this.toolStripStatusLabelSpeed.Size = new System.Drawing.Size(89, 25);
+            this.toolStripStatusLabelSpeed.Text = "Скорость";
+            // 
+            // toolStripStatusLabelWeight
+            // 
+            this.toolStripStatusLabelWeight.Name = "toolStripStatusLabelWeight";
+            this.toolStripStatusLabelWeight.Size = new System.Drawing.Size(39, 25);
+            this.toolStripStatusLabelWeight.Text = "Вес";
+            // 
+            // toolStripStatusLabelColor
+            // 
+            this.toolStripStatusLabelColor.Name = "toolStripStatusLabelColor";
+            this.toolStripStatusLabelColor.Size = new System.Drawing.Size(51, 25);
+            this.toolStripStatusLabelColor.Text = "Цвет";
+            // 
+            // statusStrip
+            // 
+            this.statusStrip.ImageScalingSize = new System.Drawing.Size(24, 24);
+            this.statusStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.toolStripStatusLabelSpeed,
+            this.toolStripStatusLabelWeight,
+            this.toolStripStatusLabelColor});
+            this.statusStrip.Location = new System.Drawing.Point(0, 418);
+            this.statusStrip.Name = "statusStrip";
+            this.statusStrip.Size = new System.Drawing.Size(800, 32);
+            this.statusStrip.TabIndex = 8;
+            this.statusStrip.Text = "statusStrip1";
+            // 
+            // TankButton
+            // 
+            this.TankButton.Location = new System.Drawing.Point(139, 365);
+            this.TankButton.Name = "TankButton";
+            this.TankButton.Size = new System.Drawing.Size(143, 34);
+            this.TankButton.TabIndex = 14;
+            this.TankButton.Text = "Модификация";
+            this.TankButton.UseVisualStyleBackColor = true;
+            this.TankButton.Click += new System.EventHandler(this.TankButton_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(13, 321);
+            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 = 15;
+            this.comboBoxSelectorMap.SelectedIndexChanged += new System.EventHandler(this.comboBoxSelectorMap_SelectedIndexChanged_1);
+            // 
+            // FormMap
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 25F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(800, 450);
+            this.Controls.Add(this.comboBoxSelectorMap);
+            this.Controls.Add(this.TankButton);
+            this.Controls.Add(this.ButtonDown);
+            this.Controls.Add(this.ButtonRight);
+            this.Controls.Add(this.ButtonLeft);
+            this.Controls.Add(this.ButtonUp);
+            this.Controls.Add(this.CreateButton);
+            this.Controls.Add(this.DrawingPictureBox);
+            this.Controls.Add(this.statusStrip);
+            this.MinimumSize = new System.Drawing.Size(210, 50);
+            this.Name = "FormMap";
+            this.Text = "Карта";
+            ((System.ComponentModel.ISupportInitialize)(this.DrawingPictureBox)).EndInit();
+            this.statusStrip.ResumeLayout(false);
+            this.statusStrip.PerformLayout();
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private Button ButtonDown;
+        private Button ButtonRight;
+        private Button ButtonLeft;
+        private Button ButtonUp;
+        private Button CreateButton;
+        private PictureBox DrawingPictureBox;
+        private ToolStripStatusLabel toolStripStatusLabelSpeed;
+        private ToolStripStatusLabel toolStripStatusLabelWeight;
+        private ToolStripStatusLabel toolStripStatusLabelColor;
+        private StatusStrip statusStrip;
+        private Button TankButton;
+        private ComboBox comboBoxSelectorMap;
+    }
+}

ArmoredVehicle/FormMap.cs

@@ -0,0 +1,96 @@
+namespace ArmoredVehicle
+{
+    public partial class FormMap : Form
+    {
+        private AbstractMap _abstractMap;
+
+        public FormMap()
+        {
+            InitializeComponent();
+            _abstractMap = new SimpleMap();
+        }
+        /// <summary>
+        /// Заполнение информации по объекту
+        /// </summary>
+        /// <param name="car"></param>
+        private void SetData(DrawingArmoredVehicle armoredVehicle)
+        {
+            toolStripStatusLabelSpeed.Text = $"Скорость: {armoredVehicle.ArmoredVehicle.Speed}";
+            toolStripStatusLabelWeight.Text = $"Вес: {armoredVehicle.ArmoredVehicle.Weight}";
+            toolStripStatusLabelColor.Text = $"Цвет: {armoredVehicle.ArmoredVehicle.BodyColor.Name}";
+            DrawingPictureBox.Image = _abstractMap.CreateMap(DrawingPictureBox.Width, DrawingPictureBox.Height, 
+                new DrawningObject(armoredVehicle));
+        }
+        /// <summary>
+        /// Обработка нажатия кнопки "Создать"
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonCreate_Click(object sender, EventArgs e)
+        {
+            Random rnd = new();
+            var machine = new DrawingArmoredVehicle(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)));
+            SetData(machine);
+        }
+        /// <summary>
+        /// Изменение размеров формы
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        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;
+            }
+           
+            DrawingPictureBox.Image = _abstractMap?.MoveObject(dir);
+        }
+        /// <summary>
+        /// Смена карты
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+      
+        private void comboBoxSelectorMap_SelectedIndexChanged_1(object sender, EventArgs e)
+        {
+            switch (comboBoxSelectorMap.Text)
+            {
+                case "Простая карта":
+                    _abstractMap = new SimpleMap();
+                    break;
+                case "Горизонтальная карта":
+                    _abstractMap = new HorizontalMap();
+                    break;
+                case "Вертикальная карта":
+                    _abstractMap = new VerticalMap();
+                    break;
+            }
+        }
+
+        private void TankButton_Click(object sender, EventArgs e)
+        {
+
+            Random rnd = new();
+            var tank = new DrawingTank(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)), Convert.ToBoolean(rnd.Next(0, 2)));
+            SetData(tank);
+        }
+    }
+}

ArmoredVehicle/FormMap.resx

@@ -0,0 +1,63 @@
+<root>
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="statusStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+</root>

ArmoredVehicle/FormMapWithSetMachine.Designer.cs

@@ -1,217 +0,0 @@
-namespace ArmoredVehicle
-{
-    partial class FormMapWithSetMachine
-    {
-        /// <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()
-        {
-            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormMapWithSetMachine));
-            this.groupBoxInstruments = new System.Windows.Forms.GroupBox();
-            this.maskedTextBoxPosition = new System.Windows.Forms.MaskedTextBox();
-            this.ButtonDown = new System.Windows.Forms.Button();
-            this.ButtonRight = new System.Windows.Forms.Button();
-            this.ButtonLeft = new System.Windows.Forms.Button();
-            this.ButtonUp = new System.Windows.Forms.Button();
-            this.buttonMap = new System.Windows.Forms.Button();
-            this.buttonStore = new System.Windows.Forms.Button();
-            this.buttonDelete = new System.Windows.Forms.Button();
-            this.buttonAdd = new System.Windows.Forms.Button();
-            this.comboBoxMap = new System.Windows.Forms.ComboBox();
-            this.pictureBoxImage = new System.Windows.Forms.PictureBox();
-            this.groupBoxInstruments.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxImage)).BeginInit();
-            this.SuspendLayout();
-            // 
-            // groupBoxInstruments
-            // 
-            this.groupBoxInstruments.Controls.Add(this.maskedTextBoxPosition);
-            this.groupBoxInstruments.Controls.Add(this.ButtonDown);
-            this.groupBoxInstruments.Controls.Add(this.ButtonRight);
-            this.groupBoxInstruments.Controls.Add(this.ButtonLeft);
-            this.groupBoxInstruments.Controls.Add(this.ButtonUp);
-            this.groupBoxInstruments.Controls.Add(this.buttonMap);
-            this.groupBoxInstruments.Controls.Add(this.buttonStore);
-            this.groupBoxInstruments.Controls.Add(this.buttonDelete);
-            this.groupBoxInstruments.Controls.Add(this.buttonAdd);
-            this.groupBoxInstruments.Controls.Add(this.comboBoxMap);
-            this.groupBoxInstruments.Dock = System.Windows.Forms.DockStyle.Right;
-            this.groupBoxInstruments.Location = new System.Drawing.Point(728, 0);
-            this.groupBoxInstruments.Name = "groupBoxInstruments";
-            this.groupBoxInstruments.Size = new System.Drawing.Size(300, 644);
-            this.groupBoxInstruments.TabIndex = 0;
-            this.groupBoxInstruments.TabStop = false;
-            this.groupBoxInstruments.Text = "Инструменты";
-            // 
-            // maskedTextBoxPosition
-            // 
-            this.maskedTextBoxPosition.Location = new System.Drawing.Point(18, 179);
-            this.maskedTextBoxPosition.Mask = "00";
-            this.maskedTextBoxPosition.Name = "maskedTextBoxPosition";
-            this.maskedTextBoxPosition.Size = new System.Drawing.Size(270, 31);
-            this.maskedTextBoxPosition.TabIndex = 18;
-            // 
-            // ButtonDown
-            // 
-            this.ButtonDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.ButtonDown.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("ButtonDown.BackgroundImage")));
-            this.ButtonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.ButtonDown.Location = new System.Drawing.Point(139, 555);
-            this.ButtonDown.Name = "ButtonDown";
-            this.ButtonDown.Size = new System.Drawing.Size(40, 36);
-            this.ButtonDown.TabIndex = 17;
-            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 = ((System.Drawing.Image)(resources.GetObject("ButtonRight.BackgroundImage")));
-            this.ButtonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.ButtonRight.Location = new System.Drawing.Point(182, 508);
-            this.ButtonRight.Name = "ButtonRight";
-            this.ButtonRight.Size = new System.Drawing.Size(40, 36);
-            this.ButtonRight.TabIndex = 16;
-            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 = ((System.Drawing.Image)(resources.GetObject("ButtonLeft.BackgroundImage")));
-            this.ButtonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.ButtonLeft.Location = new System.Drawing.Point(99, 510);
-            this.ButtonLeft.Name = "ButtonLeft";
-            this.ButtonLeft.Size = new System.Drawing.Size(40, 36);
-            this.ButtonLeft.TabIndex = 15;
-            this.ButtonLeft.UseVisualStyleBackColor = true;
-            this.ButtonLeft.Click += new System.EventHandler(this.ButtonMove_Click);
-            // 
-            // ButtonUp
-            // 
-            this.ButtonUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.ButtonUp.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("ButtonUp.BackgroundImage")));
-            this.ButtonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.ButtonUp.Location = new System.Drawing.Point(139, 460);
-            this.ButtonUp.Name = "ButtonUp";
-            this.ButtonUp.Size = new System.Drawing.Size(40, 36);
-            this.ButtonUp.TabIndex = 14;
-            this.ButtonUp.UseVisualStyleBackColor = true;
-            this.ButtonUp.Click += new System.EventHandler(this.ButtonMove_Click);
-            // 
-            // buttonMap
-            // 
-            this.buttonMap.Location = new System.Drawing.Point(26, 373);
-            this.buttonMap.Name = "buttonMap";
-            this.buttonMap.Size = new System.Drawing.Size(262, 34);
-            this.buttonMap.TabIndex = 5;
-            this.buttonMap.Text = "Посмотреть карту";
-            this.buttonMap.UseVisualStyleBackColor = true;
-            this.buttonMap.Click += new System.EventHandler(this.buttonMap_Click);
-            // 
-            // buttonStore
-            // 
-            this.buttonStore.Location = new System.Drawing.Point(24, 307);
-            this.buttonStore.Name = "buttonStore";
-            this.buttonStore.Size = new System.Drawing.Size(264, 34);
-            this.buttonStore.TabIndex = 4;
-            this.buttonStore.Text = "Посмотреть хранилище";
-            this.buttonStore.UseVisualStyleBackColor = true;
-            this.buttonStore.Click += new System.EventHandler(this.buttonStore_Click);
-            // 
-            // buttonDelete
-            // 
-            this.buttonDelete.Location = new System.Drawing.Point(20, 234);
-            this.buttonDelete.Name = "buttonDelete";
-            this.buttonDelete.Size = new System.Drawing.Size(268, 34);
-            this.buttonDelete.TabIndex = 3;
-            this.buttonDelete.Text = "Удалить машину";
-            this.buttonDelete.UseVisualStyleBackColor = true;
-            this.buttonDelete.Click += new System.EventHandler(this.buttonDelete_Click);
-            // 
-            // buttonAdd
-            // 
-            this.buttonAdd.Location = new System.Drawing.Point(13, 117);
-            this.buttonAdd.Name = "buttonAdd";
-            this.buttonAdd.Size = new System.Drawing.Size(275, 34);
-            this.buttonAdd.TabIndex = 1;
-            this.buttonAdd.Text = "Добавить машину";
-            this.buttonAdd.UseVisualStyleBackColor = true;
-            this.buttonAdd.Click += new System.EventHandler(this.buttonAdd_Click);
-            // 
-            // comboBoxMap
-            // 
-            this.comboBoxMap.FormattingEnabled = true;
-            this.comboBoxMap.Items.AddRange(new object[] {
-            "Простая карта",
-            "Горизонтальная карта",
-            "Вертикальная карта"});
-            this.comboBoxMap.Location = new System.Drawing.Point(9, 41);
-            this.comboBoxMap.Name = "comboBoxMap";
-            this.comboBoxMap.Size = new System.Drawing.Size(279, 33);
-            this.comboBoxMap.TabIndex = 0;
-            this.comboBoxMap.SelectedIndexChanged += new System.EventHandler(this.comboBoxMap_SelectedIndexChanged);
-            // 
-            // pictureBoxImage
-            // 
-            this.pictureBoxImage.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.pictureBoxImage.Location = new System.Drawing.Point(0, 0);
-            this.pictureBoxImage.Name = "pictureBoxImage";
-            this.pictureBoxImage.Size = new System.Drawing.Size(728, 644);
-            this.pictureBoxImage.TabIndex = 1;
-            this.pictureBoxImage.TabStop = false;
-            // 
-            // FormMapWithSetMachine
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 25F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1028, 644);
-            this.Controls.Add(this.pictureBoxImage);
-            this.Controls.Add(this.groupBoxInstruments);
-            this.Name = "FormMapWithSetMachine";
-            this.Text = "Карта с набором объектов";
-            this.groupBoxInstruments.ResumeLayout(false);
-            this.groupBoxInstruments.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxImage)).EndInit();
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-
-        private GroupBox groupBoxInstruments;
-        private Button buttonMap;
-        private Button buttonStore;
-        private Button buttonDelete;
-        private Button buttonAdd;
-        private ComboBox comboBoxMap;
-        private PictureBox pictureBoxImage;
-        private MaskedTextBox maskedTextBoxPosition;
-        private Button ButtonDown;
-        private Button ButtonRight;
-        private Button ButtonLeft;
-        private Button ButtonUp;
-    }
-}

ArmoredVehicle/FormMapWithSetMachine.cs

@@ -1,179 +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 ArmoredVehicle
-{
-    public partial class FormMapWithSetMachine : Form
-    { 
-        /// <summary>
-      /// Объект от класса карты с набором объектов
-      /// </summary>
-        private MapWithSetMachineGeneric<DrawningObject, AbstractMap> _mapCarsCollectionGeneric;
-        /// <summary>
-        /// Конструктор
-        /// </summary>
-        public FormMapWithSetMachine()
-        {
-            InitializeComponent();
-        }
-
-        /// <summary>
-        /// Выбор карты
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void comboBoxMap_SelectedIndexChanged(object sender, EventArgs e)
-        {
-            AbstractMap map = null;
-            switch (comboBoxMap.Text)
-            {
-                case "Простая карта":
-                    map = new SimpleMap();
-                    break;
-                case "Горизонтальная карта":
-                    map = new HorizontalMap();
-                    break;
-                case "Вертикальная карта":
-                    map = new VerticalMap();
-                    break;
-            }
-            if (map != null)
-            {
-                _mapCarsCollectionGeneric = new MapWithSetMachineGeneric<DrawningObject, AbstractMap>(
-                    pictureBoxImage.Width, pictureBoxImage.Height, map);
-            }
-            else
-            {
-                _mapCarsCollectionGeneric = null;
-            }
-        }
-        /// <summary>
-        /// Добавление объекта
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void buttonAdd_Click(object sender, EventArgs e)
-        {
-            if (_mapCarsCollectionGeneric == null)
-            {
-                return;
-            }
-            MainForm form = new();
-            if (form.ShowDialog() == DialogResult.OK)
-            {
-                if (form.SelectedMachine == null)
-                {
-                    MessageBox.Show("Вы не создали объект");
-                    return;
-                }
-                DrawningObject machine = new(form.SelectedMachine);
-                if (_mapCarsCollectionGeneric + machine != -1)
-                {
-                    MessageBox.Show("Объект добавлен");
-                    pictureBoxImage.Image = _mapCarsCollectionGeneric.ShowSet();
-                }
-                else
-                {
-                    MessageBox.Show("Не удалось добавить объект");
-                }
-            }
-        }
-
-        
-        
-        
-        ///<summary>
-        /// Удаление объекта
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void buttonDelete_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 (_mapCarsCollectionGeneric - pos != null)
-            {
-                MessageBox.Show("Объект удален");
-                pictureBoxImage.Image = _mapCarsCollectionGeneric.ShowSet();
-            }
-            else
-            {
-                MessageBox.Show("Не удалось удалить объект");
-            }
-        }
-
-        /// <summary>
-        /// Вывод набора
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void buttonStore_Click(object sender, EventArgs e)
-        {
-            if (_mapCarsCollectionGeneric == null)
-            {
-                return;
-            }
-            pictureBoxImage.Image = _mapCarsCollectionGeneric.ShowSet();
-        }
-
-        /// <summary>
-        /// Вывод карты
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void buttonMap_Click(object sender, EventArgs e)
-        {
-            if (_mapCarsCollectionGeneric == null)
-            {
-                return;
-            }
-            pictureBoxImage.Image = _mapCarsCollectionGeneric.ShowOnMap();
-        }
-
-        /// <summary>
-        /// Перемещение
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ButtonMove_Click(object sender, EventArgs e)
-        {
-            if (_mapCarsCollectionGeneric == 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;
-            }
-            pictureBoxImage.Image = _mapCarsCollectionGeneric.MoveObject(dir);
-        }
-    }
-}

ArmoredVehicle/MainForm.Designer.cs

@@ -40,7 +40,7 @@
             this.toolStripStatusLabelColor = new System.Windows.Forms.ToolStripStatusLabel();
             this.statusStrip = new System.Windows.Forms.StatusStrip();
             this.TankButton = new System.Windows.Forms.Button();
-            this.ChooseButton = new System.Windows.Forms.Button();
+            this.Mapbutton = new System.Windows.Forms.Button();
             ((System.ComponentModel.ISupportInitialize)(this.DrawingPictureBox)).BeginInit();
             this.statusStrip.SuspendLayout();
             this.SuspendLayout();
@@ -109,7 +109,7 @@
             this.DrawingPictureBox.Dock = System.Windows.Forms.DockStyle.Fill;
             this.DrawingPictureBox.Location = new System.Drawing.Point(0, 0);
             this.DrawingPictureBox.Name = "DrawingPictureBox";
-            this.DrawingPictureBox.Size = new System.Drawing.Size(800, 450);
+            this.DrawingPictureBox.Size = new System.Drawing.Size(800, 418);
             this.DrawingPictureBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
             this.DrawingPictureBox.TabIndex = 7;
             this.DrawingPictureBox.TabStop = false;
@@ -156,30 +156,30 @@
             this.TankButton.UseVisualStyleBackColor = true;
             this.TankButton.Click += new System.EventHandler(this.TankButton_Click);
             // 
-            // ChooseButton
+            // Mapbutton
             // 
-            this.ChooseButton.Location = new System.Drawing.Point(484, 362);
-            this.ChooseButton.Name = "ChooseButton";
-            this.ChooseButton.Size = new System.Drawing.Size(143, 34);
-            this.ChooseButton.TabIndex = 15;
-            this.ChooseButton.Text = "Выбрать";
-            this.ChooseButton.UseVisualStyleBackColor = true;
-            this.ChooseButton.Click += new System.EventHandler(this.ChooseButton_Click);
+            this.Mapbutton.Location = new System.Drawing.Point(304, 362);
+            this.Mapbutton.Name = "Mapbutton";
+            this.Mapbutton.Size = new System.Drawing.Size(179, 34);
+            this.Mapbutton.TabIndex = 15;
+            this.Mapbutton.Text = "Перейти на карту";
+            this.Mapbutton.UseVisualStyleBackColor = true;
+            this.Mapbutton.Click += new System.EventHandler(this.Mapbutton_Click);
             // 
             // MainForm
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 25F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(800, 450);
-            this.Controls.Add(this.ChooseButton);
+            this.Controls.Add(this.Mapbutton);
             this.Controls.Add(this.TankButton);
             this.Controls.Add(this.ButtonDown);
             this.Controls.Add(this.ButtonRight);
             this.Controls.Add(this.ButtonLeft);
             this.Controls.Add(this.ButtonUp);
             this.Controls.Add(this.CreateButton);
-            this.Controls.Add(this.statusStrip);
             this.Controls.Add(this.DrawingPictureBox);
+            this.Controls.Add(this.statusStrip);
             this.MinimumSize = new System.Drawing.Size(210, 50);
             this.Name = "MainForm";
             this.Text = "Военная машина";
@@ -204,6 +204,6 @@
         private ToolStripStatusLabel toolStripStatusLabelColor;
         private StatusStrip statusStrip;
         private Button TankButton;
-        private Button ChooseButton;
+        private Button Mapbutton;
     }
 }

ArmoredVehicle/MainForm.cs

@@ -7,8 +7,6 @@ namespace ArmoredVehicle
         {
             InitializeComponent();
         }
-
-        public DrawingArmoredVehicle SelectedMachine { get; private set; }
         /// <summary>
         /// <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
         /// </summary>
@@ -35,15 +33,8 @@ namespace ArmoredVehicle
         private void CreateButton_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;
-            }
-           
             _ArmoredVehicle = new DrawingArmoredVehicle(rnd.Next(100, 300), rnd.Next(1000, 2000),
-                    color);
+                    Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)));
             SetData();
             Draw();
         }
@@ -97,22 +88,10 @@ namespace ArmoredVehicle
         private void TankButton_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;
-            }
             _ArmoredVehicle = new DrawingTank(rnd.Next(100, 300), 
                                               rnd.Next(1000, 2000),
-                                              color,
-                                              dopColor,
+                                              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)), 
                                               Convert.ToBoolean(rnd.Next(0, 2)));
@@ -120,15 +99,10 @@ namespace ArmoredVehicle
             Draw();
         }
 
-        /// <summary>
-        /// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ChooseButton_Click(object sender, EventArgs e)
+        private void Mapbutton_Click(object sender, EventArgs e)
         {
-            SelectedMachine = _ArmoredVehicle;
-            DialogResult = DialogResult.OK;
+            FormMap map = new FormMap();
+            map.Show();
         }
     }
 }

ArmoredVehicle/MapWithSetMachineGeneric.cs

@@ -1,203 +0,0 @@
-namespace ArmoredVehicle
-{
-    /// <summary>
-    /// Карта с набром объектов под нее
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    /// <typeparam name="U"></typeparam>
-    internal class MapWithSetMachineGeneric<T, U>
-        where T : class, IDrawningObject
-        where U : AbstractMap
-    {
-        /// <summary>
-        /// Ширина окна отрисовки
-        /// </summary>
-        private readonly int _pictureWidth;
-        /// <summary>
-        /// Высота окна отрисовки
-        /// </summary>
-        private readonly int _pictureHeight;
-        /// <summary>
-        /// Размер занимаемого объектом места (ширина)
-        /// </summary>
-        private readonly int _placeSizeWidth = 210;
-        /// <summary>
-        /// Размер занимаемого объектом места (высота)
-        /// </summary>
-        private readonly int _placeSizeHeight = 90;
-        /// <summary>
-        /// Набор объектов
-        /// </summary>
-        private readonly SetMachineGeneric<T> _setMachines;
-        /// <summary>
-        /// Карта
-        /// </summary>
-        private readonly U _map;
-        /// <summary>
-        /// Конструктор
-        /// </summary>
-        /// <param name="picWidth"></param>
-        /// <param name="picHeight"></param>
-        /// <param name="map"></param>
-        public MapWithSetMachineGeneric(int picWidth, int picHeight, U map)
-        {
-            int width = picWidth / _placeSizeWidth;
-            int height = picHeight / _placeSizeHeight;
-            _setMachines = new SetMachineGeneric<T>(width * height);
-            _pictureWidth = picWidth;
-            _pictureHeight = picHeight;
-            _map = map;
-        }
-        
-        
-        
-        
-        
-        /// <summary>
-        /// Перегрузка оператора сложения
-        /// </summary>
-        /// <param name="map"></param>
-        /// <param name="machine"></param>
-        /// <returns></returns>
-        public static int operator +(MapWithSetMachineGeneric<T, U> map, T machine)
-        {
-            return map._setMachines.Insert(machine);
-        }
-        /// <summary>
-        /// Перегрузка оператора вычитания
-        /// </summary>
-        /// <param name="map"></param>
-        /// <param name="position"></param>
-        /// <returns></returns>
-        public static T operator -(MapWithSetMachineGeneric<T, U> map, int position)
-        {
-            return map._setMachines.Remove(position);
-        }
-        /// <summary>
-        /// Вывод всего набора объектов
-        /// </summary>
-        /// <returns></returns>
-        public Bitmap ShowSet()
-        {
-            Bitmap bmp = new(_pictureWidth, _pictureHeight);
-            Graphics gr = Graphics.FromImage(bmp);
-            DrawBackground(gr);
-            DrawMachine(gr);
-            return bmp;
-        }
-        /// <summary>
-        /// Просмотр объекта на карте
-        /// </summary>
-        /// <returns></returns>
-        public Bitmap ShowOnMap()
-        {
-            Shaking();
-            for (int i = 0; i < _setMachines.Count; i++)
-            {
-                var car = _setMachines.Get(i);
-                if (car != null)
-                {
-                    return _map.CreateMap(_pictureWidth, _pictureHeight, car);
-                }
-            }
-            return new(_pictureWidth, _pictureHeight);
-        }
-        /// <summary>
-        /// Перемещение объекта по крате
-        /// </summary>
-        /// <param name="direction"></param>
-        /// <returns></returns>
-        public Bitmap MoveObject(Direction direction)
-        {
-            if (_map != null)
-            {
-                return _map.MoveObject(direction);
-            }
-            return new(_pictureWidth, _pictureHeight);
-        }
-        /// <summary>
-        /// "Взбалтываем" набор, чтобы все элементы оказались в начале
-        /// </summary>
-        private void Shaking()
-        {
-            int j = _setMachines.Count - 1;
-            for (int i = 0; i < _setMachines.Count; i++)
-            {
-                if (_setMachines.Get(i) == null)
-                {
-                    for (; j > i; j--)
-                    {
-                        var car = _setMachines.Get(j);
-                        if (car != null)
-                        {
-                            _setMachines.Insert(car, i);
-                            _setMachines.Remove(j);
-                            break;
-                        }
-                    }
-                    if (j <= i)
-                    {
-                        return;
-                    }
-                }
-            }
-        }
-        /// <summary>
-        /// Метод отрисовки фона
-        /// </summary>
-        /// <param name="g"></param>
-        private void DrawBackground(Graphics g)
-        {
-            Pen pen = new(Color.LawnGreen, 5);
-            for (int i = 0; i < _pictureWidth / _placeSizeWidth; i++)
-            {
-                for (int j = 0; j < _pictureHeight / _placeSizeHeight + 1; ++j)
-                {//линия рамзетки места
-                    int dop = 0;
-                    if(i>0 && j>0)
-                    {
-                        dop = 30;
-                    }
-                    g.DrawRectangle(pen, new Rectangle(i * _placeSizeWidth + dop, j * _placeSizeHeight + dop, i * _placeSizeWidth + _placeSizeWidth, j * _placeSizeHeight + _placeSizeHeight));
-                }
-            }
-        }
-        /// <summary>
-        /// Метод прорисовки объектов
-        /// </summary>
-        /// <param name="g"></param>
-        private void DrawMachine(Graphics g)
-        {
-            int width = _pictureWidth / _placeSizeWidth;
-            int height = _pictureHeight / _placeSizeHeight;
-
-            int currentWidth = 0;
-            int currentHeight = 0;
-
-            for (int i = 0; i < _setMachines.Count; i++)
-            {
-                int dop = 0;
-                if(currentWidth > 0 && currentHeight > 0)
-                {
-                    dop = 30;
-                }
-                _setMachines.Get(i)?.SetObject(currentWidth * _placeSizeWidth + dop,
-                    currentHeight * _placeSizeHeight + dop,
-                    _pictureWidth, _pictureHeight);
-                _setMachines.Get(i)?.DrawningObject(g);
-
-                if (currentWidth < width - 1)
-                {
-                    currentWidth++;
-                }
-                else
-                {
-                    currentWidth = 0;
-                    currentHeight++;
-                }
-                if (currentHeight > height) return;
-            }
-            
-        }
-    }
-}

ArmoredVehicle/Program.cs

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

ArmoredVehicle/SetMachineGeneric.cs

@@ -1,85 +0,0 @@
-namespace ArmoredVehicle
-{
-    /// <summary>
-    /// Параметризованный набор объектов
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    internal class SetMachineGeneric<T>
-		where T : class
-	{
-		/// <summary>
-		/// Массив объектов, которые храним
-		/// </summary>
-		private readonly T[] _places;
-		/// <summary>
-		/// Количество объектов в массиве
-		/// </summary>
-		public int Count => _places.Length;
-		private int BusyPlaces = 0;
-		/// <summary>
-		/// Конструктор
-		/// </summary>
-		/// <param name="count"></param>
-		public SetMachineGeneric(int count)
-		{
-			_places = new T[count];
-		}
-		/// <summary>
-		/// Добавление объекта в набор
-		/// </summary>
-		/// <param name="machine">Добавляемая машина</param>
-		/// <returns></returns>
-		public int Insert(T machine)
-		{
-			return Insert(machine, 0);
-		}
-		/// <summary>
-		/// Добавление объекта в набор на конкретную позицию
-		/// </summary>
-		/// <param name="machine">Добавляемая машина</param>
-		/// <param name="position">Позиция</param>
-		/// <returns></returns>
-		public int Insert(T machine, int position)
-		{
-			if (position < 0 || position >= _places.Length || BusyPlaces == _places.Length) return -1;
-
-			BusyPlaces++;
-			while (_places[position] != null)
-			{
-				for (int i = _places.Length - 1; i > 0; --i)
-				{
-					if (_places[i] == null && _places[i - 1] != null)
-					{
-						_places[i] = _places[i - 1];
-						_places[i - 1] = null;
-					}
-				}
-			}
-			_places[position] = machine;
-			return position;
-		}
-		/// <summary>
-		/// Удаление объекта из набора с конкретной позиции
-		/// </summary>
-		/// <param name="position"></param>
-		/// <returns></returns>
-		public T Remove(int position)
-		{
-			if (position < 0 || position >= _places.Length) return null;
-			T deletemashine = _places[position];
-			_places[position] = null;
-			return deletemashine;
-		}
-		/// <summary>
-		/// Получение объекта из набора по позиции
-		/// </summary>
-		/// <param name="position"></param>
-		/// <returns></returns>
-		public T Get(int position)
-		{
-			if (position < 0 || position >= _places.Length) return null;
-			else if (_places[position] == null)	return null;
-			return _places[position];
-		}
-	}
-}