решение конфликтов

Signed-off-by: RomanovEgor <romanov17903@gmail.com>

HoistingCrane/HoistingCrane.sln

@@ -1,9 +1,9 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
-VisualStudioVersion = 17.0.32112.339
+VisualStudioVersion = 17.3.32922.545
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HoistingCrane", "HoistingCrane\HoistingCrane.csproj", "{D80E7B00-5088-4976-A795-E42A2FE183D6}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HoistingCrane", "HoistingCrane\HoistingCrane.csproj", "{44B433E0-4B64-464F-B7B2-85F92D68A14D}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -11,15 +11,15 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{D80E7B00-5088-4976-A795-E42A2FE183D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{44B433E0-4B64-464F-B7B2-85F92D68A14D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D80E7B00-5088-4976-A795-E42A2FE183D6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{44B433E0-4B64-464F-B7B2-85F92D68A14D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D80E7B00-5088-4976-A795-E42A2FE183D6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{44B433E0-4B64-464F-B7B2-85F92D68A14D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D80E7B00-5088-4976-A795-E42A2FE183D6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{44B433E0-4B64-464F-B7B2-85F92D68A14D}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {F67B9958-A88C-4E5E-9405-BA7150E626AF}
+		SolutionGuid = {FF7CBA77-84DA-4B39-BFC8-808056D2EEAF}
 	EndGlobalSection
 EndGlobal

HoistingCrane/HoistingCrane/AbstractMap.cs

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

HoistingCrane/HoistingCrane/App.config

@@ -3,64 +3,4 @@
     <startup> 
         <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
     </startup>
-	<runtime>
-		<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-			<dependentAssembly>
-				<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-				<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
-			</dependentAssembly>
-			<dependentAssembly>
-				<assemblyIdentity name="Microsoft.Extensions.Primitives" publicKeyToken="adb9793829ddae60" culture="neutral" />
-				<bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
-			</dependentAssembly>
-			<dependentAssembly>
-				<assemblyIdentity name="Microsoft.Extensions.Logging.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
-				<bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
-			</dependentAssembly>
-			<dependentAssembly>
-				<assemblyIdentity name="Microsoft.Extensions.Logging" publicKeyToken="adb9793829ddae60" culture="neutral" />
-				<bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
-			</dependentAssembly>
-			<dependentAssembly>
-				<assemblyIdentity name="Microsoft.Extensions.DependencyInjection.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
-				<bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
-			</dependentAssembly>
-			<dependentAssembly>
-				<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-				<bindingRedirect oldVersion="0.0.0.0-4.0.1.2" newVersion="4.0.1.2" />
-			</dependentAssembly>
-			<dependentAssembly>
-				<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-				<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
-			</dependentAssembly>
-			<dependentAssembly>
-				<assemblyIdentity name="System.Text.Encodings.Web" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-				<bindingRedirect oldVersion="0.0.0.0-4.0.5.1" newVersion="4.0.5.1" />
-			</dependentAssembly>
-			<dependentAssembly>
-				<assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-				<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
-			</dependentAssembly>
-			<dependentAssembly>
-				<assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-				<bindingRedirect oldVersion="0.0.0.0-4.2.0.1" newVersion="4.2.0.1" />
-			</dependentAssembly>
-			<dependentAssembly>
-				<assemblyIdentity name="Microsoft.Bcl.AsyncInterfaces" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-				<bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
-			</dependentAssembly>
-			<dependentAssembly>
-				<assemblyIdentity name="System.Diagnostics.DiagnosticSource" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-				<bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
-			</dependentAssembly>
-			<dependentAssembly>
-				<assemblyIdentity name="Microsoft.Extensions.Configuration.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
-				<bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
-			</dependentAssembly>
-			<dependentAssembly>
-				<assemblyIdentity name="System.Text.Json" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-				<bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
-			</dependentAssembly>
-		</assemblyBinding>
-	</runtime>
 </configuration>

HoistingCrane/HoistingCrane/Direction.cs

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

HoistingCrane/HoistingCrane/DrawingAdvancedHoistingCrane.cs

@@ -1,53 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace HoistingCrane
-{
-    internal class DrawingAdvancedHoistingCrane : DrawingHoistingCrane
-    {
-        public DrawingAdvancedHoistingCrane(int speed, float weight, Color bodyColor, Color dopColor, bool bucket, bool ripper) :
-           base(speed, weight, bodyColor, 152, 65)
-        {
-            HoistingCrane = new EntityAdvancedHoistingCrane(speed, weight, bodyColor, dopColor, bucket, ripper);
-        }
-        public override void DrawTransport(Graphics g)
-        {
-            if (HoistingCrane is not EntityAdvancedHoistingCrane advancedHoistingCrane)
-            {
-                return;
-            }
-            Pen pen = new(Color.Black, 3);
-            Brush dopBrush = new SolidBrush(advancedHoistingCrane.DopColor);
-            if (advancedHoistingCrane.Сounterweight)
-            {
-                g.DrawLine(pen, _startPosX + 15, _startPosY + 60, _startPosX + 40, _startPosY + 75);
-                g.DrawLine(pen, _startPosX + 15, _startPosY + 45, _startPosX + 45, _startPosY + 65);
-
-                g.FillRectangle(dopBrush, _startPosX + 4, _startPosY + 38, 12, 25);
-                g.DrawRectangle(pen, _startPosX + 4, _startPosY + 38, 12, 25);
-
-            }
-            if (advancedHoistingCrane.Crane)
-            {
-                g.FillRectangle(dopBrush, _startPosX + 100, _startPosY + 30, 10, 25);
-                g.DrawRectangle(pen, _startPosX + 100, _startPosY + 30, 10, 25);
-                g.FillRectangle(dopBrush, _startPosX + 110, _startPosY + 15, 10, 25);
-                g.DrawRectangle(pen, _startPosX + 110, _startPosY + 15, 10, 25);
-                g.FillRectangle(dopBrush, _startPosX + 120, _startPosY + 15, 25, 10);
-                g.DrawRectangle(pen, _startPosX + 120, _startPosY + 15, 25, 10);
-                g.FillRectangle(dopBrush, _startPosX + 145, _startPosY + 15, 10, 60);
-                g.DrawRectangle(pen, _startPosX + 145, _startPosY + 15, 10, 60);
-                g.FillRectangle(dopBrush, _startPosX + 145, _startPosY + 65, 25, 10);
-                g.DrawRectangle(pen, _startPosX + 145, _startPosY + 65, 25, 10);
-            }
-            _startPosX += 40;
-            _startPosY += 30;
-            base.DrawTransport(g);
-            _startPosY -= 30;
-            _startPosX -= 40;
-        }
-    }
-}

HoistingCrane/HoistingCrane/DrawingHoistingCrane.cs

@@ -1,146 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace HoistingCrane
-{
-    public class DrawingHoistingCrane
-    {
-        public EntityHoistingCrane HoistingCrane { get; protected set; }
-        protected float _startPosX;
-        protected float _startPosY;
-        private int? _pictureWidth = null;
-        private int? _pictureHeight = null;
-        private readonly int _hoistingCraneWidth = 80;
-        private readonly int _hoistingCraneHeight = 50;
-        protected DrawingHoistingCrane(int speed, float weight, Color bodyColor, int hoistingCraneWidth, int hoistingCraneHeigth) :
-           this(speed, weight, bodyColor)
-        {
-            _hoistingCraneHeight = hoistingCraneHeigth;
-            _hoistingCraneWidth = hoistingCraneWidth;
-        }
-        public DrawingHoistingCrane(int speed, float weight, Color bodyColor)
-        {
-            HoistingCrane = new EntityHoistingCrane(speed, weight, bodyColor);
-        }
-        public void SetPosition(int x, int y, int width, int height)
-        {
-            // TODO checks
-            _startPosX = x;
-            _startPosY = y;
-            _pictureWidth = width;
-            _pictureHeight = height;
-        }
-        public void MoveTransport(Direction direction)
-        {
-            if (!_pictureWidth.HasValue || !_pictureHeight.HasValue)
-            {
-                return;
-            }
-            switch (direction)
-            {
-                // вправо
-                case Direction.Right:
-                    if (_startPosX + _hoistingCraneWidth + HoistingCrane.Step < _pictureWidth)
-                    {
-                        _startPosX += HoistingCrane.Step;
-                    }
-                    break;
-                //влево
-                case Direction.Left:
-                    if (_startPosX - HoistingCrane.Step > 0)
-                    {
-                        _startPosX -= HoistingCrane.Step;
-                    }
-                    break;
-                //вверх
-                case Direction.Up:
-                    if (_startPosY - HoistingCrane.Step > 0)
-                    {
-                        _startPosY -= HoistingCrane.Step;
-                    }
-                    break;
-                //вниз
-                case Direction.Down:
-                    if (_startPosY + _hoistingCraneHeight + HoistingCrane.Step < _pictureHeight)
-                    {
-                        _startPosY += HoistingCrane.Step;
-                    }
-                    break;
-            }
-        }
-        public virtual void DrawTransport(Graphics g)
-        {
-            if (_startPosX < 0 || _startPosY < 0
-                || !_pictureHeight.HasValue || !_pictureWidth.HasValue)
-            {
-                return;
-            }
-            Pen pen = new Pen(Color.Black);
-            //границы 
-            g.DrawRectangle(pen, _startPosX, _startPosY + 25, 75, 20);
-            g.DrawRectangle(pen, _startPosX, _startPosY, 25, 25);
-            g.DrawRectangle(pen, _startPosX + 4, _startPosY + 4, 17, 17);
-            g.DrawRectangle(pen, _startPosX + 52, _startPosY + 7, 6, 18);
-            g.DrawEllipse(pen, _startPosX - 5, _startPosY + 45, 20, 20);
-            g.DrawEllipse(pen, _startPosX + 63, _startPosY + 45, 20, 20);
-            g.DrawRectangle(pen, _startPosX + 5, _startPosY + 45, 68, 20);
-            g.DrawEllipse(pen, _startPosX - 1, _startPosY + 46, 18, 18);
-            g.DrawEllipse(pen, _startPosX + 62, _startPosY + 46, 18, 18);
-            g.DrawEllipse(pen, _startPosX + 20, _startPosY + 53, 10, 10);
-            g.DrawEllipse(pen, _startPosX + 35, _startPosY + 53, 10, 10);
-            g.DrawEllipse(pen, _startPosX + 50, _startPosY + 53, 10, 10);
-            g.DrawRectangle(pen, _startPosX + 30, _startPosY + 45, 4, 6);
-            g.DrawRectangle(pen, _startPosX + 45, _startPosY + 45, 4, 6);
-            //корпус
-            Brush br = new SolidBrush(HoistingCrane?.BodyColor ?? Color.Black);
-            g.FillRectangle(br, _startPosX, _startPosY + 25, 75, 25);
-            g.FillRectangle(br, _startPosX, _startPosY, 25, 25);
-            //окно
-            Brush brBlue = new SolidBrush(Color.Blue);
-            g.FillRectangle(brBlue, _startPosX + 4, _startPosY + 4, 17, 17);
-            //выхлопная труба
-            Brush brBrown = new SolidBrush(Color.DarkGray);
-            g.FillRectangle(brBrown, _startPosX + 52, _startPosY + 7, 6, 18);
-            //гусеница
-            Brush brDarkGray = new SolidBrush(Color.DarkGray);
-            g.FillEllipse(brDarkGray, _startPosX - 5, _startPosY + 45, 20, 20);
-            g.FillEllipse(brDarkGray, _startPosX + 63, _startPosY + 45, 20, 20);
-            g.FillRectangle(brDarkGray, _startPosX + 5, _startPosY + 45, 68, 20);
-            Brush brBlack = new SolidBrush(Color.Black);
-            g.FillEllipse(brBlack, _startPosX - 1, _startPosY + 46, 18, 18);
-            g.FillEllipse(brBlack, _startPosX + 62, _startPosY + 46, 18, 18);
-            g.FillEllipse(brBlack, _startPosX + 20, _startPosY + 53, 10, 10);
-            g.FillEllipse(brBlack, _startPosX + 35, _startPosY + 53, 10, 10);
-            g.FillEllipse(brBlack, _startPosX + 50, _startPosY + 53, 10, 10);
-            g.FillRectangle(brBlack, _startPosX + 30, _startPosY + 45, 4, 6);
-            g.FillRectangle(brBlack, _startPosX + 45, _startPosY + 45, 4, 6);
-        }
-
-        public void ChangeBorders(int width, int height)
-        {
-            _pictureWidth = width;
-            _pictureHeight = height;
-            if (_pictureWidth <= _hoistingCraneWidth || _pictureHeight <= _hoistingCraneHeight)
-            {
-                _pictureWidth = null;
-                _pictureHeight = null;
-                return;
-            }
-            if (_startPosX + _hoistingCraneWidth > _pictureWidth)
-            {
-                _startPosX = _pictureWidth.Value - _hoistingCraneWidth;
-            }
-            if (_startPosY + _hoistingCraneHeight > _pictureHeight)
-            {
-                _startPosY = _pictureHeight.Value - _hoistingCraneHeight;
-            }
-        }
-        public (float Left, float Right, float Top, float Bottom) GetCurrentPosition()
-        {
-            return (_startPosX, _startPosY, _startPosX + _hoistingCraneWidth, _startPosY + _hoistingCraneHeight);
-        }
-    }
-}

HoistingCrane/HoistingCrane/DrawingObjectHoistingCrane.cs

@@ -1,32 +0,0 @@
-
-namespace HoistingCrane
-{
-    internal class DrawingObjectHoistingCrane : IDrawingObject
-    {
-            private DrawingHoistingCrane _hoistingCrane = null;
-            public DrawingObjectHoistingCrane(DrawingHoistingCrane hoistingCrane)
-            {
-                _hoistingCrane = hoistingCrane;
-            }
-            public float Step => _hoistingCrane?.HoistingCrane?.Step ?? 0;
-            public (float Left, float Right, float Top, float Bottom) GetCurrentPosition()
-            {
-                return _hoistingCrane?.GetCurrentPosition() ?? default;
-            }
-            public void MoveObject(Direction direction)
-            {
-                _hoistingCrane?.MoveTransport(direction);
-            }
-            public void SetObject(int x, int y, int width, int height)
-            {
-                _hoistingCrane?.SetPosition(x, y, width, height);
-            }
-            public void DrawingObject(Graphics g)
-            {
-                _hoistingCrane?.DrawTransport(g);
-            }
-        public string GetInfo() => _hoistingCrane?.GetDataForSave();
-        public static IDrawingObject Create(string data) => new DrawingObjectHoistingCrane(data.CreateDrawingHoistingCrane());
-
-    }
-}

HoistingCrane/HoistingCrane/EntityAdvancedHoistingCrane.cs

@@ -1,25 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace HoistingCrane
-{
-    internal class EntityAdvancedHoistingCrane : EntityHoistingCrane
-    {
-        // наличие крана
-        public bool Crane { get; private set; }
-        // наличие противовеса
-        public bool Сounterweight { get; private set; }
-        public Color DopColor { get; set; }
-
-        public EntityAdvancedHoistingCrane(int speed, float weight, Color bodyColor, Color dopColor, bool crane, bool counterWeight) :
-            base(speed, weight, bodyColor)
-        {
-            Crane = crane;
-            Сounterweight = counterWeight;
-            DopColor = dopColor;
-        }
-    }
-}

HoistingCrane/HoistingCrane/EntityHoistingCrane.cs

@@ -1,23 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace HoistingCrane
-{
-    public class EntityHoistingCrane
-    {
-        public int Speed { get; private set; }
-        public float Weight { get; private set; }
-        public Color BodyColor { get; set; }
-        public float Step => Speed * 100 / Weight;
-        public EntityHoistingCrane(int speed, float weight, Color bodyColor)
-        {
-            Random rnd = new();
-            Speed = speed <= 0 ? rnd.Next(30, 100) : speed;
-            Weight = weight <= 0 ? rnd.Next(300, 500) : weight;
-            BodyColor = bodyColor;
-        }
-    }
-}

HoistingCrane/HoistingCrane/ExtentionHoistingCrane.cs

@@ -1,53 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace HoistingCrane
-{
-    internal static class ExtentionHoistingCrane
-    {
-        /// <summary>
-        /// Разделитель для записи информации по объекту в файл
-        /// </summary>
-        private static readonly char _separatorForObject = ':';
-        /// <summary>
-        /// Создание объекта из строки
-        /// </summary>
-        /// <param name="info"></param>
-        /// <returns></returns>
-        public static DrawingHoistingCrane CreateDrawingHoistingCrane(this string info)
-        {
-            string[] strs = info.Split(_separatorForObject);
-            if (strs.Length == 3)
-            {
-                return new DrawingHoistingCrane(Convert.ToInt32(strs[0]),
-                Convert.ToInt32(strs[1]), Color.FromName(strs[2]));
-            }
-            if (strs.Length == 6)
-            {
-                return new DrawingAdvancedHoistingCrane(Convert.ToInt32(strs[0]),
-                Convert.ToInt32(strs[1]), Color.FromName(strs[2]),
-                Color.FromName(strs[3]), Convert.ToBoolean(strs[4]),
-               Convert.ToBoolean(strs[5]));
-            }
-            return null;
-        }
-        /// <summary>
-        /// Получение данных для сохранения в файл
-        /// </summary>
-        /// <param name="DrawingHoistingCrane"></param>
-        /// <returns></returns>
-        public static string GetDataForSave(this DrawingHoistingCrane DrawingHoistingCrane)
-        {
-            var hoistingCrane = DrawingHoistingCrane.HoistingCrane;
-            var str = $"{hoistingCrane.Speed}{_separatorForObject}{hoistingCrane.Weight}{_separatorForObject}{hoistingCrane.BodyColor.Name}";
-            if (!(hoistingCrane is EntityAdvancedHoistingCrane HoistingCrane))
-            {
-                return str;
-            }
-            return $"{str}{_separatorForObject}{HoistingCrane.DopColor.Name}{_separatorForObject}{HoistingCrane.Crane}{_separatorForObject}{HoistingCrane.Сounterweight}";
-        }
-    }
-}

HoistingCrane/HoistingCrane/FormHoistingCrane.Designer.cs

@@ -49,10 +49,9 @@
             this.buttonUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.buttonUp.BackgroundImage = global::HoistingCrane.Properties.Resources.up;
             this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
-            this.buttonUp.Location = new System.Drawing.Point(825, 471);
+            this.buttonUp.Location = new System.Drawing.Point(722, 353);
-            this.buttonUp.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.buttonUp.Name = "buttonUp";
-            this.buttonUp.Size = new System.Drawing.Size(34, 40);
+            this.buttonUp.Size = new System.Drawing.Size(30, 30);
             this.buttonUp.TabIndex = 0;
             this.buttonUp.UseVisualStyleBackColor = true;
             this.buttonUp.Click += new System.EventHandler(this.ButtonMove_Click);
@@ -62,10 +61,9 @@
             this.buttonLeft.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.buttonLeft.BackgroundImage = global::HoistingCrane.Properties.Resources.left;
             this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
-            this.buttonLeft.Location = new System.Drawing.Point(784, 519);
+            this.buttonLeft.Location = new System.Drawing.Point(686, 389);
-            this.buttonLeft.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.buttonLeft.Name = "buttonLeft";
-            this.buttonLeft.Size = new System.Drawing.Size(34, 40);
+            this.buttonLeft.Size = new System.Drawing.Size(30, 30);
             this.buttonLeft.TabIndex = 1;
             this.buttonLeft.UseVisualStyleBackColor = true;
             this.buttonLeft.Click += new System.EventHandler(this.ButtonMove_Click);
@@ -75,10 +73,9 @@
             this.buttonRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.buttonRight.BackgroundImage = global::HoistingCrane.Properties.Resources.right;
             this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
-            this.buttonRight.Location = new System.Drawing.Point(866, 519);
+            this.buttonRight.Location = new System.Drawing.Point(758, 389);
-            this.buttonRight.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.buttonRight.Name = "buttonRight";
-            this.buttonRight.Size = new System.Drawing.Size(34, 40);
+            this.buttonRight.Size = new System.Drawing.Size(30, 30);
             this.buttonRight.TabIndex = 2;
             this.buttonRight.UseVisualStyleBackColor = true;
             this.buttonRight.Click += new System.EventHandler(this.ButtonMove_Click);
@@ -88,10 +85,9 @@
             this.buttonDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.buttonDown.BackgroundImage = global::HoistingCrane.Properties.Resources.down;
             this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
-            this.buttonDown.Location = new System.Drawing.Point(825, 519);
+            this.buttonDown.Location = new System.Drawing.Point(722, 389);
-            this.buttonDown.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.buttonDown.Name = "buttonDown";
-            this.buttonDown.Size = new System.Drawing.Size(34, 40);
+            this.buttonDown.Size = new System.Drawing.Size(30, 30);
             this.buttonDown.TabIndex = 3;
             this.buttonDown.UseVisualStyleBackColor = true;
             this.buttonDown.Click += new System.EventHandler(this.ButtonMove_Click);
@@ -99,10 +95,9 @@
             // 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(14, 524);
+            this.buttonCreate.Location = new System.Drawing.Point(12, 393);
-            this.buttonCreate.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.buttonCreate.Name = "buttonCreate";
-            this.buttonCreate.Size = new System.Drawing.Size(86, 31);
+            this.buttonCreate.Size = new System.Drawing.Size(75, 23);
             this.buttonCreate.TabIndex = 4;
             this.buttonCreate.Text = "Создать";
             this.buttonCreate.UseVisualStyleBackColor = true;
@@ -110,75 +105,71 @@
             // 
             // statusStrip
             // 
-            this.statusStrip.ImageScalingSize = new System.Drawing.Size(20, 20);
             this.statusStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.toolStripStatusLabelSpeed,
             this.toolStripStatusLabelWeight,
             this.toolStripStatusLabelBodyColor});
-            this.statusStrip.Location = new System.Drawing.Point(0, 574);
+            this.statusStrip.Location = new System.Drawing.Point(0, 428);
             this.statusStrip.Name = "statusStrip";
-            this.statusStrip.Padding = new System.Windows.Forms.Padding(1, 0, 16, 0);
+            this.statusStrip.Size = new System.Drawing.Size(800, 22);
-            this.statusStrip.Size = new System.Drawing.Size(914, 26);
             this.statusStrip.TabIndex = 5;
             this.statusStrip.Text = "statusStrip";
             // 
             // toolStripStatusLabelSpeed
             // 
             this.toolStripStatusLabelSpeed.Name = "toolStripStatusLabelSpeed";
-            this.toolStripStatusLabelSpeed.Size = new System.Drawing.Size(76, 20);
+            this.toolStripStatusLabelSpeed.Size = new System.Drawing.Size(62, 17);
             this.toolStripStatusLabelSpeed.Text = "Скорость:";
             // 
             // toolStripStatusLabelWeight
             // 
             this.toolStripStatusLabelWeight.Name = "toolStripStatusLabelWeight";
-            this.toolStripStatusLabelWeight.Size = new System.Drawing.Size(36, 20);
+            this.toolStripStatusLabelWeight.Size = new System.Drawing.Size(29, 17);
             this.toolStripStatusLabelWeight.Text = "Вес:";
             // 
             // toolStripStatusLabelBodyColor
             // 
             this.toolStripStatusLabelBodyColor.Name = "toolStripStatusLabelBodyColor";
-            this.toolStripStatusLabelBodyColor.Size = new System.Drawing.Size(45, 20);
+            this.toolStripStatusLabelBodyColor.Size = new System.Drawing.Size(36, 17);
             this.toolStripStatusLabelBodyColor.Text = "Цвет:";
             // 
             // pictureBoxHoistingCrane
             // 
             this.pictureBoxHoistingCrane.Dock = System.Windows.Forms.DockStyle.Fill;
             this.pictureBoxHoistingCrane.Location = new System.Drawing.Point(0, 0);
-            this.pictureBoxHoistingCrane.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.pictureBoxHoistingCrane.Name = "pictureBoxHoistingCrane";
-            this.pictureBoxHoistingCrane.Size = new System.Drawing.Size(914, 574);
+            this.pictureBoxHoistingCrane.Size = new System.Drawing.Size(800, 428);
             this.pictureBoxHoistingCrane.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
             this.pictureBoxHoistingCrane.TabIndex = 6;
             this.pictureBoxHoistingCrane.TabStop = false;
+            this.pictureBoxHoistingCrane.Click += new System.EventHandler(this.pictureBoxHoistingCrane_Click);
             this.pictureBoxHoistingCrane.Resize += new System.EventHandler(this.PictureBoxHoistingCrane_Resize);
             // 
             // buttonCreateModify
             // 
             this.buttonCreateModify.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.buttonCreateModify.Location = new System.Drawing.Point(106, 524);
+            this.buttonCreateModify.Location = new System.Drawing.Point(93, 393);
-            this.buttonCreateModify.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.buttonCreateModify.Name = "buttonCreateModify";
-            this.buttonCreateModify.Size = new System.Drawing.Size(129, 31);
+            this.buttonCreateModify.Size = new System.Drawing.Size(100, 23);
             this.buttonCreateModify.TabIndex = 7;
             this.buttonCreateModify.Text = "Модификация";
-            this.buttonCreateModify.UseVisualStyleBackColor = true;
+
-            // 
+            this.buttonSelect.Location = new System.Drawing.Point(551, 390);
-            // buttonSelect
-            // 
-            this.buttonSelect.Location = new System.Drawing.Point(630, 520);
-            this.buttonSelect.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.buttonSelect.Name = "buttonSelect";
-            this.buttonSelect.Size = new System.Drawing.Size(86, 31);
+            this.buttonSelect.Size = new System.Drawing.Size(75, 23);
             this.buttonSelect.TabIndex = 8;
             this.buttonSelect.Text = "Выбрать";
             this.buttonSelect.UseVisualStyleBackColor = true;
             this.buttonSelect.Click += new System.EventHandler(this.ButtonSelect_Click);
             // 
+            this.buttonCreateModify.UseVisualStyleBackColor = true;
+            this.buttonCreateModify.Click += new System.EventHandler(this.ButtonCreateModify_Click);
+            // 
             // FormHoistingCrane
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(914, 600);
+            this.ClientSize = new System.Drawing.Size(800, 450);
             this.Controls.Add(this.buttonSelect);
             this.Controls.Add(this.buttonCreateModify);
             this.Controls.Add(this.buttonCreate);
@@ -188,7 +179,6 @@
             this.Controls.Add(this.buttonUp);
             this.Controls.Add(this.pictureBoxHoistingCrane);
             this.Controls.Add(this.statusStrip);
-            this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.Name = "FormHoistingCrane";
             this.Text = "Подъёмный кран";
             this.statusStrip.ResumeLayout(false);

HoistingCrane/HoistingCrane/FormHoistingCrane.cs

@@ -8,6 +8,7 @@
         {
             InitializeComponent();
         }
+
         private void Draw()
         {
             Bitmap bmp = new(pictureBoxHoistingCrane.Width, pictureBoxHoistingCrane.Height);
@@ -15,6 +16,7 @@
             _HoistingCrane?.DrawTransport(gr);
             pictureBoxHoistingCrane.Image = bmp;
         }
+
         private void SetData()
         {
             Random rnd = new();
@@ -23,6 +25,7 @@
             toolStripStatusLabelWeight.Text = $"Вес: {_HoistingCrane.HoistingCrane.Weight}";
             toolStripStatusLabelBodyColor.Text = $"Цвет:{_HoistingCrane.HoistingCrane.BodyColor.Name}";
         }
+
         private void ButtonCreate_Click(object sender, EventArgs e)
         {
             Random rnd = new();
@@ -37,6 +40,7 @@
             SetData();
             Draw();
         }
+
         private void ButtonMove_Click(object sender, EventArgs e)
         {
             string name = ((Button)sender)?.Name ?? string.Empty;
@@ -57,21 +61,40 @@
             }
             Draw();
         }
+
         private void PictureBoxHoistingCrane_Resize(object sender, EventArgs e)
         {
             _HoistingCrane?.ChangeBorders(pictureBoxHoistingCrane.Width, pictureBoxHoistingCrane.Height);
             Draw();
         }
-        /// <summary>
+
-        /// Èçìåíåíèå ðàçìåðîâ ôîðìû
+        private void ButtonCreateModify_Click(object sender, EventArgs e)
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void pictureBoxHoistingCrane_Resize(object sender, EventArgs e)
         {
-            _HoistingCrane?.ChangeBorders(pictureBoxHoistingCrane.Width, pictureBoxHoistingCrane.Height);
+            Random rnd = new();
+            Color selectedColor = Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256),
+          rnd.Next(0, 256));
+            ColorDialog dialog = new();
+            if (dialog.ShowDialog() == DialogResult.OK)
+            {
+                selectedColor = dialog.Color;
+            }
+            Color advancedSelectedColor = Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256),
+          rnd.Next(0, 256));
+            ColorDialog dialogDop = new();
+            if (dialogDop.ShowDialog() == DialogResult.OK)
+            {
+                advancedSelectedColor = dialogDop.Color;
+            }
+            _HoistingCrane = new DrawingAdvancedHoistingCrane(rnd.Next(30, 100), rnd.Next(300, 500),
+                selectedColor, advancedSelectedColor, Convert.ToBoolean(rnd.Next(0, 2)), Convert.ToBoolean(rnd.Next(0, 2)));
+            SetData();
             Draw();
         }
+
+        private void pictureBoxHoistingCrane_Click(object sender, EventArgs e)
+        {
+
+        }
         private void ButtonSelect_Click(object sender, EventArgs e)
         {
             SelectedHoistingCrane = _HoistingCrane;

HoistingCrane/HoistingCrane/FormHoistingCrane.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="statusStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
-</root>

HoistingCrane/HoistingCrane/FormHoistingCraneConfig.Designer.cs

@@ -1,410 +0,0 @@
-namespace HoistingCrane
-{
-    partial class FormHoistingCraneConfig
-    {
-        /// <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.groupBoxConfig = new System.Windows.Forms.GroupBox();
-            this.labelModifiedObject = new System.Windows.Forms.Label();
-            this.labelSimpleObject = new System.Windows.Forms.Label();
-            this.groupBoxColors = new System.Windows.Forms.GroupBox();
-            this.panelPurple = new System.Windows.Forms.Panel();
-            this.panelYellow = new System.Windows.Forms.Panel();
-            this.panelBlack = new System.Windows.Forms.Panel();
-            this.panelBlue = new System.Windows.Forms.Panel();
-            this.panelGray = new System.Windows.Forms.Panel();
-            this.panelGreen = new System.Windows.Forms.Panel();
-            this.panelWhite = new System.Windows.Forms.Panel();
-            this.panelRed = new System.Windows.Forms.Panel();
-            this.checkBoxCounterweight = new System.Windows.Forms.CheckBox();
-            this.checkBoxCrane = new System.Windows.Forms.CheckBox();
-            this.numericUpDownWeight = new System.Windows.Forms.NumericUpDown();
-            this.labelWeight = new System.Windows.Forms.Label();
-            this.numericUpDownSpeed = new System.Windows.Forms.NumericUpDown();
-            this.labelSpeed = new System.Windows.Forms.Label();
-            this.panelObject = new System.Windows.Forms.Panel();
-            this.labelDopColor = new System.Windows.Forms.Label();
-            this.labelBaseColor = new System.Windows.Forms.Label();
-            this.pictureBoxObject = new System.Windows.Forms.PictureBox();
-            this.buttonCancel = new System.Windows.Forms.Button();
-            this.buttonOk = new System.Windows.Forms.Button();
-            this.groupBoxConfig.SuspendLayout();
-            this.groupBoxColors.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.numericUpDownWeight)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.numericUpDownSpeed)).BeginInit();
-            this.panelObject.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxObject)).BeginInit();
-            this.SuspendLayout();
-            // 
-            // groupBoxConfig
-            // 
-            this.groupBoxConfig.Controls.Add(this.labelModifiedObject);
-            this.groupBoxConfig.Controls.Add(this.labelSimpleObject);
-            this.groupBoxConfig.Controls.Add(this.groupBoxColors);
-            this.groupBoxConfig.Controls.Add(this.checkBoxCounterweight);
-            this.groupBoxConfig.Controls.Add(this.checkBoxCrane);
-            this.groupBoxConfig.Controls.Add(this.numericUpDownWeight);
-            this.groupBoxConfig.Controls.Add(this.labelWeight);
-            this.groupBoxConfig.Controls.Add(this.numericUpDownSpeed);
-            this.groupBoxConfig.Controls.Add(this.labelSpeed);
-            this.groupBoxConfig.Location = new System.Drawing.Point(14, 16);
-            this.groupBoxConfig.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.groupBoxConfig.Name = "groupBoxConfig";
-            this.groupBoxConfig.Padding = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.groupBoxConfig.Size = new System.Drawing.Size(594, 293);
-            this.groupBoxConfig.TabIndex = 0;
-            this.groupBoxConfig.TabStop = false;
-            this.groupBoxConfig.Text = "Параметры";
-            // 
-            // labelModifiedObject
-            // 
-            this.labelModifiedObject.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.labelModifiedObject.Location = new System.Drawing.Point(450, 216);
-            this.labelModifiedObject.Name = "labelModifiedObject";
-            this.labelModifiedObject.Size = new System.Drawing.Size(111, 50);
-            this.labelModifiedObject.TabIndex = 16;
-            this.labelModifiedObject.Text = "Продвинутый";
-            this.labelModifiedObject.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            this.labelModifiedObject.MouseDown += new System.Windows.Forms.MouseEventHandler(this.LabelObject_MouseDown);
-            // 
-            // labelSimpleObject
-            // 
-            this.labelSimpleObject.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.labelSimpleObject.Location = new System.Drawing.Point(322, 216);
-            this.labelSimpleObject.Name = "labelSimpleObject";
-            this.labelSimpleObject.Size = new System.Drawing.Size(111, 50);
-            this.labelSimpleObject.TabIndex = 15;
-            this.labelSimpleObject.Text = "Простой";
-            this.labelSimpleObject.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            this.labelSimpleObject.MouseDown += new System.Windows.Forms.MouseEventHandler(this.LabelObject_MouseDown);
-            // 
-            // groupBoxColors
-            // 
-            this.groupBoxColors.Controls.Add(this.panelPurple);
-            this.groupBoxColors.Controls.Add(this.panelYellow);
-            this.groupBoxColors.Controls.Add(this.panelBlack);
-            this.groupBoxColors.Controls.Add(this.panelBlue);
-            this.groupBoxColors.Controls.Add(this.panelGray);
-            this.groupBoxColors.Controls.Add(this.panelGreen);
-            this.groupBoxColors.Controls.Add(this.panelWhite);
-            this.groupBoxColors.Controls.Add(this.panelRed);
-            this.groupBoxColors.Location = new System.Drawing.Point(305, 29);
-            this.groupBoxColors.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.groupBoxColors.Name = "groupBoxColors";
-            this.groupBoxColors.Padding = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.groupBoxColors.Size = new System.Drawing.Size(275, 169);
-            this.groupBoxColors.TabIndex = 14;
-            this.groupBoxColors.TabStop = false;
-            this.groupBoxColors.Text = "Цвета";
-            // 
-            // panelPurple
-            // 
-            this.panelPurple.BackColor = System.Drawing.Color.Purple;
-            this.panelPurple.Location = new System.Drawing.Point(210, 97);
-            this.panelPurple.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.panelPurple.Name = "panelPurple";
-            this.panelPurple.Size = new System.Drawing.Size(46, 53);
-            this.panelPurple.TabIndex = 3;
-            this.panelPurple.MouseDown += new System.Windows.Forms.MouseEventHandler(this.PanelColor_MouseDown);
-            // 
-            // panelYellow
-            // 
-            this.panelYellow.BackColor = System.Drawing.Color.Yellow;
-            this.panelYellow.Location = new System.Drawing.Point(210, 29);
-            this.panelYellow.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.panelYellow.Name = "panelYellow";
-            this.panelYellow.Size = new System.Drawing.Size(46, 53);
-            this.panelYellow.TabIndex = 1;
-            this.panelYellow.MouseDown += new System.Windows.Forms.MouseEventHandler(this.PanelColor_MouseDown);
-            // 
-            // panelBlack
-            // 
-            this.panelBlack.BackColor = System.Drawing.Color.Black;
-            this.panelBlack.Location = new System.Drawing.Point(145, 97);
-            this.panelBlack.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.panelBlack.Name = "panelBlack";
-            this.panelBlack.Size = new System.Drawing.Size(46, 53);
-            this.panelBlack.TabIndex = 4;
-            this.panelBlack.MouseDown += new System.Windows.Forms.MouseEventHandler(this.PanelColor_MouseDown);
-            // 
-            // panelBlue
-            // 
-            this.panelBlue.BackColor = System.Drawing.Color.Blue;
-            this.panelBlue.Location = new System.Drawing.Point(145, 29);
-            this.panelBlue.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.panelBlue.Name = "panelBlue";
-            this.panelBlue.Size = new System.Drawing.Size(46, 53);
-            this.panelBlue.TabIndex = 1;
-            this.panelBlue.MouseDown += new System.Windows.Forms.MouseEventHandler(this.PanelColor_MouseDown);
-            // 
-            // panelGray
-            // 
-            this.panelGray.BackColor = System.Drawing.Color.Gray;
-            this.panelGray.Location = new System.Drawing.Point(82, 97);
-            this.panelGray.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.panelGray.Name = "panelGray";
-            this.panelGray.Size = new System.Drawing.Size(46, 53);
-            this.panelGray.TabIndex = 5;
-            this.panelGray.MouseDown += new System.Windows.Forms.MouseEventHandler(this.PanelColor_MouseDown);
-            // 
-            // panelGreen
-            // 
-            this.panelGreen.BackColor = System.Drawing.Color.Green;
-            this.panelGreen.Location = new System.Drawing.Point(82, 29);
-            this.panelGreen.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.panelGreen.Name = "panelGreen";
-            this.panelGreen.Size = new System.Drawing.Size(46, 53);
-            this.panelGreen.TabIndex = 1;
-            this.panelGreen.MouseDown += new System.Windows.Forms.MouseEventHandler(this.PanelColor_MouseDown);
-            // 
-            // panelWhite
-            // 
-            this.panelWhite.BackColor = System.Drawing.Color.White;
-            this.panelWhite.Location = new System.Drawing.Point(17, 97);
-            this.panelWhite.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.panelWhite.Name = "panelWhite";
-            this.panelWhite.Size = new System.Drawing.Size(46, 53);
-            this.panelWhite.TabIndex = 2;
-            this.panelWhite.MouseDown += new System.Windows.Forms.MouseEventHandler(this.PanelColor_MouseDown);
-            // 
-            // panelRed
-            // 
-            this.panelRed.BackColor = System.Drawing.Color.Red;
-            this.panelRed.Location = new System.Drawing.Point(17, 29);
-            this.panelRed.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.panelRed.Name = "panelRed";
-            this.panelRed.Size = new System.Drawing.Size(46, 53);
-            this.panelRed.TabIndex = 0;
-            this.panelRed.MouseDown += new System.Windows.Forms.MouseEventHandler(this.PanelColor_MouseDown);
-            // 
-            // checkBoxCounterweight
-            // 
-            this.checkBoxCounterweight.AutoSize = true;
-            this.checkBoxCounterweight.Location = new System.Drawing.Point(25, 247);
-            this.checkBoxCounterweight.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.checkBoxCounterweight.Name = "checkBoxCounterweight";
-            this.checkBoxCounterweight.Size = new System.Drawing.Size(248, 24);
-            this.checkBoxCounterweight.TabIndex = 13;
-            this.checkBoxCounterweight.Text = "Признак наличия противовеса";
-            this.checkBoxCounterweight.UseVisualStyleBackColor = true;
-            // 
-            // checkBoxCrane
-            // 
-            this.checkBoxCrane.AutoSize = true;
-            this.checkBoxCrane.Location = new System.Drawing.Point(25, 199);
-            this.checkBoxCrane.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.checkBoxCrane.Name = "checkBoxCrane";
-            this.checkBoxCrane.Size = new System.Drawing.Size(199, 24);
-            this.checkBoxCrane.TabIndex = 12;
-            this.checkBoxCrane.Text = "Признак наличия крана";
-            this.checkBoxCrane.UseVisualStyleBackColor = true;
-            // 
-            // numericUpDownWeight
-            // 
-            this.numericUpDownWeight.Location = new System.Drawing.Point(103, 96);
-            this.numericUpDownWeight.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.numericUpDownWeight.Maximum = new decimal(new int[] {
-            1000,
-            0,
-            0,
-            0});
-            this.numericUpDownWeight.Minimum = new decimal(new int[] {
-            100,
-            0,
-            0,
-            0});
-            this.numericUpDownWeight.Name = "numericUpDownWeight";
-            this.numericUpDownWeight.Size = new System.Drawing.Size(90, 27);
-            this.numericUpDownWeight.TabIndex = 10;
-            this.numericUpDownWeight.Value = new decimal(new int[] {
-            100,
-            0,
-            0,
-            0});
-            // 
-            // labelWeight
-            // 
-            this.labelWeight.AutoSize = true;
-            this.labelWeight.Location = new System.Drawing.Point(25, 99);
-            this.labelWeight.Name = "labelWeight";
-            this.labelWeight.Size = new System.Drawing.Size(36, 20);
-            this.labelWeight.TabIndex = 9;
-            this.labelWeight.Text = "Вес:";
-            // 
-            // numericUpDownSpeed
-            // 
-            this.numericUpDownSpeed.Location = new System.Drawing.Point(103, 40);
-            this.numericUpDownSpeed.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.numericUpDownSpeed.Maximum = new decimal(new int[] {
-            1000,
-            0,
-            0,
-            0});
-            this.numericUpDownSpeed.Minimum = new decimal(new int[] {
-            100,
-            0,
-            0,
-            0});
-            this.numericUpDownSpeed.Name = "numericUpDownSpeed";
-            this.numericUpDownSpeed.Size = new System.Drawing.Size(90, 27);
-            this.numericUpDownSpeed.TabIndex = 8;
-            this.numericUpDownSpeed.Value = new decimal(new int[] {
-            100,
-            0,
-            0,
-            0});
-            // 
-            // labelSpeed
-            // 
-            this.labelSpeed.AutoSize = true;
-            this.labelSpeed.Location = new System.Drawing.Point(25, 43);
-            this.labelSpeed.Name = "labelSpeed";
-            this.labelSpeed.Size = new System.Drawing.Size(76, 20);
-            this.labelSpeed.TabIndex = 7;
-            this.labelSpeed.Text = "Скорость:";
-            // 
-            // panelObject
-            // 
-            this.panelObject.AllowDrop = true;
-            this.panelObject.Controls.Add(this.labelDopColor);
-            this.panelObject.Controls.Add(this.labelBaseColor);
-            this.panelObject.Controls.Add(this.pictureBoxObject);
-            this.panelObject.Location = new System.Drawing.Point(615, 16);
-            this.panelObject.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.panelObject.Name = "panelObject";
-            this.panelObject.Size = new System.Drawing.Size(299, 245);
-            this.panelObject.TabIndex = 2;
-            this.panelObject.DragDrop += new System.Windows.Forms.DragEventHandler(this.PanelObject_DragDrop);
-            this.panelObject.DragEnter += new System.Windows.Forms.DragEventHandler(this.PanelObject_DragEnter);
-            // 
-            // labelDopColor
-            // 
-            this.labelDopColor.AllowDrop = true;
-            this.labelDopColor.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.labelDopColor.Location = new System.Drawing.Point(161, 12);
-            this.labelDopColor.Name = "labelDopColor";
-            this.labelDopColor.Size = new System.Drawing.Size(119, 42);
-            this.labelDopColor.TabIndex = 2;
-            this.labelDopColor.Text = "Доп. цвет";
-            this.labelDopColor.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            this.labelDopColor.DragDrop += new System.Windows.Forms.DragEventHandler(this.LabelDopColor_DragDrop);
-            this.labelDopColor.DragEnter += new System.Windows.Forms.DragEventHandler(this.LabelColor_DragEnter);
-            // 
-            // labelBaseColor
-            // 
-            this.labelBaseColor.AllowDrop = true;
-            this.labelBaseColor.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.labelBaseColor.Location = new System.Drawing.Point(23, 12);
-            this.labelBaseColor.Name = "labelBaseColor";
-            this.labelBaseColor.Size = new System.Drawing.Size(119, 42);
-            this.labelBaseColor.TabIndex = 1;
-            this.labelBaseColor.Text = "Цвет";
-            this.labelBaseColor.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            this.labelBaseColor.DragDrop += new System.Windows.Forms.DragEventHandler(this.LabelBaseColor_DragDrop);
-            this.labelBaseColor.DragEnter += new System.Windows.Forms.DragEventHandler(this.LabelColor_DragEnter);
-            // 
-            // pictureBoxObject
-            // 
-            this.pictureBoxObject.Location = new System.Drawing.Point(23, 59);
-            this.pictureBoxObject.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.pictureBoxObject.Name = "pictureBoxObject";
-            this.pictureBoxObject.Size = new System.Drawing.Size(257, 167);
-            this.pictureBoxObject.TabIndex = 0;
-            this.pictureBoxObject.TabStop = false;
-            // 
-            // buttonCancel
-            // 
-            this.buttonCancel.Location = new System.Drawing.Point(776, 269);
-            this.buttonCancel.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.buttonCancel.Name = "buttonCancel";
-            this.buttonCancel.Size = new System.Drawing.Size(119, 40);
-            this.buttonCancel.TabIndex = 5;
-            this.buttonCancel.Text = "Отмена";
-            this.buttonCancel.UseVisualStyleBackColor = true;
-            // 
-            // buttonOk
-            // 
-            this.buttonOk.Location = new System.Drawing.Point(638, 269);
-            this.buttonOk.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.buttonOk.Name = "buttonOk";
-            this.buttonOk.Size = new System.Drawing.Size(119, 40);
-            this.buttonOk.TabIndex = 4;
-            this.buttonOk.Text = "Добавить";
-            this.buttonOk.UseVisualStyleBackColor = true;
-            this.buttonOk.Click += new System.EventHandler(this.ButtonAddObject_Click);
-            // 
-            // FormHoistingCraneConfig
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(926, 323);
-            this.Controls.Add(this.buttonCancel);
-            this.Controls.Add(this.buttonOk);
-            this.Controls.Add(this.panelObject);
-            this.Controls.Add(this.groupBoxConfig);
-            this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.Name = "FormHoistingCraneConfig";
-            this.Text = "Создание объекта";
-            this.groupBoxConfig.ResumeLayout(false);
-            this.groupBoxConfig.PerformLayout();
-            this.groupBoxColors.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.numericUpDownWeight)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.numericUpDownSpeed)).EndInit();
-            this.panelObject.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxObject)).EndInit();
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-
-        private GroupBox groupBoxConfig;
-        private CheckBox checkBoxCounterweight;
-        private CheckBox checkBoxCrane;
-        private NumericUpDown numericUpDownWeight;
-        private Label labelWeight;
-        private NumericUpDown numericUpDownSpeed;
-        private Label labelSpeed;
-        private Label labelModifiedObject;
-        private Label labelSimpleObject;
-        private GroupBox groupBoxColors;
-        private Panel panelPurple;
-        private Panel panelYellow;
-        private Panel panelBlack;
-        private Panel panelBlue;
-        private Panel panelGray;
-        private Panel panelGreen;
-        private Panel panelWhite;
-        private Panel panelRed;
-        private Panel panelObject;
-        private Label labelDopColor;
-        private Label labelBaseColor;
-        private PictureBox pictureBoxObject;
-        private Button buttonCancel;
-        private Button buttonOk;
-    }
-}

HoistingCrane/HoistingCrane/FormHoistingCraneConfig.resx

@@ -1,4 +1,64 @@
-<root>
+<?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">

HoistingCrane/HoistingCrane/FormMap.cs

@@ -0,0 +1,88 @@
+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 HoistingCrane
+{
+    public partial class FormMap : Form
+    {
+        private AbstractMap _abstractMap;
+        public FormMap()
+        {
+            InitializeComponent();
+            _abstractMap = new SimpleMap();
+            _abstractMap = new SecondMap();
+        }
+
+        private void SetData(DrawingHoistingCrane hoistingCrane)
+        {
+            toolStripStatusLabelSpeed.Text = $"Скорость: {hoistingCrane.HoistingCrane.Speed}";
+            toolStripStatusLabelWeight.Text = $"Вес: {hoistingCrane.HoistingCrane.Weight}";
+            toolStripStatusLabelBodyColor.Text = $"Цвет:{hoistingCrane.HoistingCrane.BodyColor.Name}";
+            pictureBoxHoistingCrane.Image = _abstractMap.CreateMap(pictureBoxHoistingCrane.Width,
+            pictureBoxHoistingCrane.Height, new DrawingObjectHoistingCrane(hoistingCrane));
+        }
+
+        private void ButtonCreate_Click(object sender, EventArgs e)
+        {
+            Random rnd = new();
+            var hoistingCrane = new DrawingHoistingCrane(rnd.Next(30, 100), rnd.Next(300, 500),
+                Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)));
+            SetData(bulldozer);
+        }
+
+        private void ButtonMove_Click(object sender, EventArgs e)
+        {
+            string name = ((Button)sender)?.Name ?? string.Empty;
+            Direction dir = Direction.None;
+            switch (name)
+            {
+                case "buttonUp":
+                    dir = Direction.Up;
+                    break;
+                case "buttonDown":
+                    dir = Direction.Down;
+                    break;
+                case "buttonLeft":
+                    dir = Direction.Left;
+                    break;
+                case "buttonRight":
+                    dir = Direction.Right;
+                    break;
+            }
+            pictureBoxHoistingCrane.Image = _abstractMap.MoveObject(dir);
+        }
+        private void ButtonCreateModify_Click(object sender, EventArgs e)
+        {
+            Random rnd = new();
+            var hoistingCrane = new DrawingAdvancedHoistingCrane(rnd.Next(30, 100), rnd.Next(300, 500),
+                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(hoistingCrane);
+        }
+
+        private void ComboBoxSelectorMap_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            switch (comboBoxSelectorMap.Text)
+            {
+                case "Простая карта":
+                    _abstractMap = new SimpleMap();
+                    break;
+                case "Вторая карта":
+                    _abstractMap = new SecondMap();
+                    break;
+            }
+        }
+
+        private void pictureBoxHoistingCrane_Click(object sender, EventArgs e)
+        {
+
+        }
+    }
+}

HoistingCrane/HoistingCrane/FormMapWithSetHoistingCrane.Designer.cs

@@ -31,12 +31,6 @@
         /// </summary>
         private void InitializeComponent()
         {
-            this.groupBoxMaps = new System.Windows.Forms.GroupBox();
-            this.buttonDeleteMap = new System.Windows.Forms.Button();
-            this.listBoxMaps = new System.Windows.Forms.ListBox();
-            this.buttonAddMap = new System.Windows.Forms.Button();
-            this.comboBoxSelectorMap = new System.Windows.Forms.ComboBox();
-            this.textBoxNewMapName = new System.Windows.Forms.TextBox();
             this.groupBoxTools = new System.Windows.Forms.GroupBox();
             this.maskedTextBoxPosition = new System.Windows.Forms.MaskedTextBox();
             this.buttonRemoveHoistingCrane = new System.Windows.Forms.Button();
@@ -47,92 +41,14 @@
             this.buttonUp = new System.Windows.Forms.Button();
             this.buttonShowOnMap = new System.Windows.Forms.Button();
             this.buttonAddHoistingCrane = new System.Windows.Forms.Button();
+            this.comboBoxSelectorMap = new System.Windows.Forms.ComboBox();
             this.pictureBox = new System.Windows.Forms.PictureBox();
-            this.menuStrip = new System.Windows.Forms.MenuStrip();
-            this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.saveToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.loadToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.openFileDialog = new System.Windows.Forms.OpenFileDialog();
-            this.saveFileDialog = new System.Windows.Forms.SaveFileDialog();
-            this.groupBoxMaps.SuspendLayout();
             this.groupBoxTools.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).BeginInit();
-            this.menuStrip.SuspendLayout();
             this.SuspendLayout();
             // 
-            // groupBoxMaps
-            // 
-            this.groupBoxMaps.Controls.Add(this.buttonDeleteMap);
-            this.groupBoxMaps.Controls.Add(this.listBoxMaps);
-            this.groupBoxMaps.Controls.Add(this.buttonAddMap);
-            this.groupBoxMaps.Controls.Add(this.comboBoxSelectorMap);
-            this.groupBoxMaps.Controls.Add(this.textBoxNewMapName);
-            this.groupBoxMaps.Location = new System.Drawing.Point(13, 28);
-            this.groupBoxMaps.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.groupBoxMaps.Name = "groupBoxMaps";
-            this.groupBoxMaps.Padding = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.groupBoxMaps.Size = new System.Drawing.Size(229, 326);
-            this.groupBoxMaps.TabIndex = 11;
-            this.groupBoxMaps.TabStop = false;
-            this.groupBoxMaps.Text = "Карты";
-            // 
-            // buttonDeleteMap
-            // 
-            this.buttonDeleteMap.Location = new System.Drawing.Point(7, 271);
-            this.buttonDeleteMap.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.buttonDeleteMap.Name = "buttonDeleteMap";
-            this.buttonDeleteMap.Size = new System.Drawing.Size(200, 47);
-            this.buttonDeleteMap.TabIndex = 5;
-            this.buttonDeleteMap.Text = "Удалить карту";
-            this.buttonDeleteMap.UseVisualStyleBackColor = true;
-            this.buttonDeleteMap.Click += new System.EventHandler(this.buttonDeleteMap_Click);
-            // 
-            // listBoxMaps
-            // 
-            this.listBoxMaps.FormattingEnabled = true;
-            this.listBoxMaps.ItemHeight = 20;
-            this.listBoxMaps.Location = new System.Drawing.Point(7, 157);
-            this.listBoxMaps.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.listBoxMaps.Name = "listBoxMaps";
-            this.listBoxMaps.Size = new System.Drawing.Size(199, 104);
-            this.listBoxMaps.TabIndex = 4;
-            this.listBoxMaps.SelectedIndexChanged += new System.EventHandler(this.ListBoxMaps_SelectedIndexChanged);
-            // 
-            // buttonAddMap
-            // 
-            this.buttonAddMap.Location = new System.Drawing.Point(7, 107);
-            this.buttonAddMap.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.buttonAddMap.Name = "buttonAddMap";
-            this.buttonAddMap.Size = new System.Drawing.Size(200, 43);
-            this.buttonAddMap.TabIndex = 3;
-            this.buttonAddMap.Text = "Добавить карту";
-            this.buttonAddMap.UseVisualStyleBackColor = true;
-            this.buttonAddMap.Click += new System.EventHandler(this.buttonAddMap_Click_1);
-            // 
-            // comboBoxSelectorMap
-            // 
-            this.comboBoxSelectorMap.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.comboBoxSelectorMap.FormattingEnabled = true;
-            this.comboBoxSelectorMap.Items.AddRange(new object[] {
-            "Простая карта",
-            "Моя вторая карта"});
-            this.comboBoxSelectorMap.Location = new System.Drawing.Point(7, 68);
-            this.comboBoxSelectorMap.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.comboBoxSelectorMap.Name = "comboBoxSelectorMap";
-            this.comboBoxSelectorMap.Size = new System.Drawing.Size(200, 28);
-            this.comboBoxSelectorMap.TabIndex = 0;
-            // 
-            // textBoxNewMapName
-            // 
-            this.textBoxNewMapName.Location = new System.Drawing.Point(7, 29);
-            this.textBoxNewMapName.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.textBoxNewMapName.Name = "textBoxNewMapName";
-            this.textBoxNewMapName.Size = new System.Drawing.Size(200, 27);
-            this.textBoxNewMapName.TabIndex = 0;
-            // 
             // groupBoxTools
             // 
-            this.groupBoxTools.Controls.Add(this.groupBoxMaps);
             this.groupBoxTools.Controls.Add(this.maskedTextBoxPosition);
             this.groupBoxTools.Controls.Add(this.buttonRemoveHoistingCrane);
             this.groupBoxTools.Controls.Add(this.buttonShowStorage);
@@ -142,32 +58,29 @@
             this.groupBoxTools.Controls.Add(this.buttonUp);
             this.groupBoxTools.Controls.Add(this.buttonShowOnMap);
             this.groupBoxTools.Controls.Add(this.buttonAddHoistingCrane);
+            this.groupBoxTools.Controls.Add(this.comboBoxSelectorMap);
             this.groupBoxTools.Dock = System.Windows.Forms.DockStyle.Right;
-            this.groupBoxTools.Location = new System.Drawing.Point(927, 28);
+            this.groupBoxTools.Location = new System.Drawing.Point(811, 0);
-            this.groupBoxTools.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.groupBoxTools.Name = "groupBoxTools";
-            this.groupBoxTools.Padding = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.groupBoxTools.Size = new System.Drawing.Size(204, 554);
-            this.groupBoxTools.Size = new System.Drawing.Size(233, 754);
             this.groupBoxTools.TabIndex = 0;
             this.groupBoxTools.TabStop = false;
             this.groupBoxTools.Text = "Инструменты";
             // 
             // maskedTextBoxPosition
             // 
-            this.maskedTextBoxPosition.Location = new System.Drawing.Point(21, 436);
+            this.maskedTextBoxPosition.Location = new System.Drawing.Point(17, 166);
-            this.maskedTextBoxPosition.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.maskedTextBoxPosition.Mask = "00";
             this.maskedTextBoxPosition.Name = "maskedTextBoxPosition";
-            this.maskedTextBoxPosition.Size = new System.Drawing.Size(199, 27);
+            this.maskedTextBoxPosition.Size = new System.Drawing.Size(175, 23);
             this.maskedTextBoxPosition.TabIndex = 2;
             this.maskedTextBoxPosition.ValidatingType = typeof(int);
             // 
             // buttonRemoveHoistingCrane
             // 
-            this.buttonRemoveHoistingCrane.Location = new System.Drawing.Point(20, 471);
+            this.buttonRemoveHoistingCrane.Location = new System.Drawing.Point(17, 195);
-            this.buttonRemoveHoistingCrane.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.buttonRemoveHoistingCrane.Name = "buttonRemoveHoistingCrane";
-            this.buttonRemoveHoistingCrane.Size = new System.Drawing.Size(199, 47);
+            this.buttonRemoveHoistingCrane.Size = new System.Drawing.Size(175, 35);
             this.buttonRemoveHoistingCrane.TabIndex = 3;
             this.buttonRemoveHoistingCrane.Text = "Удалить подъёмный кран";
             this.buttonRemoveHoistingCrane.UseVisualStyleBackColor = true;
@@ -175,10 +88,9 @@
             // 
             // buttonShowStorage
             // 
-            this.buttonShowStorage.Location = new System.Drawing.Point(20, 526);
+            this.buttonShowStorage.Location = new System.Drawing.Point(17, 287);
-            this.buttonShowStorage.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.buttonShowStorage.Name = "buttonShowStorage";
-            this.buttonShowStorage.Size = new System.Drawing.Size(199, 47);
+            this.buttonShowStorage.Size = new System.Drawing.Size(175, 35);
             this.buttonShowStorage.TabIndex = 4;
             this.buttonShowStorage.Text = "Посмотреть хранилище";
             this.buttonShowStorage.UseVisualStyleBackColor = true;
@@ -189,10 +101,9 @@
             this.buttonDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.buttonDown.BackgroundImage = global::HoistingCrane.Properties.Resources.down;
             this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonDown.Location = new System.Drawing.Point(104, 687);
+            this.buttonDown.Location = new System.Drawing.Point(91, 504);
-            this.buttonDown.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.buttonDown.Name = "buttonDown";
-            this.buttonDown.Size = new System.Drawing.Size(34, 40);
+            this.buttonDown.Size = new System.Drawing.Size(30, 30);
             this.buttonDown.TabIndex = 10;
             this.buttonDown.UseVisualStyleBackColor = true;
             this.buttonDown.Click += new System.EventHandler(this.ButtonMove_Click);
@@ -202,10 +113,9 @@
             this.buttonRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.buttonRight.BackgroundImage = global::HoistingCrane.Properties.Resources.right;
             this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonRight.Location = new System.Drawing.Point(145, 687);
+            this.buttonRight.Location = new System.Drawing.Point(127, 504);
-            this.buttonRight.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.buttonRight.Name = "buttonRight";
-            this.buttonRight.Size = new System.Drawing.Size(34, 40);
+            this.buttonRight.Size = new System.Drawing.Size(30, 30);
             this.buttonRight.TabIndex = 9;
             this.buttonRight.UseVisualStyleBackColor = true;
             this.buttonRight.Click += new System.EventHandler(this.ButtonMove_Click);
@@ -215,10 +125,9 @@
             this.buttonLeft.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.buttonLeft.BackgroundImage = global::HoistingCrane.Properties.Resources.left;
             this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonLeft.Location = new System.Drawing.Point(63, 687);
+            this.buttonLeft.Location = new System.Drawing.Point(55, 504);
-            this.buttonLeft.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.buttonLeft.Name = "buttonLeft";
-            this.buttonLeft.Size = new System.Drawing.Size(34, 40);
+            this.buttonLeft.Size = new System.Drawing.Size(30, 30);
             this.buttonLeft.TabIndex = 8;
             this.buttonLeft.UseVisualStyleBackColor = true;
             this.buttonLeft.Click += new System.EventHandler(this.ButtonMove_Click);
@@ -228,20 +137,18 @@
             this.buttonUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.buttonUp.BackgroundImage = global::HoistingCrane.Properties.Resources.up;
             this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonUp.Location = new System.Drawing.Point(104, 639);
+            this.buttonUp.Location = new System.Drawing.Point(91, 468);
-            this.buttonUp.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.buttonUp.Name = "buttonUp";
-            this.buttonUp.Size = new System.Drawing.Size(34, 40);
+            this.buttonUp.Size = new System.Drawing.Size(30, 30);
             this.buttonUp.TabIndex = 7;
             this.buttonUp.UseVisualStyleBackColor = true;
             this.buttonUp.Click += new System.EventHandler(this.ButtonMove_Click);
             // 
             // buttonShowOnMap
             // 
-            this.buttonShowOnMap.Location = new System.Drawing.Point(21, 584);
+            this.buttonShowOnMap.Location = new System.Drawing.Point(17, 391);
-            this.buttonShowOnMap.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.buttonShowOnMap.Name = "buttonShowOnMap";
-            this.buttonShowOnMap.Size = new System.Drawing.Size(198, 47);
+            this.buttonShowOnMap.Size = new System.Drawing.Size(175, 35);
             this.buttonShowOnMap.TabIndex = 5;
             this.buttonShowOnMap.Text = "Посмотреть карту";
             this.buttonShowOnMap.UseVisualStyleBackColor = true;
@@ -249,84 +156,50 @@
             // 
             // buttonAddHoistingCrane
             // 
-            this.buttonAddHoistingCrane.Location = new System.Drawing.Point(20, 381);
+            this.buttonAddHoistingCrane.Location = new System.Drawing.Point(17, 106);
-            this.buttonAddHoistingCrane.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.buttonAddHoistingCrane.Name = "buttonAddWarship";
-            this.buttonAddHoistingCrane.Name = "buttonAddHoistingCrane";
+            this.buttonAddHoistingCrane.Size = new System.Drawing.Size(175, 35);
-            this.buttonAddHoistingCrane.Size = new System.Drawing.Size(199, 47);
             this.buttonAddHoistingCrane.TabIndex = 1;
             this.buttonAddHoistingCrane.Text = "Добавить подъёмный кран";
             this.buttonAddHoistingCrane.UseVisualStyleBackColor = true;
             this.buttonAddHoistingCrane.Click += new System.EventHandler(this.ButtonAddHoistingCrane_Click);
             // 
+            // comboBoxSelectorMap
+            // 
+            this.comboBoxSelectorMap.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.comboBoxSelectorMap.FormattingEnabled = true;
+            this.comboBoxSelectorMap.Items.AddRange(new object[] {
+            "Первая карта",
+            "Вторая карта"});
+            this.comboBoxSelectorMap.Location = new System.Drawing.Point(17, 32);
+            this.comboBoxSelectorMap.Name = "comboBoxSelectorMap";
+            this.comboBoxSelectorMap.Size = new System.Drawing.Size(175, 23);
+            this.comboBoxSelectorMap.TabIndex = 0;
+            this.comboBoxSelectorMap.SelectedIndexChanged += new System.EventHandler(this.ComboBoxSelectorMap_SelectedIndexChanged);
+            // 
             // pictureBox
             // 
             this.pictureBox.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.pictureBox.Location = new System.Drawing.Point(0, 28);
+            this.pictureBox.Location = new System.Drawing.Point(0, 0);
-            this.pictureBox.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.pictureBox.Name = "pictureBox";
-            this.pictureBox.Size = new System.Drawing.Size(927, 754);
+            this.pictureBox.Size = new System.Drawing.Size(811, 554);
             this.pictureBox.TabIndex = 1;
             this.pictureBox.TabStop = false;
-            // 
+            this.pictureBox.Click += new System.EventHandler(this.pictureBox_Click);
-            // menuStrip
-            // 
-            this.menuStrip.ImageScalingSize = new System.Drawing.Size(24, 24);
-            this.menuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.fileToolStripMenuItem});
-            this.menuStrip.Location = new System.Drawing.Point(0, 0);
-            this.menuStrip.Name = "menuStrip";
-            this.menuStrip.Size = new System.Drawing.Size(1160, 28);
-            this.menuStrip.TabIndex = 2;
-            this.menuStrip.Text = "menuStrip";
-            // 
-            // fileToolStripMenuItem
-            // 
-            this.fileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.saveToolStripMenuItem,
-            this.loadToolStripMenuItem});
-            this.fileToolStripMenuItem.Name = "fileToolStripMenuItem";
-            this.fileToolStripMenuItem.Size = new System.Drawing.Size(46, 24);
-            this.fileToolStripMenuItem.Text = "File";
-            // 
-            // saveToolStripMenuItem
-            // 
-            this.saveToolStripMenuItem.Name = "saveToolStripMenuItem";
-            this.saveToolStripMenuItem.Size = new System.Drawing.Size(125, 26);
-            this.saveToolStripMenuItem.Text = "Save";
-            this.saveToolStripMenuItem.Click += new System.EventHandler(this.saveToolStripMenuItem_Click);
-            // 
-            // loadToolStripMenuItem
-            // 
-            this.loadToolStripMenuItem.Name = "loadToolStripMenuItem";
-            this.loadToolStripMenuItem.Size = new System.Drawing.Size(125, 26);
-            this.loadToolStripMenuItem.Text = "Load";
-            this.loadToolStripMenuItem.Click += new System.EventHandler(this.loadToolStripMenuItem_Click);
-            // 
-            // openFileDialog
-            // 
-            this.openFileDialog.Filter = "txt file | *.txt";
             // 
             // FormMapWithSetHoistingCrane
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1160, 782);
+            this.ClientSize = new System.Drawing.Size(1015, 554);
             this.Controls.Add(this.pictureBox);
             this.Controls.Add(this.groupBoxTools);
-            this.Controls.Add(this.menuStrip);
-            this.MainMenuStrip = this.menuStrip;
-            this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.Name = "FormMapWithSetHoistingCrane";
             this.Text = "Карта с набором объектов";
-            this.groupBoxMaps.ResumeLayout(false);
-            this.groupBoxMaps.PerformLayout();
             this.groupBoxTools.ResumeLayout(false);
             this.groupBoxTools.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).EndInit();
-            this.menuStrip.ResumeLayout(false);
-            this.menuStrip.PerformLayout();
             this.ResumeLayout(false);
-            this.PerformLayout();
 
         }
 
@@ -344,16 +217,15 @@
         private Button buttonShowStorage;
         private Button buttonRemoveHoistingCrane;
         private MaskedTextBox maskedTextBoxPosition;
-        private GroupBox groupBoxMaps;
+
-        private TextBox textBoxNewMapName;
+        #region Windows Form Designer generated code
-        private Button buttonDeleteMap;
+
-        private ListBox listBoxMaps;
+        /// <summary>
-        private Button buttonAddMap;
+        /// Required method for Designer support - do not modify
-        private System.Windows.Forms.MenuStrip menuStrip;
+        /// the contents of this method with the code editor.
-        private System.Windows.Forms.ToolStripMenuItem fileToolStripMenuItem;
+        /// </summary>
-        private System.Windows.Forms.ToolStripMenuItem saveToolStripMenuItem;
+
-        private System.Windows.Forms.ToolStripMenuItem loadToolStripMenuItem;
+
-        private System.Windows.Forms.OpenFileDialog openFileDialog;
+        #endregion
-        private System.Windows.Forms.SaveFileDialog saveFileDialog;
     }
 }

HoistingCrane/HoistingCrane/FormMapWithSetHoistingCrane.cs

@@ -1,5 +1,4 @@
 using System;
-using Microsoft.Extensions.Logging;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Data;
@@ -13,9 +12,10 @@ namespace HoistingCrane
 {
     public partial class FormMapWithSetHoistingCrane : Form
     {
-        /// Словарь для выпадающего списка
+
-        /// </summary>
+        private MapWithSetHoistingCraneGeneric<DrawingObjectHoistingCrane, AbstractMap> _mapHoistingCraneCollectionGeneric;
-        private readonly Dictionary<string, AbstractMap> _mapsDict = new()
+
+        public FormMapWithSetHoistingCrane()
         {
             { "Простая карта", new SimpleMap() },
             { "Вторая карта", new SecondMap() },
@@ -31,124 +31,58 @@ namespace HoistingCrane
         public FormMapWithSetHoistingCrane(ILogger<FormMapWithSetHoistingCrane> logger)
         {
             InitializeComponent();
-            _logger = logger;
-            _mapsCollection = new MapsCollection(pictureBox.Width, pictureBox.Height);
-            comboBoxSelectorMap.Items.Clear();
-            foreach (var elem in _mapsDict)
-            {
-                comboBoxSelectorMap.Items.Add(elem.Key);
-            }
-        }
-        /// <summary>
-        /// Заполнение listBoxMaps
-        /// </summary>
-        private void ReloadMaps()
-        {
-            int index = listBoxMaps.SelectedIndex;
-
-            listBoxMaps.Items.Clear();
-            for (int i = 0; i < _mapsCollection.Keys.Count; i++)
-            {
-                listBoxMaps.Items.Add(_mapsCollection.Keys[i]);
         }
 
-            if (listBoxMaps.Items.Count > 0 && (index == -1 || index >= listBoxMaps.Items.Count))
+        private void ComboBoxSelectorMap_SelectedIndexChanged(object sender, EventArgs e)
         {
-                listBoxMaps.SelectedIndex = 0;
+            AbstractMap map = null;
+            switch (comboBoxSelectorMap.Text)
+            {
+                case "Первая карта":
+                    map = new SimpleMap();
+                    break;
+                case "Вторая карта":
+                    map = new SecondMap();
+                    break;
+
+
             }
-            else if (listBoxMaps.Items.Count > 0 && index > -1 && index < listBoxMaps.Items.Count)
+            if (map != null)
             {
-                listBoxMaps.SelectedIndex = index;
+                _mapHoistingCraneCollectionGeneric = new MapWithSetHoistingCraneGeneric<DrawingObjectHoistingCrane, AbstractMap>(
-            }
+                pictureBox.Width, pictureBox.Height, map);
-        }
+            }
-        /// <summary>
+            else
-        /// Добавление карты
+            {
-        /// </summary>
+                _mapHoistingCraneCollectionGeneric = null;
-        /// <param name="sender"></param>
+            }
-        /// <param name="e"></param>
+        }
-        private void buttonAddMap_Click_1(object sender, EventArgs e)
+
-        {
+        private void ButtonAddHoistingCrane_Click(object sender, EventArgs e)
-            if (comboBoxSelectorMap.SelectedIndex == -1 || string.IsNullOrEmpty(textBoxNewMapName.Text))
+        {
-            {
+            if (_mapHoistingCraneCollectionGeneric == null)
-                MessageBox.Show("Не все данные заполнены", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+            {
-                return;
+                return;
-            }
+            }
-            if (!_mapsDict.ContainsKey(comboBoxSelectorMap.Text))
+            FormHoistingCrane form = new();
-            {
+            if (form.ShowDialog() == DialogResult.OK)
-                MessageBox.Show("Нет такой карты", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+            {
-                return;
+                DrawingObjectHoistingCrane hoistingCrane = new(form.SelectedHoistingCrane);
-            }
+                if (_mapHoistingCraneCollectionGeneric + hoistingCrane == 1)
-            _mapsCollection.AddMap(textBoxNewMapName.Text, _mapsDict[comboBoxSelectorMap.Text]);
+                {
-            ReloadMaps();
+                    MessageBox.Show("Объект добавлен");
-            _logger.LogInformation($"Добавлена карта {textBoxNewMapName.Text}");
+                    pictureBox.Image = _mapHoistingCraneCollectionGeneric.ShowSet();
-        }
-        private void ListBoxMaps_SelectedIndexChanged(object sender, EventArgs e)
-        {
-            pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
-            _logger.LogInformation($"Переход на карту {listBoxMaps.SelectedItem?.ToString()}");
-        }
-        /// <summary>
-        /// Удаление карты
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void buttonDeleteMap_Click(object sender, EventArgs e)
-        {
-            if (listBoxMaps.SelectedIndex == -1)
-            {
-                return;
-            }
-            if (MessageBox.Show($"Удалить карту {listBoxMaps.SelectedItem}?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
-            {
-                _mapsCollection.DelMap(listBoxMaps.SelectedItem?.ToString() ?? string.Empty);
-                ReloadMaps();
-                _logger.LogInformation($"Удалена карта {listBoxMaps.SelectedItem?.ToString()}");
-            }
-        }
-        private void ButtonAddHoistingCrane_Click(object sender, EventArgs e)
-        {
-            if (listBoxMaps.SelectedIndex == -1)
-            {
-                return;
-            }
-            var formHoistingCraneConfig = new FormHoistingCraneConfig();
-            formHoistingCraneConfig.AddEvent(AddHoistingCrane);
-            formHoistingCraneConfig.Show();
-        }
-        private void AddHoistingCrane(DrawingHoistingCrane drawingHoistingCrane)
-        {
-            try
-            {
-                if (listBoxMaps.SelectedIndex == -1)
-                {
-                    MessageBox.Show("Перед добавлением объекта необходимо создать карту");
-                }
-                else if (_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] + new DrawingObjectHoistingCrane(drawingHoistingCrane) != -1)
-                {
-                    _logger.LogInformation($"Добавлен кран {drawingHoistingCrane}");
-                    MessageBox.Show("Объект добавлен");
-                    pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
                 }
                 else
                 {
-                    _logger.LogWarning("Не удалось добавить кран");
                     MessageBox.Show("Не удалось добавить объект");
                 }
             }
-            catch (StorageOverflowException ex)
-            {
-                _logger.LogWarning($"Ошибка переполнения хранилища: {ex.Message}");
-                MessageBox.Show($"Ошибка переполнения хранилища: {ex.Message}", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
-            }
-            catch (Exception ex)
-            {
-                _logger.LogWarning($"Неизвестная ошибка: {ex.Message}");
-                MessageBox.Show($"Неизвестная ошибка: {ex.Message}");
-            }
         }
+
         private void ButtonRemoveHoistingCrane_Click(object sender, EventArgs e)
         {
-            if (listBoxMaps.SelectedIndex == -1)
+            if (string.IsNullOrEmpty(maskedTextBoxPosition.Text))
             {
                 return;
             }
@@ -157,49 +91,38 @@ namespace HoistingCrane
                 return;
             }
             int pos = Convert.ToInt32(maskedTextBoxPosition.Text);
-            try
+            if (_mapHoistingCraneCollectionGeneric - pos == null)
-            {
-                if (_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] - pos != null)
             {
                 MessageBox.Show("Объект удален");
-                    pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
+                pictureBox.Image = _mapHoistingCraneCollectionGeneric.ShowSet();
-                    _logger.LogInformation($"Удален объект {pos}");
             }
             else
             {
                 MessageBox.Show("Не удалось удалить объект");
             }
         }
-            catch (HoistingCraneNotFoundException ex)
+
-            {
-                _logger.LogWarning($"Ошибка {ex.Message}");
-                MessageBox.Show($"Ошибка удаления: {ex.Message}");
-            }
-            catch (Exception ex)
-            {
-                _logger.LogWarning($"Ошибка {ex.Message}");
-                MessageBox.Show($"Неизвестная ошибка: {ex.Message}");
-            }
-        }
         private void ButtonShowStorage_Click(object sender, EventArgs e)
         {
-            if (listBoxMaps.SelectedIndex == -1)
+            if (_mapHoistingCraneCollectionGeneric == null)
             {
                 return;
             }
-            pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
+            pictureBox.Image = _mapHoistingCraneCollectionGeneric.ShowSet();
         }
+
         private void ButtonShowOnMap_Click(object sender, EventArgs e)
         {
-            if (listBoxMaps.SelectedIndex == -1)
+            if (_mapHoistingCraneCollectionGeneric == null)
             {
                 return;
             }
-            pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowOnMap();
+            pictureBox.Image = _mapHoistingCraneCollectionGeneric.ShowOnMap();
         }
+
         private void ButtonMove_Click(object sender, EventArgs e)
         {
-            if (listBoxMaps.SelectedIndex == -1)
+            if (_mapHoistingCraneCollectionGeneric == null)
             {
                 return;
             }
@@ -220,47 +143,12 @@ namespace HoistingCrane
                     enums = Direction.Right;
                     break;
             }
-            pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].MoveObject(enums);
+            pictureBox.Image = _mapHoistingCraneCollectionGeneric.MoveObject(enums);
         }
-        private void saveToolStripMenuItem_Click(object sender, EventArgs e)
+
+        private void pictureBox_Click(object sender, EventArgs e)
         {
-            if (saveFileDialog.ShowDialog() == DialogResult.OK)
-            {
-                try
-                {
-                    _mapsCollection.SaveData(saveFileDialog.FileName);
-                    MessageBox.Show("Сохранение прошло успешно", "Результат",
-                   MessageBoxButtons.OK, MessageBoxIcon.Information);
-                    _logger.LogInformation($"Сохранение данных");
-                }
-                catch (Exception ex)
-                {
-                    MessageBox.Show($"Не сохранилось: {ex.Message}", "Результат",
-                    MessageBoxButtons.OK, MessageBoxIcon.Error);
-                    _logger.LogWarning($"Ошибка {ex.Message}");
-                }
 
         }
     }
-        private void loadToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            if (openFileDialog.ShowDialog() == DialogResult.OK)
-            {
-                try
-                {
-                    _mapsCollection.LoadData(openFileDialog.FileName);
-                    ReloadMaps();
-                    MessageBox.Show("Открытие прошло успешно", "Результат",
-                   MessageBoxButtons.OK, MessageBoxIcon.Information);
-                    _logger.LogInformation($"Загрузка данных");
-                }
-                catch (Exception ex)
-                {
-                    MessageBox.Show($"Не удалось открыть: {ex.Message}", "Результат",
-                    MessageBoxButtons.OK, MessageBoxIcon.Error);
-                    _logger.LogWarning($"Ошибка {ex.Message}");
-                }
-            }
-        }
-    }
 }

HoistingCrane/HoistingCrane/FormMapWithSetHoistingCrane.resx

@@ -57,13 +57,4 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="menuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
-  <metadata name="openFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>144, 17</value>
-  </metadata>
-  <metadata name="saveFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>303, 17</value>
-  </metadata>
 </root>

HoistingCrane/HoistingCrane/FormhoistingCrane.resx

@@ -0,0 +1,120 @@
+<?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>
+</root>

HoistingCrane/HoistingCrane/HoistingCrane.csproj

@@ -1,25 +1,81 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<?xml version="1.0" encoding="utf-8"?>
-
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{44B433E0-4B64-464F-B7B2-85F92D68A14D}</ProjectGuid>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <RootNamespace>HoistingCrane</RootNamespace>
-    <Nullable>enable</Nullable>
+    <AssemblyName>HoistingCrane</AssemblyName>
-    <UseWindowsForms>true</UseWindowsForms>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
-    <ImplicitUsings>enable</ImplicitUsings>
+    <FileAlignment>512</FileAlignment>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <Deterministic>true</Deterministic>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
   </PropertyGroup>
-
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Configuration" Version="7.0.0" />
+    <Reference Include="System" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
+    <Reference Include="System.Core" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
+    <Reference Include="System.Xml.Linq" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
+    <Reference Include="System.Data.DataSetExtensions" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
+    <Reference Include="Microsoft.CSharp" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
+    <Reference Include="System.Data" />
-    <PackageReference Include="Microsoft.Extensions.Options" Version="7.0.0" />
+    <Reference Include="System.Deployment" />
-    <PackageReference Include="NLog.Extensions.Logging" Version="5.2.0" />
+    <Reference Include="System.Drawing" />
-    <PackageReference Include="Serilog" Version="2.12.0" />
+    <Reference Include="System.Net.Http" />
-    <PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0" />
+    <Reference Include="System.Windows.Forms" />
-    <PackageReference Include="Serilog.Settings.Configuration" Version="3.4.0" />
+    <Reference Include="System.Xml" />
-    <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
   </ItemGroup>
+  <ItemGroup>
+    <Compile Include="FormhoistingCrane.cs" />
+    <Compile Include="FormhoistingCrane.Designer.cs">
+      <DependentUpon>FormhoistingCrane.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Program.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <EmbeddedResource Include="FormhoistingCrane.resx">
+      <DependentUpon>FormhoistingCrane.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+    <None Include="Properties\Settings.settings">
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
+    </None>
+    <Compile Include="Properties\Settings.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Settings.settings</DependentUpon>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="App.config" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

HoistingCrane/HoistingCrane/HoistingCraneNotFoundException.cs

@@ -1,21 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Runtime.Serialization;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace HoistingCrane
-{
-    [Serializable]
-    internal class HoistingCraneNotFoundException : ApplicationException
-    {
-        public HoistingCraneNotFoundException(int i) : base($"Не найден объект по позиции {i}") { }
-        public HoistingCraneNotFoundException() : base() { }
-        public HoistingCraneNotFoundException(string message) : base(message) { }
-        public HoistingCraneNotFoundException(string message, Exception exception) :
-       base(message, exception)
-        { }
-        protected HoistingCraneNotFoundException(SerializationInfo info, StreamingContext contex) : base(info, contex) { }
-    }
-}

HoistingCrane/HoistingCrane/IDrawingObject.cs

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

HoistingCrane/HoistingCrane/MapWithSetHoistingCraneGeneric.cs

@@ -14,25 +14,29 @@ namespace HoistingCrane
         private readonly int _pictureHeight;
         private readonly int _placeSizeWidth = 200;
         private readonly int _placeSizeHeight = 120;
-        private readonly SetHoistingCraneGeneric<T> _setHoistingCranes;
+        private readonly SetHoistingCraneGeneric<T> _setHoistingCrane;
         private readonly U _map;
+
         public MapWithSetHoistingCraneGeneric(int picWidth, int picHeight, U map)
         {
             int width = picWidth / _placeSizeWidth;
             int height = picHeight / _placeSizeHeight;
-            _setHoistingCranes = new SetHoistingCraneGeneric<T>(width * height);
+            _setHoistingCrane = new SetHoistingCraneGeneric<T>(width * height);
             _pictureWidth = picWidth;
             _pictureHeight = picHeight;
             _map = map;
         }
-        public static int operator +(MapWithSetHoistingCraneGeneric<T, U> map, T hoistingcrane)
+
+        public static int operator +(MapWithSetHoistingCraneGeneric<T, U> map, T bulldozer)
         {
-            return map._setHoistingCranes.Insert(hoistingcrane);
+            return map._setHoistingCrane.Insert(bulldozer);
         }
+
         public static T operator -(MapWithSetHoistingCraneGeneric<T, U> map, int position)
         {
-            return map._setHoistingCranes.Remove(position);
+            return map._setHoistingCrane.Remove(position);
         }
+
         public Bitmap ShowSet()
         {
             Bitmap bmp = new(_pictureWidth, _pictureWidth);
@@ -41,15 +45,21 @@ namespace HoistingCrane
             DrawHoistingCranes(gr);
             return bmp;
         }
+
         public Bitmap ShowOnMap()
         {
             Shaking();
-            foreach (var hoistingCrane in _setHoistingCranes.GetHoistingCranes())
+            for (int i = 0; i < _setHoistingCrane.Count; i++)
             {
-                return _map.CreateMap(_pictureWidth, _pictureHeight, hoistingCrane);
+                var bulldozer = _setHoistingCrane.Get(i);
+                if (bulldozer != null)
+                {
+                    return _map.CreateMap(_pictureWidth, _pictureHeight, bulldozer);
+                }
             }
             return new(_pictureWidth, _pictureHeight);
         }
+
         public Bitmap MoveObject(Direction direction)
         {
             if (_map != null)
@@ -58,20 +68,21 @@ namespace HoistingCrane
             }
             return new(_pictureWidth, _pictureHeight);
         }
+
         public void Shaking()
         {
-            int j = _setHoistingCranes.Count - 1;
+            int j = _setHoistingCrane.Count - 1;
-            for (int i = 0; i < _setHoistingCranes.Count; i++)
+            for (int i = 0; i < _setHoistingCrane.Count; i++)
             {
-                if (_setHoistingCranes[i] == null)
+                if (_setHoistingCrane.Get(i) == null)
                 {
                     for (; j > i; j--)
                     {
-                        var warship = _setHoistingCranes[j];
+                        var warship = _setHoistingCrane.Get(j);
                         if (warship != null)
                         {
-                            _setHoistingCranes.Insert(warship, i);
+                            _setHoistingCrane.Insert(warship, i);
-                            _setHoistingCranes.Remove(j);
+                            _setHoistingCrane.Remove(j);
                             break;
                         }
                     }
@@ -82,6 +93,7 @@ namespace HoistingCrane
                 }
             }
         }
+
         private void DrawBackground(Graphics gr)
         {
             Pen pen = new(Color.Black, 3);
@@ -94,6 +106,7 @@ namespace HoistingCrane
                 gr.DrawLine(pen, i * _placeSizeWidth, 0, i * _placeSizeWidth, (_pictureHeight / _placeSizeHeight) * _placeSizeHeight);
             }
         }
+
         private void DrawHoistingCranes(Graphics gr)
         {
             int heightEl = _pictureHeight / _placeSizeHeight;
@@ -101,15 +114,15 @@ namespace HoistingCrane
             int curWidth = 3;
             int curHeight = 3;
 
-            for (int i = 0; i < _setHoistingCranes.Count; i++)
+            for (int i = 0; i < _setHoistingCrane.Count; i++)
             {
                 if (curHeight < 0)
                 {
                     return;
                 }
-                _setHoistingCranes[i]?.SetObject(curWidth * _placeSizeWidth + 10,
+                _setHoistingCrane.Get(i)?.SetObject(curWidth * _placeSizeWidth + 10,
                     curHeight * _placeSizeHeight + 10, _pictureWidth, _pictureHeight);
-                _setHoistingCranes[i]?.DrawingObject(gr);
+                _setHoistingCrane.Get(i)?.DrawingObject(gr);
 
                 if (curWidth == 0)
                 {
@@ -120,25 +133,5 @@ namespace HoistingCrane
                 curWidth--;
             }
         }
-        public string GetData(char separatorType, char separatorData)
-        {
-            string data = $"{_map.GetType().Name}{separatorType}";
-            foreach (var Boat in _setHoistingCranes.GetHoistingCranes())
-            {
-                data += $"{Boat.GetInfo()}{separatorData}";
-            }
-            return data;
-        }
-        /// <summary>
-        /// Загрузка списка из массива строк
-        /// </summary>
-        /// <param name="records"></param>
-        public void LoadData(string[] records)
-        {
-            foreach (var rec in records)
-            {
-                _setHoistingCranes.Insert(DrawingObjectHoistingCrane.Create(rec) as T);
-            }
-        }
     }
 }

HoistingCrane/HoistingCrane/MapsCollection.cs

@@ -1,6 +1,8 @@
-
+using System;
-
+using System.Collections.Generic;
+using System.Linq;
 using System.Text;
+using System.Threading.Tasks;
 
 namespace HoistingCrane
 {
@@ -8,8 +10,8 @@ namespace HoistingCrane
     {
         /// <summary>
         /// Словарь (хранилище) с картами
-        /// </summary>
+
-        readonly Dictionary<string, MapWithSetHoistingCraneGeneric<IDrawingObject, AbstractMap>> _mapStorages;
+        readonly Dictionary<string, MapWithSetHoistingCraneGeneric<DrawingObjectHoistingCrane, AbstractMap>> _mapStorages;
         /// <summary>
         /// Возвращение списка названий карт
         /// </summary>
@@ -27,12 +29,9 @@ namespace HoistingCrane
         /// </summary>
         /// <param name="pictureWidth"></param>
         /// <param name="pictureHeight"></param>
-        ///   private readonly char separatorDict = '|';
-        private readonly char separatorData = ';';
-        private readonly char separatorDict = '|';
         public MapsCollection(int pictureWidth, int pictureHeight)
         {
-            _mapStorages = new Dictionary<string, MapWithSetHoistingCraneGeneric<IDrawingObject, AbstractMap>>();
+            _mapStorages = new Dictionary<string, MapWithSetHoistingCraneGeneric<DrawingObjectHoistingCrane, AbstractMap>>();
             _pictureWidth = pictureWidth;
             _pictureHeight = pictureHeight;
         }
@@ -62,13 +61,13 @@ namespace HoistingCrane
         /// </summary>
         /// <param name="ind"></param>
         /// <returns></returns>
-        public MapWithSetHoistingCraneGeneric<IDrawingObject, AbstractMap> this[string ind]
+        public MapWithSetHoistingCraneGeneric<DrawingObjectHoistingCrane, AbstractMap> this[string ind]
         {
             get
             {
                 if (ind != String.Empty)
                 {
-                    MapWithSetHoistingCraneGeneric<IDrawingObject, AbstractMap> value;
+                    MapWithSetHoistingCraneGeneric<DrawingObjectHoistingCrane, AbstractMap> value;
                     if (_mapStorages.TryGetValue(ind, out value))
                     {
                         return value;
@@ -77,67 +76,5 @@ namespace HoistingCrane
                 return null;
             }
         }
-        /// <summary>
-        /// Сохранение информации про лодки м в хранилище в файл
-        /// </summary>
-        /// <param name="filename">Путь и имя файла</param>
-        public void SaveData(string filename)
-        {
-            if (File.Exists(filename))
-            {
-                File.Delete(filename);
-            }
-            using (FileStream fs = new(filename, FileMode.Create))
-            using (StreamWriter sw = new StreamWriter(fs, Encoding.UTF8))
-            {
-                sw.WriteLine("MapsCollection");
-                foreach (var storage in _mapStorages)
-                {
-
-                    sw.WriteLine(
-                        $"{storage.Key}{separatorDict}{storage.Value.GetData(separatorDict, separatorData)}"
-                    );
-                }
-            }
-        }
-
-        /// Загрузка информации по локомотивам в депо из файла
-        public void LoadData(string filename)
-        {
-            if (!File.Exists(filename))
-            {
-                throw new FileNotFoundException(filename);
-            }
-            using (FileStream fs = new(filename, FileMode.Open))
-            using (StreamReader sr = new StreamReader(fs, Encoding.UTF8))
-            {
-                string curLine = sr.ReadLine();
-
-                if (!curLine.Contains("MapsCollection"))
-                {
-                    throw new FormatException(curLine);
-                }
-                _mapStorages.Clear();
-                while ((curLine = sr.ReadLine()) != null)
-                {
-                    var elems = curLine.Split(separatorDict);
-                    AbstractMap map = null;
-
-                    switch (elems[1])
-                    {
-                        case "SimpleMap":
-                            map = new SimpleMap();
-                            break;
-                        case "SecondMap":
-                            map = new SecondMap();
-                            break;
-
-                    }
-
-                    _mapStorages.Add(elems[0], new MapWithSetHoistingCraneGeneric<IDrawingObject, AbstractMap>(_pictureWidth, _pictureHeight, map));
-                    _mapStorages[elems[0]].LoadData(elems[2].Split(separatorData, StringSplitOptions.RemoveEmptyEntries));
-                }
-            }
-        }
     }
 }

HoistingCrane/HoistingCrane/Program.cs

@@ -1,9 +1,3 @@
-
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Configuration;
-using Serilog;
-
 namespace HoistingCrane
 {
     internal static class Program
@@ -14,25 +8,10 @@ namespace HoistingCrane
         [STAThread]
         static void Main()
         {
-            Application.EnableVisualStyles();
+            // To customize application configuration such as set high DPI settings or default font,
-            Application.SetCompatibleTextRenderingDefault(false);
+            // see https://aka.ms/applicationconfiguration.
-            var services = new ServiceCollection();
+            ApplicationConfiguration.Initialize();
-            ConfigureServices(services);
+            Application.Run(new FormMapWithSetHoistingCrane());
-            using (ServiceProvider serviceProvider = services.BuildServiceProvider())
-            {
-                Application.Run(serviceProvider.GetRequiredService<FormMapWithSetHoistingCrane>());
-            }
-        }
-        private static void ConfigureServices(ServiceCollection services)
-        {
-            services.AddSingleton<FormMapWithSetHoistingCrane>()
-            .AddLogging(option =>
-            {
-                var configuration = new ConfigurationBuilder().SetBasePath(Directory.GetCurrentDirectory()).AddJsonFile(path: "appsettings.json", optional: false, reloadOnChange: true).Build();
-                var logger = new LoggerConfiguration().ReadFrom.Configuration(configuration).CreateLogger();
-                option.SetMinimumLevel(LogLevel.Information);
-                option.AddSerilog(logger);
-            });
         }
     }
 }

HoistingCrane/HoistingCrane/Properties/AssemblyInfo.cs

@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// Общие сведения об этой сборке предоставляются следующим набором
+// набора атрибутов. Измените значения этих атрибутов для изменения сведений,
+// связанных со сборкой.
+[assembly: AssemblyTitle("HoistingCrane")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("HoistingCrane")]
+[assembly: AssemblyCopyright("Copyright ©  2022")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Установка значения False для параметра ComVisible делает типы в этой сборке невидимыми
+// для компонентов COM. Если необходимо обратиться к типу в этой сборке через
+// COM, следует установить атрибут ComVisible в TRUE для этого типа.
+[assembly: ComVisible(false)]
+
+// Следующий GUID служит для идентификации библиотеки типов, если этот проект будет видимым для COM
+[assembly: Guid("44b433e0-4b64-464f-b7b2-85f92d68a14d")]
+
+// Сведения о версии сборки состоят из указанных ниже четырех значений:
+//
+//      Основной номер версии
+//      Дополнительный номер версии
+//      Номер сборки
+//      Редакция
+//
+// Можно задать все значения или принять номера сборки и редакции по умолчанию 
+// используя "*", как показано ниже:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]

HoistingCrane/HoistingCrane/Properties/Resources.Designer.cs

@@ -1,44 +1,49 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     Этот код создан программой.
+//     Этот код создан программным средством.
-//     Исполняемая версия:4.0.30319.42000
+//     Версия среды выполнения: 4.0.30319.42000
 //
-//     Изменения в этом файле могут привести к неправильной работе и будут потеряны в случае
+//     Изменения в этом файле могут привести к неправильному поведению и будут утрачены, если
-//     повторной генерации кода.
+//     код создан повторно.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace HoistingCrane.Properties {
+namespace HoistingCrane.Properties
-    using System;
+{
 
 
     /// <summary>
-    ///   Класс ресурса со строгой типизацией для поиска локализованных строк и т.д.
+    ///   Класс ресурсов со строгим типом для поиска локализованных строк и пр.
     /// </summary>
-    // Этот класс создан автоматически классом StronglyTypedResourceBuilder
+    // Этот класс был автоматически создан при помощи StronglyTypedResourceBuilder
-    // с помощью такого средства, как ResGen или Visual Studio.
+    // класс с помощью таких средств, как ResGen или Visual Studio.
-    // Чтобы добавить или удалить член, измените файл .ResX и снова запустите ResGen
+    // Для добавления или удаления члена измените файл .ResX, а затем перезапустите ResGen
-    // с параметром /str или перестройте свой проект VS.
+    // с параметром /str или заново постройте свой VS-проект.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    internal class Resources {
+    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() {
+        internal Resources()
+        {
         }
 
         /// <summary>
-        ///   Возвращает кэшированный экземпляр ResourceManager, использованный этим классом.
+        ///   Возврат кэшированного экземпляра ResourceManager, используемого этим классом.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Resources.ResourceManager ResourceManager {
+        internal static global::System.Resources.ResourceManager ResourceManager
-            get {
+        {
-                if (object.ReferenceEquals(resourceMan, null)) {
+            get
+            {
+                if ((resourceMan == null))
+                {
                     global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("HoistingCrane.Properties.Resources", typeof(Resources).Assembly);
                     resourceMan = temp;
                 }
@@ -47,57 +52,20 @@ namespace HoistingCrane.Properties {
         }
 
         /// <summary>
-        ///   Перезаписывает свойство CurrentUICulture текущего потока для всех
+        ///   Переопределяет свойство CurrentUICulture текущего потока для всех
-        ///   обращений к ресурсу с помощью этого класса ресурса со строгой типизацией.
+        ///   подстановки ресурсов с помощью этого класса ресурсов со строгим типом.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Globalization.CultureInfo Culture {
+        internal static global::System.Globalization.CultureInfo Culture
-            get {
+        {
+            get
+            {
                 return resourceCulture;
             }
-            set {
+            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));
-            }
-        }
     }
 }

HoistingCrane/HoistingCrane/Properties/Resources.resx

@@ -46,7 +46,7 @@
     
     mimetype: application/x-microsoft.net.object.binary.base64
     value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : System.Serialization.Formatters.Binary.BinaryFormatter
             : and then encoded with base64 encoding.
     
     mimetype: application/x-microsoft.net.object.soap.base64
@@ -60,7 +60,6 @@
             : 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">
@@ -69,10 +68,9 @@
               <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="name" 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">
@@ -87,10 +85,9 @@
                 <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="name" type="xsd:string" 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">
@@ -112,22 +109,9 @@
     <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>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.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>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.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>

HoistingCrane/HoistingCrane/Properties/Settings.Designer.cs

@@ -1,10 +1,10 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     Этот код создан программой.
+//     This code was generated by a tool.
-//     Исполняемая версия:4.0.30319.42000
+//     Runtime Version:4.0.30319.42000
 //
-//     Изменения в этом файле могут привести к неправильной работе и будут потеряны в случае
+//     Changes to this file may cause incorrect behavior and will be lost if
-//     повторной генерации кода.
+//     the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
@@ -13,7 +13,7 @@ namespace HoistingCrane.Properties
 
 
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.0.3.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")]
     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase
     {
 

HoistingCrane/HoistingCrane/Properties/Settings.settings

@@ -0,0 +1,7 @@
+<?xml version='1.0' encoding='utf-8'?>
+<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)">
+  <Profiles>
+    <Profile Name="(Default)" />
+  </Profiles>
+  <Settings />
+</SettingsFile>

HoistingCrane/HoistingCrane/SecondMap.cs

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

HoistingCrane/HoistingCrane/SetHoistingCraneGeneric.cs

@@ -9,91 +9,75 @@ namespace HoistingCrane
     internal class SetHoistingCraneGeneric<T>
         where T : class
     {
-        private readonly List<T> _places;
+        public readonly T[] _places;
-        public int Count => _places.Count;
+
-        private readonly int _maxCount;
+        public int Count => _places.Length;
+
         public SetHoistingCraneGeneric(int count)
         {
-            _maxCount = count;
+            _places = new T[count];
-            _places = new List<T>();
         }
+
         public int Insert(T hoistingCrane)
         {
-            for (int i = 0; i < _maxCount; i++)
+            return Insert(hoistingCrane, 0);
-            {
-                if (i == Count)
-                {
-                    _places.Insert(i, hoistingCrane);
-                    return i;
         }
-            }
-            throw new StorageOverflowException(_maxCount);
 
-        }
         public int Insert(T hoistingCrane, int position)
         {
-            if (position < 0 || position >= _maxCount)
+            int emptypos = -1;
+            if (position >= Count && position < 0)
             {
                 return -1;
+            }
 
-            }
+            if (_places[position] == null)
-            if (position == Count)
             {
-                _places.Insert(position, hoistingCrane);
+                _places[position] = hoistingCrane;
-                return position;
+                return 1;
             }
-            else
+
+            for (int i = position; i < Count; i++)
             {
-                for (int i = position + 1; i < _maxCount; i++)
+                if (_places[i] == null)
                 {
-                    if (i == Count)
+                    emptypos = i;
+                    break;
+                }
+            }
+
+            if (emptypos != -1)
             {
-                        for (int j = i - 1; j >= position; j--)
+                for (int i = emptypos; i > position; i--)
                 {
-                            _places[j + 1] = _places[j];
+                    _places[i] = _places[i - 1];
                 }
-                        _places.Insert(position, hoistingCrane);
+                _places[position] = hoistingCrane;
-                        return position;
+                return 1;
-                    }
-                }
-                throw new StorageOverflowException(_maxCount);
             }
+
+            return -1;
         }
+
         public T Remove(int position)
         {
-            if (position < 0 || position >= Count) throw new HoistingCraneNotFoundException();
+            if (position < Count && position >= 0 && _places[position] != null)
-            var result = _places[position];
+            {
-            _places.RemoveAt(position);
+                _places[position] = null;
-            return result;
+                T removed = _places[position];
-        }
+                return removed;
-        public T this[int position]
-        {
-            get
-            {
-                if (position >= 0 && position < Count)
-                {
-                    return _places[position];
             }
+
             return null;
         }
-            set
+
+        public T Get(int position)
         {
-                Insert(value, position);
+            if (position >= Count && position < 0)
-            }
-        }
-        public IEnumerable<T> GetHoistingCranes()
             {
-            foreach (var hoistingcrane in _places)
+                return null;
-            {
-                if (hoistingcrane != null)
-                {
-                    yield return hoistingcrane;
-                }
-                else
-                {
-                    yield break;
-                }
             }
+            return _places[position];
         }
     }
 }

HoistingCrane/HoistingCrane/SimpleMap.cs

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

HoistingCrane/HoistingCrane/StorageOverflowException.cs

@@ -1,21 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Runtime.Serialization;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace HoistingCrane
-{
-    [Serializable]
-    internal class StorageOverflowException : ApplicationException
-    {
-        public StorageOverflowException(int count) : base($"В наборе превышено допустимое количество: {count}") { }
-        public StorageOverflowException() : base() { }
-        public StorageOverflowException(string message) : base(message) { }
-        public StorageOverflowException(string message, Exception exception) :
-       base(message, exception)
-        { }
-        protected StorageOverflowException(SerializationInfo info, StreamingContext contex) : base(info, contex) { }
-    }
-}

HoistingCrane/HoistingCrane/packages.config

@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-	<package id="Azure.Core" version="1.20.0" targetFramework="net472" />
-	<package id="Azure.Data.AppConfiguration" version="1.2.0" targetFramework="net472" />
-	<package id="Microsoft.Bcl.AsyncInterfaces" version="7.0.0" targetFramework="net472" />
-	<package id="Microsoft.Extensions.Configuration" version="7.0.0" targetFramework="net48" />
-	<package id="Microsoft.Extensions.Configuration.Abstractions" version="7.0.0" targetFramework="net48" />
-	<package id="Microsoft.Extensions.Configuration.Binder" version="2.0.0" targetFramework="net48" />
-	<package id="Microsoft.Extensions.Configuration.FileExtensions" version="7.0.0" targetFramework="net48" />
-	<package id="Microsoft.Extensions.Configuration.Json" version="7.0.0" targetFramework="net48" />
-	<package id="Microsoft.Extensions.DependencyInjection" version="7.0.0" targetFramework="net472" />
-	<package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="7.0.0" targetFramework="net472" />
-	<package id="Microsoft.Extensions.DependencyModel" version="3.0.0" targetFramework="net48" />
-	<package id="Microsoft.Extensions.FileProviders.Abstractions" version="7.0.0" targetFramework="net48" />
-	<package id="Microsoft.Extensions.FileProviders.Physical" version="7.0.0" targetFramework="net48" />
-	<package id="Microsoft.Extensions.FileSystemGlobbing" version="7.0.0" targetFramework="net48" />
-	<package id="Microsoft.Extensions.Logging" version="7.0.0" targetFramework="net472" />
-	<package id="Microsoft.Extensions.Logging.Abstractions" version="7.0.0" targetFramework="net472" />
-	<package id="Microsoft.Extensions.Options" version="7.0.0" targetFramework="net472" />
-	<package id="Microsoft.Extensions.Primitives" version="7.0.0" targetFramework="net472" />
-	<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net48" />
-	<package id="NLog" version="5.0.5" targetFramework="net472" />
-	<package id="NLog.Extensions.Logging" version="5.1.0" targetFramework="net472" />
-	<package id="Serilog" version="2.10.0" targetFramework="net48" />
-	<package id="Serilog.Extensions.Logging" version="3.1.0" targetFramework="net472" />
-	<package id="Serilog.Settings.Configuration" version="3.4.0" targetFramework="net48" />
-	<package id="Serilog.Sinks.File" version="5.0.0" targetFramework="net48" />
-	<package id="System.Buffers" version="4.5.1" targetFramework="net472" />
-	<package id="System.Configuration.ConfigurationManager" version="7.0.0" targetFramework="net48" />
-	<package id="System.Diagnostics.DiagnosticSource" version="7.0.0" targetFramework="net472" />
-	<package id="System.IO" version="4.3.0" targetFramework="net48" />
-	<package id="System.Memory" version="4.5.5" targetFramework="net472" />
-	<package id="System.Memory.Data" version="1.0.2" targetFramework="net472" />
-	<package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net472" />
-	<package id="System.Runtime" version="4.3.0" targetFramework="net48" />
-	<package id="System.Runtime.CompilerServices.Unsafe" version="6.0.0" targetFramework="net472" />
-	<package id="System.Runtime.InteropServices.RuntimeInformation" version="4.0.0" targetFramework="net48" />
-	<package id="System.Security.AccessControl" version="6.0.0" targetFramework="net48" />
-	<package id="System.Security.Cryptography.Algorithms" version="4.3.1" targetFramework="net48" />
-	<package id="System.Security.Cryptography.Encoding" version="4.3.0" targetFramework="net48" />
-	<package id="System.Security.Cryptography.Primitives" version="4.3.0" targetFramework="net48" />
-	<package id="System.Security.Permissions" version="7.0.0" targetFramework="net48" />
-	<package id="System.Security.Principal.Windows" version="5.0.0" targetFramework="net48" />
-	<package id="System.Text.Encodings.Web" version="7.0.0" targetFramework="net48" />
-	<package id="System.Text.Json" version="7.0.0" targetFramework="net48" />
-	<package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net472" />
-	<package id="System.ValueTuple" version="4.5.0" targetFramework="net472" />
-</packages>