From e946dbbd54cce008a5752883979887cee15fc685 Mon Sep 17 00:00:00 2001 From: ikswi Date: Sun, 7 Apr 2024 22:58:03 +0400 Subject: [PATCH 1/4] =?UTF-8?q?5=20=D0=BB=D0=B0=D0=B1=D0=BE=D1=80=D0=B0?= =?UTF-8?q?=D1=82=D0=BE=D1=80=D0=BD=D0=B0=D1=8F=20=D1=80=D0=B0=D0=B1=D0=BE?= =?UTF-8?q?=D1=82=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AirFighter/Entities/EntityAirFighter.cs | 5 + .../Entities/EntityMilitaryAircraft.cs | 5 + ...FormMilitaryAircraftCollection.Designer.cs | 1 - .../FormMilitaryAircraftCollection.cs | 62 +-- .../FormMilitaryAircraftConfig.Designer.cs | 357 ++++++++++++++++++ .../AirFighter/FormMilitaryAircraftConfig.cs | 162 ++++++++ .../FormMilitaryAircraftConfig.resx | 120 ++++++ .../AirFighter/MilitaryAircraftDelegate.cs | 9 + 8 files changed, 674 insertions(+), 47 deletions(-) create mode 100644 AirFighter/AirFighter/FormMilitaryAircraftConfig.Designer.cs create mode 100644 AirFighter/AirFighter/FormMilitaryAircraftConfig.cs create mode 100644 AirFighter/AirFighter/FormMilitaryAircraftConfig.resx create mode 100644 AirFighter/AirFighter/MilitaryAircraftDelegate.cs diff --git a/AirFighter/AirFighter/Entities/EntityAirFighter.cs b/AirFighter/AirFighter/Entities/EntityAirFighter.cs index c42b4fb..c377bfd 100644 --- a/AirFighter/AirFighter/Entities/EntityAirFighter.cs +++ b/AirFighter/AirFighter/Entities/EntityAirFighter.cs @@ -7,6 +7,11 @@ public class EntityAirFighter : EntityMilitaryAircraft { public Color AdditionalColor { get; private set; } + public void SetAdditionalColor(Color additionalColor) + { + AdditionalColor = additionalColor; + } + public bool Wings { get; private set; } public bool Rockets { get; private set; } diff --git a/AirFighter/AirFighter/Entities/EntityMilitaryAircraft.cs b/AirFighter/AirFighter/Entities/EntityMilitaryAircraft.cs index 94cc9ea..3f52185 100644 --- a/AirFighter/AirFighter/Entities/EntityMilitaryAircraft.cs +++ b/AirFighter/AirFighter/Entities/EntityMilitaryAircraft.cs @@ -11,6 +11,11 @@ public class EntityMilitaryAircraft public Color BodyColor { get; private set; } + public void SetBodyColor(Color bodyColor) + { + BodyColor = bodyColor; + } + public double Step => Speed * 100 / Weight; /// diff --git a/AirFighter/AirFighter/FormMilitaryAircraftCollection.Designer.cs b/AirFighter/AirFighter/FormMilitaryAircraftCollection.Designer.cs index 9c271e1..d107903 100644 --- a/AirFighter/AirFighter/FormMilitaryAircraftCollection.Designer.cs +++ b/AirFighter/AirFighter/FormMilitaryAircraftCollection.Designer.cs @@ -211,7 +211,6 @@ buttonAddAirFighter.TabIndex = 2; buttonAddAirFighter.Text = "Добавление истребителя"; buttonAddAirFighter.UseVisualStyleBackColor = true; - buttonAddAirFighter.Click += buttonAddAirFighter_Click; // // buttonAddMilitaryAircraft // diff --git a/AirFighter/AirFighter/FormMilitaryAircraftCollection.cs b/AirFighter/AirFighter/FormMilitaryAircraftCollection.cs index 5f83bc8..1e6fea7 100644 --- a/AirFighter/AirFighter/FormMilitaryAircraftCollection.cs +++ b/AirFighter/AirFighter/FormMilitaryAircraftCollection.cs @@ -35,43 +35,30 @@ public partial class FormMilitaryAircraftCollection : Form } /// - /// Добавление самолёта + /// Добавление военного самолёта /// /// /// - private void buttonAddMilitaryAircraft_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningMilitaryAircraft)); - - /// - /// Добавление истребителя - /// - /// - /// - private void buttonAddAirFighter_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningAirFighter)); - - private void CreateObject(string type) + private void buttonAddMilitaryAircraft_Click(object sender, EventArgs e) { - if (_company == null) + FormMilitaryAircraftConfig form = new(); + form.Show(); + form.AddEvent(SetMilitaryAircraft); + } + + + // + /// Добавление военного самолёта в коллекцию + /// + /// + private void SetMilitaryAircraft(DrawningMilitaryAircraft? militaryAircraft) + { + if (_company == null || militaryAircraft == null) { return; } - Random random = new(); - DrawningMilitaryAircraft drawningMilitaryAircraft; - switch (type) - { - case nameof(DrawningMilitaryAircraft): - drawningMilitaryAircraft = new DrawningMilitaryAircraft(random.Next(100, 300), random.Next(1000, 3000), GetColor(random)); - break; - case nameof(DrawningAirFighter): - drawningMilitaryAircraft = new DrawningAirFighter(random.Next(100, 300), random.Next(1000, 3000), - GetColor(random), GetColor(random), - Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2))); - break; - default: - return; - } - - if (_company + drawningMilitaryAircraft != -1) + if (_company + militaryAircraft != -1) { MessageBox.Show("Объект добавлен"); pictureBox.Image = _company.Show(); @@ -82,23 +69,6 @@ public partial class FormMilitaryAircraftCollection : Form } } - /// - /// Получение цвета - /// - /// Генератор случайных чисел - /// - private static Color GetColor(Random random) - { - Color color = Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)); - ColorDialog dialog = new(); - if (dialog.ShowDialog() == DialogResult.OK) - { - color = dialog.Color; - } - - return color; - } - /// /// Удаление объекта diff --git a/AirFighter/AirFighter/FormMilitaryAircraftConfig.Designer.cs b/AirFighter/AirFighter/FormMilitaryAircraftConfig.Designer.cs new file mode 100644 index 0000000..754c7ef --- /dev/null +++ b/AirFighter/AirFighter/FormMilitaryAircraftConfig.Designer.cs @@ -0,0 +1,357 @@ +namespace ProjectAirFighter +{ + partial class FormMilitaryAircraftConfig + { + /// + /// 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() + { + groupBoxConfig = new GroupBox(); + groupBoxColors = new GroupBox(); + panelBlueViolet = new Panel(); + panelBlack = new Panel(); + panelGray = new Panel(); + panelWhite = new Panel(); + panelYellow = new Panel(); + panelBlue = new Panel(); + panelGreen = new Panel(); + panelRed = new Panel(); + checkBoxRockets = new CheckBox(); + checkBoxWings = new CheckBox(); + numericUpDownWeight = new NumericUpDown(); + labelWeight = new Label(); + numericUpDownSpeed = new NumericUpDown(); + labelSpeed = new Label(); + labelModifiedObject = new Label(); + labelSimpleObject = new Label(); + pictureBoxObject = new PictureBox(); + buttonAdd = new Button(); + buttonCancel = new Button(); + panelObject = new Panel(); + labelAdditionalColor = new Label(); + labelBodyColor = new Label(); + groupBoxConfig.SuspendLayout(); + groupBoxColors.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)numericUpDownWeight).BeginInit(); + ((System.ComponentModel.ISupportInitialize)numericUpDownSpeed).BeginInit(); + ((System.ComponentModel.ISupportInitialize)pictureBoxObject).BeginInit(); + panelObject.SuspendLayout(); + SuspendLayout(); + // + // groupBoxConfig + // + groupBoxConfig.Controls.Add(groupBoxColors); + groupBoxConfig.Controls.Add(checkBoxRockets); + groupBoxConfig.Controls.Add(checkBoxWings); + groupBoxConfig.Controls.Add(numericUpDownWeight); + groupBoxConfig.Controls.Add(labelWeight); + groupBoxConfig.Controls.Add(numericUpDownSpeed); + groupBoxConfig.Controls.Add(labelSpeed); + groupBoxConfig.Controls.Add(labelModifiedObject); + groupBoxConfig.Controls.Add(labelSimpleObject); + groupBoxConfig.Dock = DockStyle.Left; + groupBoxConfig.Location = new Point(0, 0); + groupBoxConfig.Name = "groupBoxConfig"; + groupBoxConfig.Size = new Size(604, 207); + groupBoxConfig.TabIndex = 0; + groupBoxConfig.TabStop = false; + groupBoxConfig.Text = "Параметры"; + // + // groupBoxColors + // + groupBoxColors.Controls.Add(panelBlueViolet); + groupBoxColors.Controls.Add(panelBlack); + groupBoxColors.Controls.Add(panelGray); + groupBoxColors.Controls.Add(panelWhite); + groupBoxColors.Controls.Add(panelYellow); + groupBoxColors.Controls.Add(panelBlue); + groupBoxColors.Controls.Add(panelGreen); + groupBoxColors.Controls.Add(panelRed); + groupBoxColors.Location = new Point(347, 12); + groupBoxColors.Name = "groupBoxColors"; + groupBoxColors.Size = new Size(250, 125); + groupBoxColors.TabIndex = 1; + groupBoxColors.TabStop = false; + groupBoxColors.Text = "Цвета"; + // + // panelBlueViolet + // + panelBlueViolet.BackColor = Color.BlueViolet; + panelBlueViolet.Location = new Point(196, 83); + panelBlueViolet.Name = "panelBlueViolet"; + panelBlueViolet.Size = new Size(36, 36); + panelBlueViolet.TabIndex = 9; + // + // panelBlack + // + panelBlack.BackColor = Color.Black; + panelBlack.Location = new Point(136, 83); + panelBlack.Name = "panelBlack"; + panelBlack.Size = new Size(36, 36); + panelBlack.TabIndex = 11; + // + // panelGray + // + panelGray.BackColor = Color.Gray; + panelGray.Location = new Point(77, 83); + panelGray.Name = "panelGray"; + panelGray.Size = new Size(36, 36); + panelGray.TabIndex = 10; + // + // panelWhite + // + panelWhite.BackColor = Color.White; + panelWhite.Location = new Point(15, 83); + panelWhite.Name = "panelWhite"; + panelWhite.Size = new Size(36, 36); + panelWhite.TabIndex = 9; + // + // panelYellow + // + panelYellow.BackColor = Color.Yellow; + panelYellow.Location = new Point(196, 26); + panelYellow.Name = "panelYellow"; + panelYellow.Size = new Size(36, 36); + panelYellow.TabIndex = 9; + // + // panelBlue + // + panelBlue.BackColor = Color.Blue; + panelBlue.Location = new Point(136, 26); + panelBlue.Name = "panelBlue"; + panelBlue.Size = new Size(36, 36); + panelBlue.TabIndex = 9; + // + // panelGreen + // + panelGreen.BackColor = Color.Green; + panelGreen.Location = new Point(77, 26); + panelGreen.Name = "panelGreen"; + panelGreen.Size = new Size(36, 36); + panelGreen.TabIndex = 9; + // + // panelRed + // + panelRed.BackColor = Color.Red; + panelRed.Location = new Point(15, 26); + panelRed.Name = "panelRed"; + panelRed.Size = new Size(36, 36); + panelRed.TabIndex = 8; + // + // checkBoxRockets + // + checkBoxRockets.AutoSize = true; + checkBoxRockets.Location = new Point(6, 154); + checkBoxRockets.Name = "checkBoxRockets"; + checkBoxRockets.Size = new Size(339, 24); + checkBoxRockets.TabIndex = 7; + checkBoxRockets.Text = "Признак наличия дополнительных крыльев"; + checkBoxRockets.UseVisualStyleBackColor = true; + // + // checkBoxWings + // + checkBoxWings.AutoSize = true; + checkBoxWings.Location = new Point(6, 124); + checkBoxWings.Name = "checkBoxWings"; + checkBoxWings.Size = new Size(318, 24); + checkBoxWings.TabIndex = 6; + checkBoxWings.Text = "Признак наличия дополнительных ракет"; + checkBoxWings.UseVisualStyleBackColor = true; + // + // numericUpDownWeight + // + numericUpDownWeight.Location = new Point(102, 75); + numericUpDownWeight.Maximum = new decimal(new int[] { 1000, 0, 0, 0 }); + numericUpDownWeight.Minimum = new decimal(new int[] { 100, 0, 0, 0 }); + numericUpDownWeight.Name = "numericUpDownWeight"; + numericUpDownWeight.Size = new Size(126, 27); + numericUpDownWeight.TabIndex = 5; + numericUpDownWeight.Value = new decimal(new int[] { 100, 0, 0, 0 }); + // + // labelWeight + // + labelWeight.AutoSize = true; + labelWeight.Location = new Point(12, 75); + labelWeight.Name = "labelWeight"; + labelWeight.Size = new Size(36, 20); + labelWeight.TabIndex = 4; + labelWeight.Text = "Вес:"; + // + // numericUpDownSpeed + // + numericUpDownSpeed.Location = new Point(102, 32); + numericUpDownSpeed.Maximum = new decimal(new int[] { 1000, 0, 0, 0 }); + numericUpDownSpeed.Minimum = new decimal(new int[] { 100, 0, 0, 0 }); + numericUpDownSpeed.Name = "numericUpDownSpeed"; + numericUpDownSpeed.Size = new Size(126, 27); + numericUpDownSpeed.TabIndex = 3; + numericUpDownSpeed.Value = new decimal(new int[] { 100, 0, 0, 0 }); + // + // labelSpeed + // + labelSpeed.AutoSize = true; + labelSpeed.Location = new Point(12, 34); + labelSpeed.Name = "labelSpeed"; + labelSpeed.Size = new Size(76, 20); + labelSpeed.TabIndex = 2; + labelSpeed.Text = "Скорость:"; + // + // labelModifiedObject + // + labelModifiedObject.BorderStyle = BorderStyle.FixedSingle; + labelModifiedObject.Location = new Point(466, 154); + labelModifiedObject.Name = "labelModifiedObject"; + labelModifiedObject.Size = new Size(113, 36); + labelModifiedObject.TabIndex = 1; + labelModifiedObject.Text = "Продвинутый"; + labelModifiedObject.TextAlign = ContentAlignment.MiddleCenter; + labelModifiedObject.MouseDown += LabelObject_MouseDown; + // + // labelSimpleObject + // + labelSimpleObject.BorderStyle = BorderStyle.FixedSingle; + labelSimpleObject.Location = new Point(347, 154); + labelSimpleObject.Name = "labelSimpleObject"; + labelSimpleObject.Size = new Size(113, 36); + labelSimpleObject.TabIndex = 0; + labelSimpleObject.Text = "Простой"; + labelSimpleObject.TextAlign = ContentAlignment.MiddleCenter; + labelSimpleObject.MouseDown += LabelObject_MouseDown; + // + // pictureBoxObject + // + pictureBoxObject.Location = new Point(3, 49); + pictureBoxObject.Name = "pictureBoxObject"; + pictureBoxObject.Size = new Size(185, 99); + pictureBoxObject.TabIndex = 0; + pictureBoxObject.TabStop = false; + // + // buttonAdd + // + buttonAdd.Location = new Point(610, 166); + buttonAdd.Name = "buttonAdd"; + buttonAdd.Size = new Size(85, 29); + buttonAdd.TabIndex = 1; + buttonAdd.Text = "Добавить"; + buttonAdd.UseVisualStyleBackColor = true; + buttonAdd.Click += buttonAdd_Click; + // + // buttonCancel + // + buttonCancel.Location = new Point(716, 166); + buttonCancel.Name = "buttonCancel"; + buttonCancel.Size = new Size(85, 29); + buttonCancel.TabIndex = 2; + buttonCancel.Text = "Отмена"; + buttonCancel.UseVisualStyleBackColor = true; + // + // panelObject + // + panelObject.AllowDrop = true; + panelObject.Controls.Add(labelAdditionalColor); + panelObject.Controls.Add(labelBodyColor); + panelObject.Controls.Add(pictureBoxObject); + panelObject.Location = new Point(610, 0); + panelObject.Name = "panelObject"; + panelObject.Size = new Size(191, 160); + panelObject.TabIndex = 3; + panelObject.DragDrop += PanelObject_DragDrop; + panelObject.DragEnter += PanelObject_DragEnter; + // + // labelAdditionalColor + // + labelAdditionalColor.AllowDrop = true; + labelAdditionalColor.BorderStyle = BorderStyle.FixedSingle; + labelAdditionalColor.Location = new Point(100, 9); + labelAdditionalColor.Name = "labelAdditionalColor"; + labelAdditionalColor.Size = new Size(88, 36); + labelAdditionalColor.TabIndex = 2; + labelAdditionalColor.Text = "Доп. цвет"; + labelAdditionalColor.TextAlign = ContentAlignment.MiddleCenter; + labelAdditionalColor.DragDrop += LabelColors_DragDrop; + labelAdditionalColor.DragEnter += LabelColors_DragEnter; + // + // labelBodyColor + // + labelBodyColor.AllowDrop = true; + labelBodyColor.BorderStyle = BorderStyle.FixedSingle; + labelBodyColor.Location = new Point(3, 9); + labelBodyColor.Name = "labelBodyColor"; + labelBodyColor.Size = new Size(88, 36); + labelBodyColor.TabIndex = 1; + labelBodyColor.Text = "Цвет"; + labelBodyColor.TextAlign = ContentAlignment.MiddleCenter; + labelBodyColor.DragDrop += LabelColors_DragDrop; + labelBodyColor.DragEnter += LabelColors_DragEnter; + // + // FormMilitaryAircraftConfig + // + AutoScaleDimensions = new SizeF(8F, 20F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(800, 207); + Controls.Add(panelObject); + Controls.Add(buttonCancel); + Controls.Add(buttonAdd); + Controls.Add(groupBoxConfig); + Name = "FormMilitaryAircraftConfig"; + Text = "Создание объекта"; + groupBoxConfig.ResumeLayout(false); + groupBoxConfig.PerformLayout(); + groupBoxColors.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)numericUpDownWeight).EndInit(); + ((System.ComponentModel.ISupportInitialize)numericUpDownSpeed).EndInit(); + ((System.ComponentModel.ISupportInitialize)pictureBoxObject).EndInit(); + panelObject.ResumeLayout(false); + ResumeLayout(false); + } + + #endregion + + private GroupBox groupBoxConfig; + private Label labelModifiedObject; + private Label labelSimpleObject; + private Label labelWeight; + private NumericUpDown numericUpDownSpeed; + private Label labelSpeed; + private NumericUpDown numericUpDownWeight; + private CheckBox checkBoxRockets; + private CheckBox checkBoxWings; + private GroupBox groupBoxColors; + private Panel panelRed; + private Panel panelBlueViolet; + private Panel panelBlack; + private Panel panelGray; + private Panel panelWhite; + private Panel panelYellow; + private Panel panelBlue; + private Panel panelGreen; + private PictureBox pictureBoxObject; + private Button buttonAdd; + private Button buttonCancel; + private Panel panelObject; + private Label labelAdditionalColor; + private Label labelBodyColor; + } +} \ No newline at end of file diff --git a/AirFighter/AirFighter/FormMilitaryAircraftConfig.cs b/AirFighter/AirFighter/FormMilitaryAircraftConfig.cs new file mode 100644 index 0000000..9653392 --- /dev/null +++ b/AirFighter/AirFighter/FormMilitaryAircraftConfig.cs @@ -0,0 +1,162 @@ +using ProjectAirFighter.Drawnings; +using ProjectAirFighter.Entities; +namespace ProjectAirFighter; + +/// +/// Форма конфигурации объекта +/// +public partial class FormMilitaryAircraftConfig : Form +{ + /// + /// Объект - прорисовка автомобиля + /// + private DrawningMilitaryAircraft? _militaryAircraft; + + /// + /// Событие для передачи объекта + /// + private event Action? MilitaryAircraftDelegate; + + /// + /// Конструктор + /// + public FormMilitaryAircraftConfig() + { + InitializeComponent(); + panelRed.MouseDown += Panel_MouseDown; + panelGreen.MouseDown += Panel_MouseDown; + panelBlue.MouseDown += Panel_MouseDown; + panelYellow.MouseDown += Panel_MouseDown; + panelWhite.MouseDown += Panel_MouseDown; + panelGray.MouseDown += Panel_MouseDown; + panelBlack.MouseDown += Panel_MouseDown; + panelBlueViolet.MouseDown += Panel_MouseDown; + + buttonCancel.Click += (sender, e) => Close(); + } + + /// + /// Привязка внешнего метода к событию + /// + /// + public void AddEvent(Action militaryAircraftDelegate) + { + MilitaryAircraftDelegate += militaryAircraftDelegate; + } + + /// + /// Прорисовка объекта + /// + private void DrawObject() + { + Bitmap bmp = new(pictureBoxObject.Width, pictureBoxObject.Height); + Graphics gr = Graphics.FromImage(bmp); + _militaryAircraft.SetPictureSize(pictureBoxObject.Width, pictureBoxObject.Height); + _militaryAircraft?.SetPosition(15, 15); + _militaryAircraft?.DrawTransport(gr); + pictureBoxObject.Image = bmp; + } + + /// + /// Передаем информацию при нажатии на Label + /// + /// + /// + private void LabelObject_MouseDown(object sender, MouseEventArgs e) + { + (sender as Label)?.DoDragDrop((sender as Label)?.Name ?? string.Empty, DragDropEffects.Move | DragDropEffects.Copy); + } + + /// + /// Проверка получаемой информации (ее типа на соответствие требуемому) + /// + /// + /// + private void PanelObject_DragEnter(object sender, DragEventArgs e) + { + e.Effect = e.Data?.GetDataPresent(DataFormats.Text) ?? false ? DragDropEffects.Copy : DragDropEffects.None; + } + + /// + /// Действия при приеме перетаскиваемой информации + /// + /// + /// + private void PanelObject_DragDrop(object sender, DragEventArgs e) + { + switch (e.Data?.GetData(DataFormats.Text)?.ToString()) + { + case "labelSimpleObject": + _militaryAircraft = new DrawningMilitaryAircraft((int)numericUpDownSpeed.Value, (double)numericUpDownWeight.Value, Color.Black); + break; + case "labelModifiedObject": + _militaryAircraft = new DrawningAirFighter((int)numericUpDownSpeed.Value, (double)numericUpDownWeight.Value, Color.White, + Color.Black, checkBoxRockets.Checked, checkBoxWings.Checked); + break; + } + DrawObject(); + } + + /// + /// Передаем информацию при нажатии на Panel + /// + /// + /// 2 + private void Panel_MouseDown(object sender, MouseEventArgs e) + { + (sender as Panel)?.DoDragDrop((sender as Panel)?.BackColor, DragDropEffects.Move | DragDropEffects.Copy); + } + + /// + /// Проверка получаемой информации (ее типа на соответствие требуемому) + /// + /// + /// + private void LabelColors_DragEnter(object sender, DragEventArgs e) + { + e.Effect = e.Data?.GetDataPresent(typeof(Color)) ?? false ? DragDropEffects.Copy : DragDropEffects.None; + } + + /// + /// Действия при приеме перетаскиваемой информации + /// + /// + /// + private void LabelColors_DragDrop(object sender, DragEventArgs e) + { + if (_militaryAircraft == null) + { + return; + } + Label label = (Label)sender; + Color newColor = (Color)e.Data.GetData(typeof(Color).ToString()); + switch (label.Name) + { + case "labelBodyColor": + _militaryAircraft.EntityMilitaryAircraft.SetBodyColor(newColor); + DrawObject(); + break; + case "labelAdditionalColor": + if (_militaryAircraft is DrawningAirFighter) + { + (_militaryAircraft.EntityMilitaryAircraft as EntityAirFighter).SetAdditionalColor(newColor); + DrawObject(); + } + break; + } + } + + /// + /// Передача объекта + /// + /// + /// + private void buttonAdd_Click(object sender, EventArgs e) + { + if (_militaryAircraft != null) + { + MilitaryAircraftDelegate?.Invoke(_militaryAircraft); + Close(); + } + } +} diff --git a/AirFighter/AirFighter/FormMilitaryAircraftConfig.resx b/AirFighter/AirFighter/FormMilitaryAircraftConfig.resx new file mode 100644 index 0000000..af32865 --- /dev/null +++ b/AirFighter/AirFighter/FormMilitaryAircraftConfig.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + \ No newline at end of file diff --git a/AirFighter/AirFighter/MilitaryAircraftDelegate.cs b/AirFighter/AirFighter/MilitaryAircraftDelegate.cs new file mode 100644 index 0000000..bc7be90 --- /dev/null +++ b/AirFighter/AirFighter/MilitaryAircraftDelegate.cs @@ -0,0 +1,9 @@ +using ProjectAirFighter.Drawnings; + +namespace ProjectAirFighter; + +/// +/// Делегат передачи объекта класса-прорисовки +/// +/// +public delegate void MilitaryAircraftDelegate(DrawningMilitaryAircraft militaryAircraft); -- 2.25.1 From 433975003c334aeb34f24583d96c61e75d4f3d63 Mon Sep 17 00:00:00 2001 From: ikswi Date: Thu, 18 Apr 2024 09:50:55 +0400 Subject: [PATCH 2/4] =?UTF-8?q?=D0=BF=D0=B0=D1=80=D0=B0=20=D0=B8=D0=B7?= =?UTF-8?q?=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=D0=B8=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AirFighter/AirFighter/FormMilitaryAircraftConfig.cs | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/AirFighter/AirFighter/FormMilitaryAircraftConfig.cs b/AirFighter/AirFighter/FormMilitaryAircraftConfig.cs index 9653392..4e319a6 100644 --- a/AirFighter/AirFighter/FormMilitaryAircraftConfig.cs +++ b/AirFighter/AirFighter/FormMilitaryAircraftConfig.cs @@ -41,7 +41,14 @@ public partial class FormMilitaryAircraftConfig : Form /// public void AddEvent(Action militaryAircraftDelegate) { - MilitaryAircraftDelegate += militaryAircraftDelegate; + if (MilitaryAircraftDelegate != null) + { + MilitaryAircraftDelegate = militaryAircraftDelegate; + } + else + { + MilitaryAircraftDelegate += militaryAircraftDelegate; + } } /// -- 2.25.1 From 922e66830cd32f3837bc554568b4836b166988ee Mon Sep 17 00:00:00 2001 From: ikswi Date: Thu, 2 May 2024 09:26:44 +0400 Subject: [PATCH 3/4] =?UTF-8?q?=D0=B4=D0=BE=D1=80=D0=B0=D0=B1=D0=BE=D1=82?= =?UTF-8?q?=D0=BA=D0=B0=20=D0=BF=D0=BE=20=D1=82=D1=80=D0=B5=D0=B1=D0=BE?= =?UTF-8?q?=D0=B2=D0=B0=D0=BD=D0=B8=D1=8F=D0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AirFighter/AirFighter/MilitaryAircraftDelegate.cs | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 AirFighter/AirFighter/MilitaryAircraftDelegate.cs diff --git a/AirFighter/AirFighter/MilitaryAircraftDelegate.cs b/AirFighter/AirFighter/MilitaryAircraftDelegate.cs deleted file mode 100644 index bc7be90..0000000 --- a/AirFighter/AirFighter/MilitaryAircraftDelegate.cs +++ /dev/null @@ -1,9 +0,0 @@ -using ProjectAirFighter.Drawnings; - -namespace ProjectAirFighter; - -/// -/// Делегат передачи объекта класса-прорисовки -/// -/// -public delegate void MilitaryAircraftDelegate(DrawningMilitaryAircraft militaryAircraft); -- 2.25.1 From 76285d7e5ba1f97f30624d46618d8c39e331be41 Mon Sep 17 00:00:00 2001 From: ikswi Date: Thu, 2 May 2024 09:48:22 +0400 Subject: [PATCH 4/4] =?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 --- ...FormMilitaryAircraftCollection.Designer.cs | 167 ++++++++---------- 1 file changed, 77 insertions(+), 90 deletions(-) diff --git a/AirFighter/AirFighter/FormMilitaryAircraftCollection.Designer.cs b/AirFighter/AirFighter/FormMilitaryAircraftCollection.Designer.cs index d107903..da5b642 100644 --- a/AirFighter/AirFighter/FormMilitaryAircraftCollection.Designer.cs +++ b/AirFighter/AirFighter/FormMilitaryAircraftCollection.Designer.cs @@ -29,6 +29,12 @@ private void InitializeComponent() { groupBoxTools = new GroupBox(); + panelCompanyTools = new Panel(); + buttonRefresh = new Button(); + buttonGoToCheck = new Button(); + buttonRemoveMilitaryAircraft = new Button(); + buttonAddMilitaryAircraft = new Button(); + maskedTextBoxPosition = new MaskedTextBox(); buttonCreateCompany = new Button(); panelStorage = new Panel(); buttonCollectionDel = new Button(); @@ -38,19 +44,12 @@ radioButtonMassive = new RadioButton(); radioButtonList = new RadioButton(); labelCollectionName = new Label(); - buttonRefresh = new Button(); - buttonGoToCheck = new Button(); - buttonRemoveMilitaryAircraft = new Button(); - maskedTextBoxPosition = new MaskedTextBox(); - buttonAddAirFighter = new Button(); - buttonAddMilitaryAircraft = new Button(); comboBoxSelectorCompany = new ComboBox(); pictureBox = new PictureBox(); - panelCompanyTools = new Panel(); groupBoxTools.SuspendLayout(); + panelCompanyTools.SuspendLayout(); panelStorage.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)pictureBox).BeginInit(); - panelCompanyTools.SuspendLayout(); SuspendLayout(); // // groupBoxTools @@ -67,6 +66,74 @@ groupBoxTools.TabStop = false; groupBoxTools.Text = "Инструменты"; // + // panelCompanyTools + // + panelCompanyTools.Controls.Add(buttonRefresh); + panelCompanyTools.Controls.Add(buttonGoToCheck); + panelCompanyTools.Controls.Add(buttonRemoveMilitaryAircraft); + panelCompanyTools.Controls.Add(buttonAddMilitaryAircraft); + panelCompanyTools.Controls.Add(maskedTextBoxPosition); + panelCompanyTools.Dock = DockStyle.Bottom; + panelCompanyTools.Enabled = false; + panelCompanyTools.Location = new Point(3, 357); + panelCompanyTools.Name = "panelCompanyTools"; + panelCompanyTools.Size = new Size(200, 307); + panelCompanyTools.TabIndex = 10; + // + // buttonRefresh + // + buttonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + buttonRefresh.Location = new Point(3, 252); + buttonRefresh.Name = "buttonRefresh"; + buttonRefresh.Size = new Size(192, 49); + buttonRefresh.TabIndex = 7; + buttonRefresh.Text = "Обновить"; + buttonRefresh.UseVisualStyleBackColor = true; + buttonRefresh.Click += buttonRefresh_Click; + // + // buttonGoToCheck + // + buttonGoToCheck.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + buttonGoToCheck.Location = new Point(3, 197); + buttonGoToCheck.Name = "buttonGoToCheck"; + buttonGoToCheck.Size = new Size(192, 49); + buttonGoToCheck.TabIndex = 6; + buttonGoToCheck.Text = "Передать на тесты"; + buttonGoToCheck.UseVisualStyleBackColor = true; + buttonGoToCheck.Click += buttonGoToCheck_Click; + // + // buttonRemoveMilitaryAircraft + // + buttonRemoveMilitaryAircraft.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + buttonRemoveMilitaryAircraft.Location = new Point(4, 142); + buttonRemoveMilitaryAircraft.Name = "buttonRemoveMilitaryAircraft"; + buttonRemoveMilitaryAircraft.Size = new Size(191, 49); + buttonRemoveMilitaryAircraft.TabIndex = 5; + buttonRemoveMilitaryAircraft.Text = "Удаление военного самолёта"; + buttonRemoveMilitaryAircraft.UseVisualStyleBackColor = true; + buttonRemoveMilitaryAircraft.Click += buttonRemoveMilitaryAircraft_Click; + // + // buttonAddMilitaryAircraft + // + buttonAddMilitaryAircraft.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + buttonAddMilitaryAircraft.Location = new Point(4, 3); + buttonAddMilitaryAircraft.Name = "buttonAddMilitaryAircraft"; + buttonAddMilitaryAircraft.Size = new Size(191, 49); + buttonAddMilitaryAircraft.TabIndex = 1; + buttonAddMilitaryAircraft.Text = "Добавление военного самолёта"; + buttonAddMilitaryAircraft.UseVisualStyleBackColor = true; + buttonAddMilitaryAircraft.Click += buttonAddMilitaryAircraft_Click; + // + // maskedTextBoxPosition + // + maskedTextBoxPosition.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + maskedTextBoxPosition.Location = new Point(3, 109); + maskedTextBoxPosition.Mask = "00"; + maskedTextBoxPosition.Name = "maskedTextBoxPosition"; + maskedTextBoxPosition.Size = new Size(192, 27); + maskedTextBoxPosition.TabIndex = 4; + maskedTextBoxPosition.ValidatingType = typeof(int); + // // buttonCreateCompany // buttonCreateCompany.Location = new Point(7, 322); @@ -159,70 +226,6 @@ labelCollectionName.TabIndex = 0; labelCollectionName.Text = "Название коллекции:"; // - // buttonRefresh - // - buttonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonRefresh.Location = new Point(3, 252); - buttonRefresh.Name = "buttonRefresh"; - buttonRefresh.Size = new Size(192, 49); - buttonRefresh.TabIndex = 7; - buttonRefresh.Text = "Обновить"; - buttonRefresh.UseVisualStyleBackColor = true; - buttonRefresh.Click += buttonRefresh_Click; - // - // buttonGoToCheck - // - buttonGoToCheck.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonGoToCheck.Location = new Point(3, 197); - buttonGoToCheck.Name = "buttonGoToCheck"; - buttonGoToCheck.Size = new Size(192, 49); - buttonGoToCheck.TabIndex = 6; - buttonGoToCheck.Text = "Передать на тесты"; - buttonGoToCheck.UseVisualStyleBackColor = true; - buttonGoToCheck.Click += buttonGoToCheck_Click; - // - // buttonRemoveMilitaryAircraft - // - buttonRemoveMilitaryAircraft.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonRemoveMilitaryAircraft.Location = new Point(4, 142); - buttonRemoveMilitaryAircraft.Name = "buttonRemoveMilitaryAircraft"; - buttonRemoveMilitaryAircraft.Size = new Size(191, 49); - buttonRemoveMilitaryAircraft.TabIndex = 5; - buttonRemoveMilitaryAircraft.Text = "Удаление военного самолёта"; - buttonRemoveMilitaryAircraft.UseVisualStyleBackColor = true; - buttonRemoveMilitaryAircraft.Click += buttonRemoveMilitaryAircraft_Click; - // - // maskedTextBoxPosition - // - maskedTextBoxPosition.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - maskedTextBoxPosition.Location = new Point(3, 109); - maskedTextBoxPosition.Mask = "00"; - maskedTextBoxPosition.Name = "maskedTextBoxPosition"; - maskedTextBoxPosition.Size = new Size(192, 27); - maskedTextBoxPosition.TabIndex = 4; - maskedTextBoxPosition.ValidatingType = typeof(int); - // - // buttonAddAirFighter - // - buttonAddAirFighter.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonAddAirFighter.Location = new Point(3, 54); - buttonAddAirFighter.Name = "buttonAddAirFighter"; - buttonAddAirFighter.Size = new Size(192, 49); - buttonAddAirFighter.TabIndex = 2; - buttonAddAirFighter.Text = "Добавление истребителя"; - buttonAddAirFighter.UseVisualStyleBackColor = true; - // - // buttonAddMilitaryAircraft - // - buttonAddMilitaryAircraft.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonAddMilitaryAircraft.Location = new Point(4, 3); - buttonAddMilitaryAircraft.Name = "buttonAddMilitaryAircraft"; - buttonAddMilitaryAircraft.Size = new Size(191, 49); - buttonAddMilitaryAircraft.TabIndex = 1; - buttonAddMilitaryAircraft.Text = "Добавление военного самолёта"; - buttonAddMilitaryAircraft.UseVisualStyleBackColor = true; - buttonAddMilitaryAircraft.Click += buttonAddMilitaryAircraft_Click; - // // comboBoxSelectorCompany // comboBoxSelectorCompany.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; @@ -244,21 +247,6 @@ pictureBox.TabIndex = 3; pictureBox.TabStop = false; // - // panelCompanyTools - // - panelCompanyTools.Controls.Add(buttonRefresh); - panelCompanyTools.Controls.Add(buttonGoToCheck); - panelCompanyTools.Controls.Add(buttonRemoveMilitaryAircraft); - panelCompanyTools.Controls.Add(buttonAddMilitaryAircraft); - panelCompanyTools.Controls.Add(buttonAddAirFighter); - panelCompanyTools.Controls.Add(maskedTextBoxPosition); - panelCompanyTools.Dock = DockStyle.Bottom; - panelCompanyTools.Enabled = false; - panelCompanyTools.Location = new Point(3, 357); - panelCompanyTools.Name = "panelCompanyTools"; - panelCompanyTools.Size = new Size(200, 307); - panelCompanyTools.TabIndex = 10; - // // FormMilitaryAircraftCollection // AutoScaleDimensions = new SizeF(8F, 20F); @@ -269,11 +257,11 @@ Name = "FormMilitaryAircraftCollection"; Text = "Коллекция военных самолётов"; groupBoxTools.ResumeLayout(false); + panelCompanyTools.ResumeLayout(false); + panelCompanyTools.PerformLayout(); panelStorage.ResumeLayout(false); panelStorage.PerformLayout(); ((System.ComponentModel.ISupportInitialize)pictureBox).EndInit(); - panelCompanyTools.ResumeLayout(false); - panelCompanyTools.PerformLayout(); ResumeLayout(false); } @@ -281,7 +269,6 @@ private GroupBox groupBoxTools; private ComboBox comboBoxSelectorCompany; - private Button buttonAddAirFighter; private Button buttonAddMilitaryAircraft; private MaskedTextBox maskedTextBoxPosition; private PictureBox pictureBox; -- 2.25.1