From 6684f887d0f48eb69b3ad8534b381812744e29f0 Mon Sep 17 00:00:00 2001 From: ikswi Date: Wed, 3 Apr 2024 15:57:29 +0400 Subject: [PATCH] =?UTF-8?q?=D0=BD=D0=B5=20=D0=B4=D0=BE=20=D0=BA=D0=BE?= =?UTF-8?q?=D0=BD=D1=86=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 + ...ormMilitaryAircraftCollection.Designer.cs} | 293 +++++++-------- ...n.cs => FormMilitaryAircraftCollection.cs} | 82 +--- ...sx => FormMilitaryAircraftCollection.resx} | 0 .../FormMilitaryAircraftConfig.Designer.cs | 355 ++++++++++++++++++ .../AirFighter/FormMilitaryAircraftConfig.cs | 191 ++++++++++ .../FormMilitaryAircraftConfig.resx | 120 ++++++ .../AirFighter/MilitaryAircraftDelegate.cs | 9 + AirFighter/AirFighter/Program.cs | 2 +- 10 files changed, 843 insertions(+), 219 deletions(-) rename AirFighter/AirFighter/{FormAirCollection.Designer.cs => FormMilitaryAircraftCollection.Designer.cs} (87%) rename AirFighter/AirFighter/{FormAirCollection.cs => FormMilitaryAircraftCollection.cs} (70%) rename AirFighter/AirFighter/{FormAirCollection.resx => FormMilitaryAircraftCollection.resx} (100%) 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..85d17d8 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 ChooseAdditionalColor(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 285abe2..09acc5f 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 ChooseBodyColor(Color bodyColor) + { + BodyColor = bodyColor; + } + public double Step => Speed * 100 / Weight; /// diff --git a/AirFighter/AirFighter/FormAirCollection.Designer.cs b/AirFighter/AirFighter/FormMilitaryAircraftCollection.Designer.cs similarity index 87% rename from AirFighter/AirFighter/FormAirCollection.Designer.cs rename to AirFighter/AirFighter/FormMilitaryAircraftCollection.Designer.cs index dd6148e..a49f7ae 100644 --- a/AirFighter/AirFighter/FormAirCollection.Designer.cs +++ b/AirFighter/AirFighter/FormMilitaryAircraftCollection.Designer.cs @@ -1,6 +1,6 @@ namespace ProjectAirFighter { - partial class FormAirCollection + partial class FormMilitaryAircraftCollection { /// /// Required designer variable. @@ -28,16 +28,7 @@ /// private void InitializeComponent() { - groupBoxTools = new GroupBox(); - panelCompanyTools = new Panel(); - buttonCreateCompany = new Button(); - comboBoxSelectorCompany = new ComboBox(); - buttonRefresh = new Button(); - buttonAddMilitaryAircraft = new Button(); - buttonGoToCheck = new Button(); - buttonAddAirFighter = new Button(); - buttonRemoveAir = new Button(); - maskedTextBoxPosition = new MaskedTextBox(); + pictureBox = new PictureBox(); panelStorage = new Panel(); buttonCollectionDel = new Button(); listBoxCollection = new ListBox(); @@ -46,125 +37,29 @@ radioButtonMassive = new RadioButton(); textBoxCollectionName = new TextBox(); labelCollectionName = new Label(); - pictureBox = new PictureBox(); - groupBoxTools.SuspendLayout(); - panelCompanyTools.SuspendLayout(); - panelStorage.SuspendLayout(); + comboBoxSelectorCompany = new ComboBox(); + panelCompanyTools = new Panel(); + buttonRefresh = new Button(); + buttonAddMilitaryAircraft = new Button(); + buttonGoToCheck = new Button(); + buttonRemoveAir = new Button(); + maskedTextBoxPosition = new MaskedTextBox(); + buttonCreateCompany = new Button(); + groupBoxTools = new GroupBox(); ((System.ComponentModel.ISupportInitialize)pictureBox).BeginInit(); + panelStorage.SuspendLayout(); + panelCompanyTools.SuspendLayout(); + groupBoxTools.SuspendLayout(); SuspendLayout(); // - // groupBoxTools + // pictureBox // - groupBoxTools.Controls.Add(panelCompanyTools); - groupBoxTools.Controls.Add(panelStorage); - groupBoxTools.Dock = DockStyle.Right; - groupBoxTools.Location = new Point(712, 0); - groupBoxTools.Name = "groupBoxTools"; - groupBoxTools.Size = new Size(206, 602); - groupBoxTools.TabIndex = 0; - groupBoxTools.TabStop = false; - groupBoxTools.Text = "Инструменты"; - // - // panelCompanyTools - // - panelCompanyTools.Controls.Add(buttonCreateCompany); - panelCompanyTools.Controls.Add(comboBoxSelectorCompany); - panelCompanyTools.Controls.Add(buttonRefresh); - panelCompanyTools.Controls.Add(buttonAddMilitaryAircraft); - panelCompanyTools.Controls.Add(buttonGoToCheck); - panelCompanyTools.Controls.Add(buttonAddAirFighter); - panelCompanyTools.Controls.Add(buttonRemoveAir); - panelCompanyTools.Controls.Add(maskedTextBoxPosition); - panelCompanyTools.Dock = DockStyle.Fill; - panelCompanyTools.Location = new Point(3, 293); - panelCompanyTools.Name = "panelCompanyTools"; - panelCompanyTools.Size = new Size(200, 306); - panelCompanyTools.TabIndex = 10; - // - // buttonCreateCompany - // - buttonCreateCompany.Location = new Point(11, 55); - buttonCreateCompany.Name = "buttonCreateCompany"; - buttonCreateCompany.Size = new Size(182, 27); - buttonCreateCompany.TabIndex = 9; - buttonCreateCompany.Text = "Создать компанию"; - buttonCreateCompany.UseVisualStyleBackColor = true; - buttonCreateCompany.Click += buttonCreateCompany_Click; - // - // comboBoxSelectorCompany - // - comboBoxSelectorCompany.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - comboBoxSelectorCompany.DropDownStyle = ComboBoxStyle.DropDownList; - comboBoxSelectorCompany.FormattingEnabled = true; - comboBoxSelectorCompany.Items.AddRange(new object[] { "Хранилище" }); - comboBoxSelectorCompany.Location = new Point(7, 21); - comboBoxSelectorCompany.Name = "comboBoxSelectorCompany"; - comboBoxSelectorCompany.Size = new Size(182, 28); - comboBoxSelectorCompany.TabIndex = 0; - // - // buttonRefresh - // - buttonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonRefresh.Location = new Point(9, 268); - buttonRefresh.Name = "buttonRefresh"; - buttonRefresh.Size = new Size(179, 29); - buttonRefresh.TabIndex = 7; - buttonRefresh.Text = "Обновить"; - buttonRefresh.UseVisualStyleBackColor = true; - buttonRefresh.Click += buttonRefresh_Click; - // - // buttonAddMilitaryAircraft - // - buttonAddMilitaryAircraft.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonAddMilitaryAircraft.Location = new Point(4, 99); - buttonAddMilitaryAircraft.Name = "buttonAddMilitaryAircraft"; - buttonAddMilitaryAircraft.Size = new Size(193, 29); - buttonAddMilitaryAircraft.TabIndex = 1; - buttonAddMilitaryAircraft.Text = "Добавление самолёта"; - buttonAddMilitaryAircraft.UseVisualStyleBackColor = true; - buttonAddMilitaryAircraft.Click += buttonAddAir_Click; - // - // buttonGoToCheck - // - buttonGoToCheck.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonGoToCheck.Location = new Point(5, 227); - buttonGoToCheck.Name = "buttonGoToCheck"; - buttonGoToCheck.Size = new Size(194, 29); - buttonGoToCheck.TabIndex = 6; - buttonGoToCheck.Text = "Передать на тесты"; - buttonGoToCheck.UseVisualStyleBackColor = true; - buttonGoToCheck.Click += buttonGoToCheck_Click; - // - // buttonAddAirFighter - // - buttonAddAirFighter.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonAddAirFighter.Location = new Point(3, 122); - buttonAddAirFighter.Name = "buttonAddAirFighter"; - buttonAddAirFighter.Size = new Size(194, 31); - buttonAddAirFighter.TabIndex = 2; - buttonAddAirFighter.Text = "Добавление истребителя"; - buttonAddAirFighter.UseVisualStyleBackColor = true; - buttonAddAirFighter.Click += buttonAddAirFighter_Click; - // - // buttonRemoveAir - // - buttonRemoveAir.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonRemoveAir.Location = new Point(6, 192); - buttonRemoveAir.Name = "buttonRemoveAir"; - buttonRemoveAir.Size = new Size(182, 29); - buttonRemoveAir.TabIndex = 5; - buttonRemoveAir.Text = "Удаление самолёта"; - buttonRemoveAir.UseVisualStyleBackColor = true; - buttonRemoveAir.Click += buttonRemoveAir_Click; - // - // maskedTextBoxPosition - // - maskedTextBoxPosition.Location = new Point(7, 159); - maskedTextBoxPosition.Mask = "00"; - maskedTextBoxPosition.Name = "maskedTextBoxPosition"; - maskedTextBoxPosition.Size = new Size(194, 27); - maskedTextBoxPosition.TabIndex = 4; - maskedTextBoxPosition.ValidatingType = typeof(int); + pictureBox.Dock = DockStyle.Fill; + pictureBox.Location = new Point(0, 0); + pictureBox.Name = "pictureBox"; + pictureBox.Size = new Size(712, 602); + pictureBox.TabIndex = 3; + pictureBox.TabStop = false; // // panelStorage // @@ -248,53 +143,143 @@ labelCollectionName.TabIndex = 0; labelCollectionName.Text = "Название коллекции:"; // - // pictureBox + // comboBoxSelectorCompany // - pictureBox.Dock = DockStyle.Fill; - pictureBox.Location = new Point(0, 0); - pictureBox.Name = "pictureBox"; - pictureBox.Size = new Size(712, 602); - pictureBox.TabIndex = 3; - pictureBox.TabStop = false; + comboBoxSelectorCompany.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + comboBoxSelectorCompany.DropDownStyle = ComboBoxStyle.DropDownList; + comboBoxSelectorCompany.FormattingEnabled = true; + comboBoxSelectorCompany.Items.AddRange(new object[] { "Хранилище" }); + comboBoxSelectorCompany.Location = new Point(8, 299); + comboBoxSelectorCompany.Name = "comboBoxSelectorCompany"; + comboBoxSelectorCompany.Size = new Size(182, 28); + comboBoxSelectorCompany.TabIndex = 0; + comboBoxSelectorCompany.SelectedIndexChanged += comboBoxSelectorCompany_SelectedIndexChanged; // - // FormAirCollection + // panelCompanyTools + // + panelCompanyTools.Controls.Add(buttonRefresh); + panelCompanyTools.Controls.Add(buttonAddMilitaryAircraft); + panelCompanyTools.Controls.Add(buttonGoToCheck); + panelCompanyTools.Controls.Add(buttonRemoveAir); + panelCompanyTools.Controls.Add(maskedTextBoxPosition); + panelCompanyTools.Dock = DockStyle.Bottom; + panelCompanyTools.Location = new Point(3, 362); + panelCompanyTools.Name = "panelCompanyTools"; + panelCompanyTools.Size = new Size(200, 237); + panelCompanyTools.TabIndex = 10; + // + // buttonRefresh + // + buttonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + buttonRefresh.Location = new Point(6, 199); + buttonRefresh.Name = "buttonRefresh"; + buttonRefresh.Size = new Size(179, 29); + buttonRefresh.TabIndex = 7; + buttonRefresh.Text = "Обновить"; + buttonRefresh.UseVisualStyleBackColor = true; + buttonRefresh.Click += buttonRefresh_Click; + // + // buttonAddMilitaryAircraft + // + buttonAddMilitaryAircraft.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + buttonAddMilitaryAircraft.Location = new Point(5, 12); + buttonAddMilitaryAircraft.Name = "buttonAddMilitaryAircraft"; + buttonAddMilitaryAircraft.Size = new Size(193, 29); + buttonAddMilitaryAircraft.TabIndex = 1; + buttonAddMilitaryAircraft.Text = "Добавление самолёта"; + buttonAddMilitaryAircraft.Click += ButtonAddMilitaryAircraft_Click; + // + // buttonGoToCheck + // + buttonGoToCheck.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + buttonGoToCheck.Location = new Point(6, 161); + buttonGoToCheck.Name = "buttonGoToCheck"; + buttonGoToCheck.Size = new Size(194, 29); + buttonGoToCheck.TabIndex = 6; + buttonGoToCheck.Text = "Передать на тесты"; + buttonGoToCheck.UseVisualStyleBackColor = true; + buttonGoToCheck.Click += buttonGoToCheck_Click; + // + // buttonRemoveAir + // + buttonRemoveAir.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + buttonRemoveAir.Location = new Point(9, 110); + buttonRemoveAir.Name = "buttonRemoveAir"; + buttonRemoveAir.Size = new Size(182, 29); + buttonRemoveAir.TabIndex = 5; + buttonRemoveAir.Text = "Удаление самолёта"; + buttonRemoveAir.UseVisualStyleBackColor = true; + buttonRemoveAir.Click += buttonRemoveAir_Click; + // + // maskedTextBoxPosition + // + maskedTextBoxPosition.Location = new Point(11, 62); + maskedTextBoxPosition.Mask = "00"; + maskedTextBoxPosition.Name = "maskedTextBoxPosition"; + maskedTextBoxPosition.Size = new Size(194, 27); + maskedTextBoxPosition.TabIndex = 4; + maskedTextBoxPosition.ValidatingType = typeof(int); + // + // buttonCreateCompany + // + buttonCreateCompany.Location = new Point(7, 329); + buttonCreateCompany.Name = "buttonCreateCompany"; + buttonCreateCompany.Size = new Size(182, 27); + buttonCreateCompany.TabIndex = 9; + buttonCreateCompany.Text = "Создать компанию"; + buttonCreateCompany.UseVisualStyleBackColor = true; + buttonCreateCompany.Click += buttonCreateCompany_Click; + // + // groupBoxTools + // + groupBoxTools.Controls.Add(buttonCreateCompany); + groupBoxTools.Controls.Add(panelCompanyTools); + groupBoxTools.Controls.Add(comboBoxSelectorCompany); + groupBoxTools.Controls.Add(panelStorage); + groupBoxTools.Dock = DockStyle.Right; + groupBoxTools.Location = new Point(712, 0); + groupBoxTools.Name = "groupBoxTools"; + groupBoxTools.Size = new Size(206, 602); + groupBoxTools.TabIndex = 0; + groupBoxTools.TabStop = false; + groupBoxTools.Text = "Инструменты"; + // + // FormMilitaryAircraftCollection // AutoScaleDimensions = new SizeF(8F, 20F); AutoScaleMode = AutoScaleMode.Font; ClientSize = new Size(918, 602); Controls.Add(pictureBox); Controls.Add(groupBoxTools); - Name = "FormAirCollection"; + Name = "FormMilitaryAircraftCollection"; Text = "Коллекция самолётов"; - groupBoxTools.ResumeLayout(false); - panelCompanyTools.ResumeLayout(false); - panelCompanyTools.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)pictureBox).EndInit(); panelStorage.ResumeLayout(false); panelStorage.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)pictureBox).EndInit(); + panelCompanyTools.ResumeLayout(false); + panelCompanyTools.PerformLayout(); + groupBoxTools.ResumeLayout(false); ResumeLayout(false); } #endregion - - private GroupBox groupBoxTools; - private ComboBox comboBoxSelectorCompany; - private Button buttonAddMilitaryAircraft; - private Button buttonAddAirFighter; private PictureBox pictureBox; - private MaskedTextBox maskedTextBoxPosition; - private Button buttonRemoveAir; - private Button buttonRefresh; - private Button buttonGoToCheck; private Panel panelStorage; - private TextBox textBoxCollectionName; - private Label labelCollectionName; - private RadioButton radioButtonList; - private RadioButton radioButtonMassive; - private Button buttonCollectionAdd; private Button buttonCollectionDel; private ListBox listBoxCollection; - private Button buttonCreateCompany; + private Button buttonCollectionAdd; + private RadioButton radioButtonList; + private RadioButton radioButtonMassive; + private TextBox textBoxCollectionName; + private Label labelCollectionName; + private ComboBox comboBoxSelectorCompany; private Panel panelCompanyTools; + private Button buttonRefresh; + private Button buttonAddMilitaryAircraft; + private Button buttonGoToCheck; + private Button buttonRemoveAir; + private MaskedTextBox maskedTextBoxPosition; + private Button buttonCreateCompany; + private GroupBox groupBoxTools; } } \ No newline at end of file diff --git a/AirFighter/AirFighter/FormAirCollection.cs b/AirFighter/AirFighter/FormMilitaryAircraftCollection.cs similarity index 70% rename from AirFighter/AirFighter/FormAirCollection.cs rename to AirFighter/AirFighter/FormMilitaryAircraftCollection.cs index 5ad4928..a7590ec 100644 --- a/AirFighter/AirFighter/FormAirCollection.cs +++ b/AirFighter/AirFighter/FormMilitaryAircraftCollection.cs @@ -3,7 +3,7 @@ using ProjectAirFighter.Drawnings; namespace ProjectAirFighter; -public partial class FormAirCollection : Form +public partial class FormMilitaryAircraftCollection : Form { /// /// Хранилише коллекций @@ -18,64 +18,41 @@ public partial class FormAirCollection : Form /// /// Конструктор /// - public FormAirCollection() + public FormMilitaryAircraftCollection() { InitializeComponent(); _storageCollection = new(); } - /// - /// Выбор компании - /// - /// - /// - private void ComboBoxSelectorCompany_SelectedIndexChanged(object sender, EventArgs e) + private void comboBoxSelectorCompany_SelectedIndexChanged(object sender, EventArgs e) { panelCompanyTools.Enabled = false; } /// - /// Добавление самолёта + /// Добавление военного самолёта /// /// /// - private void buttonAddAir_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(); @@ -86,24 +63,6 @@ public partial class FormAirCollection : 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; - } - - /// /// Удаление объекта /// @@ -217,11 +176,6 @@ public partial class FormAirCollection : Form /// private void buttonCollectionDel_Click(object sender, EventArgs e) { - // TODO прописать логику удаления элемента из коллекции - // нужно убедиться, что есть выбранная коллекция - // спросить у пользователя через MessageBox, что он подтверждает, что хочет удалить запись - // удалить и обновить ListBox - if (listBoxCollection.SelectedItem == null) { MessageBox.Show("Коллекция не выбрана"); diff --git a/AirFighter/AirFighter/FormAirCollection.resx b/AirFighter/AirFighter/FormMilitaryAircraftCollection.resx similarity index 100% rename from AirFighter/AirFighter/FormAirCollection.resx rename to AirFighter/AirFighter/FormMilitaryAircraftCollection.resx diff --git a/AirFighter/AirFighter/FormMilitaryAircraftConfig.Designer.cs b/AirFighter/AirFighter/FormMilitaryAircraftConfig.Designer.cs new file mode 100644 index 0000000..b9f959e --- /dev/null +++ b/AirFighter/AirFighter/FormMilitaryAircraftConfig.Designer.cs @@ -0,0 +1,355 @@ +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(12, 154); + checkBoxRockets.Name = "checkBoxRockets"; + checkBoxRockets.Size = new Size(318, 24); + checkBoxRockets.TabIndex = 7; + checkBoxRockets.Text = "Признак наличия дополнительных ракет"; + checkBoxRockets.UseVisualStyleBackColor = true; + // + // checkBoxWings + // + checkBoxWings.AutoSize = true; + checkBoxWings.Location = new Point(12, 124); + checkBoxWings.Name = "checkBoxWings"; + checkBoxWings.Size = new Size(339, 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.BorderStyle = BorderStyle.FixedSingle; + labelAdditionalColor.Location = new Point(100, 12); + labelAdditionalColor.Name = "labelAdditionalColor"; + labelAdditionalColor.Size = new Size(88, 24); + labelAdditionalColor.TabIndex = 2; + labelAdditionalColor.Text = "Доп. цвет"; + labelAdditionalColor.TextAlign = ContentAlignment.MiddleCenter; + labelAdditionalColor.DragDrop += LabelColor_DragDrop; + labelAdditionalColor.DragEnter += LabelColor_DragEnter; + // + // labelBodyColor + // + labelBodyColor.BorderStyle = BorderStyle.FixedSingle; + labelBodyColor.Location = new Point(3, 12); + labelBodyColor.Name = "labelBodyColor"; + labelBodyColor.Size = new Size(88, 24); + labelBodyColor.TabIndex = 1; + labelBodyColor.Text = "Цвет"; + labelBodyColor.TextAlign = ContentAlignment.MiddleCenter; + labelBodyColor.DragDrop += LabelColor_DragDrop; + labelBodyColor.DragEnter += LabelColor_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..325ead6 --- /dev/null +++ b/AirFighter/AirFighter/FormMilitaryAircraftConfig.cs @@ -0,0 +1,191 @@ +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) + { + if (MilitaryAircraftDelegate == null) + { + MilitaryAircraftDelegate = militaryAircraftDelegate; + } + else + { + 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) + { + //var label = sender as Label; + //label.DoDragDrop(label.Name, DragDropEffects.Move); + (sender as Label)?.DoDragDrop((sender as Label)?.Name ?? string.Empty, DragDropEffects.Move | DragDropEffects.Copy); + } + + /// + /// Проверка получаемой информации (ее типа на соответствие требуемому) + /// + /// + /// + private void PanelObject_DragEnter(object sender, DragEventArgs e) + { + if (e.Data?.GetDataPresent(DataFormats.Text) ?? false) + { + e.Effect = DragDropEffects.Copy; + } + else + { + e.Effect = 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); + } + + // TODO Реализовать логику смены цветов: основного и дополнительного (для продвинутого объекта) + + /// + /// Проверка получаемой информации (ее типа на соответствие требуемому) + /// + /// + /// + private void LabelColor_DragEnter(object sender, DragEventArgs e) + { + //if (e.Data?.GetDataPresent(typeof(Color)) ?? false) + //{ + // e.Effect = DragDropEffects.Copy; + //} + //else + //{ + // e.Effect = DragDropEffects.None; + //} + + e.Effect = e.Data?.GetDataPresent(typeof(Color)) ?? false ? DragDropEffects.Copy : DragDropEffects.None; + } + + /// + /// Действия при приеме перетаскиваемой информации + /// + /// + /// + private void LabelColor_DragDrop(object sender, DragEventArgs e) + { + if (_militaryAircraft == null) + { + return; + } + Label label = (Label)sender; + switch (((Label)sender).Name) + { + case "labelBodyColor": + _militaryAircraft.EntityMilitaryAircraft.ChooseBodyColor((Color)e.Data.GetData(typeof(Color))); + break; + case "labelAdditionalColor": + if (_militaryAircraft is DrawningAirFighter) + { + return; + } + (_militaryAircraft.EntityMilitaryAircraft as EntityAirFighter).ChooseAdditionalColor((Color)e.Data.GetData(typeof(Color))); + break; + } + DrawObject(); + } + + + //конец туду + + /// + /// Передача объекта + /// + /// + /// + 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); diff --git a/AirFighter/AirFighter/Program.cs b/AirFighter/AirFighter/Program.cs index ea8c50c..9d818ea 100644 --- a/AirFighter/AirFighter/Program.cs +++ b/AirFighter/AirFighter/Program.cs @@ -11,7 +11,7 @@ namespace ProjectAirFighter // To customize application configuration such as set high DPI settings or default font, // see https://aka.ms/applicationconfiguration. ApplicationConfiguration.Initialize(); - Application.Run(new FormAirCollection()); + Application.Run(new FormMilitaryAircraftCollection()); } } } \ No newline at end of file