diff --git a/AirPlaneWithRadar/AirPlaneWithRadar/Direction.cs b/AirPlaneWithRadar/AirPlaneWithRadar/Direction.cs
index ccf9b58..c6a8470 100644
--- a/AirPlaneWithRadar/AirPlaneWithRadar/Direction.cs
+++ b/AirPlaneWithRadar/AirPlaneWithRadar/Direction.cs
@@ -6,7 +6,7 @@ using System.Threading.Tasks;
namespace AirPlaneWithRadar
{
- internal enum Direction
+ public enum Direction
{
None =0,
Up =1,
diff --git a/AirPlaneWithRadar/AirPlaneWithRadar/DrawingPlain.cs b/AirPlaneWithRadar/AirPlaneWithRadar/DrawingPlain.cs
index 2211625..4599993 100644
--- a/AirPlaneWithRadar/AirPlaneWithRadar/DrawingPlain.cs
+++ b/AirPlaneWithRadar/AirPlaneWithRadar/DrawingPlain.cs
@@ -7,7 +7,7 @@ using System.Threading.Tasks;
namespace AirPlaneWithRadar
{
- internal class DrawingPlain
+ public class DrawingPlain
{
public EntetyPlain Plain { get; protected set; }
protected float startPosX;
diff --git a/AirPlaneWithRadar/AirPlaneWithRadar/EntetyPlain.cs b/AirPlaneWithRadar/AirPlaneWithRadar/EntetyPlain.cs
index 48af56c..4c3c4e0 100644
--- a/AirPlaneWithRadar/AirPlaneWithRadar/EntetyPlain.cs
+++ b/AirPlaneWithRadar/AirPlaneWithRadar/EntetyPlain.cs
@@ -6,7 +6,7 @@ using System.Threading.Tasks;
namespace AirPlaneWithRadar
{
- internal class EntetyPlain
+ public class EntetyPlain
{
public int Speed { get;private set; }
diff --git a/AirPlaneWithRadar/AirPlaneWithRadar/FormMap.Designer.cs b/AirPlaneWithRadar/AirPlaneWithRadar/FormMap.Designer.cs
deleted file mode 100644
index 40e3196..0000000
--- a/AirPlaneWithRadar/AirPlaneWithRadar/FormMap.Designer.cs
+++ /dev/null
@@ -1,209 +0,0 @@
-namespace AirPlaneWithRadar
-{
- partial class FormMap
- {
- ///
- /// 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.pictureBoxPlain = new System.Windows.Forms.PictureBox();
- this.statusStrip = new System.Windows.Forms.StatusStrip();
- this.toolStripStatusLabelSpeed = new System.Windows.Forms.ToolStripStatusLabel();
- this.toolStripStatusLabelWeight = new System.Windows.Forms.ToolStripStatusLabel();
- this.toolStripStatusLabelColor = new System.Windows.Forms.ToolStripStatusLabel();
- this.buttonUp = new System.Windows.Forms.Button();
- this.buttonLeft = new System.Windows.Forms.Button();
- this.buttonDown = new System.Windows.Forms.Button();
- this.buttonRight = new System.Windows.Forms.Button();
- this.ButtonCreate = new System.Windows.Forms.Button();
- this.buttonCreateModif = new System.Windows.Forms.Button();
- this.comboBoxMap = new System.Windows.Forms.ComboBox();
- ((System.ComponentModel.ISupportInitialize)(this.pictureBoxPlain)).BeginInit();
- this.statusStrip.SuspendLayout();
- this.SuspendLayout();
- //
- // pictureBoxPlain
- //
- this.pictureBoxPlain.Dock = System.Windows.Forms.DockStyle.Fill;
- this.pictureBoxPlain.Location = new System.Drawing.Point(0, 0);
- this.pictureBoxPlain.Name = "pictureBoxPlain";
- this.pictureBoxPlain.Size = new System.Drawing.Size(535, 292);
- this.pictureBoxPlain.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
- this.pictureBoxPlain.TabIndex = 0;
- this.pictureBoxPlain.TabStop = false;
- //
- // statusStrip
- //
- this.statusStrip.ImageScalingSize = new System.Drawing.Size(20, 20);
- this.statusStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
- this.toolStripStatusLabelSpeed,
- this.toolStripStatusLabelWeight,
- this.toolStripStatusLabelColor});
- this.statusStrip.Location = new System.Drawing.Point(0, 292);
- this.statusStrip.Name = "statusStrip";
- this.statusStrip.Size = new System.Drawing.Size(535, 26);
- this.statusStrip.TabIndex = 1;
- //
- // toolStripStatusLabelSpeed
- //
- this.toolStripStatusLabelSpeed.Name = "toolStripStatusLabelSpeed";
- this.toolStripStatusLabelSpeed.Size = new System.Drawing.Size(71, 20);
- this.toolStripStatusLabelSpeed.Text = "скорость";
- //
- // toolStripStatusLabelWeight
- //
- this.toolStripStatusLabelWeight.Name = "toolStripStatusLabelWeight";
- this.toolStripStatusLabelWeight.Size = new System.Drawing.Size(32, 20);
- this.toolStripStatusLabelWeight.Text = "вес";
- //
- // toolStripStatusLabelColor
- //
- this.toolStripStatusLabelColor.Name = "toolStripStatusLabelColor";
- this.toolStripStatusLabelColor.Size = new System.Drawing.Size(40, 20);
- this.toolStripStatusLabelColor.Text = "цвет";
- //
- // buttonUp
- //
- this.buttonUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
- this.buttonUp.BackgroundImage = global::AirPlaneWithRadar.Properties.Resources.up;
- this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
- this.buttonUp.Location = new System.Drawing.Point(383, 223);
- this.buttonUp.Name = "buttonUp";
- this.buttonUp.Size = new System.Drawing.Size(30, 30);
- this.buttonUp.TabIndex = 3;
- this.buttonUp.Text = " ";
- this.buttonUp.UseVisualStyleBackColor = true;
- this.buttonUp.Click += new System.EventHandler(this.ButtonMove_Click);
- //
- // buttonLeft
- //
- this.buttonLeft.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
- this.buttonLeft.BackgroundImage = global::AirPlaneWithRadar.Properties.Resources.left;
- this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
- this.buttonLeft.Location = new System.Drawing.Point(347, 259);
- this.buttonLeft.Name = "buttonLeft";
- this.buttonLeft.Size = new System.Drawing.Size(30, 30);
- this.buttonLeft.TabIndex = 4;
- this.buttonLeft.Text = " ";
- this.buttonLeft.UseVisualStyleBackColor = true;
- this.buttonLeft.Click += new System.EventHandler(this.ButtonMove_Click);
- //
- // buttonDown
- //
- this.buttonDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
- this.buttonDown.BackgroundImage = global::AirPlaneWithRadar.Properties.Resources.down;
- this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
- this.buttonDown.Location = new System.Drawing.Point(383, 259);
- this.buttonDown.Name = "buttonDown";
- this.buttonDown.Size = new System.Drawing.Size(30, 30);
- this.buttonDown.TabIndex = 5;
- this.buttonDown.Text = " ";
- this.buttonDown.UseVisualStyleBackColor = true;
- this.buttonDown.Click += new System.EventHandler(this.ButtonMove_Click);
- //
- // buttonRight
- //
- this.buttonRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
- this.buttonRight.BackgroundImage = global::AirPlaneWithRadar.Properties.Resources.right;
- this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
- this.buttonRight.Location = new System.Drawing.Point(419, 259);
- this.buttonRight.Name = "buttonRight";
- this.buttonRight.Size = new System.Drawing.Size(30, 30);
- this.buttonRight.TabIndex = 6;
- this.buttonRight.Text = " ";
- this.buttonRight.UseVisualStyleBackColor = true;
- this.buttonRight.Click += new System.EventHandler(this.ButtonMove_Click);
- //
- // ButtonCreate
- //
- this.ButtonCreate.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
- this.ButtonCreate.Location = new System.Drawing.Point(12, 259);
- this.ButtonCreate.Name = "ButtonCreate";
- this.ButtonCreate.Size = new System.Drawing.Size(94, 29);
- this.ButtonCreate.TabIndex = 7;
- this.ButtonCreate.Text = "Создать";
- this.ButtonCreate.UseVisualStyleBackColor = true;
- this.ButtonCreate.Click += new System.EventHandler(this.ButtonCreate_Click);
- //
- // buttonCreateModif
- //
- this.buttonCreateModif.Location = new System.Drawing.Point(125, 259);
- this.buttonCreateModif.Name = "buttonCreateModif";
- this.buttonCreateModif.Size = new System.Drawing.Size(134, 29);
- this.buttonCreateModif.TabIndex = 8;
- this.buttonCreateModif.Text = "Модификация";
- this.buttonCreateModif.UseVisualStyleBackColor = true;
- this.buttonCreateModif.Click += new System.EventHandler(this.buttonCreateModif_Click);
- //
- // comboBoxMap
- //
- this.comboBoxMap.FormattingEnabled = true;
- this.comboBoxMap.Items.AddRange(new object[] {
- "Простая карта"});
- this.comboBoxMap.Location = new System.Drawing.Point(24, 12);
- this.comboBoxMap.Name = "comboBoxMap";
- this.comboBoxMap.Size = new System.Drawing.Size(151, 28);
- this.comboBoxMap.TabIndex = 9;
- this.comboBoxMap.SelectedIndexChanged += new System.EventHandler(this.comboBoxMap_SelectedIndexChanged);
- //
- // FormMap
- //
- this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
- this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(535, 318);
- this.Controls.Add(this.comboBoxMap);
- this.Controls.Add(this.buttonCreateModif);
- this.Controls.Add(this.ButtonCreate);
- this.Controls.Add(this.buttonRight);
- this.Controls.Add(this.buttonDown);
- this.Controls.Add(this.buttonLeft);
- this.Controls.Add(this.buttonUp);
- this.Controls.Add(this.pictureBoxPlain);
- this.Controls.Add(this.statusStrip);
- this.Name = "FormMap";
- this.Text = "Карта";
- ((System.ComponentModel.ISupportInitialize)(this.pictureBoxPlain)).EndInit();
- this.statusStrip.ResumeLayout(false);
- this.statusStrip.PerformLayout();
- this.ResumeLayout(false);
- this.PerformLayout();
-
- }
-
- #endregion
- private PictureBox pictureBoxPlain;
- private StatusStrip statusStrip;
- private ToolStripStatusLabel toolStripStatusLabelWeight;
- private ToolStripStatusLabel toolStripStatusLabelColor;
- private Button buttonUp;
- private Button buttonLeft;
- private Button buttonDown;
- private Button buttonRight;
- public ToolStripStatusLabel toolStripStatusLabelSpeed;
- private Button ButtonCreate;
- private Button buttonCreateModif;
- private ComboBox comboBoxMap;
- }
-}
\ No newline at end of file
diff --git a/AirPlaneWithRadar/AirPlaneWithRadar/FormMap.cs b/AirPlaneWithRadar/AirPlaneWithRadar/FormMap.cs
deleted file mode 100644
index 4e94b14..0000000
--- a/AirPlaneWithRadar/AirPlaneWithRadar/FormMap.cs
+++ /dev/null
@@ -1,79 +0,0 @@
-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 FormMap : Form
- {
- private AbstractMap _abstractMap;
- public FormMap()
- {
- InitializeComponent();
- _abstractMap = new SimpleMap();
- }
- private void SetData(DrawingPlain plain)
- {
- toolStripStatusLabelSpeed.Text = $"Скорость: {plain.Plain.Speed}";
- toolStripStatusLabelWeight.Text = $"Вес: {plain.Plain.Weight}";
- toolStripStatusLabelColor.Text = $"Цвет: {plain.Plain.BodyColor.Name}";
- pictureBoxPlain.Image = _abstractMap.CreateMap(pictureBoxPlain.Width, pictureBoxPlain.Height,new DrawingObjectPlane(plain)) ;
- }
- private void ButtonCreate_Click(object sender, EventArgs e)
- {
- Random rnd = new();
- var plain = new DrawingPlain(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)));
-
- SetData(plain);
- }
- private void ButtonMove_Click(object sender, EventArgs e)
- {
- string name = ((Button)sender)?.Name ?? string.Empty;
- Direction dir = Direction.None;
- switch (name)
- {
- case "buttonUp":
- dir = Direction.Up;
- break;
- case "buttonDown":
- dir = Direction.Down;
- break;
- case "buttonLeft":
- dir = Direction.Left;
- break;
- case "buttonRight":
- dir = Direction.Right;
- break;
- }
- pictureBoxPlain.Image = _abstractMap?.MoveObject(dir);
- }
-
- private void buttonCreateModif_Click(object sender, EventArgs e)
- {
-
- Random rnd = new();
- var plain = new DrawingRadarPlane(rnd.Next(100, 300), rnd.Next(1000, 2000),
- Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)),
- Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)),
- Convert.ToBoolean(rnd.Next(0, 2)), Convert.ToBoolean(rnd.Next(0, 2)));
- SetData(plain); ;
-
- }
-
- private void comboBoxMap_SelectedIndexChanged(object sender, EventArgs e)
- {
- switch (comboBoxMap.Text)
- {
- case "Простая карта":
- _abstractMap = new SimpleMap();
- break;
- }
- }
- }
-}
diff --git a/AirPlaneWithRadar/AirPlaneWithRadar/FormMap.resx b/AirPlaneWithRadar/AirPlaneWithRadar/FormMap.resx
deleted file mode 100644
index 2c0949d..0000000
--- a/AirPlaneWithRadar/AirPlaneWithRadar/FormMap.resx
+++ /dev/null
@@ -1,63 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 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
-
-
- 17, 17
-
-
\ No newline at end of file
diff --git a/AirPlaneWithRadar/AirPlaneWithRadar/FormMapWithSetPlains.Designer.cs b/AirPlaneWithRadar/AirPlaneWithRadar/FormMapWithSetPlains.Designer.cs
new file mode 100644
index 0000000..4b19b7f
--- /dev/null
+++ b/AirPlaneWithRadar/AirPlaneWithRadar/FormMapWithSetPlains.Designer.cs
@@ -0,0 +1,216 @@
+namespace AirPlaneWithRadar
+{
+ partial class FormMapWithSetPlains
+ {
+ ///
+ /// 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.groupBoxTools = new System.Windows.Forms.GroupBox();
+ this.maskedTextBoxPosition = new System.Windows.Forms.MaskedTextBox();
+ this.buttonRemovePlain = new System.Windows.Forms.Button();
+ this.buttonShowStorage = new System.Windows.Forms.Button();
+ this.buttonDown = new System.Windows.Forms.Button();
+ this.buttonRight = new System.Windows.Forms.Button();
+ this.buttonLeft = new System.Windows.Forms.Button();
+ this.buttonUp = new System.Windows.Forms.Button();
+ this.buttonShowOnMap = new System.Windows.Forms.Button();
+ this.buttonAddPlain = new System.Windows.Forms.Button();
+ this.comboBoxSelectorMap = new System.Windows.Forms.ComboBox();
+ this.pictureBox = new System.Windows.Forms.PictureBox();
+ this.groupBoxTools.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).BeginInit();
+ this.SuspendLayout();
+ //
+ // groupBoxTools
+ //
+ this.groupBoxTools.Controls.Add(this.maskedTextBoxPosition);
+ this.groupBoxTools.Controls.Add(this.buttonRemovePlain);
+ this.groupBoxTools.Controls.Add(this.buttonShowStorage);
+ this.groupBoxTools.Controls.Add(this.buttonDown);
+ this.groupBoxTools.Controls.Add(this.buttonRight);
+ this.groupBoxTools.Controls.Add(this.buttonLeft);
+ this.groupBoxTools.Controls.Add(this.buttonUp);
+ this.groupBoxTools.Controls.Add(this.buttonShowOnMap);
+ this.groupBoxTools.Controls.Add(this.buttonAddPlain);
+ this.groupBoxTools.Controls.Add(this.comboBoxSelectorMap);
+ this.groupBoxTools.Dock = System.Windows.Forms.DockStyle.Right;
+ this.groupBoxTools.Location = new System.Drawing.Point(1057, 0);
+ this.groupBoxTools.Name = "groupBoxTools";
+ this.groupBoxTools.Size = new System.Drawing.Size(204, 668);
+ this.groupBoxTools.TabIndex = 0;
+ this.groupBoxTools.TabStop = false;
+ this.groupBoxTools.Text = "Инструменты";
+ //
+ // maskedTextBoxPosition
+ //
+ this.maskedTextBoxPosition.Location = new System.Drawing.Point(17, 166);
+ this.maskedTextBoxPosition.Mask = "00";
+ this.maskedTextBoxPosition.Name = "maskedTextBoxPosition";
+ this.maskedTextBoxPosition.Size = new System.Drawing.Size(175, 27);
+ this.maskedTextBoxPosition.TabIndex = 2;
+ this.maskedTextBoxPosition.ValidatingType = typeof(int);
+ //
+ // buttonRemovePlain
+ //
+ this.buttonRemovePlain.Location = new System.Drawing.Point(17, 195);
+ this.buttonRemovePlain.Name = "buttonRemovePlain";
+ this.buttonRemovePlain.Size = new System.Drawing.Size(175, 35);
+ this.buttonRemovePlain.TabIndex = 3;
+ this.buttonRemovePlain.Text = "Удалить самолет";
+ this.buttonRemovePlain.UseVisualStyleBackColor = true;
+ this.buttonRemovePlain.Click += new System.EventHandler(this.ButtonRemovePlain_Click);
+ //
+ // buttonShowStorage
+ //
+ this.buttonShowStorage.Location = new System.Drawing.Point(17, 287);
+ this.buttonShowStorage.Name = "buttonShowStorage";
+ this.buttonShowStorage.Size = new System.Drawing.Size(175, 35);
+ this.buttonShowStorage.TabIndex = 4;
+ this.buttonShowStorage.Text = "Посмотреть хранилище";
+ this.buttonShowStorage.UseVisualStyleBackColor = true;
+ this.buttonShowStorage.Click += new System.EventHandler(this.ButtonShowStorage_Click);
+ //
+ // buttonDown
+ //
+ this.buttonDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+ this.buttonDown.BackgroundImage = global::AirPlaneWithRadar.Properties.Resources.down;
+ this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+ this.buttonDown.Location = new System.Drawing.Point(91, 618);
+ this.buttonDown.Name = "buttonDown";
+ this.buttonDown.Size = new System.Drawing.Size(30, 30);
+ this.buttonDown.TabIndex = 10;
+ this.buttonDown.UseVisualStyleBackColor = true;
+ this.buttonDown.Click += new System.EventHandler(this.ButtonMove_Click);
+ //
+ // buttonRight
+ //
+ this.buttonRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+ this.buttonRight.BackgroundImage = global::AirPlaneWithRadar.Properties.Resources.right;
+ this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+ this.buttonRight.Location = new System.Drawing.Point(127, 618);
+ this.buttonRight.Name = "buttonRight";
+ this.buttonRight.Size = new System.Drawing.Size(30, 30);
+ this.buttonRight.TabIndex = 9;
+ this.buttonRight.UseVisualStyleBackColor = true;
+ this.buttonRight.Click += new System.EventHandler(this.ButtonMove_Click);
+ //
+ // buttonLeft
+ //
+ this.buttonLeft.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+ this.buttonLeft.BackgroundImage = global::AirPlaneWithRadar.Properties.Resources.left;
+ this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+ this.buttonLeft.Location = new System.Drawing.Point(55, 618);
+ this.buttonLeft.Name = "buttonLeft";
+ this.buttonLeft.Size = new System.Drawing.Size(30, 30);
+ this.buttonLeft.TabIndex = 8;
+ this.buttonLeft.UseVisualStyleBackColor = true;
+ this.buttonLeft.Click += new System.EventHandler(this.ButtonMove_Click);
+ //
+ // buttonUp
+ //
+ this.buttonUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+ this.buttonUp.BackgroundImage = global::AirPlaneWithRadar.Properties.Resources.up;
+ this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+ this.buttonUp.Location = new System.Drawing.Point(91, 582);
+ this.buttonUp.Name = "buttonUp";
+ this.buttonUp.Size = new System.Drawing.Size(30, 30);
+ this.buttonUp.TabIndex = 7;
+ this.buttonUp.UseVisualStyleBackColor = true;
+ this.buttonUp.Click += new System.EventHandler(this.ButtonMove_Click);
+ //
+ // buttonShowOnMap
+ //
+ this.buttonShowOnMap.Location = new System.Drawing.Point(17, 391);
+ this.buttonShowOnMap.Name = "buttonShowOnMap";
+ this.buttonShowOnMap.Size = new System.Drawing.Size(175, 35);
+ this.buttonShowOnMap.TabIndex = 5;
+ this.buttonShowOnMap.Text = "Посмотреть карту";
+ this.buttonShowOnMap.UseVisualStyleBackColor = true;
+ this.buttonShowOnMap.Click += new System.EventHandler(this.ButtonShowOnMap_Click);
+ //
+ // buttonAddPlain
+ //
+ this.buttonAddPlain.Location = new System.Drawing.Point(17, 106);
+ this.buttonAddPlain.Name = "buttonAddPlain";
+ this.buttonAddPlain.Size = new System.Drawing.Size(175, 35);
+ this.buttonAddPlain.TabIndex = 1;
+ this.buttonAddPlain.Text = "Добавить самолет";
+ this.buttonAddPlain.UseVisualStyleBackColor = true;
+ this.buttonAddPlain.Click += new System.EventHandler(this.ButtonAddPlain_Click);
+ //
+ // comboBoxSelectorMap
+ //
+ this.comboBoxSelectorMap.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.comboBoxSelectorMap.FormattingEnabled = true;
+ this.comboBoxSelectorMap.Items.AddRange(new object[] {
+ "Простая карта",
+ "Пользовательская карта №1",
+ "Пользовательская карта №2"});
+ this.comboBoxSelectorMap.Location = new System.Drawing.Point(17, 32);
+ this.comboBoxSelectorMap.Name = "comboBoxSelectorMap";
+ this.comboBoxSelectorMap.Size = new System.Drawing.Size(175, 28);
+ this.comboBoxSelectorMap.TabIndex = 0;
+ this.comboBoxSelectorMap.SelectedIndexChanged += new System.EventHandler(this.ComboBoxSelectorMap_SelectedIndexChanged);
+ //
+ // pictureBox
+ //
+ this.pictureBox.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.pictureBox.Location = new System.Drawing.Point(0, 0);
+ this.pictureBox.Name = "pictureBox";
+ this.pictureBox.Size = new System.Drawing.Size(1057, 668);
+ this.pictureBox.TabIndex = 1;
+ this.pictureBox.TabStop = false;
+ //
+ // FormMapWithSetPlains
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(1261, 668);
+ this.Controls.Add(this.pictureBox);
+ this.Controls.Add(this.groupBoxTools);
+ this.Name = "FormMapWithSetPlains";
+ this.Text = "Карта с набором объектов";
+ this.groupBoxTools.ResumeLayout(false);
+ this.groupBoxTools.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).EndInit();
+ this.ResumeLayout(false);
+ }
+
+ #endregion
+ private GroupBox groupBoxTools;
+ private PictureBox pictureBox;
+ private ComboBox comboBoxSelectorMap;
+ private Button buttonShowOnMap;
+ private Button buttonAddPlain;
+ private Button buttonDown;
+ private Button buttonRight;
+ private Button buttonLeft;
+ private Button buttonUp;
+ private Button buttonShowStorage;
+ private Button buttonRemovePlain;
+ private MaskedTextBox maskedTextBoxPosition;
+ }
+}
\ No newline at end of file
diff --git a/AirPlaneWithRadar/AirPlaneWithRadar/FormMapWithSetPlains.cs b/AirPlaneWithRadar/AirPlaneWithRadar/FormMapWithSetPlains.cs
new file mode 100644
index 0000000..27d8793
--- /dev/null
+++ b/AirPlaneWithRadar/AirPlaneWithRadar/FormMapWithSetPlains.cs
@@ -0,0 +1,130 @@
+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 FormMapWithSetPlains : Form
+ {
+ private MapWithSetPlainGeneric _mapPlainsCollectionGeneric;
+ public FormMapWithSetPlains()
+ {
+ InitializeComponent();
+ }
+
+ private void ComboBoxSelectorMap_SelectedIndexChanged(object sender, EventArgs e)
+ {
+ AbstractMap map = null;
+ switch (comboBoxSelectorMap.Text)
+ {
+ case "Простая карта":
+ map = new SimpleMap();
+ break;
+
+ }
+ if (map != null)
+ {
+ _mapPlainsCollectionGeneric = new MapWithSetPlainGeneric(
+ pictureBox.Width, pictureBox.Height, map);
+ }
+ else
+ {
+ _mapPlainsCollectionGeneric = null;
+ }
+ }
+ private void ButtonAddPlain_Click(object sender, EventArgs e)
+ {
+
+ if (_mapPlainsCollectionGeneric == null)
+ {
+ return;
+ }
+
+ FormPlain form = new();
+ if (form.ShowDialog() == DialogResult.OK)
+ {
+ DrawingObjectPlane plain = new(form.SelectedPlain);
+
+ if (_mapPlainsCollectionGeneric + plain)
+ {
+ MessageBox.Show("Объект добавлен");
+ pictureBox.Image = _mapPlainsCollectionGeneric.ShowSet();
+ }
+ else
+ {
+ MessageBox.Show("Не удалось добавить объект");
+ }
+ }
+ }
+ private void ButtonRemovePlain_Click(object sender, EventArgs e)
+ {
+ if (string.IsNullOrEmpty(maskedTextBoxPosition.Text))
+ {
+ return;
+ }
+ if (MessageBox.Show("Удалить объект?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
+ {
+ return;
+ }
+ int pos = Convert.ToInt32(maskedTextBoxPosition.Text);
+ if ((_mapPlainsCollectionGeneric - (pos - 1)) != null)
+ {
+ MessageBox.Show("Объект удален");
+ pictureBox.Image = _mapPlainsCollectionGeneric.ShowSet();
+ }
+ else
+ {
+ MessageBox.Show("Не удалось удалить объект");
+ }
+ }
+ private void ButtonShowStorage_Click(object sender, EventArgs e)
+ {
+ if (_mapPlainsCollectionGeneric == null)
+ {
+ return;
+ }
+ pictureBox.Image = _mapPlainsCollectionGeneric.ShowSet();
+ }
+ private void ButtonShowOnMap_Click(object sender, EventArgs e)
+ {
+ if (_mapPlainsCollectionGeneric == null)
+ {
+ return;
+ }
+ pictureBox.Image = _mapPlainsCollectionGeneric.ShowOnMap();
+ }
+ private void ButtonMove_Click(object sender, EventArgs e)
+ {
+ if (_mapPlainsCollectionGeneric == null)
+ {
+ return;
+ }
+
+ string name = ((Button)sender)?.Name ?? string.Empty;
+ Direction dir = Direction.None;
+ switch (name)
+ {
+ case "buttonUp":
+ dir = Direction.Up;
+ break;
+ case "buttonDown":
+ dir = Direction.Down;
+ break;
+ case "buttonLeft":
+ dir = Direction.Left;
+ break;
+ case "buttonRight":
+ dir = Direction.Right;
+ break;
+ }
+ pictureBox.Image = _mapPlainsCollectionGeneric.MoveObject(dir);
+ }
+
+ }
+}
diff --git a/AirPlaneWithRadar/AirPlaneWithRadar/FormMapWithSetPlains.resx b/AirPlaneWithRadar/AirPlaneWithRadar/FormMapWithSetPlains.resx
new file mode 100644
index 0000000..1af7de1
--- /dev/null
+++ b/AirPlaneWithRadar/AirPlaneWithRadar/FormMapWithSetPlains.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/FormPlain.Designer.cs b/AirPlaneWithRadar/AirPlaneWithRadar/FormPlain.Designer.cs
index 91f6fb9..3135533 100644
--- a/AirPlaneWithRadar/AirPlaneWithRadar/FormPlain.Designer.cs
+++ b/AirPlaneWithRadar/AirPlaneWithRadar/FormPlain.Designer.cs
@@ -39,6 +39,7 @@
this.buttonRight = new System.Windows.Forms.Button();
this.ButtonCreate = new System.Windows.Forms.Button();
this.buttonCreateModif = new System.Windows.Forms.Button();
+ this.buttonSelect = new System.Windows.Forms.Button();
((System.ComponentModel.ISupportInitialize)(this.pictureBoxPlain)).BeginInit();
this.statusStrip.SuspendLayout();
this.SuspendLayout();
@@ -89,7 +90,7 @@
this.buttonUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.buttonUp.BackgroundImage = global::AirPlaneWithRadar.Properties.Resources.up;
this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
- this.buttonUp.Location = new System.Drawing.Point(383, 223);
+ this.buttonUp.Location = new System.Drawing.Point(452, 222);
this.buttonUp.Name = "buttonUp";
this.buttonUp.Size = new System.Drawing.Size(30, 30);
this.buttonUp.TabIndex = 3;
@@ -102,7 +103,7 @@
this.buttonLeft.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.buttonLeft.BackgroundImage = global::AirPlaneWithRadar.Properties.Resources.left;
this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
- this.buttonLeft.Location = new System.Drawing.Point(347, 259);
+ this.buttonLeft.Location = new System.Drawing.Point(416, 258);
this.buttonLeft.Name = "buttonLeft";
this.buttonLeft.Size = new System.Drawing.Size(30, 30);
this.buttonLeft.TabIndex = 4;
@@ -115,7 +116,7 @@
this.buttonDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.buttonDown.BackgroundImage = global::AirPlaneWithRadar.Properties.Resources.down;
this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
- this.buttonDown.Location = new System.Drawing.Point(383, 259);
+ this.buttonDown.Location = new System.Drawing.Point(452, 258);
this.buttonDown.Name = "buttonDown";
this.buttonDown.Size = new System.Drawing.Size(30, 30);
this.buttonDown.TabIndex = 5;
@@ -128,7 +129,7 @@
this.buttonRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.buttonRight.BackgroundImage = global::AirPlaneWithRadar.Properties.Resources.right;
this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
- this.buttonRight.Location = new System.Drawing.Point(419, 259);
+ this.buttonRight.Location = new System.Drawing.Point(488, 258);
this.buttonRight.Name = "buttonRight";
this.buttonRight.Size = new System.Drawing.Size(30, 30);
this.buttonRight.TabIndex = 6;
@@ -157,11 +158,22 @@
this.buttonCreateModif.UseVisualStyleBackColor = true;
this.buttonCreateModif.Click += new System.EventHandler(this.buttonCreateModif_Click);
//
+ // buttonSelect
+ //
+ this.buttonSelect.Location = new System.Drawing.Point(275, 260);
+ this.buttonSelect.Name = "buttonSelect";
+ this.buttonSelect.Size = new System.Drawing.Size(94, 29);
+ this.buttonSelect.TabIndex = 9;
+ this.buttonSelect.Text = "Выбрать";
+ this.buttonSelect.UseVisualStyleBackColor = true;
+ this.buttonSelect.Click += new System.EventHandler(this.buttonSelect_Click);
+ //
// FormPlain
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(535, 318);
+ this.Controls.Add(this.buttonSelect);
this.Controls.Add(this.buttonCreateModif);
this.Controls.Add(this.ButtonCreate);
this.Controls.Add(this.buttonRight);
@@ -193,5 +205,6 @@
public ToolStripStatusLabel toolStripStatusLabelSpeed;
private Button ButtonCreate;
private Button buttonCreateModif;
+ private Button buttonSelect;
}
}
\ No newline at end of file
diff --git a/AirPlaneWithRadar/AirPlaneWithRadar/FormPlain.cs b/AirPlaneWithRadar/AirPlaneWithRadar/FormPlain.cs
index 8ab85cd..ac7a363 100644
--- a/AirPlaneWithRadar/AirPlaneWithRadar/FormPlain.cs
+++ b/AirPlaneWithRadar/AirPlaneWithRadar/FormPlain.cs
@@ -4,13 +4,13 @@ namespace AirPlaneWithRadar
public partial class FormPlain : Form
{
private DrawingPlain _plain;
-
+ public DrawingPlain SelectedPlain { get; private set; }
public FormPlain()
{
InitializeComponent();
-
+
}
-
+
private void Draw()
{
Bitmap bmp = new(pictureBoxPlain.Width, pictureBoxPlain.Height);
@@ -29,10 +29,13 @@ namespace AirPlaneWithRadar
private void ButtonCreate_Click(object sender, EventArgs e)
{
Random rnd = new();
- _plain = new DrawingPlain(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)));
-
-
-
+ Color color = Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256));
+ ColorDialog dialog = new();
+ if (dialog.ShowDialog() == DialogResult.OK)
+ {
+ color = dialog.Color;
+ }
+ _plain = new DrawingPlain(rnd.Next(100, 300), rnd.Next(1000, 2000), color);
SetData();
Draw();
}
@@ -62,21 +65,35 @@ namespace AirPlaneWithRadar
_plain?.ChangeBorders(pictureBoxPlain.Width, pictureBoxPlain.Height);
Draw();
}
-
+
private void buttonCreateModif_Click(object sender, EventArgs e)
{
Random rnd = new();
- _plain = new DrawingRadarPlane(rnd.Next(100, 300), rnd.Next(1000, 2000),
- Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)),
- Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)),
+ Color color = Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256));
+ ColorDialog dialog = new();
+ if (dialog.ShowDialog() == DialogResult.OK)
+ {
+ color = dialog.Color;
+ }
+ Color dopColor = Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256));
+ ColorDialog dialogDop = new();
+ if (dialogDop.ShowDialog() == DialogResult.OK)
+ {
+ dopColor = dialogDop.Color;
+ }
+ _plain = new DrawingRadarPlane(rnd.Next(100, 300), rnd.Next(1000, 2000),
+ color,
+ dopColor,
Convert.ToBoolean(rnd.Next(0, 2)), Convert.ToBoolean(rnd.Next(0, 2)));
-
-
-
SetData();
Draw();
}
+ private void buttonSelect_Click(object sender, EventArgs e)
+ {
+ SelectedPlain = _plain;
+ DialogResult = DialogResult.OK;
+ }
}
}
diff --git a/AirPlaneWithRadar/AirPlaneWithRadar/Program.cs b/AirPlaneWithRadar/AirPlaneWithRadar/Program.cs
index cb92530..8cb6b9c 100644
--- a/AirPlaneWithRadar/AirPlaneWithRadar/Program.cs
+++ b/AirPlaneWithRadar/AirPlaneWithRadar/Program.cs
@@ -11,7 +11,7 @@ namespace AirPlaneWithRadar
// To customize application configuration such as set high DPI settings or default font,
// see https://aka.ms/applicationconfiguration.
ApplicationConfiguration.Initialize();
- Application.Run(new FormMap());
+ Application.Run(new FormMapWithSetPlains());
}
}
}
\ No newline at end of file