From 0c7bc6aa685feb2e9d99d9727306030649927128 Mon Sep 17 00:00:00 2001
From: Geo7312 <Geo7312@yandex.ru>
Date: Mon, 15 Apr 2024 11:03:44 +0400
Subject: [PATCH] =?UTF-8?q?5=20=D0=BB=D0=B0=D0=B1=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProjectTrolleybus/Drawnings/DrawningTrolleyB.cs          | 5 ++++-
 .../ProjectTrolleybus/FormTrolleyBCollection.cs              | 2 +-
 ProjectTrolleybus/ProjectTrolleybus/FormTrolleyBConfig.cs    | 5 +++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/ProjectTrolleybus/ProjectTrolleybus/Drawnings/DrawningTrolleyB.cs b/ProjectTrolleybus/ProjectTrolleybus/Drawnings/DrawningTrolleyB.cs
index cf2d12f..ab71e3d 100644
--- a/ProjectTrolleybus/ProjectTrolleybus/Drawnings/DrawningTrolleyB.cs
+++ b/ProjectTrolleybus/ProjectTrolleybus/Drawnings/DrawningTrolleyB.cs
@@ -130,12 +130,14 @@ public class DrawningTrolleyB
     /// </summary>
     /// <param name="x">Координата X</param>
     /// <param name="y">Координата Y</param>
-    public void SetPosition(int x, int y)
+    public void SetPosition(int x, int y, int width, int height)
     {
         if (!_pictureWidth.HasValue || !_pictureHeight.HasValue)
         {
             return;
         }
+
+        //TODO если при установке объекта в эти координаты, он будет "выходить" за границы формы
         //то надо изменить координаты, чтобы он оставался в этих границах
         if (x + _drawningVehicleWidth > _pictureWidth)
         {
@@ -150,6 +152,7 @@ public class DrawningTrolleyB
         }
         else if (y < 0) _startPosY = 0;
         else _startPosY = y;
+    
     }
 
 
diff --git a/ProjectTrolleybus/ProjectTrolleybus/FormTrolleyBCollection.cs b/ProjectTrolleybus/ProjectTrolleybus/FormTrolleyBCollection.cs
index 233da71..ff8799d 100644
--- a/ProjectTrolleybus/ProjectTrolleybus/FormTrolleyBCollection.cs
+++ b/ProjectTrolleybus/ProjectTrolleybus/FormTrolleyBCollection.cs
@@ -50,7 +50,7 @@ public partial class FormTrolleyBCollection : Form
 	/// Добавление автомобиля в коллекцию
 	/// </summary>
 	/// <param name="car"></param>
-	private void SetTrolleyB(DrawningTrolleyB? trolleyB)
+	private void SetTrolleyB(DrawningTrolleyB trolleyB)
     {
         if (_company == null || trolleyB == null)
         {
diff --git a/ProjectTrolleybus/ProjectTrolleybus/FormTrolleyBConfig.cs b/ProjectTrolleybus/ProjectTrolleybus/FormTrolleyBConfig.cs
index 1d744b0..331e262 100644
--- a/ProjectTrolleybus/ProjectTrolleybus/FormTrolleyBConfig.cs
+++ b/ProjectTrolleybus/ProjectTrolleybus/FormTrolleyBConfig.cs
@@ -24,6 +24,7 @@ public partial class FormTrolleyBConfig : Form
     /// </summary>
     public FormTrolleyBConfig()
     {
+        InitializeComponent();
         panelRed.MouseDown += Panel_MouseDown;
         panelGreen.MouseDown += Panel_MouseDown;
         panelBlue.MouseDown += Panel_MouseDown;
@@ -35,7 +36,7 @@ public partial class FormTrolleyBConfig : Form
 
         buttonCancel.Click += (s, e) => Close();
 
-        InitializeComponent();
+        
     }
 
     /// <summary>
@@ -55,7 +56,7 @@ public partial class FormTrolleyBConfig : Form
         Bitmap bmp = new(pictureBoxObject.Width, pictureBoxObject.Height);
         Graphics gr = Graphics.FromImage(bmp);
         _trolleyB?.SetPictureSize(pictureBoxObject.Width, pictureBoxObject.Height);
-        _trolleyB?.SetPosition(5, 5);
+        _trolleyB?.SetPosition(5, 5, Width, Height);
         _trolleyB?.DrawTransport(gr);
         pictureBoxObject.Image = bmp;
     }