Merge pull request 'LabWork02 PIbd-21 Zacharchenko' (#2) from LabWork02 into master

Reviewed-on: http://student.git.athene.tech/shadowik/PIbd-21_Zaharchenko_M.I._DoubleDeckerBus._Base/pulls/2

DoubleDeckerBus/DoubleDeckerBus/AbstractMap.cs

@@ -35,6 +35,7 @@ namespace DoubleDeckerBus
         }
         public Bitmap MoveObject(Direction direction)
         {
+            
             _drawingObject.MoveObject(direction);
 
             bool collision = CheckCollision();
@@ -68,7 +69,6 @@ namespace DoubleDeckerBus
             int y = _random.Next(0, 10);
             _drawingObject.SetObject(x, y, _width, _height);
           
-            
             return !CheckCollision();
         }
         private Bitmap DrawMapWithObject()
@@ -109,14 +109,13 @@ namespace DoubleDeckerBus
 
             
 
-            for (int y = startY; y <= endY + 1; y++)
+            for (int y = startY; y < endY; y++)
             {
-                for (int x = startX; x <= endX + 1; x++)
+                for (int x = startX; x < endX; x++)
                 {
                     if (_map[x, y] == _barrier)
                     {
                         return true;
-                        break;
                     }
                 }
             }

DoubleDeckerBus/DoubleDeckerBus/Direction.cs

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

DoubleDeckerBus/DoubleDeckerBus/DrawingBus.cs

@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 
 namespace DoubleDeckerBus
 {
-    public class DrawingBus
+    internal class DrawingBus
     {
         public EntityBus Bus { get; protected set; }
 

DoubleDeckerBus/DoubleDeckerBus/EntityBus.cs

@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 
 namespace DoubleDeckerBus
 {
-    public class EntityBus
+    internal class EntityBus
     {
         public int Speed { get; private set; }
         public float Weight { get; private set; }

DoubleDeckerBus/DoubleDeckerBus/FormBus.Designer.cs

@@ -39,7 +39,6 @@
             this.buttonRight = new System.Windows.Forms.Button();
             this.pictureBoxBus = new System.Windows.Forms.PictureBox();
             this.buttonСreateExtra = new System.Windows.Forms.Button();
-            this.ButtonSelectBus = new System.Windows.Forms.Button();
             this.statusStrip1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBoxBus)).BeginInit();
             this.SuspendLayout();
@@ -166,22 +165,11 @@
             this.buttonСreateExtra.UseVisualStyleBackColor = true;
             this.buttonСreateExtra.Click += new System.EventHandler(this.ButtonСreateExtra_Click);
             // 
-            // ButtonSelectBus
-            // 
-            this.ButtonSelectBus.Location = new System.Drawing.Point(525, 290);
-            this.ButtonSelectBus.Name = "ButtonSelectBus";
-            this.ButtonSelectBus.Size = new System.Drawing.Size(75, 23);
-            this.ButtonSelectBus.TabIndex = 9;
-            this.ButtonSelectBus.Text = "Выбрать";
-            this.ButtonSelectBus.UseVisualStyleBackColor = true;
-            this.ButtonSelectBus.Click += new System.EventHandler(this.ButtonSelectBus_Click);
-            // 
             // FormBus
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(700, 338);
-            this.Controls.Add(this.ButtonSelectBus);
             this.Controls.Add(this.buttonСreateExtra);
             this.Controls.Add(this.buttonRight);
             this.Controls.Add(this.buttonDown);
@@ -214,6 +202,5 @@
         private Button buttonRight;
         private PictureBox pictureBoxBus;
         private Button buttonСreateExtra;
-        private Button ButtonSelectBus;
     }
 }

DoubleDeckerBus/DoubleDeckerBus/FormBus.cs

@@ -3,9 +3,6 @@ namespace DoubleDeckerBus
     public partial class FormBus : Form
     {
         private DrawingBus _bus;
-
-        public DrawingBus SelectedBus { get; private set; }
-
         public FormBus()
         {
             InitializeComponent();
@@ -22,13 +19,7 @@ namespace DoubleDeckerBus
         private void ButtonCreate_Click(object sender, EventArgs e)
         {
             Random rnd = new();
-            Color color = Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256));
+            _bus = new DrawingBus(rnd.Next(100, 300), rnd.Next(1000, 2000), 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;
-            }
-            _bus = new DrawingBus(rnd.Next(100, 300), rnd.Next(1000, 2000), color);
             SetData();
             Draw();
         }
@@ -69,28 +60,12 @@ namespace DoubleDeckerBus
         private void ButtonÑreateExtra_Click(object sender, EventArgs e)
         {
             Random rnd = new();
-            Color color = Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256));
+            _bus = new DrawingDDB(rnd.Next(100, 300), rnd.Next(1000, 2000),
-            ColorDialog dialog = new();
+                Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)),
-            if (dialog.ShowDialog() == DialogResult.OK)
+                Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)),
-            {
-                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;
-            }
-            _bus = new DrawingDDB(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 ButtonSelectBus_Click(object sender, EventArgs e)
-        {
-            SelectedBus = _bus;
-            DialogResult = DialogResult.OK;
-        }
     }
 }

DoubleDeckerBus/DoubleDeckerBus/FormMap.Designer.cs

@@ -0,0 +1,214 @@
+namespace DoubleDeckerBus
+{
+    partial class FormMap
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.buttonCreate = 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.buttonRight = new System.Windows.Forms.Button();
+            this.pictureBoxBus = new System.Windows.Forms.PictureBox();
+            this.buttonСreateExtra = new System.Windows.Forms.Button();
+            this.toolStripStatusLabelSpeed = new System.Windows.Forms.ToolStripStatusLabel();
+            this.toolStripStatusLabelWeight = new System.Windows.Forms.ToolStripStatusLabel();
+            this.toolStripStatusLabelBodyColor = new System.Windows.Forms.ToolStripStatusLabel();
+            this.statusStrip1 = new System.Windows.Forms.StatusStrip();
+            this.comboBoxSelectorMap = new System.Windows.Forms.ComboBox();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxBus)).BeginInit();
+            this.statusStrip1.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // buttonCreate
+            // 
+            this.buttonCreate.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.buttonCreate.Location = new System.Drawing.Point(0, 389);
+            this.buttonCreate.Name = "buttonCreate";
+            this.buttonCreate.Size = new System.Drawing.Size(99, 28);
+            this.buttonCreate.TabIndex = 2;
+            this.buttonCreate.Text = "Создать";
+            this.buttonCreate.UseVisualStyleBackColor = true;
+            this.buttonCreate.Click += new System.EventHandler(this.ButtonCreate_Click);
+            // 
+            // buttonUp
+            // 
+            this.buttonUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.buttonUp.BackgroundImage = global::DoubleDeckerBus.Properties.Resources.UpArrow;
+            this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.buttonUp.Location = new System.Drawing.Point(718, 337);
+            this.buttonUp.Name = "buttonUp";
+            this.buttonUp.Size = new System.Drawing.Size(30, 29);
+            this.buttonUp.TabIndex = 3;
+            this.buttonUp.Text = " ";
+            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::DoubleDeckerBus.Properties.Resources.LeftArrow;
+            this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.buttonLeft.Location = new System.Drawing.Point(693, 363);
+            this.buttonLeft.Name = "buttonLeft";
+            this.buttonLeft.Size = new System.Drawing.Size(30, 29);
+            this.buttonLeft.TabIndex = 4;
+            this.buttonLeft.Text = " ";
+            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::DoubleDeckerBus.Properties.Resources.DownArrow;
+            this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.buttonDown.Location = new System.Drawing.Point(719, 388);
+            this.buttonDown.Name = "buttonDown";
+            this.buttonDown.Size = new System.Drawing.Size(30, 29);
+            this.buttonDown.TabIndex = 5;
+            this.buttonDown.Text = " ";
+            this.buttonDown.UseVisualStyleBackColor = true;
+            this.buttonDown.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::DoubleDeckerBus.Properties.Resources.RightArrow;
+            this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.buttonRight.Location = new System.Drawing.Point(745, 363);
+            this.buttonRight.Name = "buttonRight";
+            this.buttonRight.Size = new System.Drawing.Size(30, 29);
+            this.buttonRight.TabIndex = 6;
+            this.buttonRight.Text = " ";
+            this.buttonRight.UseVisualStyleBackColor = true;
+            this.buttonRight.Click += new System.EventHandler(this.ButtonMove_Click);
+            // 
+            // pictureBoxBus
+            // 
+            this.pictureBoxBus.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.pictureBoxBus.Location = new System.Drawing.Point(0, 0);
+            this.pictureBoxBus.Name = "pictureBoxBus";
+            this.pictureBoxBus.Size = new System.Drawing.Size(800, 425);
+            this.pictureBoxBus.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
+            this.pictureBoxBus.TabIndex = 7;
+            this.pictureBoxBus.TabStop = false;
+            // 
+            // buttonСreateExtra
+            // 
+            this.buttonСreateExtra.Location = new System.Drawing.Point(118, 388);
+            this.buttonСreateExtra.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.buttonСreateExtra.Name = "buttonСreateExtra";
+            this.buttonСreateExtra.Size = new System.Drawing.Size(113, 28);
+            this.buttonСreateExtra.TabIndex = 8;
+            this.buttonСreateExtra.Text = "Модификация";
+            this.buttonСreateExtra.UseVisualStyleBackColor = true;
+            this.buttonСreateExtra.Click += new System.EventHandler(this.ButtonСreateExtra_Click);
+            // 
+            // toolStripStatusLabelSpeed
+            // 
+            this.toolStripStatusLabelSpeed.Name = "toolStripStatusLabelSpeed";
+            this.toolStripStatusLabelSpeed.Size = new System.Drawing.Size(80, 20);
+            this.toolStripStatusLabelSpeed.Text = "Скорость: ";
+            // 
+            // toolStripStatusLabelWeight
+            // 
+            this.toolStripStatusLabelWeight.Name = "toolStripStatusLabelWeight";
+            this.toolStripStatusLabelWeight.Size = new System.Drawing.Size(40, 20);
+            this.toolStripStatusLabelWeight.Text = "Вес: ";
+            // 
+            // toolStripStatusLabelBodyColor
+            // 
+            this.toolStripStatusLabelBodyColor.Name = "toolStripStatusLabelBodyColor";
+            this.toolStripStatusLabelBodyColor.Size = new System.Drawing.Size(49, 20);
+            this.toolStripStatusLabelBodyColor.Text = "Цвет: ";
+            // 
+            // statusStrip1
+            // 
+            this.statusStrip1.ImageScalingSize = new System.Drawing.Size(20, 20);
+            this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.toolStripStatusLabelSpeed,
+            this.toolStripStatusLabelWeight,
+            this.toolStripStatusLabelBodyColor});
+            this.statusStrip1.Location = new System.Drawing.Point(0, 425);
+            this.statusStrip1.Name = "statusStrip1";
+            this.statusStrip1.Size = new System.Drawing.Size(800, 26);
+            this.statusStrip1.TabIndex = 1;
+            this.statusStrip1.Text = "statusStrip1";
+            // 
+            // 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(0, 0);
+            this.comboBoxSelectorMap.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.comboBoxSelectorMap.Name = "comboBoxSelectorMap";
+            this.comboBoxSelectorMap.Size = new System.Drawing.Size(138, 28);
+            this.comboBoxSelectorMap.TabIndex = 9;
+            this.comboBoxSelectorMap.SelectedIndexChanged += new System.EventHandler(this.ComboBoxSelectorMap_SelectedIndexChanged);
+            // 
+            // FormMap
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(800, 451);
+            this.Controls.Add(this.comboBoxSelectorMap);
+            this.Controls.Add(this.buttonСreateExtra);
+            this.Controls.Add(this.buttonRight);
+            this.Controls.Add(this.buttonDown);
+            this.Controls.Add(this.buttonLeft);
+            this.Controls.Add(this.buttonUp);
+            this.Controls.Add(this.buttonCreate);
+            this.Controls.Add(this.pictureBoxBus);
+            this.Controls.Add(this.statusStrip1);
+            this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.Name = "FormMap";
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxBus)).EndInit();
+            this.statusStrip1.ResumeLayout(false);
+            this.statusStrip1.PerformLayout();
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+            #endregion
+        private Button buttonCreate;
+        private Button buttonUp;
+        private Button buttonLeft;
+        private Button buttonDown;
+        private Button buttonRight;
+        private PictureBox pictureBoxBus;
+        private Button buttonСreateExtra;
+        private ToolStripStatusLabel toolStripStatusLabelSpeed;
+        private ToolStripStatusLabel toolStripStatusLabelWeight;
+        private ToolStripStatusLabel toolStripStatusLabelBodyColor;
+        private StatusStrip statusStrip1;
+        private ComboBox comboBoxSelectorMap;
+    }
+}

DoubleDeckerBus/DoubleDeckerBus/FormMap.cs

@@ -0,0 +1,87 @@
+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 DoubleDeckerBus
+{
+    public partial class FormMap : Form
+    {
+        private AbstractMap _abstractMap;
+        public FormMap()
+        {
+            InitializeComponent();
+            _abstractMap = new SimpleMap();
+            comboBoxSelectorMap.SelectedIndex = 0;
+        }
+
+        private void ButtonCreate_Click(object sender, EventArgs e)
+        {
+            Random rnd = new();
+            var bus = new DrawingBus(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)));
+            SetData(bus);
+        }
+
+        private void ButtonMove_Click(object sender, EventArgs e)
+        {
+            string name = ((Button)sender)?.Name ?? string.Empty;
+            Direction dir = Direction.None;
+            switch (name)
+            {
+                case "buttonUp":
+                    dir = Direction.Up;
+                    break;
+                case "buttonDown":
+                    dir = Direction.Down;
+                    break;
+                case "buttonLeft":
+                    dir = Direction.Left;
+                    break;
+                case "buttonRight":
+                    dir = Direction.Right;
+                    break;
+            }
+            pictureBoxBus.Image = _abstractMap?.MoveObject(dir);
+        }
+
+        private void SetData(DrawingBus bus)
+        {
+            toolStripStatusLabelSpeed.Text = $"Скорость: {bus.Bus.Speed}";
+            toolStripStatusLabelWeight.Text = $"Вес: {bus.Bus.Weight}";
+            toolStripStatusLabelBodyColor.Text = $"Цвет: {bus.Bus.BodyColor.Name}";
+            pictureBoxBus.Image = _abstractMap.CreateMap(pictureBoxBus.Width, pictureBoxBus.Height,
+                new DrawingObjectBus(bus));
+        }
+
+        private void ButtonСreateExtra_Click(object sender, EventArgs e)
+        {
+            Random rnd = new();
+            var bus = new DrawingDDB(rnd.Next(100, 300), rnd.Next(1000, 2000),
+                Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)),
+                Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)),
+                Convert.ToBoolean(rnd.Next(0, 2)), Convert.ToBoolean(rnd.Next(0, 2)));
+            SetData(bus);
+        }
+
+        private void ComboBoxSelectorMap_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            switch (comboBoxSelectorMap.Text)
+            {
+                case "Простая карта":
+                    _abstractMap = new SimpleMap();
+                    break;
+                case "Водная карта":
+                    _abstractMap = new WaterMap();
+                    break;
+            }
+        }
+    }
+
+
+}
+

DoubleDeckerBus/DoubleDeckerBus/FormMap.resx

@@ -57,4 +57,7 @@
   <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>

DoubleDeckerBus/DoubleDeckerBus/FormMapWithSetBuses.Designer.cs

@@ -1,224 +0,0 @@
-namespace DoubleDeckerBus
-{
-    partial class FormMapWithSetBuses
-    {
-        /// <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.groupBoxSettings = new System.Windows.Forms.GroupBox();
-            this.buttonRight = new System.Windows.Forms.Button();
-            this.buttonDown = new System.Windows.Forms.Button();
-            this.buttonLeft = new System.Windows.Forms.Button();
-            this.buttonUp = new System.Windows.Forms.Button();
-            this.button1 = new System.Windows.Forms.Button();
-            this.buttonShowStorage = new System.Windows.Forms.Button();
-            this.buttonDeleteBus = new System.Windows.Forms.Button();
-            this.maskedTextBoxPosition = new System.Windows.Forms.MaskedTextBox();
-            this.buttonAddBus = new System.Windows.Forms.Button();
-            this.comboBoxSelectorMap = new System.Windows.Forms.ComboBox();
-            this.pictureBox = new System.Windows.Forms.PictureBox();
-            this.groupBoxSettings.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).BeginInit();
-            this.SuspendLayout();
-            // 
-            // groupBoxSettings
-            // 
-            this.groupBoxSettings.Controls.Add(this.buttonRight);
-            this.groupBoxSettings.Controls.Add(this.buttonDown);
-            this.groupBoxSettings.Controls.Add(this.buttonLeft);
-            this.groupBoxSettings.Controls.Add(this.buttonUp);
-            this.groupBoxSettings.Controls.Add(this.button1);
-            this.groupBoxSettings.Controls.Add(this.buttonShowStorage);
-            this.groupBoxSettings.Controls.Add(this.buttonDeleteBus);
-            this.groupBoxSettings.Controls.Add(this.maskedTextBoxPosition);
-            this.groupBoxSettings.Controls.Add(this.buttonAddBus);
-            this.groupBoxSettings.Controls.Add(this.comboBoxSelectorMap);
-            this.groupBoxSettings.Dock = System.Windows.Forms.DockStyle.Right;
-            this.groupBoxSettings.Location = new System.Drawing.Point(600, 0);
-            this.groupBoxSettings.Name = "groupBoxSettings";
-            this.groupBoxSettings.Size = new System.Drawing.Size(200, 450);
-            this.groupBoxSettings.TabIndex = 0;
-            this.groupBoxSettings.TabStop = false;
-            this.groupBoxSettings.Text = "Инструменты";
-            // 
-            // buttonRight
-            // 
-            this.buttonRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.buttonRight.BackgroundImage = global::DoubleDeckerBus.Properties.Resources.RightArrow;
-            this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonRight.Location = new System.Drawing.Point(109, 398);
-            this.buttonRight.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.buttonRight.Name = "buttonRight";
-            this.buttonRight.Size = new System.Drawing.Size(26, 22);
-            this.buttonRight.TabIndex = 10;
-            this.buttonRight.Text = " ";
-            this.buttonRight.UseVisualStyleBackColor = true;
-            this.buttonRight.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::DoubleDeckerBus.Properties.Resources.DownArrow;
-            this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonDown.Location = new System.Drawing.Point(86, 417);
-            this.buttonDown.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.buttonDown.Name = "buttonDown";
-            this.buttonDown.Size = new System.Drawing.Size(26, 22);
-            this.buttonDown.TabIndex = 9;
-            this.buttonDown.Text = " ";
-            this.buttonDown.UseVisualStyleBackColor = true;
-            this.buttonDown.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::DoubleDeckerBus.Properties.Resources.LeftArrow;
-            this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonLeft.Location = new System.Drawing.Point(63, 398);
-            this.buttonLeft.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.buttonLeft.Name = "buttonLeft";
-            this.buttonLeft.Size = new System.Drawing.Size(26, 22);
-            this.buttonLeft.TabIndex = 8;
-            this.buttonLeft.Text = " ";
-            this.buttonLeft.UseVisualStyleBackColor = true;
-            this.buttonLeft.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::DoubleDeckerBus.Properties.Resources.UpArrow;
-            this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonUp.Location = new System.Drawing.Point(85, 379);
-            this.buttonUp.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.buttonUp.Name = "buttonUp";
-            this.buttonUp.Size = new System.Drawing.Size(26, 22);
-            this.buttonUp.TabIndex = 7;
-            this.buttonUp.Text = " ";
-            this.buttonUp.UseVisualStyleBackColor = true;
-            this.buttonUp.Click += new System.EventHandler(this.ButtonMove_Click);
-            // 
-            // button1
-            // 
-            this.button1.Location = new System.Drawing.Point(6, 320);
-            this.button1.Name = "button1";
-            this.button1.Size = new System.Drawing.Size(182, 35);
-            this.button1.TabIndex = 5;
-            this.button1.Text = "Посмотреть карту";
-            this.button1.UseVisualStyleBackColor = true;
-            this.button1.Click += new System.EventHandler(this.ButtonShowOnMap_Click);
-            // 
-            // buttonShowStorage
-            // 
-            this.buttonShowStorage.Location = new System.Drawing.Point(6, 261);
-            this.buttonShowStorage.Name = "buttonShowStorage";
-            this.buttonShowStorage.Size = new System.Drawing.Size(182, 35);
-            this.buttonShowStorage.TabIndex = 4;
-            this.buttonShowStorage.Text = "Посмотреть хранилище";
-            this.buttonShowStorage.UseVisualStyleBackColor = true;
-            this.buttonShowStorage.Click += new System.EventHandler(this.ButtonShowStorage_Click);
-            // 
-            // buttonDeleteBus
-            // 
-            this.buttonDeleteBus.Location = new System.Drawing.Point(6, 181);
-            this.buttonDeleteBus.Name = "buttonDeleteBus";
-            this.buttonDeleteBus.Size = new System.Drawing.Size(188, 36);
-            this.buttonDeleteBus.TabIndex = 3;
-            this.buttonDeleteBus.Text = "Удалить автобус";
-            this.buttonDeleteBus.UseVisualStyleBackColor = true;
-            this.buttonDeleteBus.Click += new System.EventHandler(this.ButtonRemoveBus_Click);
-            // 
-            // maskedTextBoxPosition
-            // 
-            this.maskedTextBoxPosition.Location = new System.Drawing.Point(6, 152);
-            this.maskedTextBoxPosition.Mask = "00";
-            this.maskedTextBoxPosition.Name = "maskedTextBoxPosition";
-            this.maskedTextBoxPosition.Size = new System.Drawing.Size(188, 23);
-            this.maskedTextBoxPosition.TabIndex = 2;
-            // 
-            // buttonAddBus
-            // 
-            this.buttonAddBus.Location = new System.Drawing.Point(6, 87);
-            this.buttonAddBus.Name = "buttonAddBus";
-            this.buttonAddBus.Size = new System.Drawing.Size(188, 36);
-            this.buttonAddBus.TabIndex = 1;
-            this.buttonAddBus.Text = "Добавить автобус";
-            this.buttonAddBus.UseVisualStyleBackColor = true;
-            this.buttonAddBus.Click += new System.EventHandler(this.ButtonAddBus_Click);
-            // 
-            // comboBoxSelectorMap
-            // 
-            this.comboBoxSelectorMap.FormattingEnabled = true;
-            this.comboBoxSelectorMap.Items.AddRange(new object[] {
-            "Простая карта",
-            "Водная карта"});
-            this.comboBoxSelectorMap.Location = new System.Drawing.Point(6, 22);
-            this.comboBoxSelectorMap.Name = "comboBoxSelectorMap";
-            this.comboBoxSelectorMap.Size = new System.Drawing.Size(188, 23);
-            this.comboBoxSelectorMap.TabIndex = 0;
-            this.comboBoxSelectorMap.Text = "Простая карта";
-            this.comboBoxSelectorMap.SelectedIndexChanged += new System.EventHandler(this.ComboBoxSelectorMap_SelectedIndexChanged);
-            // 
-            // 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;
-            // 
-            // FormMapWithSetBuses
-            // 
-            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.pictureBox);
-            this.Controls.Add(this.groupBoxSettings);
-            this.Name = "FormMapWithSetBuses";
-            this.Text = "FormMapWithSetBuses";
-            this.groupBoxSettings.ResumeLayout(false);
-            this.groupBoxSettings.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).EndInit();
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-
-        private GroupBox groupBoxSettings;
-        private PictureBox pictureBox;
-        private Button buttonAddBus;
-        private ComboBox comboBoxSelectorMap;
-        private Button buttonDeleteBus;
-        private MaskedTextBox maskedTextBoxPosition;
-        private Button buttonShowStorage;
-        private Button button1;
-        private Button buttonRight;
-        private Button buttonDown;
-        private Button buttonLeft;
-        private Button buttonUp;
-    }
-}

DoubleDeckerBus/DoubleDeckerBus/FormMapWithSetBuses.cs

@@ -1,146 +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;
-using static System.Windows.Forms.DataFormats;
-
-namespace DoubleDeckerBus
-{
-    public partial class FormMapWithSetBuses : Form
-    {
-        private MapWithSetBusesGeneric<DrawingObjectBus, AbstractMap> _mapBusesCollectionGeneric;
-
-        public FormMapWithSetBuses()
-        {
-            InitializeComponent();
-            AbstractMap map = new SimpleMap();
-            _mapBusesCollectionGeneric = new MapWithSetBusesGeneric<DrawingObjectBus, AbstractMap>(
-                   pictureBox.Width, pictureBox.Height, map);
-        }
-
-        private void ComboBoxSelectorMap_SelectedIndexChanged(object sender, EventArgs e)
-        {
-            AbstractMap map = null;
-            switch (comboBoxSelectorMap.Text)
-            {
-                case "Простая карта":
-                    map = new SimpleMap();
-                    break;
-                case "Водная карта":
-                    map = new WaterMap();
-                    break;
-            }
-            if (map != null)
-            {
-                _mapBusesCollectionGeneric = new MapWithSetBusesGeneric<DrawingObjectBus, AbstractMap>(
-                    pictureBox.Width, pictureBox.Height, map);
-            }
-            else
-            {
-                _mapBusesCollectionGeneric = null;
-            }
-        }
-
-        private void ButtonAddBus_Click(object sender, EventArgs e)
-        {
-            if (_mapBusesCollectionGeneric == null)
-            {
-                return;
-            }
-            FormBus form = new();
-            if (form.ShowDialog() == DialogResult.OK)
-            {
-                if (form.SelectedBus == null)
-                {
-                    MessageBox.Show("Вы не создали объект");
-                    return;
-                }
-
-                DrawingObjectBus bus = new(form.SelectedBus);
-                
-                if (_mapBusesCollectionGeneric + bus != -1)
-                {
-                    MessageBox.Show("Объект добавлен");
-                    pictureBox.Image = _mapBusesCollectionGeneric.ShowSet();
-                }
-                else
-                {
-                    MessageBox.Show("Не удалось добавить объект");
-                }
-            }
-        }
-
-        private void ButtonRemoveBus_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 (_mapBusesCollectionGeneric - pos != null)
-            {
-                MessageBox.Show("Объект удален");
-                pictureBox.Image = _mapBusesCollectionGeneric.ShowSet();
-            }
-            else
-            {
-                MessageBox.Show("Не удалось удалить объект");
-            }
-        }
-
-        private void ButtonShowStorage_Click(object sender, EventArgs e)
-        {
-            if (_mapBusesCollectionGeneric == null)
-            {
-                return;
-            }
-            pictureBox.Image = _mapBusesCollectionGeneric.ShowSet();
-        }
-
-        private void ButtonShowOnMap_Click(object sender, EventArgs e)
-        {
-            if (_mapBusesCollectionGeneric == null)
-            {
-                return;
-            }
-            pictureBox.Image = _mapBusesCollectionGeneric.ShowOnMap();
-        }
-
-        private void ButtonMove_Click(object sender, EventArgs e)
-        {
-            if (_mapBusesCollectionGeneric == 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 = _mapBusesCollectionGeneric.MoveObject(dir);
-        }
-    }
-}
-

DoubleDeckerBus/DoubleDeckerBus/MapWithSetBusesGeneric.cs

@@ -1,147 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace DoubleDeckerBus
-{
-    internal class MapWithSetBusesGeneric<T, U>
-        where T : class, IDrawingObject
-        where U : AbstractMap
-    {
-
-        private readonly int _pictureWidth;
-        private readonly int _pictureHeight;
-        private readonly int _placeSizeWidth = 210;
-        private readonly int _placeSizeHeight = 90;
-        private readonly SetBusesGeneric<T> _setBuses;
-        private readonly U _map;
-
-        public MapWithSetBusesGeneric(int picWidth, int picHeight, U map)
-        {
-            int width = picWidth / _placeSizeWidth;
-            int height = picHeight / _placeSizeHeight;
-            _setBuses = new SetBusesGeneric<T>(width * height);
-            _pictureWidth = picWidth;
-            _pictureHeight = picHeight;
-            _map = map;
-        }
-
-        public static int operator +(MapWithSetBusesGeneric<T, U> map, T bus)
-        {
-            return map._setBuses.Insert(bus);
-        }
-
-        public static T operator -(MapWithSetBusesGeneric<T, U> map, int position)
-        {
-            return map._setBuses.Remove(position);
-        }
-  
-        public Bitmap ShowSet()
-        {
-            Bitmap bmp = new(_pictureWidth, _pictureHeight);
-            Graphics gr = Graphics.FromImage(bmp);
-            DrawBackground(gr);
-            DrawBuses(gr);
-            return bmp;
-        }
-
-        public Bitmap ShowOnMap()
-        {
-            Shaking();
-            for (int i = 0; i < _setBuses.Count; i++)
-            {
-                var bus = _setBuses.Get(i);
-                if (bus != null)
-                {
-                    return _map.CreateMap(_pictureWidth, _pictureHeight, bus);
-                }
-            }
-            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 = _setBuses.Count - 1;
-            for (int i = 0; i < _setBuses.Count; i++)
-            {
-                if (_setBuses.Get(i) == null)
-                {
-                    for (; j > i; j--)
-                    {
-                        var bus = _setBuses.Get(j);
-                        if (bus != null)
-                        {
-                            _setBuses.Insert(bus, i);
-                            _setBuses.Remove(j);
-                            break;
-                        }
-                    }
-                    if (j <= i)
-                    {
-                        return;
-                    }
-                }
-            }
-        }
-
-        private void DrawBackground(Graphics g)
-        {
-            Pen pen = new(Color.Black, 3);
-            Brush pointColor = new SolidBrush(Color.Orange);
-            for (int i = 0; i < _pictureWidth / _placeSizeWidth; i++)
-            {
-                for (int j = 0; j < _pictureHeight / _placeSizeHeight + 1; ++j)
-                {
-                    g.DrawLine(pen, i * _placeSizeWidth, j * _placeSizeHeight, i * _placeSizeWidth + _placeSizeWidth / 2, j * _placeSizeHeight);
-                    g.DrawLine(pen, i * _placeSizeWidth + _placeSizeWidth / 2, j * _placeSizeHeight,
-                        i * _placeSizeWidth + _placeSizeWidth / 2, (int)((j * _placeSizeHeight) - (40)));
-
-                    g.FillPolygon(pointColor, new Point[] {
-                        new Point(i * _placeSizeWidth + _placeSizeWidth / 2, (int)((j * _placeSizeHeight) - (40))),
-                        new Point(i * _placeSizeWidth + _placeSizeWidth / 2 - 10, (int)((j * _placeSizeHeight) - (50))),
-                        new Point(i * _placeSizeWidth + _placeSizeWidth / 2, (int)((j * _placeSizeHeight) - (60))),
-                        new Point(i * _placeSizeWidth + _placeSizeWidth / 2 + 10, (int)((j * _placeSizeHeight) - (50)))
-                    });
-                }
-                g.DrawLine(pen, i * _placeSizeWidth, 0, i * _placeSizeWidth, (_pictureHeight / _placeSizeHeight) * _placeSizeHeight);
-            }
-        }
-
-        private void DrawBuses(Graphics g)
-        {
-            int width = _pictureWidth / _placeSizeWidth;
-            int height = _pictureHeight / _placeSizeHeight;
-
-            int currentWidth = width - 1;
-            int currentHeight = 0;
-
-            for (int i = 0; i < _setBuses.Count; i++) {
-
-                _setBuses.Get(i)?.SetObject(currentWidth * _placeSizeWidth,
-                    currentHeight * _placeSizeHeight,
-                    _pictureWidth, _pictureHeight);
-                _setBuses.Get(i)?.DrawingObject(g);
-
-                if (currentWidth > 0)
-                    currentWidth--;
-                else
-                {
-                    currentWidth = width - 1;
-                    currentHeight++;
-                }
-                if (currentHeight > height) return;
-            }
-        }
-    }
-}

DoubleDeckerBus/DoubleDeckerBus/Program.cs

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

DoubleDeckerBus/DoubleDeckerBus/SetBusesGeneric.cs

@@ -1,58 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace DoubleDeckerBus
-{
-    internal class SetBusesGeneric<T>
-        where T : class
-    {
-        private readonly T[] _places;
-
-        public int Count => _places.Length;
-        private int BusyPlaces = 0;
-
-        public SetBusesGeneric(int count)
-        {
-            _places = new T[count];
-        }
-
-        public int Insert(T bus)
-        {
-            return Insert(bus, 0);
-        }
-        
-        public int Insert(T bus, int position)
-        {
-            if (position < 0 || position >= _places.Length || BusyPlaces == _places.Length) return -1;
-
-            BusyPlaces++;
-            while (_places[position] != null) {
-                for (int i = _places.Length - 1; i > 0; --i) {
-                    if (_places[i] == null && _places[i - 1] != null) {
-                        _places[i] = _places[i - 1];
-                        _places[i - 1] = null;
-                    }
-                }   
-            }
-            _places[position] = bus;
-            return position;
-        }
-       
-        public T Remove(int position)
-        {
-            if (position < 0 || position >= _places.Length) return null;
-            T savedBus = _places[position];
-            _places[position] = null;
-            return savedBus;
-        }
-       
-        public T Get(int position)
-        {
-            if (position < 0 || position >= _places.Length) return null;
-            return _places[position];
-        }
-    }
-}