From a71ffaf757e01c6fc8ef27361654797c8e678346 Mon Sep 17 00:00:00 2001 From: vasmaae Date: Tue, 13 Feb 2024 10:47:36 +0400 Subject: [PATCH 1/7] =?UTF-8?q?=D0=9B=D0=B0=D0=B1=D0=BE=D1=80=D0=B0=D1=82?= =?UTF-8?q?=D0=BE=D1=80=D0=BD=D0=B0=D1=8F=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82?= =?UTF-8?q?=D0=B0=20=E2=84=961?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ProjectAirbus/ProjectAirbus/DirectionType.cs | 27 +++ ProjectAirbus/ProjectAirbus/DrawningAirbus.cs | 208 ++++++++++++++++++ ProjectAirbus/ProjectAirbus/EntityAirbus.cs | 67 ++++++ ProjectAirbus/ProjectAirbus/Form1.Designer.cs | 39 ---- ProjectAirbus/ProjectAirbus/Form1.cs | 10 - .../ProjectAirbus/FormAirbus.Designer.cs | 137 ++++++++++++ ProjectAirbus/ProjectAirbus/FormAirbus.cs | 92 ++++++++ .../{Form1.resx => FormAirbus.resx} | 50 ++--- ProjectAirbus/ProjectAirbus/Program.cs | 2 +- .../ProjectAirbus/ProjectAirbus.csproj | 15 ++ .../Properties/Resources.Designer.cs | 103 +++++++++ .../ProjectAirbus/Properties/Resources.resx | 133 +++++++++++ .../ProjectAirbus/Resources/DownArrow.jpg | Bin 0 -> 9111 bytes .../ProjectAirbus/Resources/DownArrow1.jpg | Bin 0 -> 6410 bytes .../ProjectAirbus/Resources/LeftArrow.jpg | Bin 0 -> 6208 bytes .../ProjectAirbus/Resources/LeftArrow1.jpg | Bin 0 -> 6544 bytes .../ProjectAirbus/Resources/RightArrow.jpg | Bin 0 -> 9025 bytes .../ProjectAirbus/Resources/RightArrow1.jpg | Bin 0 -> 6611 bytes .../ProjectAirbus/Resources/UpArrow.jpg | Bin 0 -> 9105 bytes .../ProjectAirbus/Resources/UpArrow1.jpg | Bin 0 -> 6435 bytes 20 files changed, 808 insertions(+), 75 deletions(-) create mode 100644 ProjectAirbus/ProjectAirbus/DirectionType.cs create mode 100644 ProjectAirbus/ProjectAirbus/DrawningAirbus.cs create mode 100644 ProjectAirbus/ProjectAirbus/EntityAirbus.cs delete mode 100644 ProjectAirbus/ProjectAirbus/Form1.Designer.cs delete mode 100644 ProjectAirbus/ProjectAirbus/Form1.cs create mode 100644 ProjectAirbus/ProjectAirbus/FormAirbus.Designer.cs create mode 100644 ProjectAirbus/ProjectAirbus/FormAirbus.cs rename ProjectAirbus/ProjectAirbus/{Form1.resx => FormAirbus.resx} (93%) create mode 100644 ProjectAirbus/ProjectAirbus/Properties/Resources.Designer.cs create mode 100644 ProjectAirbus/ProjectAirbus/Properties/Resources.resx create mode 100644 ProjectAirbus/ProjectAirbus/Resources/DownArrow.jpg create mode 100644 ProjectAirbus/ProjectAirbus/Resources/DownArrow1.jpg create mode 100644 ProjectAirbus/ProjectAirbus/Resources/LeftArrow.jpg create mode 100644 ProjectAirbus/ProjectAirbus/Resources/LeftArrow1.jpg create mode 100644 ProjectAirbus/ProjectAirbus/Resources/RightArrow.jpg create mode 100644 ProjectAirbus/ProjectAirbus/Resources/RightArrow1.jpg create mode 100644 ProjectAirbus/ProjectAirbus/Resources/UpArrow.jpg create mode 100644 ProjectAirbus/ProjectAirbus/Resources/UpArrow1.jpg diff --git a/ProjectAirbus/ProjectAirbus/DirectionType.cs b/ProjectAirbus/ProjectAirbus/DirectionType.cs new file mode 100644 index 0000000..377bd27 --- /dev/null +++ b/ProjectAirbus/ProjectAirbus/DirectionType.cs @@ -0,0 +1,27 @@ +namespace ProjectAirbus; + +/// +/// Направление перемещения +/// +public enum DirectionType +{ + /// + /// Вверх + /// + Up = 1, + + /// + /// Вниз + /// + Down = 2, + + /// + /// Влево + /// + Left = 3, + + /// + /// Вправо + /// + Right = 4, +} \ No newline at end of file diff --git a/ProjectAirbus/ProjectAirbus/DrawningAirbus.cs b/ProjectAirbus/ProjectAirbus/DrawningAirbus.cs new file mode 100644 index 0000000..d6a173d --- /dev/null +++ b/ProjectAirbus/ProjectAirbus/DrawningAirbus.cs @@ -0,0 +1,208 @@ +using System.Drawing; + +namespace ProjectAirbus; + +/// +/// Класс отрисовки и перемещения объекта-сущности +/// +public class DrawningAirbus +{ + /// + /// Класс-сущность + /// + public EntityAirbus? EntityAirbus { get; private set; } + + /// + /// Ширина окна + /// + private int? _pictureWidth; + + /// + /// Высота окна + /// + private int? _pictureHeight; + + /// + /// Начальная координата х + /// + private int? _startPosX; + + /// + /// Начальная координата у + /// + private int? _startPosY; + + /// + /// Ширина самолета + /// + private readonly int _drawningAirbusWidth = 145; + + /// + /// Высота самолета + /// + private readonly int _drawningAirbusHeight = 50; + + /// + /// Инициализация свойств + /// + /// Скорость + /// Вес + /// Основной цвет + /// Дополнительный цвет + /// + public void Init(int speed, double weight, Color bodyColor, Color additionalColor, bool additionalEngine, + bool passengerCompartment) + { + EntityAirbus = new EntityAirbus(); + EntityAirbus.Init(speed, weight, bodyColor, additionalColor, additionalEngine, passengerCompartment); + _pictureWidth = null; + _pictureHeight = null; + _startPosX = null; + _startPosY = null; + } + + /// + /// Установка границ поля + /// + /// Ширина поля + /// Высота поля + /// + public bool SetPictureSize(int width, int height) + { + if (width < _drawningAirbusWidth || height < _drawningAirbusHeight) return false; + _pictureWidth = width; + _pictureHeight = height; + return true; + } + + /// + /// установка позиции самолёта + /// + /// Координата Х + /// Координата Y + public void SetPosition(int x, int y) + { + if (!_pictureHeight.HasValue || !_pictureWidth.HasValue) + { + return; + } + + if (x + _drawningAirbusWidth > _pictureWidth.Value) { x = 0; } + if (y + _drawningAirbusHeight > _pictureHeight.Value) { y = 0; } + + _startPosX = x; + _startPosY = y; + } + + /// + /// Выбор направления перемещения + /// + /// Направлениие + /// true - перемещение возможно и выполнено, false - перемещение невозможно и не выполнено + public bool MoveTransport(DirectionType direction) + { + if (EntityAirbus == null || !_startPosX.HasValue || !_startPosY.HasValue) + { + return false; + } + + switch (direction) + { + case DirectionType.Left: + if (_startPosX.Value - EntityAirbus.Step > 0) + { + _startPosX -= (int)EntityAirbus.Step; + } + return true; + case DirectionType.Up: + if (_startPosY - EntityAirbus.Step > 0) + { + _startPosY -= (int)EntityAirbus.Step; + } + return true; + case DirectionType.Right: + if (_startPosX + EntityAirbus.Step < _pictureWidth - _drawningAirbusWidth) + { + _startPosX += (int)EntityAirbus.Step; + } + return true; + case DirectionType.Down: + if (_startPosY + EntityAirbus.Step < _pictureHeight - _drawningAirbusHeight) + { + _startPosY += (int)EntityAirbus.Step; + } + return true; + default: + return false; + } + } + + /// + /// Отрисовка самолёта + /// + /// + public void DrawTransport(Graphics g) + { + if (EntityAirbus == null || !_startPosX.HasValue || !_startPosY.HasValue) + { + return; + } + + Pen pen = new(Color.Black); + Brush brushBodyColor = new SolidBrush(EntityAirbus.BodyColor); + Brush brushAdditionalColor = new SolidBrush(EntityAirbus.AdditionalColor); + Brush brushBlack = new SolidBrush(Color.Black); + + //границы самолёта + g.DrawLine(pen, _startPosX.Value, _startPosY.Value, _startPosX.Value, _startPosY.Value + 20); + g.DrawLine(pen, _startPosX.Value, _startPosY.Value, _startPosX.Value + 20, _startPosY.Value + 20); + g.DrawRectangle(pen, _startPosX.Value, _startPosY.Value + 20, 120, 10); + g.DrawRectangle(pen, _startPosX.Value + 10, _startPosY.Value + 30, 110, 10); + g.DrawEllipse(pen, _startPosX.Value, _startPosY.Value + 20, 20, 20); + g.DrawLine(pen, _startPosX.Value + 120, _startPosY.Value + 20, _startPosX.Value + 145, _startPosY.Value + 30); + g.DrawLine(pen, _startPosX.Value + 120, _startPosY.Value + 40, _startPosX.Value + 145, _startPosY.Value + 30); + g.DrawLine(pen, _startPosX.Value + 120, _startPosY.Value + 30, _startPosX.Value + 145, _startPosY.Value + 30); + + //дополнительный отсек для пассажиров + if (EntityAirbus.PassengerCompartment) + { + g.DrawRectangle(pen, _startPosX.Value + 60, _startPosY.Value + 10, 40, 10); + g.DrawEllipse(pen, _startPosX.Value + 50, _startPosY.Value + 10, 20, 20); + g.DrawEllipse(pen, _startPosX.Value + 90, _startPosY.Value + 10, 20, 20); + + g.FillRectangle(brushAdditionalColor, _startPosX.Value + 60, _startPosY.Value + 11, 40, 10); + g.FillEllipse(brushAdditionalColor, _startPosX.Value + 50, _startPosY.Value + 10, 20, 20); + g.FillEllipse(brushAdditionalColor, _startPosX.Value + 90, _startPosY.Value + 10, 20, 20); + } + + //шасси + g.DrawLine(pen, _startPosX.Value + 40, _startPosY.Value + 40, _startPosX.Value + 40, _startPosY.Value + 44); + g.DrawEllipse(pen, _startPosX.Value + 34, _startPosY.Value + 44, 6, 6); + g.DrawEllipse(pen, _startPosX.Value + 40, _startPosY.Value + 44, 6, 6); + g.DrawLine(pen, _startPosX.Value + 110, _startPosY.Value + 40, _startPosX.Value + 110, _startPosY.Value + 44); + g.DrawEllipse(pen, _startPosX.Value + 107, _startPosY.Value + 44, 6, 6); + + //фюзеляж + g.FillEllipse(brushBodyColor, _startPosX.Value, _startPosY.Value + 20, 20, 20); + g.FillRectangle(brushBodyColor, _startPosX.Value + 1, _startPosY.Value + 21, 119, 10); + g.FillRectangle(brushBodyColor, _startPosX.Value + 10, _startPosY.Value + 30, 110, 10); + + //двигатель в хвосте + g.FillEllipse(brushBlack, _startPosX.Value, _startPosY.Value + 15, 8, 8); + g.FillEllipse(brushBlack, _startPosX.Value + 12, _startPosY.Value + 15, 8, 8); + g.FillRectangle(brushBlack, _startPosX.Value + 4, _startPosY.Value + 15, 12, 8); + + //дополнительный двигатель на крыле + if (EntityAirbus.AdditionalEngine) + { + g.FillEllipse(brushAdditionalColor, _startPosX.Value + 48, _startPosY.Value + 30, 8, 8); + g.FillEllipse(brushAdditionalColor, _startPosX.Value + 60, _startPosY.Value + 30, 8, 8); + g.FillRectangle(brushAdditionalColor, _startPosX.Value + 52, _startPosY.Value + 30, 12, 8); + } + + //крыло + g.FillRectangle(brushBlack, _startPosX.Value + 40, _startPosY.Value + 28, 40, 4); + g.FillEllipse(brushBlack, _startPosX.Value + 38, _startPosY.Value + 28, 4, 4); + g.FillEllipse(brushBlack, _startPosX.Value + 78, _startPosY.Value + 28, 4, 4); + } +} \ No newline at end of file diff --git a/ProjectAirbus/ProjectAirbus/EntityAirbus.cs b/ProjectAirbus/ProjectAirbus/EntityAirbus.cs new file mode 100644 index 0000000..2aabd02 --- /dev/null +++ b/ProjectAirbus/ProjectAirbus/EntityAirbus.cs @@ -0,0 +1,67 @@ +namespace ProjectAirbus; + +/// +/// Класс-сущность "Аэробус" +/// +public class EntityAirbus +{ + /// + /// Скорость + /// + public int Speed { get; private set; } + + /// + /// Вес + /// + public double Weight { get; private set; } + + /// + /// Основной цвет + /// + public Color BodyColor { get; private set; } + + /// + /// Дополнительный цвет + /// + public Color AdditionalColor { get; private set; } + + /// + /// Опция наличия дополнительного двигателя + /// + public bool AdditionalEngine { get; private set; } + + /// + /// Опция наличия дополнительного отсека для пассажиров + /// + public bool PassengerCompartment { get; private set; } + + /// + /// Количество иллюминаторов + /// + public int NumberOfPortholes { get; private set; } + + /// + /// Шаг перемещения автомобиля + /// + public double Step => Speed * 100 / Weight; + + /// + /// Инициализация полей объекта-класса аэробуса + /// + /// Скорость + /// Вес + /// Основной цвет + /// Дополнительный цвет + /// Опция наличия дополнительного двигателя + /// Опция наличия + public void Init(int speed, double weight, Color bodyColor, Color additionalColor, bool additionalEngine, + bool passengerCompartment) + { + Speed = speed; + Weight = weight; + BodyColor = bodyColor; + AdditionalColor = additionalColor; + AdditionalEngine = additionalEngine; + PassengerCompartment = passengerCompartment; + } +} diff --git a/ProjectAirbus/ProjectAirbus/Form1.Designer.cs b/ProjectAirbus/ProjectAirbus/Form1.Designer.cs deleted file mode 100644 index 2cef376..0000000 --- a/ProjectAirbus/ProjectAirbus/Form1.Designer.cs +++ /dev/null @@ -1,39 +0,0 @@ -namespace ProjectAirbus -{ - partial class Form1 - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Windows Form Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - this.components = new System.ComponentModel.Container(); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(800, 450); - this.Text = "Form1"; - } - - #endregion - } -} diff --git a/ProjectAirbus/ProjectAirbus/Form1.cs b/ProjectAirbus/ProjectAirbus/Form1.cs deleted file mode 100644 index 012e18e..0000000 --- a/ProjectAirbus/ProjectAirbus/Form1.cs +++ /dev/null @@ -1,10 +0,0 @@ -namespace ProjectAirbus -{ - public partial class Form1 : Form - { - public Form1() - { - InitializeComponent(); - } - } -} diff --git a/ProjectAirbus/ProjectAirbus/FormAirbus.Designer.cs b/ProjectAirbus/ProjectAirbus/FormAirbus.Designer.cs new file mode 100644 index 0000000..0db8d7a --- /dev/null +++ b/ProjectAirbus/ProjectAirbus/FormAirbus.Designer.cs @@ -0,0 +1,137 @@ +namespace ProjectAirbus +{ + partial class FormAirbus + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + pictureBoxAirbus = new PictureBox(); + buttonCreateAirBus = new Button(); + buttonLeft = new Button(); + buttonUp = new Button(); + buttonRight = new Button(); + buttonDown = new Button(); + ((System.ComponentModel.ISupportInitialize)pictureBoxAirbus).BeginInit(); + SuspendLayout(); + // + // pictureBoxAirbus + // + pictureBoxAirbus.Dock = DockStyle.Fill; + pictureBoxAirbus.Location = new Point(0, 0); + pictureBoxAirbus.Name = "pictureBoxAirbus"; + pictureBoxAirbus.Size = new Size(1042, 564); + pictureBoxAirbus.SizeMode = PictureBoxSizeMode.AutoSize; + pictureBoxAirbus.TabIndex = 0; + pictureBoxAirbus.TabStop = false; + // + // buttonCreateAirBus + // + buttonCreateAirBus.Anchor = AnchorStyles.Bottom | AnchorStyles.Left; + buttonCreateAirBus.Location = new Point(12, 529); + buttonCreateAirBus.Name = "buttonCreateAirBus"; + buttonCreateAirBus.Size = new Size(75, 23); + buttonCreateAirBus.TabIndex = 1; + buttonCreateAirBus.Text = "Создать"; + buttonCreateAirBus.UseVisualStyleBackColor = true; + buttonCreateAirBus.Click += ButtonCreateAirbus_Click; + // + // buttonLeft + // + buttonLeft.Anchor = AnchorStyles.Bottom | AnchorStyles.Right; + buttonLeft.BackgroundImage = Properties.Resources.LeftArrow; + buttonLeft.BackgroundImageLayout = ImageLayout.Stretch; + buttonLeft.Location = new Point(908, 517); + buttonLeft.Name = "buttonLeft"; + buttonLeft.Size = new Size(35, 35); + buttonLeft.TabIndex = 2; + buttonLeft.UseVisualStyleBackColor = true; + buttonLeft.Click += ButtonMove_Click; + // + // buttonUp + // + buttonUp.Anchor = AnchorStyles.Bottom | AnchorStyles.Right; + buttonUp.BackgroundImage = Properties.Resources.UpArrow; + buttonUp.BackgroundImageLayout = ImageLayout.Stretch; + buttonUp.Location = new Point(949, 476); + buttonUp.Name = "buttonUp"; + buttonUp.Size = new Size(35, 35); + buttonUp.TabIndex = 3; + buttonUp.UseVisualStyleBackColor = true; + buttonUp.Click += ButtonMove_Click; + // + // buttonRight + // + buttonRight.Anchor = AnchorStyles.Bottom | AnchorStyles.Right; + buttonRight.BackgroundImage = Properties.Resources.RightArrow; + buttonRight.BackgroundImageLayout = ImageLayout.Stretch; + buttonRight.Location = new Point(990, 517); + buttonRight.Name = "buttonRight"; + buttonRight.Size = new Size(35, 35); + buttonRight.TabIndex = 4; + buttonRight.UseVisualStyleBackColor = true; + buttonRight.Click += ButtonMove_Click; + // + // buttonDown + // + buttonDown.Anchor = AnchorStyles.Bottom | AnchorStyles.Right; + buttonDown.BackgroundImage = Properties.Resources.DownArrow; + buttonDown.BackgroundImageLayout = ImageLayout.Stretch; + buttonDown.Location = new Point(949, 517); + buttonDown.Name = "buttonDown"; + buttonDown.Size = new Size(35, 35); + buttonDown.TabIndex = 5; + buttonDown.UseVisualStyleBackColor = true; + buttonDown.Click += ButtonMove_Click; + // + // FormAirbus + // + AutoScaleDimensions = new SizeF(7F, 15F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(1042, 564); + Controls.Add(buttonDown); + Controls.Add(buttonRight); + Controls.Add(buttonUp); + Controls.Add(buttonLeft); + Controls.Add(buttonCreateAirBus); + Controls.Add(pictureBoxAirbus); + Margin = new Padding(3, 2, 3, 2); + Name = "FormAirbus"; + Text = "Аэробус"; + ((System.ComponentModel.ISupportInitialize)pictureBoxAirbus).EndInit(); + ResumeLayout(false); + PerformLayout(); + } + + #endregion + + private PictureBox pictureBoxAirbus; + private Button buttonCreateAirBus; + private Button buttonLeft; + private Button buttonUp; + private Button buttonRight; + private Button buttonDown; + } +} \ No newline at end of file diff --git a/ProjectAirbus/ProjectAirbus/FormAirbus.cs b/ProjectAirbus/ProjectAirbus/FormAirbus.cs new file mode 100644 index 0000000..39c018d --- /dev/null +++ b/ProjectAirbus/ProjectAirbus/FormAirbus.cs @@ -0,0 +1,92 @@ +namespace ProjectAirbus + +{ + /// + /// Форма работающая с обектом "самолёт" + /// + public partial class FormAirbus : Form + { + /// + /// Поле-объект для отрисовки объекта + /// + private DrawningAirbus? _drawningAirbus; + + /// + /// Конструктор формы + /// + public FormAirbus() + { + InitializeComponent(); + } + + /// + /// метод прорисовки машины + /// + private void Draw() + { + if (_drawningAirbus == null) + { + return; + } + + Bitmap bmp = new(pictureBoxAirbus.Width, pictureBoxAirbus.Height); + Graphics gr = Graphics.FromImage(bmp); + _drawningAirbus.DrawTransport(gr); + pictureBoxAirbus.Image = bmp; + } + + /// + /// Обработка кнопки "создать" + /// + /// + /// + private void ButtonCreateAirbus_Click(object sender, EventArgs e) + { + Random random = new(); + _drawningAirbus = new DrawningAirbus(); + _drawningAirbus.Init(random.Next(100, 300), random.Next(1000, 3000), + Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)), + Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)), + Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2))); + _drawningAirbus.SetPictureSize(pictureBoxAirbus.Width, pictureBoxAirbus.Height); + _drawningAirbus.SetPosition(random.Next(10, 100), random.Next(10, 100)); + + Draw(); + } + + /// + /// Обработка кнопок перемещения объекта + /// + /// + /// + private void ButtonMove_Click(object sender, EventArgs e) + { + if (_drawningAirbus == null) + { + return; + } + + String name = ((Button)sender)?.Name ?? String.Empty; + bool result = false; + switch (name) { + case "buttonUp": + result = _drawningAirbus.MoveTransport(DirectionType.Up); + break; + case "buttonDown": + result = _drawningAirbus.MoveTransport(DirectionType.Down); + break; + case "buttonLeft": + result = _drawningAirbus.MoveTransport(DirectionType.Left); + break; + case "buttonRight": + result = _drawningAirbus.MoveTransport(DirectionType.Right); + break; + } + + if (result) + { + Draw(); + } + } + } +} diff --git a/ProjectAirbus/ProjectAirbus/Form1.resx b/ProjectAirbus/ProjectAirbus/FormAirbus.resx similarity index 93% rename from ProjectAirbus/ProjectAirbus/Form1.resx rename to ProjectAirbus/ProjectAirbus/FormAirbus.resx index 1af7de1..af32865 100644 --- a/ProjectAirbus/ProjectAirbus/Form1.resx +++ b/ProjectAirbus/ProjectAirbus/FormAirbus.resx @@ -1,17 +1,17 @@  - diff --git a/ProjectAirbus/ProjectAirbus/Program.cs b/ProjectAirbus/ProjectAirbus/Program.cs index a39e589..9d45ae4 100644 --- a/ProjectAirbus/ProjectAirbus/Program.cs +++ b/ProjectAirbus/ProjectAirbus/Program.cs @@ -11,7 +11,7 @@ namespace ProjectAirbus // To customize application configuration such as set high DPI settings or default font, // see https://aka.ms/applicationconfiguration. ApplicationConfiguration.Initialize(); - Application.Run(new Form1()); + Application.Run(new FormAirbus()); } } } \ No newline at end of file diff --git a/ProjectAirbus/ProjectAirbus/ProjectAirbus.csproj b/ProjectAirbus/ProjectAirbus/ProjectAirbus.csproj index 663fdb8..af03d74 100644 --- a/ProjectAirbus/ProjectAirbus/ProjectAirbus.csproj +++ b/ProjectAirbus/ProjectAirbus/ProjectAirbus.csproj @@ -8,4 +8,19 @@ enable + + + True + True + Resources.resx + + + + + + ResXFileCodeGenerator + Resources.Designer.cs + + + \ No newline at end of file diff --git a/ProjectAirbus/ProjectAirbus/Properties/Resources.Designer.cs b/ProjectAirbus/ProjectAirbus/Properties/Resources.Designer.cs new file mode 100644 index 0000000..d177efb --- /dev/null +++ b/ProjectAirbus/ProjectAirbus/Properties/Resources.Designer.cs @@ -0,0 +1,103 @@ +//------------------------------------------------------------------------------ +// +// Этот код создан программой. +// Исполняемая версия:4.0.30319.42000 +// +// Изменения в этом файле могут привести к неправильной работе и будут потеряны в случае +// повторной генерации кода. +// +//------------------------------------------------------------------------------ + +namespace ProjectAirbus.Properties { + using System; + + + /// + /// Класс ресурса со строгой типизацией для поиска локализованных строк и т.д. + /// + // Этот класс создан автоматически классом StronglyTypedResourceBuilder + // с помощью такого средства, как ResGen или Visual Studio. + // Чтобы добавить или удалить член, измените файл .ResX и снова запустите ResGen + // с параметром /str или перестройте свой проект VS. + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + internal class Resources { + + private static global::System.Resources.ResourceManager resourceMan; + + private static global::System.Globalization.CultureInfo resourceCulture; + + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] + internal Resources() { + } + + /// + /// Возвращает кэшированный экземпляр ResourceManager, использованный этим классом. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Resources.ResourceManager ResourceManager { + get { + if (object.ReferenceEquals(resourceMan, null)) { + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("ProjectAirbus.Properties.Resources", typeof(Resources).Assembly); + resourceMan = temp; + } + return resourceMan; + } + } + + /// + /// Перезаписывает свойство CurrentUICulture текущего потока для всех + /// обращений к ресурсу с помощью этого класса ресурса со строгой типизацией. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Globalization.CultureInfo Culture { + get { + return resourceCulture; + } + set { + resourceCulture = value; + } + } + + /// + /// Поиск локализованного ресурса типа System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap DownArrow { + get { + object obj = ResourceManager.GetObject("DownArrow", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Поиск локализованного ресурса типа System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap LeftArrow { + get { + object obj = ResourceManager.GetObject("LeftArrow", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Поиск локализованного ресурса типа System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap RightArrow { + get { + object obj = ResourceManager.GetObject("RightArrow", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Поиск локализованного ресурса типа System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap UpArrow { + get { + object obj = ResourceManager.GetObject("UpArrow", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + } +} diff --git a/ProjectAirbus/ProjectAirbus/Properties/Resources.resx b/ProjectAirbus/ProjectAirbus/Properties/Resources.resx new file mode 100644 index 0000000..925faa9 --- /dev/null +++ b/ProjectAirbus/ProjectAirbus/Properties/Resources.resx @@ -0,0 +1,133 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + ..\Resources\DownArrow1.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\LeftArrow1.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\RightArrow1.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\UpArrow1.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + \ No newline at end of file diff --git a/ProjectAirbus/ProjectAirbus/Resources/DownArrow.jpg b/ProjectAirbus/ProjectAirbus/Resources/DownArrow.jpg new file mode 100644 index 0000000000000000000000000000000000000000..5a307d83d1cc1deccc66dae88e45f824f0d095ba GIT binary patch literal 9111 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 e?zJQ@K{)m8<*)19aW7&{#P~?EN3HqJQ=P literal 0 HcmV?d00001 diff --git a/ProjectAirbus/ProjectAirbus/Resources/LeftArrow1.jpg b/ProjectAirbus/ProjectAirbus/Resources/LeftArrow1.jpg new file mode 100644 index 0000000000000000000000000000000000000000..eaf30a7c74c79cab698ef2e80319f5b9619f9b34 GIT binary patch literal 6544 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 literal 0 HcmV?d00001 diff --git a/ProjectAirbus/ProjectAirbus/Resources/RightArrow.jpg b/ProjectAirbus/ProjectAirbus/Resources/RightArrow.jpg new file mode 100644 index 0000000000000000000000000000000000000000..706120af7361ab85b98663a93c5544c520417be0 GIT binary patch literal 9025 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 literal 0 HcmV?d00001 diff --git a/ProjectAirbus/ProjectAirbus/Resources/RightArrow1.jpg b/ProjectAirbus/ProjectAirbus/Resources/RightArrow1.jpg new file mode 100644 index 0000000000000000000000000000000000000000..63f053b2d8cfcc5f108cfd58dae469f4d71a0b25 GIT binary patch literal 6611 zcmeHLc|25m|371lv9DuDG(<&cwM85$TdssFjB2!7uB4E%91*T9QBk@XSrS57Ybukq z)RhJqMp^5k3^QdJ%<`NmE%!dpb6>ybcklDxbIkX3X8D}Y`Mlrf^Lc+hU%YPK03f~H z%GL@%AP|5j{0H!Qfvo^iK!E>(4?*~a5=Nl}1yQ1Cw2-j4sJOV8sF;|9q^z`rq>QAP zm^4;eMh+t{FE1{opoqmN%3|a(d?yGbe2pMV1ceg8NQg;b{^Nu92#^s*cpG;57m`06?JNX!!vz9tZ(AMj^DYh^QEBP$dlrAdpA_K_owF*g72k9T1d3$*Qg2 zA|&Uy54}79v*AqYbzyajJ9Y9-6o$se{l}w3M6n8rOO#fuT&1bCT2J4=&}ftK)@_zn z);6}=oqu%MxE>uIHLCj$SvP+Mi^s}di_qF zi26n+hW!5H6j7{(-rx!*AKE8m|2JS!|1V@;fqlb81H_RC_~9XC01)6f=OkzX|66~N zgS$LHG3)?Cp`o|2g6WX_z+~`#&Cd7!#Xh$^Y@VK$E*%)|BT1ke@vaG#m-X!xoGZHY zo}D2reJ0W#a&TGEsEzul7t$g@Gh5*AUbTKaASyDVU4dA!c6{=tFU`!kF|+Ea7wyNo ztzxI%SRYuAj=rOw8d-;mimub2x)gDo2h{oHsSiMra-bGdPSz~Fod?8cOFh}+i|^cQ zU-a51v*c}a{>?s{j@^6q*tFZ}Bpr9Za__MIB;n2^{mKvz=uvNKf91W+Cqk~XAbI+l zkmvoQQ9_8E<6@SYlEJVIy0XWJ|r%uH$ZE^f&6NFSyqCskXE2^5>EjdMiV_ zCkFb+r%pCE9XCm0dR$`9bDIg(Jm6;@aNwbbOQJ)&PS}>g*TKJa**iTSe^RmBLPM~3 zLv8o#vw7G+&tTPI`Gxz8`$Lb<*6N3tQJc&}y9TIJ+UW<+y^{}AyEvGdT2ERxaSJh% zEm{3{(@i$w0Rz?jAGSr{ctCf3|GfQ*h;yzZhHUIhXsC%L@^G`2^@!hE)=uc0159oYBoVN`y z$0aYjSebRP5^%J{05Swi?qeQMO-O_eLW;Hlc^6-9)+%%m>8ji$54K-I0?d0$b5pn0 z3LE)fT&KFmEHJOv9M?gupG@G&vN{G92pE>OM>OF@sh!TroyFJ13&d}olc&H4rK*Ce z*vtsNZ`VZdAVHxeD1Tk&1MR|AIbXbZQRMC-G$Qx>?|2)8(~W$#R*z-e(X{tdx-HFl zrqU@o2J^P-zrY)LGdNJaga^ciGOP>OE3|k(UWWWUj&KcPcz|=NWNas|Kkf7aVTsxKX(dr9U^$w8VW_`H0WQ=raZ<)&N?cU+$WIB8P(F)Iu$1gpj~zay zDjr6+u>>Fof>^Cih~2PjG(F65pya3oWN}xgFi3zT-7u-G9{Hq!bX)MWs|TSCHx4Zv z3aOZ}WQM*P`+)=}o7Rw@uSM!ku}eut5=+nHwJ;{0NkRkb)U3cTGX?f82C+E>jSnfV z!@sU2XTQd}O=R!-VZ$#QjE%&TOo{>Pd?4teqa}d(lO?}(FST+~boAu>^E;tJSM%M> zXANC5*2rq^x72z5YX|`B@Zp5n@c>j9^KkAUu}6ZgvvS?zQs3%Kzn;BfTg$zla&-le z^h|(RmWX5E@2jkB%rF3@HVcuSUpV?!!KJH|hCGonWaDV-Vwz}R^Da047|2*?TMAM1 zUVsc^h*8$+XlIVg|NWP_T->Q)|M`_9G*_sND?e9q#)<+P5f}?)i&q*zj2k?lVRExS zac*U%5cq!PG@DA(q-i3j3KlQUM03#&Tnq#o!8*RJ!<+{^8sh==Wc@o<|K5zsH|zOi zR-Ld8wkzi1g7~q(?%-H3ZLIK-bB0ihK7$Ls|8Sb!of8RehX!Y}40u3}cQ!N-$O8tg z*=8S``={*nq}Y-~w)RJS0>IJa0dajHz1;YMI3B=9UH~;rJm5$6-7UScrP^KLrt><4 zQPaZcZ72e1q+fUdo+(9p&lQy!a-dB^(JyTn7HCT z#XSfV_i?JHJ&##k+FO;hPH2;8I$Rbkb;R9Q!hlpC4~QXRAE+}c>Sp@17(4C>k+1LG zXq5pgiK}z0wYBJI!@@1Zn}AjzsPoTqmqBG?*L0br^k5YN(xV%LomN$xI#KrF0O2^b z5oEai05#yqoFpvx6c4ZsR0>bn=R~Sl8eCKY@S1tA&BZL2SH|w^-Bi)@$A|FXQG>@!+6xOfE4NOk^Z;o zwF70*{Y}9E#CqBoc?Rat=JTi<1Q;X)8AOU|=6qWl;Y7P%=q=Fx zO)G6WD`|jcP6BXDZ)fFa`GjQ@@Es#}x6Qm_;>JUZe1^AErZ~_RYN_tQm%9Gq#jEqo zJb8fiq3}ERMF=|Y2IxC3>wjFKh6lJ=X7X%2Bc-_w-5XL+XZ%Kq8*{8xX^%x|%$^-f zRFt(B(dxr2HZ7=eySX}?RJMn1U(&O}kONMcSh%xY0$>&a$0xd&1QmuApF{xng8nb% zQJw*^v58!J=Z5|nLmD)uLJwyW1mWrK$e=fPNJS(gFG9ES@O*e01KOa8WEutM-pvlq z=c<{D^fUAGCRs2ITXIrwA~bU{{D2jhJg3k2cifxl&a!Khldw$ckZ0o7bW}{ zA%j7=EQ{P9x%Q9A!T;>qKxDY(Ni3)}+q4j5dSvJyegISTXH~)s;f|2tM=sYtGPwsY| zk)eVR#nvODU_9b6mjrE%gRWF zI<5r84ENbY?^!s`vSUaZ--9ph9@^3k#lM*?$^184i&`aEshc&yavhCoVdjcdBz5)# zlN+u*foBzPMd<@2c1``|IyI-m{8xJ^y)G>dE~Gw@X+`3)Hx{xrk&L^+`FYNE<|vF~ zCZL(CcNi|F)+O*JW}_7>H%XMQU-Gk}^_z@;|D0T@{kMtZxLXk~mo2yVb@xbKHCRhD z^5~sL?VYRpjn>Zt4qrG=#`}-2`oxt(f`VHYHXJs(woZW*m0Z4e9S_I|g=QWS&S#Az za3~BYI?y4GyQG6{I@r3Q-%J1xF|X`VO(l){ZGKBWv&+i4 zK}#@7N>Hi75{L+4?}Dja&o*WT-&>PA(1!JiKu39tr`%}qA;mm^#+&X@I-v)XyA{|* zv^H*{MnB6wg}c41lcb6K(7{#qJ;DPl(;)Urcnn?P1dj>Hba1r16&~xJ@_-L65&4eh zxO9jy?BOu4QvnU?fpe>`@c>D~O1OnTGvvx?^MDqY`Acvhc&H)yCmt|bZVz7!ZwB5J zfrHJ}(3JZsctZFI;`@RJlXN2N3!K-v0JnYv*jWZw+20!uA>E(767J?{#nY=30CojD z04UKQ%Au<~K;$}niyz61;n2?^Y#_5Q5efr$qTd#-;%KZZv*LQm`h&kA|q(1B} zrv>E79e{682n{yR5U1P^!%-cA=2nxPZe~k816ctj1stq9nQ;{dyEozX5*QBhoD?=X zJ0xwbvS9+%xpT)g4Zr+EP-o75`EAa}H~S5y=mgTGISO3gm2GTI2*CqRa%CMjRhg0C z(z^V-sr=t>vuhu6VxWEYCuWM6nq5JG#O*Bqf?u%I-o)e~>2QIlnTFL`@OmY85-+e*wHUR?)WX z7oJL2=D682Ma8~v}Ewv%)+~y!2(C$8pWEQlipAY_y zmD&fKv(P?Mf0&UCzQ%W9Mgj`9qh_+r+}G}go;|!bJsl1 zJz;|?EYUg&BS#Iv{-|O@1eGb{&yLd!5FNW8bfP*H`w$p$tQYm0cZH_ACwi&-pG$zU5OE3URK?iB0&8C zi^+lSfs-SCF*&5rER$_4Xz&`?(5KSj*{-+8Obu0XshoaJLnV%t<#4)ZvFm>6zJK+s zJ(AK}GviI1$!DR$2a^qcjBCUy*cN-6`J&F*U8ZzAJJI8=5!AMS3!ShP*3M@<;M`{9 z5Exs#oM_J66(64MGxJ!sr~eVf#`MwA>>2fFf@4G@#Bd;Dxb3wXm0b_)4ulU*#&*3u zNZgse5krb>lkqtEKI?;L(LyGt`))a?KHed|J tJ=k=^V|0EEQ97#Y>C529vXTvKhgA=MqWt+T`OkLH|NHH~#~sA$`3FK`BDeqm literal 0 HcmV?d00001 diff --git a/ProjectAirbus/ProjectAirbus/Resources/UpArrow.jpg b/ProjectAirbus/ProjectAirbus/Resources/UpArrow.jpg new file mode 100644 index 0000000000000000000000000000000000000000..b5d97ad04f4b50ce85c25671ce2557be737dea57 GIT binary patch literal 9105 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 literal 0 HcmV?d00001 diff --git a/ProjectAirbus/ProjectAirbus/Resources/UpArrow1.jpg b/ProjectAirbus/ProjectAirbus/Resources/UpArrow1.jpg new file mode 100644 index 0000000000000000000000000000000000000000..bb185677b644ffa3c3690eeb13afb927037a6c8d GIT binary patch literal 6435 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 Date: Tue, 13 Feb 2024 19:55:51 +0400 Subject: [PATCH 2/7] =?UTF-8?q?=D0=9B=D0=B0=D0=B1=D0=BE=D1=80=D0=B0=D1=82?= =?UTF-8?q?=D0=BE=D1=80=D0=BD=D0=B0=D1=8F=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82?= =?UTF-8?q?=D0=B0=20=E2=84=961?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ProjectAirbus/ProjectAirbus/DrawningAirbus.cs | 13 ++++------ ProjectAirbus/ProjectAirbus/EntityAirbus.cs | 7 +----- ProjectAirbus/ProjectAirbus/FormAirbus.cs | 25 ++++++++++++++++++- 3 files changed, 30 insertions(+), 15 deletions(-) diff --git a/ProjectAirbus/ProjectAirbus/DrawningAirbus.cs b/ProjectAirbus/ProjectAirbus/DrawningAirbus.cs index d6a173d..a1f22e3 100644 --- a/ProjectAirbus/ProjectAirbus/DrawningAirbus.cs +++ b/ProjectAirbus/ProjectAirbus/DrawningAirbus.cs @@ -16,7 +16,7 @@ public class DrawningAirbus /// Ширина окна /// private int? _pictureWidth; - + /// /// Высота окна /// @@ -26,7 +26,7 @@ public class DrawningAirbus /// Начальная координата х /// private int? _startPosX; - + /// /// Начальная координата у /// @@ -35,12 +35,12 @@ public class DrawningAirbus /// /// Ширина самолета /// - private readonly int _drawningAirbusWidth = 145; + public readonly int _drawningAirbusWidth = 145; /// /// Высота самолета /// - private readonly int _drawningAirbusHeight = 50; + public readonly int _drawningAirbusHeight = 50; /// /// Инициализация свойств @@ -49,9 +49,7 @@ public class DrawningAirbus /// Вес /// Основной цвет /// Дополнительный цвет - /// - public void Init(int speed, double weight, Color bodyColor, Color additionalColor, bool additionalEngine, - bool passengerCompartment) + public void Init(int speed, double weight, Color bodyColor, Color additionalColor, bool additionalEngine, bool passengerCompartment) { EntityAirbus = new EntityAirbus(); EntityAirbus.Init(speed, weight, bodyColor, additionalColor, additionalEngine, passengerCompartment); @@ -69,7 +67,6 @@ public class DrawningAirbus /// public bool SetPictureSize(int width, int height) { - if (width < _drawningAirbusWidth || height < _drawningAirbusHeight) return false; _pictureWidth = width; _pictureHeight = height; return true; diff --git a/ProjectAirbus/ProjectAirbus/EntityAirbus.cs b/ProjectAirbus/ProjectAirbus/EntityAirbus.cs index 2aabd02..3296488 100644 --- a/ProjectAirbus/ProjectAirbus/EntityAirbus.cs +++ b/ProjectAirbus/ProjectAirbus/EntityAirbus.cs @@ -35,11 +35,6 @@ public class EntityAirbus /// public bool PassengerCompartment { get; private set; } - /// - /// Количество иллюминаторов - /// - public int NumberOfPortholes { get; private set; } - /// /// Шаг перемещения автомобиля /// @@ -53,7 +48,7 @@ public class EntityAirbus /// Основной цвет /// Дополнительный цвет /// Опция наличия дополнительного двигателя - /// Опция наличия + /// Опция наличия дополнительного отсека для пассажиров public void Init(int speed, double weight, Color bodyColor, Color additionalColor, bool additionalEngine, bool passengerCompartment) { diff --git a/ProjectAirbus/ProjectAirbus/FormAirbus.cs b/ProjectAirbus/ProjectAirbus/FormAirbus.cs index 39c018d..4ca834f 100644 --- a/ProjectAirbus/ProjectAirbus/FormAirbus.cs +++ b/ProjectAirbus/ProjectAirbus/FormAirbus.cs @@ -1,4 +1,6 @@ -namespace ProjectAirbus +using System.Diagnostics; + +namespace ProjectAirbus { /// @@ -35,6 +37,24 @@ pictureBoxAirbus.Image = bmp; } + /// + /// проверка, что объект влезает в размеры формы, если нет - форма увеличивается ровно так, чтобы вместить + /// + 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); + } + } + /// /// Обработка кнопки "создать" /// @@ -48,9 +68,12 @@ Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)), Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)), Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2))); + _drawningAirbus.SetPictureSize(pictureBoxAirbus.Width, pictureBoxAirbus.Height); + FormAirbusSizeChanged(); _drawningAirbus.SetPosition(random.Next(10, 100), random.Next(10, 100)); + Draw(); } -- 2.25.1 From a2ddb6d06eacc243e65fc61a1d8a17a24784a440 Mon Sep 17 00:00:00 2001 From: vasmaae Date: Wed, 14 Feb 2024 04:36:54 +0400 Subject: [PATCH 3/7] =?UTF-8?q?=D0=9B=D0=B0=D0=B1=D0=BE=D1=80=D0=B0=D1=82?= =?UTF-8?q?=D0=BE=D1=80=D0=BD=D0=B0=D1=8F=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82?= =?UTF-8?q?=D0=B0=20=E2=84=961?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectAirbus/Resources/DownArrow.jpg | Bin 9111 -> 0 bytes .../ProjectAirbus/Resources/LeftArrow.jpg | Bin 6208 -> 0 bytes .../ProjectAirbus/Resources/RightArrow.jpg | Bin 9025 -> 0 bytes .../ProjectAirbus/Resources/UpArrow.jpg | Bin 9105 -> 0 bytes 4 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 ProjectAirbus/ProjectAirbus/Resources/DownArrow.jpg delete mode 100644 ProjectAirbus/ProjectAirbus/Resources/LeftArrow.jpg delete mode 100644 ProjectAirbus/ProjectAirbus/Resources/RightArrow.jpg delete mode 100644 ProjectAirbus/ProjectAirbus/Resources/UpArrow.jpg diff --git a/ProjectAirbus/ProjectAirbus/Resources/DownArrow.jpg b/ProjectAirbus/ProjectAirbus/Resources/DownArrow.jpg deleted file mode 100644 index 5a307d83d1cc1deccc66dae88e45f824f0d095ba..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9111 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 e?zJQ@K{)m8<*)19aW7&{#P~?EN3HqJQ=P diff --git a/ProjectAirbus/ProjectAirbus/Resources/RightArrow.jpg b/ProjectAirbus/ProjectAirbus/Resources/RightArrow.jpg deleted file mode 100644 index 706120af7361ab85b98663a93c5544c520417be0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9025 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 diff --git a/ProjectAirbus/ProjectAirbus/Resources/UpArrow.jpg b/ProjectAirbus/ProjectAirbus/Resources/UpArrow.jpg deleted file mode 100644 index b5d97ad04f4b50ce85c25671ce2557be737dea57..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9105 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 -- 2.25.1 From cb18d4e7c24d55e7a6dc4e8eac5dfd3c26bef743 Mon Sep 17 00:00:00 2001 From: vasmaae Date: Sun, 25 Feb 2024 00:57:48 +0400 Subject: [PATCH 4/7] =?UTF-8?q?=D0=9B=D0=B0=D0=B1=D0=BE=D1=80=D0=B0=D1=82?= =?UTF-8?q?=D0=BE=D1=80=D0=BD=D0=B0=D1=8F=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82?= =?UTF-8?q?=D0=B0=20=E2=84=961?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ProjectAirbus/ProjectAirbus/DrawningAirbus.cs | 33 +++++++++++++++---- ProjectAirbus/ProjectAirbus/FormAirbus.cs | 19 ----------- 2 files changed, 27 insertions(+), 25 deletions(-) diff --git a/ProjectAirbus/ProjectAirbus/DrawningAirbus.cs b/ProjectAirbus/ProjectAirbus/DrawningAirbus.cs index a1f22e3..6d56340 100644 --- a/ProjectAirbus/ProjectAirbus/DrawningAirbus.cs +++ b/ProjectAirbus/ProjectAirbus/DrawningAirbus.cs @@ -67,9 +67,28 @@ public class DrawningAirbus /// public bool SetPictureSize(int width, int height) { - _pictureWidth = width; - _pictureHeight = height; - return true; + if (width > _drawningAirbusWidth && height > _drawningAirbusHeight) + { + _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; + } /// @@ -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; } + + } /// diff --git a/ProjectAirbus/ProjectAirbus/FormAirbus.cs b/ProjectAirbus/ProjectAirbus/FormAirbus.cs index 4ca834f..f5fb646 100644 --- a/ProjectAirbus/ProjectAirbus/FormAirbus.cs +++ b/ProjectAirbus/ProjectAirbus/FormAirbus.cs @@ -37,24 +37,6 @@ namespace ProjectAirbus pictureBoxAirbus.Image = bmp; } - /// - /// проверка, что объект влезает в размеры формы, если нет - форма увеличивается ровно так, чтобы вместить - /// - 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); - } - } - /// /// Обработка кнопки "создать" /// @@ -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)); -- 2.25.1 From 2b073c8fbc9fcf8fc817c199c7cd04547fda1ec2 Mon Sep 17 00:00:00 2001 From: vasmaae Date: Sun, 25 Feb 2024 01:06:00 +0400 Subject: [PATCH 5/7] =?UTF-8?q?=D0=9B=D0=B0=D0=B1=D0=BE=D1=80=D0=B0=D1=82?= =?UTF-8?q?=D0=BE=D1=80=D0=BD=D0=B0=D1=8F=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82?= =?UTF-8?q?=D0=B0=20=E2=84=961?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ProjectAirbus/ProjectAirbus/DrawningAirbus.cs | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/ProjectAirbus/ProjectAirbus/DrawningAirbus.cs b/ProjectAirbus/ProjectAirbus/DrawningAirbus.cs index 6d56340..83a6c86 100644 --- a/ProjectAirbus/ProjectAirbus/DrawningAirbus.cs +++ b/ProjectAirbus/ProjectAirbus/DrawningAirbus.cs @@ -106,8 +106,14 @@ public class DrawningAirbus _startPosX = x; _startPosY = y; - if (_startPosX + _drawningAirbusWidth > _pictureWidth.Value) { _startPosX = 0; } - if (_startPosY + _drawningAirbusHeight > _pictureHeight.Value) { _startPosY = 0; } + if (_startPosX + _drawningAirbusWidth > _pictureWidth.Value) + { + _startPosX = _pictureWidth.Value - _drawningAirbusWidth; + } + if (_startPosY + _drawningAirbusHeight > _pictureHeight.Value) + { + _startPosY = _pictureHeight.Value - _drawningAirbusHeight; + } } -- 2.25.1 From 620c166dcc1b81f9a45cccd6ace84a730a6df202 Mon Sep 17 00:00:00 2001 From: vasmaae Date: Sun, 25 Feb 2024 04:26:04 +0400 Subject: [PATCH 6/7] =?UTF-8?q?=D0=9B=D0=B0=D0=B1=D0=BE=D1=80=D0=B0=D1=82?= =?UTF-8?q?=D0=BE=D1=80=D0=BD=D0=B0=D1=8F=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82?= =?UTF-8?q?=D0=B0=20=E2=84=961?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ProjectAirbus/ProjectAirbus/DrawningAirbus.cs | 2 -- 1 file changed, 2 deletions(-) diff --git a/ProjectAirbus/ProjectAirbus/DrawningAirbus.cs b/ProjectAirbus/ProjectAirbus/DrawningAirbus.cs index 83a6c86..9bd986a 100644 --- a/ProjectAirbus/ProjectAirbus/DrawningAirbus.cs +++ b/ProjectAirbus/ProjectAirbus/DrawningAirbus.cs @@ -73,8 +73,6 @@ public class DrawningAirbus _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; -- 2.25.1 From b3f02eed2701a4f02be7e3c1de921db498aa698e Mon Sep 17 00:00:00 2001 From: vasmaae Date: Tue, 27 Feb 2024 09:50:31 +0400 Subject: [PATCH 7/7] =?UTF-8?q?=D0=9B=D0=B0=D0=B1=D0=BE=D1=80=D0=B0=D1=82?= =?UTF-8?q?=D0=BE=D1=80=D0=BD=D0=B0=D1=8F=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82?= =?UTF-8?q?=D0=B0=20=E2=84=961?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ProjectAirbus/ProjectAirbus/DrawningAirbus.cs | 28 ++++++++++--------- ProjectAirbus/ProjectAirbus/FormAirbus.cs | 1 - 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/ProjectAirbus/ProjectAirbus/DrawningAirbus.cs b/ProjectAirbus/ProjectAirbus/DrawningAirbus.cs index 9bd986a..dde2026 100644 --- a/ProjectAirbus/ProjectAirbus/DrawningAirbus.cs +++ b/ProjectAirbus/ProjectAirbus/DrawningAirbus.cs @@ -82,7 +82,6 @@ public class DrawningAirbus _startPosY = _pictureHeight - _drawningAirbusHeight; } } - return true; } return false; @@ -100,20 +99,23 @@ public class DrawningAirbus { return; } + else + { + _startPosX = x; + _startPosY = y; - _startPosX = x; - _startPosY = y; - - if (_startPosX + _drawningAirbusWidth > _pictureWidth.Value) - { - _startPosX = _pictureWidth.Value - _drawningAirbusWidth; - } - if (_startPosY + _drawningAirbusHeight > _pictureHeight.Value) - { - _startPosY = _pictureHeight.Value - _drawningAirbusHeight; - } + if (_startPosX < 0) _startPosX = 0; + if (_startPosY < 0) _startPosY = 0; - + if (_startPosX + _drawningAirbusWidth > _pictureWidth.Value) + { + _startPosX = _pictureWidth.Value - _drawningAirbusWidth; + } + if (_startPosY + _drawningAirbusHeight > _pictureHeight.Value) + { + _startPosY = _pictureHeight.Value - _drawningAirbusHeight; + } + } } /// diff --git a/ProjectAirbus/ProjectAirbus/FormAirbus.cs b/ProjectAirbus/ProjectAirbus/FormAirbus.cs index f5fb646..e84ff77 100644 --- a/ProjectAirbus/ProjectAirbus/FormAirbus.cs +++ b/ProjectAirbus/ProjectAirbus/FormAirbus.cs @@ -54,7 +54,6 @@ namespace ProjectAirbus _drawningAirbus.SetPictureSize(pictureBoxAirbus.Width, pictureBoxAirbus.Height); _drawningAirbus.SetPosition(random.Next(10, 100), random.Next(10, 100)); - Draw(); } -- 2.25.1