diff --git a/ProjectBomber/ProjectBomber/Entities/EntityAirBomber.cs b/ProjectBomber/ProjectBomber/Entities/EntityAirBomber.cs index 4c514f4..7de84a5 100644 --- a/ProjectBomber/ProjectBomber/Entities/EntityAirBomber.cs +++ b/ProjectBomber/ProjectBomber/Entities/EntityAirBomber.cs @@ -10,6 +10,11 @@ public class EntityAirBomber : EntityPlane /// public Color AdditionalColor { get; private set; } + public void SetAdditionalColor(Color color) + { + AdditionalColor = color; + } + /// /// наличие двигателя /// diff --git a/ProjectBomber/ProjectBomber/Entities/EntityPlane.cs b/ProjectBomber/ProjectBomber/Entities/EntityPlane.cs index 8e60d5b..bf3d6af 100644 --- a/ProjectBomber/ProjectBomber/Entities/EntityPlane.cs +++ b/ProjectBomber/ProjectBomber/Entities/EntityPlane.cs @@ -23,6 +23,11 @@ public class EntityPlane /// Основной цвет /// public Color BodyColor { get; private set; } + + public void setBodyColor(Color color) + { + BodyColor = color; + } /// /// Шаг перемещения автомобиля /// diff --git a/ProjectBomber/ProjectBomber/FormCarConfig.Designer.cs b/ProjectBomber/ProjectBomber/FormCarConfig.Designer.cs new file mode 100644 index 0000000..55bedea --- /dev/null +++ b/ProjectBomber/ProjectBomber/FormCarConfig.Designer.cs @@ -0,0 +1,359 @@ +namespace ProjectAirBomber +{ + partial class FormCarConfig + { + /// + /// 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(); + panelPurple = new Panel(); + panelBlack = new Panel(); + panelGray = new Panel(); + panelWhite = new Panel(); + panelYellow = new Panel(); + panelBlue = new Panel(); + panelGreen = new Panel(); + panelRed = new Panel(); + checkBoxBomb = new CheckBox(); + checkBoxEngine = new CheckBox(); + numericUpDownWeight = new NumericUpDown(); + labelWeight = new Label(); + numericUpDownSpeed = new NumericUpDown(); + labelSpeed = new Label(); + labelModificObject = new Label(); + labelSimpleObject = new Label(); + pictureBoxObject = new PictureBox(); + buttonAdd = new Button(); + buttonCancel = new Button(); + panelObject = new Panel(); + labelAditionalColor = 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(checkBoxBomb); + groupBoxConfig.Controls.Add(checkBoxEngine); + groupBoxConfig.Controls.Add(numericUpDownWeight); + groupBoxConfig.Controls.Add(labelWeight); + groupBoxConfig.Controls.Add(numericUpDownSpeed); + groupBoxConfig.Controls.Add(labelSpeed); + groupBoxConfig.Controls.Add(labelModificObject); + groupBoxConfig.Controls.Add(labelSimpleObject); + groupBoxConfig.Dock = DockStyle.Left; + groupBoxConfig.Location = new Point(0, 0); + groupBoxConfig.Name = "groupBoxConfig"; + groupBoxConfig.Size = new Size(667, 318); + groupBoxConfig.TabIndex = 0; + groupBoxConfig.TabStop = false; + groupBoxConfig.Text = "Параметры"; + // + // groupBoxColors + // + groupBoxColors.Controls.Add(panelPurple); + 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(338, 12); + groupBoxColors.Name = "groupBoxColors"; + groupBoxColors.Size = new Size(314, 152); + groupBoxColors.TabIndex = 8; + groupBoxColors.TabStop = false; + groupBoxColors.Text = "Цвета:"; + // + // panelPurple + // + panelPurple.BackColor = Color.Purple; + panelPurple.Location = new Point(230, 80); + panelPurple.Name = "panelPurple"; + panelPurple.Size = new Size(49, 48); + panelPurple.TabIndex = 1; + // + // panelBlack + // + panelBlack.BackColor = Color.Black; + panelBlack.Location = new Point(157, 80); + panelBlack.Name = "panelBlack"; + panelBlack.Size = new Size(49, 48); + panelBlack.TabIndex = 1; + // + // panelGray + // + panelGray.BackColor = Color.Gray; + panelGray.Location = new Point(80, 80); + panelGray.Name = "panelGray"; + panelGray.Size = new Size(49, 48); + panelGray.TabIndex = 1; + // + // panelWhite + // + panelWhite.BackColor = Color.White; + panelWhite.Location = new Point(6, 80); + panelWhite.Name = "panelWhite"; + panelWhite.Size = new Size(49, 48); + panelWhite.TabIndex = 1; + // + // panelYellow + // + panelYellow.BackColor = Color.Yellow; + panelYellow.Location = new Point(230, 26); + panelYellow.Name = "panelYellow"; + panelYellow.Size = new Size(49, 48); + panelYellow.TabIndex = 1; + // + // panelBlue + // + panelBlue.BackColor = Color.Blue; + panelBlue.Location = new Point(157, 26); + panelBlue.Name = "panelBlue"; + panelBlue.Size = new Size(49, 48); + panelBlue.TabIndex = 1; + // + // panelGreen + // + panelGreen.BackColor = Color.Green; + panelGreen.Location = new Point(80, 26); + panelGreen.Name = "panelGreen"; + panelGreen.Size = new Size(49, 48); + panelGreen.TabIndex = 1; + // + // panelRed + // + panelRed.BackColor = Color.Red; + panelRed.Location = new Point(6, 26); + panelRed.Name = "panelRed"; + panelRed.Size = new Size(49, 48); + panelRed.TabIndex = 0; + // + // checkBoxBomb + // + checkBoxBomb.AutoSize = true; + checkBoxBomb.Location = new Point(6, 177); + checkBoxBomb.Name = "checkBoxBomb"; + checkBoxBomb.Size = new Size(132, 24); + checkBoxBomb.TabIndex = 7; + checkBoxBomb.Text = "наличие бомб"; + checkBoxBomb.UseVisualStyleBackColor = true; + // + // checkBoxEngine + // + checkBoxEngine.AutoSize = true; + checkBoxEngine.Location = new Point(6, 116); + checkBoxEngine.Name = "checkBoxEngine"; + checkBoxEngine.Size = new Size(163, 24); + checkBoxEngine.TabIndex = 6; + checkBoxEngine.Text = "наличие двигателя"; + checkBoxEngine.UseVisualStyleBackColor = true; + // + // numericUpDownWeight + // + numericUpDownWeight.Location = new Point(48, 68); + 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(75, 27); + numericUpDownWeight.TabIndex = 5; + numericUpDownWeight.Value = new decimal(new int[] { 100, 0, 0, 0 }); + // + // labelWeight + // + labelWeight.AutoSize = true; + labelWeight.Location = new Point(6, 70); + labelWeight.Name = "labelWeight"; + labelWeight.Size = new Size(36, 20); + labelWeight.TabIndex = 4; + labelWeight.Text = "Вес:"; + // + // numericUpDownSpeed + // + numericUpDownSpeed.Location = new Point(88, 35); + 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(80, 27); + numericUpDownSpeed.TabIndex = 3; + numericUpDownSpeed.Value = new decimal(new int[] { 100, 0, 0, 0 }); + // + // labelSpeed + // + labelSpeed.AutoSize = true; + labelSpeed.Location = new Point(6, 35); + labelSpeed.Name = "labelSpeed"; + labelSpeed.Size = new Size(76, 20); + labelSpeed.TabIndex = 2; + labelSpeed.Text = "Скорость:"; + // + // labelModificObject + // + labelModificObject.BorderStyle = BorderStyle.FixedSingle; + labelModificObject.Location = new Point(495, 177); + labelModificObject.Name = "labelModificObject"; + labelModificObject.Size = new Size(135, 54); + labelModificObject.TabIndex = 1; + labelModificObject.Text = "Продвинутый"; + labelModificObject.TextAlign = ContentAlignment.MiddleCenter; + labelModificObject.MouseDown += LabelObject_MouseDown; + // + // labelSimpleObject + // + labelSimpleObject.BorderStyle = BorderStyle.FixedSingle; + labelSimpleObject.Location = new Point(344, 177); + labelSimpleObject.Name = "labelSimpleObject"; + labelSimpleObject.Size = new Size(135, 54); + labelSimpleObject.TabIndex = 0; + labelSimpleObject.Text = "Простой"; + labelSimpleObject.TextAlign = ContentAlignment.MiddleCenter; + labelSimpleObject.MouseDown += LabelObject_MouseDown; + // + // pictureBoxObject + // + pictureBoxObject.Location = new Point(26, 58); + pictureBoxObject.Name = "pictureBoxObject"; + pictureBoxObject.Size = new Size(293, 177); + pictureBoxObject.TabIndex = 1; + pictureBoxObject.TabStop = false; + pictureBoxObject.DragDrop += LabelBodyColor_DragDrop; + pictureBoxObject.DragEnter += LabelBodyColor_DragEnter; + // + // buttonAdd + // + buttonAdd.Location = new Point(686, 267); + buttonAdd.Name = "buttonAdd"; + buttonAdd.Size = new Size(94, 29); + buttonAdd.TabIndex = 2; + buttonAdd.Text = "Добавить"; + buttonAdd.UseVisualStyleBackColor = true; + buttonAdd.Click += ButtonAdd_Click; + // + // buttonCancel + // + buttonCancel.Location = new Point(885, 277); + buttonCancel.Name = "buttonCancel"; + buttonCancel.Size = new Size(94, 29); + buttonCancel.TabIndex = 3; + buttonCancel.Text = "Отмена"; + buttonCancel.UseVisualStyleBackColor = true; + // + // panelObject + // + panelObject.AllowDrop = true; + panelObject.Controls.Add(labelAditionalColor); + panelObject.Controls.Add(labelBodyColor); + panelObject.Controls.Add(pictureBoxObject); + panelObject.Location = new Point(673, 12); + panelObject.Name = "panelObject"; + panelObject.Size = new Size(344, 238); + panelObject.TabIndex = 4; + panelObject.DragDrop += PanelObject_DragDrop; + panelObject.DragEnter += PanelObject_DragEnter; + // + // labelAditionalColor + // + labelAditionalColor.AllowDrop = true; + labelAditionalColor.BorderStyle = BorderStyle.FixedSingle; + labelAditionalColor.Location = new Point(238, 15); + labelAditionalColor.Name = "labelAditionalColor"; + labelAditionalColor.Size = new Size(81, 35); + labelAditionalColor.TabIndex = 10; + labelAditionalColor.Text = "Доп. Цвет"; + labelAditionalColor.TextAlign = ContentAlignment.MiddleCenter; + labelAditionalColor.DragDrop += LabelAdditionalColor_DragDrop; + labelAditionalColor.DragEnter += LabelAdditionalColor_DragEnter; + // + // labelBodyColor + // + labelBodyColor.AllowDrop = true; + labelBodyColor.BorderStyle = BorderStyle.FixedSingle; + labelBodyColor.Location = new Point(26, 18); + labelBodyColor.Name = "labelBodyColor"; + labelBodyColor.Size = new Size(81, 35); + labelBodyColor.TabIndex = 9; + labelBodyColor.Text = "Цвет"; + labelBodyColor.TextAlign = ContentAlignment.MiddleCenter; + labelBodyColor.DragDrop += LabelBodyColor_DragDrop; + labelBodyColor.DragEnter += LabelBodyColor_DragEnter; + // + // FormCarConfig + // + AutoScaleDimensions = new SizeF(8F, 20F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(1039, 318); + Controls.Add(panelObject); + Controls.Add(buttonCancel); + Controls.Add(buttonAdd); + Controls.Add(groupBoxConfig); + Name = "FormCarConfig"; + 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 labelSimpleObject; + private NumericUpDown numericUpDownSpeed; + private Label labelSpeed; + private Label labelModificObject; + private NumericUpDown numericUpDownWeight; + private Label labelWeight; + private CheckBox checkBoxEngine; + private CheckBox checkBoxBomb; + private GroupBox groupBoxColors; + private Panel panelPurple; + private Panel panelBlack; + private Panel panelGray; + private Panel panelWhite; + private Panel panelYellow; + private Panel panelBlue; + private Panel panelGreen; + private Panel panelRed; + private PictureBox pictureBoxObject; + private Button buttonAdd; + private Button buttonCancel; + private Panel panelObject; + private Label labelAditionalColor; + private Label labelBodyColor; + } +} \ No newline at end of file diff --git a/ProjectBomber/ProjectBomber/FormCarConfig.cs b/ProjectBomber/ProjectBomber/FormCarConfig.cs new file mode 100644 index 0000000..a4265a4 --- /dev/null +++ b/ProjectBomber/ProjectBomber/FormCarConfig.cs @@ -0,0 +1,167 @@ +using ProjectAirBomber.Drawnings; +using ProjectAirBomber.Entities; +using System.Windows.Forms; + + +namespace ProjectAirBomber +{ + public partial class FormCarConfig : Form + { + /// + /// Объект - прорисовка автомобиля + /// + private DrawningPlane? _plane; + + /// + /// Событие для передачи объекта + /// + private event Action? PlaneDelegate; + + /// + /// конструктор + /// + public FormCarConfig() + { + 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; + panelPurple.MouseDown += Panel_MouseDown; + // TODO buttonCancel.Click привязать анонимный метод через lambda с закрытием формы + buttonCancel.Click += (sender, e) => Close(); + } + /// + /// Привязка внешнего метода к событию + /// + /// + public void AddEvent(Action planeDelegate) + { + PlaneDelegate += planeDelegate; + } + + private void Panel_MouseDown(object? sender, MouseEventArgs e) + { + (sender as Control)?.DoDragDrop((sender as Control).BackColor, DragDropEffects.Move | DragDropEffects.Copy); + + // TODO отправка цвета в Drag&Drop + } + + // TODO Реализовать логику смены цветов: основного и дополнительного (для продвинутого объекта) + + + private void LabelBodyColor_DragEnter(object sender, DragEventArgs e) + { + if (e.Data.GetDataPresent(typeof(Color))) + { + e.Effect = DragDropEffects.Copy; + } + else + { + e.Effect = DragDropEffects.None; + } + } + private void LabelBodyColor_DragDrop(object sender, DragEventArgs e) + { + if (_plane != null) + { + _plane.EntityPlane.setBodyColor((Color)e.Data.GetData(typeof(Color))); + DrawObject(); + } + } + + private void LabelAdditionalColor_DragEnter(object sender, DragEventArgs e) + { + if (_plane is DrawningPlane) + { + if (e.Data.GetDataPresent(typeof(Color))) + { + e.Effect = DragDropEffects.Copy; + } + else + { + e.Effect = DragDropEffects.None; + } + } + } + + private void LabelAdditionalColor_DragDrop(object sender, DragEventArgs e) + { + if (_plane.EntityPlane is EntityAirBomber _airBomber) + { + _airBomber.SetAdditionalColor((Color)e.Data.GetData(typeof(Color))); + } + DrawObject(); + } + + /// + /// Прорисовка объекта + /// + private void DrawObject() + { + Bitmap bmp = new(pictureBoxObject.Width, pictureBoxObject.Height); + Graphics gr = Graphics.FromImage(bmp); + _plane?.SetPictureSize(pictureBoxObject.Width, pictureBoxObject.Height); + _plane?.SetPosition(15, 15); + _plane?.DrawPlane(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": + _plane = new DrawningPlane((int)numericUpDownSpeed.Value, (double)numericUpDownWeight.Value, Color.White); + break; + case "labelModificObject": + _plane = new DrawingAirBomber((int)numericUpDownSpeed.Value, (double)numericUpDownWeight.Value, Color.White, + Color.Black, checkBoxEngine.Checked, checkBoxBomb.Checked); + break; + } + labelBodyColor.BackColor = Color.Empty; + labelAditionalColor.BackColor = Color.Empty; + DrawObject(); + } + /// + /// Передача объекта + /// + /// + /// + private void ButtonAdd_Click(object sender, EventArgs e) + { + if (_plane != null) + { + PlaneDelegate?.Invoke(_plane); + Close(); + } + } + } +} diff --git a/ProjectBomber/ProjectBomber/FormCarConfig.resx b/ProjectBomber/ProjectBomber/FormCarConfig.resx new file mode 100644 index 0000000..af32865 --- /dev/null +++ b/ProjectBomber/ProjectBomber/FormCarConfig.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/ProjectBomber/ProjectBomber/FormPlaneCollection.Designer.cs b/ProjectBomber/ProjectBomber/FormPlaneCollection.Designer.cs index 11c27f5..65d20ef 100644 --- a/ProjectBomber/ProjectBomber/FormPlaneCollection.Designer.cs +++ b/ProjectBomber/ProjectBomber/FormPlaneCollection.Designer.cs @@ -33,7 +33,6 @@ maskedTextBox = new MaskedTextBox(); buttonAddPlane = new Button(); buttonRefresh = new Button(); - buttonAddAirBomber = new Button(); buttonGoToCheck = new Button(); buttonDelPlane = new Button(); comboBoxSelectionCompany = new ComboBox(); @@ -72,7 +71,6 @@ panelCompanyTools.Controls.Add(maskedTextBox); panelCompanyTools.Controls.Add(buttonAddPlane); panelCompanyTools.Controls.Add(buttonRefresh); - panelCompanyTools.Controls.Add(buttonAddAirBomber); panelCompanyTools.Controls.Add(buttonGoToCheck); panelCompanyTools.Controls.Add(buttonDelPlane); panelCompanyTools.Dock = DockStyle.Bottom; @@ -111,16 +109,6 @@ buttonRefresh.UseVisualStyleBackColor = true; buttonRefresh.Click += ButtonRefresh_Click; // - // buttonAddAirBomber - // - buttonAddAirBomber.Location = new Point(3, 207); - buttonAddAirBomber.Name = "buttonAddAirBomber"; - buttonAddAirBomber.Size = new Size(235, 59); - buttonAddAirBomber.TabIndex = 2; - buttonAddAirBomber.Text = "Добавление бомбардировщика"; - buttonAddAirBomber.UseVisualStyleBackColor = true; - buttonAddAirBomber.Click += ButtonAddAirBomber_Click; - // // buttonGoToCheck // buttonGoToCheck.Location = new Point(9, 131); @@ -276,7 +264,6 @@ private GroupBox groupBoxTools; private ComboBox comboBoxSelectionCompany; private Button buttonAddPlane; - private Button buttonAddAirBomber; private PictureBox pictureBox; private Button buttonDelPlane; private MaskedTextBox maskedTextBox; diff --git a/ProjectBomber/ProjectBomber/FormPlaneCollection.cs b/ProjectBomber/ProjectBomber/FormPlaneCollection.cs index 4125e8f..b8299f7 100644 --- a/ProjectBomber/ProjectBomber/FormPlaneCollection.cs +++ b/ProjectBomber/ProjectBomber/FormPlaneCollection.cs @@ -33,33 +33,16 @@ namespace ProjectAirBomber panelCompanyTools.Enabled = false; } - private void CreateObject(string type) - { - if (_company == null) + + private void SetPlane(DrawningPlane? Plane) + { + if (_company == null || Plane == null) { return; } - Random random = new(); - DrawningPlane drawningPlane; - Random rnd = new Random(); - switch (type) - { - case nameof(DrawningPlane): - drawningPlane = new DrawningPlane(rnd.Next(100, 300), rnd.Next(1000, 3000), GetColor(random)); - break; - case nameof(DrawingAirBomber): - drawningPlane = new DrawingAirBomber(rnd.Next(650, 700), rnd.Next(15760, 16130), - GetColor(random), GetColor(random), - Convert.ToBoolean(rnd.Next(0, 2)), - Convert.ToBoolean(rnd.Next(0, 2))); - break; - default: - return; - } - - if (_company + drawningPlane != -1) + if (_company + Plane != -1) { MessageBox.Show("Объект добавлен"); pictureBox.Image = _company.Show(); @@ -70,29 +53,19 @@ namespace ProjectAirBomber } } - 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; - } /// /// кнопка добавления самолета /// /// /// - private void ButtonAddPlane_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningPlane)); - /// - /// кнопка добавления бомбардировщика - /// - /// - /// - private void ButtonAddAirBomber_Click(object sender, EventArgs e) => CreateObject(nameof(DrawingAirBomber)); + private void ButtonAddPlane_Click(object sender, EventArgs e) + { + FormCarConfig form = new(); + // TODO передать метод + + form.Show(); + form.AddEvent(SetPlane); + } /// /// кнопка удаления /// diff --git a/ProjectBomber/ProjectBomber/PlaneDelegate.cs b/ProjectBomber/ProjectBomber/PlaneDelegate.cs new file mode 100644 index 0000000..2329836 --- /dev/null +++ b/ProjectBomber/ProjectBomber/PlaneDelegate.cs @@ -0,0 +1,9 @@ +using ProjectAirBomber.Drawnings; + +namespace ProjectAirBomber; + +/// +/// Делегат передачи объекта класса-прорисовки +/// +/// +public delegate void PlaneDelegate(DrawningPlane Plane); \ No newline at end of file diff --git a/КУРСАЧ.docx b/КУРСАЧ.docx new file mode 100644 index 0000000..959bf19 Binary files /dev/null and b/КУРСАЧ.docx differ