Merge pull request 'Bondarenko M.S. Lab Work 3' (#8) from LabWork_03 into LabWork_02

Reviewed-on: http://student.git.athene.tech/maxnes3/PIbd-22_Bondarenko_M.S._WarmlyShip_Base/pulls/8

WarmlyShip/WarmlyShip/Direction.cs

@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 
 namespace WarmlyShip
 {
-	internal enum Direction //Направление при перемещении
+	public enum Direction //Направление при перемещении
 	{
 		None = 0,
 		Left = 1, //Влево

WarmlyShip/WarmlyShip/DrawingWarmlyShip.cs

@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 
 namespace WarmlyShip
 {
-	internal class DrawingWarmlyShip
+	public class DrawingWarmlyShip
 	{
 		public EntityWarmlyShip warmlyShip { protected set; get; } //Класс-сущность
 		protected float _startPosX; //Координаты отрисовки по оси x

WarmlyShip/WarmlyShip/EntityWarmlyShip.cs

@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 
 namespace WarmlyShip
 {
-	internal class EntityWarmlyShip
+	public class EntityWarmlyShip
 	{
 		public int Speed { get; private set; } //Скорость
 		public float Weight { get; private set; } //Вес

WarmlyShip/WarmlyShip/FormClass.Designer.cs

@@ -39,6 +39,7 @@
 			this.buttonDown = new System.Windows.Forms.Button();
 			this.ButtonCreate = new System.Windows.Forms.Button();
 			this.buttonCreateModif = new System.Windows.Forms.Button();
+			this.buttonSelectShip = new System.Windows.Forms.Button();
 			((System.ComponentModel.ISupportInitialize)(this.pictureBox)).BeginInit();
 			this.statusStrip.SuspendLayout();
 			this.SuspendLayout();
@@ -154,11 +155,22 @@
 			this.buttonCreateModif.UseVisualStyleBackColor = true;
 			this.buttonCreateModif.Click += new System.EventHandler(this.ButtonCreateModif_Click);
 			// 
+			// buttonSelectShip
+			// 
+			this.buttonSelectShip.Location = new System.Drawing.Point(522, 402);
+			this.buttonSelectShip.Name = "buttonSelectShip";
+			this.buttonSelectShip.Size = new System.Drawing.Size(75, 23);
+			this.buttonSelectShip.TabIndex = 9;
+			this.buttonSelectShip.Text = "Выбрать";
+			this.buttonSelectShip.UseVisualStyleBackColor = true;
+			this.buttonSelectShip.Click += new System.EventHandler(this.ButtonSelectShip_Click);
+			// 
 			// FormClass
 			// 
 			this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
 			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
 			this.ClientSize = new System.Drawing.Size(800, 450);
+			this.Controls.Add(this.buttonSelectShip);
 			this.Controls.Add(this.buttonCreateModif);
 			this.Controls.Add(this.ButtonCreate);
 			this.Controls.Add(this.buttonDown);
@@ -190,5 +202,6 @@
 		private Button buttonDown;
 		private Button ButtonCreate;
 		private Button buttonCreateModif;
+		private Button buttonSelectShip;
 	}
 }

WarmlyShip/WarmlyShip/FormClass.cs

@@ -4,6 +4,8 @@ namespace WarmlyShip
     {
         private DrawingWarmlyShip _warmlyShip;
 
+        public DrawingWarmlyShip SelectedShip { get; private set; }
+
         public FormClass()
         {
             InitializeComponent();
@@ -28,10 +30,17 @@ namespace WarmlyShip
 
 		private void ButtonCreate_Click(object sender, EventArgs e)
         {
-			Random random = new Random();
+			Random rnd = new();
-			_warmlyShip = new DrawingWarmlyShip(random.Next(100, 300), random.Next(1000, 3000), Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)));
+			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;
+			}
+			_warmlyShip = new DrawingWarmlyShip(rnd.Next(100, 300), rnd.Next(1000, 2000), color);
 			SetData();
 			Draw();
+
 		}
 
 		private void ButtonMove_Click(object sender, EventArgs e)
@@ -63,13 +72,28 @@ namespace WarmlyShip
 
         private void ButtonCreateModif_Click(object sender, EventArgs e)
         {
-			Random random = new Random();
+			Random rnd = new();
-			_warmlyShip = new DrawningMotorShip(random.Next(100, 300), random.Next(1000, 3000),
+			Color color = Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256));
-				Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)),
+			ColorDialog dialog = new();
-				Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)),
+			if (dialog.ShowDialog() == DialogResult.OK)
-				Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2)));
+			{
+				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;
+			}
+			_warmlyShip = new DrawningMotorShip(rnd.Next(100, 300), rnd.Next(1000, 2000), color, dopColor, Convert.ToBoolean(rnd.Next(0, 2)), Convert.ToBoolean(rnd.Next(0, 2)));
 			SetData();
 			Draw();
 		}
+
+        private void ButtonSelectShip_Click(object sender, EventArgs e)
+        {
+			SelectedShip = _warmlyShip;
+			DialogResult = DialogResult.OK;
+		}
     }
 }

WarmlyShip/WarmlyShip/FormMap.cs

@@ -1,88 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-
-namespace WarmlyShip
-{
-	public partial class FormMap : Form
-	{
-		private AbstractMap _abstractMap;
-
-		public FormMap()
-		{
-			InitializeComponent();
-			_abstractMap = new SimpleMap();
-		}
-
-		private void SetData(DrawingWarmlyShip warmlyShip)
-		{
-			toolStripStatusSpeed.Text = $"Скорость: {warmlyShip.warmlyShip?.Speed}";
-			toolStripStatusWeight.Text = $"Вес: {warmlyShip.warmlyShip?.Weight}";
-			toolStripStatusLabelBodyColor.Text = $"Цвет: {warmlyShip.warmlyShip?.BodyColor}";
-			pictureBox.Image = _abstractMap.CreateMap(pictureBox.Width, pictureBox.Height, new DrawningObjectShip(warmlyShip));
-		}
-
-
-		private void ButtonCreate_Click(object sender, EventArgs e)
-		{
-			Random random = new Random();
-			var warmlyShip = new DrawingWarmlyShip(random.Next(100, 300), random.Next(1000, 3000), Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)));
-			SetData(warmlyShip);
-		}
-
-		private void ButtonMove_Click(object sender, EventArgs e)
-		{
-			string name = ((Button)sender)?.Name ?? string.Empty;
-			Direction direction = Direction.None;
-			switch (name)
-			{
-				case "buttonLeft":
-					direction = Direction.Left;
-					break;
-				case "buttonUp":
-					direction = Direction.Up;
-					break;
-				case "buttonRight":
-					direction = Direction.Right;
-					break;
-				case "buttonDown":
-					direction = Direction.Down;
-					break;
-			}
-			pictureBox.Image = _abstractMap?.MoveObject(direction);
-		}
-
-		private void ButtonCreateModif_Click(object sender, EventArgs e)
-		{
-			Random random = new Random();
-			var warmlyShip = new DrawningMotorShip(random.Next(100, 300), random.Next(1000, 3000),
-				Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)),
-				Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)),
-				Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2)));
-			SetData(warmlyShip);
-		}
-
-		private void СomboBoxSelectorMap_SelectedIndexChanged(object sender, EventArgs e)
-		{
-			switch (comboBoxSelectorMap.Text)
-			{
-				case "Простая карта":
-					_abstractMap = new SimpleMap();
-					break;
-				case "Вторая карта":
-					_abstractMap = new SecondMap();
-					break;
-				case "Последняя карта":
-					_abstractMap = new LastMap();
-					break;
-			}
-
-		}
-	}
-}

WarmlyShip/WarmlyShip/FormMapWithSetShip.Designer.cs

@@ -1,6 +1,6 @@
 namespace WarmlyShip
 {
-	partial class FormMap
+	partial class FormMapWithSetShip
 	{
 		/// <summary>
 		/// Required designer variable.
@@ -28,183 +28,189 @@
 		/// </summary>
 		private void InitializeComponent()
 		{
-			this.pictureBox = new System.Windows.Forms.PictureBox();
+			this.groupBox1 = new System.Windows.Forms.GroupBox();
-			this.statusStrip = new System.Windows.Forms.StatusStrip();
+			this.maskedTextBoxPosition = new System.Windows.Forms.MaskedTextBox();
-			this.toolStripStatusSpeed = new System.Windows.Forms.ToolStripStatusLabel();
-			this.toolStripStatusWeight = new System.Windows.Forms.ToolStripStatusLabel();
-			this.toolStripStatusLabelBodyColor = new System.Windows.Forms.ToolStripStatusLabel();
-			this.buttonRight = new System.Windows.Forms.Button();
-			this.buttonUp = new System.Windows.Forms.Button();
-			this.buttonLeft = new System.Windows.Forms.Button();
 			this.buttonDown = new System.Windows.Forms.Button();
-			this.ButtonCreate = new System.Windows.Forms.Button();
+			this.buttonLeft = new System.Windows.Forms.Button();
-			this.buttonCreateModif = new System.Windows.Forms.Button();
+			this.buttonUp = new System.Windows.Forms.Button();
+			this.buttonRight = 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.buttonAddShip = new System.Windows.Forms.Button();
 			this.comboBoxSelectorMap = new System.Windows.Forms.ComboBox();
+			this.pictureBox = new System.Windows.Forms.PictureBox();
+			this.groupBox1.SuspendLayout();
 			((System.ComponentModel.ISupportInitialize)(this.pictureBox)).BeginInit();
-			this.statusStrip.SuspendLayout();
 			this.SuspendLayout();
 			// 
-			// pictureBox
+			// groupBox1
 			// 
-			this.pictureBox.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.groupBox1.Controls.Add(this.maskedTextBoxPosition);
-			this.pictureBox.Location = new System.Drawing.Point(0, 0);
+			this.groupBox1.Controls.Add(this.buttonDown);
-			this.pictureBox.Name = "pictureBox";
+			this.groupBox1.Controls.Add(this.buttonLeft);
-			this.pictureBox.Size = new System.Drawing.Size(800, 428);
+			this.groupBox1.Controls.Add(this.buttonUp);
-			this.pictureBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
+			this.groupBox1.Controls.Add(this.buttonRight);
-			this.pictureBox.TabIndex = 0;
+			this.groupBox1.Controls.Add(this.buttonShowOnMap);
-			this.pictureBox.TabStop = false;
+			this.groupBox1.Controls.Add(this.buttonShowStorage);
+			this.groupBox1.Controls.Add(this.buttonRemoveShip);
+			this.groupBox1.Controls.Add(this.buttonAddShip);
+			this.groupBox1.Controls.Add(this.comboBoxSelectorMap);
+			this.groupBox1.Dock = System.Windows.Forms.DockStyle.Right;
+			this.groupBox1.Location = new System.Drawing.Point(600, 0);
+			this.groupBox1.Name = "groupBox1";
+			this.groupBox1.Size = new System.Drawing.Size(200, 450);
+			this.groupBox1.TabIndex = 0;
+			this.groupBox1.TabStop = false;
+			this.groupBox1.Text = "Инструменты";
 			// 
-			// statusStrip
+			// maskedTextBoxPosition
 			// 
-			this.statusStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+			this.maskedTextBoxPosition.Location = new System.Drawing.Point(6, 116);
-            this.toolStripStatusSpeed,
+			this.maskedTextBoxPosition.Mask = "00";
-            this.toolStripStatusWeight,
+			this.maskedTextBoxPosition.Name = "maskedTextBoxPosition";
-            this.toolStripStatusLabelBodyColor});
+			this.maskedTextBoxPosition.Size = new System.Drawing.Size(188, 23);
-			this.statusStrip.Location = new System.Drawing.Point(0, 428);
+			this.maskedTextBoxPosition.TabIndex = 11;
-			this.statusStrip.Name = "statusStrip";
-			this.statusStrip.Size = new System.Drawing.Size(800, 22);
-			this.statusStrip.TabIndex = 1;
-			this.statusStrip.Text = "statusStrip1";
-			// 
-			// toolStripStatusSpeed
-			// 
-			this.toolStripStatusSpeed.Name = "toolStripStatusSpeed";
-			this.toolStripStatusSpeed.Size = new System.Drawing.Size(62, 17);
-			this.toolStripStatusSpeed.Text = "Скорость:";
-			// 
-			// toolStripStatusWeight
-			// 
-			this.toolStripStatusWeight.Name = "toolStripStatusWeight";
-			this.toolStripStatusWeight.Size = new System.Drawing.Size(29, 17);
-			this.toolStripStatusWeight.Text = "Вес:";
-			// 
-			// toolStripStatusLabelBodyColor
-			// 
-			this.toolStripStatusLabelBodyColor.Name = "toolStripStatusLabelBodyColor";
-			this.toolStripStatusLabelBodyColor.Size = new System.Drawing.Size(36, 17);
-			this.toolStripStatusLabelBodyColor.Text = "Цвет:";
-			// 
-			// 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.toright;
-			this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-			this.buttonRight.Location = new System.Drawing.Point(738, 375);
-			this.buttonRight.Name = "buttonRight";
-			this.buttonRight.Size = new System.Drawing.Size(50, 50);
-			this.buttonRight.TabIndex = 3;
-			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.totop;
-			this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-			this.buttonUp.Location = new System.Drawing.Point(682, 319);
-			this.buttonUp.Name = "buttonUp";
-			this.buttonUp.Size = new System.Drawing.Size(50, 50);
-			this.buttonUp.TabIndex = 4;
-			this.buttonUp.UseVisualStyleBackColor = true;
-			this.buttonUp.Click += new System.EventHandler(this.ButtonMove_Click);
-			// 
-			// buttonLeft
-			// 
-			this.buttonLeft.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-			this.buttonLeft.BackgroundImage = global::WarmlyShip.Properties.Resources.toleft;
-			this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-			this.buttonLeft.Location = new System.Drawing.Point(626, 375);
-			this.buttonLeft.Name = "buttonLeft";
-			this.buttonLeft.Size = new System.Drawing.Size(50, 50);
-			this.buttonLeft.TabIndex = 5;
-			this.buttonLeft.UseVisualStyleBackColor = true;
-			this.buttonLeft.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.todown;
 			this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-			this.buttonDown.Location = new System.Drawing.Point(682, 375);
+			this.buttonDown.Location = new System.Drawing.Point(75, 391);
 			this.buttonDown.Name = "buttonDown";
 			this.buttonDown.Size = new System.Drawing.Size(50, 50);
-			this.buttonDown.TabIndex = 6;
+			this.buttonDown.TabIndex = 10;
 			this.buttonDown.UseVisualStyleBackColor = true;
 			this.buttonDown.Click += new System.EventHandler(this.ButtonMove_Click);
 			// 
-			// ButtonCreate
+			// buttonLeft
 			// 
-			this.ButtonCreate.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+			this.buttonLeft.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-			this.ButtonCreate.Location = new System.Drawing.Point(12, 402);
+			this.buttonLeft.BackgroundImage = global::WarmlyShip.Properties.Resources.toleft;
-			this.ButtonCreate.Name = "ButtonCreate";
+			this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-			this.ButtonCreate.Size = new System.Drawing.Size(75, 23);
+			this.buttonLeft.Location = new System.Drawing.Point(19, 391);
-			this.ButtonCreate.TabIndex = 7;
+			this.buttonLeft.Name = "buttonLeft";
-			this.ButtonCreate.Text = "Создать";
+			this.buttonLeft.Size = new System.Drawing.Size(50, 50);
-			this.ButtonCreate.UseVisualStyleBackColor = true;
+			this.buttonLeft.TabIndex = 9;
-			this.ButtonCreate.Click += new System.EventHandler(this.ButtonCreate_Click);
+			this.buttonLeft.UseVisualStyleBackColor = true;
+			this.buttonLeft.Click += new System.EventHandler(this.ButtonMove_Click);
 			// 
-			// buttonCreateModif
+			// buttonUp
 			// 
-			this.buttonCreateModif.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+			this.buttonUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-			this.buttonCreateModif.Location = new System.Drawing.Point(93, 402);
+			this.buttonUp.BackgroundImage = global::WarmlyShip.Properties.Resources.totop;
-			this.buttonCreateModif.Name = "buttonCreateModif";
+			this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-			this.buttonCreateModif.Size = new System.Drawing.Size(100, 23);
+			this.buttonUp.Location = new System.Drawing.Point(75, 335);
-			this.buttonCreateModif.TabIndex = 8;
+			this.buttonUp.Name = "buttonUp";
-			this.buttonCreateModif.Text = "Модификация ";
+			this.buttonUp.Size = new System.Drawing.Size(50, 50);
-			this.buttonCreateModif.UseVisualStyleBackColor = true;
+			this.buttonUp.TabIndex = 8;
-			this.buttonCreateModif.Click += new System.EventHandler(this.ButtonCreateModif_Click);
+			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.toright;
+			this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+			this.buttonRight.Location = new System.Drawing.Point(131, 391);
+			this.buttonRight.Name = "buttonRight";
+			this.buttonRight.Size = new System.Drawing.Size(50, 50);
+			this.buttonRight.TabIndex = 7;
+			this.buttonRight.UseVisualStyleBackColor = true;
+			this.buttonRight.Click += new System.EventHandler(this.ButtonMove_Click);
+			// 
+			// buttonShowOnMap
+			// 
+			this.buttonShowOnMap.Location = new System.Drawing.Point(6, 281);
+			this.buttonShowOnMap.Name = "buttonShowOnMap";
+			this.buttonShowOnMap.Size = new System.Drawing.Size(188, 23);
+			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, 226);
+			this.buttonShowStorage.Name = "buttonShowStorage";
+			this.buttonShowStorage.Size = new System.Drawing.Size(188, 23);
+			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, 170);
+			this.buttonRemoveShip.Name = "buttonRemoveShip";
+			this.buttonRemoveShip.Size = new System.Drawing.Size(188, 23);
+			this.buttonRemoveShip.TabIndex = 3;
+			this.buttonRemoveShip.Text = "Удалить корабль";
+			this.buttonRemoveShip.UseVisualStyleBackColor = true;
+			this.buttonRemoveShip.Click += new System.EventHandler(this.ButtonRemoveShip_Click);
+			// 
+			// buttonAddShip
+			// 
+			this.buttonAddShip.Location = new System.Drawing.Point(6, 65);
+			this.buttonAddShip.Name = "buttonAddShip";
+			this.buttonAddShip.Size = new System.Drawing.Size(188, 23);
+			this.buttonAddShip.TabIndex = 1;
+			this.buttonAddShip.Text = "Добавить корабль";
+			this.buttonAddShip.UseVisualStyleBackColor = true;
+			this.buttonAddShip.Click += new System.EventHandler(this.ButtonAddShip_Click);
 			// 
 			// comboBoxSelectorMap
 			// 
-			this.comboBoxSelectorMap.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
 			this.comboBoxSelectorMap.FormattingEnabled = true;
 			this.comboBoxSelectorMap.Items.AddRange(new object[] {
             "Простая карта",
             "Вторая карта",
             "Последняя карта"});
-			this.comboBoxSelectorMap.Location = new System.Drawing.Point(12, 12);
+			this.comboBoxSelectorMap.Location = new System.Drawing.Point(6, 22);
 			this.comboBoxSelectorMap.Name = "comboBoxSelectorMap";
-			this.comboBoxSelectorMap.Size = new System.Drawing.Size(121, 23);
+			this.comboBoxSelectorMap.Size = new System.Drawing.Size(188, 23);
-			this.comboBoxSelectorMap.TabIndex = 9;
+			this.comboBoxSelectorMap.TabIndex = 0;
-			this.comboBoxSelectorMap.SelectedIndexChanged += new System.EventHandler(this.СomboBoxSelectorMap_SelectedIndexChanged);
+			this.comboBoxSelectorMap.SelectedIndexChanged += new System.EventHandler(this.ComboBoxSelectorMap_SelectedIndexChanged);
 			// 
-			// FormMap
+			// 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(600, 450);
+			this.pictureBox.TabIndex = 1;
+			this.pictureBox.TabStop = false;
+			// 
+			// FormMapWithSetShip
 			// 
 			this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
 			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
 			this.ClientSize = new System.Drawing.Size(800, 450);
-			this.Controls.Add(this.comboBoxSelectorMap);
-			this.Controls.Add(this.buttonCreateModif);
-			this.Controls.Add(this.ButtonCreate);
-			this.Controls.Add(this.buttonDown);
-			this.Controls.Add(this.buttonLeft);
-			this.Controls.Add(this.buttonUp);
-			this.Controls.Add(this.buttonRight);
 			this.Controls.Add(this.pictureBox);
-			this.Controls.Add(this.statusStrip);
+			this.Controls.Add(this.groupBox1);
-			this.Name = "FormMap";
+			this.Name = "FormMapWithSetShip";
-			this.Text = "FormMap";
+			this.Text = "FormMapWithSetShip";
+			this.groupBox1.ResumeLayout(false);
+			this.groupBox1.PerformLayout();
 			((System.ComponentModel.ISupportInitialize)(this.pictureBox)).EndInit();
-			this.statusStrip.ResumeLayout(false);
-			this.statusStrip.PerformLayout();
 			this.ResumeLayout(false);
-			this.PerformLayout();
 
 		}
 
 		#endregion
 
+		private GroupBox groupBox1;
 		private PictureBox pictureBox;
-		private StatusStrip statusStrip;
+		private Button buttonAddShip;
-		private ToolStripStatusLabel toolStripStatusSpeed;
-		private ToolStripStatusLabel toolStripStatusWeight;
-		private ToolStripStatusLabel toolStripStatusLabelBodyColor;
-		private Button buttonRight;
-		private Button buttonUp;
-		private Button buttonLeft;
-		private Button buttonDown;
-		private Button ButtonCreate;
-		private Button buttonCreateModif;
 		private ComboBox comboBoxSelectorMap;
+		private Button buttonShowOnMap;
+		private Button buttonShowStorage;
+		private Button buttonRemoveShip;
+		private Button buttonDown;
+		private Button buttonLeft;
+		private Button buttonUp;
+		private Button buttonRight;
+		private MaskedTextBox maskedTextBoxPosition;
 	}
 }

WarmlyShip/WarmlyShip/FormMapWithSetShip.cs

@@ -0,0 +1,139 @@
+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 WarmlyShip;
+
+namespace WarmlyShip
+{
+	public partial class FormMapWithSetShip : Form
+	{
+		private MapWithSetShipGeneric<DrawningObjectShip, AbstractMap> _mapShipCollectionGeneric;
+		public bool ShipOnMap = false;
+
+		public FormMapWithSetShip()
+		{
+			InitializeComponent();
+		}
+
+		private void ComboBoxSelectorMap_SelectedIndexChanged(object sender, EventArgs e)
+		{
+			AbstractMap map = null;
+			switch (comboBoxSelectorMap.Text)
+			{
+				case "Простая карта":
+					map = new SimpleMap();
+					break;
+				case "Вторая карта":
+					map = new SecondMap();
+					break;
+				case "Последняя карта":
+					map = new LastMap();
+					break;
+			}
+			if (map != null)
+			{
+				_mapShipCollectionGeneric = new MapWithSetShipGeneric<DrawningObjectShip, AbstractMap>(pictureBox.Width, pictureBox.Height, map);
+			}
+			else
+			{
+				_mapShipCollectionGeneric = null;
+			}
+		}
+		private void ButtonAddShip_Click(object sender, EventArgs e)
+		{
+			if (_mapShipCollectionGeneric == null)
+			{
+				return;
+			}
+			FormClass form = new();
+			if (form.ShowDialog() == DialogResult.OK)
+			{
+				DrawningObjectShip ship = new(form.SelectedShip);
+				if (_mapShipCollectionGeneric + ship > -1)
+				{
+					MessageBox.Show("Объект добавлен");
+					pictureBox.Image = _mapShipCollectionGeneric.ShowSet();
+				}
+				else
+				{
+					MessageBox.Show("Не удалось добавить объект");
+				}
+			}
+		}
+
+		private void ButtonRemoveShip_Click(object sender, EventArgs e)
+		{
+			if (string.IsNullOrEmpty(maskedTextBoxPosition.Text))
+			{
+				return;
+			}
+			if (MessageBox.Show("Удалить объект?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
+			{
+				return;
+			}
+			int pos = Convert.ToInt32(maskedTextBoxPosition.Text);
+			if (_mapShipCollectionGeneric - pos != null)
+			{
+				MessageBox.Show("Объект удален");
+				pictureBox.Image = _mapShipCollectionGeneric.ShowSet();
+			}
+			else
+			{
+				MessageBox.Show("Не удалось удалить объект");
+			}
+		}
+
+		private void ButtonShowStorage_Click(object sender, EventArgs e)
+		{
+			if (_mapShipCollectionGeneric == null)
+			{
+				return;
+			}
+			pictureBox.Image = _mapShipCollectionGeneric.ShowSet();
+			ShipOnMap = false;
+		}
+
+		private void ButtonShowOnMap_Click(object sender, EventArgs e)
+		{
+			if (_mapShipCollectionGeneric == null)
+			{
+				return;
+			}
+			pictureBox.Image = _mapShipCollectionGeneric.ShowOnMap();
+			ShipOnMap = true;
+		}
+
+		private void ButtonMove_Click(object sender, EventArgs e)
+		{
+			if (_mapShipCollectionGeneric == null || !ShipOnMap)
+			{
+				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 = _mapShipCollectionGeneric.MoveObject(dir);
+		}
+	}
+}

WarmlyShip/WarmlyShip/FormMapWithSetShip.resx

@@ -57,7 +57,4 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="statusStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
 </root>

WarmlyShip/WarmlyShip/MapWithSetShipGeneric.cs

@@ -0,0 +1,127 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WarmlyShip
+{
+	internal class MapWithSetShipGeneric<T, U>
+		where T : class, IDrawningObject
+		where U : AbstractMap
+	{
+		private readonly int _pictureWidth;
+		private readonly int _pictureHeight;
+		private readonly int _placeSizeWidth = 210;
+		private readonly int _placeSizeHeight = 100;
+		private readonly SetShipGeneric<T> _setShips;
+		private readonly U _map;
+
+		public MapWithSetShipGeneric(int picWidth, int picHeight, U map)
+		{
+			int width = picWidth / _placeSizeWidth;
+			int height = picHeight / _placeSizeHeight;
+			_setShips = new SetShipGeneric<T>(width * height);
+			_pictureWidth = picWidth;
+			_pictureHeight = picHeight;
+			_map = map;
+		}
+
+		public static int operator +(MapWithSetShipGeneric<T, U> map, T ship)
+		{
+			return map._setShips.Insert(ship);
+		}
+
+		public static T operator -(MapWithSetShipGeneric<T, U> map, int position)
+		{
+			return map._setShips.Remove(position);
+		}
+
+		public Bitmap ShowSet()
+		{
+			Bitmap bmp = new(_pictureWidth, _pictureHeight);
+			Graphics gr = Graphics.FromImage(bmp);
+			DrawShips(gr);
+			DrawBackground(gr);
+			return bmp;
+		}
+
+		public Bitmap ShowOnMap()
+		{
+			Shaking();
+			for (int i = 0; i < _setShips.Count; i++)
+			{
+				var ship = _setShips.Get(i);
+				if (ship != null)
+				{
+					return _map.CreateMap(_pictureWidth, _pictureHeight, ship);
+				}
+			}
+			return new(_pictureWidth, _pictureHeight);
+		}
+
+		public Bitmap MoveObject(Direction direction)
+		{
+			if (_map != null)
+			{
+				return _map.MoveObject(direction);
+			}
+			return new(_pictureWidth, _pictureHeight);
+		}
+
+		private void Shaking()
+		{
+			int j = _setShips.Count - 1;
+			for (int i = 0; i < _setShips.Count; ++i)
+			{
+				if (_setShips.Get(i) == null)
+				{
+					for (; j > i; --j)
+					{
+						var car = _setShips.Get(j);
+						if (car != null)
+						{
+							_setShips.Insert(car, i);
+							_setShips.Remove(j);
+							break;
+						}
+					}
+					if (j <= i)
+					{
+						return;
+					}
+				}
+			}
+		}
+
+		private void DrawBackground(Graphics g)
+		{
+			Pen pen = new(Color.Brown, 8);
+			for (int i = 0; i < _pictureWidth / _placeSizeWidth; ++i)
+			{
+				for (int j = 1; j < _pictureHeight / _placeSizeHeight + 1; ++j) //линия рамзетки места
+				{
+					g.DrawLine(pen, i * _placeSizeWidth, j * _placeSizeHeight, i * _placeSizeWidth + _placeSizeWidth / 2, j * _placeSizeHeight);
+					for (int k = 0; k < _placeSizeWidth / (30 * 2); ++k) 
+						g.DrawLine(pen, i * _placeSizeWidth + (k + 1) * 30, j * _placeSizeHeight, i * _placeSizeWidth + (k + 1) * 30, j * _placeSizeHeight + 30);
+				}
+				g.DrawLine(pen, i * _placeSizeWidth, 0, i * _placeSizeWidth, (_pictureHeight / _placeSizeHeight) * _placeSizeHeight);
+			}
+		}
+
+		private void DrawShips(Graphics g)
+		{
+			for (int i = 0; i < _setShips.Count; ++i)
+			{
+				if (_setShips.Get(i) != null )
+				{
+					int temp = 0;
+					if (_setShips.Get(i).GetCurrentPosition().Bottom - _setShips.Get(i).GetCurrentPosition().Top < 75) temp = (int)(_setShips.Get(i).GetCurrentPosition().Bottom - _setShips.Get(i).GetCurrentPosition().Top);
+					_setShips.Get(i).SetObject((_pictureWidth / _placeSizeWidth - (i % (_pictureWidth / _placeSizeWidth)) - 1) * _placeSizeWidth, (i / (_pictureWidth / _placeSizeWidth)) * _placeSizeHeight + temp, _pictureWidth, _pictureHeight);
+					_setShips.Get(i).DrawningObject(g);
+				}
+			}
+		}
+
+	}
+}

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 FormMapWithSetShip());
         }
     }
 }

WarmlyShip/WarmlyShip/SetShipGeneric.cs

@@ -0,0 +1,64 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WarmlyShip
+{
+	internal class SetShipGeneric<T>
+		where T : class
+	{
+		private readonly T[] _places;
+		public int Count => _places.Length;
+
+		public SetShipGeneric(int count)
+		{
+			_places = new T[count];
+		}
+
+		private bool CanInsert(int position)
+		{
+			for (int i = position; i < _places.Length; ++i)
+				if (_places[i] == null) return true;
+			return false;
+		}
+
+		public int Insert(T ship)
+		{
+			return Insert(ship, 0);
+		}
+
+		public int Insert(T ship, int position)
+		{
+			if (position < 0 || position > _places.Length) return -1;
+			if (_places[position] != null && CanInsert(position))
+			{
+				for (int i = _places.Length - 1; i > position; --i)
+				{
+					if (_places[i] == null)
+					{
+						_places[i] = _places[i - 1];
+						_places[i - 1] = null;
+					}
+				}
+			}
+			_places[position] = ship;
+			return position;
+		}
+
+		public T Remove(int position)
+		{
+			T DelElement = _places[position];
+			_places[position] = null;
+			return DelElement;
+		}
+
+		public T Get(int position)
+		{
+			if (position < 0 || position > _places.Length) return null;
+			return _places[position];
+		}
+
+	}
+}