HoistingCrane/HoistingCrane/AbstractMap.cs

@@ -103,7 +103,6 @@ namespace HoistingCrane
             else _drawingObject.MoveObject(SetOppositDirection(direction));
             return DrawMapWithObject();
         }
-
         private Direction SetOppositDirection(Direction dir)
         {
             switch (dir)

HoistingCrane/HoistingCrane/DrawingHoistingCrane.cs

@@ -9,14 +9,12 @@ namespace HoistingCrane
     public class DrawingHoistingCrane
     {
         public EntityHoistingCrane HoistingCrane { get; protected set; }
-
         protected float _startPosX;
         protected float _startPosY;
         private int? _pictureWidth = null;
         private int? _pictureHeight = null;
         private readonly int _hoistingCraneWidth = 80;
         private readonly int _hoistingCraneHeight = 50;
-
         protected DrawingHoistingCrane(int speed, float weight, Color bodyColor, int hoistingCraneWidth, int hoistingCraneHeigth) :
            this(speed, weight, bodyColor)
         {
@@ -27,7 +25,6 @@ namespace HoistingCrane
         {
             HoistingCrane = new EntityHoistingCrane(speed, weight, bodyColor);
         }
-
         public void SetPosition(int x, int y, int width, int height)
         {
             // TODO checks
@@ -36,7 +33,6 @@ namespace HoistingCrane
             _pictureWidth = width;
             _pictureHeight = height;
         }
-
         public void MoveTransport(Direction direction)
         {
             if (!_pictureWidth.HasValue || !_pictureHeight.HasValue)
@@ -122,7 +118,6 @@ namespace HoistingCrane
             g.FillRectangle(brBlack, _startPosX + 30, _startPosY + 45, 4, 6);
             g.FillRectangle(brBlack, _startPosX + 45, _startPosY + 45, 4, 6);
         }
-
         public void ChangeBorders(int width, int height)
         {
             _pictureWidth = width;

HoistingCrane/HoistingCrane/EntityAdvancedHoistingCrane.cs

@@ -13,7 +13,6 @@ namespace HoistingCrane
         // наличие противовеса
         public bool Сounterweight { get; private set; }
         public Color DopColor { get; private set; }
-
         public EntityAdvancedHoistingCrane(int speed, float weight, Color bodyColor, Color dopColor, bool crane, bool counterweight) :
             base(speed, weight, bodyColor)
         {

HoistingCrane/HoistingCrane/EntityHoistingCrane.cs

@@ -9,13 +9,9 @@ namespace HoistingCrane
     public class EntityHoistingCrane
     {
         public int Speed { get; private set; }
-
         public float Weight { get; private set; }
-
         public Color BodyColor { get; private set; }
-
         public float Step => Speed * 100 / Weight;
-
         public EntityHoistingCrane(int speed, float weight, Color bodyColor)
         {
             Random rnd = new();

HoistingCrane/HoistingCrane/FormHoistingCrane.Designer.cs

@@ -49,9 +49,10 @@
             this.buttonUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.buttonUp.BackgroundImage = global::HoistingCrane.Properties.Resources.up;
             this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
-            this.buttonUp.Location = new System.Drawing.Point(722, 353);
+            this.buttonUp.Location = new System.Drawing.Point(825, 471);
+            this.buttonUp.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.buttonUp.Name = "buttonUp";
-            this.buttonUp.Size = new System.Drawing.Size(30, 30);
+            this.buttonUp.Size = new System.Drawing.Size(34, 40);
             this.buttonUp.TabIndex = 0;
             this.buttonUp.UseVisualStyleBackColor = true;
             this.buttonUp.Click += new System.EventHandler(this.ButtonMove_Click);
@@ -61,9 +62,10 @@
             this.buttonLeft.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.buttonLeft.BackgroundImage = global::HoistingCrane.Properties.Resources.left;
             this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
-            this.buttonLeft.Location = new System.Drawing.Point(686, 389);
+            this.buttonLeft.Location = new System.Drawing.Point(784, 519);
+            this.buttonLeft.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.buttonLeft.Name = "buttonLeft";
-            this.buttonLeft.Size = new System.Drawing.Size(30, 30);
+            this.buttonLeft.Size = new System.Drawing.Size(34, 40);
             this.buttonLeft.TabIndex = 1;
             this.buttonLeft.UseVisualStyleBackColor = true;
             this.buttonLeft.Click += new System.EventHandler(this.ButtonMove_Click);
@@ -73,9 +75,10 @@
             this.buttonRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.buttonRight.BackgroundImage = global::HoistingCrane.Properties.Resources.right;
             this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
-            this.buttonRight.Location = new System.Drawing.Point(758, 389);
+            this.buttonRight.Location = new System.Drawing.Point(866, 519);
+            this.buttonRight.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.buttonRight.Name = "buttonRight";
-            this.buttonRight.Size = new System.Drawing.Size(30, 30);
+            this.buttonRight.Size = new System.Drawing.Size(34, 40);
             this.buttonRight.TabIndex = 2;
             this.buttonRight.UseVisualStyleBackColor = true;
             this.buttonRight.Click += new System.EventHandler(this.ButtonMove_Click);
@@ -85,9 +88,10 @@
             this.buttonDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.buttonDown.BackgroundImage = global::HoistingCrane.Properties.Resources.down;
             this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
-            this.buttonDown.Location = new System.Drawing.Point(722, 389);
+            this.buttonDown.Location = new System.Drawing.Point(825, 519);
+            this.buttonDown.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.buttonDown.Name = "buttonDown";
-            this.buttonDown.Size = new System.Drawing.Size(30, 30);
+            this.buttonDown.Size = new System.Drawing.Size(34, 40);
             this.buttonDown.TabIndex = 3;
             this.buttonDown.UseVisualStyleBackColor = true;
             this.buttonDown.Click += new System.EventHandler(this.ButtonMove_Click);
@@ -95,9 +99,10 @@
             // 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, 393);
+            this.buttonCreate.Location = new System.Drawing.Point(14, 524);
+            this.buttonCreate.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.buttonCreate.Name = "buttonCreate";
-            this.buttonCreate.Size = new System.Drawing.Size(75, 23);
+            this.buttonCreate.Size = new System.Drawing.Size(86, 31);
             this.buttonCreate.TabIndex = 4;
             this.buttonCreate.Text = "Создать";
             this.buttonCreate.UseVisualStyleBackColor = true;
@@ -105,71 +110,76 @@
             // 
             // statusStrip
             // 
+            this.statusStrip.ImageScalingSize = new System.Drawing.Size(20, 20);
             this.statusStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.toolStripStatusLabelSpeed,
             this.toolStripStatusLabelWeight,
             this.toolStripStatusLabelBodyColor});
-            this.statusStrip.Location = new System.Drawing.Point(0, 428);
+            this.statusStrip.Location = new System.Drawing.Point(0, 574);
             this.statusStrip.Name = "statusStrip";
-            this.statusStrip.Size = new System.Drawing.Size(800, 22);
+            this.statusStrip.Padding = new System.Windows.Forms.Padding(1, 0, 16, 0);
+            this.statusStrip.Size = new System.Drawing.Size(914, 26);
             this.statusStrip.TabIndex = 5;
             this.statusStrip.Text = "statusStrip";
             // 
             // toolStripStatusLabelSpeed
             // 
             this.toolStripStatusLabelSpeed.Name = "toolStripStatusLabelSpeed";
-            this.toolStripStatusLabelSpeed.Size = new System.Drawing.Size(62, 17);
+            this.toolStripStatusLabelSpeed.Size = new System.Drawing.Size(76, 20);
             this.toolStripStatusLabelSpeed.Text = "Скорость:";
             // 
             // toolStripStatusLabelWeight
             // 
             this.toolStripStatusLabelWeight.Name = "toolStripStatusLabelWeight";
-            this.toolStripStatusLabelWeight.Size = new System.Drawing.Size(29, 17);
+            this.toolStripStatusLabelWeight.Size = new System.Drawing.Size(36, 20);
             this.toolStripStatusLabelWeight.Text = "Вес:";
             // 
             // toolStripStatusLabelBodyColor
             // 
             this.toolStripStatusLabelBodyColor.Name = "toolStripStatusLabelBodyColor";
-            this.toolStripStatusLabelBodyColor.Size = new System.Drawing.Size(36, 17);
+            this.toolStripStatusLabelBodyColor.Size = new System.Drawing.Size(45, 20);
             this.toolStripStatusLabelBodyColor.Text = "Цвет:";
             // 
             // pictureBoxHoistingCrane
             // 
             this.pictureBoxHoistingCrane.Dock = System.Windows.Forms.DockStyle.Fill;
             this.pictureBoxHoistingCrane.Location = new System.Drawing.Point(0, 0);
+            this.pictureBoxHoistingCrane.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.pictureBoxHoistingCrane.Name = "pictureBoxHoistingCrane";
-            this.pictureBoxHoistingCrane.Size = new System.Drawing.Size(800, 428);
+            this.pictureBoxHoistingCrane.Size = new System.Drawing.Size(914, 574);
             this.pictureBoxHoistingCrane.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
             this.pictureBoxHoistingCrane.TabIndex = 6;
             this.pictureBoxHoistingCrane.TabStop = false;
-            this.pictureBoxHoistingCrane.Click += new System.EventHandler(this.pictureBoxHoistingCrane_Click);
             this.pictureBoxHoistingCrane.Resize += new System.EventHandler(this.PictureBoxHoistingCrane_Resize);
             // 
             // buttonCreateModify
             // 
             this.buttonCreateModify.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.buttonCreateModify.Location = new System.Drawing.Point(93, 393);
+            this.buttonCreateModify.Location = new System.Drawing.Point(106, 524);
+            this.buttonCreateModify.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.buttonCreateModify.Name = "buttonCreateModify";
-            this.buttonCreateModify.Size = new System.Drawing.Size(100, 23);
+            this.buttonCreateModify.Size = new System.Drawing.Size(129, 31);
             this.buttonCreateModify.TabIndex = 7;
             this.buttonCreateModify.Text = "Модификация";
-
+            this.buttonCreateModify.UseVisualStyleBackColor = true;
-            this.buttonSelect.Location = new System.Drawing.Point(551, 390);
+            this.buttonCreateModify.Click += new System.EventHandler(this.ButtonCreateModify_Click);
+            // 
+            // buttonSelect
+            // 
+            this.buttonSelect.Location = new System.Drawing.Point(630, 520);
+            this.buttonSelect.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.buttonSelect.Name = "buttonSelect";
-            this.buttonSelect.Size = new System.Drawing.Size(75, 23);
+            this.buttonSelect.Size = new System.Drawing.Size(86, 31);
             this.buttonSelect.TabIndex = 8;
             this.buttonSelect.Text = "Выбрать";
             this.buttonSelect.UseVisualStyleBackColor = true;
             this.buttonSelect.Click += new System.EventHandler(this.ButtonSelect_Click);
             // 
-            this.buttonCreateModify.UseVisualStyleBackColor = true;
-            this.buttonCreateModify.Click += new System.EventHandler(this.ButtonCreateModify_Click);
-            // 
             // FormHoistingCrane
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(800, 450);
+            this.ClientSize = new System.Drawing.Size(914, 600);
             this.Controls.Add(this.buttonSelect);
             this.Controls.Add(this.buttonCreateModify);
             this.Controls.Add(this.buttonCreate);
@@ -179,6 +189,7 @@
             this.Controls.Add(this.buttonUp);
             this.Controls.Add(this.pictureBoxHoistingCrane);
             this.Controls.Add(this.statusStrip);
+            this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.Name = "FormHoistingCrane";
             this.Text = "Подъёмный кран";
             this.statusStrip.ResumeLayout(false);

HoistingCrane/HoistingCrane/FormHoistingCrane.cs

@@ -8,7 +8,6 @@
         {
             InitializeComponent();
         }
-
         private void Draw()
         {
             Bitmap bmp = new(pictureBoxHoistingCrane.Width, pictureBoxHoistingCrane.Height);
@@ -16,7 +15,6 @@
             _HoistingCrane?.DrawTransport(gr);
             pictureBoxHoistingCrane.Image = bmp;
         }
-
         private void SetData()
         {
             Random rnd = new();
@@ -25,7 +23,6 @@
             toolStripStatusLabelWeight.Text = $"Вес: {_HoistingCrane.HoistingCrane.Weight}";
             toolStripStatusLabelBodyColor.Text = $"Цвет:{_HoistingCrane.HoistingCrane.BodyColor.Name}";
         }
-
         private void ButtonCreate_Click(object sender, EventArgs e)
         {
             Random rnd = new();
@@ -40,7 +37,6 @@
             SetData();
             Draw();
         }
-
         private void ButtonMove_Click(object sender, EventArgs e)
         {
             string name = ((Button)sender)?.Name ?? string.Empty;
@@ -61,13 +57,11 @@
             }
             Draw();
         }
-
         private void PictureBoxHoistingCrane_Resize(object sender, EventArgs e)
         {
             _HoistingCrane?.ChangeBorders(pictureBoxHoistingCrane.Width, pictureBoxHoistingCrane.Height);
             Draw();
         }
-
         private void ButtonCreateModify_Click(object sender, EventArgs e)
         {
             Random rnd = new();
@@ -90,11 +84,6 @@
             SetData();
             Draw();
         }
-
-        private void pictureBoxHoistingCrane_Click(object sender, EventArgs e)
-        {
-
-        }
         private void ButtonSelect_Click(object sender, EventArgs e)
         {
             SelectedHoistingCrane = _HoistingCrane;

HoistingCrane/HoistingCrane/FormHoistingCrane.resx

@@ -57,4 +57,7 @@
   <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>

HoistingCrane/HoistingCrane/FormMap.Designer.cs

@@ -1,208 +0,0 @@
-namespace HoistingCrane
-{
-    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.buttonUp = new System.Windows.Forms.Button();
-            this.buttonLeft = new System.Windows.Forms.Button();
-            this.buttonRight = new System.Windows.Forms.Button();
-            this.buttonDown = new System.Windows.Forms.Button();
-            this.buttonCreate = new System.Windows.Forms.Button();
-            this.statusStrip = new System.Windows.Forms.StatusStrip();
-            this.toolStripStatusLabelSpeed = new System.Windows.Forms.ToolStripStatusLabel();
-            this.toolStripStatusLabelWeight = new System.Windows.Forms.ToolStripStatusLabel();
-            this.toolStripStatusLabelBodyColor = new System.Windows.Forms.ToolStripStatusLabel();
-            this.pictureBoxHoistingCrane = new System.Windows.Forms.PictureBox();
-            this.buttonCreateModify = new System.Windows.Forms.Button();
-            this.comboBoxSelectorMap = new System.Windows.Forms.ComboBox();
-            this.statusStrip.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxHoistingCrane)).BeginInit();
-            this.SuspendLayout();
-            // 
-            // buttonUp
-            // 
-            this.buttonUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.buttonUp.BackgroundImage = global::HoistingCrane.Properties.Resources.up;
-            this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
-            this.buttonUp.Location = new System.Drawing.Point(722, 353);
-            this.buttonUp.Name = "buttonUp";
-            this.buttonUp.Size = new System.Drawing.Size(30, 30);
-            this.buttonUp.TabIndex = 0;
-            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::HoistingCrane.Properties.Resources.left;
-            this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
-            this.buttonLeft.Location = new System.Drawing.Point(686, 389);
-            this.buttonLeft.Name = "buttonLeft";
-            this.buttonLeft.Size = new System.Drawing.Size(30, 30);
-            this.buttonLeft.TabIndex = 1;
-            this.buttonLeft.UseVisualStyleBackColor = true;
-            this.buttonLeft.Click += new System.EventHandler(this.ButtonMove_Click);
-            // 
-            // buttonRight
-            // 
-            this.buttonRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.buttonRight.BackgroundImage = global::HoistingCrane.Properties.Resources.right;
-            this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
-            this.buttonRight.Location = new System.Drawing.Point(758, 389);
-            this.buttonRight.Name = "buttonRight";
-            this.buttonRight.Size = new System.Drawing.Size(30, 30);
-            this.buttonRight.TabIndex = 2;
-            this.buttonRight.UseVisualStyleBackColor = true;
-            this.buttonRight.Click += new System.EventHandler(this.ButtonMove_Click);
-            // 
-            // buttonDown
-            // 
-            this.buttonDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.buttonDown.BackgroundImage = global::HoistingCrane.Properties.Resources.down;
-            this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
-            this.buttonDown.Location = new System.Drawing.Point(722, 389);
-            this.buttonDown.Name = "buttonDown";
-            this.buttonDown.Size = new System.Drawing.Size(30, 30);
-            this.buttonDown.TabIndex = 3;
-            this.buttonDown.UseVisualStyleBackColor = true;
-            this.buttonDown.Click += new System.EventHandler(this.ButtonMove_Click);
-            // 
-            // 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, 393);
-            this.buttonCreate.Name = "buttonCreate";
-            this.buttonCreate.Size = new System.Drawing.Size(75, 23);
-            this.buttonCreate.TabIndex = 4;
-            this.buttonCreate.Text = "Создать";
-            this.buttonCreate.UseVisualStyleBackColor = true;
-            this.buttonCreate.Click += new System.EventHandler(this.ButtonCreate_Click);
-            // 
-            // statusStrip
-            // 
-            this.statusStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.toolStripStatusLabelSpeed,
-            this.toolStripStatusLabelWeight,
-            this.toolStripStatusLabelBodyColor});
-            this.statusStrip.Location = new System.Drawing.Point(0, 428);
-            this.statusStrip.Name = "statusStrip";
-            this.statusStrip.Size = new System.Drawing.Size(800, 22);
-            this.statusStrip.TabIndex = 5;
-            this.statusStrip.Text = "statusStrip";
-            // 
-            // toolStripStatusLabelSpeed
-            // 
-            this.toolStripStatusLabelSpeed.Name = "toolStripStatusLabelSpeed";
-            this.toolStripStatusLabelSpeed.Size = new System.Drawing.Size(62, 17);
-            this.toolStripStatusLabelSpeed.Text = "Скорость:";
-            // 
-            // toolStripStatusLabelWeight
-            // 
-            this.toolStripStatusLabelWeight.Name = "toolStripStatusLabelWeight";
-            this.toolStripStatusLabelWeight.Size = new System.Drawing.Size(29, 17);
-            this.toolStripStatusLabelWeight.Text = "Вес:";
-            // 
-            // toolStripStatusLabelBodyColor
-            // 
-            this.toolStripStatusLabelBodyColor.Name = "toolStripStatusLabelBodyColor";
-            this.toolStripStatusLabelBodyColor.Size = new System.Drawing.Size(36, 17);
-            this.toolStripStatusLabelBodyColor.Text = "Цвет:";
-            // 
-            // pictureBoxBulldozer
-            // 
-            this.pictureBoxHoistingCrane.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.pictureBoxHoistingCrane.Location = new System.Drawing.Point(0, 0);
-            this.pictureBoxHoistingCrane.Name = "pictureBoxHoistingCrane";
-            this.pictureBoxHoistingCrane.Size = new System.Drawing.Size(800, 428);
-            this.pictureBoxHoistingCrane.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
-            this.pictureBoxHoistingCrane.TabIndex = 6;
-            this.pictureBoxHoistingCrane.TabStop = false;
-            this.pictureBoxHoistingCrane.Click += new System.EventHandler(this.pictureBoxHoistingCrane_Click);
-            // 
-            // buttonCreateModify
-            // 
-            this.buttonCreateModify.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.buttonCreateModify.Location = new System.Drawing.Point(93, 393);
-            this.buttonCreateModify.Name = "buttonCreateModify";
-            this.buttonCreateModify.Size = new System.Drawing.Size(100, 23);
-            this.buttonCreateModify.TabIndex = 7;
-            this.buttonCreateModify.Text = "Модификация";
-            this.buttonCreateModify.UseVisualStyleBackColor = true;
-            this.buttonCreateModify.Click += new System.EventHandler(this.ButtonCreateModify_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(121, 23);
-            this.comboBoxSelectorMap.TabIndex = 8;
-            this.comboBoxSelectorMap.SelectedIndexChanged += new System.EventHandler(this.ComboBoxSelectorMap_SelectedIndexChanged);
-            // 
-            // FormMap
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(800, 450);
-            this.Controls.Add(this.comboBoxSelectorMap);
-            this.Controls.Add(this.buttonCreateModify);
-            this.Controls.Add(this.buttonCreate);
-            this.Controls.Add(this.buttonDown);
-            this.Controls.Add(this.buttonRight);
-            this.Controls.Add(this.buttonLeft);
-            this.Controls.Add(this.buttonUp);
-            this.Controls.Add(this.pictureBoxHoistingCrane);
-            this.Controls.Add(this.statusStrip);
-            this.Name = "FormMap";
-            this.Text = "FormMap";
-            this.statusStrip.ResumeLayout(false);
-            this.statusStrip.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxHoistingCrane)).EndInit();
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-        private Button buttonUp;
-        private Button buttonLeft;
-        private Button buttonRight;
-        private Button buttonDown;
-        private Button buttonCreate;
-        private StatusStrip statusStrip;
-        private ToolStripStatusLabel toolStripStatusLabelSpeed;
-        private ToolStripStatusLabel toolStripStatusLabelWeight;
-        private ToolStripStatusLabel toolStripStatusLabelBodyColor;
-        private PictureBox pictureBoxHoistingCrane;
-        private Button buttonCreateModify;
-        private ComboBox comboBoxSelectorMap;
-    }
-}

HoistingCrane/HoistingCrane/FormMap.cs

@@ -1,88 +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 HoistingCrane
-{
-    public partial class FormMap : Form
-    {
-        private AbstractMap _abstractMap;
-        public FormMap()
-        {
-            InitializeComponent();
-            _abstractMap = new SimpleMap();
-            _abstractMap = new SecondMap();
-        }
-
-        private void SetData(DrawingHoistingCrane hoistingCrane)
-        {
-            toolStripStatusLabelSpeed.Text = $"Скорость: {hoistingCrane.HoistingCrane.Speed}";
-            toolStripStatusLabelWeight.Text = $"Вес: {hoistingCrane.HoistingCrane.Weight}";
-            toolStripStatusLabelBodyColor.Text = $"Цвет:{hoistingCrane.HoistingCrane.BodyColor.Name}";
-            pictureBoxHoistingCrane.Image = _abstractMap.CreateMap(pictureBoxHoistingCrane.Width,
-            pictureBoxHoistingCrane.Height, new DrawingObjectHoistingCrane(hoistingCrane));
-        }
-
-        private void ButtonCreate_Click(object sender, EventArgs e)
-        {
-            Random rnd = new();
-            var bulldozer = new DrawingHoistingCrane(rnd.Next(30, 100), rnd.Next(300, 500),
-                Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)));
-            SetData(bulldozer);
-        }
-
-        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;
-            }
-            pictureBoxHoistingCrane.Image = _abstractMap.MoveObject(dir);
-        }
-        private void ButtonCreateModify_Click(object sender, EventArgs e)
-        {
-            Random rnd = new();
-            var hoistingCrane = new DrawingAdvancedHoistingCrane(rnd.Next(30, 100), rnd.Next(300, 500),
-                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(hoistingCrane);
-        }
-
-        private void ComboBoxSelectorMap_SelectedIndexChanged(object sender, EventArgs e)
-        {
-            switch (comboBoxSelectorMap.Text)
-            {
-                case "Простая карта":
-                    _abstractMap = new SimpleMap();
-                    break;
-                case "Вторая карта":
-                    _abstractMap = new SecondMap();
-                    break;
-            }
-        }
-
-        private void pictureBoxHoistingCrane_Click(object sender, EventArgs e)
-        {
-
-        }
-    }
-}

HoistingCrane/HoistingCrane/FormMap.resx

@@ -1,60 +0,0 @@
-<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>
-</root>

HoistingCrane/HoistingCrane/FormMapWithSetHoistingCrane.Designer.cs

@@ -9,7 +9,6 @@
         /// Required designer variable.
         /// </summary>
         private System.ComponentModel.IContainer components = null;
-
         /// <summary>
         /// Clean up any resources being used.
         /// </summary>
@@ -31,6 +30,12 @@
         /// </summary>
         private void InitializeComponent()
         {
+            this.groupBoxMaps = new System.Windows.Forms.GroupBox();
+            this.buttonDeleteMap = new System.Windows.Forms.Button();
+            this.listBoxMaps = new System.Windows.Forms.ListBox();
+            this.buttonAddMap = new System.Windows.Forms.Button();
+            this.comboBoxSelectorMap = new System.Windows.Forms.ComboBox();
+            this.textBoxNewMapName = new System.Windows.Forms.TextBox();
             this.groupBoxTools = new System.Windows.Forms.GroupBox();
             this.maskedTextBoxPosition = new System.Windows.Forms.MaskedTextBox();
             this.buttonRemoveHoistingCrane = new System.Windows.Forms.Button();
@@ -41,14 +46,87 @@
             this.buttonUp = new System.Windows.Forms.Button();
             this.buttonShowOnMap = new System.Windows.Forms.Button();
             this.buttonAddHoistingCrane = new System.Windows.Forms.Button();
-            this.comboBoxSelectorMap = new System.Windows.Forms.ComboBox();
             this.pictureBox = new System.Windows.Forms.PictureBox();
+            this.groupBoxMaps.SuspendLayout();
             this.groupBoxTools.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).BeginInit();
             this.SuspendLayout();
             // 
+            // groupBoxMaps
+            // 
+            this.groupBoxMaps.Controls.Add(this.buttonDeleteMap);
+            this.groupBoxMaps.Controls.Add(this.listBoxMaps);
+            this.groupBoxMaps.Controls.Add(this.buttonAddMap);
+            this.groupBoxMaps.Controls.Add(this.comboBoxSelectorMap);
+            this.groupBoxMaps.Controls.Add(this.textBoxNewMapName);
+            this.groupBoxMaps.Location = new System.Drawing.Point(13, 28);
+            this.groupBoxMaps.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.groupBoxMaps.Name = "groupBoxMaps";
+            this.groupBoxMaps.Padding = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.groupBoxMaps.Size = new System.Drawing.Size(229, 326);
+            this.groupBoxMaps.TabIndex = 11;
+            this.groupBoxMaps.TabStop = false;
+            this.groupBoxMaps.Text = "Карты";
+            // 
+            // buttonDeleteMap
+            // 
+            this.buttonDeleteMap.Location = new System.Drawing.Point(7, 271);
+            this.buttonDeleteMap.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.buttonDeleteMap.Name = "buttonDeleteMap";
+            this.buttonDeleteMap.Size = new System.Drawing.Size(200, 47);
+            this.buttonDeleteMap.TabIndex = 5;
+            this.buttonDeleteMap.Text = "Удалить карту";
+            this.buttonDeleteMap.UseVisualStyleBackColor = true;
+            this.buttonDeleteMap.Click += new System.EventHandler(this.buttonDeleteMap_Click);
+            // 
+            // listBoxMaps
+            // 
+            this.listBoxMaps.FormattingEnabled = true;
+            this.listBoxMaps.ItemHeight = 20;
+            this.listBoxMaps.Location = new System.Drawing.Point(7, 157);
+            this.listBoxMaps.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.listBoxMaps.Name = "listBoxMaps";
+            this.listBoxMaps.Size = new System.Drawing.Size(199, 104);
+            this.listBoxMaps.TabIndex = 4;
+            this.listBoxMaps.SelectedIndexChanged += new System.EventHandler(this.ListBoxMaps_SelectedIndexChanged);
+            // 
+            // buttonAddMap
+            // 
+            this.buttonAddMap.Location = new System.Drawing.Point(7, 107);
+            this.buttonAddMap.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.buttonAddMap.Name = "buttonAddMap";
+            this.buttonAddMap.Size = new System.Drawing.Size(200, 43);
+            this.buttonAddMap.TabIndex = 3;
+            this.buttonAddMap.Text = "Добавить карту";
+            this.buttonAddMap.UseVisualStyleBackColor = true;
+            this.buttonAddMap.Click += new System.EventHandler(this.buttonAddMap_Click_1);
+            // 
+            // 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(7, 68);
+            this.comboBoxSelectorMap.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.comboBoxSelectorMap.Name = "comboBoxSelectorMap";
+            this.comboBoxSelectorMap.Size = new System.Drawing.Size(200, 28);
+            this.comboBoxSelectorMap.TabIndex = 0;
+            this.comboBoxSelectorMap.SelectedIndexChanged += new System.EventHandler(this.ComboBoxSelectorMap_SelectedIndexChanged);
+
+            // 
+            // textBoxNewMapName
+            // 
+            this.textBoxNewMapName.Location = new System.Drawing.Point(7, 29);
+            this.textBoxNewMapName.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.textBoxNewMapName.Name = "textBoxNewMapName";
+            this.textBoxNewMapName.Size = new System.Drawing.Size(200, 27);
+            this.textBoxNewMapName.TabIndex = 0;
+            // 
             // groupBoxTools
             // 
+            this.groupBoxTools.Controls.Add(this.groupBoxMaps);
             this.groupBoxTools.Controls.Add(this.maskedTextBoxPosition);
             this.groupBoxTools.Controls.Add(this.buttonRemoveHoistingCrane);
             this.groupBoxTools.Controls.Add(this.buttonShowStorage);
@@ -58,29 +136,32 @@
             this.groupBoxTools.Controls.Add(this.buttonUp);
             this.groupBoxTools.Controls.Add(this.buttonShowOnMap);
             this.groupBoxTools.Controls.Add(this.buttonAddHoistingCrane);
-            this.groupBoxTools.Controls.Add(this.comboBoxSelectorMap);
             this.groupBoxTools.Dock = System.Windows.Forms.DockStyle.Right;
-            this.groupBoxTools.Location = new System.Drawing.Point(811, 0);
+            this.groupBoxTools.Location = new System.Drawing.Point(927, 0);
+            this.groupBoxTools.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.groupBoxTools.Name = "groupBoxTools";
-            this.groupBoxTools.Size = new System.Drawing.Size(204, 554);
+            this.groupBoxTools.Padding = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.groupBoxTools.Size = new System.Drawing.Size(233, 782);
             this.groupBoxTools.TabIndex = 0;
             this.groupBoxTools.TabStop = false;
             this.groupBoxTools.Text = "Инструменты";
             // 
             // maskedTextBoxPosition
             // 
-            this.maskedTextBoxPosition.Location = new System.Drawing.Point(17, 166);
+            this.maskedTextBoxPosition.Location = new System.Drawing.Point(21, 459);
+            this.maskedTextBoxPosition.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.maskedTextBoxPosition.Mask = "00";
             this.maskedTextBoxPosition.Name = "maskedTextBoxPosition";
-            this.maskedTextBoxPosition.Size = new System.Drawing.Size(175, 23);
+            this.maskedTextBoxPosition.Size = new System.Drawing.Size(199, 27);
             this.maskedTextBoxPosition.TabIndex = 2;
             this.maskedTextBoxPosition.ValidatingType = typeof(int);
             // 
             // buttonRemoveHoistingCrane
             // 
-            this.buttonRemoveHoistingCrane.Location = new System.Drawing.Point(17, 195);
+            this.buttonRemoveHoistingCrane.Location = new System.Drawing.Point(20, 494);
+            this.buttonRemoveHoistingCrane.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.buttonRemoveHoistingCrane.Name = "buttonRemoveHoistingCrane";
-            this.buttonRemoveHoistingCrane.Size = new System.Drawing.Size(175, 35);
+            this.buttonRemoveHoistingCrane.Size = new System.Drawing.Size(199, 47);
             this.buttonRemoveHoistingCrane.TabIndex = 3;
             this.buttonRemoveHoistingCrane.Text = "Удалить подъёмный кран";
             this.buttonRemoveHoistingCrane.UseVisualStyleBackColor = true;
@@ -88,9 +169,10 @@
             // 
             // buttonShowStorage
             // 
-            this.buttonShowStorage.Location = new System.Drawing.Point(17, 287);
+            this.buttonShowStorage.Location = new System.Drawing.Point(20, 549);
+            this.buttonShowStorage.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.buttonShowStorage.Name = "buttonShowStorage";
-            this.buttonShowStorage.Size = new System.Drawing.Size(175, 35);
+            this.buttonShowStorage.Size = new System.Drawing.Size(199, 47);
             this.buttonShowStorage.TabIndex = 4;
             this.buttonShowStorage.Text = "Посмотреть хранилище";
             this.buttonShowStorage.UseVisualStyleBackColor = true;
@@ -101,9 +183,10 @@
             this.buttonDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.buttonDown.BackgroundImage = global::HoistingCrane.Properties.Resources.down;
             this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonDown.Location = new System.Drawing.Point(91, 504);
+            this.buttonDown.Location = new System.Drawing.Point(104, 715);
+            this.buttonDown.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.buttonDown.Name = "buttonDown";
-            this.buttonDown.Size = new System.Drawing.Size(30, 30);
+            this.buttonDown.Size = new System.Drawing.Size(34, 40);
             this.buttonDown.TabIndex = 10;
             this.buttonDown.UseVisualStyleBackColor = true;
             this.buttonDown.Click += new System.EventHandler(this.ButtonMove_Click);
@@ -113,9 +196,10 @@
             this.buttonRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.buttonRight.BackgroundImage = global::HoistingCrane.Properties.Resources.right;
             this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonRight.Location = new System.Drawing.Point(127, 504);
+            this.buttonRight.Location = new System.Drawing.Point(145, 715);
+            this.buttonRight.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.buttonRight.Name = "buttonRight";
-            this.buttonRight.Size = new System.Drawing.Size(30, 30);
+            this.buttonRight.Size = new System.Drawing.Size(34, 40);
             this.buttonRight.TabIndex = 9;
             this.buttonRight.UseVisualStyleBackColor = true;
             this.buttonRight.Click += new System.EventHandler(this.ButtonMove_Click);
@@ -125,9 +209,10 @@
             this.buttonLeft.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.buttonLeft.BackgroundImage = global::HoistingCrane.Properties.Resources.left;
             this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonLeft.Location = new System.Drawing.Point(55, 504);
+            this.buttonLeft.Location = new System.Drawing.Point(63, 715);
+            this.buttonLeft.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.buttonLeft.Name = "buttonLeft";
-            this.buttonLeft.Size = new System.Drawing.Size(30, 30);
+            this.buttonLeft.Size = new System.Drawing.Size(34, 40);
             this.buttonLeft.TabIndex = 8;
             this.buttonLeft.UseVisualStyleBackColor = true;
             this.buttonLeft.Click += new System.EventHandler(this.ButtonMove_Click);
@@ -137,18 +222,20 @@
             this.buttonUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.buttonUp.BackgroundImage = global::HoistingCrane.Properties.Resources.up;
             this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonUp.Location = new System.Drawing.Point(91, 468);
+            this.buttonUp.Location = new System.Drawing.Point(104, 667);
+            this.buttonUp.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.buttonUp.Name = "buttonUp";
-            this.buttonUp.Size = new System.Drawing.Size(30, 30);
+            this.buttonUp.Size = new System.Drawing.Size(34, 40);
             this.buttonUp.TabIndex = 7;
             this.buttonUp.UseVisualStyleBackColor = true;
             this.buttonUp.Click += new System.EventHandler(this.ButtonMove_Click);
             // 
             // buttonShowOnMap
             // 
-            this.buttonShowOnMap.Location = new System.Drawing.Point(17, 391);
+            this.buttonShowOnMap.Location = new System.Drawing.Point(20, 604);
+            this.buttonShowOnMap.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.buttonShowOnMap.Name = "buttonShowOnMap";
-            this.buttonShowOnMap.Size = new System.Drawing.Size(175, 35);
+            this.buttonShowOnMap.Size = new System.Drawing.Size(193, 47);
             this.buttonShowOnMap.TabIndex = 5;
             this.buttonShowOnMap.Text = "Посмотреть карту";
             this.buttonShowOnMap.UseVisualStyleBackColor = true;
@@ -156,51 +243,41 @@
             // 
             // buttonAddHoistingCrane
             // 
-            this.buttonAddHoistingCrane.Location = new System.Drawing.Point(17, 106);
+            this.buttonAddHoistingCrane.Location = new System.Drawing.Point(20, 404);
-            this.buttonAddHoistingCrane.Name = "buttonAddWarship";
+            this.buttonAddHoistingCrane.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.buttonAddHoistingCrane.Size = new System.Drawing.Size(175, 35);
+            this.buttonAddHoistingCrane.Name = "buttonAddHoistingCrane";
+            this.buttonAddHoistingCrane.Size = new System.Drawing.Size(199, 47);
             this.buttonAddHoistingCrane.TabIndex = 1;
             this.buttonAddHoistingCrane.Text = "Добавить подъёмный кран";
             this.buttonAddHoistingCrane.UseVisualStyleBackColor = true;
             this.buttonAddHoistingCrane.Click += new System.EventHandler(this.ButtonAddHoistingCrane_Click);
             // 
-            // comboBoxSelectorMap
-            // 
-            this.comboBoxSelectorMap.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.comboBoxSelectorMap.FormattingEnabled = true;
-            this.comboBoxSelectorMap.Items.AddRange(new object[] {
-            "Первая карта",
-            "Вторая карта"});
-            this.comboBoxSelectorMap.Location = new System.Drawing.Point(17, 32);
-            this.comboBoxSelectorMap.Name = "comboBoxSelectorMap";
-            this.comboBoxSelectorMap.Size = new System.Drawing.Size(175, 23);
-            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.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.pictureBox.Name = "pictureBox";
-            this.pictureBox.Size = new System.Drawing.Size(811, 554);
+            this.pictureBox.Size = new System.Drawing.Size(927, 782);
             this.pictureBox.TabIndex = 1;
             this.pictureBox.TabStop = false;
-            this.pictureBox.Click += new System.EventHandler(this.pictureBox_Click);
             // 
             // FormMapWithSetHoistingCrane
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1015, 554);
+            this.ClientSize = new System.Drawing.Size(1160, 782);
             this.Controls.Add(this.pictureBox);
             this.Controls.Add(this.groupBoxTools);
+            this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.Name = "FormMapWithSetHoistingCrane";
             this.Text = "Карта с набором объектов";
+            this.groupBoxMaps.ResumeLayout(false);
+            this.groupBoxMaps.PerformLayout();
             this.groupBoxTools.ResumeLayout(false);
             this.groupBoxTools.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).EndInit();
             this.ResumeLayout(false);
-
         }
 
         #endregion
@@ -217,15 +294,10 @@
         private Button buttonShowStorage;
         private Button buttonRemoveHoistingCrane;
         private MaskedTextBox maskedTextBoxPosition;
-
+        private GroupBox groupBoxMaps;
-        #region Windows Form Designer generated code
+        private TextBox textBoxNewMapName;
-
+        private Button buttonDeleteMap;
-        /// <summary>
+        private ListBox listBoxMaps;
-        /// Required method for Designer support - do not modify
+        private Button buttonAddMap;
-        /// the contents of this method with the code editor.
-        /// </summary>
-
-
-        #endregion
     }
 }

HoistingCrane/HoistingCrane/FormMapWithSetHoistingCrane.cs

@@ -12,25 +12,63 @@ namespace HoistingCrane
 {
     public partial class FormMapWithSetHoistingCrane : Form
     {
-
+        /// Словарь для выпадающего списка
+        /// </summary>
+        private readonly Dictionary<string, AbstractMap> _mapsDict = new()
+        {
+            { "Простая карта", new SimpleMap() },
+            { "Вторая карта", new SecondMap() },
+        };
+        /// <summary>
+        /// Объект от коллекции карт
+        /// </summary>
+        private readonly MapsCollection _mapsCollection;
+        /// <summary>
         private MapWithSetHoistingCraneGeneric<DrawingObjectHoistingCrane, AbstractMap> _mapHoistingCraneCollectionGeneric;
-
         public FormMapWithSetHoistingCrane()
         {
             InitializeComponent();
+            _mapsCollection = new MapsCollection(pictureBox.Width, pictureBox.Height);
+            comboBoxSelectorMap.Items.Clear();
+            foreach (var elem in _mapsDict)
+            {
+                comboBoxSelectorMap.Items.Add(elem.Key);
+            }
+        }
+        /// <summary>
+        /// Заполнение listBoxMaps
+        /// </summary>
+        private void ReloadMaps()
+        {
+            int index = listBoxMaps.SelectedIndex;
+
+            listBoxMaps.Items.Clear();
+            for (int i = 0; i < _mapsCollection.Keys.Count; i++)
+            {
+                listBoxMaps.Items.Add(_mapsCollection.Keys[i]);
             }
 
+            if (listBoxMaps.Items.Count > 0 && (index == -1 || index >= listBoxMaps.Items.Count))
+            {
+                listBoxMaps.SelectedIndex = 0;
+            }
+            else if (listBoxMaps.Items.Count > 0 && index > -1 && index < listBoxMaps.Items.Count)
+            {
+                listBoxMaps.SelectedIndex = index;
+            }
+        }
         private void ComboBoxSelectorMap_SelectedIndexChanged(object sender, EventArgs e)
         {
             AbstractMap map = null;
             switch (comboBoxSelectorMap.Text)
             {
-                case "Первая карта":
+                case "Простая карта":
                     map = new SimpleMap();
                     break;
                 case "Вторая карта":
                     map = new SecondMap();
                     break;
+               
             }
             if (map != null)
             {
@@ -42,10 +80,51 @@ namespace HoistingCrane
                 _mapHoistingCraneCollectionGeneric = null;
             }
         }
+        /// <summary>
+        /// Добавление карты
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void buttonAddMap_Click_1(object sender, EventArgs e)
+        {
+            if (comboBoxSelectorMap.SelectedIndex == -1 || string.IsNullOrEmpty(textBoxNewMapName.Text))
+            {
+                MessageBox.Show("Не все данные заполнены", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                return;
+            }
+            if (!_mapsDict.ContainsKey(comboBoxSelectorMap.Text))
+            {
+                MessageBox.Show("Нет такой карты", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                return;
+            }
+            _mapsCollection.AddMap(textBoxNewMapName.Text, _mapsDict[comboBoxSelectorMap.Text]);
+            ReloadMaps();
+        }
+        private void ListBoxMaps_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
+        }
+        /// <summary>
+        /// Удаление карты
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void buttonDeleteMap_Click(object sender, EventArgs e)
+        {
+            if (listBoxMaps.SelectedIndex == -1)
+            {
+                return;
+            }
 
+            if (MessageBox.Show($"Удалить карту {listBoxMaps.SelectedItem}?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
+            {
+                _mapsCollection.DelMap(listBoxMaps.SelectedItem?.ToString() ?? string.Empty);
+                ReloadMaps();
+            }
+        }
         private void ButtonAddHoistingCrane_Click(object sender, EventArgs e)
         {
-            if (_mapHoistingCraneCollectionGeneric == null)
+            if (listBoxMaps.SelectedIndex == -1)
             {
                 return;
             }
@@ -53,10 +132,10 @@ namespace HoistingCrane
             if (form.ShowDialog() == DialogResult.OK)
             {
                 DrawingObjectHoistingCrane hoistingCrane = new(form.SelectedHoistingCrane);
-                if (_mapHoistingCraneCollectionGeneric + hoistingCrane == 1)
+                if (_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] + hoistingCrane != -1)
                 {
                     MessageBox.Show("Объект добавлен");
-                    pictureBox.Image = _mapHoistingCraneCollectionGeneric.ShowSet();
+                    pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
                 }
                 else
                 {
@@ -67,7 +146,7 @@ namespace HoistingCrane
 
         private void ButtonRemoveHoistingCrane_Click(object sender, EventArgs e)
         {
-            if (string.IsNullOrEmpty(maskedTextBoxPosition.Text))
+            if (listBoxMaps.SelectedIndex == -1)
             {
                 return;
             }
@@ -76,38 +155,36 @@ namespace HoistingCrane
                 return;
             }
             int pos = Convert.ToInt32(maskedTextBoxPosition.Text);
-            if (_mapHoistingCraneCollectionGeneric - pos == null)
+            if (_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] - pos != null)
             {
                 MessageBox.Show("Объект удален");
-                pictureBox.Image = _mapHoistingCraneCollectionGeneric.ShowSet();
+                pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
             }
             else
             {
                 MessageBox.Show("Не удалось удалить объект");
             }
         }
-
         private void ButtonShowStorage_Click(object sender, EventArgs e)
         {
-            if (_mapHoistingCraneCollectionGeneric == null)
+            if (listBoxMaps.SelectedIndex == -1)
             {
                 return;
             }
-            pictureBox.Image = _mapHoistingCraneCollectionGeneric.ShowSet();
+            pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
         }
-
         private void ButtonShowOnMap_Click(object sender, EventArgs e)
         {
-            if (_mapHoistingCraneCollectionGeneric == null)
+            if (listBoxMaps.SelectedIndex == -1)
             {
                 return;
             }
-            pictureBox.Image = _mapHoistingCraneCollectionGeneric.ShowOnMap();
+            pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowOnMap();
         }
 
         private void ButtonMove_Click(object sender, EventArgs e)
         {
-            if (_mapHoistingCraneCollectionGeneric == null)
+            if (listBoxMaps.SelectedIndex == -1)
             {
                 return;
             }
@@ -130,10 +207,5 @@ namespace HoistingCrane
             }
             pictureBox.Image = _mapHoistingCraneCollectionGeneric.MoveObject(enums);
         }
-
-        private void pictureBox_Click(object sender, EventArgs e)
-        {
-
-        }
     }
 }

HoistingCrane/HoistingCrane/MapWithSetHoistingCraneGeneric.cs

@@ -16,7 +16,6 @@ namespace HoistingCrane
         private readonly int _placeSizeHeight = 120;
         private readonly SetHoistingCraneGeneric<T> _setHoistingCrane;
         private readonly U _map;
-
         public MapWithSetHoistingCraneGeneric(int picWidth, int picHeight, U map)
         {
             int width = picWidth / _placeSizeWidth;
@@ -26,40 +25,31 @@ namespace HoistingCrane
             _pictureHeight = picHeight;
             _map = map;
         }
-
         public static int operator +(MapWithSetHoistingCraneGeneric<T, U> map, T bulldozer)
         {
             return map._setHoistingCrane.Insert(bulldozer);
         }
-
         public static T operator -(MapWithSetHoistingCraneGeneric<T, U> map, int position)
         {
             return map._setHoistingCrane.Remove(position);
         }
-
         public Bitmap ShowSet()
         {
             Bitmap bmp = new(_pictureWidth, _pictureWidth);
             Graphics gr = Graphics.FromImage(bmp);
             DrawBackground(gr);
-            DrawBulldozers(gr);
+            DrawHoistingCranes(gr);
             return bmp;
         }
-
         public Bitmap ShowOnMap()
         {
             Shaking();
-            for (int i = 0; i < _setHoistingCrane.Count; i++)
+            foreach (var hoistingCrane in _setHoistingCrane.GetHoistingCrane())
             {
-                var bulldozer = _setHoistingCrane.Get(i);
+                return _map.CreateMap(_pictureWidth, _pictureHeight, hoistingCrane);
-                if (bulldozer != null)
-                {
-                    return _map.CreateMap(_pictureWidth, _pictureHeight, bulldozer);
-                }
             }
             return new(_pictureWidth, _pictureHeight);
         }
-
         public Bitmap MoveObject(Direction direction)
         {
             if (_map != null)
@@ -68,17 +58,16 @@ namespace HoistingCrane
             }
             return new(_pictureWidth, _pictureHeight);
         }
-
         public void Shaking()
         {
             int j = _setHoistingCrane.Count - 1;
             for (int i = 0; i < _setHoistingCrane.Count; i++)
             {
-                if (_setHoistingCrane.Get(i) == null)
+                if (_setHoistingCrane[i] == null)
                 {
                     for (; j > i; j--)
                     {
-                        var warship = _setHoistingCrane.Get(j);
+                        var warship = _setHoistingCrane[j];
                         if (warship != null)
                         {
                             _setHoistingCrane.Insert(warship, i);
@@ -93,7 +82,6 @@ namespace HoistingCrane
                 }
             }
         }
-
         private void DrawBackground(Graphics gr)
         {
             Pen pen = new(Color.Black, 3);
@@ -107,7 +95,7 @@ namespace HoistingCrane
             }
         }
 
-        private void DrawBulldozers(Graphics gr)
+        private void DrawHoistingCranes(Graphics gr)
         {
             int heightEl = _pictureHeight / _placeSizeHeight;
             int widthEl = _pictureWidth / _placeSizeWidth;
@@ -120,9 +108,9 @@ namespace HoistingCrane
                 {
                     return;
                 }
-                _setHoistingCrane.Get(i)?.SetObject(curWidth * _placeSizeWidth + 10,
+                _setHoistingCrane[i]?.SetObject(curWidth * _placeSizeWidth + 10,
                     curHeight * _placeSizeHeight + 10, _pictureWidth, _pictureHeight);
-                _setHoistingCrane.Get(i)?.DrawingObject(gr);
+                _setHoistingCrane[i]?.DrawingObject(gr);
 
                 if (curWidth == 0)
                 {

HoistingCrane/HoistingCrane/MapsCollection.cs

@@ -0,0 +1,80 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace HoistingCrane
+{
+    internal class MapsCollection
+    {
+        /// <summary>
+        /// Словарь (хранилище) с картами
+        /// </summary>
+        readonly Dictionary<string, MapWithSetHoistingCraneGeneric<DrawingObjectHoistingCrane, AbstractMap>> _mapStorages;
+        /// <summary>
+        /// Возвращение списка названий карт
+        /// </summary>
+        public List<string> Keys => _mapStorages.Keys.ToList();
+        /// <summary>
+        /// Ширина окна отрисовки
+        /// </summary>
+        private readonly int _pictureWidth;
+        /// <summary>
+        /// Высота окна отрисовки
+        /// </summary>
+        private readonly int _pictureHeight;
+        /// <summary>
+        /// Конструктор
+        /// </summary>
+        /// <param name="pictureWidth"></param>
+        /// <param name="pictureHeight"></param>
+        public MapsCollection(int pictureWidth, int pictureHeight)
+        {
+            _mapStorages = new Dictionary<string, MapWithSetHoistingCraneGeneric<DrawingObjectHoistingCrane, AbstractMap>>();
+            _pictureWidth = pictureWidth;
+            _pictureHeight = pictureHeight;
+        }
+        /// <summary>
+        /// Добавление карты
+        /// </summary>
+        /// <param name="name">Название карты</param>
+        /// <param name="map">Карта</param>
+        public void AddMap(string name, AbstractMap map)
+        {
+            if (Keys.Contains(name)) return;
+            _mapStorages.Add(name, new(_pictureWidth, _pictureHeight, map));
+        }
+        /// <summary>
+        /// Удаление карты
+        /// </summary>
+        /// <param name="name">Название карты</param>
+        public void DelMap(string name)
+        {
+            if (_mapStorages.ContainsKey(name))
+            {
+                _mapStorages.Remove(name);
+            }
+        }
+        /// <summary>
+        /// Доступ к парковке
+        /// </summary>
+        /// <param name="ind"></param>
+        /// <returns></returns>
+        public MapWithSetHoistingCraneGeneric<DrawingObjectHoistingCrane, AbstractMap> this[string ind]
+        {
+            get
+            {
+                if (ind != String.Empty)
+                {
+                    MapWithSetHoistingCraneGeneric<DrawingObjectHoistingCrane, AbstractMap> value;
+                    if (_mapStorages.TryGetValue(ind, out value))
+                    {
+                        return value;
+                    }
+                }
+                return null;
+            }
+        }
+    }
+}

HoistingCrane/HoistingCrane/SetHoistingCraneGeneric.cs

@@ -9,56 +9,27 @@ namespace HoistingCrane
     internal class SetHoistingCraneGeneric<T>
         where T : class
     {
-        public readonly T[] _places;
+        private readonly List<T> _places;
-
+        public int Count => _places.Count;
-        public int Count => _places.Length;
+        private readonly int _maxCount;
-
         public SetHoistingCraneGeneric(int count)
         {
-            _places = new T[count];
+            _maxCount = count;
+            _places = new List<T>();
         }
-
         public int Insert(T hoistingCrane)
         {
             return Insert(hoistingCrane, 0);
         }
-
         public int Insert(T hoistingCrane, int position)
         {
-            int emptypos = -1;
+            if (position < 0 || position > Count || _maxCount == Count)
-            if (position >= Count && position < 0)
             {
                 return -1;
             }
-
+            _places.Insert(position, hoistingCrane);
-            if (_places[position] == null)
+            return position;
-            {
-                _places[position] = hoistingCrane;
-                return 1;
         }
-
-            for (int i = position; i < Count; i++)
-            {
-                if (_places[i] == null)
-                {
-                    emptypos = i;
-                    break;
-                }
-            }
-
-            if (emptypos != -1)
-            {
-                for (int i = emptypos; i > position; i--)
-                {
-                    _places[i] = _places[i - 1];
-                }
-                _places[position] = hoistingCrane;
-                return 1;
-            }
-
-            return -1;
-        }
-
         public T Remove(int position)
         {
             if (position < Count && position >= 0 && _places[position] != null)
@@ -70,14 +41,34 @@ namespace HoistingCrane
 
             return null;
         }
-
+        public T this[int position]
-        public T Get(int position)
         {
-            if (position >= Count && position < 0)
+            get
+            {
+                if (position >= 0 && position < Count)
                 {
-                return null;
-            }
                     return _places[position];
                 }
+                return null;
+            }
+            set
+            {
+                Insert(value, position);
+            }
+        }
+        public IEnumerable<T> GetHoistingCrane()
+        {
+            foreach (var hoistingcrane in _places)
+            {
+                if (hoistingcrane != null)
+                {
+                    yield return hoistingcrane;
+                }
+                else
+                {
+                    yield break;
+                }
+            }
+        }
     }
 }