RoadTrain/RoadTrain/AbstractStrategy.cs

@@ -1,71 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using RoadTrain.DrawingObjects;
-
-namespace RoadTrain.MovementStrategy
-{
-    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;
-        }
-    }
-}

RoadTrain/RoadTrain/DirectionType.cs

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

RoadTrain/RoadTrain/DrawingObjectTrain.cs

@@ -1,33 +0,0 @@
-using RoadTrain.MovementStrategy;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using RoadTrain.DrawingObjects;
-
-namespace RoadTrain.MovementStrategy
-{
-    public class DrawingObjectTrain : IMoveableObject
-    {
-        private readonly DrawingRoadTrain? _drawingRoadTrain = null;
-        public DrawingObjectTrain(DrawingRoadTrain drawingRoadTrain)
-        {
-            _drawingRoadTrain = drawingRoadTrain;
-        }
-        public ObjectParameters? GetObjectPosition
-        {
-            get
-            {
-                if (_drawingRoadTrain == null || _drawingRoadTrain.EntityRoadTrain == null)
-                {
-                    return null;
-                }
-                return new ObjectParameters(_drawingRoadTrain.GetPosX, _drawingRoadTrain.GetPosY, _drawingRoadTrain.GetWidth, _drawingRoadTrain.GetHeight);
-            }
-        }
-        public int GetStep => (int)(_drawingRoadTrain?.EntityRoadTrain?.Step ?? 0);
-        public bool CheckCanMove(DirectionType direction) => _drawingRoadTrain?.CanMove(direction) ?? false;
-        public void MoveObject(DirectionType direction) => _drawingRoadTrain?.MoveTransport(direction);
-    }
-}

RoadTrain/RoadTrain/DrawingRoadTrain.cs

@@ -1,122 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using RoadTrain.Entities;
-
-
-namespace RoadTrain.DrawingObjects
-{
-    public class DrawingRoadTrain
-    {
-        public EntityRoadTrain? EntityRoadTrain { get; protected set; }
-        private int _pictureWidth;
-        private int _pictureHeight;
-        protected int _startPosX;
-        protected int _startPosY;
-        protected readonly int _roadTrainWidth = 200;
-        protected readonly int _roadTrainHeight = 100;
-        public int GetPosX => _startPosX;
-        public int GetPosY => _startPosY;
-        public int GetWidth => _roadTrainWidth;
-        public int GetHeight => _roadTrainHeight;
-        public DrawingRoadTrain(int speed, double weight, Color bodyColor, int width, int height)
-        {
-            if (width < _roadTrainWidth || height < _roadTrainHeight)
-            {
-                return;
-            }
-            _pictureWidth = width;
-            _pictureHeight = height;
-            EntityRoadTrain = new EntityRoadTrain(speed, weight, bodyColor);
-
-        }
-        protected DrawingRoadTrain(int speed, double weight, Color bodyColor, int width, int height, int roadTrainWidth, int roadTrainHeight)
-        {
-            if (width < _roadTrainWidth || height < _roadTrainHeight)
-            {
-                return;
-            }
-            _pictureWidth = width;
-            _pictureHeight = height;
-            _roadTrainWidth = roadTrainWidth;
-            _roadTrainHeight = roadTrainHeight;
-            EntityRoadTrain = new EntityRoadTrain(speed, weight, bodyColor);
-        }
-        public void SetPosition(int x, int y)
-        {
-            _startPosX = x;
-            _startPosY = y;
-
-            if (_startPosX < 0 || _startPosY < 0 || _startPosX > (_pictureWidth - _roadTrainWidth) || _startPosY > (_pictureHeight - _roadTrainHeight))
-            {
-                _startPosX = 50;
-                _startPosY = 50;
-            }
-        }
-        public void MoveTransport(DirectionType direction)
-        {
-            if (!CanMove(direction) || EntityRoadTrain == null)
-            {
-                return;
-            }
-            switch (direction)
-            {
-                case DirectionType.Left:
-                    _startPosX -= (int)EntityRoadTrain.Step;
-                    break;
-                case DirectionType.Up:
-                    _startPosY -= (int)EntityRoadTrain.Step;
-                    break;
-                case DirectionType.Right:
-                    _startPosX += (int)EntityRoadTrain.Step;
-                    break;
-                case DirectionType.Down:
-                    _startPosY += (int)EntityRoadTrain.Step;
-                    break;
-            }
-        }
-        public bool CanMove(DirectionType direction)
-        {
-            if (EntityRoadTrain == null)
-            {
-                return false;
-            }
-            return direction switch
-            {
-                DirectionType.Left => _startPosX - EntityRoadTrain.Step > 0,
-                DirectionType.Up => _startPosY - EntityRoadTrain.Step > 0,
-                DirectionType.Right => _startPosX + _roadTrainWidth + EntityRoadTrain.Step < _pictureWidth,
-                DirectionType.Down => _startPosY + _roadTrainHeight + EntityRoadTrain.Step < _pictureHeight,
-                _ => false,
-            };
-        }
-        public virtual void DrawTransport(Graphics g)
-        {
-            if (EntityRoadTrain == null)
-            {
-                return;
-            }
-            Pen pen = new(Color.Black, 2);
-            Pen anchor = new(Color.Black, 4);
-            Brush bodyBrush = new SolidBrush(EntityRoadTrain.BodyColor);
-            Brush whiteBrush = new SolidBrush(Color.White);
-
-            //машина
-            g.DrawRectangle(pen, _startPosX, _startPosY + 50, 160, 20);
-            g.FillRectangle(bodyBrush, _startPosX, _startPosY + 50, 160, 20);
-            g.DrawEllipse(pen, _startPosX + 5, _startPosY + 70, 30, 30); //колесо
-            g.FillEllipse(bodyBrush, _startPosX + 5, _startPosY + 70        , 30, 30);
-            g.DrawEllipse(pen, _startPosX + 40, _startPosY + 70, 30, 30); //колесо
-            g.FillEllipse(bodyBrush, _startPosX + 40, _startPosY + 70, 30, 30);
-            g.DrawEllipse(pen, _startPosX + 120, _startPosY + 70, 30, 30); //колесо
-            g.FillEllipse(bodyBrush, _startPosX + 120, _startPosY + 70, 30, 30);
-            g.DrawRectangle(pen, _startPosX + 120, _startPosY + 10, 40, 40); //кабина
-            g.FillRectangle(bodyBrush, _startPosX + 120, _startPosY + 10, 40, 40);
-            g.DrawRectangle(pen, _startPosX + 130, _startPosY + 20, 30, 20); //окно
-            g.FillRectangle(whiteBrush, _startPosX + 130, _startPosY + 20, 30, 20);
-
-        }
-    }
-}

RoadTrain/RoadTrain/DrawingRoadTrainWithTank.cs

@@ -1,49 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using RoadTrain.Entities;
-
-namespace RoadTrain.DrawingObjects
-{
-    public class DrawingRoadTrainWithTank : DrawingRoadTrain
-    {
-        public DrawingRoadTrainWithTank(int speed, double weight, Color bodyColor, Color
-        additionalColor, bool pipes, bool section, int width, int height)
-            : base(speed, weight, bodyColor, width, height, 200, 100)
-        {
-            if (EntityRoadTrain != null)
-            {
-                EntityRoadTrain = new EntityRoadTrainWithTank(speed, weight, bodyColor, additionalColor, pipes, section);
-            }
-        }
-        public override void DrawTransport(Graphics g)
-        {
-            if (EntityRoadTrain is not EntityRoadTrainWithTank roadTrain)
-            {
-                return;
-            }
-            Pen pen = new(Color.Black, 2);
-            Brush additionalBrush = new SolidBrush(roadTrain.AdditionalColor);
-            base.DrawTransport(g);
-
-
-            //щетка
-            Brush brGray = new SolidBrush(Color.Gray);
-            if (roadTrain.Brush)
-            {
-                g.DrawLine(pen, _startPosX + 160, _startPosY + 70, _startPosX + 180, _startPosY + 80);
-                g.DrawRectangle(pen, _startPosX + 170, _startPosY + 80, 40, 10); //щетка
-                g.FillRectangle(additionalBrush, _startPosX + 170, _startPosY + 80, 40, 10);
-            }
-            //бак
-            if (roadTrain.Tank)
-            {
-                g.DrawRectangle(pen, _startPosX + 10, _startPosY, 90, 50); //бак с водой
-                g.FillRectangle(additionalBrush, _startPosX + 10, _startPosY, 90, 50);
-            }
-        }
-    }
-}

RoadTrain/RoadTrain/EntityRoadTrain.cs

@@ -1,22 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace RoadTrain.Entities
-{
-    public class EntityRoadTrain
-    {
-        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 EntityRoadTrain(int speed, double weight, Color bodyColor)
-        {
-            Speed = speed;
-            Weight = weight;
-            BodyColor = bodyColor;
-        }
-    }
-}

RoadTrain/RoadTrain/EntityRoadTrainWithTank.cs

@@ -1,23 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace RoadTrain.Entities
-{
-    public class EntityRoadTrainWithTank : EntityRoadTrain
-    {
-        public Color AdditionalColor { get; private set; }
-        public bool Tank { get; private set; }
-        public bool Brush { get; private set; }
-        public EntityRoadTrainWithTank(int speed, double weight, Color bodyColor, Color
-       additionalColor, bool tank, bool brush)
-            : base (speed, weight, bodyColor)
-        {
-            AdditionalColor = additionalColor;
-            Tank = tank;
-            Brush = brush;
-        }
-    }
-}

RoadTrain/RoadTrain/Form1.Designer.cs

@@ -0,0 +1,39 @@
+namespace RoadTrain
+{
+    partial class Form1
+    {
+        /// <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.components = new System.ComponentModel.Container();
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(800, 450);
+            this.Text = "Form1";
+        }
+
+        #endregion
+    }
+}

RoadTrain/RoadTrain/Form1.cs

@@ -0,0 +1,10 @@
+namespace RoadTrain
+{
+    public partial class Form1 : Form
+    {
+        public Form1()
+        {
+            InitializeComponent();
+        }
+    }
+}

RoadTrain/RoadTrain/Form1.resx

@@ -1,17 +1,17 @@
 <?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
+    
+    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>
@@ -26,36 +26,36 @@
         <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
+                
+    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
+    
+    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
+    
+    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
+    
+    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
+    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
+    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
+    value   : The object must be serialized into a byte array 
             : using a System.ComponentModel.TypeConverter
             : and then encoded with base64 encoding.
     -->

RoadTrain/RoadTrain/IMoveableObject.cs

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

RoadTrain/RoadTrain/MoveToBorder.cs

@@ -1,56 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace RoadTrain.MovementStrategy
-{
-    public 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.RightBorder - FieldWidth;
-            if (Math.Abs(diffX) > GetStep())
-            {
-                if (diffX > 0)
-                {
-                    MoveLeft();
-                }
-                else
-                {
-                    MoveRight();
-                }
-            }
-            var diffY = objParams.DownBorder - FieldHeight;
-            if (Math.Abs(diffY) > GetStep())
-            {
-                if (diffY > 0)
-                {
-                    MoveUp();
-                }
-                else
-                {
-                    MoveDown();
-                }
-            }
-        }
-    }
-}

RoadTrain/RoadTrain/MoveToCenter.cs

@@ -1,56 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace RoadTrain.MovementStrategy
-{
-    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();
-                }
-            }
-        }
-    }
-}

RoadTrain/RoadTrain/ObjectParameters.cs

@@ -1,29 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace RoadTrain.MovementStrategy
-{
-    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;
-        }
-    }
-}

RoadTrain/RoadTrain/Program.cs

@@ -2,11 +2,16 @@ namespace RoadTrain
 {
     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 RoadTrain());
+            Application.Run(new Form1());
         }
     }
 }

RoadTrain/RoadTrain/Properties/Resources.Designer.cs

@@ -1,103 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     Этот код создан программой.
-//     Исполняемая версия:4.0.30319.42000
-//
-//     Изменения в этом файле могут привести к неправильной работе и будут потеряны в случае
-//     повторной генерации кода.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace RoadTrain.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("RoadTrain.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 down {
-            get {
-                object obj = ResourceManager.GetObject("down", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Поиск локализованного ресурса типа System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap left {
-            get {
-                object obj = ResourceManager.GetObject("left", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Поиск локализованного ресурса типа System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap right {
-            get {
-                object obj = ResourceManager.GetObject("right", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Поиск локализованного ресурса типа System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap up {
-            get {
-                object obj = ResourceManager.GetObject("up", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-    }
-}

RoadTrain/RoadTrain/Properties/Resources.resx

@@ -1,140 +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="down" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\down.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="left" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\left.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="right" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\right.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="up" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\up.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-</root>

RoadTrain/RoadTrain/RoadTrain.Designer.cs

@@ -1,185 +0,0 @@
-namespace RoadTrain
-{
-    partial class RoadTrain
-    {
-        /// <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()
-        {
-            buttonDown = new Button();
-            buttonLeft = new Button();
-            buttonUp = new Button();
-            buttonRight = new Button();
-            pictureBoxRoadTrain = new PictureBox();
-            buttonStep = new Button();
-            comboBoxStrategy = new ComboBox();
-            button1 = new Button();
-            buttonCreateRoadTrain = new Button();
-            ((System.ComponentModel.ISupportInitialize)pictureBoxRoadTrain).BeginInit();
-            SuspendLayout();
-            // 
-            // buttonDown
-            // 
-            buttonDown.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
-            buttonDown.BackgroundImage = Properties.Resources.down;
-            buttonDown.BackgroundImageLayout = ImageLayout.Zoom;
-            buttonDown.ForeColor = SystemColors.ControlText;
-            buttonDown.Location = new Point(718, 418);
-            buttonDown.Margin = new Padding(3, 2, 3, 2);
-            buttonDown.Name = "buttonDown";
-            buttonDown.Size = new Size(26, 22);
-            buttonDown.TabIndex = 12;
-            buttonDown.UseVisualStyleBackColor = true;
-            buttonDown.Click += buttonMove_Click;
-            // 
-            // buttonLeft
-            // 
-            buttonLeft.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
-            buttonLeft.BackgroundImage = Properties.Resources.left;
-            buttonLeft.BackgroundImageLayout = ImageLayout.Zoom;
-            buttonLeft.ForeColor = SystemColors.ControlText;
-            buttonLeft.Location = new Point(686, 418);
-            buttonLeft.Margin = new Padding(3, 2, 3, 2);
-            buttonLeft.Name = "buttonLeft";
-            buttonLeft.Size = new Size(26, 22);
-            buttonLeft.TabIndex = 11;
-            buttonLeft.UseVisualStyleBackColor = true;
-            buttonLeft.Click += buttonMove_Click;
-            // 
-            // buttonUp
-            // 
-            buttonUp.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
-            buttonUp.BackgroundImage = Properties.Resources.up;
-            buttonUp.BackgroundImageLayout = ImageLayout.Zoom;
-            buttonUp.ForeColor = SystemColors.ControlText;
-            buttonUp.Location = new Point(718, 391);
-            buttonUp.Margin = new Padding(3, 2, 3, 2);
-            buttonUp.Name = "buttonUp";
-            buttonUp.Size = new Size(26, 22);
-            buttonUp.TabIndex = 10;
-            buttonUp.UseVisualStyleBackColor = true;
-            buttonUp.Click += buttonMove_Click;
-            // 
-            // buttonRight
-            // 
-            buttonRight.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
-            buttonRight.BackgroundImage = Properties.Resources.right;
-            buttonRight.BackgroundImageLayout = ImageLayout.Zoom;
-            buttonRight.ForeColor = SystemColors.ControlText;
-            buttonRight.Location = new Point(749, 417);
-            buttonRight.Margin = new Padding(3, 2, 3, 2);
-            buttonRight.Name = "buttonRight";
-            buttonRight.Size = new Size(26, 22);
-            buttonRight.TabIndex = 9;
-            buttonRight.UseVisualStyleBackColor = true;
-            buttonRight.Click += buttonMove_Click;
-            // 
-            // pictureBoxRoadTrain
-            // 
-            pictureBoxRoadTrain.Dock = DockStyle.Fill;
-            pictureBoxRoadTrain.Location = new Point(0, 0);
-            pictureBoxRoadTrain.Margin = new Padding(3, 2, 3, 2);
-            pictureBoxRoadTrain.Name = "pictureBoxRoadTrain";
-            pictureBoxRoadTrain.Size = new Size(800, 450);
-            pictureBoxRoadTrain.SizeMode = PictureBoxSizeMode.AutoSize;
-            pictureBoxRoadTrain.TabIndex = 7;
-            pictureBoxRoadTrain.TabStop = false;
-            // 
-            // buttonStep
-            // 
-            buttonStep.Location = new Point(650, 41);
-            buttonStep.Name = "buttonStep";
-            buttonStep.Size = new Size(94, 29);
-            buttonStep.TabIndex = 16;
-            buttonStep.Text = "Шаг";
-            buttonStep.UseVisualStyleBackColor = true;
-            buttonStep.Click += buttonStep_Click;
-            // 
-            // comboBoxStrategy
-            // 
-            comboBoxStrategy.DropDownStyle = ComboBoxStyle.DropDownList;
-            comboBoxStrategy.FormattingEnabled = true;
-            comboBoxStrategy.Items.AddRange(new object[] { "К центру", "К краю" });
-            comboBoxStrategy.Location = new Point(624, 12);
-            comboBoxStrategy.Name = "comboBoxStrategy";
-            comboBoxStrategy.Size = new Size(151, 23);
-            comboBoxStrategy.TabIndex = 15;
-            // 
-            // button1
-            // 
-            button1.Anchor = AnchorStyles.Bottom | AnchorStyles.Left;
-            button1.Location = new Point(228, 388);
-            button1.Name = "button1";
-            button1.Size = new Size(122, 50);
-            button1.TabIndex = 14;
-            button1.Text = "Создать машину";
-            button1.UseVisualStyleBackColor = true;
-            button1.Click += buttonCreate_Click;
-            // 
-            // buttonCreateRoadTrain
-            // 
-            buttonCreateRoadTrain.Anchor = AnchorStyles.Bottom | AnchorStyles.Left;
-            buttonCreateRoadTrain.Location = new Point(24, 388);
-            buttonCreateRoadTrain.Name = "buttonCreateRoadTrain";
-            buttonCreateRoadTrain.Size = new Size(198, 50);
-            buttonCreateRoadTrain.TabIndex = 13;
-            buttonCreateRoadTrain.Text = "Создать машину с баком под воду или щеткой";
-            buttonCreateRoadTrain.UseVisualStyleBackColor = true;
-            buttonCreateRoadTrain.Click += buttonCreateRoadTrain_Click;
-            // 
-            // RoadTrain
-            // 
-            AutoScaleDimensions = new SizeF(7F, 15F);
-            AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(800, 450);
-            Controls.Add(buttonStep);
-            Controls.Add(comboBoxStrategy);
-            Controls.Add(button1);
-            Controls.Add(buttonCreateRoadTrain);
-            Controls.Add(buttonDown);
-            Controls.Add(buttonLeft);
-            Controls.Add(buttonUp);
-            Controls.Add(buttonRight);
-            Controls.Add(pictureBoxRoadTrain);
-            Name = "RoadTrain";
-            Text = "RoadTrain";
-            ((System.ComponentModel.ISupportInitialize)pictureBoxRoadTrain).EndInit();
-            ResumeLayout(false);
-            PerformLayout();
-        }
-
-        #endregion
-
-        private Button buttonDown;
-        private Button buttonLeft;
-        private Button buttonUp;
-        private Button buttonRight;
-        public PictureBox pictureBoxRoadTrain;
-        private Button buttonStep;
-        private ComboBox comboBoxStrategy;
-        private Button button1;
-        private Button buttonCreateRoadTrain;
-    }
-}

RoadTrain/RoadTrain/RoadTrain.cs

@@ -1,117 +0,0 @@
-using System;
-using System.Collections.Generic;
-using RoadTrain.DrawingObjects;
-using RoadTrain.MovementStrategy;
-
-namespace RoadTrain
-{
-    public partial class RoadTrain : Form
-    {
-        private DrawingRoadTrain? _drawingRoadTrain;
-        private AbstractStrategy? _abstractStrategy;
-
-        public RoadTrain()
-        {
-            InitializeComponent();
-        }
-        private void Draw()
-        {
-            if (_drawingRoadTrain == null)
-            {
-                return;
-            }
-            Bitmap bmp = new(pictureBoxRoadTrain.Width,
-            pictureBoxRoadTrain.Height);
-            Graphics gr = Graphics.FromImage(bmp);
-            _drawingRoadTrain.DrawTransport(gr);
-            pictureBoxRoadTrain.Image = bmp;
-        }
-        private void buttonCreate_Click(object sender, EventArgs e)
-        {
-            Random random = new();
-            _drawingRoadTrain = new DrawingRoadTrain(random.Next(100, 300),
-            random.Next(1000, 3000),
-            Color.FromArgb(random.Next(0, 256), random.Next(0, 256),
-            random.Next(0, 256)),
-            pictureBoxRoadTrain.Width, pictureBoxRoadTrain.Height);
-            _drawingRoadTrain.SetPosition(random.Next(10, 100), random.Next(10, 100));
-            Draw();
-        }
-        private void buttonCreateRoadTrain_Click(object sender, EventArgs e)
-        {
-            Random random = new();
-            _drawingRoadTrain = new DrawingRoadTrainWithTank(random.Next(100, 300),
-            random.Next(1000, 3000),
-            Color.FromArgb(random.Next(0, 256), random.Next(0, 256),
-            random.Next(0, 256)),
-            Color.FromArgb(random.Next(0, 256), random.Next(0, 256),
-            random.Next(0, 256)),
-            Convert.ToBoolean(random.Next(0, 2)),
-            Convert.ToBoolean(random.Next(0, 2)),
-            pictureBoxRoadTrain.Width, pictureBoxRoadTrain.Height);
-            _drawingRoadTrain.SetPosition(random.Next(10, 100), random.Next(10, 100));
-            Draw();
-        }
-        private void buttonMove_Click(object sender, EventArgs e)
-        {
-            if (_drawingRoadTrain == null)
-            {
-                return;
-            }
-            string name = ((Button)sender)?.Name ?? string.Empty;
-            switch (name)
-            {
-                case "buttonUp":
-                    _drawingRoadTrain.MoveTransport(DirectionType.Up);
-                    break;
-                case "buttonDown":
-                    _drawingRoadTrain.MoveTransport(DirectionType.Down);
-                    break;
-                case "buttonLeft":
-                    _drawingRoadTrain.MoveTransport(DirectionType.Left);
-                    break;
-                case "buttonRight":
-                    _drawingRoadTrain.MoveTransport(DirectionType.Right);
-                    break;
-            }
-            Draw();
-
-        }
-        private void buttonStep_Click(object sender, EventArgs e)
-        {
-            if (_drawingRoadTrain == null)
-            {
-                return;
-            }
-            if (comboBoxStrategy.Enabled)
-            {
-                _abstractStrategy = comboBoxStrategy.SelectedIndex
-                switch
-                {
-                    0 => new MoveToCenter(),
-                    1 => new MoveToBorder(),
-                    _ => null,
-                };
-                if (_abstractStrategy == null)
-                {
-                    return;
-                }
-                _abstractStrategy.SetData(new
-               DrawingObjectTrain(_drawingRoadTrain), pictureBoxRoadTrain.Width,
-               pictureBoxRoadTrain.Height);
-                comboBoxStrategy.Enabled = false;
-            }
-            if (_abstractStrategy == null)
-            {
-                return;
-            }
-            _abstractStrategy.MakeStep();
-            Draw();
-            if (_abstractStrategy.GetStatus() == Status.Finish)
-            {
-                comboBoxStrategy.Enabled = true;
-                _abstractStrategy = null;
-            }
-        }
-    }
-}

RoadTrain/RoadTrain/RoadTrain.csproj

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

RoadTrain/RoadTrain/Status.cs

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