Merge pull request 'Vaksman V.D. Lab work 1' (#1) from Lab1 into master

Reviewed-on: http://student.git.athene.tech/just_valery__/ISE-21_Vaksman_V_D_WarmlyShip_Base/pulls/1

WarmlyShip/WarmlyShip/Direction.cs

@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 
 namespace WarmlyShip
 {
-    public enum Direction
+    internal enum Direction
     {
         None = 0,
         Up = 1,

WarmlyShip/WarmlyShip/DrawningShip.cs

@@ -1,6 +1,6 @@
 namespace WarmlyShip
 {
-    public class DrawningShip
+    internal class DrawningShip
     {
         /// <summary>
         /// Класс-сущность
@@ -181,25 +181,11 @@
                 _startPosY = _pictureHeight.Value - _shipHeight;
             }
         }
-
-        public void SetBaseColor(Color color)
-        {
-            if (Ship is EntityWarmlyShip)
-            {
-                Ship = (EntityWarmlyShip)Ship;
-                if (Ship is not null)
-                {
-                    Ship = new EntityWarmlyShip(Ship.Speed, Ship.Weight, color, (Ship as EntityWarmlyShip).DopColor, (Ship as EntityWarmlyShip).Pipes, (Ship as EntityWarmlyShip).FuelCompartment);
-                    return;
-                }
-            }
-            Ship = new EntityShip(Ship.Speed, Ship.Weight, color);
-        }
-            /// <summary>
-            /// Получение текущей позиции объекта
-            /// </summary>
-            /// <returns></returns>
-            public (float Left, float Right, float Top, float Bottom) GetCurrentPosition()
+        /// <summary>
+        /// Получение текущей позиции объекта
+        /// </summary>
+        /// <returns></returns>
+        public (float Left, float Right, float Top, float Bottom) GetCurrentPosition()
         {
             return (_startPosX, _startPosY, _startPosX + _shipWidth, _startPosY + _shipHeight);
         }

WarmlyShip/WarmlyShip/DrawningWarmlyShip.cs

@@ -53,13 +53,5 @@ namespace WarmlyShip
                 g.DrawRectangle(pen, _startPosX + 135, _startPosY + 70, 10, 5);
             }
         }
-        public void SetDopColor(Color color)
-        {
-            Ship = Ship as EntityWarmlyShip;
-            if (Ship is not null)
-            {
-                Ship = new EntityWarmlyShip(Ship.Speed, Ship.Weight, Ship.BodyColor, color, (Ship as EntityWarmlyShip).Pipes, (Ship as EntityWarmlyShip).FuelCompartment);
-            }
-        }
     }
 }

WarmlyShip/WarmlyShip/EntityShip.cs

@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 
 namespace WarmlyShip
 {
-    public class EntityShip
+    internal class EntityShip
     {
         /// <summary>
         /// Скорость

WarmlyShip/WarmlyShip/FormMap.Designer.cs

@@ -0,0 +1,213 @@
+namespace WarmlyShip
+{
+    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.pictureBoxShip = new System.Windows.Forms.PictureBox();
+            this.statusStrip1 = new System.Windows.Forms.StatusStrip();
+            this.toolStripStatusLabelSpeed = new System.Windows.Forms.ToolStripStatusLabel();
+            this.toolStripStatusLabelWeight = new System.Windows.Forms.ToolStripStatusLabel();
+            this.toolStripStatusLabelBodyColor = new System.Windows.Forms.ToolStripStatusLabel();
+            this.buttonCreate = new System.Windows.Forms.Button();
+            this.buttonDown = 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.ButtonCreateModif = new System.Windows.Forms.Button();
+            this.ComboBoxSelectorMap = new System.Windows.Forms.ComboBox();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxShip)).BeginInit();
+            this.statusStrip1.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // pictureBoxShip
+            // 
+            this.pictureBoxShip.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.pictureBoxShip.Location = new System.Drawing.Point(0, 0);
+            this.pictureBoxShip.Name = "pictureBoxShip";
+            this.pictureBoxShip.Size = new System.Drawing.Size(800, 424);
+            this.pictureBoxShip.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
+            this.pictureBoxShip.TabIndex = 0;
+            this.pictureBoxShip.TabStop = false;
+            // 
+            // statusStrip1
+            // 
+            this.statusStrip1.ImageScalingSize = new System.Drawing.Size(20, 20);
+            this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.toolStripStatusLabelSpeed,
+            this.toolStripStatusLabelWeight,
+            this.toolStripStatusLabelBodyColor});
+            this.statusStrip1.Location = new System.Drawing.Point(0, 424);
+            this.statusStrip1.Name = "statusStrip1";
+            this.statusStrip1.Size = new System.Drawing.Size(800, 26);
+            this.statusStrip1.TabIndex = 1;
+            this.statusStrip1.Text = "statusStrip1";
+            // 
+            // toolStripStatusLabelSpeed
+            // 
+            this.toolStripStatusLabelSpeed.Name = "toolStripStatusLabelSpeed";
+            this.toolStripStatusLabelSpeed.Size = new System.Drawing.Size(80, 20);
+            this.toolStripStatusLabelSpeed.Text = "Скорость: ";
+            // 
+            // toolStripStatusLabelWeight
+            // 
+            this.toolStripStatusLabelWeight.Name = "toolStripStatusLabelWeight";
+            this.toolStripStatusLabelWeight.Size = new System.Drawing.Size(40, 20);
+            this.toolStripStatusLabelWeight.Text = "Вес: ";
+            // 
+            // toolStripStatusLabelBodyColor
+            // 
+            this.toolStripStatusLabelBodyColor.Name = "toolStripStatusLabelBodyColor";
+            this.toolStripStatusLabelBodyColor.Size = new System.Drawing.Size(49, 20);
+            this.toolStripStatusLabelBodyColor.Text = "Цвет: ";
+            // 
+            // 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, 367);
+            this.buttonCreate.Name = "buttonCreate";
+            this.buttonCreate.Size = new System.Drawing.Size(94, 29);
+            this.buttonCreate.TabIndex = 2;
+            this.buttonCreate.Text = "Создать";
+            this.buttonCreate.UseVisualStyleBackColor = true;
+            this.buttonCreate.Click += new System.EventHandler(this.buttonCreate_Click);
+            // 
+            // 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.arrowDown;
+            this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.buttonDown.Location = new System.Drawing.Point(701, 367);
+            this.buttonDown.Name = "buttonDown";
+            this.buttonDown.Size = new System.Drawing.Size(30, 30);
+            this.buttonDown.TabIndex = 3;
+            this.buttonDown.Text = " ";
+            this.buttonDown.UseVisualStyleBackColor = true;
+            this.buttonDown.Click += new System.EventHandler(this.ButtonMove_Click);
+            // 
+            // buttonUp
+            // 
+            this.buttonUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.buttonUp.BackgroundImage = global::WarmlyShip.Properties.Resources.arrowUp;
+            this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.buttonUp.Location = new System.Drawing.Point(701, 331);
+            this.buttonUp.Name = "buttonUp";
+            this.buttonUp.Size = new System.Drawing.Size(30, 30);
+            this.buttonUp.TabIndex = 4;
+            this.buttonUp.Text = " ";
+            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.arrowRight;
+            this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.buttonRight.Location = new System.Drawing.Point(737, 367);
+            this.buttonRight.Name = "buttonRight";
+            this.buttonRight.Size = new System.Drawing.Size(30, 30);
+            this.buttonRight.TabIndex = 5;
+            this.buttonRight.Text = " ";
+            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.arrowLeft;
+            this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.buttonLeft.Location = new System.Drawing.Point(665, 368);
+            this.buttonLeft.Name = "buttonLeft";
+            this.buttonLeft.Size = new System.Drawing.Size(30, 30);
+            this.buttonLeft.TabIndex = 6;
+            this.buttonLeft.Text = " ";
+            this.buttonLeft.UseVisualStyleBackColor = true;
+            this.buttonLeft.Click += new System.EventHandler(this.ButtonMove_Click);
+            // 
+            // ButtonCreateModif
+            // 
+            this.ButtonCreateModif.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.ButtonCreateModif.Location = new System.Drawing.Point(126, 367);
+            this.ButtonCreateModif.Name = "ButtonCreateModif";
+            this.ButtonCreateModif.Size = new System.Drawing.Size(120, 29);
+            this.ButtonCreateModif.TabIndex = 7;
+            this.ButtonCreateModif.Text = "Модификация";
+            this.ButtonCreateModif.UseVisualStyleBackColor = true;
+            this.ButtonCreateModif.Click += new System.EventHandler(this.ButtonCreateModif_Click);
+            // 
+            // ComboBoxSelectorMap
+            // 
+            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(182, 28);
+            this.ComboBoxSelectorMap.TabIndex = 8;
+            this.ComboBoxSelectorMap.SelectedIndexChanged += new System.EventHandler(this.ComboBoxSelectorMap_SelectedIndexChanged);
+            // 
+            // FormMap
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(800, 450);
+            this.Controls.Add(this.ComboBoxSelectorMap);
+            this.Controls.Add(this.ButtonCreateModif);
+            this.Controls.Add(this.buttonLeft);
+            this.Controls.Add(this.buttonRight);
+            this.Controls.Add(this.buttonUp);
+            this.Controls.Add(this.buttonDown);
+            this.Controls.Add(this.buttonCreate);
+            this.Controls.Add(this.pictureBoxShip);
+            this.Controls.Add(this.statusStrip1);
+            this.Name = "FormMap";
+            this.Text = "Карта";
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxShip)).EndInit();
+            this.statusStrip1.ResumeLayout(false);
+            this.statusStrip1.PerformLayout();
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private PictureBox pictureBoxShip;
+        private StatusStrip statusStrip1;
+        private ToolStripStatusLabel toolStripStatusLabelSpeed;
+        private ToolStripStatusLabel toolStripStatusLabelWeight;
+        private ToolStripStatusLabel toolStripStatusLabelBodyColor;
+        private Button buttonCreate;
+        private Button buttonDown;
+        private Button buttonUp;
+        private Button buttonRight;
+        private Button buttonLeft;
+        private Button ButtonCreateModif;
+        private ComboBox ComboBoxSelectorMap;
+    }
+}

WarmlyShip/WarmlyShip/FormMap.cs

@@ -0,0 +1,103 @@
+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 WarmlyShip
+{
+    public partial class FormMap : Form
+    {
+        private AbstractMap _abstractMap;
+
+        public FormMap()
+        {
+            InitializeComponent();
+            _abstractMap = new SimpleMap();
+        }
+        /// <summary>
+        /// Заполнение информации по объекту
+        /// </summary>
+        /// <param name="ship"></param>
+        private void SetData(DrawningShip ship)
+        {
+            toolStripStatusLabelSpeed.Text = $"Скорость: {ship.Ship.Speed}";
+            toolStripStatusLabelWeight.Text = $"Вес: {ship.Ship.Weight}";
+            toolStripStatusLabelBodyColor.Text = $"Цвет: {ship.Ship.BodyColor.Name}";
+            pictureBoxShip.Image = _abstractMap.CreateMap(pictureBoxShip.Width, pictureBoxShip.Height,
+                new DrawningObjectShip(ship));
+        }
+
+        /// <summary>
+        /// Обработка нажатия кнопки "Создать"
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void buttonCreate_Click(object sender, EventArgs e)
+        {
+            Random rnd = new();
+            var ship = new DrawningShip(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)));
+            SetData(ship);
+        }
+
+        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;
+            }
+            pictureBoxShip.Image = _abstractMap?.MoveObject(dir);
+        }
+
+        /// <summary>
+        /// Обработка нажатия кнопки "Модификация"
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonCreateModif_Click(object sender, EventArgs e)
+        {
+            Random rnd = new();
+            var ship = new DrawningWarmlyShip(rnd.Next(100, 300), rnd.Next(1000, 2000),
+                Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)),
+                Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)),
+                Convert.ToBoolean(rnd.Next(0, 2)), Convert.ToBoolean(rnd.Next(0, 2)));
+            SetData(ship);
+        }
+        /// <summary>
+        /// Смена карты
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ComboBoxSelectorMap_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            switch (ComboBoxSelectorMap.Text)
+            {
+                case "Простая карта":
+                    _abstractMap = new SimpleMap();
+                    break;
+
+                case "Океан":
+                    _abstractMap = new OceanMap();
+                    break;
+            }
+        }
+    }
+}

WarmlyShip/WarmlyShip/FormMap.resx

@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <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/FormMapWithSetShips.Designer.cs

@@ -1,282 +0,0 @@
-namespace WarmlyShip
-{
-    partial class FormMapWithSetShips
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.groupBoxTools = new System.Windows.Forms.GroupBox();
-            this.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.textBoxNewMapName = new System.Windows.Forms.TextBox();
-            this.comboBoxSelectorMap = new System.Windows.Forms.ComboBox();
-            this.buttonLeft = new System.Windows.Forms.Button();
-            this.buttonRight = new System.Windows.Forms.Button();
-            this.buttonUp = new System.Windows.Forms.Button();
-            this.buttonDown = new System.Windows.Forms.Button();
-            this.buttonShowOnMap = new System.Windows.Forms.Button();
-            this.buttonShowStorage = new System.Windows.Forms.Button();
-            this.buttonRemoveShip = new System.Windows.Forms.Button();
-            this.maskedTextBoxPosition = new System.Windows.Forms.MaskedTextBox();
-            this.buttonAddShip = 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.buttonRight);
-            this.groupBoxTools.Controls.Add(this.buttonUp);
-            this.groupBoxTools.Controls.Add(this.buttonDown);
-            this.groupBoxTools.Controls.Add(this.buttonShowOnMap);
-            this.groupBoxTools.Controls.Add(this.buttonShowStorage);
-            this.groupBoxTools.Controls.Add(this.buttonRemoveShip);
-            this.groupBoxTools.Controls.Add(this.maskedTextBoxPosition);
-            this.groupBoxTools.Controls.Add(this.buttonAddShip);
-            this.groupBoxTools.Dock = System.Windows.Forms.DockStyle.Right;
-            this.groupBoxTools.Location = new System.Drawing.Point(616, 0);
-            this.groupBoxTools.Name = "groupBoxTools";
-            this.groupBoxTools.Size = new System.Drawing.Size(250, 594);
-            this.groupBoxTools.TabIndex = 0;
-            this.groupBoxTools.TabStop = false;
-            this.groupBoxTools.Text = "Инструменты";
-            // 
-            // groupBoxMaps
-            // 
-            this.groupBoxMaps.Controls.Add(this.buttonDeleteMap);
-            this.groupBoxMaps.Controls.Add(this.listBoxMaps);
-            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, 26);
-            this.groupBoxMaps.Name = "groupBoxMaps";
-            this.groupBoxMaps.Size = new System.Drawing.Size(241, 283);
-            this.groupBoxMaps.TabIndex = 12;
-            this.groupBoxMaps.TabStop = false;
-            this.groupBoxMaps.Text = "Карты";
-            // 
-            // buttonDeleteMap
-            // 
-            this.buttonDeleteMap.Location = new System.Drawing.Point(0, 235);
-            this.buttonDeleteMap.Name = "buttonDeleteMap";
-            this.buttonDeleteMap.Size = new System.Drawing.Size(238, 29);
-            this.buttonDeleteMap.TabIndex = 3;
-            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(6, 125);
-            this.listBoxMaps.Name = "listBoxMaps";
-            this.listBoxMaps.Size = new System.Drawing.Size(229, 104);
-            this.listBoxMaps.TabIndex = 2;
-            this.listBoxMaps.SelectedIndexChanged += new System.EventHandler(this.ListBoxMaps_SelectedIndexChanged);
-            // 
-            // buttonAddMap
-            // 
-            this.buttonAddMap.Location = new System.Drawing.Point(0, 90);
-            this.buttonAddMap.Name = "buttonAddMap";
-            this.buttonAddMap.Size = new System.Drawing.Size(238, 29);
-            this.buttonAddMap.TabIndex = 2;
-            this.buttonAddMap.Text = "Добавить карту";
-            this.buttonAddMap.UseVisualStyleBackColor = true;
-            this.buttonAddMap.Click += new System.EventHandler(this.ButtonAddMap_Click);
-            // 
-            // textBoxNewMapName
-            // 
-            this.textBoxNewMapName.Location = new System.Drawing.Point(3, 23);
-            this.textBoxNewMapName.Name = "textBoxNewMapName";
-            this.textBoxNewMapName.Size = new System.Drawing.Size(235, 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(3, 56);
-            this.comboBoxSelectorMap.Name = "comboBoxSelectorMap";
-            this.comboBoxSelectorMap.Size = new System.Drawing.Size(232, 28);
-            this.comboBoxSelectorMap.TabIndex = 1;
-            // 
-            // 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.arrowLeft;
-            this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonLeft.Location = new System.Drawing.Point(73, 544);
-            this.buttonLeft.Name = "buttonLeft";
-            this.buttonLeft.Size = new System.Drawing.Size(30, 30);
-            this.buttonLeft.TabIndex = 10;
-            this.buttonLeft.Text = " ";
-            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::WarmlyShip.Properties.Resources.arrowRight;
-            this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonRight.Location = new System.Drawing.Point(145, 543);
-            this.buttonRight.Name = "buttonRight";
-            this.buttonRight.Size = new System.Drawing.Size(30, 30);
-            this.buttonRight.TabIndex = 9;
-            this.buttonRight.Text = " ";
-            this.buttonRight.UseVisualStyleBackColor = true;
-            this.buttonRight.Click += new System.EventHandler(this.ButtonMove_Click);
-            // 
-            // buttonUp
-            // 
-            this.buttonUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.buttonUp.BackgroundImage = global::WarmlyShip.Properties.Resources.arrowUp;
-            this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonUp.Location = new System.Drawing.Point(109, 507);
-            this.buttonUp.Name = "buttonUp";
-            this.buttonUp.Size = new System.Drawing.Size(30, 30);
-            this.buttonUp.TabIndex = 8;
-            this.buttonUp.Text = " ";
-            this.buttonUp.UseVisualStyleBackColor = true;
-            this.buttonUp.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::WarmlyShip.Properties.Resources.arrowDown;
-            this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonDown.Location = new System.Drawing.Point(109, 543);
-            this.buttonDown.Name = "buttonDown";
-            this.buttonDown.Size = new System.Drawing.Size(30, 30);
-            this.buttonDown.TabIndex = 7;
-            this.buttonDown.Text = " ";
-            this.buttonDown.UseVisualStyleBackColor = true;
-            this.buttonDown.Click += new System.EventHandler(this.ButtonMove_Click);
-            // 
-            // buttonShowOnMap
-            // 
-            this.buttonShowOnMap.Location = new System.Drawing.Point(6, 478);
-            this.buttonShowOnMap.Name = "buttonShowOnMap";
-            this.buttonShowOnMap.Size = new System.Drawing.Size(238, 29);
-            this.buttonShowOnMap.TabIndex = 5;
-            this.buttonShowOnMap.Text = "Посмотреть карту";
-            this.buttonShowOnMap.UseVisualStyleBackColor = true;
-            this.buttonShowOnMap.Click += new System.EventHandler(this.ButtonShowOnMap_Click);
-            // 
-            // buttonShowStorage
-            // 
-            this.buttonShowStorage.Location = new System.Drawing.Point(6, 443);
-            this.buttonShowStorage.Name = "buttonShowStorage";
-            this.buttonShowStorage.Size = new System.Drawing.Size(238, 29);
-            this.buttonShowStorage.TabIndex = 4;
-            this.buttonShowStorage.Text = "Посмотреть хранилище";
-            this.buttonShowStorage.UseVisualStyleBackColor = true;
-            this.buttonShowStorage.Click += new System.EventHandler(this.ButtonShowStorage_Click);
-            // 
-            // buttonRemoveShip
-            // 
-            this.buttonRemoveShip.Location = new System.Drawing.Point(6, 399);
-            this.buttonRemoveShip.Name = "buttonRemoveShip";
-            this.buttonRemoveShip.Size = new System.Drawing.Size(238, 29);
-            this.buttonRemoveShip.TabIndex = 3;
-            this.buttonRemoveShip.Text = "Удалить корабль";
-            this.buttonRemoveShip.UseVisualStyleBackColor = true;
-            this.buttonRemoveShip.Click += new System.EventHandler(this.ButtonRemoveShip_Click);
-            // 
-            // maskedTextBoxPosition
-            // 
-            this.maskedTextBoxPosition.Location = new System.Drawing.Point(6, 366);
-            this.maskedTextBoxPosition.Mask = "00";
-            this.maskedTextBoxPosition.Name = "maskedTextBoxPosition";
-            this.maskedTextBoxPosition.Size = new System.Drawing.Size(238, 27);
-            this.maskedTextBoxPosition.TabIndex = 2;
-            // 
-            // buttonAddShip
-            // 
-            this.buttonAddShip.Location = new System.Drawing.Point(6, 331);
-            this.buttonAddShip.Name = "buttonAddShip";
-            this.buttonAddShip.Size = new System.Drawing.Size(238, 29);
-            this.buttonAddShip.TabIndex = 1;
-            this.buttonAddShip.Text = "Добавить корабль";
-            this.buttonAddShip.UseVisualStyleBackColor = true;
-            this.buttonAddShip.Click += new System.EventHandler(this.ButtonAddShip_Click);
-            // 
-            // pictureBox
-            // 
-            this.pictureBox.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.pictureBox.Location = new System.Drawing.Point(0, 0);
-            this.pictureBox.Name = "pictureBox";
-            this.pictureBox.Size = new System.Drawing.Size(616, 594);
-            this.pictureBox.TabIndex = 1;
-            this.pictureBox.TabStop = false;
-            // 
-            // FormMapWithSetShips
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(866, 594);
-            this.Controls.Add(this.pictureBox);
-            this.Controls.Add(this.groupBoxTools);
-            this.Name = "FormMapWithSetShips";
-            this.Text = "Карта с набором объектов";
-            this.groupBoxTools.ResumeLayout(false);
-            this.groupBoxTools.PerformLayout();
-            this.groupBoxMaps.ResumeLayout(false);
-            this.groupBoxMaps.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).EndInit();
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-
-        private GroupBox groupBoxTools;
-        private PictureBox pictureBox;
-        private Button buttonShowOnMap;
-        private Button buttonShowStorage;
-        private Button buttonRemoveShip;
-        private MaskedTextBox maskedTextBoxPosition;
-        private Button buttonAddShip;
-        private Button buttonLeft;
-        private Button buttonRight;
-        private Button buttonUp;
-        private Button buttonDown;
-        private GroupBox groupBoxMaps;
-        private Button buttonDeleteMap;
-        private ListBox listBoxMaps;
-        private Button buttonAddMap;
-        private TextBox textBoxNewMapName;
-        private ComboBox comboBoxSelectorMap;
-    }
-}

WarmlyShip/WarmlyShip/FormMapWithSetShips.cs

@@ -1,222 +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 WarmlyShip
-{
-    public partial class FormMapWithSetShips : Form
-    {
-        /// <summary>
-        /// Словарь для выпадающего списка
-        /// </summary>
-        private readonly Dictionary<string, AbstractMap> _mapsDict = new()
-        {
-            { "Простая карта", new SimpleMap() },
-            { "Океан", new OceanMap() }
-        };
-        /// <summary>
-        /// Объект от коллекции карт
-        /// </summary>
-        private readonly MapsCollection _mapsCollection;
-        public FormMapWithSetShips()
-        {
-            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>
-        /// Выбор карты
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        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();
-            }
-        }
-        /// <summary>
-        /// Добавление объекта
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ButtonAddShip_Click(object sender, EventArgs e)
-        {
-            FormShipConfig formShip = new();
-            formShip.AddEvent(new(AddShip));
-            formShip.Show();
-        }
-        private void AddShip(DrawningShip ship)
-        {
-            if (listBoxMaps.SelectedIndex == -1)
-            {
-                MessageBox.Show("Перед добавлением объекта необходимо создать карту");
-            }
-            else if (_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] + new DrawningObjectShip(ship) != -1)
-            {
-                MessageBox.Show("Объект добавлен");
-                pictureBox.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 || string.IsNullOrEmpty(maskedTextBoxPosition.Text) ||
-                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("Объект удален");
-                pictureBox.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;
-            }
-            pictureBox.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;
-            }
-            pictureBox.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;
-            }
-            pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].MoveObject(dir);
-        }
-    }
-}

WarmlyShip/WarmlyShip/FormMapWithSetShips.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>

WarmlyShip/WarmlyShip/FormShip.Designer.cs

@@ -39,7 +39,6 @@
             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();
@@ -159,22 +158,11 @@
             this.buttonCreateModif.UseVisualStyleBackColor = true;
             this.buttonCreateModif.Click += new System.EventHandler(this.ButtonCreateModif_Click);
             // 
-            // buttonSelectShip
-            // 
-            this.buttonSelectShip.Location = new System.Drawing.Point(565, 369);
-            this.buttonSelectShip.Name = "buttonSelectShip";
-            this.buttonSelectShip.Size = new System.Drawing.Size(94, 29);
-            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(8F, 20F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(800, 450);
-            this.Controls.Add(this.buttonSelectShip);
             this.Controls.Add(this.buttonCreateModif);
             this.Controls.Add(this.buttonLeft);
             this.Controls.Add(this.buttonRight);
@@ -206,6 +194,5 @@
         private Button buttonRight;
         private Button buttonLeft;
         private Button buttonCreateModif;
-        private Button buttonSelectShip;
     }
 }

WarmlyShip/WarmlyShip/FormShip.cs

@@ -3,11 +3,10 @@ namespace WarmlyShip
     public partial class FormShip : Form
     {
         private DrawningShip _ship;
-        public DrawningShip SelectedShip { get; private set; }
         public FormShip()
         {
             InitializeComponent();
-         }
+        }
         /// <summary>
 		/// Ìåòîä óñòàíîâêè äàííûõ
 		/// </summary>
@@ -34,15 +33,8 @@ namespace WarmlyShip
         private void buttonCreate_Click(object sender, EventArgs e)
         {
             Random rnd = new();
-            Color color = Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256),
-           rnd.Next(0, 256));
-            ColorDialog dialog = new();
-            if (dialog.ShowDialog() == DialogResult.OK)
-            {
-                color = dialog.Color;
-            }
-            _ship = new DrawningShip(rnd.Next(100, 300), rnd.Next(1000, 2000),
-           color);
+            _ship = new DrawningShip(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)));
+            _ship.SetPosition(rnd.Next(10, 100), rnd.Next(10, 100), pictureBoxShip.Width, pictureBoxShip.Height);
             SetData();
             Draw();
         }
@@ -76,33 +68,12 @@ namespace WarmlyShip
         private void ButtonCreateModif_Click(object sender, EventArgs e)
         {
             Random rnd = new();
-            Color color = Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256),
-           rnd.Next(0, 256));
-            ColorDialog dialog = new();
-            if (dialog.ShowDialog() == DialogResult.OK)
-            {
-                color = dialog.Color;
-            }
-            Color dopColor = Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256),
-           rnd.Next(0, 256));
-            ColorDialog dialogDop = new();
-            if (dialogDop.ShowDialog() == DialogResult.OK)
-            {
-                dopColor = dialogDop.Color;
-            }
             _ship = new DrawningWarmlyShip(rnd.Next(100, 300), rnd.Next(1000, 2000),
-           color, dopColor,
-            Convert.ToBoolean(rnd.Next(0, 2)), Convert.ToBoolean(rnd.Next(0,
-           2)));
+                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();
             Draw();
-
-        }
-
-        private void ButtonSelectShip_Click(object sender, EventArgs e)
-        {
-            SelectedShip = _ship;
-            DialogResult = DialogResult.OK;
         }
     }
 }

WarmlyShip/WarmlyShip/FormShipConfig.Designer.cs

@@ -1,369 +0,0 @@
-namespace WarmlyShip
-{
-    partial class FormShipConfig
-    {
-        /// <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.groupBoxConfig = new System.Windows.Forms.GroupBox();
-            this.labelModifiedObject = new System.Windows.Forms.Label();
-            this.labelSimpleObject = new System.Windows.Forms.Label();
-            this.groupBoxColors = new System.Windows.Forms.GroupBox();
-            this.panelPurple = new System.Windows.Forms.Panel();
-            this.panelYellow = new System.Windows.Forms.Panel();
-            this.panelBlack = new System.Windows.Forms.Panel();
-            this.panelBlue = new System.Windows.Forms.Panel();
-            this.panelGray = new System.Windows.Forms.Panel();
-            this.panelGreen = new System.Windows.Forms.Panel();
-            this.panelWhite = new System.Windows.Forms.Panel();
-            this.panelRed = new System.Windows.Forms.Panel();
-            this.checkBoxFuelCompartment = new System.Windows.Forms.CheckBox();
-            this.checkBoxPipes = new System.Windows.Forms.CheckBox();
-            this.numericUpDownWeight = new System.Windows.Forms.NumericUpDown();
-            this.labelWeight = new System.Windows.Forms.Label();
-            this.numericUpDownSpeed = new System.Windows.Forms.NumericUpDown();
-            this.labelSpeed = new System.Windows.Forms.Label();
-            this.panelObject = new System.Windows.Forms.Panel();
-            this.labelDopColor = new System.Windows.Forms.Label();
-            this.labelBaseColor = new System.Windows.Forms.Label();
-            this.pictureBoxObject = new System.Windows.Forms.PictureBox();
-            this.buttonOk = new System.Windows.Forms.Button();
-            this.buttonCancel = new System.Windows.Forms.Button();
-            this.groupBoxConfig.SuspendLayout();
-            this.groupBoxColors.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.numericUpDownWeight)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.numericUpDownSpeed)).BeginInit();
-            this.panelObject.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxObject)).BeginInit();
-            this.SuspendLayout();
-            // 
-            // groupBoxConfig
-            // 
-            this.groupBoxConfig.Controls.Add(this.labelModifiedObject);
-            this.groupBoxConfig.Controls.Add(this.labelSimpleObject);
-            this.groupBoxConfig.Controls.Add(this.groupBoxColors);
-            this.groupBoxConfig.Controls.Add(this.checkBoxFuelCompartment);
-            this.groupBoxConfig.Controls.Add(this.checkBoxPipes);
-            this.groupBoxConfig.Controls.Add(this.numericUpDownWeight);
-            this.groupBoxConfig.Controls.Add(this.labelWeight);
-            this.groupBoxConfig.Controls.Add(this.numericUpDownSpeed);
-            this.groupBoxConfig.Controls.Add(this.labelSpeed);
-            this.groupBoxConfig.Location = new System.Drawing.Point(12, 12);
-            this.groupBoxConfig.Name = "groupBoxConfig";
-            this.groupBoxConfig.Size = new System.Drawing.Size(660, 246);
-            this.groupBoxConfig.TabIndex = 0;
-            this.groupBoxConfig.TabStop = false;
-            this.groupBoxConfig.Text = "Параметры";
-            // 
-            // labelModifiedObject
-            // 
-            this.labelModifiedObject.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.labelModifiedObject.Location = new System.Drawing.Point(505, 195);
-            this.labelModifiedObject.Name = "labelModifiedObject";
-            this.labelModifiedObject.Size = new System.Drawing.Size(120, 41);
-            this.labelModifiedObject.TabIndex = 7;
-            this.labelModifiedObject.Text = "Продвинутый";
-            this.labelModifiedObject.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            this.labelModifiedObject.MouseDown += new System.Windows.Forms.MouseEventHandler(this.LabelObject_MouseDown);
-            // 
-            // labelSimpleObject
-            // 
-            this.labelSimpleObject.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.labelSimpleObject.Location = new System.Drawing.Point(363, 195);
-            this.labelSimpleObject.Name = "labelSimpleObject";
-            this.labelSimpleObject.Size = new System.Drawing.Size(121, 41);
-            this.labelSimpleObject.TabIndex = 1;
-            this.labelSimpleObject.Text = "Простой";
-            this.labelSimpleObject.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            this.labelSimpleObject.MouseDown += new System.Windows.Forms.MouseEventHandler(this.LabelObject_MouseDown);
-            // 
-            // groupBoxColors
-            // 
-            this.groupBoxColors.Controls.Add(this.panelPurple);
-            this.groupBoxColors.Controls.Add(this.panelYellow);
-            this.groupBoxColors.Controls.Add(this.panelBlack);
-            this.groupBoxColors.Controls.Add(this.panelBlue);
-            this.groupBoxColors.Controls.Add(this.panelGray);
-            this.groupBoxColors.Controls.Add(this.panelGreen);
-            this.groupBoxColors.Controls.Add(this.panelWhite);
-            this.groupBoxColors.Controls.Add(this.panelRed);
-            this.groupBoxColors.Location = new System.Drawing.Point(345, 26);
-            this.groupBoxColors.Name = "groupBoxColors";
-            this.groupBoxColors.Size = new System.Drawing.Size(303, 166);
-            this.groupBoxColors.TabIndex = 6;
-            this.groupBoxColors.TabStop = false;
-            this.groupBoxColors.Text = "Цвета";
-            // 
-            // panelPurple
-            // 
-            this.panelPurple.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(0)))), ((int)(((byte)(64)))));
-            this.panelPurple.Location = new System.Drawing.Point(230, 96);
-            this.panelPurple.Name = "panelPurple";
-            this.panelPurple.Size = new System.Drawing.Size(50, 50);
-            this.panelPurple.TabIndex = 6;
-            this.panelPurple.MouseDown += new System.Windows.Forms.MouseEventHandler(this.PanelColor_MouseDown);
-            // 
-            // panelYellow
-            // 
-            this.panelYellow.BackColor = System.Drawing.Color.Yellow;
-            this.panelYellow.Location = new System.Drawing.Point(230, 26);
-            this.panelYellow.Name = "panelYellow";
-            this.panelYellow.Size = new System.Drawing.Size(50, 50);
-            this.panelYellow.TabIndex = 2;
-            this.panelYellow.MouseDown += new System.Windows.Forms.MouseEventHandler(this.PanelColor_MouseDown);
-            // 
-            // panelBlack
-            // 
-            this.panelBlack.BackColor = System.Drawing.Color.Black;
-            this.panelBlack.Location = new System.Drawing.Point(160, 96);
-            this.panelBlack.Name = "panelBlack";
-            this.panelBlack.Size = new System.Drawing.Size(50, 50);
-            this.panelBlack.TabIndex = 5;
-            this.panelBlack.MouseDown += new System.Windows.Forms.MouseEventHandler(this.PanelColor_MouseDown);
-            // 
-            // panelBlue
-            // 
-            this.panelBlue.BackColor = System.Drawing.Color.Blue;
-            this.panelBlue.Location = new System.Drawing.Point(160, 26);
-            this.panelBlue.Name = "panelBlue";
-            this.panelBlue.Size = new System.Drawing.Size(50, 50);
-            this.panelBlue.TabIndex = 1;
-            this.panelBlue.MouseDown += new System.Windows.Forms.MouseEventHandler(this.PanelColor_MouseDown);
-            // 
-            // panelGray
-            // 
-            this.panelGray.BackColor = System.Drawing.Color.Gray;
-            this.panelGray.Location = new System.Drawing.Point(89, 96);
-            this.panelGray.Name = "panelGray";
-            this.panelGray.Size = new System.Drawing.Size(50, 50);
-            this.panelGray.TabIndex = 3;
-            this.panelGray.MouseDown += new System.Windows.Forms.MouseEventHandler(this.PanelColor_MouseDown);
-            // 
-            // panelGreen
-            // 
-            this.panelGreen.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(0)))));
-            this.panelGreen.Location = new System.Drawing.Point(89, 26);
-            this.panelGreen.Name = "panelGreen";
-            this.panelGreen.Size = new System.Drawing.Size(50, 50);
-            this.panelGreen.TabIndex = 0;
-            this.panelGreen.MouseDown += new System.Windows.Forms.MouseEventHandler(this.PanelColor_MouseDown);
-            // 
-            // panelWhite
-            // 
-            this.panelWhite.BackColor = System.Drawing.Color.White;
-            this.panelWhite.Location = new System.Drawing.Point(18, 96);
-            this.panelWhite.Name = "panelWhite";
-            this.panelWhite.Size = new System.Drawing.Size(50, 50);
-            this.panelWhite.TabIndex = 4;
-            this.panelWhite.MouseDown += new System.Windows.Forms.MouseEventHandler(this.PanelColor_MouseDown);
-            // 
-            // panelRed
-            // 
-            this.panelRed.BackColor = System.Drawing.Color.Red;
-            this.panelRed.Location = new System.Drawing.Point(18, 26);
-            this.panelRed.Name = "panelRed";
-            this.panelRed.Size = new System.Drawing.Size(50, 50);
-            this.panelRed.TabIndex = 0;
-            this.panelRed.MouseDown += new System.Windows.Forms.MouseEventHandler(this.PanelColor_MouseDown);
-            // 
-            // checkBoxFuelCompartment
-            // 
-            this.checkBoxFuelCompartment.AutoSize = true;
-            this.checkBoxFuelCompartment.Location = new System.Drawing.Point(28, 198);
-            this.checkBoxFuelCompartment.Name = "checkBoxFuelCompartment";
-            this.checkBoxFuelCompartment.Size = new System.Drawing.Size(289, 24);
-            this.checkBoxFuelCompartment.TabIndex = 5;
-            this.checkBoxFuelCompartment.Text = "Признак наличия топливного отсека";
-            this.checkBoxFuelCompartment.UseVisualStyleBackColor = true;
-            // 
-            // checkBoxPipes
-            // 
-            this.checkBoxPipes.AutoSize = true;
-            this.checkBoxPipes.Location = new System.Drawing.Point(28, 148);
-            this.checkBoxPipes.Name = "checkBoxPipes";
-            this.checkBoxPipes.Size = new System.Drawing.Size(189, 24);
-            this.checkBoxPipes.TabIndex = 4;
-            this.checkBoxPipes.Text = "Призрак наличия труб";
-            this.checkBoxPipes.UseVisualStyleBackColor = true;
-            // 
-            // numericUpDownWeight
-            // 
-            this.numericUpDownWeight.Location = new System.Drawing.Point(139, 89);
-            this.numericUpDownWeight.Name = "numericUpDownWeight";
-            this.numericUpDownWeight.Size = new System.Drawing.Size(117, 27);
-            this.numericUpDownWeight.TabIndex = 3;
-            this.numericUpDownWeight.Value = new decimal(new int[] {
-            100,
-            0,
-            0,
-            0});
-            // 
-            // labelWeight
-            // 
-            this.labelWeight.AutoSize = true;
-            this.labelWeight.Location = new System.Drawing.Point(28, 91);
-            this.labelWeight.Name = "labelWeight";
-            this.labelWeight.Size = new System.Drawing.Size(36, 20);
-            this.labelWeight.TabIndex = 2;
-            this.labelWeight.Text = "Вес:";
-            // 
-            // numericUpDownSpeed
-            // 
-            this.numericUpDownSpeed.Location = new System.Drawing.Point(139, 32);
-            this.numericUpDownSpeed.Name = "numericUpDownSpeed";
-            this.numericUpDownSpeed.Size = new System.Drawing.Size(117, 27);
-            this.numericUpDownSpeed.TabIndex = 1;
-            this.numericUpDownSpeed.Value = new decimal(new int[] {
-            100,
-            0,
-            0,
-            0});
-            // 
-            // labelSpeed
-            // 
-            this.labelSpeed.AutoSize = true;
-            this.labelSpeed.Location = new System.Drawing.Point(28, 34);
-            this.labelSpeed.Name = "labelSpeed";
-            this.labelSpeed.Size = new System.Drawing.Size(76, 20);
-            this.labelSpeed.TabIndex = 0;
-            this.labelSpeed.Text = "Скорость:";
-            // 
-            // panelObject
-            // 
-            this.panelObject.AllowDrop = true;
-            this.panelObject.Controls.Add(this.labelDopColor);
-            this.panelObject.Controls.Add(this.labelBaseColor);
-            this.panelObject.Controls.Add(this.pictureBoxObject);
-            this.panelObject.Location = new System.Drawing.Point(678, 25);
-            this.panelObject.Name = "panelObject";
-            this.panelObject.Size = new System.Drawing.Size(313, 191);
-            this.panelObject.TabIndex = 8;
-            this.panelObject.DragDrop += new System.Windows.Forms.DragEventHandler(this.PanelObject_DragDrop);
-            this.panelObject.DragEnter += new System.Windows.Forms.DragEventHandler(this.PanelObject_DragEnter);
-            // 
-            // labelDopColor
-            // 
-            this.labelDopColor.AllowDrop = true;
-            this.labelDopColor.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.labelDopColor.Location = new System.Drawing.Point(174, 13);
-            this.labelDopColor.Name = "labelDopColor";
-            this.labelDopColor.Size = new System.Drawing.Size(121, 41);
-            this.labelDopColor.TabIndex = 9;
-            this.labelDopColor.Text = "Доп. цвет";
-            this.labelDopColor.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            this.labelDopColor.DragDrop += new System.Windows.Forms.DragEventHandler(this.LabelDopColor_DragDrop);
-            this.labelDopColor.DragEnter += new System.Windows.Forms.DragEventHandler(this.LabelColor_DragEnter);
-            // 
-            // labelBaseColor
-            // 
-            this.labelBaseColor.AllowDrop = true;
-            this.labelBaseColor.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.labelBaseColor.Location = new System.Drawing.Point(21, 13);
-            this.labelBaseColor.Name = "labelBaseColor";
-            this.labelBaseColor.Size = new System.Drawing.Size(121, 41);
-            this.labelBaseColor.TabIndex = 8;
-            this.labelBaseColor.Text = "Цвет";
-            this.labelBaseColor.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            this.labelBaseColor.DragDrop += new System.Windows.Forms.DragEventHandler(this.LabelBaseColor_DragDrop);
-            this.labelBaseColor.DragEnter += new System.Windows.Forms.DragEventHandler(this.LabelColor_DragEnter);
-            // 
-            // pictureBoxObject
-            // 
-            this.pictureBoxObject.Location = new System.Drawing.Point(21, 57);
-            this.pictureBoxObject.Name = "pictureBoxObject";
-            this.pictureBoxObject.Size = new System.Drawing.Size(274, 122);
-            this.pictureBoxObject.TabIndex = 0;
-            this.pictureBoxObject.TabStop = false;
-            // 
-            // buttonOk
-            // 
-            this.buttonOk.Location = new System.Drawing.Point(683, 229);
-            this.buttonOk.Name = "buttonOk";
-            this.buttonOk.Size = new System.Drawing.Size(142, 42);
-            this.buttonOk.TabIndex = 10;
-            this.buttonOk.Text = "Добавить";
-            this.buttonOk.UseVisualStyleBackColor = true;
-            this.buttonOk.Click += new System.EventHandler(this.ButtonOk_Click);
-            // 
-            // buttonCancel
-            // 
-            this.buttonCancel.Location = new System.Drawing.Point(831, 229);
-            this.buttonCancel.Name = "buttonCancel";
-            this.buttonCancel.Size = new System.Drawing.Size(142, 42);
-            this.buttonCancel.TabIndex = 11;
-            this.buttonCancel.Text = "Отмена";
-            this.buttonCancel.UseVisualStyleBackColor = true;
-            // 
-            // FormShipConfig
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1004, 283);
-            this.Controls.Add(this.buttonCancel);
-            this.Controls.Add(this.buttonOk);
-            this.Controls.Add(this.panelObject);
-            this.Controls.Add(this.groupBoxConfig);
-            this.Name = "FormShipConfig";
-            this.Text = "Создание объекта";
-            this.groupBoxConfig.ResumeLayout(false);
-            this.groupBoxConfig.PerformLayout();
-            this.groupBoxColors.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.numericUpDownWeight)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.numericUpDownSpeed)).EndInit();
-            this.panelObject.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxObject)).EndInit();
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-
-        private GroupBox groupBoxConfig;
-        private CheckBox checkBoxPipes;
-        private NumericUpDown numericUpDownWeight;
-        private Label labelWeight;
-        private NumericUpDown numericUpDownSpeed;
-        private Label labelSpeed;
-        private CheckBox checkBoxFuelCompartment;
-        private GroupBox groupBoxColors;
-        private Panel panelPurple;
-        private Panel panelYellow;
-        private Panel panelBlack;
-        private Panel panelBlue;
-        private Panel panelGray;
-        private Panel panelGreen;
-        private Panel panelWhite;
-        private Panel panelRed;
-        private Label labelModifiedObject;
-        private Label labelSimpleObject;
-        private Panel panelObject;
-        private PictureBox pictureBoxObject;
-        private Label labelDopColor;
-        private Label labelBaseColor;
-        private Button buttonOk;
-        private Button buttonCancel;
-    }
-}

WarmlyShip/WarmlyShip/FormShipConfig.cs

@@ -1,120 +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 WarmlyShip
-{
-    public partial class FormShipConfig : Form
-    {
-        private event Action<DrawningShip> EventAddShip;
-
-        DrawningShip _ship = null;
-        public FormShipConfig()
-        {
-            InitializeComponent();
-            panelBlack.MouseDown += PanelColor_MouseDown;
-            panelPurple.MouseDown += PanelColor_MouseDown;
-            panelGray.MouseDown += PanelColor_MouseDown;
-            panelGreen.MouseDown += PanelColor_MouseDown;
-            panelRed.MouseDown += PanelColor_MouseDown;
-            panelWhite.MouseDown += PanelColor_MouseDown;
-            panelYellow.MouseDown += PanelColor_MouseDown;
-            panelBlue.MouseDown += PanelColor_MouseDown;
-            buttonCancel.Click += (sender, e) => Close();
-        }
-        private void LabelObject_MouseDown(object sender, MouseEventArgs e)
-        {
-            (sender as Label).DoDragDrop((sender as Label).Name, DragDropEffects.Move | DragDropEffects.Copy);
-        }
-
-        private void DrawShip()
-        {
-            Bitmap bmp = new(pictureBoxObject.Width, pictureBoxObject.Height);
-            Graphics gr = Graphics.FromImage(bmp);
-            _ship?.SetPosition(5, 5, pictureBoxObject.Width, pictureBoxObject.Height);
-            _ship?.DrawTransport(gr);
-            pictureBoxObject.Image = bmp;
-        }
-        public void AddEvent(Action<DrawningShip> ev)
-        {
-            if (EventAddShip == null)
-            {
-                EventAddShip = new(ev);
-            }
-            else
-            {
-                EventAddShip += ev;
-            }
-        }
-        private void PanelObject_DragEnter(object sender, DragEventArgs e)
-        {
-            if (e.Data.GetDataPresent(DataFormats.Text))
-            {
-                e.Effect = DragDropEffects.Copy;
-            }
-            else
-            {
-                e.Effect = DragDropEffects.None;
-            }
-        }
-
-        private void PanelObject_DragDrop(object sender, DragEventArgs e)
-        {
-            switch (e.Data.GetData(DataFormats.Text).ToString())
-            {
-                case "labelSimpleObject":
-                    _ship = new DrawningShip((int)numericUpDownSpeed.Value, (int)numericUpDownWeight.Value, Color.White);
-                    break;
-                case "labelModifiedObject":
-                    _ship = new DrawningWarmlyShip((int)numericUpDownSpeed.Value, (int)numericUpDownWeight.Value, Color.White, Color.Black,
-                        checkBoxPipes.Checked, checkBoxFuelCompartment.Checked);
-                    break;
-            }
-            DrawShip();
-        }
-        private void PanelColor_MouseDown(object sender, MouseEventArgs e)
-        {
-            (sender as Control).DoDragDrop((sender as Control).BackColor, DragDropEffects.Move | DragDropEffects.Copy);
-        }
-
-        private void ButtonOk_Click(object sender, EventArgs e)
-        {
-            EventAddShip?.Invoke(_ship);
-            Close();
-        }
-
-        private void LabelBaseColor_DragDrop(object sender, DragEventArgs e)
-        {
-            _ship.SetBaseColor((Color)e.Data.GetData(typeof(Color)));
-            DrawShip();
-        }
-
-        private void LabelColor_DragEnter(object sender, DragEventArgs e)
-        {
-            if (e.Data.GetDataPresent(typeof(Color)))
-            {
-                e.Effect = DragDropEffects.Copy;
-            }
-            else
-            {
-                e.Effect = DragDropEffects.None;
-            }
-        }
-
-        private void LabelDopColor_DragDrop(object sender, DragEventArgs e)
-        {
-            if (_ship is DrawningWarmlyShip)
-            {
-                var ship = _ship as DrawningWarmlyShip;
-                ship.SetDopColor((Color)e.Data.GetData(typeof(Color)));
-            }
-            DrawShip();
-        }
-    }
-}

WarmlyShip/WarmlyShip/FormShipConfig.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>

WarmlyShip/WarmlyShip/MapWithSetShipsGeneric.cs

@@ -1,177 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WarmlyShip
-{
-    internal class MapWithSetShipsGeneric<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 = 180;
-        /// <summary>
-        /// Размер занимаемого объектом места (высота)
-        /// </summary>
-        private readonly int _placeSizeHeight = 120;
-        /// <summary>
-        /// Набор объектов
-        /// </summary>
-        private readonly SetShipsGeneric<T> _setShips;
-        /// <summary>
-        /// Карта
-        /// </summary>
-        private readonly U _map;
-        /// <summary>
-        /// Конструктор
-        /// </summary>
-        /// <param name="picWidth"></param>
-        /// <param name="picHeight"></param>
-        /// <param name="map"></param>
-        public MapWithSetShipsGeneric(int picWidth, int picHeight, U map)
-        {
-            int width = picWidth / _placeSizeWidth;
-            int height = picHeight / _placeSizeHeight;
-            _setShips = new SetShipsGeneric<T>(width * height);
-            _pictureWidth = picWidth;
-            _pictureHeight = picHeight;
-            _map = map;
-        }
-        /// <summary>
-        /// Перегрузка оператора сложения
-        /// </summary>
-        /// <param name="map"></param>
-        /// <param name="ship"></param>
-        /// <returns></returns>
-        public static int operator +(MapWithSetShipsGeneric<T, U> map, T ship)
-        {
-            return map._setShips.Insert(ship);
-        }
-        /// <summary>
-        /// Перегрузка оператора вычитания
-        /// </summary>
-        /// <param name="map"></param>
-        /// <param name="position"></param>
-        /// <returns></returns>
-        public static T operator -(MapWithSetShipsGeneric<T, U> map, int position)
-        {
-            return map._setShips.Remove(position);
-        }
-        /// <summary>
-        /// Вывод всего набора объектов
-        /// </summary>
-        /// <returns></returns>
-        public Bitmap ShowSet()
-        {
-            Bitmap bmp = new(_pictureWidth, _pictureHeight);
-            Graphics gr = Graphics.FromImage(bmp);
-            DrawBackground(gr);
-            DrawShips(gr);
-            return bmp;
-        }
-        /// <summary>
-        /// Просмотр объекта на карте
-        /// </summary>
-        /// <returns></returns>
-        public Bitmap ShowOnMap()
-        {
-            Shaking();
-            foreach (var ship in _setShips.GetShips())
-            {
-                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 = _setShips.Count - 1;
-            for (int i = 0; i < _setShips.Count; i++)
-            {
-                if (_setShips[i] == null)
-                {
-                    for (; j > i; j--)
-                    {
-                        var ship = _setShips[j];
-                        if (ship != null)
-                        {
-                            _setShips.Insert(ship, i);
-                            _setShips.Remove(j);
-                            break;
-                        }
-                    }
-                    if (j <= i)
-                    {
-                        return;
-                    }
-                }
-            }
-        }
-        /// <summary>
-        /// Метод отрисовки фона
-        /// </summary>
-        /// <param name="g"></param>
-        private void DrawBackground(Graphics g)
-        {
-            for (int x = 0; x < _pictureWidth; x++)
-            {
-                for (int y = 0; y < _pictureWidth; y++)
-                {
-                    Brush waterColor = new SolidBrush(Color.LightSkyBlue);
-                    g.FillRectangle(waterColor, x * x, y * y, x * (x + 1), y * (y + 1));
-                }
-            }
-            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 DrawShips(Graphics g)
-        {
-            int countInLine = _pictureWidth / _placeSizeWidth;
-            int maxLeft = (countInLine - 1) * _placeSizeWidth;
-            for (int i = 0; i < _setShips.Count; i++)
-            {
-                var ship = _setShips[i];
-                ship?.SetObject(maxLeft - i % countInLine * _placeSizeWidth, i / countInLine * _placeSizeHeight + 3, _pictureWidth, _pictureHeight);
-                ship?.DrawningObject(g);
-            }
-        }
-    }
-}

WarmlyShip/WarmlyShip/MapsCollection.cs

@@ -1,69 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WarmlyShip
-{
-    internal class MapsCollection
-    {
-        /// <summary>
-        /// Словарь (хранилище) с картами
-        /// </summary>
-        readonly Dictionary<string, MapWithSetShipsGeneric<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, MapWithSetShipsGeneric<DrawningObjectShip, AbstractMap>>();
-            _pictureWidth = pictureWidth;
-            _pictureHeight = pictureHeight;
-        }
-        /// <summary>
-        /// Добавление карты
-        /// </summary>
-        /// <param name="name">Название карты</param>
-        /// <param name="map">Карта</param>
-        public void AddMap(string name, AbstractMap map)
-        {
-            _mapStorages.Add(name, new(_pictureWidth, _pictureHeight, map));
-        }
-        /// <summary>
-        /// Удаление карты
-        /// </summary>
-        /// <param name="name">Название карты</param>
-        public void DelMap(string name)
-        {
-            _mapStorages.Remove(name);
-        }
-        /// <summary>
-        /// Доступ к хранилищу
-        /// </summary>
-        /// <param name="ind"></param>
-        /// <returns></returns>
-        public MapWithSetShipsGeneric<DrawningObjectShip, AbstractMap> this[string ind]
-        {
-            get
-            {
-                _mapStorages.TryGetValue(ind, out var mapWithSetShipsGeneric);
-                return mapWithSetShipsGeneric;
-            }
-        }
-    }
-}

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 FormMapWithSetShips());
+            Application.Run(new FormShip());
         }
     }
 }

WarmlyShip/WarmlyShip/SetShipsGeneric.cs

@@ -1,108 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WarmlyShip
-{
-    internal class SetShipsGeneric<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 SetShipsGeneric(int count)
-		{
-			_maxCount = count;
-			_places = new List<T>();
-		}
-		/// <summary>
-		/// Добавление объекта в набор
-		/// </summary>
-		/// <param name="ship">Добавляемый корабль</param>
-		/// <returns></returns>
-		public int Insert(T ship)
-		{
-			return Insert(ship, 0);
-		}
-
-		private bool isCorrectPosition(int position)
-		{
-			return 0 <= position && position < _maxCount;
-		}
-		/// <summary>
-		/// Добавление объекта в набор на конкретную позицию
-		/// </summary>
-		/// <param name="ship">Добавляемый корабль</param>
-		/// <param name="position">Позиция</param>
-		/// <returns></returns>
-		public int Insert(T airplane, int position)
-		{
-			if (!isCorrectPosition(position))
-			{
-				return -1;
-			}
-			_places.Insert(position, airplane);
-			return position;
-		}
-		/// <summary>
-		/// Удаление объекта из набора с конкретной позиции
-		/// </summary>
-		/// <param name="position"></param>
-		/// <returns></returns>
-		public T Remove(int position)
-		{
-			if (!isCorrectPosition(position))
-				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
-			{
-				return isCorrectPosition(position) && position < Count ? _places[position] : null;
-			}
-			set
-			{
-				Insert(value, position);
-			}
-		}
-		/// <summary>
-		/// Проход по набору до первого пустого
-		/// </summary>
-		/// <returns></returns>
-		public IEnumerable<T> GetShips()
-		{
-			foreach (var ship in _places)
-			{
-				if (ship != null)
-				{
-					yield return ship;
-				}
-				else
-				{
-					yield break;
-				}
-			}
-		}
-	}
-}