Merge pull request 'Kashin M.I. Lab work 1' (#1) from LabWork01 into master

Reviewed-on: http://student.git.athene.tech/Sosees04ka/PIbd-22_Kashin_M.I_GasolineTanker._Base/pulls/1

GasolineTanker/GasolineTanker/AbstractMap.cs

@@ -1,151 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace GasolineTanker
-{
-    internal abstract class AbstractMap
-    {
-        private IDrawingObject _drawningObject = null;
-        protected int[,] _map = null;
-        protected int _width;
-        protected int _height;
-        protected float _size_x;
-        protected float _size_y;
-        protected readonly Random _random = new();
-        protected readonly int _freeRoad = 0;
-        protected readonly int _barrier = 1;
-
-        private Direction GetOpositDirection(Direction d)
-        {
-            switch (d)
-            {
-                case Direction.None:
-                    return Direction.None;
-                case Direction.Up:
-                    return Direction.Down;
-                case Direction.Down:
-                    return Direction.Up;
-                case Direction.Left:
-                    return Direction.Right;
-                case Direction.Right:
-                    return Direction.Left;
-            }
-            return Direction.None;
-        }
-
-        private int CheckCollision(float Left, float Right, float Top, float Bottom)
-        {
-            int starCoordinateX = (int)(Left / _size_x);
-            int starCoordinateY = (int)(Right / _size_y);
-            int endCoordinateX = (int)(Top / _size_x);
-            int endCoordinateY = (int)(Bottom / _size_y);
-            if (starCoordinateX < 0 || starCoordinateY < 0 || endCoordinateX >= _map.GetLength(1) || endCoordinateY >= _map.GetLength(0))
-            {
-                return 2;
-            }
-            for (int x = starCoordinateX; x <= endCoordinateX; x++)
-            {
-                for (int y = starCoordinateY; y <= endCoordinateY; y++)
-                {
-                    if (_map[x, y] == _barrier)
-                    {
-                        return 1;
-                    }
-                }
-            }
-            return 0;
-        }
-
-        public Bitmap CreateMap(int width, int height, IDrawingObject drawningObject)
-        {
-            _width = width;
-            _height = height;
-            _drawningObject = drawningObject;
-            GenerateMap();
-            while (!SetObjectOnMap())
-            {
-                GenerateMap();
-            }
-            return DrawMapWithObject();
-        }
-        
-        public Bitmap MoveObject(Direction direction)
-        {
-            if (true)
-            {
-                _drawningObject.MoveObject(direction);
-            }
-            (float Left, float Right, float Top, float Bottom) = _drawningObject.GetCurrentPosition();
-            if (CheckCollision(Left, Right, Top, Bottom) != 0)
-            {
-                _drawningObject.MoveObject(GetOpositDirection(direction));
-            }
-            return DrawMapWithObject();
-        }
-        private bool SetObjectOnMap()
-        {
-            if (_drawningObject == null || _map == null)
-            {
-                return false;
-            }
-            int x = _random.Next(0, 10);
-            int y = _random.Next(0, 10);
-            _drawningObject.SetObject(x, y, _width, _height);
-            (float Left, float Right, float Top, float Bottom) = _drawningObject.GetCurrentPosition();
-  
-            while (CheckCollision(Left, Right, Top, Bottom) != 2)
-            {
-                int resoult;
-                do
-                {
-                    resoult = CheckCollision(Left, Right, Top, Bottom);
-                    if (resoult == 0)
-                    {
-                        _drawningObject.SetObject((int)Left, (int)Right, _width, _height);
-                        return true;
-                    }
-                    else
-                    {
-                        Left += _size_x;
-                    }
-                } while (resoult != 2);
-                Left = x;
-                Right += _size_y;
-            }
-            return false;
-        }
-        private Bitmap DrawMapWithObject()
-        {
-            Bitmap bmp = new(_width, _height);
-            if (_drawningObject == null || _map == null)
-            {
-                return bmp;
-            }
-            Graphics gr = Graphics.FromImage(bmp);
-            for (int i = 0; i < _map.GetLength(0); ++i)
-            {
-                for (int j = 0; j < _map.GetLength(1); ++j)
-                {
-                    if (_map[i, j] == _freeRoad)
-                    {
-                        DrawRoadPart(gr, i, j);
-                    }
-                    else if (_map[i, j] == _barrier)
-                    {
-                        DrawBarrierPart(gr, i, j);
-                    }
-                }
-            }
-            _drawningObject.DrawningObject(gr);
-            return bmp;
-        }
-
-        protected abstract void GenerateMap();
-        protected abstract void DrawRoadPart(Graphics g, int i, int j);
-        protected abstract void DrawBarrierPart(Graphics g, int i, int j);
-    }
-}
-

GasolineTanker/GasolineTanker/Direction.cs

@@ -8,7 +8,6 @@ namespace GasolineTanker
 {
     internal enum Direction
     {
-        None = 0,
         Up = 1,
         Down = 2,
         Left = 3,

GasolineTanker/GasolineTanker/DrawingGasolineTanker.cs

@@ -8,24 +8,18 @@ namespace GasolineTanker
 {
     internal class DrawingGasolineTanker
     {
-        public EnityGasolineTanker GasolineTanker { get; protected set; }
+        public EnityGasolineTanker GasolineTanker { get; private set; }
-        protected float _startPosX;
+        private float _startPosX;
-        protected float _startPosY;
+        private float _startPosY;
         private int? _pictureWidth = null;
         private int? _pictureHeight = null;
         private readonly int _gasolineTankerWidth = 160;
         private readonly int _gasolineTankerHeight = 55;
 
-        public DrawingGasolineTanker(int speed, float weight, Color bodyColor)
+        public void Init(int speed, float weight, Color bodyColor)
         {
-            GasolineTanker = new EnityGasolineTanker(speed, weight, bodyColor);
+            GasolineTanker = new EnityGasolineTanker();
-        }
+            GasolineTanker.Init(speed, weight, bodyColor);
-
-        protected DrawingGasolineTanker(int speed, float weight, Color bodyColor, int gasolineTankerWidth, int gasolineTankerHeight) :
-    this(speed, weight, bodyColor)
-        {
-            _gasolineTankerWidth = gasolineTankerWidth;
-            _gasolineTankerHeight = gasolineTankerHeight;
         }
 
         public void SetPosition(int x, int y, int width, int height)
@@ -77,7 +71,7 @@ namespace GasolineTanker
                     break;
             }
         }
-        public virtual void DrawTransport(Graphics g)
+        public void DrawTransport(Graphics g)
         {
             if (_startPosX < 0 || _startPosY < 0
                 || !_pictureHeight.HasValue || !_pictureWidth.HasValue)
@@ -127,10 +121,5 @@ namespace GasolineTanker
                 _startPosY = _pictureHeight.Value - _gasolineTankerHeight;
             }
         }
-
-        public (float Left, float Right, float Top, float Bottom) GetCurrentPosition()
-        {
-            return (_startPosX, _startPosY, _startPosX + _gasolineTankerWidth, _startPosY + _gasolineTankerHeight);
-        }
     }
 }

GasolineTanker/GasolineTanker/DrawingImprovedGasolineTanker.cs

@@ -1,50 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace GasolineTanker
-{
-    internal class DrawingImprovedGasolineTanker : DrawingGasolineTanker
-    {
-        public DrawingImprovedGasolineTanker(int speed, float weight, Color bodyColor, Color dopColor, bool bodyKit, bool ornamentWheels) :
-           base(speed, weight, bodyColor, 160, 55)
-        {
-            GasolineTanker = new EntityImprovedGasolineTanker(speed, weight, bodyColor, dopColor, bodyKit, ornamentWheels);
-        }
-        public override void DrawTransport(Graphics g)
-        {
-            if (GasolineTanker is not EntityImprovedGasolineTanker improvedGasolineTanker)
-            {
-                return;
-            }
-
-            Pen pen = new(Color.Black);
-            Brush dopBrush = new SolidBrush(improvedGasolineTanker.DopColor);
-
-            if (improvedGasolineTanker.BodyKit)
-            {
-                Brush brOrange = new SolidBrush(Color.Orange);
-                g.FillRectangle(brOrange, _startPosX + 25, _startPosY + 5, 100, 35);
-                Brush brRed = new SolidBrush(Color.Red);
-                g.FillRectangle(brRed, _startPosX + 80, _startPosY, 10, 5);
-            }
-
-            _startPosX += 10;
-            _startPosY += 5;
-            base.DrawTransport(g);
-            _startPosX -= 10;
-            _startPosY -= 5;
-
-            if (improvedGasolineTanker.OrnamentWheels)
-            {
-                Pen penGray = new(Color.Gray);
-                Brush brBlack = new SolidBrush(Color.Gray);
-                g.DrawEllipse(penGray, _startPosX + 140, _startPosY + 50, 20, 5);
-                g.DrawEllipse(penGray, _startPosX + 40, _startPosY + 50, 20, 5);
-                g.DrawEllipse(penGray, _startPosX + 20, _startPosY + 50, 20, 5);
-            }
-        }
-    }
-}

GasolineTanker/GasolineTanker/DrawingObjectGasolineTanker.cs

@@ -1,40 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace GasolineTanker
-{
-    internal class DrawingObjectGasolineTanker : IDrawingObject
-    {
-        private DrawingGasolineTanker _gasolineTanker = null;
-
-        public DrawingObjectGasolineTanker(DrawingGasolineTanker gasolineTanker)
-        {
-            _gasolineTanker = gasolineTanker;
-        }
-
-        public float Step => _gasolineTanker?.GasolineTanker?.Step ?? 0;
-
-        public (float Left, float Right, float Top, float Bottom) GetCurrentPosition()
-        {
-            return _gasolineTanker?.GetCurrentPosition() ?? default;
-        }
-
-        public void MoveObject(Direction direction)
-        {
-            _gasolineTanker?.MoveTransport(direction);
-        }
-
-        public void SetObject(int x, int y, int width, int height)
-        {
-            _gasolineTanker.SetPosition(x, y, width, height);
-        }
-
-        void IDrawingObject.DrawningObject(Graphics g)
-        {
-            _gasolineTanker.DrawTransport(g);
-        }
-    }
-}

GasolineTanker/GasolineTanker/EnityGasolineTanker.cs

@@ -12,7 +12,7 @@ namespace GasolineTanker
         public float Weight { get; private set; }
         public Color BodyColor { get; private set; }
         public float Step => Speed * 100 / Weight;
-        public EnityGasolineTanker(int speed, float weight, Color bodyColor)
+        public void Init(int speed, float weight, Color bodyColor)
         {
             Random rnd = new Random();
             Speed = speed <= 0 ? rnd.Next(50, 100) : speed;

GasolineTanker/GasolineTanker/EntityImprovedGasolineTanker.cs

@@ -1,22 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace GasolineTanker
-{
-    internal class EntityImprovedGasolineTanker : EnityGasolineTanker
-    {
-        public Color DopColor { get; private set; }
-        public bool BodyKit { get; private set; }
-        public bool OrnamentWheels { get; private set; }
-        public EntityImprovedGasolineTanker(int speed, float weight, Color bodyColor, Color dopColor, bool bodyKit, bool ornamentWheels) :
-            base(speed, weight, bodyColor)
-        {
-            DopColor = dopColor;
-            BodyKit = bodyKit;
-            OrnamentWheels = ornamentWheels;
-        }
-    }
-}

GasolineTanker/GasolineTanker/FormGasolineTanker.Designer.cs

@@ -38,7 +38,6 @@
             this.keyUp = new System.Windows.Forms.Button();
             this.keyLeft = new System.Windows.Forms.Button();
             this.keyRight = new System.Windows.Forms.Button();
-            this.ButtonCreateImproved = new System.Windows.Forms.Button();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBoxGasolineTanker)).BeginInit();
             this.statusStrip1.SuspendLayout();
             this.SuspendLayout();
@@ -47,8 +46,9 @@
             // 
             this.pictureBoxGasolineTanker.Dock = System.Windows.Forms.DockStyle.Fill;
             this.pictureBoxGasolineTanker.Location = new System.Drawing.Point(0, 0);
+            this.pictureBoxGasolineTanker.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.pictureBoxGasolineTanker.Name = "pictureBoxGasolineTanker";
-            this.pictureBoxGasolineTanker.Size = new System.Drawing.Size(807, 428);
+            this.pictureBoxGasolineTanker.Size = new System.Drawing.Size(922, 574);
             this.pictureBoxGasolineTanker.TabIndex = 0;
             this.pictureBoxGasolineTanker.TabStop = false;
             // 
@@ -59,36 +59,38 @@
             this.toolStripStatusSpeed,
             this.toolStripStatusWeight,
             this.toolStripStatusBodyColor});
-            this.statusStrip1.Location = new System.Drawing.Point(0, 428);
+            this.statusStrip1.Location = new System.Drawing.Point(0, 574);
             this.statusStrip1.Name = "statusStrip1";
-            this.statusStrip1.Size = new System.Drawing.Size(807, 22);
+            this.statusStrip1.Padding = new System.Windows.Forms.Padding(1, 0, 16, 0);
+            this.statusStrip1.Size = new System.Drawing.Size(922, 26);
             this.statusStrip1.TabIndex = 1;
             this.statusStrip1.Text = "statusStrip1";
             // 
             // toolStripStatusSpeed
             // 
             this.toolStripStatusSpeed.Name = "toolStripStatusSpeed";
-            this.toolStripStatusSpeed.Size = new System.Drawing.Size(39, 17);
+            this.toolStripStatusSpeed.Size = new System.Drawing.Size(51, 20);
             this.toolStripStatusSpeed.Text = "Speed";
             // 
             // toolStripStatusWeight
             // 
             this.toolStripStatusWeight.Name = "toolStripStatusWeight";
-            this.toolStripStatusWeight.Size = new System.Drawing.Size(45, 17);
+            this.toolStripStatusWeight.Size = new System.Drawing.Size(56, 20);
             this.toolStripStatusWeight.Text = "Weight";
             // 
             // toolStripStatusBodyColor
             // 
             this.toolStripStatusBodyColor.Name = "toolStripStatusBodyColor";
-            this.toolStripStatusBodyColor.Size = new System.Drawing.Size(36, 17);
+            this.toolStripStatusBodyColor.Size = new System.Drawing.Size(45, 20);
             this.toolStripStatusBodyColor.Text = "Color";
             // 
             // buttonCreate
             // 
             this.buttonCreate.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.buttonCreate.Location = new System.Drawing.Point(12, 393);
+            this.buttonCreate.Location = new System.Drawing.Point(14, 524);
+            this.buttonCreate.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.buttonCreate.Name = "buttonCreate";
-            this.buttonCreate.Size = new System.Drawing.Size(75, 23);
+            this.buttonCreate.Size = new System.Drawing.Size(86, 31);
             this.buttonCreate.TabIndex = 2;
             this.buttonCreate.Text = "Create";
             this.buttonCreate.UseVisualStyleBackColor = true;
@@ -99,9 +101,10 @@
             this.keyDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.keyDown.BackgroundImage = global::GasolineTanker.Properties.Resources.KeyDown;
             this.keyDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.keyDown.Location = new System.Drawing.Point(724, 386);
+            this.keyDown.Location = new System.Drawing.Point(827, 515);
+            this.keyDown.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.keyDown.Name = "keyDown";
-            this.keyDown.Size = new System.Drawing.Size(30, 30);
+            this.keyDown.Size = new System.Drawing.Size(34, 40);
             this.keyDown.TabIndex = 3;
             this.keyDown.UseVisualStyleBackColor = true;
             this.keyDown.Click += new System.EventHandler(this.ButtonMove_Click);
@@ -111,9 +114,10 @@
             this.keyUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.keyUp.BackgroundImage = global::GasolineTanker.Properties.Resources.KeyUp;
             this.keyUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.keyUp.Location = new System.Drawing.Point(724, 350);
+            this.keyUp.Location = new System.Drawing.Point(827, 467);
+            this.keyUp.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.keyUp.Name = "keyUp";
-            this.keyUp.Size = new System.Drawing.Size(30, 30);
+            this.keyUp.Size = new System.Drawing.Size(34, 40);
             this.keyUp.TabIndex = 4;
             this.keyUp.UseVisualStyleBackColor = true;
             this.keyUp.Click += new System.EventHandler(this.ButtonMove_Click);
@@ -123,9 +127,10 @@
             this.keyLeft.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.keyLeft.BackgroundImage = global::GasolineTanker.Properties.Resources.KeyLeft;
             this.keyLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.keyLeft.Location = new System.Drawing.Point(688, 386);
+            this.keyLeft.Location = new System.Drawing.Point(786, 515);
+            this.keyLeft.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.keyLeft.Name = "keyLeft";
-            this.keyLeft.Size = new System.Drawing.Size(30, 30);
+            this.keyLeft.Size = new System.Drawing.Size(34, 40);
             this.keyLeft.TabIndex = 5;
             this.keyLeft.UseVisualStyleBackColor = true;
             this.keyLeft.Click += new System.EventHandler(this.ButtonMove_Click);
@@ -135,29 +140,19 @@
             this.keyRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.keyRight.BackgroundImage = global::GasolineTanker.Properties.Resources.KeyRight;
             this.keyRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.keyRight.Location = new System.Drawing.Point(760, 386);
+            this.keyRight.Location = new System.Drawing.Point(868, 515);
+            this.keyRight.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.keyRight.Name = "keyRight";
-            this.keyRight.Size = new System.Drawing.Size(30, 30);
+            this.keyRight.Size = new System.Drawing.Size(34, 40);
             this.keyRight.TabIndex = 6;
             this.keyRight.UseVisualStyleBackColor = true;
             this.keyRight.Click += new System.EventHandler(this.ButtonMove_Click);
             // 
-            // ButtonCreateImproved
-            // 
-            this.ButtonCreateImproved.Location = new System.Drawing.Point(93, 393);
-            this.ButtonCreateImproved.Name = "ButtonCreateImproved";
-            this.ButtonCreateImproved.Size = new System.Drawing.Size(75, 23);
-            this.ButtonCreateImproved.TabIndex = 7;
-            this.ButtonCreateImproved.Text = "Improved";
-            this.ButtonCreateImproved.UseVisualStyleBackColor = true;
-            this.ButtonCreateImproved.Click += new System.EventHandler(this.ButtonCreateImproved_Click);
-            // 
             // FormGasolineTanker
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(807, 450);
+            this.ClientSize = new System.Drawing.Size(922, 600);
-            this.Controls.Add(this.ButtonCreateImproved);
             this.Controls.Add(this.keyRight);
             this.Controls.Add(this.keyLeft);
             this.Controls.Add(this.keyUp);
@@ -165,6 +160,7 @@
             this.Controls.Add(this.buttonCreate);
             this.Controls.Add(this.pictureBoxGasolineTanker);
             this.Controls.Add(this.statusStrip1);
+            this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.Name = "FormGasolineTanker";
             this.Text = "Gasoline tanker";
             ((System.ComponentModel.ISupportInitialize)(this.pictureBoxGasolineTanker)).EndInit();
@@ -187,6 +183,5 @@
         private Button keyUp;
         private Button keyLeft;
         private Button keyRight;
-        private Button ButtonCreateImproved;
     }
 }

GasolineTanker/GasolineTanker/FormGasolineTanker.cs

@@ -14,14 +14,6 @@ namespace GasolineTanker
             _gasolineTanker?.DrawTransport(gr);
             pictureBoxGasolineTanker.Image = bmp;
         }
-        private void SetData()
-        {
-            Random rnd = new();
-            _gasolineTanker.SetPosition(rnd.Next(10, 100), rnd.Next(10, 100), pictureBoxGasolineTanker.Width, pictureBoxGasolineTanker.Height);
-            toolStripStatusSpeed.Text = $"Speed {_gasolineTanker.GasolineTanker.Speed}";
-            toolStripStatusWeight.Text = $"Weight {_gasolineTanker.GasolineTanker.Weight}";
-            toolStripStatusBodyColor.Text = $"Color {_gasolineTanker.GasolineTanker.BodyColor.Name}";
-        }
         private void PictureBoxCar_Resize(object sender, EventArgs e)
         {
             _gasolineTanker?.ChangeBorders(pictureBoxGasolineTanker.Width, pictureBoxGasolineTanker.Height);
@@ -31,9 +23,12 @@ namespace GasolineTanker
         private void buttonCreate_Click_1(object sender, EventArgs e)
         {
             Random rnd = new();
-            _gasolineTanker = new DrawingGasolineTanker(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)));
+            _gasolineTanker = new DrawingGasolineTanker();
+            _gasolineTanker.Init(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)));
             _gasolineTanker.SetPosition(rnd.Next(10, 100),rnd.Next(50, 100), pictureBoxGasolineTanker.Width, pictureBoxGasolineTanker.Height);
-            SetData();
+            toolStripStatusSpeed.Text = $"Speed {_gasolineTanker.GasolineTanker.Speed}";
+            toolStripStatusWeight.Text = $"Weight {_gasolineTanker.GasolineTanker.Weight}";
+            toolStripStatusBodyColor.Text = $"Color {_gasolineTanker.GasolineTanker.BodyColor.Name}";
             Draw();
         }
 
@@ -64,16 +59,5 @@ namespace GasolineTanker
             _gasolineTanker?.ChangeBorders(pictureBoxGasolineTanker.Width, pictureBoxGasolineTanker.Height);
             Draw();
         }
-
-        private void ButtonCreateImproved_Click(object sender, EventArgs e)
-        {
-            Random rnd = new();
-            _gasolineTanker = new DrawingImprovedGasolineTanker(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();
-            Draw();
-        }
     }
 }

GasolineTanker/GasolineTanker/FormMap.Designer.cs

@@ -1,208 +0,0 @@
-namespace GasolineTanker
-{
-    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.pictureBoxGasolineTanker = new System.Windows.Forms.PictureBox();
-            this.statusStrip1 = new System.Windows.Forms.StatusStrip();
-            this.toolStripStatusSpeed = new System.Windows.Forms.ToolStripStatusLabel();
-            this.toolStripStatusWeight = new System.Windows.Forms.ToolStripStatusLabel();
-            this.toolStripStatusBodyColor = new System.Windows.Forms.ToolStripStatusLabel();
-            this.buttonCreate = new System.Windows.Forms.Button();
-            this.keyDown = new System.Windows.Forms.Button();
-            this.keyUp = new System.Windows.Forms.Button();
-            this.keyLeft = new System.Windows.Forms.Button();
-            this.keyRight = new System.Windows.Forms.Button();
-            this.ButtonCreateImproved = new System.Windows.Forms.Button();
-            this.comboBoxSelectorMap = new System.Windows.Forms.ComboBox();
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxGasolineTanker)).BeginInit();
-            this.statusStrip1.SuspendLayout();
-            this.SuspendLayout();
-            // 
-            // pictureBoxGasolineTanker
-            // 
-            this.pictureBoxGasolineTanker.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.pictureBoxGasolineTanker.Location = new System.Drawing.Point(0, 0);
-            this.pictureBoxGasolineTanker.Name = "pictureBoxGasolineTanker";
-            this.pictureBoxGasolineTanker.Size = new System.Drawing.Size(807, 428);
-            this.pictureBoxGasolineTanker.TabIndex = 0;
-            this.pictureBoxGasolineTanker.TabStop = false;
-            // 
-            // statusStrip1
-            // 
-            this.statusStrip1.ImageScalingSize = new System.Drawing.Size(20, 20);
-            this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.toolStripStatusSpeed,
-            this.toolStripStatusWeight,
-            this.toolStripStatusBodyColor});
-            this.statusStrip1.Location = new System.Drawing.Point(0, 428);
-            this.statusStrip1.Name = "statusStrip1";
-            this.statusStrip1.Size = new System.Drawing.Size(807, 22);
-            this.statusStrip1.TabIndex = 1;
-            this.statusStrip1.Text = "statusStrip1";
-            // 
-            // toolStripStatusSpeed
-            // 
-            this.toolStripStatusSpeed.Name = "toolStripStatusSpeed";
-            this.toolStripStatusSpeed.Size = new System.Drawing.Size(39, 17);
-            this.toolStripStatusSpeed.Text = "Speed";
-            // 
-            // toolStripStatusWeight
-            // 
-            this.toolStripStatusWeight.Name = "toolStripStatusWeight";
-            this.toolStripStatusWeight.Size = new System.Drawing.Size(45, 17);
-            this.toolStripStatusWeight.Text = "Weight";
-            // 
-            // toolStripStatusBodyColor
-            // 
-            this.toolStripStatusBodyColor.Name = "toolStripStatusBodyColor";
-            this.toolStripStatusBodyColor.Size = new System.Drawing.Size(36, 17);
-            this.toolStripStatusBodyColor.Text = "Color";
-            // 
-            // buttonCreate
-            // 
-            this.buttonCreate.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.buttonCreate.Location = new System.Drawing.Point(12, 393);
-            this.buttonCreate.Name = "buttonCreate";
-            this.buttonCreate.Size = new System.Drawing.Size(75, 23);
-            this.buttonCreate.TabIndex = 2;
-            this.buttonCreate.Text = "Create";
-            this.buttonCreate.UseVisualStyleBackColor = true;
-            this.buttonCreate.Click += new System.EventHandler(this.buttonCreate_Click_1);
-            // 
-            // keyDown
-            // 
-            this.keyDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.keyDown.BackgroundImage = global::GasolineTanker.Properties.Resources.KeyDown;
-            this.keyDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.keyDown.Location = new System.Drawing.Point(724, 386);
-            this.keyDown.Name = "keyDown";
-            this.keyDown.Size = new System.Drawing.Size(30, 30);
-            this.keyDown.TabIndex = 3;
-            this.keyDown.UseVisualStyleBackColor = true;
-            this.keyDown.Click += new System.EventHandler(this.ButtonMove_Click);
-            // 
-            // keyUp
-            // 
-            this.keyUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.keyUp.BackgroundImage = global::GasolineTanker.Properties.Resources.KeyUp;
-            this.keyUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.keyUp.Location = new System.Drawing.Point(724, 350);
-            this.keyUp.Name = "keyUp";
-            this.keyUp.Size = new System.Drawing.Size(30, 30);
-            this.keyUp.TabIndex = 4;
-            this.keyUp.UseVisualStyleBackColor = true;
-            this.keyUp.Click += new System.EventHandler(this.ButtonMove_Click);
-            // 
-            // keyLeft
-            // 
-            this.keyLeft.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.keyLeft.BackgroundImage = global::GasolineTanker.Properties.Resources.KeyLeft;
-            this.keyLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.keyLeft.Location = new System.Drawing.Point(688, 386);
-            this.keyLeft.Name = "keyLeft";
-            this.keyLeft.Size = new System.Drawing.Size(30, 30);
-            this.keyLeft.TabIndex = 5;
-            this.keyLeft.UseVisualStyleBackColor = true;
-            this.keyLeft.Click += new System.EventHandler(this.ButtonMove_Click);
-            // 
-            // keyRight
-            // 
-            this.keyRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.keyRight.BackgroundImage = global::GasolineTanker.Properties.Resources.KeyRight;
-            this.keyRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.keyRight.Location = new System.Drawing.Point(760, 386);
-            this.keyRight.Name = "keyRight";
-            this.keyRight.Size = new System.Drawing.Size(30, 30);
-            this.keyRight.TabIndex = 6;
-            this.keyRight.UseVisualStyleBackColor = true;
-            this.keyRight.Click += new System.EventHandler(this.ButtonMove_Click);
-            // 
-            // ButtonCreateImproved
-            // 
-            this.ButtonCreateImproved.Location = new System.Drawing.Point(93, 393);
-            this.ButtonCreateImproved.Name = "ButtonCreateImproved";
-            this.ButtonCreateImproved.Size = new System.Drawing.Size(75, 23);
-            this.ButtonCreateImproved.TabIndex = 7;
-            this.ButtonCreateImproved.Text = "Improved";
-            this.ButtonCreateImproved.UseVisualStyleBackColor = true;
-            this.ButtonCreateImproved.Click += new System.EventHandler(this.ButtonCreateImproved_Click);
-            // 
-            // comboBoxSelectorMap
-            // 
-            this.comboBoxSelectorMap.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.comboBoxSelectorMap.FormattingEnabled = true;
-            this.comboBoxSelectorMap.Items.AddRange(new object[] {
-            "Simple map",
-            "Long map"});
-            this.comboBoxSelectorMap.Location = new System.Drawing.Point(12, 12);
-            this.comboBoxSelectorMap.Name = "comboBoxSelectorMap";
-            this.comboBoxSelectorMap.Size = new System.Drawing.Size(121, 23);
-            this.comboBoxSelectorMap.TabIndex = 8;
-            this.comboBoxSelectorMap.SelectedIndexChanged += new System.EventHandler(this.comboBoxSelectorMap_SelectedIndexChanged);
-            // 
-            // FormMap
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(807, 450);
-            this.Controls.Add(this.comboBoxSelectorMap);
-            this.Controls.Add(this.ButtonCreateImproved);
-            this.Controls.Add(this.keyRight);
-            this.Controls.Add(this.keyLeft);
-            this.Controls.Add(this.keyUp);
-            this.Controls.Add(this.keyDown);
-            this.Controls.Add(this.buttonCreate);
-            this.Controls.Add(this.pictureBoxGasolineTanker);
-            this.Controls.Add(this.statusStrip1);
-            this.Name = "FormMap";
-            this.Text = "Map";
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxGasolineTanker)).EndInit();
-            this.statusStrip1.ResumeLayout(false);
-            this.statusStrip1.PerformLayout();
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-
-        private PictureBox pictureBoxGasolineTanker;
-        private StatusStrip statusStrip1;
-        private ToolStripStatusLabel toolStripStatusSpeed;
-        private ToolStripStatusLabel toolStripStatusWeight;
-        private ToolStripStatusLabel toolStripStatusBodyColor;
-        private Button buttonCreate;
-        private Button keyDown;
-        private Button keyUp;
-        private Button keyLeft;
-        private Button keyRight;
-        private Button ButtonCreateImproved;
-        private ComboBox comboBoxSelectorMap;
-    }
-}

GasolineTanker/GasolineTanker/FormMap.cs

@@ -1,86 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-
-namespace GasolineTanker
-{
-    public partial class FormMap : Form
-    {
-        private AbstractMap _abstractMap;
-        public FormMap()
-        {
-            InitializeComponent();
-            _abstractMap = new SimpleMap();
-        }
-
-        private void SetData(DrawingGasolineTanker gasolineTanker)
-        {
-            toolStripStatusSpeed.Text = $"Speed {gasolineTanker.GasolineTanker.Speed}";
-            toolStripStatusWeight.Text = $"Weight {gasolineTanker.GasolineTanker.Weight}";
-            toolStripStatusBodyColor.Text = $"Color {gasolineTanker.GasolineTanker.BodyColor.Name}";
-            pictureBoxGasolineTanker.Image = _abstractMap.CreateMap(pictureBoxGasolineTanker.Width, pictureBoxGasolineTanker.Height,
-       new DrawingObjectGasolineTanker(gasolineTanker));
-        }
-
-        private void buttonCreate_Click_1(object sender, EventArgs e)
-        {
-            Random rnd = new();
-            var gasolineTanker = new DrawingGasolineTanker(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)));
-            SetData(gasolineTanker);
-        }
-
-        private void ButtonMove_Click(object sender, EventArgs e)
-        {
-            //получаем имя кнопки
-            string name = ((Button)sender)?.Name ?? string.Empty;
-            Direction dir = Direction.None;
-            switch (name)
-            {
-                case "keyUp":
-                    dir = Direction.Up;
-                    break;
-                case "keyDown":
-                    dir = Direction.Down;
-                    break;
-                case "keyLeft":
-                    dir = Direction.Left;
-                    break;
-                case "keyRight":
-                    dir = Direction.Right;
-                    break;
-            }
-            pictureBoxGasolineTanker.Image = _abstractMap?.MoveObject(dir);
-        }
-
-        private void ButtonCreateImproved_Click(object sender, EventArgs e)
-        {
-            Random rnd = new();
-            var gasolineTanker = new DrawingImprovedGasolineTanker(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(gasolineTanker);
-        }
-
-        private void comboBoxSelectorMap_SelectedIndexChanged(object sender, EventArgs e)
-        {
-            switch (comboBoxSelectorMap.Text)
-            {
-                case "Simple map":
-                    _abstractMap = new SimpleMap();
-                    break;
-                case "Long map":
-                    _abstractMap = new LongMap();
-                    break;
-            }
-        }
-
-    }
-}
-

GasolineTanker/GasolineTanker/FormMap.resx

@@ -1,63 +0,0 @@
-<root>
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <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>

GasolineTanker/GasolineTanker/IDrawingObject.cs

@@ -1,17 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace GasolineTanker
-{
-    internal interface IDrawingObject
-    {
-		public float Step { get; }
-		void SetObject(int x, int y, int width, int height);
-		void MoveObject(Direction direction);
-		void DrawningObject(Graphics g);
-		(float Left, float Right, float Top, float Bottom) GetCurrentPosition();
-	}
-}

GasolineTanker/GasolineTanker/LongMap.cs

@@ -1,49 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace GasolineTanker
-{
-    internal class LongMap : AbstractMap
-    {
-        private readonly Brush barrierColor = new SolidBrush(Color.Black);
-        private readonly Brush roadColor = new SolidBrush(Color.Gray);
-        protected override void DrawBarrierPart(Graphics g, int i, int j)
-        {
-            g.FillRectangle(barrierColor, i * _size_x, j * _size_y, _size_x, _size_y);
-        }
-        protected override void DrawRoadPart(Graphics g, int i, int j)
-        {
-            g.FillRectangle(roadColor, i * _size_x, j * _size_y, _size_x, _size_y);
-        }
-        protected override void GenerateMap()
-        {
-            _map = new int[100, 100];
-            _size_x = (float)_width / _map.GetLength(0);
-            _size_y = (float)_height / _map.GetLength(1);
-            int counter = 0;
-            for (int i = 0; i < _map.GetLength(0); ++i)
-            {
-                for (int j = 0; j < _map.GetLength(1); ++j)
-                {
-                    _map[i, j] = _freeRoad;
-                }
-            }
-            while (counter < 5)
-            {
-                int xStart = _random.Next(0, 100);
-                int xEnd = _random.Next(80, 100);
-
-                for (int i = xStart; i <= xEnd; ++i)
-                {
-                    _map[i, xStart] = _barrier;
-                }
-
-                counter++;
-            }
-        }
-    }
-}
-

GasolineTanker/GasolineTanker/Program.cs

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

GasolineTanker/GasolineTanker/SimpleMap.cs

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