From f88b41849dc0924d81b35729f68097f8c0a15bb5 Mon Sep 17 00:00:00 2001 From: abazov73 <92822431+abazov73@users.noreply.github.com> Date: Tue, 1 Nov 2022 11:56:30 +0400 Subject: [PATCH 1/3] =?UTF-8?q?=D0=9F=D1=8F=D1=82=D0=B0=D1=8F=20=D0=BB?= =?UTF-8?q?=D0=B0=D0=B1=D0=BE=D1=80=D0=B0=D1=82=D0=BE=D1=80=D0=BD=D0=B0?= =?UTF-8?q?=D1=8F=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=B0.=20=D0=9E=D0=BA?= =?UTF-8?q?=D0=BD=D0=BE=20=D1=81=D0=BE=D0=B7=D0=B4=D0=B0=D0=BD=D0=B8=D1=8F?= =?UTF-8?q?=20=D0=BE=D0=B1=D1=8A=D0=B5=D0=BA=D1=82=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AirBomber/AirBomber/EntityAirBomber.cs | 5 + AirBomber/AirBomber/EntityHeavyAirBomber.cs | 5 + .../AirBomber/FormAirBomberConfig.Designer.cs | 414 ++++++++++++++++++ AirBomber/AirBomber/FormAirBomberConfig.cs | 101 +++++ AirBomber/AirBomber/FormAirBomberConfig.resx | 60 +++ 5 files changed, 585 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/EntityAirBomber.cs b/AirBomber/AirBomber/EntityAirBomber.cs index b6cf197..3da7608 100644 --- a/AirBomber/AirBomber/EntityAirBomber.cs +++ b/AirBomber/AirBomber/EntityAirBomber.cs @@ -41,5 +41,10 @@ namespace AirBomber Weight = weight <= 0 ? rnd.Next(40, 70) : weight; BodyColor = bodyColor; } + + public void setColor(Color newColor) + { + BodyColor = newColor; + } } } diff --git a/AirBomber/AirBomber/EntityHeavyAirBomber.cs b/AirBomber/AirBomber/EntityHeavyAirBomber.cs index 4f15db4..d583e2e 100644 --- a/AirBomber/AirBomber/EntityHeavyAirBomber.cs +++ b/AirBomber/AirBomber/EntityHeavyAirBomber.cs @@ -45,5 +45,10 @@ namespace AirBomber FuelTank = fuelTank; TailLine = tailLine; } + + public void setDopColor(Color newDopColor) + { + DopColor = newDopColor; + } } } diff --git a/AirBomber/AirBomber/FormAirBomberConfig.Designer.cs b/AirBomber/AirBomber/FormAirBomberConfig.Designer.cs new file mode 100644 index 0000000..a4f6683 --- /dev/null +++ b/AirBomber/AirBomber/FormAirBomberConfig.Designer.cs @@ -0,0 +1,414 @@ +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.buttonCancel = new System.Windows.Forms.Button(); + this.buttonOk = new System.Windows.Forms.Button(); + this.panelObject = new System.Windows.Forms.Panel(); + this.labelDopColor = new System.Windows.Forms.Label(); + this.labelBaseColor = new System.Windows.Forms.Label(); + this.pictureBoxObject = new System.Windows.Forms.PictureBox(); + 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.panelYellow = new System.Windows.Forms.Panel(); + this.panelBlack = new System.Windows.Forms.Panel(); + this.panelBlue = new System.Windows.Forms.Panel(); + this.panelGray = new System.Windows.Forms.Panel(); + this.panelGreen = new System.Windows.Forms.Panel(); + this.panelWhite = new System.Windows.Forms.Panel(); + this.panelRed = new System.Windows.Forms.Panel(); + this.checkBoxTailLine = new System.Windows.Forms.CheckBox(); + this.checkBoxFuelTank = new System.Windows.Forms.CheckBox(); + this.checkBoxBombs = new System.Windows.Forms.CheckBox(); + this.numericUpDownWeight = new System.Windows.Forms.NumericUpDown(); + this.labelWeight = new System.Windows.Forms.Label(); + this.numericUpDownSpeed = new System.Windows.Forms.NumericUpDown(); + this.labelSpeed = new System.Windows.Forms.Label(); + this.panelObject.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBoxObject)).BeginInit(); + this.groupBoxConfig.SuspendLayout(); + this.groupBoxColors.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownWeight)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownSpeed)).BeginInit(); + this.SuspendLayout(); + // + // buttonCancel + // + this.buttonCancel.Location = new System.Drawing.Point(775, 268); + this.buttonCancel.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.buttonCancel.Name = "buttonCancel"; + this.buttonCancel.Size = new System.Drawing.Size(119, 40); + this.buttonCancel.TabIndex = 9; + this.buttonCancel.Text = "Отмена"; + this.buttonCancel.UseVisualStyleBackColor = true; + // + // buttonOk + // + this.buttonOk.Location = new System.Drawing.Point(637, 268); + this.buttonOk.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.buttonOk.Name = "buttonOk"; + this.buttonOk.Size = new System.Drawing.Size(119, 40); + this.buttonOk.TabIndex = 8; + this.buttonOk.Text = "Добавить"; + this.buttonOk.UseVisualStyleBackColor = true; + // + // 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(614, 15); + this.panelObject.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.panelObject.Name = "panelObject"; + this.panelObject.Size = new System.Drawing.Size(299, 245); + this.panelObject.TabIndex = 7; + 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(161, 12); + this.labelDopColor.Name = "labelDopColor"; + this.labelDopColor.Size = new System.Drawing.Size(119, 42); + this.labelDopColor.TabIndex = 2; + 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.labelColor_DragEnter); + // + // labelBaseColor + // + this.labelBaseColor.AllowDrop = true; + this.labelBaseColor.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.labelBaseColor.Location = new System.Drawing.Point(23, 12); + this.labelBaseColor.Name = "labelBaseColor"; + this.labelBaseColor.Size = new System.Drawing.Size(119, 42); + this.labelBaseColor.TabIndex = 1; + 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.labelColor_DragEnter); + // + // pictureBoxObject + // + this.pictureBoxObject.Location = new System.Drawing.Point(23, 59); + this.pictureBoxObject.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.pictureBoxObject.Name = "pictureBoxObject"; + this.pictureBoxObject.Size = new System.Drawing.Size(257, 167); + this.pictureBoxObject.TabIndex = 0; + this.pictureBoxObject.TabStop = false; + // + // groupBoxConfig + // + this.groupBoxConfig.Controls.Add(this.labelModifiedObject); + this.groupBoxConfig.Controls.Add(this.labelSimpleObject); + this.groupBoxConfig.Controls.Add(this.groupBoxColors); + this.groupBoxConfig.Controls.Add(this.checkBoxTailLine); + this.groupBoxConfig.Controls.Add(this.checkBoxFuelTank); + this.groupBoxConfig.Controls.Add(this.checkBoxBombs); + this.groupBoxConfig.Controls.Add(this.numericUpDownWeight); + this.groupBoxConfig.Controls.Add(this.labelWeight); + this.groupBoxConfig.Controls.Add(this.numericUpDownSpeed); + this.groupBoxConfig.Controls.Add(this.labelSpeed); + this.groupBoxConfig.Location = new System.Drawing.Point(13, 15); + this.groupBoxConfig.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.groupBoxConfig.Name = "groupBoxConfig"; + this.groupBoxConfig.Padding = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.groupBoxConfig.Size = new System.Drawing.Size(594, 293); + this.groupBoxConfig.TabIndex = 6; + this.groupBoxConfig.TabStop = false; + this.groupBoxConfig.Text = "Параметры"; + // + // labelModifiedObject + // + this.labelModifiedObject.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.labelModifiedObject.Location = new System.Drawing.Point(450, 216); + this.labelModifiedObject.Name = "labelModifiedObject"; + this.labelModifiedObject.Size = new System.Drawing.Size(111, 50); + this.labelModifiedObject.TabIndex = 16; + 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(322, 216); + this.labelSimpleObject.Name = "labelSimpleObject"; + this.labelSimpleObject.Size = new System.Drawing.Size(111, 50); + this.labelSimpleObject.TabIndex = 15; + 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.panelYellow); + this.groupBoxColors.Controls.Add(this.panelBlack); + this.groupBoxColors.Controls.Add(this.panelBlue); + this.groupBoxColors.Controls.Add(this.panelGray); + this.groupBoxColors.Controls.Add(this.panelGreen); + this.groupBoxColors.Controls.Add(this.panelWhite); + this.groupBoxColors.Controls.Add(this.panelRed); + this.groupBoxColors.Location = new System.Drawing.Point(305, 29); + this.groupBoxColors.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.groupBoxColors.Name = "groupBoxColors"; + this.groupBoxColors.Padding = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.groupBoxColors.Size = new System.Drawing.Size(275, 169); + this.groupBoxColors.TabIndex = 14; + this.groupBoxColors.TabStop = false; + this.groupBoxColors.Text = "Цвета"; + // + // panelPurple + // + this.panelPurple.BackColor = System.Drawing.Color.Purple; + this.panelPurple.Location = new System.Drawing.Point(210, 97); + this.panelPurple.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.panelPurple.Name = "panelPurple"; + this.panelPurple.Size = new System.Drawing.Size(46, 53); + this.panelPurple.TabIndex = 3; + // + // panelYellow + // + this.panelYellow.BackColor = System.Drawing.Color.Yellow; + this.panelYellow.Location = new System.Drawing.Point(210, 29); + this.panelYellow.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.panelYellow.Name = "panelYellow"; + this.panelYellow.Size = new System.Drawing.Size(46, 53); + this.panelYellow.TabIndex = 1; + // + // panelBlack + // + this.panelBlack.BackColor = System.Drawing.Color.Black; + this.panelBlack.Location = new System.Drawing.Point(145, 97); + this.panelBlack.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.panelBlack.Name = "panelBlack"; + this.panelBlack.Size = new System.Drawing.Size(46, 53); + this.panelBlack.TabIndex = 4; + // + // panelBlue + // + this.panelBlue.BackColor = System.Drawing.Color.Blue; + this.panelBlue.Location = new System.Drawing.Point(145, 29); + this.panelBlue.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.panelBlue.Name = "panelBlue"; + this.panelBlue.Size = new System.Drawing.Size(46, 53); + this.panelBlue.TabIndex = 1; + // + // panelGray + // + this.panelGray.BackColor = System.Drawing.Color.Gray; + this.panelGray.Location = new System.Drawing.Point(82, 97); + this.panelGray.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.panelGray.Name = "panelGray"; + this.panelGray.Size = new System.Drawing.Size(46, 53); + this.panelGray.TabIndex = 5; + // + // panelGreen + // + this.panelGreen.BackColor = System.Drawing.Color.Green; + this.panelGreen.Location = new System.Drawing.Point(82, 29); + this.panelGreen.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.panelGreen.Name = "panelGreen"; + this.panelGreen.Size = new System.Drawing.Size(46, 53); + this.panelGreen.TabIndex = 1; + // + // panelWhite + // + this.panelWhite.BackColor = System.Drawing.Color.White; + this.panelWhite.Location = new System.Drawing.Point(17, 97); + this.panelWhite.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.panelWhite.Name = "panelWhite"; + this.panelWhite.Size = new System.Drawing.Size(46, 53); + this.panelWhite.TabIndex = 2; + // + // panelRed + // + this.panelRed.BackColor = System.Drawing.Color.Red; + this.panelRed.Location = new System.Drawing.Point(17, 29); + this.panelRed.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.panelRed.Name = "panelRed"; + this.panelRed.Size = new System.Drawing.Size(46, 53); + this.panelRed.TabIndex = 0; + // + // checkBoxTailLine + // + this.checkBoxTailLine.AutoSize = true; + this.checkBoxTailLine.Location = new System.Drawing.Point(25, 248); + this.checkBoxTailLine.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.checkBoxTailLine.Name = "checkBoxTailLine"; + this.checkBoxTailLine.Size = new System.Drawing.Size(286, 24); + this.checkBoxTailLine.TabIndex = 13; + this.checkBoxTailLine.Text = "Признак наличия полосок на хвосте"; + this.checkBoxTailLine.UseVisualStyleBackColor = true; + // + // checkBoxFuelTank + // + this.checkBoxFuelTank.AutoSize = true; + this.checkBoxFuelTank.Location = new System.Drawing.Point(25, 200); + this.checkBoxFuelTank.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.checkBoxFuelTank.Name = "checkBoxFuelTank"; + this.checkBoxFuelTank.Size = new System.Drawing.Size(279, 24); + this.checkBoxFuelTank.TabIndex = 12; + this.checkBoxFuelTank.Text = "Признак наличия топливных баков"; + this.checkBoxFuelTank.UseVisualStyleBackColor = true; + // + // checkBoxBombs + // + this.checkBoxBombs.AutoSize = true; + this.checkBoxBombs.Location = new System.Drawing.Point(25, 154); + this.checkBoxBombs.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.checkBoxBombs.Name = "checkBoxBombs"; + this.checkBoxBombs.Size = new System.Drawing.Size(196, 24); + this.checkBoxBombs.TabIndex = 11; + this.checkBoxBombs.Text = "Признак наличия бомб"; + this.checkBoxBombs.UseVisualStyleBackColor = true; + // + // numericUpDownWeight + // + this.numericUpDownWeight.Location = new System.Drawing.Point(103, 96); + this.numericUpDownWeight.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.numericUpDownWeight.Maximum = new decimal(new int[] { + 1000, + 0, + 0, + 0}); + this.numericUpDownWeight.Minimum = new decimal(new int[] { + 100, + 0, + 0, + 0}); + this.numericUpDownWeight.Name = "numericUpDownWeight"; + this.numericUpDownWeight.Size = new System.Drawing.Size(90, 27); + this.numericUpDownWeight.TabIndex = 10; + this.numericUpDownWeight.Value = new decimal(new int[] { + 100, + 0, + 0, + 0}); + // + // labelWeight + // + this.labelWeight.AutoSize = true; + this.labelWeight.Location = new System.Drawing.Point(25, 100); + this.labelWeight.Name = "labelWeight"; + this.labelWeight.Size = new System.Drawing.Size(36, 20); + this.labelWeight.TabIndex = 9; + this.labelWeight.Text = "Вес:"; + // + // numericUpDownSpeed + // + this.numericUpDownSpeed.Location = new System.Drawing.Point(103, 40); + this.numericUpDownSpeed.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.numericUpDownSpeed.Maximum = new decimal(new int[] { + 1000, + 0, + 0, + 0}); + this.numericUpDownSpeed.Minimum = new decimal(new int[] { + 100, + 0, + 0, + 0}); + this.numericUpDownSpeed.Name = "numericUpDownSpeed"; + this.numericUpDownSpeed.Size = new System.Drawing.Size(90, 27); + this.numericUpDownSpeed.TabIndex = 8; + this.numericUpDownSpeed.Value = new decimal(new int[] { + 100, + 0, + 0, + 0}); + // + // labelSpeed + // + this.labelSpeed.AutoSize = true; + this.labelSpeed.Location = new System.Drawing.Point(25, 44); + this.labelSpeed.Name = "labelSpeed"; + this.labelSpeed.Size = new System.Drawing.Size(76, 20); + this.labelSpeed.TabIndex = 7; + this.labelSpeed.Text = "Скорость:"; + // + // FormAirBomberConfig + // + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(926, 323); + this.Controls.Add(this.buttonCancel); + this.Controls.Add(this.buttonOk); + this.Controls.Add(this.panelObject); + this.Controls.Add(this.groupBoxConfig); + this.Name = "FormAirBomberConfig"; + this.Text = "FormAirBomberConfig"; + this.panelObject.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.pictureBoxObject)).EndInit(); + this.groupBoxConfig.ResumeLayout(false); + this.groupBoxConfig.PerformLayout(); + this.groupBoxColors.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownWeight)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownSpeed)).EndInit(); + this.ResumeLayout(false); + + } + + #endregion + + private Button buttonCancel; + private Button buttonOk; + private Panel panelObject; + private Label labelDopColor; + private Label labelBaseColor; + private PictureBox pictureBoxObject; + private GroupBox groupBoxConfig; + private Label labelModifiedObject; + private Label labelSimpleObject; + private GroupBox groupBoxColors; + private Panel panelPurple; + private Panel panelYellow; + private Panel panelBlack; + private Panel panelBlue; + private Panel panelGray; + private Panel panelGreen; + private Panel panelWhite; + private Panel panelRed; + private CheckBox checkBoxTailLine; + private CheckBox checkBoxFuelTank; + private CheckBox checkBoxBombs; + private NumericUpDown numericUpDownWeight; + private Label labelWeight; + private NumericUpDown numericUpDownSpeed; + private Label labelSpeed; + } +} \ No newline at end of file diff --git a/AirBomber/AirBomber/FormAirBomberConfig.cs b/AirBomber/AirBomber/FormAirBomberConfig.cs new file mode 100644 index 0000000..e03fea3 --- /dev/null +++ b/AirBomber/AirBomber/FormAirBomberConfig.cs @@ -0,0 +1,101 @@ +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 + { + DrawingAirBomber _airBomber = null; + + public FormAirBomberConfig() + { + InitializeComponent(); + panelBlack.MouseDown += PanelColor_MouseDown; + panelPurple.MouseDown += PanelColor_MouseDown; + panelGray.MouseDown += PanelColor_MouseDown; + panelGreen.MouseDown += PanelColor_MouseDown; + panelRed.MouseDown += PanelColor_MouseDown; + panelWhite.MouseDown += PanelColor_MouseDown; + panelYellow.MouseDown += PanelColor_MouseDown; + panelBlue.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 PanelObject_DragEnter(object sender, DragEventArgs e) + { + if (e.Data.GetDataPresent(DataFormats.Text)) + { + 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": + _airBomber = new DrawingAirBomber((int)numericUpDownSpeed.Value, (int)numericUpDownWeight.Value, Color.White); + break; + case "labelModifiedObject": + _airBomber = new DrawingHeavyAirBomber((int)numericUpDownSpeed.Value, (int)numericUpDownWeight.Value, Color.White, Color.Black, + checkBoxBombs.Checked, checkBoxFuelTank.Checked, checkBoxTailLine.Checked); + break; + } + DrawAirBomber(); + } + + private void PanelColor_MouseDown(object sender, MouseEventArgs e) + { + (sender as Control).DoDragDrop((sender as Control).BackColor.Name, DragDropEffects.Move | DragDropEffects.Copy); + } + + private void labelColor_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) + { + _airBomber?.AirBomber?.setColor(Color.FromName(e.Data.GetData(DataFormats.Text).ToString())); + } + + private void labelDopColor_DragDrop(object sender, DragEventArgs e) + { + if (_airBomber.AirBomber is EntityHeavyAirBomber heavyAirBomber) + { + heavyAirBomber.setDopColor(Color.FromName(e.Data.GetData(DataFormats.Text).ToString())); + } + } + } +} 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 8463082f803e47ca132a474386d1844e66e82453 Mon Sep 17 00:00:00 2001 From: abazov73 <92822431+abazov73@users.noreply.github.com> Date: Tue, 1 Nov 2022 12:58:49 +0400 Subject: [PATCH 2/3] =?UTF-8?q?=D0=9F=D1=8F=D1=82=D0=B0=D1=8F=20=D0=BB?= =?UTF-8?q?=D0=B0=D0=B1=D0=BE=D1=80=D0=B0=D1=82=D0=BE=D1=80=D0=B0=D1=8F=20?= =?UTF-8?q?=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=B0.=20=D0=A0=D0=B0=D0=B1?= =?UTF-8?q?=D0=BE=D1=82=D0=B0=20=D1=81=20event?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AirBomber/FormAirBomberConfig.Designer.cs | 1 + AirBomber/AirBomber/FormAirBomberConfig.cs | 25 ++++++++++++++++++- .../AirBomber/FormMapWithSetAirBombers.cs | 23 +++++++---------- .../AirBomber/MapWithSetAirBombersGeneric.cs | 5 ++++ 4 files changed, 39 insertions(+), 15 deletions(-) diff --git a/AirBomber/AirBomber/FormAirBomberConfig.Designer.cs b/AirBomber/AirBomber/FormAirBomberConfig.Designer.cs index a4f6683..4e8ddea 100644 --- a/AirBomber/AirBomber/FormAirBomberConfig.Designer.cs +++ b/AirBomber/AirBomber/FormAirBomberConfig.Designer.cs @@ -80,6 +80,7 @@ this.buttonOk.TabIndex = 8; this.buttonOk.Text = "Добавить"; this.buttonOk.UseVisualStyleBackColor = true; + this.buttonOk.Click += new System.EventHandler(this.buttonOk_Click); // // panelObject // diff --git a/AirBomber/AirBomber/FormAirBomberConfig.cs b/AirBomber/AirBomber/FormAirBomberConfig.cs index e03fea3..a3b47cd 100644 --- a/AirBomber/AirBomber/FormAirBomberConfig.cs +++ b/AirBomber/AirBomber/FormAirBomberConfig.cs @@ -14,6 +14,8 @@ namespace AirBomber { DrawingAirBomber _airBomber = null; + private event Action EventAddAirBomber; + public FormAirBomberConfig() { InitializeComponent(); @@ -25,6 +27,7 @@ namespace AirBomber panelWhite.MouseDown += PanelColor_MouseDown; panelYellow.MouseDown += PanelColor_MouseDown; panelBlue.MouseDown += PanelColor_MouseDown; + buttonCancel.Click += (object sender, EventArgs e) => Close(); } private void DrawAirBomber() @@ -53,6 +56,18 @@ namespace AirBomber } } + public void AddEvent(Action ev) + { + if (EventAddAirBomber == null) + { + EventAddAirBomber = ev; + } + else + { + EventAddAirBomber += ev; + } + } + private void panelObject_DragDrop(object sender, DragEventArgs e) { switch (e.Data.GetData(DataFormats.Text).ToString()) @@ -75,7 +90,7 @@ namespace AirBomber private void labelColor_DragEnter(object sender, DragEventArgs e) { - if (e.Data.GetDataPresent(typeof(Color))) + if (e.Data.GetDataPresent(typeof(String))) { e.Effect = DragDropEffects.Copy; } @@ -88,6 +103,7 @@ namespace AirBomber private void labelBaseColor_DragDrop(object sender, DragEventArgs e) { _airBomber?.AirBomber?.setColor(Color.FromName(e.Data.GetData(DataFormats.Text).ToString())); + DrawAirBomber(); } private void labelDopColor_DragDrop(object sender, DragEventArgs e) @@ -95,7 +111,14 @@ namespace AirBomber if (_airBomber.AirBomber is EntityHeavyAirBomber heavyAirBomber) { heavyAirBomber.setDopColor(Color.FromName(e.Data.GetData(DataFormats.Text).ToString())); + DrawAirBomber(); } } + + private void buttonOk_Click(object sender, EventArgs e) + { + EventAddAirBomber?.Invoke(_airBomber); + Close(); + } } } diff --git a/AirBomber/AirBomber/FormMapWithSetAirBombers.cs b/AirBomber/AirBomber/FormMapWithSetAirBombers.cs index f568850..f690fc1 100644 --- a/AirBomber/AirBomber/FormMapWithSetAirBombers.cs +++ b/AirBomber/AirBomber/FormMapWithSetAirBombers.cs @@ -27,6 +27,10 @@ namespace AirBomber /// private readonly MapsCollection _mapsCollection; + private Action AddAction; + + private DrawingObjectAirBomber returnedAirBomber; + public FormMapWithSetAirBombers() { InitializeComponent(); @@ -36,6 +40,8 @@ namespace AirBomber { comboBoxSelectorMap.Items.Add(elem.Key); } + AddAction = airBomber => { _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].add(new DrawingObjectAirBomber(airBomber)); + pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();}; } private void buttonAddAirBomber_Click(object sender, EventArgs e) @@ -44,20 +50,9 @@ namespace AirBomber { return; } - FormAirBomber form = new(); - if (form.ShowDialog() == DialogResult.OK) - { - DrawingObjectAirBomber 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(); + formAirBomberConfig.AddEvent(AddAction); + formAirBomberConfig.Show(); } private void buttonRemoveAirBomber_Click(object sender, EventArgs e) diff --git a/AirBomber/AirBomber/MapWithSetAirBombersGeneric.cs b/AirBomber/AirBomber/MapWithSetAirBombersGeneric.cs index 194a3b5..a9704db 100644 --- a/AirBomber/AirBomber/MapWithSetAirBombersGeneric.cs +++ b/AirBomber/AirBomber/MapWithSetAirBombersGeneric.cs @@ -69,6 +69,11 @@ namespace AirBomber { return map._setAirBombers.Remove(position); } + + public void add(T airBomber) + { + _setAirBombers.Insert(airBomber); + } /// /// Вывод всего набора объектов /// -- 2.25.1 From cb826574cf6af14a04d3f62e01c473ac7c9dc347 Mon Sep 17 00:00:00 2001 From: abazov73 <92822431+abazov73@users.noreply.github.com> Date: Sun, 13 Nov 2022 16:41:12 +0400 Subject: [PATCH 3/3] =?UTF-8?q?=D0=9F=D1=8F=D1=82=D0=B0=D1=8F=20=D0=BB?= =?UTF-8?q?=D0=B0=D0=B1=D0=BE=D1=80=D0=B0=D1=82=D0=BE=D1=80=D0=BD=D0=B0?= =?UTF-8?q?=D1=8F=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=B0.=20=D0=A4=D0=B8?= =?UTF-8?q?=D0=BA=D1=81=20=D0=BD=D0=B5=D0=B8=D1=81=D0=BF=D0=BE=D0=BB=D1=8C?= =?UTF-8?q?=D0=B7=D0=BE=D0=B2=D0=B0=D0=BD=D0=BD=D1=8B=D1=85=20=D0=BF=D0=B5?= =?UTF-8?q?=D1=80=D0=B5=D0=BC=D0=B5=D0=BD=D0=BD=D1=8B=D1=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AirBomber/AirBomber/FormMapWithSetAirBombers.cs | 2 -- 1 file changed, 2 deletions(-) diff --git a/AirBomber/AirBomber/FormMapWithSetAirBombers.cs b/AirBomber/AirBomber/FormMapWithSetAirBombers.cs index f690fc1..64f7b32 100644 --- a/AirBomber/AirBomber/FormMapWithSetAirBombers.cs +++ b/AirBomber/AirBomber/FormMapWithSetAirBombers.cs @@ -29,8 +29,6 @@ namespace AirBomber private Action AddAction; - private DrawingObjectAirBomber returnedAirBomber; - public FormMapWithSetAirBombers() { InitializeComponent(); -- 2.25.1