From d3e7dd9657d8fb26fcb43f3d9ffe3199e15e2ba2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D1=80=D1=82=D1=91=D0=BC=20=D0=90=D0=BB=D0=B5=D0=B9?= =?UTF-8?q?=D0=BA=D0=B8=D0=BD?= Date: Sat, 12 Nov 2022 16:04:33 +0400 Subject: [PATCH 1/4] Add config form --- .../AirBomber/FormAirBomberConfig.Designer.cs | 356 ++++++++++++++++++ AirBomber/AirBomber/FormAirBomberConfig.cs | 97 +++++ AirBomber/AirBomber/FormAirBomberConfig.resx | 60 +++ 3 files changed, 513 insertions(+) create mode 100644 AirBomber/AirBomber/FormAirBomberConfig.Designer.cs create mode 100644 AirBomber/AirBomber/FormAirBomberConfig.cs create mode 100644 AirBomber/AirBomber/FormAirBomberConfig.resx diff --git a/AirBomber/AirBomber/FormAirBomberConfig.Designer.cs b/AirBomber/AirBomber/FormAirBomberConfig.Designer.cs new file mode 100644 index 0000000..b1b1564 --- /dev/null +++ b/AirBomber/AirBomber/FormAirBomberConfig.Designer.cs @@ -0,0 +1,356 @@ +namespace AirBomber +{ + partial class FormAirBomberConfig + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.groupBoxConfig = new System.Windows.Forms.GroupBox(); + this.labelModifiedObject = new System.Windows.Forms.Label(); + this.labelSimpleObject = new System.Windows.Forms.Label(); + this.groupBoxColors = new System.Windows.Forms.GroupBox(); + this.panelPurple = new System.Windows.Forms.Panel(); + this.panelGray = new System.Windows.Forms.Panel(); + this.panelBlue = new System.Windows.Forms.Panel(); + this.panelBlack = new System.Windows.Forms.Panel(); + this.panelWhite = new System.Windows.Forms.Panel(); + this.panelGreen = new System.Windows.Forms.Panel(); + this.panelYellow = new System.Windows.Forms.Panel(); + this.panelRed = new System.Windows.Forms.Panel(); + this.checkBoxWeapons = new System.Windows.Forms.CheckBox(); + this.checkBoxEngines = new System.Windows.Forms.CheckBox(); + this.numericUpDownWeight = new System.Windows.Forms.NumericUpDown(); + this.numericUpDownSpeed = new System.Windows.Forms.NumericUpDown(); + this.labelWeight = new System.Windows.Forms.Label(); + this.labelSpeed = new System.Windows.Forms.Label(); + this.pictureBoxObject = new System.Windows.Forms.PictureBox(); + this.panelObject = new System.Windows.Forms.Panel(); + this.labelDopColor = new System.Windows.Forms.Label(); + this.labelBaseColor = new System.Windows.Forms.Label(); + this.button1 = new System.Windows.Forms.Button(); + this.button2 = new System.Windows.Forms.Button(); + this.groupBoxConfig.SuspendLayout(); + this.groupBoxColors.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownWeight)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownSpeed)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBoxObject)).BeginInit(); + this.panelObject.SuspendLayout(); + this.SuspendLayout(); + // + // groupBoxConfig + // + this.groupBoxConfig.Controls.Add(this.labelModifiedObject); + this.groupBoxConfig.Controls.Add(this.labelSimpleObject); + this.groupBoxConfig.Controls.Add(this.groupBoxColors); + this.groupBoxConfig.Controls.Add(this.checkBoxWeapons); + this.groupBoxConfig.Controls.Add(this.checkBoxEngines); + this.groupBoxConfig.Controls.Add(this.numericUpDownWeight); + this.groupBoxConfig.Controls.Add(this.numericUpDownSpeed); + this.groupBoxConfig.Controls.Add(this.labelWeight); + this.groupBoxConfig.Controls.Add(this.labelSpeed); + this.groupBoxConfig.Location = new System.Drawing.Point(12, 12); + this.groupBoxConfig.Name = "groupBoxConfig"; + this.groupBoxConfig.Size = new System.Drawing.Size(703, 255); + this.groupBoxConfig.TabIndex = 0; + this.groupBoxConfig.TabStop = false; + this.groupBoxConfig.Text = "Параметры"; + // + // labelModifiedObject + // + this.labelModifiedObject.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.labelModifiedObject.Location = new System.Drawing.Point(529, 200); + this.labelModifiedObject.Name = "labelModifiedObject"; + this.labelModifiedObject.Size = new System.Drawing.Size(128, 52); + this.labelModifiedObject.TabIndex = 8; + this.labelModifiedObject.Text = "Продвинутый"; + this.labelModifiedObject.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.labelModifiedObject.MouseDown += new System.Windows.Forms.MouseEventHandler(this.LabelObject_MouseDown); + // + // labelSimpleObject + // + this.labelSimpleObject.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.labelSimpleObject.Location = new System.Drawing.Point(378, 200); + this.labelSimpleObject.Name = "labelSimpleObject"; + this.labelSimpleObject.Size = new System.Drawing.Size(128, 52); + this.labelSimpleObject.TabIndex = 7; + this.labelSimpleObject.Text = "Простой"; + this.labelSimpleObject.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.labelSimpleObject.MouseDown += new System.Windows.Forms.MouseEventHandler(this.LabelObject_MouseDown); + // + // groupBoxColors + // + this.groupBoxColors.Controls.Add(this.panelPurple); + this.groupBoxColors.Controls.Add(this.panelGray); + this.groupBoxColors.Controls.Add(this.panelBlue); + this.groupBoxColors.Controls.Add(this.panelBlack); + this.groupBoxColors.Controls.Add(this.panelWhite); + this.groupBoxColors.Controls.Add(this.panelGreen); + this.groupBoxColors.Controls.Add(this.panelYellow); + this.groupBoxColors.Controls.Add(this.panelRed); + this.groupBoxColors.Location = new System.Drawing.Point(349, 22); + this.groupBoxColors.Name = "groupBoxColors"; + this.groupBoxColors.Size = new System.Drawing.Size(334, 175); + this.groupBoxColors.TabIndex = 6; + this.groupBoxColors.TabStop = false; + this.groupBoxColors.Text = "Цвета"; + // + // panelPurple + // + this.panelPurple.BackColor = System.Drawing.Color.Purple; + this.panelPurple.Location = new System.Drawing.Point(253, 118); + this.panelPurple.Name = "panelPurple"; + this.panelPurple.Size = new System.Drawing.Size(55, 46); + this.panelPurple.TabIndex = 7; + // + // panelGray + // + this.panelGray.BackColor = System.Drawing.Color.Gray; + this.panelGray.Location = new System.Drawing.Point(176, 118); + this.panelGray.Name = "panelGray"; + this.panelGray.Size = new System.Drawing.Size(55, 46); + this.panelGray.TabIndex = 6; + // + // panelBlue + // + this.panelBlue.BackColor = System.Drawing.Color.Blue; + this.panelBlue.Location = new System.Drawing.Point(103, 118); + this.panelBlue.Name = "panelBlue"; + this.panelBlue.Size = new System.Drawing.Size(55, 46); + this.panelBlue.TabIndex = 5; + // + // panelBlack + // + this.panelBlack.BackColor = System.Drawing.Color.Black; + this.panelBlack.Location = new System.Drawing.Point(29, 118); + this.panelBlack.Name = "panelBlack"; + this.panelBlack.Size = new System.Drawing.Size(55, 46); + this.panelBlack.TabIndex = 4; + // + // panelWhite + // + this.panelWhite.BackColor = System.Drawing.Color.White; + this.panelWhite.Location = new System.Drawing.Point(253, 41); + this.panelWhite.Name = "panelWhite"; + this.panelWhite.Size = new System.Drawing.Size(55, 46); + this.panelWhite.TabIndex = 3; + // + // panelGreen + // + this.panelGreen.BackColor = System.Drawing.Color.Green; + this.panelGreen.Location = new System.Drawing.Point(176, 41); + this.panelGreen.Name = "panelGreen"; + this.panelGreen.Size = new System.Drawing.Size(55, 46); + this.panelGreen.TabIndex = 2; + // + // panelYellow + // + this.panelYellow.BackColor = System.Drawing.Color.Gold; + this.panelYellow.Location = new System.Drawing.Point(103, 41); + this.panelYellow.Name = "panelYellow"; + this.panelYellow.Size = new System.Drawing.Size(55, 46); + this.panelYellow.TabIndex = 1; + // + // panelRed + // + this.panelRed.BackColor = System.Drawing.Color.Red; + this.panelRed.Location = new System.Drawing.Point(29, 41); + this.panelRed.Name = "panelRed"; + this.panelRed.Size = new System.Drawing.Size(55, 46); + this.panelRed.TabIndex = 0; + // + // checkBoxWeapons + // + this.checkBoxWeapons.AutoSize = true; + this.checkBoxWeapons.Location = new System.Drawing.Point(25, 178); + this.checkBoxWeapons.Name = "checkBoxWeapons"; + this.checkBoxWeapons.Size = new System.Drawing.Size(194, 19); + this.checkBoxWeapons.TabIndex = 5; + this.checkBoxWeapons.Text = "Признак наличия вооружения"; + this.checkBoxWeapons.UseVisualStyleBackColor = true; + // + // checkBoxEngines + // + this.checkBoxEngines.AutoSize = true; + this.checkBoxEngines.Location = new System.Drawing.Point(25, 140); + this.checkBoxEngines.Name = "checkBoxEngines"; + this.checkBoxEngines.Size = new System.Drawing.Size(284, 19); + this.checkBoxEngines.TabIndex = 4; + this.checkBoxEngines.Text = "Признак наличия дополнительных двигателей"; + this.checkBoxEngines.UseVisualStyleBackColor = true; + // + // numericUpDownWeight + // + this.numericUpDownWeight.Location = new System.Drawing.Point(93, 94); + this.numericUpDownWeight.Name = "numericUpDownWeight"; + this.numericUpDownWeight.Size = new System.Drawing.Size(120, 23); + this.numericUpDownWeight.TabIndex = 3; + this.numericUpDownWeight.Value = new decimal(new int[] { + 100, + 0, + 0, + 0}); + // + // numericUpDownSpeed + // + this.numericUpDownSpeed.Location = new System.Drawing.Point(93, 45); + this.numericUpDownSpeed.Name = "numericUpDownSpeed"; + this.numericUpDownSpeed.Size = new System.Drawing.Size(120, 23); + this.numericUpDownSpeed.TabIndex = 2; + this.numericUpDownSpeed.Value = new decimal(new int[] { + 100, + 0, + 0, + 0}); + // + // labelWeight + // + this.labelWeight.AutoSize = true; + this.labelWeight.Location = new System.Drawing.Point(25, 94); + this.labelWeight.Name = "labelWeight"; + this.labelWeight.Size = new System.Drawing.Size(29, 15); + this.labelWeight.TabIndex = 1; + this.labelWeight.Text = "Вес:"; + // + // labelSpeed + // + this.labelSpeed.AutoSize = true; + this.labelSpeed.Location = new System.Drawing.Point(25, 47); + this.labelSpeed.Name = "labelSpeed"; + this.labelSpeed.Size = new System.Drawing.Size(62, 15); + this.labelSpeed.TabIndex = 0; + this.labelSpeed.Text = "Скорость:"; + // + // pictureBoxObject + // + this.pictureBoxObject.Location = new System.Drawing.Point(16, 56); + this.pictureBoxObject.Name = "pictureBoxObject"; + this.pictureBoxObject.Size = new System.Drawing.Size(236, 130); + this.pictureBoxObject.TabIndex = 1; + this.pictureBoxObject.TabStop = false; + // + // panelObject + // + this.panelObject.AllowDrop = true; + this.panelObject.Controls.Add(this.labelDopColor); + this.panelObject.Controls.Add(this.labelBaseColor); + this.panelObject.Controls.Add(this.pictureBoxObject); + this.panelObject.Location = new System.Drawing.Point(761, 12); + this.panelObject.Name = "panelObject"; + this.panelObject.Size = new System.Drawing.Size(264, 197); + this.panelObject.TabIndex = 2; + this.panelObject.DragDrop += new System.Windows.Forms.DragEventHandler(this.PanelObject_DragDrop); + this.panelObject.DragEnter += new System.Windows.Forms.DragEventHandler(this.PanelObject_DragEnter); + // + // labelDopColor + // + this.labelDopColor.AllowDrop = true; + this.labelDopColor.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.labelDopColor.Location = new System.Drawing.Point(147, 9); + this.labelDopColor.Name = "labelDopColor"; + this.labelDopColor.Size = new System.Drawing.Size(105, 44); + this.labelDopColor.TabIndex = 10; + this.labelDopColor.Text = "Доп. цвет"; + this.labelDopColor.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // labelBaseColor + // + this.labelBaseColor.AllowDrop = true; + this.labelBaseColor.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.labelBaseColor.Location = new System.Drawing.Point(16, 9); + this.labelBaseColor.Name = "labelBaseColor"; + this.labelBaseColor.Size = new System.Drawing.Size(105, 44); + this.labelBaseColor.TabIndex = 9; + this.labelBaseColor.Text = "Цвет"; + this.labelBaseColor.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // button1 + // + this.button1.Location = new System.Drawing.Point(777, 226); + this.button1.Name = "button1"; + this.button1.Size = new System.Drawing.Size(105, 38); + this.button1.TabIndex = 3; + this.button1.Text = "Добавить"; + this.button1.UseVisualStyleBackColor = true; + // + // button2 + // + this.button2.Location = new System.Drawing.Point(908, 226); + this.button2.Name = "button2"; + this.button2.Size = new System.Drawing.Size(105, 38); + this.button2.TabIndex = 4; + this.button2.Text = "Отмена"; + this.button2.UseVisualStyleBackColor = true; + // + // FormAirBomberConfig + // + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(1055, 279); + this.Controls.Add(this.button2); + this.Controls.Add(this.button1); + this.Controls.Add(this.panelObject); + this.Controls.Add(this.groupBoxConfig); + this.Name = "FormAirBomberConfig"; + this.Text = "Создание объекта"; + this.groupBoxConfig.ResumeLayout(false); + this.groupBoxConfig.PerformLayout(); + this.groupBoxColors.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownWeight)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownSpeed)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBoxObject)).EndInit(); + this.panelObject.ResumeLayout(false); + this.ResumeLayout(false); + + } + + #endregion + + private GroupBox groupBoxConfig; + private Label labelWeight; + private Label labelSpeed; + private CheckBox checkBoxWeapons; + private CheckBox checkBoxEngines; + private NumericUpDown numericUpDownWeight; + private NumericUpDown numericUpDownSpeed; + private Label labelModifiedObject; + private Label labelSimpleObject; + private GroupBox groupBoxColors; + private Panel panelPurple; + private Panel panelGray; + private Panel panelBlue; + private Panel panelBlack; + private Panel panelWhite; + private Panel panelGreen; + private Panel panelYellow; + private Panel panelRed; + private PictureBox pictureBoxObject; + private Panel panelObject; + private Label labelDopColor; + private Label labelBaseColor; + private Button button1; + private Button button2; + } +} \ No newline at end of file diff --git a/AirBomber/AirBomber/FormAirBomberConfig.cs b/AirBomber/AirBomber/FormAirBomberConfig.cs new file mode 100644 index 0000000..b187451 --- /dev/null +++ b/AirBomber/AirBomber/FormAirBomberConfig.cs @@ -0,0 +1,97 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace AirBomber +{ + public partial class FormAirBomberConfig : Form + { + DrawningBomber _airBomber = null; + public FormAirBomberConfig() + { + InitializeComponent(); + panelBlack.MouseDown += PanelColor_MouseDown; + panelBlue.MouseDown += PanelColor_MouseDown; + panelYellow.MouseDown += PanelColor_MouseDown; + panelGray.MouseDown += PanelColor_MouseDown; + panelWhite.MouseDown += PanelColor_MouseDown; + panelRed.MouseDown += PanelColor_MouseDown; + panelPurple.MouseDown += PanelColor_MouseDown; + panelGreen.MouseDown += PanelColor_MouseDown; + } + + private void DrawAirBomber() + { + Bitmap bmp = new(pictureBoxObject.Width, pictureBoxObject.Height); + Graphics gr = Graphics.FromImage(bmp); + _airBomber?.SetPosition(5, 5, pictureBoxObject.Width, pictureBoxObject.Height); + _airBomber?.DrawTransport(gr); + pictureBoxObject.Image = bmp; + } + + private void LabelObject_MouseDown(object sender, MouseEventArgs e) + { + (sender as Label).DoDragDrop((sender as Label).Name, DragDropEffects.Move | DragDropEffects.Copy); + } + + private void LabelBaseColor_DragEnter(object sender, DragEventArgs e) + { + if (e.Data.GetDataPresent(typeof(Color))) + { + e.Effect = DragDropEffects.Copy; + } + else + { + e.Effect = DragDropEffects.None; + } + } + + private void LabelBaseColor_DragDrop(object sender, DragEventArgs e) + { + // TODO Call method from object _car and set color + } + + private void LabelDopColor_DragDrop(object sender, DragEventArgs e) + { + // TODO Call method from object _car if _car is DrawningSportCar and set dop color + } + + private void PanelObject_DragEnter(object sender, DragEventArgs e) + { + if (e.Data.GetDataPresent(DataFormats.Text)) + { + e.Effect = DragDropEffects.Copy; + } + else + { + e.Effect = DragDropEffects.None; + } + } + + private void PanelColor_MouseDown(object sender, MouseEventArgs e) + { + (sender as Control).DoDragDrop((sender as Control).BackColor, DragDropEffects.Move |) + } + + private void PanelObject_DragDrop(object sender, DragEventArgs e) + { + switch (e.Data.GetData(DataFormats.Text).ToString()) + { + case "labelSimpleObject": + _airBomber = new DrawningBomber((int)numericUpDownSpeed.Value, (int)numericUpDownWeight.Value, Color.White); + break; + case "labelModifiedObject": + _airBomber = new DrawningWarplane((int)numericUpDownSpeed.Value, (int)numericUpDownWeight.Value, + Color.White, Color.Black, checkBoxEngines.Checked, checkBoxWeapons.Checked); + break; + } + DrawAirBomber(); + } + } +} diff --git a/AirBomber/AirBomber/FormAirBomberConfig.resx b/AirBomber/AirBomber/FormAirBomberConfig.resx new file mode 100644 index 0000000..f298a7b --- /dev/null +++ b/AirBomber/AirBomber/FormAirBomberConfig.resx @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 -- 2.25.1 From 1cf95f8b5987aee6938528e07a8ca6002d31d36a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D1=80=D1=82=D1=91=D0=BC=20=D0=90=D0=BB=D0=B5=D0=B9?= =?UTF-8?q?=D0=BA=D0=B8=D0=BD?= Date: Sat, 12 Nov 2022 16:11:50 +0400 Subject: [PATCH 2/4] Event work --- AirBomber/AirBomber/AirBomberDelegate.cs | 10 ++++++++ .../AirBomber/FormAirBomberConfig.Designer.cs | 21 ++++++++-------- AirBomber/AirBomber/FormAirBomberConfig.cs | 24 ++++++++++++++++++- .../AirBomber/FormMapWithSetAirBomber.cs | 21 +++------------- 4 files changed, 47 insertions(+), 29 deletions(-) create mode 100644 AirBomber/AirBomber/AirBomberDelegate.cs diff --git a/AirBomber/AirBomber/AirBomberDelegate.cs b/AirBomber/AirBomber/AirBomberDelegate.cs new file mode 100644 index 0000000..0af60c7 --- /dev/null +++ b/AirBomber/AirBomber/AirBomberDelegate.cs @@ -0,0 +1,10 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AirBomber +{ + public delegate void AirBomberDelegate(DrawningBomber airBomber); +} diff --git a/AirBomber/AirBomber/FormAirBomberConfig.Designer.cs b/AirBomber/AirBomber/FormAirBomberConfig.Designer.cs index b1b1564..07d65f7 100644 --- a/AirBomber/AirBomber/FormAirBomberConfig.Designer.cs +++ b/AirBomber/AirBomber/FormAirBomberConfig.Designer.cs @@ -50,7 +50,7 @@ this.panelObject = new System.Windows.Forms.Panel(); this.labelDopColor = new System.Windows.Forms.Label(); this.labelBaseColor = new System.Windows.Forms.Label(); - this.button1 = new System.Windows.Forms.Button(); + this.buttonOk = new System.Windows.Forms.Button(); this.button2 = new System.Windows.Forms.Button(); this.groupBoxConfig.SuspendLayout(); this.groupBoxColors.SuspendLayout(); @@ -286,14 +286,15 @@ this.labelBaseColor.Text = "Цвет"; this.labelBaseColor.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // - // button1 + // buttonOk // - this.button1.Location = new System.Drawing.Point(777, 226); - this.button1.Name = "button1"; - this.button1.Size = new System.Drawing.Size(105, 38); - this.button1.TabIndex = 3; - this.button1.Text = "Добавить"; - this.button1.UseVisualStyleBackColor = true; + this.buttonOk.Location = new System.Drawing.Point(777, 226); + this.buttonOk.Name = "buttonOk"; + this.buttonOk.Size = new System.Drawing.Size(105, 38); + this.buttonOk.TabIndex = 3; + this.buttonOk.Text = "Добавить"; + this.buttonOk.UseVisualStyleBackColor = true; + this.buttonOk.Click += new System.EventHandler(this.ButtonOk_Click); // // button2 // @@ -310,7 +311,7 @@ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(1055, 279); this.Controls.Add(this.button2); - this.Controls.Add(this.button1); + this.Controls.Add(this.buttonOk); this.Controls.Add(this.panelObject); this.Controls.Add(this.groupBoxConfig); this.Name = "FormAirBomberConfig"; @@ -350,7 +351,7 @@ private Panel panelObject; private Label labelDopColor; private Label labelBaseColor; - private Button button1; + private Button buttonOk; private Button button2; } } \ No newline at end of file diff --git a/AirBomber/AirBomber/FormAirBomberConfig.cs b/AirBomber/AirBomber/FormAirBomberConfig.cs index b187451..eea585a 100644 --- a/AirBomber/AirBomber/FormAirBomberConfig.cs +++ b/AirBomber/AirBomber/FormAirBomberConfig.cs @@ -13,6 +13,8 @@ namespace AirBomber public partial class FormAirBomberConfig : Form { DrawningBomber _airBomber = null; + + private event AirBomberDelegate EventAddAirBomber; public FormAirBomberConfig() { InitializeComponent(); @@ -24,6 +26,8 @@ namespace AirBomber panelRed.MouseDown += PanelColor_MouseDown; panelPurple.MouseDown += PanelColor_MouseDown; panelGreen.MouseDown += PanelColor_MouseDown; + + // TODO buttonCancel.Click with lambda } private void DrawAirBomber() @@ -35,6 +39,18 @@ namespace AirBomber pictureBoxObject.Image = bmp; } + public void AddEvent(AirBomberDelegate ev) + { + if (EventAddAirBomber == null) + { + EventAddAirBomber = new AirBomberDelegate(ev); + } + else + { + EventAddAirBomber += ev; + } + } + private void LabelObject_MouseDown(object sender, MouseEventArgs e) { (sender as Label).DoDragDrop((sender as Label).Name, DragDropEffects.Move | DragDropEffects.Copy); @@ -76,7 +92,7 @@ namespace AirBomber private void PanelColor_MouseDown(object sender, MouseEventArgs e) { - (sender as Control).DoDragDrop((sender as Control).BackColor, DragDropEffects.Move |) + (sender as Control).DoDragDrop((sender as Control).BackColor, DragDropEffects.Move | DragDropEffects.Copy); } private void PanelObject_DragDrop(object sender, DragEventArgs e) @@ -93,5 +109,11 @@ namespace AirBomber } DrawAirBomber(); } + + private void ButtonOk_Click(object sender, EventArgs e) + { + EventAddAirBomber?.Invoke(_airBomber); + Close(); + } } } diff --git a/AirBomber/AirBomber/FormMapWithSetAirBomber.cs b/AirBomber/AirBomber/FormMapWithSetAirBomber.cs index d2b9515..82af5df 100644 --- a/AirBomber/AirBomber/FormMapWithSetAirBomber.cs +++ b/AirBomber/AirBomber/FormMapWithSetAirBomber.cs @@ -56,24 +56,9 @@ namespace AirBomber private void ButtonAddAirBomber_Click(object sender, EventArgs e) { - if (listBoxMaps.SelectedIndex == -1) - { - return; - } - FormAirBomber form = new(); - if (form.ShowDialog() == DialogResult.OK) - { - DrawningObjectBomber airBomber = new(form.SelectedAirBomber); - if (_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] + airBomber > -1) - { - MessageBox.Show("Объект добавлен"); - pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet(); - } - else - { - MessageBox.Show("Не удалось добавить объект"); - } - } + var formAirBomberConfig = new FormAirBomberConfig(); + // TODO Call method AddEvent form formCarConfig + formAirBomberConfig.Show(); } private void ButtonRemoveAirBomber_Click(object sender, EventArgs e) -- 2.25.1 From b02bce038705aaf60d3b99af7c90616ec8ab9f37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D1=80=D1=82=D1=91=D0=BC=20=D0=90=D0=BB=D0=B5=D0=B9?= =?UTF-8?q?=D0=BA=D0=B8=D0=BD?= Date: Sat, 12 Nov 2022 17:35:03 +0400 Subject: [PATCH 3/4] =?UTF-8?q?LabWork05=20=D1=81=D0=B4=D0=B5=D0=BB=D0=B0?= =?UTF-8?q?=D0=BD=D0=B0=20=D0=B4=D0=BE=D0=BC=D0=B0.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AirBomber/AirBomber/EntityAirBomber.cs | 2 +- AirBomber/AirBomber/EntityWarplane.cs | 2 +- .../AirBomber/FormAirBomberConfig.Designer.cs | 24 +++++++++++-------- AirBomber/AirBomber/FormAirBomberConfig.cs | 10 +++++--- .../AirBomber/FormMapWithSetAirBomber.cs | 19 ++++++++++++++- 5 files changed, 41 insertions(+), 16 deletions(-) diff --git a/AirBomber/AirBomber/EntityAirBomber.cs b/AirBomber/AirBomber/EntityAirBomber.cs index c778c91..0ff99f2 100644 --- a/AirBomber/AirBomber/EntityAirBomber.cs +++ b/AirBomber/AirBomber/EntityAirBomber.cs @@ -10,7 +10,7 @@ namespace AirBomber { public int Speed { get; private set; } public float Weight { get; private set; } - public Color BodyColor { get; private set; } + public Color BodyColor { get; set; } public float Step => Speed * 100 / Weight; public EntityAirBomber(int speed, float weight, Color bodyColor) diff --git a/AirBomber/AirBomber/EntityWarplane.cs b/AirBomber/AirBomber/EntityWarplane.cs index f66ecac..cebe323 100644 --- a/AirBomber/AirBomber/EntityWarplane.cs +++ b/AirBomber/AirBomber/EntityWarplane.cs @@ -8,7 +8,7 @@ namespace AirBomber { internal class EntityWarplane : EntityAirBomber { - public Color DopColor { get; private set; } + public Color DopColor { get; set; } public bool Engines { get; private set; } diff --git a/AirBomber/AirBomber/FormAirBomberConfig.Designer.cs b/AirBomber/AirBomber/FormAirBomberConfig.Designer.cs index 07d65f7..d63c109 100644 --- a/AirBomber/AirBomber/FormAirBomberConfig.Designer.cs +++ b/AirBomber/AirBomber/FormAirBomberConfig.Designer.cs @@ -51,7 +51,7 @@ this.labelDopColor = new System.Windows.Forms.Label(); this.labelBaseColor = new System.Windows.Forms.Label(); this.buttonOk = new System.Windows.Forms.Button(); - this.button2 = new System.Windows.Forms.Button(); + this.buttonCancel = new System.Windows.Forms.Button(); this.groupBoxConfig.SuspendLayout(); this.groupBoxColors.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.numericUpDownWeight)).BeginInit(); @@ -274,6 +274,8 @@ this.labelDopColor.TabIndex = 10; this.labelDopColor.Text = "Доп. цвет"; this.labelDopColor.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.labelDopColor.DragDrop += new System.Windows.Forms.DragEventHandler(this.LabelDopColor_DragDrop); + this.labelDopColor.DragEnter += new System.Windows.Forms.DragEventHandler(this.LabelBaseColor_DragEnter); // // labelBaseColor // @@ -285,6 +287,8 @@ this.labelBaseColor.TabIndex = 9; this.labelBaseColor.Text = "Цвет"; this.labelBaseColor.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.labelBaseColor.DragDrop += new System.Windows.Forms.DragEventHandler(this.LabelBaseColor_DragDrop); + this.labelBaseColor.DragEnter += new System.Windows.Forms.DragEventHandler(this.LabelBaseColor_DragEnter); // // buttonOk // @@ -296,21 +300,21 @@ this.buttonOk.UseVisualStyleBackColor = true; this.buttonOk.Click += new System.EventHandler(this.ButtonOk_Click); // - // button2 + // buttonCancel // - this.button2.Location = new System.Drawing.Point(908, 226); - this.button2.Name = "button2"; - this.button2.Size = new System.Drawing.Size(105, 38); - this.button2.TabIndex = 4; - this.button2.Text = "Отмена"; - this.button2.UseVisualStyleBackColor = true; + this.buttonCancel.Location = new System.Drawing.Point(908, 226); + this.buttonCancel.Name = "buttonCancel"; + this.buttonCancel.Size = new System.Drawing.Size(105, 38); + this.buttonCancel.TabIndex = 4; + this.buttonCancel.Text = "Отмена"; + this.buttonCancel.UseVisualStyleBackColor = true; // // FormAirBomberConfig // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(1055, 279); - this.Controls.Add(this.button2); + this.Controls.Add(this.buttonCancel); this.Controls.Add(this.buttonOk); this.Controls.Add(this.panelObject); this.Controls.Add(this.groupBoxConfig); @@ -352,6 +356,6 @@ private Label labelDopColor; private Label labelBaseColor; private Button buttonOk; - private Button button2; + private Button buttonCancel; } } \ No newline at end of file diff --git a/AirBomber/AirBomber/FormAirBomberConfig.cs b/AirBomber/AirBomber/FormAirBomberConfig.cs index eea585a..754d5b8 100644 --- a/AirBomber/AirBomber/FormAirBomberConfig.cs +++ b/AirBomber/AirBomber/FormAirBomberConfig.cs @@ -27,7 +27,7 @@ namespace AirBomber panelPurple.MouseDown += PanelColor_MouseDown; panelGreen.MouseDown += PanelColor_MouseDown; - // TODO buttonCancel.Click with lambda + buttonCancel.Click += (object sender, EventArgs e) => { Close(); }; } private void DrawAirBomber() @@ -70,12 +70,16 @@ namespace AirBomber private void LabelBaseColor_DragDrop(object sender, DragEventArgs e) { - // TODO Call method from object _car and set color + if (_airBomber == null) return; + _airBomber.AirBomber.BodyColor = (Color)e.Data.GetData(typeof(Color)); + DrawAirBomber(); } private void LabelDopColor_DragDrop(object sender, DragEventArgs e) { - // TODO Call method from object _car if _car is DrawningSportCar and set dop color + if (_airBomber == null || !(_airBomber.AirBomber is EntityWarplane airBomber)) return; + airBomber.DopColor = (Color)e.Data.GetData(typeof(Color)); + DrawAirBomber(); } private void PanelObject_DragEnter(object sender, DragEventArgs e) diff --git a/AirBomber/AirBomber/FormMapWithSetAirBomber.cs b/AirBomber/AirBomber/FormMapWithSetAirBomber.cs index 82af5df..9549b8f 100644 --- a/AirBomber/AirBomber/FormMapWithSetAirBomber.cs +++ b/AirBomber/AirBomber/FormMapWithSetAirBomber.cs @@ -57,10 +57,27 @@ namespace AirBomber private void ButtonAddAirBomber_Click(object sender, EventArgs e) { var formAirBomberConfig = new FormAirBomberConfig(); - // TODO Call method AddEvent form formCarConfig + formAirBomberConfig.AddEvent(AddAirBomber); formAirBomberConfig.Show(); } + private void AddAirBomber(DrawningBomber airBomber) + { + if (listBoxMaps.SelectedIndex == -1) + { + return; + } + if (_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] + new DrawningObjectBomber(airBomber) > -1) + { + MessageBox.Show("Объект добавлен"); + pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet(); + } + else + { + MessageBox.Show("Не удалось добавить объект"); + } + } + private void ButtonRemoveAirBomber_Click(object sender, EventArgs e) { if (listBoxMaps.SelectedIndex == -1) -- 2.25.1 From 67d28053af7f51c0af5453c8d3ea21c3cc7626ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D1=80=D1=82=D1=91=D0=BC=20=D0=90=D0=BB=D0=B5=D0=B9?= =?UTF-8?q?=D0=BA=D0=B8=D0=BD?= Date: Sat, 12 Nov 2022 17:43:00 +0400 Subject: [PATCH 4/4] =?UTF-8?q?LabWork05=20=D1=82=D0=B5=D0=BF=D0=B5=D1=80?= =?UTF-8?q?=D1=8C=20=D1=82=D0=BE=D1=87=D0=BD=D0=BE=20=D0=B4=D0=BE=D0=B4?= =?UTF-8?q?=D0=B5=D0=BB=D0=B0=D0=BD=D0=B0)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AirBomber/AirBomber/FormAirBomberConfig.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/AirBomber/AirBomber/FormAirBomberConfig.cs b/AirBomber/AirBomber/FormAirBomberConfig.cs index 754d5b8..51e0803 100644 --- a/AirBomber/AirBomber/FormAirBomberConfig.cs +++ b/AirBomber/AirBomber/FormAirBomberConfig.cs @@ -14,7 +14,7 @@ namespace AirBomber { DrawningBomber _airBomber = null; - private event AirBomberDelegate EventAddAirBomber; + private Action EventAddAirBomber; public FormAirBomberConfig() { InitializeComponent(); @@ -39,11 +39,11 @@ namespace AirBomber pictureBoxObject.Image = bmp; } - public void AddEvent(AirBomberDelegate ev) + public void AddEvent(Action ev) { if (EventAddAirBomber == null) { - EventAddAirBomber = new AirBomberDelegate(ev); + EventAddAirBomber = ev; } else { -- 2.25.1