Удалить 'DoubleDeckerBus/Properties/Resources.resx'

revert готовая

.gitignore

@@ -397,4 +397,3 @@ FodyWeavers.xsd
 
 # JetBrains Rider
 *.sln.iml
-

DoubleDeckerBus.sln

@@ -1,25 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.7.34024.191
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DoubleDeckerBus\DoubleDeckerBus", "DoubleDeckerBus\DoubleDeckerBus.csproj", "{2AA7FB83-8FC3-451D-B277-158CCA4DAE44}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{2AA7FB83-8FC3-451D-B277-158CCA4DAE44}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2AA7FB83-8FC3-451D-B277-158CCA4DAE44}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2AA7FB83-8FC3-451D-B277-158CCA4DAE44}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2AA7FB83-8FC3-451D-B277-158CCA4DAE44}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {7F269221-EAB0-4961-A192-4F793DC88242}
-	EndGlobalSection
-EndGlobal

DoubleDeckerBus/DoubleDeckerBus.csproj

@@ -1,26 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <OutputType>WinExe</OutputType>
-    <TargetFramework>net6.0-windows</TargetFramework>
-    <Nullable>enable</Nullable>
-    <UseWindowsForms>true</UseWindowsForms>
-    <ImplicitUsings>enable</ImplicitUsings>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Update="Properties\Resources.Designer.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-  </ItemGroup>
-
-  <ItemGroup>
-    <EmbeddedResource Update="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-  </ItemGroup>
-
-</Project>

DoubleDeckerBus/Drawing/DrawingBus.cs

@@ -1,129 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-using DoubleDeckerbus.Entities;
-using DoubleDeckerbus.Move_Strategy;
-
-namespace DoubleDeckerbus.Drawing
-{
-    public class DrawingBus
-    {
-        public IMoveableObject GetMoveableObject => new DrawingObjectBus(this);
-        public EntityBus? EntityBus { get; protected set; }
-        public int _pictureWidth;
-        public int _pictureHeight;
-        protected int _startPosX;
-        protected int _startPosY;
-        protected readonly int _busWidth = 175;                       
-        protected readonly int _busHeight = 115;                                 
-        public int GetPosX => _startPosX;
-        public int GetPosY => _startPosY;
-        public int GetWidth => _busWidth;
-        public int GetHeight => _busHeight;
-        public DrawingBus(int speed, double weight, Color bodyColor, int width, int height)
-        {
-            if (width < _busWidth || height < _busHeight)
-            {
-                return;
-            }
-            _pictureWidth = width;
-            _pictureHeight = height;
-            EntityBus = new EntityBus(speed, weight, bodyColor);
-        }
-        protected DrawingBus(int speed, double weight, Color bodyColor, int width, int height, int busWidth, int busHeight)
-        {
-            if (width < _busWidth || height < _busHeight)
-            {
-                return;
-            }
-            _pictureWidth = width;
-            _pictureHeight = height;
-            _busWidth = busWidth;
-            _busHeight = busHeight;
-            EntityBus = new EntityBus(speed, weight, bodyColor);
-        }
-        public void SetPosition(int x, int y)
-        {
-            if (x > _pictureWidth || y > _pictureHeight)
-            {
-                return;
-            }
-            _startPosX = x;
-            _startPosY = y;
-        }
-        public void MoveTransport(DirectionType direction)
-        {
-            if (!CanMove(direction) || EntityBus == null)
-            {
-                return;
-            }
-            switch (direction)
-            {
-                case DirectionType.Left:
-                    if (_startPosX - EntityBus.Step > 0)
-                    {
-                        _startPosX -= (int)EntityBus.Step;
-                    }
-                    break;
-                case DirectionType.Up:
-                    if (_startPosY - EntityBus.Step > 0)
-                    {
-                        _startPosY -= (int)EntityBus.Step;
-                    }
-                    break;
-                case DirectionType.Right:
-                    if (_startPosX + _busWidth + EntityBus.Step < _pictureWidth)
-                    {
-                        _startPosX += (int)EntityBus.Step;
-                    }
-                    break;
-                case DirectionType.Down:
-                    if (_startPosY + _busHeight + EntityBus.Step < _pictureHeight)
-                    {
-                        _startPosY += (int)EntityBus.Step;
-                    }
-                    break;
-            }
-        }
-        public virtual void DrawTransport(Graphics g)
-        {
-            Pen pen = new(Color.Black);
-            Brush additionalBrush = new
-            SolidBrush(EntityBus.BodyColor);
-            g.FillRectangle(additionalBrush, _startPosX + 147, _startPosY + 52, 21, 20);
-            g.FillRectangle(additionalBrush, _startPosX + 147, _startPosY + 71, 30, 27);
-            g.FillRectangle(additionalBrush, _startPosX + 10, _startPosY + 52, 137, 46);
-            Brush brBlue = new SolidBrush(Color.LightBlue);
-            g.FillRectangle(brBlue, _startPosX + 150, _startPosY + 55, 15, 15);
-            g.FillRectangle(brBlue, _startPosX + 42, _startPosY + 55, 15, 15);
-            g.FillRectangle(brBlue, _startPosX + 69, _startPosY + 55, 15, 15);
-            g.FillRectangle(brBlue, _startPosX + 96, _startPosY + 55, 15, 15);
-            g.FillRectangle(brBlue, _startPosX + 123, _startPosY + 55, 15, 15);
-            g.DrawLine(pen, _startPosX + 30, _startPosY + 52, _startPosX + 30, _startPosY + 98);
-            g.DrawLine(pen, _startPosX + 35, _startPosY + 52, _startPosX + 35, _startPosY + 98);
-            Brush gr = new SolidBrush(Color.Gray);
-            g.FillEllipse(additionalBrush, _startPosX + 23, _startPosY + 88, 25, 25);
-            g.FillEllipse(additionalBrush, _startPosX + 123, _startPosY + 88, 25, 25);
-            g.FillEllipse(gr, _startPosX + 25, _startPosY + 90, 21, 21);
-            g.FillEllipse(gr, _startPosX + 125, _startPosY + 90, 21, 21);
-        }
-        public bool CanMove(DirectionType direction)
-        {
-            if (EntityBus == null)
-            {
-                return false;
-            }
-            return direction switch
-            {
-                DirectionType.Left => _startPosX - EntityBus.Step > 0,
-                DirectionType.Up => _startPosY - EntityBus.Step > 0,
-                DirectionType.Right => _startPosX + _busWidth + EntityBus.Step < _pictureWidth,
-                DirectionType.Down => _startPosY + _busHeight + EntityBus.Step < _pictureHeight,
-                _ => false,
-            };
-        }
-    }
-}

DoubleDeckerBus/Drawing/DrawingDoubleDeckerbus.cs

@@ -1,60 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-using DoubleDeckerbus.Entities;
-
-namespace DoubleDeckerbus.Drawing
-{
-    public class DrawingDoubleDeckerbus : DrawingBus
-    {
-        public DrawingDoubleDeckerbus(int speed, double weight, Color bodyColor, Color additionalColor, bool secondfloor, bool stairs, int width, int height) : base(speed, weight, bodyColor, width, height, 180, 110)
-        {
-            if (EntityBus != null)
-            {
-                EntityBus = new EntityDoubleDeckerBus(speed, weight, bodyColor, additionalColor, secondfloor, stairs);
-            }
-        }
-        public override void DrawTransport(Graphics g)
-        {
-            if (EntityBus is not EntityDoubleDeckerBus doubleDeckerBus)
-            {
-                return;
-            }
-            Pen pen = new(Color.Black); //чёрный цвет для колёс
-            Pen additionalPen = new(doubleDeckerBus.AddColor);
-            Brush additionalBrush = new SolidBrush(doubleDeckerBus.AddColor);
-            base.DrawTransport(g);
-
-            if (doubleDeckerBus.Secondfloor)
-            {
-                Brush additionalBrush2 = new SolidBrush(doubleDeckerBus.AddColor);
-                Brush brBlue = new SolidBrush(Color.LightBlue);
-
-                g.FillRectangle(additionalBrush2, _startPosX + 7, _startPosY + 12, 172, 40); //большой прямоугольник
-
-                g.DrawLine(pen, _startPosX + 7, _startPosY + 36, _startPosX + 178, _startPosY + 36);
-
-                g.FillRectangle(brBlue, _startPosX + 15, _startPosY + 15, 15, 15);
-                g.FillRectangle(brBlue, _startPosX + 42, _startPosY + 15, 15, 15);
-                g.FillRectangle(brBlue, _startPosX + 69, _startPosY + 15, 15, 15);
-                g.FillRectangle(brBlue, _startPosX + 96, _startPosY + 15, 15, 15);
-                g.FillRectangle(brBlue, _startPosX + 123, _startPosY + 15, 15, 15);
-                g.FillRectangle(brBlue, _startPosX + 150, _startPosY + 15, 15, 15);
-            }
-
-            if (doubleDeckerBus.Stairs)
-            {
-                g.DrawLine(pen, _startPosX + 10, _startPosY + 55, _startPosX + 34, _startPosY + 55);
-                g.DrawLine(pen, _startPosX + 10, _startPosY + 58, _startPosX + 34, _startPosY + 58);
-                g.DrawLine(pen, _startPosX + 10, _startPosY + 64, _startPosX + 34, _startPosY + 64);
-                g.DrawLine(pen, _startPosX + 10, _startPosY + 72, _startPosX + 34, _startPosY + 72);
-                g.DrawLine(pen, _startPosX + 10, _startPosY + 80, _startPosX + 34, _startPosY + 80);
-                g.DrawLine(pen, _startPosX + 10, _startPosY + 88, _startPosX + 34, _startPosY + 88);
-                g.DrawLine(pen, _startPosX + 10, _startPosY + 94, _startPosX + 34, _startPosY + 94);
-            }
-        }
-    }
-}

DoubleDeckerBus/Entities/DirectionType.cs

@@ -1,16 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace DoubleDeckerbus.Entities
-{
-    public enum DirectionType
-    {
-        Up = 1,
-        Down = 2,
-        Left = 3,
-        Right = 4
-    }
-}

DoubleDeckerBus/Entities/EntityBus.cs

@@ -1,22 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace DoubleDeckerbus.Entities
-{
-    public class EntityBus
-    {
-        public int Speed { get; private set; }
-        public double Weight { get; private set; }
-        public Color BodyColor { get; private set; }
-        public double Step => (double)Speed * 100 / Weight;
-        public EntityBus(int speed, double weight, Color bodyColor)
-        {
-            Speed = speed;
-            Weight = weight;
-            BodyColor = bodyColor;
-        }
-    }
-}

DoubleDeckerBus/Entities/EntityDoubleDeckerbus.cs

@@ -1,22 +0,0 @@
-using DoubleDeckerbus.Entities;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace DoubleDeckerbus.Entities
-{
-    public class EntityDoubleDeckerBus : EntityBus
-    {
-        public Color AddColor { get; private set; }
-        public bool Secondfloor { get; private set; }
-        public bool Stairs { get; private set; }
-        public EntityDoubleDeckerBus(int speed, double weight, Color bodyColor, Color additionalColor, bool secondfloor, bool stairs) : base(speed, weight, bodyColor)
-        {
-            AddColor = additionalColor;
-            Secondfloor = secondfloor;
-            Stairs = stairs;
-        }
-    }
-}

DoubleDeckerBus/FormDoubleDeckerBus.Designer.cs

@@ -1,198 +0,0 @@
-namespace DoubleDeckerbus
-{
-    partial class FormDoubleDeckerbus
-    {
-        /// <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()
-        {
-            pictureBoxDoubleDeckerbus = new PictureBox();
-            DoubleDeckerbus = new Button();
-            buttonUp = new Button();
-            buttonLeft = new Button();
-            buttonDown = new Button();
-            buttonRight = new Button();
-            comboBoxStrategy = new ComboBox();
-            buttonStep = new Button();
-            buttonCreateBus = new Button();
-            buttonSelect = new Button();
-            ((System.ComponentModel.ISupportInitialize)pictureBoxDoubleDeckerbus).BeginInit();
-            SuspendLayout();
-            // 
-            // pictureBoxDoubleDeckerbus
-            // 
-            pictureBoxDoubleDeckerbus.Dock = DockStyle.Fill;
-            pictureBoxDoubleDeckerbus.Location = new Point(0, 0);
-            pictureBoxDoubleDeckerbus.Margin = new Padding(3, 2, 3, 2);
-            pictureBoxDoubleDeckerbus.Name = "pictureBoxDoubleDeckerbus";
-            pictureBoxDoubleDeckerbus.Size = new Size(772, 340);
-            pictureBoxDoubleDeckerbus.TabIndex = 5;
-            pictureBoxDoubleDeckerbus.TabStop = false;
-            // 
-            // DoubleDeckerbus
-            // 
-            DoubleDeckerbus.Anchor = AnchorStyles.Bottom | AnchorStyles.Left;
-            DoubleDeckerbus.Font = new Font("Segoe UI", 9F, FontStyle.Regular, GraphicsUnit.Point);
-            DoubleDeckerbus.Location = new Point(10, 274);
-            DoubleDeckerbus.Margin = new Padding(3, 2, 3, 2);
-            DoubleDeckerbus.Name = "DoubleDeckerbus";
-            DoubleDeckerbus.Size = new Size(105, 55);
-            DoubleDeckerbus.TabIndex = 6;
-            DoubleDeckerbus.Text = "Создать Двухэтажный автобус";
-            DoubleDeckerbus.UseVisualStyleBackColor = true;
-            DoubleDeckerbus.Click += buttonCreateDoubleDeckerbus_Click;
-            // 
-            // buttonUp
-            // 
-            buttonUp.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
-            buttonUp.BackgroundImageLayout = ImageLayout.Zoom;
-            buttonUp.Location = new Point(710, 283);
-            buttonUp.Margin = new Padding(3, 2, 3, 2);
-            buttonUp.Name = "buttonUp";
-            buttonUp.Size = new Size(26, 22);
-            buttonUp.TabIndex = 7;
-            buttonUp.UseVisualStyleBackColor = true;
-            buttonUp.Click += buttonMove_Click;
-            // 
-            // buttonLeft
-            // 
-            buttonLeft.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
-            buttonLeft.BackgroundImageLayout = ImageLayout.Zoom;
-            buttonLeft.Location = new Point(679, 310);
-            buttonLeft.Margin = new Padding(3, 2, 3, 2);
-            buttonLeft.Name = "buttonLeft";
-            buttonLeft.Size = new Size(26, 22);
-            buttonLeft.TabIndex = 8;
-            buttonLeft.UseVisualStyleBackColor = true;
-            buttonLeft.Click += buttonMove_Click;
-            // 
-            // buttonDown
-            // 
-            buttonDown.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
-            buttonDown.BackgroundImageLayout = ImageLayout.Zoom;
-            buttonDown.Location = new Point(710, 310);
-            buttonDown.Margin = new Padding(3, 2, 3, 2);
-            buttonDown.Name = "buttonDown";
-            buttonDown.Size = new Size(26, 22);
-            buttonDown.TabIndex = 9;
-            buttonDown.UseVisualStyleBackColor = true;
-            buttonDown.Click += buttonMove_Click;
-            // 
-            // buttonRight
-            // 
-            buttonRight.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
-            buttonRight.BackgroundImageLayout = ImageLayout.Zoom;
-            buttonRight.Location = new Point(742, 310);
-            buttonRight.Margin = new Padding(3, 2, 3, 2);
-            buttonRight.Name = "buttonRight";
-            buttonRight.Size = new Size(26, 22);
-            buttonRight.TabIndex = 10;
-            buttonRight.UseVisualStyleBackColor = true;
-            buttonRight.Click += buttonMove_Click;
-            // 
-            // comboBoxStrategy
-            // 
-            comboBoxStrategy.Anchor = AnchorStyles.Top | AnchorStyles.Right;
-            comboBoxStrategy.DropDownStyle = ComboBoxStyle.DropDownList;
-            comboBoxStrategy.FormattingEnabled = true;
-            comboBoxStrategy.Items.AddRange(new object[] { "В центр", "В правый нижний угол" });
-            comboBoxStrategy.Location = new Point(629, 9);
-            comboBoxStrategy.Margin = new Padding(3, 2, 3, 2);
-            comboBoxStrategy.Name = "comboBoxStrategy";
-            comboBoxStrategy.Size = new Size(133, 23);
-            comboBoxStrategy.TabIndex = 11;
-            // 
-            // buttonStep
-            // 
-            buttonStep.Anchor = AnchorStyles.Top | AnchorStyles.Right;
-            buttonStep.Location = new Point(654, 34);
-            buttonStep.Margin = new Padding(3, 2, 3, 2);
-            buttonStep.Name = "buttonStep";
-            buttonStep.Size = new Size(82, 22);
-            buttonStep.TabIndex = 12;
-            buttonStep.Text = "Шаг";
-            buttonStep.UseVisualStyleBackColor = true;
-            buttonStep.Click += buttonStep_Click;
-            // 
-            // buttonCreateBus
-            // 
-            buttonCreateBus.Anchor = AnchorStyles.Bottom | AnchorStyles.Left;
-            buttonCreateBus.Location = new Point(121, 291);
-            buttonCreateBus.Margin = new Padding(3, 2, 3, 2);
-            buttonCreateBus.Name = "buttonCreateBus";
-            buttonCreateBus.Size = new Size(105, 38);
-            buttonCreateBus.TabIndex = 13;
-            buttonCreateBus.Text = "Создать автобус";
-            buttonCreateBus.UseVisualStyleBackColor = true;
-            buttonCreateBus.Click += buttonCreateBus_Click;
-            // 
-            // buttonSelect
-            // 
-            buttonSelect.Anchor = AnchorStyles.Bottom | AnchorStyles.Left;
-            buttonSelect.Location = new Point(239, 274);
-            buttonSelect.Margin = new Padding(3, 2, 3, 2);
-            buttonSelect.Name = "buttonSelect";
-            buttonSelect.Size = new Size(105, 55);
-            buttonSelect.TabIndex = 14;
-            buttonSelect.Text = "Выбрать автобус";
-            buttonSelect.UseVisualStyleBackColor = true;
-            buttonSelect.Click += ButtonSelectBus_Click;
-            // 
-            // FormDoubleDeckerbus
-            // 
-            AutoScaleDimensions = new SizeF(7F, 15F);
-            AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(772, 340);
-            Controls.Add(buttonSelect);
-            Controls.Add(buttonCreateBus);
-            Controls.Add(buttonStep);
-            Controls.Add(comboBoxStrategy);
-            Controls.Add(buttonRight);
-            Controls.Add(buttonDown);
-            Controls.Add(buttonLeft);
-            Controls.Add(buttonUp);
-            Controls.Add(DoubleDeckerbus);
-            Controls.Add(pictureBoxDoubleDeckerbus);
-            Margin = new Padding(3, 2, 3, 2);
-            Name = "FormDoubleDeckerbus";
-            Text = "Автобус";
-            ((System.ComponentModel.ISupportInitialize)pictureBoxDoubleDeckerbus).EndInit();
-            ResumeLayout(false);
-        }
-
-        #endregion
-
-        private PictureBox pictureBoxDoubleDeckerbus;
-        private Button DoubleDeckerbus;
-        private Button buttonUp;
-        private Button buttonLeft;
-        private Button buttonDown;
-        private Button buttonRight;
-        private ComboBox comboBoxStrategy;
-        private Button buttonStep;
-        private Button buttonCreateBus;
-        private Button buttonSelect;
-    }
-}

DoubleDeckerBus/FormDoubleDeckerBus.cs

@@ -1,134 +0,0 @@
-using DoubleDeckerbus.Drawing;
-using DoubleDeckerbus.Entities;
-using DoubleDeckerbus.Move_Strategy;
-
-namespace DoubleDeckerbus
-{
-
-    public partial class FormDoubleDeckerbus : Form
-    {
-        private DrawingBus? _drawingBus;
-        private AbstractStrategy? _abstractStrategy;
-        public DrawingBus? SelectedBus { get; private set; }
-
-        public FormDoubleDeckerbus()
-        {
-            InitializeComponent();
-            _abstractStrategy = null;
-            SelectedBus = null;
-        }
-        private void Draw()
-        {
-            if (_drawingBus == null)
-            {
-                return;
-            }
-            Bitmap bmp = new(pictureBoxDoubleDeckerbus.Width, pictureBoxDoubleDeckerbus.Height);
-            Graphics gr = Graphics.FromImage(bmp);
-            _drawingBus.DrawTransport(gr);
-            pictureBoxDoubleDeckerbus.Image = bmp;
-
-        }
-        private void buttonCreateDoubleDeckerbus_Click(object sender, EventArgs e)
-        {
-            Random random = new();
-            Color color = Color.FromArgb(random.Next(0, 256),
-            random.Next(0, 256), random.Next(0, 256));
-            Color color1 = Color.FromArgb(random.Next(0, 256),
-            random.Next(0, 256), random.Next(0, 256));
-            ColorDialog dialog = new();
-            ColorDialog dialog1 = new();
-            if (dialog.ShowDialog() == DialogResult.OK && dialog1.ShowDialog() == DialogResult.OK)
-            {
-                color = dialog.Color;
-                color1 = dialog1.Color;
-            }
-            _drawingBus = new DrawingDoubleDeckerbus(random.Next(100, 300),
-            random.Next(1000, 3000), color, color1, true, true,
-            pictureBoxDoubleDeckerbus.Width, pictureBoxDoubleDeckerbus.Height);
-            _drawingBus.SetPosition(random.Next(10, 100), random.Next(10,
-            100));
-            Draw();
-
-        }
-        private void buttonCreateBus_Click(object sender, EventArgs e)
-        {
-            Random random = new();
-            Color color = Color.FromArgb(random.Next(0, 256),
-            random.Next(0, 256), random.Next(0, 256));
-            ColorDialog dialog = new();
-            if (dialog.ShowDialog() == DialogResult.OK)
-            {
-                color = dialog.Color;
-            }
-            _drawingBus = new DrawingBus(random.Next(100, 300),
-            random.Next(1000, 3000), color,
-            pictureBoxDoubleDeckerbus.Width, pictureBoxDoubleDeckerbus.Height);
-            _drawingBus.SetPosition(random.Next(10, 100), random.Next(10,100));
-            Draw();
-        }
-        private void buttonMove_Click(object sender, EventArgs e)
-        {
-            if (_drawingBus == null)
-            {
-                return;
-            }
-            string name = ((Button)sender)?.Name ?? string.Empty;
-            switch (name)
-            {
-                case "buttonUp":
-                    _drawingBus.MoveTransport(DirectionType.Up);
-                    break;
-                case "buttonDown":
-                    _drawingBus.MoveTransport(DirectionType.Down);
-                    break;
-                case "buttonLeft":
-                    _drawingBus.MoveTransport(DirectionType.Left);
-                    break;
-                case "buttonRight":
-                    _drawingBus.MoveTransport(DirectionType.Right);
-                    break;
-            }
-            Draw();
-        }
-        private void buttonStep_Click(object sender, EventArgs e)
-        {
-            if (_drawingBus == null)
-            {
-                return;
-            }
-            if (comboBoxStrategy.Enabled)
-            {
-                _abstractStrategy = comboBoxStrategy.SelectedIndex
-                switch
-                {
-                    0 => new MoveToCenter(),
-                    1 => new MoveToBorder(),
-                    _ => null,
-                };
-                if (_abstractStrategy == null)
-                {
-                    return;
-                }
-                _abstractStrategy.SetData(new DrawingObjectBus(_drawingBus), pictureBoxDoubleDeckerbus.Width, pictureBoxDoubleDeckerbus.Height);
-                comboBoxStrategy.Enabled = false;
-            }
-            if (_abstractStrategy == null)
-            {
-                return;
-            }
-            _abstractStrategy.MakeStep();
-            Draw();
-            if (_abstractStrategy.GetStatus() == Status.Finish)
-            {
-                comboBoxStrategy.Enabled = true;
-                _abstractStrategy = null;
-            }
-        }
-        private void ButtonSelectBus_Click(object sender, EventArgs e)
-        {
-            SelectedBus = _drawingBus;
-            DialogResult = DialogResult.OK;
-        }
-    }
-}

DoubleDeckerBus/FormDoubleDeckerbusCollection.Designer.cs

@@ -1,197 +0,0 @@
-namespace DoubleDeckerbus
-{
-    partial class FormDoubleDeckerbusCollection
-    {
-        /// <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()
-        {
-            buttonAddBus = new Button();
-            pictureBoxCollection = new PictureBox();
-            labelInstruments = new Label();
-            buttonUpdate = new Button();
-            buttonDeleteBus = new Button();
-            colorDialog = new ColorDialog();
-            maskedTextBoxNumber = new MaskedTextBox();
-            label1 = new Label();
-            listBoxStorages = new ListBox();
-            buttonAddStorage = new Button();
-            buttonDeleteStorage = new Button();
-            textBoxStorageName = new TextBox();
-            ((System.ComponentModel.ISupportInitialize)pictureBoxCollection).BeginInit();
-            SuspendLayout();
-            // 
-            // buttonAddBus
-            // 
-            buttonAddBus.Anchor = AnchorStyles.Top | AnchorStyles.Right;
-            buttonAddBus.Location = new Point(666, 331);
-            buttonAddBus.Name = "buttonAddBus";
-            buttonAddBus.Size = new Size(118, 28);
-            buttonAddBus.TabIndex = 0;
-            buttonAddBus.Text = "Добавить автобус";
-            buttonAddBus.UseVisualStyleBackColor = true;
-            buttonAddBus.Click += buttonAddBus_Click;
-            // 
-            // pictureBoxCollection
-            // 
-            pictureBoxCollection.Location = new Point(3, 0);
-            pictureBoxCollection.Name = "pictureBoxCollection";
-            pictureBoxCollection.Size = new Size(639, 436);
-            pictureBoxCollection.TabIndex = 1;
-            pictureBoxCollection.TabStop = false;
-            // 
-            // labelInstruments
-            // 
-            labelInstruments.Anchor = AnchorStyles.Top | AnchorStyles.Right;
-            labelInstruments.AutoSize = true;
-            labelInstruments.Font = new Font("Segoe UI", 12F, FontStyle.Regular, GraphicsUnit.Point);
-            labelInstruments.Location = new Point(666, 0);
-            labelInstruments.Name = "labelInstruments";
-            labelInstruments.Size = new Size(108, 21);
-            labelInstruments.TabIndex = 2;
-            labelInstruments.Text = "Инструменты";
-            // 
-            // buttonUpdate
-            // 
-            buttonUpdate.Anchor = AnchorStyles.Top | AnchorStyles.Right;
-            buttonUpdate.Location = new Point(658, 130);
-            buttonUpdate.Name = "buttonUpdate";
-            buttonUpdate.Size = new Size(131, 25);
-            buttonUpdate.TabIndex = 3;
-            buttonUpdate.Text = "Обновить набор";
-            buttonUpdate.UseVisualStyleBackColor = true;
-            buttonUpdate.Click += buttonUpdate_Click;
-            // 
-            // buttonDeleteBus
-            // 
-            buttonDeleteBus.Anchor = AnchorStyles.Top | AnchorStyles.Right;
-            buttonDeleteBus.Location = new Point(666, 394);
-            buttonDeleteBus.Name = "buttonDeleteBus";
-            buttonDeleteBus.Size = new Size(118, 28);
-            buttonDeleteBus.TabIndex = 4;
-            buttonDeleteBus.Text = "Удалить автобус";
-            buttonDeleteBus.UseVisualStyleBackColor = true;
-            buttonDeleteBus.Click += buttonDeleteBus_Click;
-            // 
-            // maskedTextBoxNumber
-            // 
-            maskedTextBoxNumber.Anchor = AnchorStyles.Top | AnchorStyles.Right;
-            maskedTextBoxNumber.Location = new Point(658, 365);
-            maskedTextBoxNumber.Mask = "00";
-            maskedTextBoxNumber.Name = "maskedTextBoxNumber";
-            maskedTextBoxNumber.Size = new Size(138, 23);
-            maskedTextBoxNumber.TabIndex = 5;
-            maskedTextBoxNumber.ValidatingType = typeof(int);
-            // 
-            // label1
-            // 
-            label1.Anchor = AnchorStyles.Top | AnchorStyles.Right;
-            label1.AutoSize = true;
-            label1.Location = new Point(658, 38);
-            label1.Name = "label1";
-            label1.Size = new Size(52, 15);
-            label1.TabIndex = 7;
-            label1.Text = "Наборы";
-            // 
-            // listBoxStorages
-            // 
-            listBoxStorages.FormattingEnabled = true;
-            listBoxStorages.ItemHeight = 15;
-            listBoxStorages.Location = new Point(657, 159);
-            listBoxStorages.Margin = new Padding(3, 2, 3, 2);
-            listBoxStorages.Name = "listBoxStorages";
-            listBoxStorages.Size = new Size(132, 109);
-            listBoxStorages.TabIndex = 8;
-            listBoxStorages.SelectedIndexChanged += listBoxObjects_SelectedIndexChanged;
-            // 
-            // buttonAddStorage
-            // 
-            buttonAddStorage.Location = new Point(657, 101);
-            buttonAddStorage.Margin = new Padding(3, 2, 3, 2);
-            buttonAddStorage.Name = "buttonAddStorage";
-            buttonAddStorage.Size = new Size(131, 25);
-            buttonAddStorage.TabIndex = 9;
-            buttonAddStorage.Text = "Добавить набор";
-            buttonAddStorage.UseVisualStyleBackColor = true;
-            buttonAddStorage.Click += buttonAddStorage_Click;
-            // 
-            // buttonDeleteStorage
-            // 
-            buttonDeleteStorage.Location = new Point(657, 272);
-            buttonDeleteStorage.Margin = new Padding(3, 2, 3, 2);
-            buttonDeleteStorage.Name = "buttonDeleteStorage";
-            buttonDeleteStorage.Size = new Size(131, 25);
-            buttonDeleteStorage.TabIndex = 10;
-            buttonDeleteStorage.Text = "Удалить набор";
-            buttonDeleteStorage.UseVisualStyleBackColor = true;
-            buttonDeleteStorage.Click += buttonDeleteStorage_Click;
-            // 
-            // textBoxStorageName
-            // 
-            textBoxStorageName.Location = new Point(657, 76);
-            textBoxStorageName.Margin = new Padding(3, 2, 3, 2);
-            textBoxStorageName.Name = "textBoxStorageName";
-            textBoxStorageName.Size = new Size(132, 23);
-            textBoxStorageName.TabIndex = 11;
-            // 
-            // FormDoubleDeckerbusCollection
-            // 
-            AutoScaleDimensions = new SizeF(7F, 15F);
-            AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(810, 443);
-            Controls.Add(textBoxStorageName);
-            Controls.Add(buttonDeleteStorage);
-            Controls.Add(buttonAddStorage);
-            Controls.Add(listBoxStorages);
-            Controls.Add(label1);
-            Controls.Add(buttonAddBus);
-            Controls.Add(maskedTextBoxNumber);
-            Controls.Add(buttonDeleteBus);
-            Controls.Add(buttonUpdate);
-            Controls.Add(labelInstruments);
-            Controls.Add(pictureBoxCollection);
-            Name = "FormDoubleDeckerbusCollection";
-            Text = "Набор автобусов";
-            ((System.ComponentModel.ISupportInitialize)pictureBoxCollection).EndInit();
-            ResumeLayout(false);
-            PerformLayout();
-        }
-
-        #endregion
-
-        private Button buttonAddBus;
-        private PictureBox pictureBoxCollection;
-        private Label labelInstruments;
-        private Button buttonUpdate;
-        private Button buttonDeleteBus;
-        private ColorDialog colorDialog;
-        private MaskedTextBox maskedTextBoxNumber;
-        private Label label1;
-        private ListBox listBoxStorages;
-        private Button buttonAddStorage;
-        private Button buttonDeleteStorage;
-        private TextBox textBoxStorageName;
-    }
-}

DoubleDeckerBus/FormDoubleDeckerbusCollection.cs

@@ -1,143 +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 DoubleDeckerbus.Generic;
-using DoubleDeckerbus.Drawing;
-using DoubleDeckerbus.Move_Strategy;
-
-namespace DoubleDeckerbus
-{
-    public partial class FormDoubleDeckerbusCollection : Form
-    {
-        private readonly BusesGenericStorage _storage;
-        public FormDoubleDeckerbusCollection()
-        {
-            InitializeComponent();
-            _storage = new BusesGenericStorage(pictureBoxCollection.Width, pictureBoxCollection.Height);
-        }
-        private void ReloadObjects()
-        {
-            int index = listBoxStorages.SelectedIndex;
-            listBoxStorages.Items.Clear();
-            for (int i = 0; i < _storage.Keys.Count; i++)
-            {
-                listBoxStorages.Items.Add(_storage.Keys[i]);
-            }
-            if (listBoxStorages.Items.Count > 0 && (index == -1 || index >= listBoxStorages.Items.Count))
-            {
-                listBoxStorages.SelectedIndex = 0;
-            }
-            else if (listBoxStorages.Items.Count > 0 && index > -1 && index < listBoxStorages.Items.Count)
-            {
-                listBoxStorages.SelectedIndex = index;
-            }
-        }
-        private void buttonAddStorage_Click(object sender, EventArgs e)
-        {
-            if (string.IsNullOrEmpty(textBoxStorageName.Text))
-            {
-                MessageBox.Show("Не все данные заполнены", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
-            }
-            _storage.AddSet(textBoxStorageName.Text);
-            ReloadObjects();
-        }
-        private void listBoxObjects_SelectedIndexChanged(object sender, EventArgs e)
-        {
-            pictureBoxCollection.Image = _storage[listBoxStorages.SelectedItem?.ToString() ?? string.Empty]?.ShowBus();
-        }
-        private void buttonDeleteStorage_Click(object sender, EventArgs e)
-        {
-            if (listBoxStorages.SelectedIndex == -1)
-            {
-                return;
-            }
-            if (MessageBox.Show($"Удалить объект {listBoxStorages.SelectedItem}?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
-            {
-                _storage.DelSet(listBoxStorages.SelectedItem.ToString() ?? string.Empty);
-                ReloadObjects();
-            }
-        }
-        private void buttonAddBus_Click(object sender, EventArgs e)
-        {
-            if (listBoxStorages.SelectedIndex == -1)
-            {
-                MessageBox.Show("Не выбран набор");
-                return;
-            }
-            var obj = _storage[listBoxStorages.SelectedItem.ToString() ?? string.Empty];
-            if (obj == null)
-            {
-                return;
-            }
-            FormDoubleDeckerbus form = new();
-            if (form.ShowDialog() == DialogResult.OK)
-            {
-                if (obj + form.SelectedBus != -1)                                                    //-1
-                {
-                    MessageBox.Show("Объект добавлен");
-                    pictureBoxCollection.Image = obj.ShowBus();
-                }
-                else
-                {
-                    MessageBox.Show("Не удалось добавить объект");
-                }
-            }
-        }
-        private void buttonDeleteBus_Click(object sender, EventArgs e)
-        {
-            if (listBoxStorages.SelectedIndex == -1)
-            {
-                return;
-            }
-            var obj = _storage[listBoxStorages.SelectedItem.ToString() ?? string.Empty];
-            if (obj == null)
-            {
-                return;
-            }
-            if (MessageBox.Show("Удалить объект?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
-            {
-                return;
-            }
-            int pos = 0;
-            try
-            {
-                pos = Convert.ToInt32(maskedTextBoxNumber.Text);
-            }
-            catch
-            {
-                MessageBox.Show("Не все данные заполнены", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
-            }
-            if (obj - pos)                                                                                                           //!!
-            {
-                MessageBox.Show("Объект удален");
-                pictureBoxCollection.Image = obj.ShowBus();
-            }
-            else
-            {
-                MessageBox.Show("Не удалось удалить объект");
-            }
-        }
-        private void buttonUpdate_Click(object sender, EventArgs e)
-        {
-            if (listBoxStorages.SelectedIndex == -1)
-            {
-                return;
-            }
-            var obj = _storage[listBoxStorages.SelectedItem.ToString() ??
-            string.Empty];
-            if (obj == null)
-            {
-                return;
-            }
-            pictureBoxCollection.Image = obj.ShowBus();
-        }
-    }
-}

DoubleDeckerBus/FormDoubleDeckerbusCollection.resx

@@ -1,126 +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="colorDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
-  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>36</value>
-  </metadata>
-</root>

DoubleDeckerBus/Generic/BusGenericCollection.cs

@@ -1,93 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using DoubleDeckerbus.Drawing;
-using DoubleDeckerbus.Move_Strategy;
-
-namespace DoubleDeckerbus.Generic
-{
-    internal class BusGenericCollection<T, U>
-        where T : DrawingBus
-        where U : IMoveableObject
-    {
-        private readonly int _pictureWidth;
-        private readonly int _pictureHeight;
-        private readonly int _placeSizeWidth = 200;
-        private readonly int _placeSizeHeight = 120;
-        private readonly SetGeneric<T> _collection;
-        public BusGenericCollection(int picWidth, int picHeight)
-        {
-            int width = picWidth / _placeSizeWidth;
-            int height = picHeight / _placeSizeHeight;
-            _pictureWidth = picWidth;
-            _pictureHeight = picHeight;
-
-            _collection = new SetGeneric<T>(width * height);
-        }
-        public static int operator +(BusGenericCollection<T, U> collect, T? obj)
-        {
-            if (obj != null)
-            {
-                return collect._collection.Insert(obj);
-            }
-            return -1;
-        }
-        public static bool operator -(BusGenericCollection<T, U> collect, int pos)
-        {
-            if (collect._collection.GetBus(pos) == null)
-            {
-                return false;
-            }
-            return collect?._collection.Remove(pos) ?? false;
-        }
-        public U? GetU(int pos)
-        {
-            return (U?)_collection[pos]?.GetMoveableObject;
-        }
-        public int ReturnLength()
-        {
-            return _collection.Count;
-        }
-        public Bitmap ShowBus()
-        {
-            Bitmap bmp = new(_pictureWidth, _pictureHeight);
-            Graphics gr = Graphics.FromImage(bmp);
-            DrawBackground(gr);
-            DrawObjects(gr);
-            return bmp;
-        }
-        private void DrawBackground(Graphics gr)
-        {
-            Pen pen = new(Color.Black, 3);
-            for (int i = 0; i < _pictureWidth / _placeSizeWidth; ++i)
-            {
-                for (int j = 0; j < _pictureHeight / _placeSizeHeight + 1; ++j)
-                {
-                    gr.DrawLine(pen, i * _placeSizeWidth, j * _placeSizeHeight, i * _placeSizeWidth + _placeSizeWidth / 2, j * _placeSizeHeight);
-                    gr.DrawLine(pen, i * _placeSizeWidth, 0, i * _placeSizeWidth, _pictureHeight / _placeSizeHeight * _placeSizeHeight);
-                }
-            }
-        }
-        private void DrawObjects(Graphics g)
-        {
-            int x = _pictureWidth / _placeSizeWidth - 1;
-            int y = 0;
-            foreach (var bus in _collection.GetBus())
-            {
-                if (bus != null)
-                {
-                    if (x < 0)
-                    {
-                        x = _pictureWidth / _placeSizeWidth - 1;
-                        ++y;
-                    }
-                    bus.SetPosition(_placeSizeWidth * x, _placeSizeHeight * y);
-                    bus.DrawTransport(g);
-                    --x;
-                }
-            }
-        }
-    }
-}

DoubleDeckerBus/Generic/BusesGenericStorage.cs

@@ -1,56 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using DoubleDeckerbus.Drawing;
-using DoubleDeckerbus.Move_Strategy;
-
-namespace DoubleDeckerbus.Generic
-{
-    internal class BusesGenericStorage
-    {
-        readonly Dictionary<string, BusGenericCollection<DrawingBus, DrawingObjectBus>> _busStorages;
-        public List<string> Keys => _busStorages.Keys.ToList();
-        private readonly int _pictureWidth;
-        private readonly int _pictureHeight;
-
-        public BusesGenericStorage(int pictureWidth, int pictureHeight)
-        {
-            _busStorages = new Dictionary<string, BusGenericCollection<DrawingBus, DrawingObjectBus>>();
-            _pictureWidth = pictureWidth;
-            _pictureHeight = pictureHeight;
-        }
-        public void AddSet(string name)
-        {
-            foreach (string nameStorage in Keys)
-            {
-                if (nameStorage == name)
-                {
-                    MessageBox.Show("Набор с заданным именем уже есть", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                    return;
-                }
-            }
-            _busStorages.Add(name, new BusGenericCollection<DrawingBus, DrawingObjectBus>(_pictureWidth, _pictureHeight));
-        }
-        public void DelSet(string name)
-        {
-            if (_busStorages.ContainsKey(name))
-            {
-                _busStorages.Remove(name);
-            }
-
-        }
-        public BusGenericCollection<DrawingBus, DrawingObjectBus>? this[string ind]
-        {
-            get
-            {
-                if (_busStorages.ContainsKey(ind))
-                {
-                    return _busStorages[ind];
-                }
-                return null;
-            }
-        }
-    }
-}

DoubleDeckerBus/Generic/SetGeneric.cs

@@ -1,74 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace DoubleDeckerbus.Generic
-{
-    internal class SetGeneric<T>
-        where T : class
-    {
-        private readonly List<T?> _places;
-        public int Count => _places.Count;
-        private readonly int _maxCount;
-        public SetGeneric(int count)
-        {
-            _maxCount = count;
-            _places = new List<T?>(count);
-        }
-        public int Insert(T bus)
-        {
-            _places.Insert(0, bus);                                                     //0
-            return 0;
-        }
-        public bool Insert(T bus, int position)
-        {
-            if (position < 0 || position >= Count || Count >= _maxCount)
-            {
-                return false;
-            }
-            _places.Insert(position, bus);
-            return true;
-        }
-        public bool Remove(int position)
-        {
-            if (position < 0 || position >= Count)
-            {
-                return false;
-            }
-            _places.RemoveAt(position);
-            return true;
-        }
-        public T? this[int position]
-        {
-            get
-            {
-                if (position < 0 || position >= Count)
-                {
-                    return null;
-                }
-                return _places[position];
-            }
-            set
-            {
-                if (position < 0 || position > Count || Count >= _maxCount)
-                {
-                    return;
-                }
-                _places.Insert(position, value);
-            }
-        }
-        public IEnumerable<T?> GetBus(int? maxBus = null)
-        {
-            for (int i = 0; i < _places.Count; ++i)
-            {
-                yield return _places[i];
-                if (maxBus.HasValue && i == maxBus.Value)
-                {
-                    yield break;
-                }
-            }
-        }
-    }
-}

DoubleDeckerBus/Move_Strategy/AbstractStrategy.cs

@@ -1,72 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using DoubleDeckerbus.Entities;
-using static System.Windows.Forms.VisualStyles.VisualStyleElement;
-
-namespace DoubleDeckerbus.Move_Strategy
-{
-    public abstract class AbstractStrategy
-    {
-        private IMoveableObject? _moveableObject;
-        private Status _state = Status.NotInit;
-        protected int FieldWidth { get; private set; }
-        protected int FieldHeight { get; private set; }
-        public Status GetStatus() { return _state; }
-        public void SetData(IMoveableObject moveableObject, int width, int height)
-        {
-            if (moveableObject == null)
-            {
-                _state = Status.NotInit;
-                return;
-            }
-            _state = Status.InProgress;
-            _moveableObject = moveableObject;
-            FieldWidth = width;
-            FieldHeight = height;
-        }
-        public void MakeStep()
-        {
-            if (_state != Status.InProgress)
-            {
-                return;
-            }
-            if (IsTargetDestinaion())
-            {
-                _state = Status.Finish;
-                return;
-            }
-            MoveToTarget();
-        }
-        protected bool MoveLeft() => MoveTo(DirectionType.Left);
-        protected bool MoveRight() => MoveTo(DirectionType.Right);
-        protected bool MoveUp() => MoveTo(DirectionType.Up);
-        protected bool MoveDown() => MoveTo(DirectionType.Down);
-        protected ObjectParameters? GetObjectParameters => _moveableObject?.GetObjectPosition;
-        protected int? GetStep()
-        {
-            if (_state != Status.InProgress)
-            {
-                return null;
-            }
-            return _moveableObject?.GetStep;
-        }
-        protected abstract void MoveToTarget();
-        protected abstract bool IsTargetDestinaion();
-        private bool MoveTo(DirectionType directionType)
-        {
-            if (_state != Status.InProgress)
-            {
-                return false;
-            }
-            if (_moveableObject?.CheckCanMove(directionType) ?? false)
-            {
-                _moveableObject.MoveObject(directionType);
-                return true;
-            }
-            return false;
-        }
-    }
-}

DoubleDeckerBus/Move_Strategy/DrawingObjectBus.cs

@@ -1,35 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net.NetworkInformation;
-using System.Text;
-using System.Threading.Tasks;
-
-using DoubleDeckerbus.Entities;
-using DoubleDeckerbus.Drawing;
-
-namespace DoubleDeckerbus.Move_Strategy
-{
-    public class DrawingObjectBus : IMoveableObject
-    {
-        private readonly DrawingBus? _drawingBus = null;
-        public DrawingObjectBus(DrawingBus drawingBus)
-        {
-            _drawingBus = drawingBus;
-        }
-        public ObjectParameters? GetObjectPosition
-        {
-            get
-            {
-                if (_drawingBus == null || _drawingBus.EntityBus == null)
-                {
-                    return null;
-                }
-                return new ObjectParameters(_drawingBus.GetPosX, _drawingBus.GetPosY, _drawingBus.GetWidth, _drawingBus.GetHeight);
-            }
-        }
-        public int GetStep => (int)(_drawingBus?.EntityBus?.Step ?? 0);
-        public bool CheckCanMove(DirectionType direction) => _drawingBus?.CanMove(direction) ?? false;
-        public void MoveObject(DirectionType direction) => _drawingBus?.MoveTransport(direction);
-    }
-}

DoubleDeckerBus/Move_Strategy/IMoveableObject.cs

@@ -1,19 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-using DoubleDeckerbus.Drawing;
-using DoubleDeckerbus.Entities;
-
-namespace DoubleDeckerbus.Move_Strategy
-{
-    public interface IMoveableObject
-    {
-        ObjectParameters? GetObjectPosition { get; }
-        int GetStep { get; }
-        bool CheckCanMove(DirectionType direction);
-        void MoveObject(DirectionType direction);
-    }
-}

DoubleDeckerBus/Move_Strategy/MoveToBorder.cs

@@ -1,56 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace DoubleDeckerbus.Move_Strategy
-{
-    internal class MoveToBorder : AbstractStrategy
-    {
-        protected override bool IsTargetDestinaion()
-        {
-            var objParams = GetObjectParameters;
-            if (objParams == null)
-            {
-                return false;
-            }
-            return objParams.RightBorder <= FieldWidth &&
-            objParams.RightBorder + GetStep() >= FieldWidth &&
-            objParams.DownBorder <= FieldHeight &&
-            objParams.DownBorder + GetStep() >= FieldHeight;
-        }
-        protected override void MoveToTarget()
-        {
-            var objParams = GetObjectParameters;
-            if (objParams == null)
-            {
-                return;
-            }
-            var diffX = objParams.ObjectMiddleHorizontal - FieldWidth;
-            if (Math.Abs(diffX) > GetStep())
-            {
-                if (diffX > 0)
-                {
-                    MoveLeft();
-                }
-                else
-                {
-                    MoveRight();
-                }
-            }
-            var diffY = objParams.ObjectMiddleVertical - FieldHeight;
-            if (Math.Abs(diffY) > GetStep())
-            {
-                if (diffY > 0)
-                {
-                    MoveUp();
-                }
-                else
-                {
-                    MoveDown();
-                }
-            }
-        }
-    }
-}

DoubleDeckerBus/Move_Strategy/MoveToCenter.cs

@@ -1,57 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace DoubleDeckerbus.Move_Strategy
-{
-    public class MoveToCenter : AbstractStrategy
-    {
-        protected override bool IsTargetDestinaion()
-        {
-            var objParams = GetObjectParameters;
-            if (objParams == null)
-            {
-                return false;
-            }
-            return objParams.ObjectMiddleHorizontal <= FieldWidth / 2 &&
-            objParams.ObjectMiddleHorizontal + GetStep() >= FieldWidth / 2 &&
-            objParams.ObjectMiddleVertical <= FieldHeight / 2 &&
-            objParams.ObjectMiddleVertical + GetStep() >= FieldHeight / 2;
-        }
-        protected override void MoveToTarget()
-        {
-            var objParams = GetObjectParameters;
-            if (objParams == null)
-            {
-                return;
-            }
-            var diffX = objParams.ObjectMiddleHorizontal - FieldWidth / 2;
-            if (Math.Abs(diffX) > GetStep())
-            {
-                if (diffX > 0)
-                {
-                    MoveLeft();
-                }
-                else
-                {
-                    MoveRight();
-                }
-
-            }
-            var diffY = objParams.ObjectMiddleVertical - FieldHeight / 2;
-            if (Math.Abs(diffY) > GetStep())
-            {
-                if (diffY > 0)
-                {
-                    MoveUp();
-                }
-                else
-                {
-                    MoveDown();
-                }
-            }
-        }
-    }
-}

DoubleDeckerBus/Move_Strategy/ObjectParameters.cs

@@ -1,29 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace DoubleDeckerbus.Move_Strategy
-{
-    public class ObjectParameters
-    {
-        private readonly int _x;
-        private readonly int _y;
-        private readonly int _width;
-        private readonly int _height;
-        public int LeftBorder => _x;
-        public int TopBorder => _y;
-        public int RightBorder => _x + _width;
-        public int DownBorder => _y + _height;
-        public int ObjectMiddleHorizontal => _x + _width / 2;
-        public int ObjectMiddleVertical => _y + _height / 2;
-        public ObjectParameters(int x, int y, int width, int height)
-        {
-            _x = x;
-            _y = y;
-            _width = width;
-            _height = height;
-        }
-    }
-}

DoubleDeckerBus/Move_Strategy/Status.cs

@@ -1,15 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace DoubleDeckerbus.Move_Strategy
-{
-    public enum Status
-    {
-        NotInit,
-        InProgress,
-        Finish
-    }
-}

DoubleDeckerBus/Program.cs

@@ -1,17 +0,0 @@
-namespace DoubleDeckerbus
-{
-    internal static class Program
-    {
-        /// <summary>
-        ///  The main entry point for the application.
-        /// </summary>
-        [STAThread]
-        static void Main()
-        {
-            // To customize application configuration such as set high DPI settings or default font,
-            // see https://aka.ms/applicationconfiguration.
-            ApplicationConfiguration.Initialize();
-            Application.Run(new FormDoubleDeckerbusCollection());
-        }
-    }
-}

DoubleDeckerBus/Properties/Resources.Designer.cs

@@ -1,103 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     Этот код создан программой.
-//     Исполняемая версия:4.0.30319.42000
-//
-//     Изменения в этом файле могут привести к неправильной работе и будут потеряны в случае
-//     повторной генерации кода.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace DoubleDeckerbus.Properties {
-    using System;
-    
-    
-    /// <summary>
-    ///   Класс ресурса со строгой типизацией для поиска локализованных строк и т.д.
-    /// </summary>
-    // Этот класс создан автоматически классом StronglyTypedResourceBuilder
-    // с помощью такого средства, как ResGen или Visual Studio.
-    // Чтобы добавить или удалить член, измените файл .ResX и снова запустите ResGen
-    // с параметром /str или перестройте свой проект VS.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    internal class Resources {
-        
-        private static global::System.Resources.ResourceManager resourceMan;
-        
-        private static global::System.Globalization.CultureInfo resourceCulture;
-        
-        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal Resources() {
-        }
-        
-        /// <summary>
-        ///   Возвращает кэшированный экземпляр ResourceManager, использованный этим классом.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Resources.ResourceManager ResourceManager {
-            get {
-                if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("DoubleDeckerbus.Properties.Resources", typeof(Resources).Assembly);
-                    resourceMan = temp;
-                }
-                return resourceMan;
-            }
-        }
-        
-        /// <summary>
-        ///   Перезаписывает свойство CurrentUICulture текущего потока для всех
-        ///   обращений к ресурсу с помощью этого класса ресурса со строгой типизацией.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Globalization.CultureInfo Culture {
-            get {
-                return resourceCulture;
-            }
-            set {
-                resourceCulture = value;
-            }
-        }
-        
-        /// <summary>
-        ///   Поиск локализованного ресурса типа System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap стрелка_вверх {
-            get {
-                object obj = ResourceManager.GetObject("ArrowUp", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Поиск локализованного ресурса типа System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap стрелка_влево {
-            get {
-                object obj = ResourceManager.GetObject("ArrowLeft", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Поиск локализованного ресурса типа System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap стрелка_вниз {
-            get {
-                object obj = ResourceManager.GetObject("ArrowDown", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Поиск локализованного ресурса типа System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap стрелка_вправо {
-            get {
-                object obj = ResourceManager.GetObject("ArrowRight", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-    }
-}

DoubleDeckerBus/Properties/Resources.resx

@@ -1,133 +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>
-  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="ArrowUp" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\ArrowUp.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="ArrowLeft" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\ArrowLeft.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="ArrowDown" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\ArrowDown.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="ArrowRight" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\ArrowRight.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-</root>

README.md

@@ -1,2 +1 @@
 # PIbd22_Kamcharova_K.A._DoubleDeckerBus_Base
-