Лабораторная работа №1

ProjectAirbus/ProjectAirbus/DrawningAirbus.cs

@@ -67,9 +67,28 @@ public class DrawningAirbus
     /// <returns></returns>
     public bool SetPictureSize(int width, int height)
     {
-        _pictureWidth = width;
+        if (width > _drawningAirbusWidth && height > _drawningAirbusHeight)
-        _pictureHeight = height;
+        {
-        return true;
+            _pictureWidth = width;
+            _pictureHeight = height;
+            if (_startPosX != null && _startPosY != null)
+            {
+                if (_startPosX.Value < 0) _startPosX = 0;
+                if (_startPosY.Value < 0) _startPosY = 0;
+                if (_startPosX.Value + _drawningAirbusWidth > _pictureWidth)
+                {
+                    _startPosX = _pictureWidth - _drawningAirbusWidth;
+                }
+                if (_startPosY.Value + _drawningAirbusHeight > _pictureHeight)
+                {
+                    _startPosY = _pictureHeight - _drawningAirbusHeight;
+                }
+            }
+
+            return true;
+        }
+        return false;
+
     }
 
     /// <summary>
@@ -84,11 +103,13 @@ public class DrawningAirbus
             return;
         }
 
-        if (x + _drawningAirbusWidth > _pictureWidth.Value) { x = 0; }
-        if (y + _drawningAirbusHeight > _pictureHeight.Value) { y = 0; }
-
         _startPosX = x;
         _startPosY = y;
+        
+        if (_startPosX + _drawningAirbusWidth > _pictureWidth.Value) { _startPosX = 0; }
+        if (_startPosY + _drawningAirbusHeight > _pictureHeight.Value) { _startPosY = 0; }
+
+        
     }
 
     /// <summary>

ProjectAirbus/ProjectAirbus/FormAirbus.cs

@@ -37,24 +37,6 @@ namespace ProjectAirbus
             pictureBoxAirbus.Image = bmp;
         }
 
-        /// <summary>
-        /// проверка, что объект влезает в размеры формы, если нет - форма увеличивается ровно так, чтобы вместить
-        /// </summary>
-        private void FormAirbusSizeChanged()
-        {
-            if (this.Width < _drawningAirbus._drawningAirbusWidth)
-            {
-                this.Width = _drawningAirbus._drawningAirbusWidth + 20;
-                _drawningAirbus.SetPictureSize(this.Width, this.Height);
-            }
-            
-            if (this.Height < _drawningAirbus._drawningAirbusHeight + 40)
-            {
-                this.Height = _drawningAirbus._drawningAirbusHeight + 40;
-                _drawningAirbus.SetPictureSize(this.Width, this.Height);
-            }
-        }
-
         /// <summary>
         /// Обработка кнопки "создать"
         /// </summary>
@@ -70,7 +52,6 @@ namespace ProjectAirbus
                 Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2)));
 
             _drawningAirbus.SetPictureSize(pictureBoxAirbus.Width, pictureBoxAirbus.Height);
-            FormAirbusSizeChanged();
             _drawningAirbus.SetPosition(random.Next(10, 100), random.Next(10, 100));