Лабораторная 4

ProjectMachine/ProjectMachine/FormMapWithSetTank.Designer.cs

@@ -29,11 +29,16 @@
         private void InitializeComponent()
         {
             this.groupBoxTools = new System.Windows.Forms.GroupBox();
+            this.groupBoxMaps = new System.Windows.Forms.GroupBox();
+            this.listBoxMaps = new System.Windows.Forms.ListBox();
+            this.buttonAddMap = new System.Windows.Forms.Button();
+            this.buttonDeleteMap = new System.Windows.Forms.Button();
+            this.textBoxNewMapName = new System.Windows.Forms.TextBox();
+            this.comboBoxSelectorMap = new System.Windows.Forms.ComboBox();
             this.buttonLeft = new System.Windows.Forms.Button();
             this.buttonUp = new System.Windows.Forms.Button();
             this.buttonRight = new System.Windows.Forms.Button();
             this.buttonDown = new System.Windows.Forms.Button();
-            this.comboBoxSelectorMap = new System.Windows.Forms.ComboBox();
             this.buttonShowOnMap = new System.Windows.Forms.Button();
             this.buttonShowStorage = new System.Windows.Forms.Button();
             this.buttonRemoveTank = new System.Windows.Forms.Button();
@@ -41,35 +46,104 @@
             this.buttonAddTank = new System.Windows.Forms.Button();
             this.pictureBox = new System.Windows.Forms.PictureBox();
             this.groupBoxTools.SuspendLayout();
+            this.groupBoxMaps.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).BeginInit();
             this.SuspendLayout();
             // 
             // groupBoxTools
             // 
+            this.groupBoxTools.Controls.Add(this.groupBoxMaps);
             this.groupBoxTools.Controls.Add(this.buttonLeft);
             this.groupBoxTools.Controls.Add(this.buttonUp);
             this.groupBoxTools.Controls.Add(this.buttonRight);
             this.groupBoxTools.Controls.Add(this.buttonDown);
-            this.groupBoxTools.Controls.Add(this.comboBoxSelectorMap);
             this.groupBoxTools.Controls.Add(this.buttonShowOnMap);
             this.groupBoxTools.Controls.Add(this.buttonShowStorage);
             this.groupBoxTools.Controls.Add(this.buttonRemoveTank);
             this.groupBoxTools.Controls.Add(this.maskedTextBoxPosition);
             this.groupBoxTools.Controls.Add(this.buttonAddTank);
             this.groupBoxTools.Dock = System.Windows.Forms.DockStyle.Right;
-            this.groupBoxTools.Location = new System.Drawing.Point(807, 0);
+            this.groupBoxTools.Location = new System.Drawing.Point(819, 0);
             this.groupBoxTools.Name = "groupBoxTools";
-            this.groupBoxTools.Size = new System.Drawing.Size(233, 546);
+            this.groupBoxTools.Size = new System.Drawing.Size(233, 766);
             this.groupBoxTools.TabIndex = 0;
             this.groupBoxTools.TabStop = false;
             this.groupBoxTools.Text = "Инструменты";
             // 
+            // groupBoxMaps
+            // 
+            this.groupBoxMaps.Controls.Add(this.listBoxMaps);
+            this.groupBoxMaps.Controls.Add(this.buttonAddMap);
+            this.groupBoxMaps.Controls.Add(this.buttonDeleteMap);
+            this.groupBoxMaps.Controls.Add(this.textBoxNewMapName);
+            this.groupBoxMaps.Controls.Add(this.comboBoxSelectorMap);
+            this.groupBoxMaps.Location = new System.Drawing.Point(8, 27);
+            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(219, 331);
+            this.groupBoxMaps.TabIndex = 14;
+            this.groupBoxMaps.TabStop = false;
+            this.groupBoxMaps.Text = "Карты";
+            // 
+            // listBoxMaps
+            // 
+            this.listBoxMaps.FormattingEnabled = true;
+            this.listBoxMaps.ItemHeight = 20;
+            this.listBoxMaps.Location = new System.Drawing.Point(14, 165);
+            this.listBoxMaps.Name = "listBoxMaps";
+            this.listBoxMaps.Size = new System.Drawing.Size(198, 104);
+            this.listBoxMaps.TabIndex = 10;
+            this.listBoxMaps.SelectedIndexChanged += new System.EventHandler(this.ComboBoxSelectorMap_SelectedIndexChanged);
+            // 
+            // buttonAddMap
+            // 
+            this.buttonAddMap.Location = new System.Drawing.Point(13, 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, 47);
+            this.buttonAddMap.TabIndex = 2;
+            this.buttonAddMap.Text = "Добавить карту";
+            this.buttonAddMap.UseVisualStyleBackColor = true;
+            this.buttonAddMap.Click += new System.EventHandler(this.ButtonAddMap_Click);
+            // 
+            // buttonDeleteMap
+            // 
+            this.buttonDeleteMap.Location = new System.Drawing.Point(13, 275);
+            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 = 4;
+            this.buttonDeleteMap.Text = "Удалить карту";
+            this.buttonDeleteMap.UseVisualStyleBackColor = true;
+            this.buttonDeleteMap.Click += new System.EventHandler(this.ButtonDeleteMap_Click);
+            // 
+            // textBoxNewMapName
+            // 
+            this.textBoxNewMapName.Location = new System.Drawing.Point(13, 29);
+            this.textBoxNewMapName.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.textBoxNewMapName.Name = "textBoxNewMapName";
+            this.textBoxNewMapName.Size = new System.Drawing.Size(199, 27);
+            this.textBoxNewMapName.TabIndex = 0;
+            // 
+            // 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, 63);
+            this.comboBoxSelectorMap.Name = "comboBoxSelectorMap";
+            this.comboBoxSelectorMap.Size = new System.Drawing.Size(199, 28);
+            this.comboBoxSelectorMap.TabIndex = 9;
+            // 
             // buttonLeft
             // 
             this.buttonLeft.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.buttonLeft.BackgroundImage = global::ProjectMachine.Properties.Resources.лево;
             this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonLeft.Location = new System.Drawing.Point(69, 491);
+            this.buttonLeft.Location = new System.Drawing.Point(69, 711);
             this.buttonLeft.Name = "buttonLeft";
             this.buttonLeft.Size = new System.Drawing.Size(34, 30);
             this.buttonLeft.TabIndex = 13;
@@ -82,7 +156,7 @@
             this.buttonUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.buttonUp.BackgroundImage = global::ProjectMachine.Properties.Resources.вверх;
             this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonUp.Location = new System.Drawing.Point(105, 455);
+            this.buttonUp.Location = new System.Drawing.Point(105, 675);
             this.buttonUp.Name = "buttonUp";
             this.buttonUp.Size = new System.Drawing.Size(34, 30);
             this.buttonUp.TabIndex = 12;
@@ -95,7 +169,7 @@
             this.buttonRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.buttonRight.BackgroundImage = global::ProjectMachine.Properties.Resources.право;
             this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonRight.Location = new System.Drawing.Point(141, 491);
+            this.buttonRight.Location = new System.Drawing.Point(141, 711);
             this.buttonRight.Name = "buttonRight";
             this.buttonRight.Size = new System.Drawing.Size(34, 30);
             this.buttonRight.TabIndex = 11;
@@ -108,7 +182,7 @@
             this.buttonDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.buttonDown.BackgroundImage = global::ProjectMachine.Properties.Resources.вниз;
             this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonDown.Location = new System.Drawing.Point(105, 491);
+            this.buttonDown.Location = new System.Drawing.Point(105, 711);
             this.buttonDown.Name = "buttonDown";
             this.buttonDown.Size = new System.Drawing.Size(34, 30);
             this.buttonDown.TabIndex = 10;
@@ -116,22 +190,9 @@
             this.buttonDown.UseVisualStyleBackColor = true;
             this.buttonDown.Click += new System.EventHandler(this.ButtonMove_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(26, 35);
-            this.comboBoxSelectorMap.Name = "comboBoxSelectorMap";
-            this.comboBoxSelectorMap.Size = new System.Drawing.Size(199, 28);
-            this.comboBoxSelectorMap.TabIndex = 9;
-            this.comboBoxSelectorMap.SelectedIndexChanged += new System.EventHandler(this.ComboBoxSelectorMap_SelectedIndexChanged);
-            // 
             // buttonShowOnMap
             // 
-            this.buttonShowOnMap.Location = new System.Drawing.Point(25, 379);
+            this.buttonShowOnMap.Location = new System.Drawing.Point(21, 611);
             this.buttonShowOnMap.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.buttonShowOnMap.Name = "buttonShowOnMap";
             this.buttonShowOnMap.Size = new System.Drawing.Size(200, 47);
@@ -142,7 +203,7 @@
             // 
             // buttonShowStorage
             // 
-            this.buttonShowStorage.Location = new System.Drawing.Point(25, 291);
+            this.buttonShowStorage.Location = new System.Drawing.Point(21, 556);
             this.buttonShowStorage.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.buttonShowStorage.Name = "buttonShowStorage";
             this.buttonShowStorage.Size = new System.Drawing.Size(200, 47);
@@ -153,7 +214,7 @@
             // 
             // buttonRemoveTank
             // 
-            this.buttonRemoveTank.Location = new System.Drawing.Point(25, 205);
+            this.buttonRemoveTank.Location = new System.Drawing.Point(21, 501);
             this.buttonRemoveTank.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.buttonRemoveTank.Name = "buttonRemoveTank";
             this.buttonRemoveTank.Size = new System.Drawing.Size(200, 47);
@@ -164,7 +225,7 @@
             // 
             // maskedTextBoxPosition
             // 
-            this.maskedTextBoxPosition.Location = new System.Drawing.Point(26, 170);
+            this.maskedTextBoxPosition.Location = new System.Drawing.Point(21, 466);
             this.maskedTextBoxPosition.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.maskedTextBoxPosition.Mask = "00";
             this.maskedTextBoxPosition.Name = "maskedTextBoxPosition";
@@ -174,7 +235,7 @@
             // 
             // buttonAddTank
             // 
-            this.buttonAddTank.Location = new System.Drawing.Point(25, 82);
+            this.buttonAddTank.Location = new System.Drawing.Point(21, 411);
             this.buttonAddTank.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.buttonAddTank.Name = "buttonAddTank";
             this.buttonAddTank.Size = new System.Drawing.Size(200, 47);
@@ -188,7 +249,7 @@
             this.pictureBox.Dock = System.Windows.Forms.DockStyle.Fill;
             this.pictureBox.Location = new System.Drawing.Point(0, 0);
             this.pictureBox.Name = "pictureBox";
-            this.pictureBox.Size = new System.Drawing.Size(807, 546);
+            this.pictureBox.Size = new System.Drawing.Size(819, 766);
             this.pictureBox.TabIndex = 1;
             this.pictureBox.TabStop = false;
             // 
@@ -196,13 +257,15 @@
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1040, 546);
+            this.ClientSize = new System.Drawing.Size(1052, 766);
             this.Controls.Add(this.pictureBox);
             this.Controls.Add(this.groupBoxTools);
             this.Name = "FormMapWithSetTank";
             this.Text = "FormMapWithSetTank";
             this.groupBoxTools.ResumeLayout(false);
             this.groupBoxTools.PerformLayout();
+            this.groupBoxMaps.ResumeLayout(false);
+            this.groupBoxMaps.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).EndInit();
             this.ResumeLayout(false);
 
@@ -222,5 +285,10 @@
         private Button buttonUp;
         private Button buttonRight;
         private Button buttonDown;
+        private GroupBox groupBoxMaps;
+        private Button buttonAddMap;
+        private Button buttonDeleteMap;
+        private TextBox textBoxNewMapName;
+        private ListBox listBoxMaps;
     }
 }

ProjectMachine/ProjectMachine/FormMapWithSetTank.cs

@@ -13,15 +13,72 @@ namespace ProjectMachine
     public partial class FormMapWithSetTank : Form
     {
         /// <summary>
-        /// Объект от класса карты с набором объектов
+        /// Словарь для выпадающего списка
         /// </summary>
-        private MapWithSetTankGeneric<DrawningObject, AbstractMap> _mapTankCollectionGeneric;
+        private readonly Dictionary<string, AbstractMap> _mapsDict = new()
+        {
+            { "Простая карта", new SimpleMap() },
+            { "Город", new TownMap() }
+        };
+
+        /// <summary>
+        /// Объект от коллекции карт
+        /// </summary>
+        private readonly MapsCollection _mapsCollection;
         /// <summary>
         /// Конструктор
         /// </summary>
         public FormMapWithSetTank()
         {
             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;
+            }
+        }
+        /// <summary>
+        /// Добавление карты
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonAddMap_Click(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();
         }
         /// <summary>
         /// Выбор карты
@@ -30,24 +87,24 @@ namespace ProjectMachine
         /// <param name="e"></param>
         private void ComboBoxSelectorMap_SelectedIndexChanged(object sender, EventArgs e)
         {
-            AbstractMap map = null;
-            switch (comboBoxSelectorMap.Text)
+            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)
             {
-                case "Простая карта":
-                    map = new SimpleMap();
-                    break;
-                case "Город":
-                    map = new TownMap();
-                    break;
+                return;
             }
-            if (map != null)
+
+            if (MessageBox.Show($"Удалить карту {listBoxMaps.SelectedItem}?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
             {
-                _mapTankCollectionGeneric = new MapWithSetTankGeneric<DrawningObject, AbstractMap>(
-                    pictureBox.Width, pictureBox.Height, map);
-            }
-            else
-            {
-                _mapTankCollectionGeneric = null;
+                _mapsCollection.DelMap(listBoxMaps.SelectedItem?.ToString() ?? string.Empty);
+                ReloadMaps();
             }
         }
         /// <summary>
@@ -57,7 +114,7 @@ namespace ProjectMachine
         /// <param name="e"></param>
         private void ButtonAddTank_Click(object sender, EventArgs e)
         {
-            if (_mapTankCollectionGeneric == null)
+            if (listBoxMaps.SelectedIndex == -1)
             {
                 return;
             }
@@ -65,10 +122,10 @@ namespace ProjectMachine
             if (form.ShowDialog() == DialogResult.OK)
             {
                 DrawningObject tank = new(form.SelectedTank);
-                if ((_mapTankCollectionGeneric + tank) > -1)
+                if (_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] + tank!=null)
                 {
                     MessageBox.Show("Объект добавлен");
-                    pictureBox.Image = _mapTankCollectionGeneric.ShowSet();
+                    pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
                 }
                 else
                 {
@@ -83,6 +140,10 @@ namespace ProjectMachine
         /// <param name="e"></param>
         private void ButtonRemoveTank_Click(object sender, EventArgs e)
         {
+            if (listBoxMaps.SelectedIndex == -1)
+            {
+                return;
+            }
             if (string.IsNullOrEmpty(maskedTextBoxPosition.Text))
             {
                 return;
@@ -92,10 +153,10 @@ namespace ProjectMachine
                 return;
             }
             int pos = Convert.ToInt32(maskedTextBoxPosition.Text);
-            if ((_mapTankCollectionGeneric - pos) != null)
+            if (_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] - pos!=null)
             {
                 MessageBox.Show("Объект удален");
-                pictureBox.Image = _mapTankCollectionGeneric.ShowSet();
+                pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
             }
             else
             {
@@ -109,11 +170,11 @@ namespace ProjectMachine
         /// <param name="e"></param>
         private void ButtonShowStorage_Click(object sender, EventArgs e)
         {
-            if (_mapTankCollectionGeneric == null)
+            if (listBoxMaps.SelectedIndex == -1)
             {
                 return;
             }
-            pictureBox.Image = _mapTankCollectionGeneric.ShowSet();
+            pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
         }
         /// <summary>
         /// Вывод карты
@@ -122,11 +183,11 @@ namespace ProjectMachine
         /// <param name="e"></param>
         private void ButtonShowOnMap_Click(object sender, EventArgs e)
         {
-            if (_mapTankCollectionGeneric == null)
+            if (listBoxMaps.SelectedIndex == -1)
             {
                 return;
             }
-            pictureBox.Image = _mapTankCollectionGeneric.ShowOnMap();
+            pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowOnMap();
         }
         /// <summary>
         /// Перемещение
@@ -135,7 +196,7 @@ namespace ProjectMachine
         /// <param name="e"></param>
         private void ButtonMove_Click(object sender, EventArgs e)
         {
-            if (_mapTankCollectionGeneric == null)
+            if (listBoxMaps.SelectedIndex == -1)
             {
                 return;
             }
@@ -157,7 +218,7 @@ namespace ProjectMachine
                     dir = Direction.Right;
                     break;
             }
-            pictureBox.Image = _mapTankCollectionGeneric.MoveObject(dir);
+            pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].MoveObject(dir);
         }
     }
 }

ProjectMachine/ProjectMachine/MapWithSetTankGeneric.cs

@@ -94,13 +94,9 @@ namespace ProjectMachine
         public Bitmap ShowOnMap()
         {
             Shaking();
-            for (int i = 0; i < _setTank.Count; i++)
+            foreach (var tank in _setTank.GetTanks())
             {
-                var tank = _setTank.Get(i);
-                if (tank != null)
-                {
-                    return _map.CreateMap(_pictureWidth, _pictureHeight, tank);
-                }
+                return _map.CreateMap(_pictureWidth, _pictureHeight, tank);
             }
             return new(_pictureWidth, _pictureHeight);
         }
@@ -125,11 +121,11 @@ namespace ProjectMachine
             int j = _setTank.Count - 1;
             for (int i = 0; i < _setTank.Count; i++)
             {
-                if (_setTank.Get(i) == null)
+                if (_setTank[i] == null)
                 {
                     for (; j > i; j--)
                     {
-                        var car = _setTank.Get(j);
+                        var car = _setTank[j];
                         if (car != null)
                         {
                             _setTank.Insert(car, i);
@@ -170,21 +166,13 @@ namespace ProjectMachine
         /// <param name="g"></param>
         private void DrawTanks(Graphics g)
         {
-            int i = 0;
-            int j = 0;
-            for (int k = 0; k < _setTank.Count; k++)
+            int width = _pictureWidth / _placeSizeWidth;
+            int k = 0;
+            foreach (var tank in _setTank.GetTanks())
             {
-                _setTank.Get(k)?.SetObject(j + 10, i + 20, _pictureWidth, _pictureHeight);
-                _setTank.Get(k)?.DrawningObject(g);
-                if (j >= _pictureWidth - 2*_placeSizeWidth)
-                {
-                    j = 0;
-                    i += _placeSizeHeight;
-                }
-                else
-                {
-                    j += _placeSizeWidth;
-                }
+                tank.SetObject(k % width * _placeSizeWidth + 10, k / width * _placeSizeHeight + 20, _pictureWidth, _pictureHeight);
+                tank.DrawningObject(g);
+                k++;
             }
         }
     }

ProjectMachine/ProjectMachine/MapsCollection.cs

@@ -0,0 +1,80 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectMachine
+{
+    /// <summary>
+    /// Класс для хранения коллекции карт
+    /// </summary>
+    internal class MapsCollection
+    {
+        /// <summary>
+        /// Словарь (хранилище) с картами
+        /// </summary>
+        readonly Dictionary<string, MapWithSetTankGeneric<DrawningObject,
+       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,
+           MapWithSetTankGeneric<DrawningObject, 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))
+                _mapStorages.Add(name, new MapWithSetTankGeneric<DrawningObject, AbstractMap>(_pictureWidth, _pictureHeight, map));
+        }
+        /// <summary>
+        /// Удаление карты
+        /// </summary>
+        /// <param name="name">Название карты</param>
+        public void DelMap(string name)
+        {
+            if (Keys.Contains(name))
+                _mapStorages.Remove(name);
+        }
+        /// <summary>
+        /// Доступ к парковке
+        /// </summary>
+        /// <param name="ind"></param>
+        /// <returns></returns>
+        public MapWithSetTankGeneric<DrawningObject, AbstractMap> this[string
+       ind]
+        {
+            get
+            {
+                if (Keys.Contains(ind))
+                    return _mapStorages[ind];
+                return null;
+            }
+        }
+    }
+
+}
+

ProjectMachine/ProjectMachine/SetTankGeneric.cs

@@ -14,38 +14,33 @@ namespace ProjectMachine
         where T : class
     {
         /// <summary>
-        /// Массив объектов, которые храним
+        /// Список объектов, которые храним
         /// </summary>
-        private readonly T[] _places;
+        private readonly List<T> _places;
         /// <summary>
-        /// Количество объектов в массиве
+        /// Количество объектов в списке
         /// </summary>
-        public int Count => _places.Length;
+        public int Count => _places.Count;
+        private readonly int _maxCount; 
         /// <summary>
         /// Конструктор
         /// </summary>
         /// <param name="count"></param>
         public SetTankGeneric(int count)
         {
-            _places = new T[count];
+            _maxCount = count;
+            _places = new List<T>();
         }
         /// <summary>
         /// Добавление объекта в набор
         /// </summary>
-        /// <param name="car">Добавляемый танк</param>
+        /// <param name="tank">Добавляемый танк</param>
         /// <returns></returns>
         public int Insert(T tank)
         {
-            if (tank == null)
-            {
-                return -1;
-            }
-            for (int i = Count -1; i > 0; i--)
-            {
-                _places[i] = _places[i - 1];
-            }
-            _places[0] = tank;
-            return 0;
+            if (Count < _maxCount)
+                return Insert(tank, 0);
+            return -1;
         }
         /// <summary>
         /// Добавление объекта в набор на конкретную позицию
@@ -55,25 +50,10 @@ namespace ProjectMachine
         /// <returns></returns>
         public int Insert(T tank, int position)
         {
-            if (position < 0 || position > Count)
-            {
+            if (position < 0 || position >= _maxCount)
                 return -1;
-            }
-            int firstNullElementIndex = position; //индекс первого нулевого элемента
-            while(_places[firstNullElementIndex] != null)
-            {
-                if (firstNullElementIndex >= Count)
-                {
-                    return -1;
-                }
-                firstNullElementIndex++;
-            }
-            for (int i = firstNullElementIndex; i > position; i--)
-            {
-                _places[i] = _places[i - 1];
-            }
-            _places[position] = tank;
-            return 0;
+            _places.Insert(position, tank);
+            return position;
         }
         /// <summary>
         /// Удаление объекта из набора с конкретной позиции
@@ -82,12 +62,10 @@ namespace ProjectMachine
         /// <returns></returns>
         public T Remove(int position)
         {
-            if (_places[position] == null)
-            {
+            if (position < 0 || position >= Count)
                 return null;
-            }
             var result = _places[position];
-            _places[position] = null;
+            _places.RemoveAt(position);
             return result;
         }
         /// <summary>
@@ -95,15 +73,39 @@ namespace ProjectMachine
         /// </summary>
         /// <param name="position"></param>
         /// <returns></returns>
-        public T Get(int position)
+        public T this[int position]
         {
-            if (_places[position] != null)
+            get
             {
+                if (position < 0 || position >= Count)
+                    return null;
                 return _places[position];
             }
-            return null;
+            set
+            {
+                if (position < 0 || position >= _maxCount)
+                    return;
+                _places.Add(value);
+            }
+        }
+        /// <summary>
+        /// Проход по набору до первого пустого
+        /// </summary>
+        /// <returns></returns>
+        public IEnumerable<T> GetTanks()
+        {
+            foreach (var tank in _places)
+            {
+                if (tank != null)
+                {
+                    yield return tank;
+                }
+                else
+                {
+                    yield break;
+                }
+            }
         }
     }
-
 }