From cde98ea4e6773fea721141b6d858d5c85fca0c32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=92=D0=BE=D0=BB=D0=BE=D0=B4=D1=8F?= Date: Sat, 19 Nov 2022 17:22:44 +0300 Subject: [PATCH 1/4] add config form --- .../FormPlaneConfig.Designer.cs | 381 ++++++++++++++++++ .../AirPlaneWithRadar/FormPlaneConfig.cs | 125 ++++++ .../AirPlaneWithRadar/FormPlaneConfig.resx | 120 ++++++ .../AirPlaneWithRadar/MapsCollection.cs | 3 +- 4 files changed, 627 insertions(+), 2 deletions(-) create mode 100644 AirPlaneWithRadar/AirPlaneWithRadar/FormPlaneConfig.Designer.cs create mode 100644 AirPlaneWithRadar/AirPlaneWithRadar/FormPlaneConfig.cs create mode 100644 AirPlaneWithRadar/AirPlaneWithRadar/FormPlaneConfig.resx diff --git a/AirPlaneWithRadar/AirPlaneWithRadar/FormPlaneConfig.Designer.cs b/AirPlaneWithRadar/AirPlaneWithRadar/FormPlaneConfig.Designer.cs new file mode 100644 index 0000000..fb22304 --- /dev/null +++ b/AirPlaneWithRadar/AirPlaneWithRadar/FormPlaneConfig.Designer.cs @@ -0,0 +1,381 @@ +namespace AirPlaneWithRadar +{ + partial class FormPlaneConfig + { + /// + /// 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.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.checkBoxRadar = new System.Windows.Forms.CheckBox(); + this.checkBoxOilBox = 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 = 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.buttonCancel = new System.Windows.Forms.Button(); + this.buttonOk = new System.Windows.Forms.Button(); + this.groupBoxConfig.SuspendLayout(); + this.groupBoxColors.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownWeight)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownSpeed)).BeginInit(); + this.panelObject.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBoxObject)).BeginInit(); + 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.checkBoxRadar); + this.groupBoxConfig.Controls.Add(this.checkBoxOilBox); ; + 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(12, 12); + this.groupBoxConfig.Name = "groupBoxConfig"; + this.groupBoxConfig.Size = new System.Drawing.Size(520, 220); + 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(394, 162); + this.labelModifiedObject.Name = "labelModifiedObject"; + this.labelModifiedObject.Size = new System.Drawing.Size(97, 38); + 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(282, 162); + this.labelSimpleObject.Name = "labelSimpleObject"; + this.labelSimpleObject.Size = new System.Drawing.Size(97, 38); + 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(267, 22); + this.groupBoxColors.Name = "groupBoxColors"; + this.groupBoxColors.Size = new System.Drawing.Size(241, 127); + 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(184, 73); + this.panelPurple.Name = "panelPurple"; + this.panelPurple.Size = new System.Drawing.Size(40, 40); + this.panelPurple.TabIndex = 3; + // + // panelYellow + // + this.panelYellow.BackColor = System.Drawing.Color.Yellow; + this.panelYellow.Location = new System.Drawing.Point(184, 22); + this.panelYellow.Name = "panelYellow"; + this.panelYellow.Size = new System.Drawing.Size(40, 40); + this.panelYellow.TabIndex = 1; + + // + // panelBlack + // + this.panelBlack.BackColor = System.Drawing.Color.Black; + this.panelBlack.Location = new System.Drawing.Point(127, 73); + this.panelBlack.Name = "panelBlack"; + this.panelBlack.Size = new System.Drawing.Size(40, 40); + this.panelBlack.TabIndex = 4; + // + // panelBlue + // + this.panelBlue.BackColor = System.Drawing.Color.Blue; + this.panelBlue.Location = new System.Drawing.Point(127, 22); + this.panelBlue.Name = "panelBlue"; + this.panelBlue.Size = new System.Drawing.Size(40, 40); + this.panelBlue.TabIndex = 1; + // + // panelGray + // + this.panelGray.BackColor = System.Drawing.Color.Gray; + this.panelGray.Location = new System.Drawing.Point(72, 73); + this.panelGray.Name = "panelGray"; + this.panelGray.Size = new System.Drawing.Size(40, 40); + this.panelGray.TabIndex = 5; + // + // panelGreen + // + this.panelGreen.BackColor = System.Drawing.Color.Green; + this.panelGreen.Location = new System.Drawing.Point(72, 22); + this.panelGreen.Name = "panelGreen"; + this.panelGreen.Size = new System.Drawing.Size(40, 40); + this.panelGreen.TabIndex = 1; + // + // panelWhite + // + this.panelWhite.BackColor = System.Drawing.Color.White; + this.panelWhite.Location = new System.Drawing.Point(15, 73); + this.panelWhite.Name = "panelWhite"; + this.panelWhite.Size = new System.Drawing.Size(40, 40); + this.panelWhite.TabIndex = 2; + // + // panelRed + // + this.panelRed.BackColor = System.Drawing.Color.Red; + this.panelRed.Location = new System.Drawing.Point(15, 22); + this.panelRed.Name = "panelRed"; + this.panelRed.Size = new System.Drawing.Size(40, 40); + this.panelRed.TabIndex = 0; + // + // checkBox + // + this.checkBoxRadar.AutoSize = true; + this.checkBoxRadar.Location = new System.Drawing.Point(22, 185); + this.checkBoxRadar.Name = "checkBoxRadar"; + this.checkBoxRadar.Size = new System.Drawing.Size(226, 19); + this.checkBoxRadar.TabIndex = 13; + this.checkBoxRadar.Text = "Признак наличия радара"; + this.checkBoxRadar.UseVisualStyleBackColor = true; + // + // checkBoxOilBox + // + this.checkBoxOilBox.AutoSize = true; + this.checkBoxOilBox.Location = new System.Drawing.Point(22, 149); + this.checkBoxOilBox.Name = "checkBoxWing"; + this.checkBoxOilBox.Size = new System.Drawing.Size(186, 19); + this.checkBoxOilBox.TabIndex = 12; + this.checkBoxOilBox.Text = "Признак наличия топливных баков"; + this.checkBoxOilBox.UseVisualStyleBackColor = true; + // + // numericUpDownWeight + // + this.numericUpDownWeight.Location = new System.Drawing.Point(90, 72); + 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(79, 23); + 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(22, 74); + this.labelWeight.Name = "labelWeight"; + this.labelWeight.Size = new System.Drawing.Size(29, 15); + this.labelWeight.TabIndex = 9; + this.labelWeight.Text = "Вес:"; + // + // numericUpDownSpeed + // + this.numericUpDownSpeed.Location = new System.Drawing.Point(90, 30); + 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(79, 23); + 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(22, 32); + this.labelSpeed.Name = "labelSpeed"; + this.labelSpeed.Size = new System.Drawing.Size(62, 15); + this.labelSpeed.TabIndex = 7; + this.labelSpeed.Text = "Скорость:"; + // + // 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(538, 12); + this.panelObject.Name = "panelObject"; + this.panelObject.Size = new System.Drawing.Size(262, 184); + 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(141, 9); + this.labelDopColor.Name = "labelDopColor"; + this.labelDopColor.Size = new System.Drawing.Size(104, 32); + 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.LabelDopColor_DragEnter); + + // + // labelBaseColor + // + this.labelBaseColor.AllowDrop = true; + this.labelBaseColor.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.labelBaseColor.Location = new System.Drawing.Point(20, 9); + this.labelBaseColor.Name = "labelBaseColor"; + this.labelBaseColor.Size = new System.Drawing.Size(104, 32); + 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.LabelBaseColor_DragEnter); + // + // pictureBoxObject + // + this.pictureBoxObject.Location = new System.Drawing.Point(20, 44); + this.pictureBoxObject.Name = "pictureBoxObject"; + this.pictureBoxObject.Size = new System.Drawing.Size(225, 125); + this.pictureBoxObject.TabIndex = 0; + this.pictureBoxObject.TabStop = false; + // + // buttonCancel + // + this.buttonCancel.Location = new System.Drawing.Point(679, 202); + this.buttonCancel.Name = "buttonCancel"; + this.buttonCancel.Size = new System.Drawing.Size(104, 30); + this.buttonCancel.TabIndex = 5; + this.buttonCancel.Text = "Отмена"; + this.buttonCancel.UseVisualStyleBackColor = true; + // + // buttonOk + // + this.buttonOk.Location = new System.Drawing.Point(558, 202); + this.buttonOk.Name = "buttonOk"; + this.buttonOk.Size = new System.Drawing.Size(104, 30); + this.buttonOk.TabIndex = 4; + this.buttonOk.Text = "Добавить"; + this.buttonOk.UseVisualStyleBackColor = true; + this.buttonOk.Click += new System.EventHandler(this.ButtonOk_Click); + // + // FormPlaneConfig + // + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(810, 242); + this.Controls.Add(this.buttonCancel); + this.Controls.Add(this.buttonOk); + this.Controls.Add(this.panelObject); + this.Controls.Add(this.groupBoxConfig); + this.Name = "FormPlaneConfig"; + 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(); + this.panelObject.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.pictureBoxObject)).EndInit(); + this.ResumeLayout(false); + } + + #endregion + private GroupBox groupBoxConfig; + private CheckBox checkBoxRadar; + private CheckBox checkBoxOilBox; + private NumericUpDown numericUpDownWeight; + private Label labelWeight; + private NumericUpDown numericUpDownSpeed; + private Label labelSpeed; + 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 Panel panelObject; + private Label labelDopColor; + private Label labelBaseColor; + private PictureBox pictureBoxObject; + private Button buttonCancel; + private Button buttonOk; + } +} \ No newline at end of file diff --git a/AirPlaneWithRadar/AirPlaneWithRadar/FormPlaneConfig.cs b/AirPlaneWithRadar/AirPlaneWithRadar/FormPlaneConfig.cs new file mode 100644 index 0000000..71f0a2f --- /dev/null +++ b/AirPlaneWithRadar/AirPlaneWithRadar/FormPlaneConfig.cs @@ -0,0 +1,125 @@ +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 AirPlaneWithRadar +{ + public partial class FormPlaneConfig : Form + { + DrawingPlain _Plane = null; + + + + public FormPlaneConfig() + { + 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; + buttonCancel.Click += (object sender, EventArgs e) => { Close(); }; + + } + + private void DrawPlane() + { + Bitmap bmp = new(pictureBoxObject.Width, pictureBoxObject.Height); + Graphics gr = Graphics.FromImage(bmp); + _Plane?.setPosition(5, 5, pictureBoxObject.Width, pictureBoxObject.Height); + _Plane?.DrawTransoprt(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) + { + if (_Plane != null) + { + labelBaseColor.BackColor = Color.Transparent; + labelDopColor.BackColor = Color.Transparent; + } + + switch (e.Data.GetData(DataFormats.Text).ToString()) + { + case "labelSimpleObject": + _Plane = new DrawingPlain((int)numericUpDownSpeed.Value, (int)numericUpDownWeight.Value, Color.White); + break; + case "labelModifiedObject": + _Plane = new DrawingRadarPlane((int)numericUpDownSpeed.Value, (int)numericUpDownWeight.Value, Color.White, Color.Black, + checkBoxRadar.Checked, checkBoxOilBox.Checked); + break; + } + DrawPlane(); + } + + private void PanelColor_MouseDown(object sender, MouseEventArgs e) + { + (sender as Control).DoDragDrop((sender as Control).BackColor, 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 LabelDopColor_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) + { + + } + + private void LabelDopColor_DragDrop(object sender, DragEventArgs e) + { + + + } + + + + } +} diff --git a/AirPlaneWithRadar/AirPlaneWithRadar/FormPlaneConfig.resx b/AirPlaneWithRadar/AirPlaneWithRadar/FormPlaneConfig.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/AirPlaneWithRadar/AirPlaneWithRadar/FormPlaneConfig.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/AirPlaneWithRadar/AirPlaneWithRadar/MapsCollection.cs b/AirPlaneWithRadar/AirPlaneWithRadar/MapsCollection.cs index abbd72a..74bac1e 100644 --- a/AirPlaneWithRadar/AirPlaneWithRadar/MapsCollection.cs +++ b/AirPlaneWithRadar/AirPlaneWithRadar/MapsCollection.cs @@ -25,8 +25,7 @@ namespace AirPlaneWithRadar public void AddMap(string name, AbstractMap map) { - if (_mapStorages.ContainsKey(name)) - return; + Keys.Add(name); _mapStorages.Add(name, new MapWithSetPlainGeneric(_pictureWidth, _pictureHeight, map)); -- 2.25.1 From ab9fdf006d7c2027610ed7f00f80e0e4463aec5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=92=D0=BE=D0=BB=D0=BE=D0=B4=D1=8F?= Date: Sat, 19 Nov 2022 17:36:49 +0300 Subject: [PATCH 2/4] Event work --- .../AirPlaneWithRadar/FormMapWithSetPlains.cs | 22 ++----------------- .../AirPlaneWithRadar/FormPlaneConfig.cs | 20 ++++++++++++++--- .../AirPlaneWithRadar/PlainDelegate.cs | 10 +++++++++ 3 files changed, 29 insertions(+), 23 deletions(-) create mode 100644 AirPlaneWithRadar/AirPlaneWithRadar/PlainDelegate.cs diff --git a/AirPlaneWithRadar/AirPlaneWithRadar/FormMapWithSetPlains.cs b/AirPlaneWithRadar/AirPlaneWithRadar/FormMapWithSetPlains.cs index 8624783..362a990 100644 --- a/AirPlaneWithRadar/AirPlaneWithRadar/FormMapWithSetPlains.cs +++ b/AirPlaneWithRadar/AirPlaneWithRadar/FormMapWithSetPlains.cs @@ -86,26 +86,8 @@ namespace AirPlaneWithRadar private void ButtonAddPlain_Click(object sender, EventArgs e) { - if (listBoxMaps.SelectedIndex == -1) - { - return; - } - - FormPlain form = new(); - if (form.ShowDialog() == DialogResult.OK) - { - DrawingObjectPlane plain = new(form.SelectedPlain); - - if ((_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] + plain) >= 0) - { - MessageBox.Show("Объект добавлен"); - pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet(); - } - else - { - MessageBox.Show("Не удалось добавить объект"); - } - } + var formPlainConfig = new FormPlaneConfig(); + formPlainConfig.Show(); } private void ButtonRemovePlain_Click(object sender, EventArgs e) { diff --git a/AirPlaneWithRadar/AirPlaneWithRadar/FormPlaneConfig.cs b/AirPlaneWithRadar/AirPlaneWithRadar/FormPlaneConfig.cs index 71f0a2f..09f136f 100644 --- a/AirPlaneWithRadar/AirPlaneWithRadar/FormPlaneConfig.cs +++ b/AirPlaneWithRadar/AirPlaneWithRadar/FormPlaneConfig.cs @@ -14,7 +14,7 @@ namespace AirPlaneWithRadar { DrawingPlain _Plane = null; - + private event PlainDelegate EventAddPlane; public FormPlaneConfig() { @@ -40,7 +40,17 @@ namespace AirPlaneWithRadar pictureBoxObject.Image = bmp; } - + public void AddEvent(PlainDelegate ev) + { + if (EventAddPlane == null) + { + EventAddPlane = ev; + } + else + { + EventAddPlane += ev; + } + } private void LabelObject_MouseDown(object sender, MouseEventArgs e) { @@ -119,7 +129,11 @@ namespace AirPlaneWithRadar } - + private void ButtonOk_Click(object sender, EventArgs e) + { + EventAddPlane?.Invoke(_Plane); + Close(); + } } } diff --git a/AirPlaneWithRadar/AirPlaneWithRadar/PlainDelegate.cs b/AirPlaneWithRadar/AirPlaneWithRadar/PlainDelegate.cs new file mode 100644 index 0000000..c026b64 --- /dev/null +++ b/AirPlaneWithRadar/AirPlaneWithRadar/PlainDelegate.cs @@ -0,0 +1,10 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AirPlaneWithRadar +{ + public delegate void PlainDelegate(DrawingPlain car); +} -- 2.25.1 From 2bdfda9ce98c3086eb7165fcf558cc75b1859f24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=92=D0=BE=D0=BB=D0=BE=D0=B4=D1=8F?= Date: Sat, 19 Nov 2022 17:45:04 +0300 Subject: [PATCH 3/4] Fix --- .../AirPlaneWithRadar/DrawingPlain.cs | 54 ++++++++++--------- .../AirPlaneWithRadar/DrawingRadarPlane.cs | 13 +++-- .../AirPlaneWithRadar/EntetyPlain.cs | 7 ++- .../AirPlaneWithRadar/FormMapWithSetPlains.cs | 19 +++++++ .../AirPlaneWithRadar/FormPlaneConfig.cs | 20 +++++-- 5 files changed, 76 insertions(+), 37 deletions(-) diff --git a/AirPlaneWithRadar/AirPlaneWithRadar/DrawingPlain.cs b/AirPlaneWithRadar/AirPlaneWithRadar/DrawingPlain.cs index f4601a2..f887fe3 100644 --- a/AirPlaneWithRadar/AirPlaneWithRadar/DrawingPlain.cs +++ b/AirPlaneWithRadar/AirPlaneWithRadar/DrawingPlain.cs @@ -20,16 +20,20 @@ namespace AirPlaneWithRadar { Plain = new EntetyPlain(speed, weight, bodycolor); } - protected DrawingPlain(int speed, float weight,Color bodyColor,int plainWidth,int plainHeight): - this(speed,weight, bodyColor) + protected DrawingPlain(int speed, float weight, Color bodyColor, int plainWidth, int plainHeight) : + this(speed, weight, bodyColor) { this.plainWidth = plainWidth; this.plainHeight = plainHeight; } - - public void setPosition(int x,int y,int width,int height) + public void ReColor(Color col) { - if (x + plainWidth > width || y + plainHeight > height || plainHeight > height || plainWidth > width || x <0 || y<0) + Plain.BodyColor = col; + } + + public void setPosition(int x, int y, int width, int height) + { + if (x + plainWidth > width || y + plainHeight > height || plainHeight > height || plainWidth > width || x < 0 || y < 0) return; else { @@ -39,11 +43,11 @@ namespace AirPlaneWithRadar pictureHeight = height; } } - public void MoveTransport (Direction direction) + public void MoveTransport(Direction direction) { - if(!pictureWidth.HasValue || !pictureHeight.HasValue) - { return; } - switch (direction) + if (!pictureWidth.HasValue || !pictureHeight.HasValue) + { return; } + switch (direction) { case Direction.Right: if (startPosX + plainWidth + Plain.Step < pictureWidth) @@ -51,7 +55,7 @@ namespace AirPlaneWithRadar break; case Direction.Left: - if (startPosX -Plain.Step > 0) + if (startPosX - Plain.Step > 0) startPosX -= Plain.Step; break; case Direction.Down: @@ -59,47 +63,47 @@ namespace AirPlaneWithRadar startPosY += Plain.Step; break; case Direction.Up: - if (startPosY - Plain.Step >0) + if (startPosY - Plain.Step > 0) startPosY -= Plain.Step; break; } } - public virtual void DrawTransoprt (Graphics g) + public virtual void DrawTransoprt(Graphics g) { - if(startPosX < 0 || startPosY < 0 || !pictureHeight.HasValue || !pictureWidth.HasValue) + if (startPosX < 0 || startPosY < 0 || !pictureHeight.HasValue || !pictureWidth.HasValue) { return; } Pen pen = new Pen(Color.Black); - + g.DrawRectangle(pen, startPosX, startPosY, 20, 30); g.DrawRectangle(pen, startPosX, startPosY + 30, 100, 30); - g.DrawRectangle(pen, startPosX+100, startPosY + 40, 20, 15); + g.DrawRectangle(pen, startPosX + 100, startPosY + 40, 20, 15); //koleso1 g.DrawRectangle(pen, startPosX + 30, startPosY + 60, 5, 10); - g.DrawEllipse(pen, startPosX+28, startPosY+70, 9, 9); + g.DrawEllipse(pen, startPosX + 28, startPosY + 70, 9, 9); //koleso2 g.DrawRectangle(pen, startPosX + 80, startPosY + 60, 5, 10); g.DrawEllipse(pen, startPosX + 78, startPosY + 70, 9, 9); - + //Korpys Brush br = new SolidBrush(Plain?.BodyColor ?? Color.Black); - g.FillRectangle(br, startPosX+3, startPosY + 33, 94, 24); - g.FillRectangle(br, startPosX+1, startPosY+1, 19, 29); - + g.FillRectangle(br, startPosX + 3, startPosY + 33, 94, 24); + g.FillRectangle(br, startPosX + 1, startPosY + 1, 19, 29); + //krilya Brush brWings = new SolidBrush(Color.Black); g.FillRectangle(brWings, startPosX + 30, startPosY + 40, 40, 8); - - + + //cabina Brush brCabine = new SolidBrush(Color.Blue); g.FillRectangle(brCabine, startPosX + 101, startPosY + 41, 19, 14); - + @@ -109,7 +113,7 @@ namespace AirPlaneWithRadar { pictureWidth = width; pictureHeight = height; - if(pictureWidth < plainWidth || pictureHeight < plainHeight) + if (pictureWidth < plainWidth || pictureHeight < plainHeight) { pictureWidth = null; pictureHeight = null; @@ -118,7 +122,7 @@ namespace AirPlaneWithRadar if (startPosX + plainWidth > pictureWidth) startPosX = pictureWidth.Value - plainWidth; - if(startPosY + plainHeight > pictureHeight) + if (startPosY + plainHeight > pictureHeight) startPosY = pictureHeight.Value - plainHeight; } public (float Left, float Right, float Top, float Bottom) GetCurrentPosition() diff --git a/AirPlaneWithRadar/AirPlaneWithRadar/DrawingRadarPlane.cs b/AirPlaneWithRadar/AirPlaneWithRadar/DrawingRadarPlane.cs index 9747a0e..3d83e59 100644 --- a/AirPlaneWithRadar/AirPlaneWithRadar/DrawingRadarPlane.cs +++ b/AirPlaneWithRadar/AirPlaneWithRadar/DrawingRadarPlane.cs @@ -9,13 +9,18 @@ namespace AirPlaneWithRadar { internal class DrawingRadarPlane : DrawingPlain { - public DrawingRadarPlane(int speed, float weight, Color bodyColor,Color dopColor, bool radar, bool oilBox) : base(speed, weight, bodyColor, 110, 60) + public DrawingRadarPlane(int speed, float weight, Color bodyColor, Color dopColor, bool radar, bool oilBox) : base(speed, weight, bodyColor, 110, 60) { Plain = new RadioPlane(speed, weight, bodyColor, dopColor, radar, oilBox); } + + public void ReColorDop(Color dopCol) + { + (Plain as RadioPlane).DopColor = dopCol; + } public override void DrawTransoprt(Graphics g) { - if(Plain is not RadioPlane radioPlane) + if (Plain is not RadioPlane radioPlane) { return; } @@ -27,7 +32,7 @@ namespace AirPlaneWithRadar g.DrawRectangle(pen, startPosX + 40, startPosY + 48, 20, 10); g.FillRectangle(doBrush, startPosX + 40, startPosY + 48, 20, 10); - g.DrawRectangle(pen, startPosX , startPosY+15, 30, 10); + g.DrawRectangle(pen, startPosX, startPosY + 15, 30, 10); g.FillRectangle(doBrush, startPosX, startPosY + 15, 30, 10); } if (radioPlane.Radar) @@ -35,7 +40,7 @@ namespace AirPlaneWithRadar g.FillRectangle(doBrush, startPosX + 55, startPosY + 20, 10, 10); g.FillEllipse(doBrush, startPosX + 40, startPosY + 13, 40, 10); } - + } } } diff --git a/AirPlaneWithRadar/AirPlaneWithRadar/EntetyPlain.cs b/AirPlaneWithRadar/AirPlaneWithRadar/EntetyPlain.cs index 4c3c4e0..1f270f3 100644 --- a/AirPlaneWithRadar/AirPlaneWithRadar/EntetyPlain.cs +++ b/AirPlaneWithRadar/AirPlaneWithRadar/EntetyPlain.cs @@ -9,9 +9,9 @@ namespace AirPlaneWithRadar public class EntetyPlain { - public int Speed { get;private set; } - public float Weight { get; private set; } - public Color BodyColor { get; private set; } + public int Speed { get; private set; } + public float Weight { get; private set; } + public Color BodyColor { get; set; } public float Step => Speed * 100 / Weight; public EntetyPlain(int speed, float weight, Color bodyColor) @@ -22,6 +22,5 @@ namespace AirPlaneWithRadar BodyColor = bodyColor; } - } } diff --git a/AirPlaneWithRadar/AirPlaneWithRadar/FormMapWithSetPlains.cs b/AirPlaneWithRadar/AirPlaneWithRadar/FormMapWithSetPlains.cs index 362a990..00a5bb1 100644 --- a/AirPlaneWithRadar/AirPlaneWithRadar/FormMapWithSetPlains.cs +++ b/AirPlaneWithRadar/AirPlaneWithRadar/FormMapWithSetPlains.cs @@ -87,7 +87,26 @@ namespace AirPlaneWithRadar { var formPlainConfig = new FormPlaneConfig(); + formPlainConfig.AddEvent(ReactEv); formPlainConfig.Show(); + + } + public void ReactEv(DrawingPlain dp) + { + if (listBoxMaps.SelectedIndex == -1) + { + return; + } + if ((_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] + new DrawingObjectPlane(dp)) >= 0) + { + MessageBox.Show("Объект добавлен"); + pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet(); + } + else + { + MessageBox.Show("Не удалось добавить объект"); + } + } private void ButtonRemovePlain_Click(object sender, EventArgs e) { diff --git a/AirPlaneWithRadar/AirPlaneWithRadar/FormPlaneConfig.cs b/AirPlaneWithRadar/AirPlaneWithRadar/FormPlaneConfig.cs index 09f136f..438562e 100644 --- a/AirPlaneWithRadar/AirPlaneWithRadar/FormPlaneConfig.cs +++ b/AirPlaneWithRadar/AirPlaneWithRadar/FormPlaneConfig.cs @@ -14,7 +14,7 @@ namespace AirPlaneWithRadar { DrawingPlain _Plane = null; - private event PlainDelegate EventAddPlane; + private event Action EventAddPlane; public FormPlaneConfig() { @@ -40,7 +40,7 @@ namespace AirPlaneWithRadar pictureBoxObject.Image = bmp; } - public void AddEvent(PlainDelegate ev) + public void AddEvent(Action ev) { if (EventAddPlane == null) { @@ -120,12 +120,24 @@ namespace AirPlaneWithRadar private void LabelBaseColor_DragDrop(object sender, DragEventArgs e) { - + if (_Plane is null) return; + var col = e.Data.GetData(typeof(Color)); + Color newCol = (Color)col; + labelBaseColor.BackColor = newCol; + _Plane?.ReColor(newCol); + DrawPlane(); } private void LabelDopColor_DragDrop(object sender, DragEventArgs e) { - + if (_Plane is DrawingRadarPlane) + { + var col = e.Data.GetData(typeof(Color)); + Color newCol = (Color)col; + labelDopColor.BackColor = newCol; + (_Plane as DrawingRadarPlane).ReColorDop(newCol); + DrawPlane(); + } } -- 2.25.1 From 6e9883932e9fc98edfd864abed869ea306fb8c7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=92=D0=BE=D0=BB=D0=BE=D0=B4=D1=8F?= Date: Sun, 20 Nov 2022 02:10:51 +0300 Subject: [PATCH 4/4] Fix map --- AirPlaneWithRadar/AirPlaneWithRadar/MapsCollection.cs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/AirPlaneWithRadar/AirPlaneWithRadar/MapsCollection.cs b/AirPlaneWithRadar/AirPlaneWithRadar/MapsCollection.cs index 74bac1e..6b49008 100644 --- a/AirPlaneWithRadar/AirPlaneWithRadar/MapsCollection.cs +++ b/AirPlaneWithRadar/AirPlaneWithRadar/MapsCollection.cs @@ -26,16 +26,15 @@ namespace AirPlaneWithRadar public void AddMap(string name, AbstractMap map) { - Keys.Add(name); + if (_mapStorages.ContainsKey(name)) + return; _mapStorages.Add(name, new MapWithSetPlainGeneric(_pictureWidth, _pictureHeight, map)); } public void DelMap(string name) { - if (!_mapStorages.ContainsKey(name)) - return; - Keys.Remove(name); + _mapStorages.Remove(name); } -- 2.25.1