Изменения

WarmlyShip/WarmlyShip/Direction.cs

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

WarmlyShip/WarmlyShip/DrawningShip.cs

@@ -9,7 +9,7 @@ namespace WarmlyShip
     /// <summary>
     /// Класс, отвечающий за прорисовку и перемещение объекта-сущности
     /// </summary>
-    internal class DrawningShip
+    public class DrawningShip
     {
         /// <summary>>
         /// Класс-сущность

WarmlyShip/WarmlyShip/EntityShip.cs

@@ -10,7 +10,7 @@ namespace WarmlyShip
     /// Класс - сущность "Корабль"
     /// </summary>
 
-    internal class EntityShip
+    public class EntityShip
     {
         /// <summary>
         /// Скорость

WarmlyShip/WarmlyShip/FormMapWithSetWarmlyShip.Designer.cs

@@ -0,0 +1,277 @@
+namespace WarmlyShip
+{
+    partial class FormMapWithSetWarmlyShip
+    {
+        /// <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.groupBox1 = new System.Windows.Forms.GroupBox();
+            this.groupBoxMaps = new System.Windows.Forms.GroupBox();
+            this.listBoxMaps = new System.Windows.Forms.ListBox();
+            this.buttonDeleteMap = new System.Windows.Forms.Button();
+            this.buttonAddMap = new System.Windows.Forms.Button();
+            this.textBoxNewMapName = new System.Windows.Forms.TextBox();
+            this.comboBoxSelectorMap = new System.Windows.Forms.ComboBox();
+            this.buttonDown = new System.Windows.Forms.Button();
+            this.ButtonAddShip = new System.Windows.Forms.Button();
+            this.buttonUp = new System.Windows.Forms.Button();
+            this.buttonRight = new System.Windows.Forms.Button();
+            this.buttonLeft = new System.Windows.Forms.Button();
+            this.ButtonShowStorage = new System.Windows.Forms.Button();
+            this.ButtonShowOnMap = new System.Windows.Forms.Button();
+            this.maskedTextBoxPosition = new System.Windows.Forms.MaskedTextBox();
+            this.ButtonRemoveShip = new System.Windows.Forms.Button();
+            this.pictureBox1 = new System.Windows.Forms.PictureBox();
+            this.groupBox1.SuspendLayout();
+            this.groupBoxMaps.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // groupBox1
+            // 
+            this.groupBox1.Controls.Add(this.groupBoxMaps);
+            this.groupBox1.Controls.Add(this.buttonDown);
+            this.groupBox1.Controls.Add(this.ButtonAddShip);
+            this.groupBox1.Controls.Add(this.buttonUp);
+            this.groupBox1.Controls.Add(this.buttonRight);
+            this.groupBox1.Controls.Add(this.buttonLeft);
+            this.groupBox1.Controls.Add(this.ButtonShowStorage);
+            this.groupBox1.Controls.Add(this.ButtonShowOnMap);
+            this.groupBox1.Controls.Add(this.maskedTextBoxPosition);
+            this.groupBox1.Controls.Add(this.ButtonRemoveShip);
+            this.groupBox1.Dock = System.Windows.Forms.DockStyle.Right;
+            this.groupBox1.Location = new System.Drawing.Point(593, 0);
+            this.groupBox1.Name = "groupBox1";
+            this.groupBox1.Size = new System.Drawing.Size(200, 582);
+            this.groupBox1.TabIndex = 1;
+            this.groupBox1.TabStop = false;
+            this.groupBox1.Text = "Инструменты";
+            // 
+            // groupBoxMaps
+            // 
+            this.groupBoxMaps.Controls.Add(this.listBoxMaps);
+            this.groupBoxMaps.Controls.Add(this.buttonDeleteMap);
+            this.groupBoxMaps.Controls.Add(this.buttonAddMap);
+            this.groupBoxMaps.Controls.Add(this.textBoxNewMapName);
+            this.groupBoxMaps.Controls.Add(this.comboBoxSelectorMap);
+            this.groupBoxMaps.Location = new System.Drawing.Point(6, 22);
+            this.groupBoxMaps.Name = "groupBoxMaps";
+            this.groupBoxMaps.Size = new System.Drawing.Size(188, 209);
+            this.groupBoxMaps.TabIndex = 12;
+            this.groupBoxMaps.TabStop = false;
+            this.groupBoxMaps.Text = "Карты";
+            // 
+            // listBoxMaps
+            // 
+            this.listBoxMaps.FormattingEnabled = true;
+            this.listBoxMaps.ItemHeight = 15;
+            this.listBoxMaps.Location = new System.Drawing.Point(6, 109);
+            this.listBoxMaps.Name = "listBoxMaps";
+            this.listBoxMaps.Size = new System.Drawing.Size(176, 64);
+            this.listBoxMaps.TabIndex = 7;
+            // 
+            // buttonDeleteMap
+            // 
+            this.buttonDeleteMap.Location = new System.Drawing.Point(6, 180);
+            this.buttonDeleteMap.Name = "buttonDeleteMap";
+            this.buttonDeleteMap.Size = new System.Drawing.Size(176, 23);
+            this.buttonDeleteMap.TabIndex = 6;
+            this.buttonDeleteMap.Text = "Удалить карту";
+            this.buttonDeleteMap.UseVisualStyleBackColor = true;
+            this.buttonDeleteMap.Click += new System.EventHandler(this.ButtonDeleteMap_Click);
+            // 
+            // buttonAddMap
+            // 
+            this.buttonAddMap.Location = new System.Drawing.Point(6, 80);
+            this.buttonAddMap.Name = "buttonAddMap";
+            this.buttonAddMap.Size = new System.Drawing.Size(176, 23);
+            this.buttonAddMap.TabIndex = 5;
+            this.buttonAddMap.Text = "Добавить карту";
+            this.buttonAddMap.UseVisualStyleBackColor = true;
+            this.buttonAddMap.Click += new System.EventHandler(this.ButtonAddMap_Click);
+            // 
+            // textBoxNewMapName
+            // 
+            this.textBoxNewMapName.Location = new System.Drawing.Point(6, 22);
+            this.textBoxNewMapName.Name = "textBoxNewMapName";
+            this.textBoxNewMapName.Size = new System.Drawing.Size(176, 23);
+            this.textBoxNewMapName.TabIndex = 0;
+            // 
+            // comboBoxSelectorMap
+            // 
+            this.comboBoxSelectorMap.FormattingEnabled = true;
+            this.comboBoxSelectorMap.Items.AddRange(new object[] {
+            "Простая карта",
+            "Море"});
+            this.comboBoxSelectorMap.Location = new System.Drawing.Point(6, 51);
+            this.comboBoxSelectorMap.Name = "comboBoxSelectorMap";
+            this.comboBoxSelectorMap.Size = new System.Drawing.Size(176, 23);
+            this.comboBoxSelectorMap.TabIndex = 4;
+            // 
+            // buttonDown
+            // 
+            this.buttonDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.buttonDown.BackgroundImage = global::WarmlyShip.Properties.Resources.Down;
+            this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.buttonDown.Location = new System.Drawing.Point(96, 536);
+            this.buttonDown.Name = "buttonDown";
+            this.buttonDown.Size = new System.Drawing.Size(30, 30);
+            this.buttonDown.TabIndex = 11;
+            this.buttonDown.UseVisualStyleBackColor = true;
+            this.buttonDown.Click += new System.EventHandler(this.ButtonMove_Click);
+            // 
+            // ButtonAddShip
+            // 
+            this.ButtonAddShip.Location = new System.Drawing.Point(12, 298);
+            this.ButtonAddShip.Name = "ButtonAddShip";
+            this.ButtonAddShip.Size = new System.Drawing.Size(176, 25);
+            this.ButtonAddShip.TabIndex = 2;
+            this.ButtonAddShip.Text = "Добавить корабль";
+            this.ButtonAddShip.UseVisualStyleBackColor = true;
+            this.ButtonAddShip.Click += new System.EventHandler(this.ButtonAddShip_Click);
+            // 
+            // buttonUp
+            // 
+            this.buttonUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.buttonUp.BackgroundImage = global::WarmlyShip.Properties.Resources.Up;
+            this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.buttonUp.Location = new System.Drawing.Point(96, 500);
+            this.buttonUp.Name = "buttonUp";
+            this.buttonUp.Size = new System.Drawing.Size(30, 30);
+            this.buttonUp.TabIndex = 10;
+            this.buttonUp.UseVisualStyleBackColor = true;
+            this.buttonUp.Click += new System.EventHandler(this.ButtonMove_Click);
+            // 
+            // buttonRight
+            // 
+            this.buttonRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.buttonRight.BackgroundImage = global::WarmlyShip.Properties.Resources.Right;
+            this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.buttonRight.Location = new System.Drawing.Point(132, 536);
+            this.buttonRight.Name = "buttonRight";
+            this.buttonRight.Size = new System.Drawing.Size(30, 30);
+            this.buttonRight.TabIndex = 9;
+            this.buttonRight.UseVisualStyleBackColor = true;
+            this.buttonRight.Click += new System.EventHandler(this.ButtonMove_Click);
+            // 
+            // buttonLeft
+            // 
+            this.buttonLeft.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.buttonLeft.BackgroundImage = global::WarmlyShip.Properties.Resources.Left;
+            this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.buttonLeft.Location = new System.Drawing.Point(60, 536);
+            this.buttonLeft.Name = "buttonLeft";
+            this.buttonLeft.Size = new System.Drawing.Size(30, 30);
+            this.buttonLeft.TabIndex = 8;
+            this.buttonLeft.UseVisualStyleBackColor = true;
+            this.buttonLeft.Click += new System.EventHandler(this.ButtonMove_Click);
+            // 
+            // ButtonShowStorage
+            // 
+            this.ButtonShowStorage.Location = new System.Drawing.Point(12, 402);
+            this.ButtonShowStorage.Name = "ButtonShowStorage";
+            this.ButtonShowStorage.Size = new System.Drawing.Size(176, 23);
+            this.ButtonShowStorage.TabIndex = 7;
+            this.ButtonShowStorage.Text = "Посмотреть хранилище";
+            this.ButtonShowStorage.UseVisualStyleBackColor = true;
+            this.ButtonShowStorage.Click += new System.EventHandler(this.ButtonShowStorage_Click);
+            // 
+            // ButtonShowOnMap
+            // 
+            this.ButtonShowOnMap.Location = new System.Drawing.Point(12, 431);
+            this.ButtonShowOnMap.Name = "ButtonShowOnMap";
+            this.ButtonShowOnMap.Size = new System.Drawing.Size(176, 23);
+            this.ButtonShowOnMap.TabIndex = 6;
+            this.ButtonShowOnMap.Text = "Посмотреть карту";
+            this.ButtonShowOnMap.UseVisualStyleBackColor = true;
+            this.ButtonShowOnMap.Click += new System.EventHandler(this.ButtonShowOnMap_Click);
+            // 
+            // maskedTextBoxPosition
+            // 
+            this.maskedTextBoxPosition.Location = new System.Drawing.Point(12, 329);
+            this.maskedTextBoxPosition.Mask = "00";
+            this.maskedTextBoxPosition.Name = "maskedTextBoxPosition";
+            this.maskedTextBoxPosition.Size = new System.Drawing.Size(176, 23);
+            this.maskedTextBoxPosition.TabIndex = 5;
+            // 
+            // ButtonRemoveShip
+            // 
+            this.ButtonRemoveShip.Location = new System.Drawing.Point(12, 358);
+            this.ButtonRemoveShip.Name = "ButtonRemoveShip";
+            this.ButtonRemoveShip.Size = new System.Drawing.Size(176, 25);
+            this.ButtonRemoveShip.TabIndex = 3;
+            this.ButtonRemoveShip.Text = "Удалить корабль";
+            this.ButtonRemoveShip.UseVisualStyleBackColor = true;
+            this.ButtonRemoveShip.Click += new System.EventHandler(this.ButtonRemoveShip_Click);
+            // 
+            // pictureBox1
+            // 
+            this.pictureBox1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.pictureBox1.Location = new System.Drawing.Point(0, 0);
+            this.pictureBox1.Name = "pictureBox1";
+            this.pictureBox1.Size = new System.Drawing.Size(593, 582);
+            this.pictureBox1.TabIndex = 0;
+            this.pictureBox1.TabStop = false;
+            // 
+            // FormMapWithSetWarmlyShip
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(793, 582);
+            this.Controls.Add(this.pictureBox1);
+            this.Controls.Add(this.groupBox1);
+            this.Name = "FormMapWithSetWarmlyShip";
+            this.Text = "FormMapWithSetWarmlyShip";
+            this.groupBox1.ResumeLayout(false);
+            this.groupBox1.PerformLayout();
+            this.groupBoxMaps.ResumeLayout(false);
+            this.groupBoxMaps.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private GroupBox groupBox1;
+        private PictureBox pictureBox1;
+        private ComboBox comboBoxSelectorMap;
+        private Button ButtonRemoveShip;
+        private Button ButtonAddShip;
+        private MaskedTextBox maskedTextBoxPosition;
+        private Button ButtonShowOnMap;
+        private Button ButtonShowStorage;
+        private Button buttonDown;
+        private Button buttonUp;
+        private Button buttonRight;
+        private Button buttonLeft;
+        private GroupBox groupBoxMaps;
+        private ListBox listBoxMaps;
+        private Button buttonDeleteMap;
+        private Button buttonAddMap;
+        private TextBox textBoxNewMapName;
+    }
+}

WarmlyShip/WarmlyShip/FormMapWithSetWarmlyShip.cs

@@ -0,0 +1,266 @@
+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;
+using static System.Windows.Forms.DataFormats;
+
+namespace WarmlyShip
+{
+    public partial class FormMapWithSetWarmlyShip : Form
+    {
+        /// <summary>
+        /// Словарь для выпадающего списка
+        /// </summary>
+        private readonly Dictionary<string, AbstractMap> _mapsDict = new()
+        {
+            { "Простая карта", new SimpleMap() },
+            { "Море", new MyMap() }
+        };
+        /// <summary>
+        /// Объект от коллекции карт
+        /// </summary>
+        private readonly MapsCollection _mapsCollection;
+       
+
+        ///// <summary>
+        ///// Объект от класса карты с набором объектов
+        ///// </summary>
+        //private MapWithSetWarmlyShipGeneric<DrawningObjectShip, AbstractMap> _mapWarmlyShipCollectionGeneric;
+        
+
+        /// <summary>
+        /// Конструктор
+        /// </summary>
+        public FormMapWithSetWarmlyShip()
+        {
+            InitializeComponent();
+            _mapsCollection = new MapsCollection(pictureBox1.Width, pictureBox1.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>
+        /// Выбор карты
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ListBoxMaps_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            pictureBox1.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
+        }
+
+        ///// <summary>
+        ///// Выбор карты
+        ///// </summary>
+        ///// <param name="sender"></param>
+        ///// <param name="e"></param>
+        //private void ComboBoxSelectorShip_SelectedIndexChanged(object sender, EventArgs e)
+        //{
+        //    AbstractMap map = null;
+        //    switch (comboBoxSelectorMap.Text)
+        //    {
+        //        case "Простая карта":
+        //            map = new SimpleMap();
+        //            break;
+        //        case "Море":
+        //            map = new MyMap();
+        //            break;
+        //    }
+        //    if (map != null)
+        //    {
+        //        _mapWarmlyShipCollectionGeneric = new MapWithSetWarmlyShipGeneric<DrawningObjectShip, AbstractMap>(
+        //            pictureBox1.Width, pictureBox1.Height, map);
+        //    }
+        //    else
+        //    {
+        //        _mapWarmlyShipCollectionGeneric = null;
+        //    }
+
+        //}
+
+        /// <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();
+            }
+        }
+        /// <summary>
+        /// Добавление объекта
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonAddShip_Click(object sender, EventArgs e)
+        {
+            if (listBoxMaps.SelectedIndex == -1)
+            {
+                return;
+            }
+            FormShip form = new();
+            if (form.ShowDialog() == DialogResult.OK)
+            {
+                DrawningObjectShip ship = new(form.SelectedShip);
+                if (_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] + ship!=null)
+                {
+                    MessageBox.Show("Объект добавлен");
+                    pictureBox1.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
+                }
+                else
+                {
+                    MessageBox.Show("Не удалось добавить объект");
+                }
+            }
+
+        }
+
+        /// <summary>
+        /// Удаление объекта
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonRemoveShip_Click(object sender, EventArgs e)
+        {
+            if (listBoxMaps.SelectedIndex == -1)
+            {
+                return;
+            }
+            if (string.IsNullOrEmpty(maskedTextBoxPosition.Text))
+            {
+                return;
+            }
+            if (MessageBox.Show("Удалить объект?", "Удаление",
+           MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
+            {
+                return;
+            }
+            int pos = Convert.ToInt32(maskedTextBoxPosition.Text);
+            if (_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] - pos != null)
+            {
+                MessageBox.Show("Объект удален");
+                pictureBox1.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet(); ;
+            }
+            else
+            {
+                MessageBox.Show("Не удалось удалить объект");
+            }
+        }
+
+        /// <summary>
+        /// Вывод набора
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonShowStorage_Click(object sender, EventArgs e)
+        {
+            if (listBoxMaps.SelectedIndex == -1)
+            {
+                return;
+            }
+            pictureBox1.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
+        }
+
+        /// <summary>
+        /// Вывод карты
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonShowOnMap_Click(object sender, EventArgs e)
+        {
+            if (listBoxMaps.SelectedIndex == -1)
+            {
+                return;
+            }
+            pictureBox1.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowOnMap();
+        }
+
+        /// <summary>
+        /// Перемещение
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonMove_Click(object sender, EventArgs e)
+        {
+            if (listBoxMaps.SelectedIndex == -1)
+            {
+                return;
+            }
+            //получаем имя кнопки
+            string name = ((Button)sender)?.Name ?? string.Empty;
+            Direction dir = Direction.None;
+            switch (name)
+            {
+                case "buttonUp":
+                    dir = Direction.Up;
+                    break;
+                case "buttonDown":
+                    dir = Direction.Down;
+                    break;
+                case "buttonLeft":
+                    dir = Direction.Left;
+                    break;
+                case "buttonRight":
+                    dir = Direction.Right;
+                    break;
+            }
+
+            pictureBox1.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].MoveObject(dir);
+        }
+    }
+}

WarmlyShip/WarmlyShip/FormMapWithSetWarmlyShip.resx

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

WarmlyShip/WarmlyShip/FormShip.Designer.cs

@@ -39,6 +39,7 @@
             this.buttonRight = new System.Windows.Forms.Button();
             this.buttonLeft = new System.Windows.Forms.Button();
             this.buttonCreateModif = new System.Windows.Forms.Button();
+            this.buttonSelectShip = new System.Windows.Forms.Button();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBoxShip)).BeginInit();
             this.statusStrip1.SuspendLayout();
             this.SuspendLayout();
@@ -153,11 +154,22 @@
             this.buttonCreateModif.UseVisualStyleBackColor = true;
             this.buttonCreateModif.Click += new System.EventHandler(this.ButtonCreateModif_Click);
             // 
+            // buttonSelectShip
+            // 
+            this.buttonSelectShip.Location = new System.Drawing.Point(611, 403);
+            this.buttonSelectShip.Name = "buttonSelectShip";
+            this.buttonSelectShip.Size = new System.Drawing.Size(75, 23);
+            this.buttonSelectShip.TabIndex = 8;
+            this.buttonSelectShip.Text = "Выбрать";
+            this.buttonSelectShip.UseVisualStyleBackColor = true;
+            this.buttonSelectShip.Click += new System.EventHandler(this.buttonSelectShip_Click);
+            // 
             // FormShip
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(824, 462);
+            this.Controls.Add(this.buttonSelectShip);
             this.Controls.Add(this.buttonCreateModif);
             this.Controls.Add(this.buttonLeft);
             this.Controls.Add(this.buttonRight);
@@ -189,5 +201,6 @@
         private Button buttonRight;
         private Button buttonLeft;
         private Button buttonCreateModif;
+        private Button buttonSelectShip;
     }
 }

WarmlyShip/WarmlyShip/FormShip.cs

@@ -5,6 +5,10 @@ namespace WarmlyShip
     public partial class FormShip : Form
     {
         private DrawningShip _ship;
+        /// <summary>
+        /// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+        /// </summary>
+        public DrawningShip SelectedShip { get; private set; }
 
         public FormShip()
         {
@@ -50,7 +54,6 @@ namespace WarmlyShip
         /// <param name="e"></param>
         private void ButtonMove_Click(object sender, EventArgs e)
         {
-            //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
             string name = ((Button)sender)?.Name ?? string.Empty;
             switch (name)
             {
@@ -68,6 +71,7 @@ namespace WarmlyShip
                     break;
             }
             Draw();
+
         }
         /// <summary>
         /// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>
@@ -94,5 +98,11 @@ namespace WarmlyShip
             SetData();
             Draw();
         }
+
+        private void buttonSelectShip_Click(object sender, EventArgs e)
+        {
+            SelectedShip = _ship;
+            DialogResult = DialogResult.OK;
+        }
     }
 }

WarmlyShip/WarmlyShip/MapWithSetWarmlyShipGeneric.cs

@@ -0,0 +1,178 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WarmlyShip
+{
+    /// <summary>
+    /// Карта с набром объектов под нее
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <typeparam name="U"></typeparam>
+    internal class MapWithSetWarmlyShipGeneric<T, U>
+        where T : class, IDrawningObject
+        where U : AbstractMap
+    {
+        /// <summary>
+        /// Ширина окна отрисовки
+        /// </summary>
+        private readonly int _pictureWidth;
+        /// <summary>
+        /// Высота окна отрисовки
+        /// </summary>
+        private readonly int _pictureHeight;
+        /// <summary>
+        /// Размер занимаемого объектом места (ширина)
+        /// </summary>
+        private readonly int _placeSizeWidth = 140;
+        /// <summary>
+        /// Размер занимаемого объектом места (высота)
+        /// </summary>
+        private readonly int _placeSizeHeight = 80;
+        /// <summary>
+        /// Набор объектов
+        /// </summary>
+        private readonly SetWarmlyShipGeneric<T> _setWarmlyShip;
+        /// <summary>
+        /// Карта
+        /// </summary>
+        private readonly U _map;
+        /// <summary>
+        /// Конструктор
+        /// </summary>
+        /// <param name="picWidth"></param>
+        /// <param name="picHeight"></param>
+        /// <param name="map"></param>
+        public MapWithSetWarmlyShipGeneric(int picWidth, int picHeight, U map)
+        {
+            int width = picWidth / _placeSizeWidth;
+            int height = picHeight / _placeSizeHeight;
+            _setWarmlyShip = new SetWarmlyShipGeneric<T>(width * height);
+            _pictureWidth = picWidth;
+            _pictureHeight = picHeight;
+            _map = map;
+        }
+        /// <summary>
+        /// Перегрузка оператора сложения
+        /// </summary>
+        /// <param name="map"></param>
+        /// <param name="car"></param>
+        /// <returns></returns>
+        public static int operator +(MapWithSetWarmlyShipGeneric<T, U> map, T ship)
+        {
+            return map._setWarmlyShip.Insert(ship);
+        }
+        /// <summary>
+        /// Перегрузка оператора вычитания
+        /// </summary>
+        /// <param name="map"></param>
+        /// <param name="position"></param>
+        /// <returns></returns>
+        public static T operator -(MapWithSetWarmlyShipGeneric<T, U> map, int position)
+        {
+            return map._setWarmlyShip.Remove(position);
+        }
+        /// <summary>
+        /// Вывод всего набора объектов
+        /// </summary>
+        /// <returns></returns>
+        public Bitmap ShowSet()
+        {
+            Bitmap bmp = new(_pictureWidth, _pictureHeight);
+            Graphics gr = Graphics.FromImage(bmp);
+            DrawBackground(gr);
+            DrawWarmlyShip(gr);
+            return bmp;
+        }
+        /// <summary>
+        /// Просмотр объекта на карте
+        /// </summary>
+        /// <returns></returns>
+        public Bitmap ShowOnMap()
+        {
+            Shaking();
+            foreach (var ship in _setWarmlyShip.GetShip())
+            {
+                return _map.CreateMap(_pictureWidth, _pictureHeight, ship);
+            }
+
+            return new(_pictureWidth, _pictureHeight);
+        }
+        /// <summary>
+        /// Перемещение объекта по крате
+        /// </summary>
+        /// <param name="direction"></param>
+        /// <returns></returns>
+        public Bitmap MoveObject(Direction direction)
+        {
+            if (_map != null)
+            {
+                return _map.MoveObject(direction);
+            }
+            return new(_pictureWidth, _pictureHeight);
+        }
+        /// <summary>
+        /// "Взбалтываем" набор, чтобы все элементы оказались в начале
+        /// </summary>
+        private void Shaking()
+        {
+            int j = _setWarmlyShip.Count - 1;
+            for (int i = 0; i < _setWarmlyShip.Count; i++)
+            {
+                if (_setWarmlyShip[i] == null)
+                {
+                    for (; j > i; j--)
+                    {
+                        var car = _setWarmlyShip[j];
+                        if (car != null)
+                        {
+                            _setWarmlyShip.Insert(car, i);
+                            _setWarmlyShip.Remove(j);
+                            break;
+                        }
+                    }
+                    if (j <= i)
+                    {
+                        return;
+                    }
+                }
+            }
+        }
+        /// <summary>
+        /// Метод отрисовки фона
+        /// </summary>
+        /// <param name="g"></param>
+        private void DrawBackground(Graphics g)
+        {
+            Pen pen = new(Color.Black, 3);
+            for (int i = 0; i < _pictureWidth / _placeSizeWidth; i++)
+            {
+                for (int j = 0; j < _pictureHeight / _placeSizeHeight + 1; ++j)
+                {
+                    g.DrawLine(pen, i * _placeSizeWidth, j * _placeSizeHeight, i *
+                   _placeSizeWidth + _placeSizeWidth / 2 , j * _placeSizeHeight);
+                }
+                g.DrawLine(pen, i * _placeSizeWidth, 0, i * _placeSizeWidth,
+               (_pictureHeight / _placeSizeHeight) * _placeSizeHeight);
+            }
+        }
+        /// <summary>
+        /// Метод прорисовки объектов
+        /// </summary>
+        /// <param name="g"></param>
+        private void DrawWarmlyShip(Graphics g)
+        {
+            int width = _pictureWidth / _placeSizeWidth;
+            int k = 0;
+            foreach (var ship in _setWarmlyShip.GetShip())
+            {
+                ship.SetObject(k % width * _placeSizeWidth + 10, k / width * _placeSizeHeight + 20, _pictureWidth, _pictureHeight);
+                ship.DrawningObject(g);
+                k++;
+            }
+
+        }
+    }
+}

WarmlyShip/WarmlyShip/MapsCollection.cs

@@ -0,0 +1,76 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WarmlyShip
+{
+    /// <summary>
+    /// Класс для хранения коллекции карт
+    /// </summary>
+    internal class MapsCollection
+    {
+        /// <summary>
+        /// Словарь (хранилище) с картами
+        /// </summary>
+        readonly Dictionary<string, MapWithSetWarmlyShipGeneric<DrawningObjectShip, 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, MapWithSetWarmlyShipGeneric<DrawningObjectShip, 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 MapWithSetWarmlyShipGeneric<DrawningObjectShip, 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 MapWithSetWarmlyShipGeneric<DrawningObjectShip, AbstractMap> this[string
+       ind]
+        {
+            get
+            {
+                if (Keys.Contains(ind))
+                    return _mapStorages[ind];
+                return null;
+            }
+        }
+    }
+}

WarmlyShip/WarmlyShip/Program.cs

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

WarmlyShip/WarmlyShip/SetWarmlyShipGeneric.cs

@@ -0,0 +1,114 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WarmlyShip
+{
+    /// <summary>
+    /// Параметризованный набор объектов
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    internal class SetWarmlyShipGeneric<T>
+        where T : class
+    {
+        /// <summary>
+        /// Список объектов, которые храним
+        /// </summary>
+        private readonly List<T> _places;
+        /// <summary>
+        /// Количество объектов в списке
+        /// </summary>
+        public int Count => _places.Count;
+
+        private readonly int _maxCount;
+        /// <summary>
+        /// Конструктор
+        /// </summary>
+        /// <param name="count"></param>
+        public SetWarmlyShipGeneric(int count)
+        {
+            _maxCount = count;
+            _places = new List<T>();
+        }
+        /// <summary>
+        /// Добавление объекта в набор
+        /// </summary>
+        /// <param name="ship">Добавляемый корабль</param>
+        /// <returns></returns>
+        public int Insert(T ship)
+        {
+            if (Count < _maxCount)
+                return Insert(ship, 0);
+            return -1;
+        }
+        /// <summary>
+        /// Добавление объекта в набор на конкретную позицию
+        /// </summary>
+        /// <param name="ship">Добавляемый автомобиль</param>
+        /// <param name="position">Позиция</param>
+        /// <returns></returns>
+        public int Insert(T ship, int position)
+        {
+            if (position < 0 || position > Count)
+            {
+                return -1;
+            }
+            _places.Insert(position, ship);
+            return position;
+        }
+        /// <summary>
+        /// Удаление объекта из набора с конкретной позиции
+        /// </summary>
+        /// <param name="position"></param>
+        /// <returns></returns>
+        public T Remove(int position)
+        {
+            if (position < 0 || position >= Count)
+                return null;
+            var result = _places[position];
+            _places.RemoveAt(position);
+            return result;
+
+        }
+        /// <summary>
+        /// Получение объекта из набора по позиции
+        /// </summary>
+        /// <param name="position"></param>
+        /// <returns></returns>
+        public T this[int position]
+        {
+            get
+            {
+                if (position < 0 || position >= Count)
+                    return null;
+                return _places[position];
+            }
+            set
+            {
+                if (position < 0 || position >= _maxCount)
+                    return;
+                _places.Add(value);
+            }
+        }
+        /// <summary>
+        /// Проход по набору до первого пустого
+        /// </summary>
+        /// <returns></returns>
+        public IEnumerable<T> GetShip()
+        {
+            foreach (var ship in _places)
+            {
+                if (ship != null)
+                {
+                    yield return ship;
+                }
+                else
+                {
+                    yield break;
+                }
+            }
+        }
+    }
+}