Merge pull request 'Presnyakova V.V. Lab work 1' (#1) from Lab_1 into main

Reviewed-on: http://student.git.athene.tech/Victoria_Presnyakova/Pibd-22_Presnyakova.V.V_Catamaran_Base/pulls/1

Catamaran/AbstractMap.cs

@@ -1,164 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Catamaran
-{
-    internal abstract class AbstractMap
-    {
-        private IDrawingObject _drawingObject = null;
-        protected int[,] _map = null;
-        protected int _width;
-        protected int _height;
-        protected float _size_x;
-        protected float _size_y;
-        protected readonly Random _random = new Random();
-        protected readonly int _freeRoad = 0;
-        protected readonly int _barrier = 1;
-        public Bitmap CreateMap(int width, int height, IDrawingObject drawingObject)
-        {
-            _width = width;
-            _height = height;
-            _drawingObject = drawingObject;
-            GenerateMap();
-            while (!SetObjectOnMap())
-            {
-                GenerateMap();
-            }
-            return DrawMapWithObject();
-        }
-        public Bitmap MoveObject(Direction direction)
-        {
-            bool isFree = true;
-            int startPosX = (int)(_drawingObject.GetCurrentPosition().Left / _size_x);
-            int startPosY = (int)(_drawingObject.GetCurrentPosition().Right / _size_y);
-            int boatWidth = (int)(_drawingObject.GetCurrentPosition().Top / _size_x);
-            int boatHeight = (int)(_drawingObject.GetCurrentPosition().Bottom / _size_y);
-
-            switch (direction)
-            {
-                // вправо
-                case Direction.Right:
-                    for (int i = boatWidth; i <= boatWidth + (int)(_drawingObject.Step / _size_x); i++)
-                    {
-                        for (int j = startPosY; j <= boatHeight; j++)
-                        {
-                            if (_map[i, j] == _barrier)
-                            {
-                                isFree = false;
-                                break;
-                            }
-                        }
-                    }
-                    break;
-                //влево
-                case Direction.Left:
-                    for (int i = startPosX; i >= (int)(_drawingObject.Step / _size_x); i--)
-                    {
-                        for (int j = startPosY; j <= boatHeight; j++)
-                        {
-                            if (_map[i, j] == _barrier)
-                            {
-                                isFree = false;
-                                break;
-                            }
-                        }
-                    }
-                    break;
-                //вверх
-                case Direction.Up:
-                    for (int i = startPosX; i <= boatWidth; i++)
-                    {
-                        for (int j = startPosY; j >= (int)(_drawingObject.Step / _size_y); j--)
-                        {
-                            if (_map[i, j] == _barrier)
-                            {
-                                isFree = false;
-                                break;
-                            }
-                        }
-                    }
-                    break;
-                //вниз
-                case Direction.Down:
-                    for (int i = startPosX; i <= boatWidth; i++)
-                    {
-                        for (int j = boatHeight; j <= boatHeight + (int)(_drawingObject.Step / _size_y); j++)
-                        {
-                            if (_map[i, j] == _barrier)
-                            {
-                                isFree = false;
-                                break;
-                            }
-                        }
-                    }
-                    break;
-            }
-
-            if (isFree)
-            {
-                _drawingObject.MoveObject(direction);
-            }
-            return DrawMapWithObject();
-        }
-            private bool SetObjectOnMap()
-        {
-            if (_drawingObject == null || _map == null)
-            {
-                return false;
-            }
-            int x = _random.Next(0, 10);
-            int y = _random.Next(0, 10);
-            _drawingObject.SetObject(x, y, _width, _height);
-            // TODO првоерка, что объект не "накладывается" на закрытые участки
-            _drawingObject.SetObject(x, y, _width, _height);
-            int startPosX = (int)(_drawingObject.GetCurrentPosition().Left / _size_x);
-            int startPosY = (int)(_drawingObject.GetCurrentPosition().Right / _size_y);
-            int boatWidth = (int)(_drawingObject.GetCurrentPosition().Top / _size_x);
-            int boatHeight = (int)(_drawingObject.GetCurrentPosition().Bottom / _size_y);
-            for (int i = startPosX; i <= boatWidth; i++)
-            {
-                for (int j = startPosY; j <= boatHeight; j++)
-                {
-                    if (_map[i, j] == _barrier)
-                    {
-                        return false;
-                    }
-                }
-            }
-            return true;
-        }
-        private Bitmap DrawMapWithObject()
-        {
-            Bitmap bmp = new Bitmap(_width, _height);
-            if (_drawingObject == null || _map == null)
-            {
-                return bmp;
-            }
-            Graphics gr = Graphics.FromImage(bmp);
-            for (int i = 0; i < _map.GetLength(0); ++i)
-            {
-                for (int j = 0; j < _map.GetLength(1); ++j)
-                {
-                    if (_map[i, j] == _freeRoad)
-                    {
-                        DrawRoadPart(gr, i, j);
-                    }
-                    else if (_map[i, j] == _barrier)
-                    {
-                        DrawBarrierPart(gr, i, j);
-                    }
-                }
-            }
-            _drawingObject.DrawingObject(gr);
-            return bmp;
-        }
-        protected abstract void GenerateMap();
-        protected abstract void DrawRoadPart(Graphics g, int i, int j);
-        protected abstract void DrawBarrierPart(Graphics g, int i, int j);
-
-    }
-}

Catamaran/Catamaran.csproj

@@ -46,37 +46,19 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="AbstractMap.cs" />
-    <Compile Include="DrawingCatamaran.cs" />
-    <Compile Include="DrawingObjectBoat.cs" />
-    <Compile Include="EntityCatamaran.cs" />
     <Compile Include="Direction.cs" />
-    <Compile Include="DrawingBoat.cs" />
-    <Compile Include="EntityBoat.cs" />
-    <Compile Include="FormBoat.cs">
+    <Compile Include="DrawingCatamaran.cs" />
+    <Compile Include="EntityCatamaran.cs" />
+    <Compile Include="CatamaranForm.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="FormBoat.Designer.cs">
-      <DependentUpon>FormBoat.cs</DependentUpon>
+    <Compile Include="CatamaranForm.Designer.cs">
+      <DependentUpon>CatamaranForm.cs</DependentUpon>
     </Compile>
-    <Compile Include="FormMapWithSetBoats.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="FormMapWithSetBoats.Designer.cs">
-      <DependentUpon>FormMapWithSetBoats.cs</DependentUpon>
-    </Compile>
-    <Compile Include="IDrawingObject.cs" />
-    <Compile Include="MapWithSetBoatsGeneric.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="SecondMap.cs" />
-    <Compile Include="SetBoatsGeneric.cs" />
-    <Compile Include="SimpleMap.cs" />
-    <EmbeddedResource Include="FormBoat.resx">
-      <DependentUpon>FormBoat.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="FormMapWithSetBoats.resx">
-      <DependentUpon>FormMapWithSetBoats.cs</DependentUpon>
+    <EmbeddedResource Include="CatamaranForm.resx">
+      <DependentUpon>CatamaranForm.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>

Catamaran/CatamaranForm.Designer.cs

@@ -1,6 +1,6 @@
 namespace Catamaran
 {
-    partial class FormBoat
+    partial class CatamaranForm
     {
         /// <summary>
         /// Обязательная переменная конструктора.
@@ -38,8 +38,6 @@
             this.buttonLeft = new System.Windows.Forms.Button();
             this.buttonRight = new System.Windows.Forms.Button();
             this.buttonCreate = new System.Windows.Forms.Button();
-            this.buttonCreateModif = new System.Windows.Forms.Button();
-            this.buttonSelectBoat = new System.Windows.Forms.Button();
             this.statusStrip1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBoxCatamaran)).BeginInit();
             this.SuspendLayout();
@@ -74,6 +72,7 @@
             this.toolStripStatusLabelColor.Name = "toolStripStatusLabelColor";
             this.toolStripStatusLabelColor.Size = new System.Drawing.Size(55, 25);
             this.toolStripStatusLabelColor.Text = "Color";
+            this.toolStripStatusLabelColor.Click += new System.EventHandler(this.toolStripStatusLabel3_Click);
             // 
             // pictureBoxCatamaran
             // 
@@ -144,36 +143,12 @@
             this.buttonCreate.Text = "Cteate";
             this.buttonCreate.UseVisualStyleBackColor = true;
             this.buttonCreate.Click += new System.EventHandler(this.buttonCreate_Click);
-            // 
-            // buttonCreateModif
-            // 
-            this.buttonCreateModif.Location = new System.Drawing.Point(90, 380);
-            this.buttonCreateModif.Name = "buttonCreateModif";
-            this.buttonCreateModif.Size = new System.Drawing.Size(108, 30);
-            this.buttonCreateModif.TabIndex = 7;
-            this.buttonCreateModif.Text = "CreateModif";
-            this.buttonCreateModif.UseVisualStyleBackColor = true;
-            this.buttonCreateModif.Click += new System.EventHandler(this.buttonCreateModif_Click);
-
-            // 
-            // buttonSelectBoat
-            // 
-            this.buttonSelectBoat.Location = new System.Drawing.Point(204, 384);
-            this.buttonSelectBoat.Name = "buttonSelectBoat";
-            this.buttonSelectBoat.Size = new System.Drawing.Size(113, 26);
-            this.buttonSelectBoat.TabIndex = 8;
-            this.buttonSelectBoat.Text = "SelectBoat";
-            this.buttonSelectBoat.UseVisualStyleBackColor = true;
-            this.buttonSelectBoat.Click += new System.EventHandler(this.buttonSelectBoat_Click);
-
             // 
             // CatamaranForm
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(796, 461);
-            this.Controls.Add(this.buttonSelectBoat);
-            this.Controls.Add(this.buttonCreateModif);
             this.Controls.Add(this.buttonCreate);
             this.Controls.Add(this.buttonRight);
             this.Controls.Add(this.buttonLeft);
@@ -183,6 +158,7 @@
             this.Controls.Add(this.statusStrip1);
             this.Name = "CatamaranForm";
             this.Text = "Catamaran";
+            this.Load += new System.EventHandler(this.CatamaranForm_Load);
             this.statusStrip1.ResumeLayout(false);
             this.statusStrip1.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBoxCatamaran)).EndInit();
@@ -203,8 +179,6 @@
         private System.Windows.Forms.Button buttonLeft;
         private System.Windows.Forms.Button buttonRight;
         private System.Windows.Forms.Button buttonCreate;
-        private System.Windows.Forms.Button buttonCreateModif;
-        private System.Windows.Forms.Button buttonSelectBoat;
     }
 }
 

Catamaran/CatamaranForm.cs

@@ -10,12 +10,10 @@ using System.Windows.Forms;
 
 namespace Catamaran
 {
-    public partial class FormBoat : Form
+    public partial class CatamaranForm : Form
     {
-        private DrawingBoat _catamaran;
-        public DrawingBoat SelectedBoat { get; private set; }
-
-        public FormBoat()
+        private DrawingCatamaran _catamaran;
+        public CatamaranForm()
         {
             InitializeComponent();
         }
@@ -26,26 +24,26 @@ namespace Catamaran
             _catamaran?.DrawTransport(gr);
             pictureBoxCatamaran.Image = bmp;
         }
-        private void SetData()
+      
+        private void CatamaranForm_Load(object sender, EventArgs e)
         {
-            Random rnd = new Random();
-            _catamaran.SetPosition(rnd.Next(10, 100), rnd.Next(10, 100),
-           pictureBoxCatamaran.Width, pictureBoxCatamaran.Height);
-            toolStripStatusLabelSpeed.Text = $"Скорость: {_catamaran.Catamaran.Speed}";
-            toolStripStatusLabelWeight.Text = $"Вес: {_catamaran.Catamaran.Weight}";
-            toolStripStatusLabelColor.Text = $"Цвет: { _catamaran.Catamaran.BodyColor.Name}";
+
+        }
+        private void toolStripStatusLabel3_Click(object sender, EventArgs e)
+        {
+
         }
         private void buttonCreate_Click(object sender, EventArgs e)
         {
             Random rnd = new Random();
-            Color color = Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256));
-            ColorDialog dialog = new ColorDialog();
-            if (dialog.ShowDialog() == DialogResult.OK)
-            {
-                color = dialog.Color;
-            }
-            _catamaran = new DrawingBoat(rnd.Next(100, 300), rnd.Next(1000, 2000), color);
-            SetData();
+            _catamaran = new DrawingCatamaran();
+            _catamaran.Init(rnd.Next(100, 300), rnd.Next(1000, 2000),
+           Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)));
+            _catamaran.SetPosition(rnd.Next(10, 100), rnd.Next(10, 100),
+           pictureBoxCatamaran.Width, pictureBoxCatamaran.Height);
+            toolStripStatusLabelSpeed.Text = $"Скорость: {_catamaran.Catamaran.Speed}";
+            toolStripStatusLabelWeight.Text = $"Вес: {_catamaran.Catamaran.Weight}";
+            toolStripStatusLabelColor.Text = $"Цвет:{ _catamaran.Catamaran.BodyColor.Name}";
             Draw();
         }
         private void buttonMove_Click(object sender, EventArgs e)
@@ -75,37 +73,5 @@ namespace Catamaran
             _catamaran?.ChangeBorders(pictureBoxCatamaran.Width, pictureBoxCatamaran.Height);
             Draw();
         }
-        private void buttonCreateModif_Click(object sender, EventArgs e)
-        {
-            Random rnd = new Random();
-            Color color = Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256));
-            ColorDialog dialog = new ColorDialog();
-            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 ColorDialog();
-            if (dialogDop.ShowDialog() == DialogResult.OK)
-            {
-                dopColor = dialogDop.Color;
-            }
-            _catamaran = new DrawingCatamaran(rnd.Next(100, 300), rnd.Next(1000, 2000),
-           color, dopColor,
-            Convert.ToBoolean(rnd.Next(0, 2)), Convert.ToBoolean(rnd.Next(0, 2)));
-            SetData();
-            Draw();
-        }
-        /// <summary>
-        /// Обработка нажатия кнопки "Выбрать"
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void buttonSelectBoat_Click(object sender, EventArgs e)
-        {
-            SelectedBoat = _catamaran;
-            DialogResult = DialogResult.OK;
-        }
     }
 }

Catamaran/Direction.cs

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

Catamaran/DrawingBoat.cs

@@ -1,191 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Catamaran
-{
-   public class DrawingBoat
-    {
-        /// <summary>
-        /// Класс-сущность
-        /// </summary>
-        public EntityBoat Catamaran { set; get; }
-        /// <summary>
-        /// Левая координата отрисовки лодки
-        /// </summary>
-        protected float _startPosX;
-        /// <summary>
-        /// Верхняя кооридната отрисовки лодки
-        /// </summary>
-        protected float _startPosY;
-        /// <summary>
-        /// Ширина окна отрисовки
-        /// </summary>
-        protected int? _pictureWidth = null;
-        /// <summary>
-        /// Высота окна отрисовки
-        /// </summary>
-        protected int? _pictureHeight = null;
-        /// <summary>
-        /// Ширина отрисовки лодки
-        /// </summary>
-        protected readonly int _catamaranWidth = 80;
-        /// <summary>
-        /// Высота отрисовки лодки
-        /// </summary>
-        protected readonly int _catamaranHeight = 50;
-        /// <summary>
-        /// Инициализация свойств
-        /// </summary>
-        /// <param name="speed">Скорость</param>
-        /// <param name="weight">Вес лодки</param>
-        /// <param name="bodyColor">Цвет лодки</param>
-        public DrawingBoat(int speed, float weight, Color bodyColor)
-        {
-            Catamaran = new EntityBoat(speed, weight, bodyColor);
-        }
-
-        /// <summary>
-        /// Получение текущей позиции объекта
-        /// </summary>
-        /// <returns></returns>
-        public (float Left, float Right, float Top, float Bottom)
-       GetCurrentPosition()
-        {
-            return (_startPosX, _startPosY, _startPosX + _catamaranWidth, _startPosY +
-           _catamaranHeight);
-        }
-
-        /// <summary>
-        /// Установка позиции лодки
-        /// </summary>
-        /// <param name="x">Координата X</param>
-        /// <param name="y">Координата Y</param>
-        /// <param name="width">Ширина картинки</param>
-        /// <param name="height">Высота картинки</param>
-        public void SetPosition(int x, int y, int width, int height)
-        {
-            if (x < 0 || y < 0 || x + _catamaranWidth > width || y + _catamaranHeight > height) return;
-            _startPosX = x;
-            _startPosY = y;
-            _pictureWidth = width;
-            _pictureHeight = height;
-        }
-        /// <summary>
-        /// Изменение направления перемещения
-        /// </summary>
-        /// <param name="direction">Направление</param>
-        public void MoveTransport(Direction direction)
-        {
-            if (!_pictureWidth.HasValue || !_pictureHeight.HasValue)
-            {
-                return;
-            }
-            switch (direction)
-            {
-                // вправо
-                case Direction.Right:
-                    if (_startPosX + _catamaranWidth + Catamaran.Step < _pictureWidth)
-                    {
-                        _startPosX += Catamaran.Step;
-                    }
-                    break;
-                //влево
-                case Direction.Left:
-                    if (_startPosX - Catamaran.Step > 0)
-                    {
-                        _startPosX -= Catamaran.Step;
-                    }
-                    break;
-                //вверх
-                case Direction.Up:
-                    if (_startPosY - Catamaran.Step > 0)
-                    {
-                        _startPosY -= Catamaran.Step;
-                    }
-                    break;
-                //вниз
-                case Direction.Down:
-                    if (_startPosY + _catamaranHeight + Catamaran.Step < _pictureHeight)
-                    {
-                        _startPosY += Catamaran.Step;
-                    }
-                    break;
-            }
-        }
-        /// <summary>
-        /// Инициализация свойств
-        /// </summary>
-        /// <param name="speed">Скорость</param>
-        /// <param name="weight">Вес автомобиля</param>
-        /// <param name="bodyColor">Цвет кузова</param>
-        /// <param name="carWidth">Ширина отрисовки автомобиля</param>
-        /// <param name="carHeight">Высота отрисовки автомобиля</param>
-        protected DrawingBoat(int speed, float weight, Color bodyColor, int
-       catamaranWidth, int catamaranHeight) :
-        this(speed, weight, bodyColor)
-        {
-            _catamaranWidth = catamaranWidth;
-            _catamaranHeight = catamaranHeight;
-        }
-
-        /// <summary>
-        /// Отрисовка лодки
-        /// </summary>
-        /// <param name="g"></param>
-        public virtual void DrawTransport(Graphics g)
-        {
-            if (_startPosX < 0 || _startPosY < 0
-            || !_pictureHeight.HasValue || !_pictureWidth.HasValue)
-            {
-                return;
-            }
-            Pen pen = new Pen(Color.Black);
-            //границы
-            g.DrawRectangle(pen, _startPosX, _startPosY, _catamaranWidth * 3 / 4, _catamaranHeight);
-
-            Point point_1 = new Point((int)(_startPosX + _catamaranWidth * 3 / 4), (int)_startPosY);
-            Point point_2 = new Point((int)(_startPosX + _catamaranWidth), (int)(_startPosY + _catamaranHeight / 2));
-            Point point_3 = new Point((int)(_startPosX + _catamaranWidth * 3 / 4), (int)(_startPosY + _catamaranHeight));
-            Point[] pointsArray = {point_1, point_2, point_3};
-            g.DrawPolygon(pen, pointsArray);
-            Brush br = new SolidBrush(Catamaran?.BodyColor ?? Color.Black);
-            g.FillRectangle(br, _startPosX, _startPosY, _catamaranWidth * 3 / 4, _catamaranHeight);
-            g.FillPolygon(br, pointsArray);
-
-            // середина
-            g.DrawEllipse(pen, _startPosX +  5, _startPosY +  5, _catamaranWidth - 15, _catamaranHeight - 11);
-            Brush brBlue = new SolidBrush(Color.LightBlue);
-            g.FillEllipse(brBlue, _startPosX + 5, _startPosY + 5, _catamaranWidth - 15, _catamaranHeight - 11);
-        }
-        /// <summary>
-        /// Смена границ формы отрисовки
-        /// </summary>
-        /// <param name="width">Ширина картинки</param>
-        /// <param name="height">Высота картинки</param>
-        public void ChangeBorders(int width, int height)
-        {
-            _pictureWidth = width;
-            _pictureHeight = height;
-            if (_pictureWidth <= _catamaranWidth || _pictureHeight <= _catamaranHeight)
-            {
-                _pictureWidth = null;
-                _pictureHeight = null;
-                return;
-            }
-            if (_startPosX + _catamaranWidth > _pictureWidth)
-            {
-                _startPosX = _pictureWidth.Value - _catamaranWidth;
-            }
-            if (_startPosY + _catamaranHeight > _pictureHeight)
-            {
-                _startPosY = _pictureHeight.Value - _catamaranHeight;
-            }
-        }
-    }
-}
-
-   

Catamaran/DrawingCatamaran.cs

@@ -7,56 +7,158 @@ using System.Threading.Tasks;
 
 namespace Catamaran
 {
-    internal class DrawingCatamaran : DrawingBoat
+   internal class DrawingCatamaran
     {
+        /// <summary>
+        /// Класс-сущность
+        /// </summary>
+        public EntityCatamaran Catamaran { private set; get; }
+        /// <summary>
+        /// Левая координата отрисовки лодки
+        /// </summary>
+        private float _startPosX;
+        /// <summary>
+        /// Верхняя кооридната отрисовки лодки
+        /// </summary>
+        private float _startPosY;
+        /// <summary>
+        /// Ширина окна отрисовки
+        /// </summary>
+        private int? _pictureWidth = null;
+        /// <summary>
+        /// Высота окна отрисовки
+        /// </summary>
+        private int? _pictureHeight = null;
+        /// <summary>
+        /// Ширина отрисовки лодки
+        /// </summary>
+        private readonly int _catamaranWidth = 80;
+        /// <summary>
+        /// Высота отрисовки лодки
+        /// </summary>
+        private readonly int _catamaranHeight = 50;
         /// <summary>
         /// Инициализация свойств
         /// </summary>
         /// <param name="speed">Скорость</param>
-        /// <param name="weight">Вес автомобиля</param>
-        /// <param name="bodyColor">Цвет кузова</param>
-        /// <param name="dopColor">Дополнительный цвет</param>
-        /// <param name="Floats">Признак наличия обвеса</param>
-        /// <param name="Sail">Признак наличия антикрыла</param>
-        public DrawingCatamaran(int speed, float weight, Color bodyColor, Color
-       dopColor, bool Floats, bool Sail) :
-        base(speed, weight, bodyColor, 110, 60)
+        /// <param name="weight">Вес лодки</param>
+        /// <param name="bodyColor">Цвет лодки</param>
+        public void Init(int speed, float weight, Color bodyColor)
         {
-            Catamaran = new EntityCatamaran(speed, weight, bodyColor, dopColor, Floats,
-           Sail);
+            Catamaran = new EntityCatamaran();
+            Catamaran.Init(speed, weight, bodyColor);
         }
-        public override void DrawTransport(Graphics g)
+        /// <summary>
+        /// Установка позиции лодки
+        /// </summary>
+        /// <param name="x">Координата X</param>
+        /// <param name="y">Координата Y</param>
+        /// <param name="width">Ширина картинки</param>
+        /// <param name="height">Высота картинки</param>
+        public void SetPosition(int x, int y, int width, int height)
         {
-            if (!(Catamaran is EntityCatamaran catamaranPro))
+            if (x < 0 || y < 0 || x + _catamaranWidth > width || y + _catamaranHeight > height) return;
+            _startPosX = x;
+            _startPosY = y;
+            _pictureWidth = width;
+            _pictureHeight = height;
+        }
+        /// <summary>
+        /// Изменение направления перемещения
+        /// </summary>
+        /// <param name="direction">Направление</param>
+        public void MoveTransport(Direction direction)
+        {
+            if (!_pictureWidth.HasValue || !_pictureHeight.HasValue)
+            {
+                return;
+            }
+            switch (direction)
+            {
+                // вправо
+                case Direction.Right:
+                    if (_startPosX + _catamaranWidth + Catamaran.Step < _pictureWidth)
+                    {
+                        _startPosX += Catamaran.Step;
+                    }
+                    break;
+                //влево
+                case Direction.Left:
+                    if (_startPosX - Catamaran.Step > 0)
+                    {
+                        _startPosX -= Catamaran.Step;
+                    }
+                    break;
+                //вверх
+                case Direction.Up:
+                    if (_startPosY - Catamaran.Step > 0)
+                    {
+                        _startPosY -= Catamaran.Step;
+                    }
+                    break;
+                //вниз
+                case Direction.Down:
+                    if (_startPosY + _catamaranHeight + Catamaran.Step < _pictureHeight)
+                    {
+                        _startPosY += Catamaran.Step;
+                    }
+                    break;
+            }
+        }
+        /// <summary>
+        /// Отрисовка лодки
+        /// </summary>
+        /// <param name="g"></param>
+        public void DrawTransport(Graphics g)
+        {
+            if (_startPosX < 0 || _startPosY < 0
+            || !_pictureHeight.HasValue || !_pictureWidth.HasValue)
             {
                 return;
             }
             Pen pen = new Pen(Color.Black);
-            Brush dopBrush = new SolidBrush(catamaranPro.DopColor);
-            if (catamaranPro.Floats)
-            {
-                g.DrawEllipse(pen, _startPosX, _startPosY, (int)(_catamaranWidth / 2), (int)(_catamaranHeight / 2));
-                g.FillEllipse(dopBrush, _startPosX, _startPosY, (int)(_catamaranWidth / 2), (int)(_catamaranHeight / 2));
-                g.DrawEllipse(pen, _startPosX, 10 + _startPosY + (int)(_catamaranHeight / 2), (int)(_catamaranWidth / 2), (int)(_catamaranHeight / 2));
-                g.FillEllipse(dopBrush, _startPosX, 10 + _startPosY + (int)(_catamaranHeight / 2), (int)(_catamaranWidth / 2), (int)(_catamaranHeight / 2));
+            //границы
+            g.DrawRectangle(pen, _startPosX, _startPosY, _catamaranWidth * 3 / 4, _catamaranHeight);
 
-            }
-            _startPosX += 10;
-            _startPosY += 5;
-            base.DrawTransport(g);
-            _startPosX -= 10;
-            _startPosY -= 5;
-            if (catamaranPro.Sail)
-            {
-                Point point_1 = new Point((int)(_startPosX + _catamaranWidth * 2 / 4), (int)_startPosY + 5);
-                Point point_2 = new Point((int)(_startPosX + _catamaranWidth), (int)(_startPosY + _catamaranHeight / 2));
-                Point point_3 = new Point((int)(_startPosX + _catamaranWidth * 2 / 4), (int)(_startPosY + _catamaranHeight));
-                Point[] pointsArray = { point_1, point_2, point_3 };
-                g.DrawPolygon(pen, pointsArray);
-                g.FillPolygon(dopBrush, pointsArray);
+            Point point_1 = new Point((int)(_startPosX + _catamaranWidth * 3 / 4), (int)_startPosY);
+            Point point_2 = new Point((int)(_startPosX + _catamaranWidth), (int)(_startPosY + _catamaranHeight / 2));
+            Point point_3 = new Point((int)(_startPosX + _catamaranWidth * 3 / 4), (int)(_startPosY + _catamaranHeight));
+            Point[] pointsArray = {point_1, point_2, point_3};
+            g.DrawPolygon(pen, pointsArray);
+            Brush br = new SolidBrush(Catamaran?.BodyColor ?? Color.Black);
+            g.FillRectangle(br, _startPosX, _startPosY, _catamaranWidth * 3 / 4, _catamaranHeight);
+            g.FillPolygon(br, pointsArray);
 
+            // середина
+            g.DrawEllipse(pen, _startPosX +  5, _startPosY +  5, _catamaranWidth - 15, _catamaranHeight - 15);
+            Brush brBlue = new SolidBrush(Color.LightBlue);
+            g.FillEllipse(brBlue, _startPosX + 5, _startPosY + 5, _catamaranWidth - 15, _catamaranHeight - 15);
+        }
+        /// <summary>
+        /// Смена границ формы отрисовки
+        /// </summary>
+        /// <param name="width">Ширина картинки</param>
+        /// <param name="height">Высота картинки</param>
+        public void ChangeBorders(int width, int height)
+        {
+            _pictureWidth = width;
+            _pictureHeight = height;
+            if (_pictureWidth <= _catamaranWidth || _pictureHeight <= _catamaranHeight)
+            {
+                _pictureWidth = null;
+                _pictureHeight = null;
+                return;
+            }
+            if (_startPosX + _catamaranWidth > _pictureWidth)
+            {
+                _startPosX = _pictureWidth.Value - _catamaranWidth;
+            }
+            if (_startPosY + _catamaranHeight > _pictureHeight)
+            {
+                _startPosY = _pictureHeight.Value - _catamaranHeight;
             }
-            
         }
     }
 }
+
+   

Catamaran/DrawingObjectBoat.cs

@@ -1,38 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Catamaran
-{
-    internal class DrawingObjectBoat : IDrawingObject
-    {
-        private DrawingBoat _catamaran = null;
-        public DrawingObjectBoat(DrawingBoat catamaran)
-        {
-            _catamaran = catamaran;
-        }
-        public float Step => _catamaran?.Catamaran?.Step ?? 0;
-        public (float Left, float Right, float Top, float Bottom)
-       GetCurrentPosition()
-        {
-            return _catamaran?.GetCurrentPosition() ?? default;
-        }
-        public void MoveObject(Direction direction)
-        {
-            _catamaran?.MoveTransport(direction);
-        }
-        public void SetObject(int x, int y, int width, int height)
-        {
-            _catamaran.SetPosition(x, y, width, height);
-        }
-        public void DrawingObject(Graphics g)
-        {
-      
-            _catamaran.DrawTransport(g);
-        }
-
-    }
-}

Catamaran/EntityBoat.cs

@@ -1,43 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Catamaran
-{
-    public class EntityBoat
-    {
-        /// <summary>
-        /// Скорость
-        /// </summary>
-        public int Speed { get; private set; }
-        /// <summary>
-        /// Вес
-        /// </summary>
-        public float Weight { get; private set; }
-        /// <summary>
-        /// Цвет
-        /// </summary>
-        public Color BodyColor { get; private set; }
-        /// <summary>
-        /// Шаг перемещения
-        /// </summary>
-        public float Step => Speed * 100 / Weight;
-        /// <summary>
-        /// Инициализация полей объекта-класса 
-        /// </summary>
-        /// <param name="speed"></param>
-        /// <param name="weight"></param>
-        /// <param name="bodyColor"></param>
-        /// <returns></returns>
-        public EntityBoat(int speed, float weight, Color bodyColor)
-        {
-            Random rnd = new Random();
-            Speed = speed <= 0 ? rnd.Next(50, 150) : speed;
-            Weight = weight <= 0 ? rnd.Next(40, 70) : weight;
-            BodyColor = bodyColor;
-        }
-    }
-}

Catamaran/EntityCatamaran.cs

@@ -7,33 +7,37 @@ using System.Threading.Tasks;
 
 namespace Catamaran
 {
-    internal class EntityCatamaran : EntityBoat
+    internal class EntityCatamaran
     {
-        public Color DopColor { get; private set; }
         /// <summary>
-        /// Признак наличия поплавков
+        /// Скорость
         /// </summary>
-        public bool Floats { get; private set; }
+        public int Speed { get; private set; }
         /// <summary>
-        /// Признак наличия паруса
+        /// Вес
         /// </summary>
-        public bool Sail { get; private set; }
+        public float Weight { get; private set; }
         /// <summary>
-        /// Инициализация свойств
+        /// Цвет
         /// </summary>
-        /// /// <param name="speed">Скорость</param>
-        /// <param name="weight">Вес лодки</param>
-        /// <param name="bodyColor">Цвет</param>
-        /// <param name="dopColor">Дополнительный цвет</param>
-        /// <param name="Floats">Признак наличия поплавков</param>
-        /// <param name="Sail">Признак наличия паруса</param>
-        public EntityCatamaran(int speed, float weight, Color bodyColor, Color
-       dopColor, bool Floats, bool Sail) :
-        base(speed, weight, bodyColor)
+        public Color BodyColor { get; private set; }
+        /// <summary>
+        /// Шаг перемещения
+        /// </summary>
+        public float Step => Speed * 100 / Weight;
+        /// <summary>
+        /// Инициализация полей объекта-класса 
+        /// </summary>
+        /// <param name="speed"></param>
+        /// <param name="weight"></param>
+        /// <param name="bodyColor"></param>
+        /// <returns></returns>
+        public void Init(int speed, float weight, Color bodyColor)
         {
-            DopColor = dopColor;
-            this.Floats = Floats;
-            this.Sail = Sail;
+            Random rnd = new Random();
+            Speed = speed <= 0 ? rnd.Next(50, 150) : speed;
+            Weight = weight <= 0 ? rnd.Next(40, 70) : weight;
+            BodyColor = bodyColor;
         }
     }
 }

Catamaran/FormMapWithSetBoats.Designer.cs

@@ -1,215 +0,0 @@
-namespace Catamaran
-{
-    partial class FormMapWithSetBoats
-    {
-        /// <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.buttonShowOnMap = new System.Windows.Forms.Button();
-            this.buttonShowStorage = new System.Windows.Forms.Button();
-            this.buttonRemoveBoat = new System.Windows.Forms.Button();
-            this.maskedTextBoxPosition = new System.Windows.Forms.MaskedTextBox();
-            this.buttonAddBoat = new System.Windows.Forms.Button();
-            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.pictureBox = new System.Windows.Forms.PictureBox();
-            this.groupBoxTools.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).BeginInit();
-            this.SuspendLayout();
-            // 
-            // groupBoxTools
-            // 
-            this.groupBoxTools.Controls.Add(this.buttonShowOnMap);
-            this.groupBoxTools.Controls.Add(this.buttonShowStorage);
-            this.groupBoxTools.Controls.Add(this.buttonRemoveBoat);
-            this.groupBoxTools.Controls.Add(this.maskedTextBoxPosition);
-            this.groupBoxTools.Controls.Add(this.buttonAddBoat);
-            this.groupBoxTools.Controls.Add(this.comboBoxSelectorMap);
-            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.Dock = System.Windows.Forms.DockStyle.Right;
-            this.groupBoxTools.Location = new System.Drawing.Point(653, 0);
-            this.groupBoxTools.Name = "groupBoxTools";
-            this.groupBoxTools.Size = new System.Drawing.Size(303, 557);
-            this.groupBoxTools.TabIndex = 0;
-            this.groupBoxTools.TabStop = false;
-            this.groupBoxTools.Text = "Tools";
-            // 
-            // buttonShowOnMap
-            // 
-            this.buttonShowOnMap.Location = new System.Drawing.Point(24, 402);
-            this.buttonShowOnMap.Name = "buttonShowOnMap";
-            this.buttonShowOnMap.Size = new System.Drawing.Size(191, 31);
-            this.buttonShowOnMap.TabIndex = 5;
-            this.buttonShowOnMap.Text = "ShowOnMap";
-            this.buttonShowOnMap.UseVisualStyleBackColor = true;
-            this.buttonShowOnMap.Click += new System.EventHandler(this.buttonShowOnMap_Click);
-            // 
-            // buttonShowStorage
-            // 
-            this.buttonShowStorage.Location = new System.Drawing.Point(24, 344);
-            this.buttonShowStorage.Name = "buttonShowStorage";
-            this.buttonShowStorage.Size = new System.Drawing.Size(191, 33);
-            this.buttonShowStorage.TabIndex = 4;
-            this.buttonShowStorage.Text = "ShowStorage";
-            this.buttonShowStorage.UseVisualStyleBackColor = true;
-            this.buttonShowStorage.Click += new System.EventHandler(this.buttonShowStorage_Click);
-            // 
-            // buttonRemoveBoat
-            // 
-            this.buttonRemoveBoat.Location = new System.Drawing.Point(24, 271);
-            this.buttonRemoveBoat.Name = "buttonRemoveBoat";
-            this.buttonRemoveBoat.Size = new System.Drawing.Size(191, 30);
-            this.buttonRemoveBoat.TabIndex = 3;
-            this.buttonRemoveBoat.Text = "RemoveBoat";
-            this.buttonRemoveBoat.UseVisualStyleBackColor = true;
-            this.buttonRemoveBoat.Click += new System.EventHandler(this.buttonRemoveBoat_Click);
-            // 
-            // maskedTextBoxPosition
-            // 
-            this.maskedTextBoxPosition.Location = new System.Drawing.Point(24, 201);
-            this.maskedTextBoxPosition.Mask = "00";
-            this.maskedTextBoxPosition.Name = "maskedTextBoxPosition";
-            this.maskedTextBoxPosition.Size = new System.Drawing.Size(191, 26);
-            this.maskedTextBoxPosition.TabIndex = 2;
-            // 
-            // buttonAddBoat
-            // 
-            this.buttonAddBoat.Location = new System.Drawing.Point(24, 123);
-            this.buttonAddBoat.Name = "buttonAddBoat";
-            this.buttonAddBoat.Size = new System.Drawing.Size(191, 32);
-            this.buttonAddBoat.TabIndex = 1;
-            this.buttonAddBoat.Text = "AddBoat";
-            this.buttonAddBoat.UseVisualStyleBackColor = true;
-            this.buttonAddBoat.Click += new System.EventHandler(this.buttonAddBoat_Click_1);
-            // 
-            // comboBoxSelectorMap
-            // 
-            this.comboBoxSelectorMap.FormattingEnabled = true;
-            this.comboBoxSelectorMap.Items.AddRange(new object[] {
-            "SimpleMap",
-            "SecondMap"});
-            this.comboBoxSelectorMap.Location = new System.Drawing.Point(24, 51);
-            this.comboBoxSelectorMap.Name = "comboBoxSelectorMap";
-            this.comboBoxSelectorMap.Size = new System.Drawing.Size(191, 28);
-            this.comboBoxSelectorMap.TabIndex = 0;
-            this.comboBoxSelectorMap.SelectedIndexChanged += new System.EventHandler(this.ComboBoxSelectorMap_SelectedIndexChanged);
-            // 
-            // buttonLeft
-            // 
-            this.buttonLeft.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.buttonLeft.BackgroundImage = global::Catamaran.Properties.Resources.Left;
-            this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
-            this.buttonLeft.Location = new System.Drawing.Point(10, 472);
-            this.buttonLeft.Name = "buttonLeft";
-            this.buttonLeft.Size = new System.Drawing.Size(30, 30);
-            this.buttonLeft.TabIndex = 4;
-            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::Catamaran.Properties.Resources.Right;
-            this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
-            this.buttonRight.Location = new System.Drawing.Point(70, 472);
-            this.buttonRight.Name = "buttonRight";
-            this.buttonRight.Size = new System.Drawing.Size(30, 30);
-            this.buttonRight.TabIndex = 5;
-            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::Catamaran.Properties.Resources.Up;
-            this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
-            this.buttonUp.Location = new System.Drawing.Point(40, 450);
-            this.buttonUp.Name = "buttonUp";
-            this.buttonUp.Size = new System.Drawing.Size(30, 30);
-            this.buttonUp.TabIndex = 2;
-            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::Catamaran.Properties.Resources.Down;
-            this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
-            this.buttonDown.Location = new System.Drawing.Point(40, 480);
-            this.buttonDown.Name = "buttonDown";
-            this.buttonDown.Size = new System.Drawing.Size(30, 30);
-            this.buttonDown.TabIndex = 3;
-            this.buttonDown.UseVisualStyleBackColor = true;
-            this.buttonDown.Click += new System.EventHandler(this.buttonMove_Click);
-            // 
-            // 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(653, 557);
-            this.pictureBox.TabIndex = 1;
-            this.pictureBox.TabStop = false;
-            // 
-            // FormMapWithSetBoats
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(956, 557);
-            this.Controls.Add(this.pictureBox);
-            this.Controls.Add(this.groupBoxTools);
-            this.Name = "FormMapWithSetBoats";
-            this.Text = "FormMapWithSetBoats";
-            this.groupBoxTools.ResumeLayout(false);
-            this.groupBoxTools.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).EndInit();
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-
-        private System.Windows.Forms.GroupBox groupBoxTools;
-        private System.Windows.Forms.ComboBox comboBoxSelectorMap;
-        private System.Windows.Forms.PictureBox pictureBox;
-        private System.Windows.Forms.Button buttonShowOnMap;
-        private System.Windows.Forms.Button buttonShowStorage;
-        private System.Windows.Forms.Button buttonRemoveBoat;
-        private System.Windows.Forms.MaskedTextBox maskedTextBoxPosition;
-        private System.Windows.Forms.Button buttonAddBoat;
-        private System.Windows.Forms.Button buttonUp;
-        private System.Windows.Forms.Button buttonDown;
-        private System.Windows.Forms.Button buttonLeft;
-        private System.Windows.Forms.Button buttonRight;
-    }
-}

Catamaran/FormMapWithSetBoats.cs

@@ -1,165 +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 Catamaran
-{
-    public partial class FormMapWithSetBoats : Form
-    {
-        private MapWithSetBoatsGeneric<DrawingObjectBoat, AbstractMap> _mapBoatsCollectionGeneric;
-
-
-        public FormMapWithSetBoats()
-        {
-            InitializeComponent();
-
-        }
-
-        /// <summary>
-        /// Выбор карты
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ComboBoxSelectorMap_SelectedIndexChanged(object sender, EventArgs e)
-        {
-            AbstractMap map = null;
-            switch (comboBoxSelectorMap.Text)
-            {
-                case "SimpleMap":
-                    map = new SimpleMap();
-                    break;
-                case "SecondMap":
-                    map = new SecondMap();
-                    break;
-            }
-            if (map != null)
-            {
-                _mapBoatsCollectionGeneric = new MapWithSetBoatsGeneric<DrawingObjectBoat, AbstractMap>(pictureBox.Width, pictureBox.Height, map);
-            }
-            else
-            {
-                _mapBoatsCollectionGeneric = null;
-            }
-        }
-
-        /// <summary>
-        /// Добавление объекта
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-
-        /// <summary>
-        /// Удаление объекта
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void buttonRemoveBoat_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 (_mapBoatsCollectionGeneric - pos != null)
-            {
-                MessageBox.Show("Объект удален");
-                pictureBox.Image = _mapBoatsCollectionGeneric.ShowSet();
-            }
-            else
-            {
-                MessageBox.Show("Не удалось удалить объект");
-            }
-        }
-        /// <summary>
-        /// Вывод набора
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void buttonShowStorage_Click(object sender, EventArgs e)
-        {
-            if (_mapBoatsCollectionGeneric == null)
-            {
-                return;
-            }
-            pictureBox.Image = _mapBoatsCollectionGeneric.ShowSet();
-        }
-        /// <summary>
-        /// Вывод карты
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void buttonShowOnMap_Click(object sender, EventArgs e)
-        {
-            if (_mapBoatsCollectionGeneric == null)
-            {
-                return;
-            }
-            pictureBox.Image = _mapBoatsCollectionGeneric.ShowOnMap();
-        }
-
-        /// <summary>
-        /// Перемещение
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void buttonMove_Click(object sender, EventArgs e)
-        {
-            if (_mapBoatsCollectionGeneric == null)
-            {
-                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 = _mapBoatsCollectionGeneric.MoveObject(dir);
-        }
-
-        private void buttonAddBoat_Click_1(object sender, EventArgs e)
-        {
-            if (_mapBoatsCollectionGeneric == null)
-            {
-                return;
-            }
-            FormBoat form = new FormBoat();
-            if (form.ShowDialog() == DialogResult.OK)
-            {
-                DrawingObjectBoat boat = new DrawingObjectBoat(form.SelectedBoat);
-                if (_mapBoatsCollectionGeneric + boat != null)
-                {
-                    MessageBox.Show("Объект добавлен");
-                    pictureBox.Image = _mapBoatsCollectionGeneric.ShowSet();
-                }
-                else
-                {
-                    MessageBox.Show("Не удалось добавить объект");
-                }
-            }
-        }
-    }
-}

Catamaran/FormMapWithSetBoats.resx

@@ -1,123 +0,0 @@
-<?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>
-  <metadata name="statusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
-</root>

Catamaran/IDrawingObject.cs

@@ -1,42 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Catamaran
-{
-    internal interface IDrawingObject
-    {
-        /// <summary>
-        /// Шаг перемещения объекта
-        /// </summary>
-        float Step { get; }
-        /// <summary>
-        /// Установка позиции объекта
-        /// </summary>
-        /// <param name="x">Координата X</param>
-        /// <param name="y">Координата Y</param>
-        /// <param name="width">Ширина полотна</param>
-        /// <param name="height">Высота полотна</param>
-        void SetObject(int x, int y, int width, int height);
-        /// <summary>
-        /// Изменение направления пермещения объекта
-        /// </summary>
-        /// <param name="direction">Направление</param>
-        void MoveObject(Direction direction);
-        /// <summary>
-        /// Отрисовка объекта
-        /// </summary>
-        /// <param name="g"></param>
-        void DrawingObject(Graphics g);
-        /// <summary>
-        /// Получение текущей позиции объекта
-        /// </summary>
-        /// <returns></returns>
-        (float Left, float Right, float Top, float Bottom)
-        GetCurrentPosition();
-
-    }
-}

Catamaran/MapWithSetBoatsGeneric.cs

@@ -1,193 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Catamaran
-{
-    /// <summary>
-    /// Карта с набром объектов под нее
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    /// <typeparam name="U"></typeparam>
-    internal class MapWithSetBoatsGeneric<T, U>
-        where T : class, IDrawingObject
-        where U : AbstractMap
-    {
-        /// <summary>
-        /// Ширина окна отрисовки
-        /// </summary>
-        private readonly int _pictureWidth;
-        /// <summary>
-        /// Высота окна отрисовки
-        /// </summary>
-        private readonly int _pictureHeight;
-        /// <summary>
-        /// Размер занимаемого объектом места (ширина)
-        /// </summary>
-        private readonly int _placeSizeWidth = 210;
-        /// <summary>
-        /// Размер занимаемого объектом места (высота)
-        /// </summary>
-        private readonly int _placeSizeHeight = 90;
-        /// <summary>
-        /// Набор объектов
-        /// </summary>
-        private readonly SetBoatsGeneric<T> _setBoats;
-        /// <summary>
-        /// Карта
-        /// </summary>
-        private readonly U _map;
-        /// <summary>
-        /// Конструктор
-        /// </summary>
-        /// <param name="picWidth"></param>
-        /// <param name="picHeight"></param>
-        /// <param name="map"></param>
-        public MapWithSetBoatsGeneric(int picWidth, int picHeight, U map)
-        {
-            int width = picWidth / _placeSizeWidth;
-            int height = picHeight / _placeSizeHeight;
-            _setBoats = new SetBoatsGeneric<T>(width * height);
-            _pictureWidth = picWidth;
-            _pictureHeight = picHeight;
-            _map = map;
-        }
-        /// <summary>
-        /// Перегрузка оператора сложения
-        /// </summary>
-        /// <param name="map"></param>
-        /// <param name="Boat"></param>
-        /// <returns></returns>
-        /// 
-
-        public static int operator +(MapWithSetBoatsGeneric<T, U> map, T Boat)
-        {
-            return map._setBoats.Insert(Boat);
-        }
-        /// <summary>
-        /// Перегрузка оператора вычитания
-        /// </summary>
-        /// <param name="map"></param>
-        /// <param name="position"></param>
-        /// <returns></returns>
-        public static T operator -(MapWithSetBoatsGeneric<T, U> map, int position)
-        {
-            return map._setBoats.Remove(position);
-        }
-        /// <summary>
-        /// Вывод всего набора объектов
-        /// </summary>
-        /// <returns></returns>
-        public Bitmap ShowSet()
-        {
-            Bitmap bmp = new Bitmap(_pictureWidth, _pictureHeight);
-            Graphics gr = Graphics.FromImage(bmp);
-            DrawBackground(gr);
-            DrawBoats(gr);
-            return bmp;
-        }
-        /// <summary>
-        /// Просмотр объекта на карте
-        /// </summary>
-        /// <returns></returns>
-        public Bitmap ShowOnMap()
-        {
-            Shaking();
-            for (int i = 0; i < _setBoats.Count; i++)
-            {
-                var Boat = _setBoats.Get(i);
-                if (Boat != null)
-                {
-                    return _map.CreateMap(_pictureWidth, _pictureHeight, Boat);
-                }
-            }
-            return new Bitmap(_pictureWidth, _pictureHeight);
-        }
-        /// <summary>
-        /// Перемещение объекта по крате
-        /// </summary>
-        /// <param name="direction"></param>
-        /// <returns></returns>
-        public Bitmap MoveObject(Direction direction)
-        {
-            if (_map != null)
-            {
-                return _map.MoveObject(direction);
-            }
-            return new Bitmap(_pictureWidth, _pictureHeight);
-        }
-        /// <summary>
-        /// "Взбалтываем" набор, чтобы все элементы оказались в начале
-        /// </summary>
-        private void Shaking()
-        {
-            int j = _setBoats.Count - 1;
-            for (int i = 0; i < _setBoats.Count; i++)
-            {
-                if (_setBoats.Get(i) == null)
-                {
-                    for (; j > i; j--)
-                    {
-                        var Boat = _setBoats.Get(j);
-                        if (Boat != null)
-                        {
-                            _setBoats.Insert(Boat, i);
-                            _setBoats.Remove(j);
-                            break;
-                        }
-                    }
-                    if (j <= i)
-                    {
-                        return;
-                    }
-                }
-            }
-        }
-        /// <summary>
-        /// Метод отрисовки фона
-        /// </summary>
-        /// <param name="g"></param>
-        private void DrawBackground(Graphics g)
-        {
-            Pen pen = new Pen(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);
-                    for (int k = 0; k < 7; k++)
-                    {
-                        g.DrawEllipse(pen, i * _placeSizeWidth + 15 * k, j * _placeSizeHeight, 15, 15);
-                        g.DrawEllipse(pen, i * _placeSizeWidth + 15 * k, j * _placeSizeHeight - 15, 15, 15);
-                    }
-                }
-                g.DrawLine(pen, i * _placeSizeWidth, 0, i * _placeSizeWidth, (_pictureHeight / _placeSizeHeight) * _placeSizeHeight);
-                for (int k = 0; k < 6 * 4; k++)
-                {
-                    g.DrawEllipse(pen, i * _placeSizeWidth, 0 + 15 * k, 15, 15);
-                }
-            }
-        }
-        /// <summary>
-        /// Метод прорисовки объектов
-        /// </summary>
-        /// <param name="g"></param>
-        private void DrawBoats(System.Drawing.Graphics g)
-        {
-            int numberOfSeatsInWidth = _pictureWidth / _placeSizeWidth;
-            int numberOfSeatsInHeight = _pictureHeight / _placeSizeHeight;
-            int bottomLine = (numberOfSeatsInHeight - 1) * _placeSizeHeight;
-            for (int i = 0; i < _setBoats.Count; i++)
-            {
-                // TODO установка позиции
-                _setBoats.Get(i)?.SetObject(i % numberOfSeatsInWidth * _placeSizeWidth, bottomLine - i / numberOfSeatsInWidth * _placeSizeHeight, _pictureWidth, _pictureHeight);
-                _setBoats.Get(i)?.DrawingObject(g);
-            }
-        }
-    }
-}
-

Catamaran/Program.cs

@@ -16,7 +16,7 @@ namespace Catamaran
         {
             Application.EnableVisualStyles();
             Application.SetCompatibleTextRenderingDefault(false);
-            Application.Run(new FormMapWithSetBoats());
+            Application.Run(new CatamaranForm());
         }
     }
 }

Catamaran/SecondMap.cs

@@ -1,48 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Catamaran
-{
-    internal class SecondMap : AbstractMap
-    {
-        private readonly Brush barrierColor = new SolidBrush(Color.Black);
-        private readonly Brush roadColor = new SolidBrush(Color.DarkCyan);
-        protected override void DrawBarrierPart(Graphics g, int i, int j)
-        {
-            g.FillRectangle(barrierColor, i * _size_x, j * _size_y, i * (_size_x + 1), j * (_size_y + 1));
-        }
-        protected override void DrawRoadPart(Graphics g, int i, int j)
-        {
-            g.FillRectangle(roadColor, i * _size_x, j * _size_y, i * (_size_x + 1), j * (_size_y + 1));
-        }
-        protected override void GenerateMap()
-        {
-            _map = new int[100, 100];
-            _size_x = (float)_width / _map.GetLength(0);
-            _size_y = (float)_height / _map.GetLength(1);
-            int counter = 0;
-            for (int i = 0; i < _map.GetLength(0); ++i)
-            {
-                for (int j = 0; j < _map.GetLength(1); ++j)
-                {
-                    _map[i, j] = _freeRoad;
-                }
-            }
-            while (counter < 20)
-            {
-                int x = _random.Next(0, 100);
-                int y = _random.Next(0, 100);
-                if (_map[x, y] == _freeRoad)
-                {
-                    _map[x, y] = _barrier;
-                    counter++;
-                }
-            }
-        }
-    }
-}
-

Catamaran/SetBoatsGeneric.cs

@@ -1,113 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Catamaran
-{
-    /// <summary>
-    /// Параметризованный набор объектов
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    internal class SetBoatsGeneric<T>
-        where T : class
-    {
-        /// <summary>
-        /// Массив объектов, которые храним
-        /// </summary>
-        private readonly T[] _places;
-        /// <summary>
-        /// Количество объектов в массиве
-        /// </summary>
-        public int Count => _places.Length;
-        /// <summary>
-        /// Конструктор
-        /// </summary>
-        /// <param name="count"></param>
-        public SetBoatsGeneric(int count)
-        {
-            _places = new T[count];
-        }
-        /// <summary>
-        /// Добавление объекта в набор
-        /// </summary>
-        /// <param name="boat">Добавляемая лодка </param>
-        /// <returns></returns>
-        public int Insert(T boat)
-        {
-            for (int i = 0; i < Count; i++)
-            {
-                if (_places[i] == null)
-                {
-                    _places[i] = boat;
-                    return i;
-                }
-            }
-            return -1;
-        }
-        /// <summary>
-        /// Добавление объекта в набор на конкретную позицию
-        /// </summary>
-        /// <param name="boat">Добавляемая лодка</param>
-        /// <param name="position">Позиция</param>
-        /// <returns></returns>
-        public int Insert(T boat, int position)
-        {
-            // TODO проверка позиции
-            if (position < 0 || position >= Count) return -1;
-            // TODO проверка, что элемент массива по этой позиции пустой,если нет, то
-            // проверка, что после вставляемого элемента в массиве есть пустой элемент
-            // сдвиг всех объектов, находящихся справа от позиции до первого пустого элемента
-            if (_places[position] == null)
-            {
-                _places[position] = boat;
-                return position;
-            }
-            else
-            {
-                for (int i = position + 1; i < Count; i++)
-                {
-                    if (_places[i] == null)
-                    {
-                        for (int j = i - 1; j >= position; j--)
-                        {
-                            _places[j + 1] = _places[j];
-                        }
-                        _places[position] = boat;
-                        return position;
-                    }
-                }
-                return -1;
-            }
-            // TODO вставка по позиции
-        }
-        /// <summary>
-        /// Удаление объекта из набора с конкретной позиции
-        /// </summary>
-        /// <param name="position"></param>
-        /// <returns></returns>
-        public T Remove(int position)
-        {
-            // TODO проверка позиции
-            if (position < 0 || position >= Count) return null;
-            // TODO удаление объекта из массива, присовив элементу массива значение null
-            T removed = _places[position];
-            _places[position] = null;
-            return removed;
-        }
-        /// <summary>
-        /// Получение объекта из набора по позиции
-        /// </summary>
-        /// <param name="position"></param>
-        /// <returns></returns>
-        public T Get(int position)
-        {
-            // TODO проверка позиции
-            if (position < 0 || position >= Count) return null;
-            return _places[position];
-        }
-
-    }
-}
-

Catamaran/SimpleMap.cs

@@ -1,53 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Catamaran
-{
-    internal class SimpleMap : AbstractMap
-    {
-        /// <summary>
-        /// Цвет участка закрытого
-        /// </summary>
-        private readonly Brush barrierColor = new SolidBrush(Color.Black);
-        /// <summary>
-        /// Цвет участка открытого
-        /// </summary>
-        private readonly Brush roadColor = new SolidBrush(Color.Gray);
-        protected override void DrawBarrierPart(Graphics g, int i, int j)
-        {
-            g.FillRectangle(barrierColor, i * _size_x, j * _size_y, i * (_size_x + 1), j * (_size_y + 1));
-        }
-        protected override void DrawRoadPart(Graphics g, int i, int j)
-        {
-            g.FillRectangle(roadColor, i * _size_x, j * _size_y, i * (_size_x + 1), j * (_size_y + 1));
-        }
-        protected override void GenerateMap()
-        {
-            _map = new int[100, 100];
-            _size_x = (float)_width / _map.GetLength(0);
-            _size_y = (float)_height / _map.GetLength(1);
-            int counter = 0;
-            for (int i = 0; i < _map.GetLength(0); ++i)
-            {
-                for (int j = 0; j < _map.GetLength(1); ++j)
-                {
-                    _map[i, j] = _freeRoad;
-                }
-            }
-            while (counter < 50)
-            {
-                int x = _random.Next(0, 100);
-                int y = _random.Next(0, 100);
-                if (_map[x, y] == _freeRoad)
-                {
-                    _map[x, y] = _barrier;
-                    counter++;
-                }
-            }
-        }
-    }
-}