diff --git a/AirplaneWithRadar/AirplaneWithRadar/Direction.cs b/AirplaneWithRadar/AirplaneWithRadar/Direction.cs index 6d2d2e4..360928b 100644 --- a/AirplaneWithRadar/AirplaneWithRadar/Direction.cs +++ b/AirplaneWithRadar/AirplaneWithRadar/Direction.cs @@ -4,7 +4,7 @@ namespace AirplaneWithRadar /// /// Направление перемещения /// - internal enum Direction + public enum Direction { None = 0, Up = 1, diff --git a/AirplaneWithRadar/AirplaneWithRadar/DrawingAirplane.cs b/AirplaneWithRadar/AirplaneWithRadar/DrawingAirplane.cs index 951dfa8..5dd3e14 100644 --- a/AirplaneWithRadar/AirplaneWithRadar/DrawingAirplane.cs +++ b/AirplaneWithRadar/AirplaneWithRadar/DrawingAirplane.cs @@ -4,7 +4,7 @@ namespace AirplaneWithRadar /// /// Класс, отвечающий за прорисовку и перемещение объекта-сущности /// - internal class DrawningAirplane + public class DrawningAirplane { /// /// Класс-сущность @@ -39,13 +39,19 @@ namespace AirplaneWithRadar /// Инициализация свойств /// /// Скорость - /// Вес - /// Цвет + /// Вес самолета + /// Цвет обшивки + /// Какие будут иллюминаторы самолета public DrawningAirplane(int speed, float weight, Color bodyColor, IAirplanePortholes typeAirplanePortholes) { Airplane = new EntityAirplane(speed, weight, bodyColor); DrawningPortholes = typeAirplanePortholes; } + public DrawningAirplane(EntityAirplane entityAirplane, IAirplanePortholes typeAirplanePortholes) + { + Airplane = entityAirplane; + DrawningPortholes = typeAirplanePortholes; + } /// /// Инициализация свойств @@ -56,7 +62,7 @@ namespace AirplaneWithRadar /// Ширина отрисовки самолёта /// Высота отрисовки самолёта protected DrawningAirplane(int speed, float weight, Color bodyColor, int airplaneWidth, int airplaneHeight, IAirplanePortholes typeAirplanePortholes) : - this(speed, weight, bodyColor, typeAirplanePortholes) + this(speed, weight, bodyColor, typeAirplanePortholes) { _airplaneWidth = airplaneWidth; _airplaneHeight = airplaneHeight; diff --git a/AirplaneWithRadar/AirplaneWithRadar/EntityAirplane.cs b/AirplaneWithRadar/AirplaneWithRadar/EntityAirplane.cs index 4682efc..edaee9f 100644 --- a/AirplaneWithRadar/AirplaneWithRadar/EntityAirplane.cs +++ b/AirplaneWithRadar/AirplaneWithRadar/EntityAirplane.cs @@ -4,7 +4,7 @@ namespace AirplaneWithRadar /// /// Класс-сущность "Самолёт" /// - internal class EntityAirplane + public class EntityAirplane { /// /// Скорость diff --git a/AirplaneWithRadar/AirplaneWithRadar/FormAirplane.Designer.cs b/AirplaneWithRadar/AirplaneWithRadar/FormAirplane.Designer.cs index 7fe2dba..3d637e2 100644 --- a/AirplaneWithRadar/AirplaneWithRadar/FormAirplane.Designer.cs +++ b/AirplaneWithRadar/AirplaneWithRadar/FormAirplane.Designer.cs @@ -42,6 +42,7 @@ this.comboBoxPortholes = new System.Windows.Forms.ComboBox(); this.comboBoxTypePortholes = new System.Windows.Forms.ComboBox(); this.buttonCreateModif = new System.Windows.Forms.Button(); + this.buttonSelectAirplane = new System.Windows.Forms.Button(); this.statusStrip1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBoxAirplane)).BeginInit(); this.SuspendLayout(); @@ -191,11 +192,23 @@ this.buttonCreateModif.UseVisualStyleBackColor = true; this.buttonCreateModif.Click += new System.EventHandler(this.ButtonCreateModif_Click); // + // buttonSelectAirplane + // + this.buttonSelectAirplane.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.buttonSelectAirplane.Location = new System.Drawing.Point(572, 402); + this.buttonSelectAirplane.Name = "buttonSelectAirplane"; + this.buttonSelectAirplane.Size = new System.Drawing.Size(75, 23); + this.buttonSelectAirplane.TabIndex = 11; + this.buttonSelectAirplane.Text = "Выбрать"; + this.buttonSelectAirplane.UseVisualStyleBackColor = true; + this.buttonSelectAirplane.Click += new System.EventHandler(this.ButtonSelectAirplane_Click); + // // FormAirplane // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(800, 450); + this.Controls.Add(this.buttonSelectAirplane); this.Controls.Add(this.buttonCreateModif); this.Controls.Add(this.comboBoxTypePortholes); this.Controls.Add(this.comboBoxPortholes); @@ -233,5 +246,6 @@ private ComboBox comboBoxPortholes; private ComboBox comboBoxTypePortholes; private Button buttonCreateModif; + private Button buttonSelectAirplane; } } \ No newline at end of file diff --git a/AirplaneWithRadar/AirplaneWithRadar/FormAirplane.cs b/AirplaneWithRadar/AirplaneWithRadar/FormAirplane.cs index 94c2502..8381bdb 100644 --- a/AirplaneWithRadar/AirplaneWithRadar/FormAirplane.cs +++ b/AirplaneWithRadar/AirplaneWithRadar/FormAirplane.cs @@ -4,6 +4,11 @@ namespace AirplaneWithRadar { private DrawningAirplane _airplane; + /// + /// + /// + public DrawningAirplane SelectedAirplane { get; private set; } + public FormAirplane() { InitializeComponent(); @@ -121,5 +126,11 @@ namespace AirplaneWithRadar SetData(); Draw(); } + + private void ButtonSelectAirplane_Click(object sender, EventArgs e) + { + SelectedAirplane = _airplane; + DialogResult = DialogResult.OK; + } } } \ No newline at end of file diff --git a/AirplaneWithRadar/AirplaneWithRadar/FormMap.Designer.cs b/AirplaneWithRadar/AirplaneWithRadar/FormMap.Designer.cs deleted file mode 100644 index 5fe8327..0000000 --- a/AirplaneWithRadar/AirplaneWithRadar/FormMap.Designer.cs +++ /dev/null @@ -1,251 +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.statusStrip1 = new System.Windows.Forms.StatusStrip(); - this.toolStripStatusLabelSpeed = new System.Windows.Forms.ToolStripStatusLabel(); - this.toolStripStatusLabelWeight = new System.Windows.Forms.ToolStripStatusLabel(); - this.toolStripStatusLabelBodyColor = new System.Windows.Forms.ToolStripStatusLabel(); - this.pictureBoxAirplane = new System.Windows.Forms.PictureBox(); - this.buttonCreate = new System.Windows.Forms.Button(); - 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.buttonCreateModif = new System.Windows.Forms.Button(); - this.comboBoxSelectorMap = new System.Windows.Forms.ComboBox(); - this.comboBoxTypePortholes = new System.Windows.Forms.ComboBox(); - this.comboBoxPortholes = new System.Windows.Forms.ComboBox(); - this.labelPortholes = new System.Windows.Forms.Label(); - this.statusStrip1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBoxAirplane)).BeginInit(); - this.SuspendLayout(); - // - // statusStrip1 - // - this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.toolStripStatusLabelSpeed, - this.toolStripStatusLabelWeight, - this.toolStripStatusLabelBodyColor}); - this.statusStrip1.Location = new System.Drawing.Point(0, 428); - this.statusStrip1.Name = "statusStrip1"; - this.statusStrip1.Size = new System.Drawing.Size(800, 22); - this.statusStrip1.TabIndex = 0; - this.statusStrip1.Text = "statusStrip1"; - // - // toolStripStatusLabelSpeed - // - this.toolStripStatusLabelSpeed.Name = "toolStripStatusLabelSpeed"; - this.toolStripStatusLabelSpeed.Size = new System.Drawing.Size(62, 17); - this.toolStripStatusLabelSpeed.Text = "Скорость:"; - // - // toolStripStatusLabelWeight - // - this.toolStripStatusLabelWeight.Name = "toolStripStatusLabelWeight"; - this.toolStripStatusLabelWeight.Size = new System.Drawing.Size(29, 17); - this.toolStripStatusLabelWeight.Text = "Вес:"; - // - // toolStripStatusLabelBodyColor - // - this.toolStripStatusLabelBodyColor.Name = "toolStripStatusLabelBodyColor"; - this.toolStripStatusLabelBodyColor.Size = new System.Drawing.Size(36, 17); - this.toolStripStatusLabelBodyColor.Text = "Цвет:"; - // - // pictureBoxAirplane - // - this.pictureBoxAirplane.Dock = System.Windows.Forms.DockStyle.Fill; - this.pictureBoxAirplane.Location = new System.Drawing.Point(0, 0); - this.pictureBoxAirplane.Name = "pictureBoxAirplane"; - this.pictureBoxAirplane.Size = new System.Drawing.Size(800, 428); - this.pictureBoxAirplane.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; - this.pictureBoxAirplane.TabIndex = 1; - this.pictureBoxAirplane.TabStop = false; - // - // 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, 395); - this.buttonCreate.Name = "buttonCreate"; - this.buttonCreate.Size = new System.Drawing.Size(96, 23); - this.buttonCreate.TabIndex = 2; - this.buttonCreate.Text = "Создать"; - this.buttonCreate.UseVisualStyleBackColor = true; - this.buttonCreate.Click += new System.EventHandler(this.ButtonCreate_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.arrUp; - this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.buttonUp.Location = new System.Drawing.Point(722, 359); - this.buttonUp.Name = "buttonUp"; - this.buttonUp.Size = new System.Drawing.Size(30, 30); - this.buttonUp.TabIndex = 3; - 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.arrLeft; - this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.buttonLeft.Location = new System.Drawing.Point(686, 395); - this.buttonLeft.Name = "buttonLeft"; - this.buttonLeft.Size = new System.Drawing.Size(30, 30); - this.buttonLeft.TabIndex = 4; - 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.arrDown; - this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.buttonDown.Location = new System.Drawing.Point(722, 395); - this.buttonDown.Name = "buttonDown"; - this.buttonDown.Size = new System.Drawing.Size(30, 30); - this.buttonDown.TabIndex = 5; - 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.arrRight; - this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.buttonRight.Location = new System.Drawing.Point(758, 395); - this.buttonRight.Name = "buttonRight"; - this.buttonRight.Size = new System.Drawing.Size(30, 30); - this.buttonRight.TabIndex = 6; - this.buttonRight.UseVisualStyleBackColor = true; - this.buttonRight.Click += new System.EventHandler(this.ButtonMove_Click); - // - // buttonCreateModif - // - this.buttonCreateModif.Location = new System.Drawing.Point(114, 395); - this.buttonCreateModif.Name = "buttonCreateModif"; - this.buttonCreateModif.Size = new System.Drawing.Size(96, 23); - this.buttonCreateModif.TabIndex = 7; - this.buttonCreateModif.Text = "Модификация"; - this.buttonCreateModif.UseVisualStyleBackColor = true; - this.buttonCreateModif.Click += new System.EventHandler(this.ButtonCreateModif_Click); - // - // comboBoxSelectorMap - // - this.comboBoxSelectorMap.FormattingEnabled = true; - this.comboBoxSelectorMap.Items.AddRange(new object[] { - "Простая карта", - "Моя карта"}); - this.comboBoxSelectorMap.Location = new System.Drawing.Point(27, 34); - this.comboBoxSelectorMap.Name = "comboBoxSelectorMap"; - this.comboBoxSelectorMap.Size = new System.Drawing.Size(121, 23); - this.comboBoxSelectorMap.TabIndex = 8; - this.comboBoxSelectorMap.Text = "Простая карта"; - this.comboBoxSelectorMap.SelectedIndexChanged += new System.EventHandler(this.ComboBoxSelectorMap_SelectedIndexChanged); - // - // comboBoxTypePortholes - // - this.comboBoxTypePortholes.FormattingEnabled = true; - this.comboBoxTypePortholes.Items.AddRange(new object[] { - "Квадратные", - "Треугольные", - "Ромбовидные"}); - this.comboBoxTypePortholes.Location = new System.Drawing.Point(12, 337); - this.comboBoxTypePortholes.Name = "comboBoxTypePortholes"; - this.comboBoxTypePortholes.Size = new System.Drawing.Size(121, 23); - this.comboBoxTypePortholes.TabIndex = 9; - this.comboBoxTypePortholes.Text = "Квадратные"; - // - // comboBoxPortholes - // - this.comboBoxPortholes.FormattingEnabled = true; - this.comboBoxPortholes.Items.AddRange(new object[] { - "10", - "20", - "30"}); - this.comboBoxPortholes.Location = new System.Drawing.Point(195, 368); - this.comboBoxPortholes.Name = "comboBoxPortholes"; - this.comboBoxPortholes.Size = new System.Drawing.Size(44, 23); - this.comboBoxPortholes.TabIndex = 11; - this.comboBoxPortholes.Text = "10"; - // - // labelPortholes - // - this.labelPortholes.AutoSize = true; - this.labelPortholes.Location = new System.Drawing.Point(12, 371); - this.labelPortholes.Name = "labelPortholes"; - this.labelPortholes.Size = new System.Drawing.Size(177, 15); - this.labelPortholes.TabIndex = 10; - this.labelPortholes.Text = "Колличество иллюминаторов:"; - // - // FormMap - // - this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(800, 450); - this.Controls.Add(this.comboBoxPortholes); - this.Controls.Add(this.labelPortholes); - this.Controls.Add(this.comboBoxTypePortholes); - this.Controls.Add(this.comboBoxSelectorMap); - this.Controls.Add(this.buttonCreateModif); - this.Controls.Add(this.buttonRight); - this.Controls.Add(this.buttonDown); - this.Controls.Add(this.buttonLeft); - this.Controls.Add(this.buttonUp); - this.Controls.Add(this.buttonCreate); - this.Controls.Add(this.pictureBoxAirplane); - this.Controls.Add(this.statusStrip1); - this.Name = "FormMap"; - this.Text = "FormMap"; - this.statusStrip1.ResumeLayout(false); - this.statusStrip1.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBoxAirplane)).EndInit(); - this.ResumeLayout(false); - this.PerformLayout(); - - } - - #endregion - private StatusStrip statusStrip1; - private ToolStripStatusLabel toolStripStatusLabelSpeed; - private ToolStripStatusLabel toolStripStatusLabelWeight; - private ToolStripStatusLabel toolStripStatusLabelBodyColor; - private PictureBox pictureBoxAirplane; - private Button buttonCreate; - private Button buttonUp; - private Button buttonLeft; - private Button buttonDown; - private Button buttonRight; - private Button buttonCreateModif; - private ComboBox comboBoxSelectorMap; - private ComboBox comboBoxTypePortholes; - private ComboBox comboBoxPortholes; - private Label labelPortholes; - } -} \ No newline at end of file diff --git a/AirplaneWithRadar/AirplaneWithRadar/FormMap.cs b/AirplaneWithRadar/AirplaneWithRadar/FormMap.cs deleted file mode 100644 index feac0e4..0000000 --- a/AirplaneWithRadar/AirplaneWithRadar/FormMap.cs +++ /dev/null @@ -1,127 +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; -using System.Xml.Serialization; - -namespace AirplaneWithRadar -{ - public partial class FormMap : Form - { - private AbstractMap _abstractMap; - public FormMap() - { - InitializeComponent(); - _abstractMap = new SimpleMap(); - } - /// - /// Заполнение информации по объекту - /// - /// - private void SetData(DrawningAirplane airplane) - { - toolStripStatusLabelSpeed.Text = $"Скорость: {airplane.Airplane.Speed}"; - toolStripStatusLabelWeight.Text = $"Вес: {airplane.Airplane.Weight}"; - toolStripStatusLabelBodyColor.Text = $"Цвет: {airplane.Airplane.BodyColor.Name}"; - pictureBoxAirplane.Image = _abstractMap.CreateMap(pictureBoxAirplane.Width, pictureBoxAirplane.Height, new DrawningObjectAirplane(airplane)); - } - - /// - /// Обработка нажатия кнопки "Создать" - /// - /// - /// - /// - private void ButtonCreate_Click(object sender, EventArgs e) - { - IAirplanePortholes typeAirplanePortholes = new DrawningAirplanePortholes(); - switch (comboBoxTypePortholes.Text) - { - case "Треугольные": - typeAirplanePortholes = new DrawningDeltaPortholes(); - break; - case "Ромбовидные": - typeAirplanePortholes = new DrawningRhombusPortholes(); - break; - } - Random rnd = new(); - var airplane = new DrawningAirplane(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)), typeAirplanePortholes); - airplane.DrawningPortholes.CountPortholes = Convert.ToInt32(comboBoxPortholes.Text); - SetData(airplane); - } - - /// - /// Изменение размеров формы - /// - /// - /// - 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; - } - pictureBoxAirplane.Image = _abstractMap?.MoveObject(dir); - } - - /// - /// Обработка нажатия кнопки "Модификация" - /// - /// - /// - private void ButtonCreateModif_Click(object sender, EventArgs e) - { - IAirplanePortholes typeAirplanePortholes = new DrawningAirplanePortholes(); - switch (comboBoxTypePortholes.Text) - { - case "Треугольные": - typeAirplanePortholes = new DrawningDeltaPortholes(); - break; - case "Ромбовидные": - typeAirplanePortholes = new DrawningRhombusPortholes(); - break; - } - Random rnd = new(); - var airplane = new DrawningAirplaneWithRadar(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)), - typeAirplanePortholes); - airplane.DrawningPortholes.CountPortholes = Convert.ToInt32(comboBoxPortholes.Text); - SetData(airplane); - } - - private void ComboBoxSelectorMap_SelectedIndexChanged(object sender, EventArgs e) - { - switch (comboBoxSelectorMap.Text) - { - case "Простая карта": - _abstractMap = new SimpleMap(); - break; - case "Моя карта": - _abstractMap = new MyMap(); - break; - } - } - } -} diff --git a/AirplaneWithRadar/AirplaneWithRadar/FormMapWithSetAirplanes.Designer.cs b/AirplaneWithRadar/AirplaneWithRadar/FormMapWithSetAirplanes.Designer.cs new file mode 100644 index 0000000..b9db144 --- /dev/null +++ b/AirplaneWithRadar/AirplaneWithRadar/FormMapWithSetAirplanes.Designer.cs @@ -0,0 +1,379 @@ +namespace AirplaneWithRadar +{ + partial class FormMapWithSetAirplanes + { + /// + /// 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.maskedTextBoxPosition = new System.Windows.Forms.MaskedTextBox(); + this.buttonRemoveAirplane = new System.Windows.Forms.Button(); + this.buttonShowStorage = new System.Windows.Forms.Button(); + this.buttonShowOnMap = new System.Windows.Forms.Button(); + this.buttonAddAirplane = new System.Windows.Forms.Button(); + this.groupBoxGenerate = new System.Windows.Forms.GroupBox(); + this.comboTypePortholes = new System.Windows.Forms.ComboBox(); + this.comboBoxPortholes = new System.Windows.Forms.ComboBox(); + this.comboTypePotholes = new System.Windows.Forms.ComboBox(); + this.buttonAddTypeOfPhortholes = new System.Windows.Forms.Button(); + this.labelSpeed = new System.Windows.Forms.Label(); + this.numericSpeed = new System.Windows.Forms.NumericUpDown(); + this.buttonAddTypeOfEntity = new System.Windows.Forms.Button(); + this.labelWeight = new System.Windows.Forms.Label(); + this.numericWeight = new System.Windows.Forms.NumericUpDown(); + this.labelCountPortholes = new System.Windows.Forms.Label(); + this.buttonGenerateAirplane = new System.Windows.Forms.Button(); + this.comboBoxSelectorMap = new System.Windows.Forms.ComboBox(); + this.groupBoxTools = new System.Windows.Forms.GroupBox(); + this.buttonRight = new System.Windows.Forms.Button(); + this.buttonLeft = new System.Windows.Forms.Button(); + this.buttonDown = new System.Windows.Forms.Button(); + this.buttonUp = new System.Windows.Forms.Button(); + this.pictureBox = new System.Windows.Forms.PictureBox(); + this.groupBoxGenerate.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.numericSpeed)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericWeight)).BeginInit(); + this.groupBoxTools.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).BeginInit(); + this.SuspendLayout(); + // + // maskedTextBoxPosition + // + this.maskedTextBoxPosition.Location = new System.Drawing.Point(35, 331); + this.maskedTextBoxPosition.Mask = "00"; + this.maskedTextBoxPosition.Name = "maskedTextBoxPosition"; + this.maskedTextBoxPosition.Size = new System.Drawing.Size(175, 23); + this.maskedTextBoxPosition.TabIndex = 29; + this.maskedTextBoxPosition.ValidatingType = typeof(int); + // + // buttonRemoveAirplane + // + this.buttonRemoveAirplane.Location = new System.Drawing.Point(35, 360); + this.buttonRemoveAirplane.Name = "buttonRemoveAirplane"; + this.buttonRemoveAirplane.Size = new System.Drawing.Size(175, 35); + this.buttonRemoveAirplane.TabIndex = 30; + this.buttonRemoveAirplane.Text = "Удалить самолет"; + this.buttonRemoveAirplane.UseVisualStyleBackColor = true; + this.buttonRemoveAirplane.Click += new System.EventHandler(this.ButtonRemoveAirplane_Click); + // + // buttonShowStorage + // + this.buttonShowStorage.Location = new System.Drawing.Point(35, 401); + this.buttonShowStorage.Name = "buttonShowStorage"; + this.buttonShowStorage.Size = new System.Drawing.Size(175, 35); + this.buttonShowStorage.TabIndex = 31; + this.buttonShowStorage.Text = "Посмотреть хранилище"; + this.buttonShowStorage.UseVisualStyleBackColor = true; + this.buttonShowStorage.Click += new System.EventHandler(this.ButtonShowStorage_Click); + // + // buttonShowOnMap + // + this.buttonShowOnMap.Location = new System.Drawing.Point(35, 438); + this.buttonShowOnMap.Name = "buttonShowOnMap"; + this.buttonShowOnMap.Size = new System.Drawing.Size(175, 35); + this.buttonShowOnMap.TabIndex = 32; + this.buttonShowOnMap.Text = "Посмотреть карту"; + this.buttonShowOnMap.UseVisualStyleBackColor = true; + this.buttonShowOnMap.Click += new System.EventHandler(this.ButtonShowOnMap_Click); + // + // buttonAddAirplane + // + this.buttonAddAirplane.Location = new System.Drawing.Point(35, 287); + this.buttonAddAirplane.Name = "buttonAddAirplane"; + this.buttonAddAirplane.Size = new System.Drawing.Size(175, 35); + this.buttonAddAirplane.TabIndex = 28; + this.buttonAddAirplane.Text = "Добавить самолет вручную"; + this.buttonAddAirplane.UseVisualStyleBackColor = true; + this.buttonAddAirplane.Click += new System.EventHandler(this.ButtonAddAirplane_Click); + // + // groupBoxGenerate + // + this.groupBoxGenerate.Controls.Add(this.comboTypePortholes); + this.groupBoxGenerate.Controls.Add(this.comboBoxPortholes); + this.groupBoxGenerate.Controls.Add(this.comboTypePotholes); + this.groupBoxGenerate.Controls.Add(this.buttonAddTypeOfPhortholes); + this.groupBoxGenerate.Controls.Add(this.labelSpeed); + this.groupBoxGenerate.Controls.Add(this.numericSpeed); + this.groupBoxGenerate.Controls.Add(this.buttonAddTypeOfEntity); + this.groupBoxGenerate.Controls.Add(this.labelWeight); + this.groupBoxGenerate.Controls.Add(this.numericWeight); + this.groupBoxGenerate.Controls.Add(this.labelCountPortholes); + this.groupBoxGenerate.Controls.Add(this.buttonGenerateAirplane); + this.groupBoxGenerate.Location = new System.Drawing.Point(16, 15); + this.groupBoxGenerate.Name = "groupBoxGenerate"; + this.groupBoxGenerate.Size = new System.Drawing.Size(200, 266); + this.groupBoxGenerate.TabIndex = 27; + this.groupBoxGenerate.TabStop = false; + this.groupBoxGenerate.Text = "Генерация"; + // + // comboTypePortholes + // + this.comboTypePortholes.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.comboTypePortholes.FormattingEnabled = true; + this.comboTypePortholes.Items.AddRange(new object[] { + "Квадратные", + "Треугольные", + "Ромбовидные"}); + this.comboTypePortholes.Location = new System.Drawing.Point(17, 122); + this.comboTypePortholes.Name = "comboTypePortholes"; + this.comboTypePortholes.Size = new System.Drawing.Size(175, 23); + this.comboTypePortholes.TabIndex = 21; + // + // comboBoxPortholes + // + this.comboBoxPortholes.FormattingEnabled = true; + this.comboBoxPortholes.Items.AddRange(new object[] { + "10", + "20", + "30"}); + this.comboBoxPortholes.Location = new System.Drawing.Point(150, 148); + this.comboBoxPortholes.Name = "comboBoxPortholes"; + this.comboBoxPortholes.Size = new System.Drawing.Size(44, 23); + this.comboBoxPortholes.TabIndex = 20; + this.comboBoxPortholes.Text = "10"; + // + // comboTypePotholes + // + this.comboTypePotholes.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.comboTypePotholes.FormattingEnabled = true; + this.comboTypePotholes.Items.AddRange(new object[] { + "Закругленный", + "Квадратный", + "Стрелка"}); + this.comboTypePotholes.Location = new System.Drawing.Point(19, 282); + this.comboTypePotholes.Name = "comboTypePotholes"; + this.comboTypePotholes.Size = new System.Drawing.Size(175, 23); + this.comboTypePotholes.TabIndex = 9; + // + // buttonAddTypeOfPhortholes + // + this.buttonAddTypeOfPhortholes.Location = new System.Drawing.Point(17, 175); + this.buttonAddTypeOfPhortholes.Name = "buttonAddTypeOfPhortholes"; + this.buttonAddTypeOfPhortholes.Size = new System.Drawing.Size(175, 56); + this.buttonAddTypeOfPhortholes.TabIndex = 12; + this.buttonAddTypeOfPhortholes.Text = "Добавить тип иллюминатора и их кол-во"; + this.buttonAddTypeOfPhortholes.UseVisualStyleBackColor = true; + this.buttonAddTypeOfPhortholes.Click += new System.EventHandler(this.ButtonAddTypeOfPortholes_Click); + // + // labelSpeed + // + this.labelSpeed.AutoSize = true; + this.labelSpeed.Location = new System.Drawing.Point(17, 19); + this.labelSpeed.Name = "labelSpeed"; + this.labelSpeed.Size = new System.Drawing.Size(117, 15); + this.labelSpeed.TabIndex = 19; + this.labelSpeed.Text = "Скорость самолета:"; + // + // numericSpeed + // + this.numericSpeed.Location = new System.Drawing.Point(136, 17); + this.numericSpeed.Name = "numericSpeed"; + this.numericSpeed.Size = new System.Drawing.Size(56, 23); + this.numericSpeed.TabIndex = 18; + // + // buttonAddTypeOfEntity + // + this.buttonAddTypeOfEntity.Location = new System.Drawing.Point(17, 71); + this.buttonAddTypeOfEntity.Name = "buttonAddTypeOfEntity"; + this.buttonAddTypeOfEntity.Size = new System.Drawing.Size(175, 39); + this.buttonAddTypeOfEntity.TabIndex = 11; + this.buttonAddTypeOfEntity.Text = "Добавить свойства для генерации"; + this.buttonAddTypeOfEntity.UseVisualStyleBackColor = true; + this.buttonAddTypeOfEntity.Click += new System.EventHandler(this.ButtonAddTypeOfEntity_Click); + // + // labelWeight + // + this.labelWeight.AutoSize = true; + this.labelWeight.Location = new System.Drawing.Point(17, 44); + this.labelWeight.Name = "labelWeight"; + this.labelWeight.Size = new System.Drawing.Size(100, 15); + this.labelWeight.TabIndex = 17; + this.labelWeight.Text = "Масса самолета:"; + // + // numericWeight + // + this.numericWeight.Location = new System.Drawing.Point(136, 42); + this.numericWeight.Name = "numericWeight"; + this.numericWeight.Size = new System.Drawing.Size(56, 23); + this.numericWeight.TabIndex = 16; + // + // labelCountPortholes + // + this.labelCountPortholes.AutoSize = true; + this.labelCountPortholes.Location = new System.Drawing.Point(6, 151); + this.labelCountPortholes.Name = "labelCountPortholes"; + this.labelCountPortholes.Size = new System.Drawing.Size(144, 15); + this.labelCountPortholes.TabIndex = 14; + this.labelCountPortholes.Text = "Кол-во иллюминаторов:"; + // + // buttonGenerateAirplane + // + this.buttonGenerateAirplane.Location = new System.Drawing.Point(19, 237); + this.buttonGenerateAirplane.Name = "buttonGenerateAirplane"; + this.buttonGenerateAirplane.Size = new System.Drawing.Size(175, 23); + this.buttonGenerateAirplane.TabIndex = 15; + this.buttonGenerateAirplane.Text = "Сгенерировать самолет"; + this.buttonGenerateAirplane.UseVisualStyleBackColor = true; + this.buttonGenerateAirplane.Click += new System.EventHandler(this.ButtonGenerateAirplane_Click); + // + // comboBoxSelectorMap + // + this.comboBoxSelectorMap.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.comboBoxSelectorMap.FormattingEnabled = true; + this.comboBoxSelectorMap.Items.AddRange(new object[] { + "Простая карта", + "Моя карта"}); + this.comboBoxSelectorMap.Location = new System.Drawing.Point(35, 479); + this.comboBoxSelectorMap.Name = "comboBoxSelectorMap"; + this.comboBoxSelectorMap.Size = new System.Drawing.Size(175, 23); + this.comboBoxSelectorMap.TabIndex = 26; + this.comboBoxSelectorMap.SelectedIndexChanged += new System.EventHandler(this.ComboBoxSelectorMap_SelectedIndexChanged); + // + // groupBoxTools + // + this.groupBoxTools.Controls.Add(this.buttonRight); + this.groupBoxTools.Controls.Add(this.buttonLeft); + this.groupBoxTools.Controls.Add(this.buttonDown); + this.groupBoxTools.Controls.Add(this.buttonUp); + this.groupBoxTools.Controls.Add(this.maskedTextBoxPosition); + this.groupBoxTools.Controls.Add(this.buttonRemoveAirplane); + this.groupBoxTools.Controls.Add(this.buttonShowStorage); + this.groupBoxTools.Controls.Add(this.buttonShowOnMap); + this.groupBoxTools.Controls.Add(this.buttonAddAirplane); + this.groupBoxTools.Controls.Add(this.groupBoxGenerate); + this.groupBoxTools.Controls.Add(this.comboBoxSelectorMap); + this.groupBoxTools.Dock = System.Windows.Forms.DockStyle.Right; + this.groupBoxTools.Location = new System.Drawing.Point(894, 0); + this.groupBoxTools.Name = "groupBoxTools"; + this.groupBoxTools.Size = new System.Drawing.Size(225, 598); + this.groupBoxTools.TabIndex = 33; + this.groupBoxTools.TabStop = false; + this.groupBoxTools.Text = "Инструменты"; + // + // 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.arrRight; + this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.buttonRight.Location = new System.Drawing.Point(139, 555); + this.buttonRight.Name = "buttonRight"; + this.buttonRight.Size = new System.Drawing.Size(30, 30); + this.buttonRight.TabIndex = 36; + 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.arrLeft; + this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.buttonLeft.Location = new System.Drawing.Point(67, 555); + this.buttonLeft.Name = "buttonLeft"; + this.buttonLeft.Size = new System.Drawing.Size(30, 30); + this.buttonLeft.TabIndex = 35; + 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.arrDown; + this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.buttonDown.Location = new System.Drawing.Point(103, 555); + this.buttonDown.Name = "buttonDown"; + this.buttonDown.Size = new System.Drawing.Size(30, 30); + this.buttonDown.TabIndex = 34; + this.buttonDown.UseVisualStyleBackColor = true; + this.buttonDown.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.arrUp; + this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.buttonUp.Location = new System.Drawing.Point(103, 519); + this.buttonUp.Name = "buttonUp"; + this.buttonUp.Size = new System.Drawing.Size(30, 30); + this.buttonUp.TabIndex = 33; + this.buttonUp.UseVisualStyleBackColor = true; + this.buttonUp.Click += new System.EventHandler(this.ButtonMove_Click); + // + // 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(894, 598); + this.pictureBox.TabIndex = 34; + this.pictureBox.TabStop = false; + // + // FormMapWithSetAirplanes + // + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(1119, 598); + this.Controls.Add(this.pictureBox); + this.Controls.Add(this.groupBoxTools); + this.Name = "FormMapWithSetAirplanes"; + this.Text = "FormMapWithSetAirplanes"; + this.groupBoxGenerate.ResumeLayout(false); + this.groupBoxGenerate.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.numericSpeed)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericWeight)).EndInit(); + this.groupBoxTools.ResumeLayout(false); + this.groupBoxTools.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).EndInit(); + this.ResumeLayout(false); + + } + + #endregion + + private MaskedTextBox maskedTextBoxPosition; + private Button buttonRemoveAirplane; + private Button buttonShowStorage; + private Button buttonShowOnMap; + private Button buttonAddAirplane; + private GroupBox groupBoxGenerate; + private ComboBox comboTypePortholes; + private Button buttonAddTypeOfPhortholes; + private Label labelSpeed; + private NumericUpDown numericSpeed; + private Button buttonAddTypeOfEntity; + private Label labelWeight; + private NumericUpDown numericWeight; + private Label labelCountPortholes; + private Button buttonGenerateAirplane; + private ComboBox comboBoxSelectorMap; + private GroupBox groupBoxTools; + private Button buttonRight; + private Button buttonLeft; + private Button buttonDown; + private Button buttonUp; + private PictureBox pictureBox; + private ComboBox comboBoxPortholes; + private ComboBox comboTypePotholes; + } +} \ No newline at end of file diff --git a/AirplaneWithRadar/AirplaneWithRadar/FormMapWithSetAirplanes.cs b/AirplaneWithRadar/AirplaneWithRadar/FormMapWithSetAirplanes.cs new file mode 100644 index 0000000..502e130 --- /dev/null +++ b/AirplaneWithRadar/AirplaneWithRadar/FormMapWithSetAirplanes.cs @@ -0,0 +1,222 @@ +using AirBomber; + +namespace AirplaneWithRadar +{ + public partial class FormMapWithSetAirplanes : Form + { + /// + /// Объект от класса карты с набором объектов + /// + private MapWithSetAirplanesGeneric _mapAirplanesCollectionGeneric; + private GeneratorAirplane _generatorAirplane; + /// + /// Конструктор + /// + public FormMapWithSetAirplanes() + { + _generatorAirplane = new(100, 100); + InitializeComponent(); + } + /// + /// Добавление самолета на карту + /// + /// самолет. + private void AddAirplaneInMap(DrawningObjectAirplane airplane) + { + if (airplane == null || (_mapAirplanesCollectionGeneric + airplane) == -1) + { + MessageBox.Show("Не удалось добавить объект"); + } + else + { + MessageBox.Show("Объект добавлен"); + pictureBox.Image = _mapAirplanesCollectionGeneric.ShowSet(); + } + } + /// + /// Выбор карты + /// + /// + /// + private void ComboBoxSelectorMap_SelectedIndexChanged(object sender, EventArgs e) + { + AbstractMap map = null; + switch (comboBoxSelectorMap.Text) + { + case "Простая карта": + map = new SimpleMap(); + break; + case "Моя карта": + map = new MyMap(); + break; + } + if (map != null) + { + _mapAirplanesCollectionGeneric = new MapWithSetAirplanesGeneric(pictureBox.Width, pictureBox.Height, map); + } + else + { + _mapAirplanesCollectionGeneric = null; + } + } + /// + /// Перемещение + /// + /// + /// + 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; + } + pictureBox.Image = _mapAirplanesCollectionGeneric?.MoveObject(dir) ?? pictureBox.Image; + } + /// + /// Добавления сущности в генератор + /// + /// + /// + private void ButtonAddTypeOfEntity_Click(object sender, EventArgs e) + { + Random rnd = new(); + Color colorBody = Color.FromArgb(rnd.Next() % 256, rnd.Next() % 256, rnd.Next() % 256); + ColorDialog dialog = new(); + if (dialog.ShowDialog() == DialogResult.OK) + { + colorBody = dialog.Color; + } + var entity = new EntityAirplane((int)numericSpeed.Value, (int)numericWeight.Value, colorBody); + _generatorAirplane.AddTypeOfEntity(entity); + MessageBox.Show($"Добавлены свойства самолета:\n" + + $"Вес: {entity.Weight}\n" + + $"Скорость: {entity.Speed}\n" + + $"Цвет: {colorBody.Name}", + "Успешно добавлены свойства"); + } + /// + /// Добавления типа иллюминаторов и их колличетсва в генератор + /// + /// + /// + private void ButtonAddTypeOfPortholes_Click(object sender, EventArgs e) + { + IAirplanePortholes typeAirplanePortholes = new DrawningAirplanePortholes(); + switch (comboTypePortholes.Text) + { + case "Треугольные": + typeAirplanePortholes = new DrawningDeltaPortholes(); + break; + case "Ромбовидные": + typeAirplanePortholes = new DrawningRhombusPortholes(); + break; + } + typeAirplanePortholes.CountPortholes = Convert.ToInt32(comboBoxPortholes.Text); + _generatorAirplane.AddTypeOfPortholes(typeAirplanePortholes); + } + /// + /// Генерация самолета + /// + /// + /// + private void ButtonGenerateAirplane_Click(object sender, EventArgs e) + { + if (_mapAirplanesCollectionGeneric == null) + { + return; + } + var airplane = _generatorAirplane.Generate(); + if (airplane == null) + { + MessageBox.Show("Не удалось сгенерировать самолет. Добавьте свойства для генерации" + , "Генерация самолета"); + return; + } + AddAirplaneInMap(airplane); + + } + /// + /// Добавление объекта + /// + /// + /// + private void ButtonAddAirplane_Click(object sender, EventArgs e) + { + if (_mapAirplanesCollectionGeneric == null) + { + return; + } + FormAirplane form = new(); + if (form.ShowDialog() == DialogResult.OK && form.SelectedAirplane != null) + { + AddAirplaneInMap(new(form.SelectedAirplane)); + } + } + /// + /// Удаление объекта + /// + /// + /// + private void ButtonRemoveAirplane_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 (_mapAirplanesCollectionGeneric - pos != null) + { + MessageBox.Show("Объект удален"); + pictureBox.Image = _mapAirplanesCollectionGeneric.ShowSet(); + } + else + { + MessageBox.Show("Не удалось удалить объект"); + } + } + /// + /// Вывод набора + /// + /// + /// + private void ButtonShowStorage_Click(object sender, EventArgs e) + { + if (_mapAirplanesCollectionGeneric == null) + { + return; + } + pictureBox.Image = _mapAirplanesCollectionGeneric.ShowSet(); + } + /// + /// Вывод карты + /// + /// + /// + private void ButtonShowOnMap_Click(object sender, EventArgs e) + { + if (_mapAirplanesCollectionGeneric == null) + { + return; + } + pictureBox.Image = _mapAirplanesCollectionGeneric.ShowOnMap(); + } + } +} diff --git a/AirplaneWithRadar/AirplaneWithRadar/FormMap.resx b/AirplaneWithRadar/AirplaneWithRadar/FormMapWithSetAirplanes.resx similarity index 93% rename from AirplaneWithRadar/AirplaneWithRadar/FormMap.resx rename to AirplaneWithRadar/AirplaneWithRadar/FormMapWithSetAirplanes.resx index 5cb320f..f298a7b 100644 --- a/AirplaneWithRadar/AirplaneWithRadar/FormMap.resx +++ b/AirplaneWithRadar/AirplaneWithRadar/FormMapWithSetAirplanes.resx @@ -57,7 +57,4 @@ 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/GeneratorAirplane.cs b/AirplaneWithRadar/AirplaneWithRadar/GeneratorAirplane.cs new file mode 100644 index 0000000..ef8a4c2 --- /dev/null +++ b/AirplaneWithRadar/AirplaneWithRadar/GeneratorAirplane.cs @@ -0,0 +1,73 @@ +using AirplaneWithRadar; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AirBomber +{ + /// + /// Класс, который генирирует самолет из разнообразного количества сущностей и типа иллюминаторов + /// + /// Класс Сущность самолет + /// Класс иллюминатора самолета + internal class GeneratorAirplane + where T : EntityAirplane + where U : class, IAirplanePortholes + { + private readonly T[] typesOfEntity; + private readonly U[] typesOfPortholes; + + public int NumTypesOfEntity { get; private set; } + public int NumTypesOfPortholes { get; private set; } + + public GeneratorAirplane(int countTypesOfEntity, int countTypesOfPortholes) + { + typesOfEntity = new T[countTypesOfEntity]; + typesOfPortholes = new U[countTypesOfPortholes]; + } + /// + /// Добавляет возможный тип сущности при генерации самолета + /// + /// тип + /// Успешно ли проведена операция + public virtual bool AddTypeOfEntity(T type) + { + if (NumTypesOfEntity >= typesOfEntity.Length) + { + return false; + } + typesOfEntity[NumTypesOfEntity++] = type; + return true; + } + /// + /// Добавляет возможный тип иллюминатора при генерации самолета + /// + /// тип + /// Успешно ли проведена операция + public virtual bool AddTypeOfPortholes(U type) + { + if (NumTypesOfPortholes >= typesOfPortholes.Length) + { + return false; + } + typesOfPortholes[NumTypesOfPortholes++] = type; + return true; + } + /// + /// Генерирует объект отрисовки + /// + /// Возвращает объект отрисовки, либо null, если не были добавлены типы для выборки + public DrawningObjectAirplane? Generate() + { + if (NumTypesOfPortholes == 0 || NumTypesOfEntity == 0) + { + return null; + } + var rnd = new Random(); + var airplane = new DrawningAirplane(typesOfEntity[rnd.Next() % NumTypesOfEntity], typesOfPortholes[rnd.Next() % NumTypesOfPortholes]); + return new DrawningObjectAirplane(airplane); + } + } +} diff --git a/AirplaneWithRadar/AirplaneWithRadar/IAirplanePortholes.cs b/AirplaneWithRadar/AirplaneWithRadar/IAirplanePortholes.cs index d41a5d3..daf12af 100644 --- a/AirplaneWithRadar/AirplaneWithRadar/IAirplanePortholes.cs +++ b/AirplaneWithRadar/AirplaneWithRadar/IAirplanePortholes.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; namespace AirplaneWithRadar { - internal interface IAirplanePortholes + public interface IAirplanePortholes { int CountPortholes { set; } public void DrawPortholes(Graphics g, int _startPosX, int _startPosY, int _airplaneWidth); diff --git a/AirplaneWithRadar/AirplaneWithRadar/MapWithSetAirplanesGeneric.cs b/AirplaneWithRadar/AirplaneWithRadar/MapWithSetAirplanesGeneric.cs new file mode 100644 index 0000000..465905e --- /dev/null +++ b/AirplaneWithRadar/AirplaneWithRadar/MapWithSetAirplanesGeneric.cs @@ -0,0 +1,178 @@ +namespace AirplaneWithRadar +{ + /// + /// Карта с набром объектов под нее + /// + /// + /// + internal class MapWithSetAirplanesGeneric + where T : class, IDrawningObject + where U : AbstractMap + { + /// + /// Ширина окна отрисовки + /// + private readonly int _pictureWidth; + /// + /// Высота окна отрисовки + /// + private readonly int _pictureHeight; + /// + /// Размер занимаемого объектом места (ширина) + /// + private readonly int _placeSizeWidth = 210; + /// + /// Размер занимаемого объектом места (высота) + /// + private readonly int _placeSizeHeight = 90; + /// + /// Набор объектов + /// + private readonly SetAirplanesGeneric _setAirplanes; + /// + /// Карта + /// + private readonly U _map; + /// + /// Конструктор + /// + /// + /// + /// + public MapWithSetAirplanesGeneric(int picWidth, int picHeight, U map) + { + int width = picWidth / _placeSizeWidth; + int height = picHeight / _placeSizeHeight; + _setAirplanes = new SetAirplanesGeneric(width * height); + _pictureWidth = picWidth; + _pictureHeight = picHeight; + _map = map; + } + /// + /// Перегрузка оператора сложения + /// + /// + /// + /// + public static int operator +(MapWithSetAirplanesGeneric map, T airplane) + { + return map._setAirplanes.Insert(airplane); + } + /// + /// Перегрузка оператора вычитания + /// + /// + /// + /// + public static T operator -(MapWithSetAirplanesGeneric map, int position) + { + return map._setAirplanes.Remove(position); + } + /// + /// Вывод всего набора объектов + /// + /// + public Bitmap ShowSet() + { + Bitmap bmp = new(_pictureWidth, _pictureHeight); + Graphics gr = Graphics.FromImage(bmp); + DrawBackground(gr); + DrawAirplanes(gr); + return bmp; + } + /// + /// Просмотр объекта на карте + /// + /// + public Bitmap ShowOnMap() + { + Shaking(); + for (int i = 0; i < _setAirplanes.Count; i++) + { + var airplane = _setAirplanes.Get(i); + if (airplane != null) + { + return _map.CreateMap(_pictureWidth, _pictureHeight, airplane); + } + } + return new(_pictureWidth, _pictureHeight); + } + /// + /// Перемещение объекта по крате + /// + /// + /// + public Bitmap MoveObject(Direction direction) + { + if (_map != null) + { + return _map.MoveObject(direction); + } + return new(_pictureWidth, _pictureHeight); + } + /// + /// "Взбалтываем" набор, чтобы все элементы оказались в начале + /// + private void Shaking() + { + int j = _setAirplanes.Count - 1; + for (int i = 0; i < _setAirplanes.Count; i++) + { + if (_setAirplanes.Get(i) == null) + { + for (; j > i; j--) + { + var airplane = _setAirplanes.Get(j); + if (airplane != null) + { + _setAirplanes.Insert(airplane, i); + _setAirplanes.Remove(j); + break; + } + } + if (j <= i) + { + return; + } + } + } + } + private void DrawHangar(Graphics g, int x, int y, int width, int height) + { + Pen pen = new(Color.Black, 3); + g.DrawLine(pen, x, y, x + width, y); + g.DrawLine(pen, x, y, x, y + height); + g.DrawLine(pen, x, y + height, x + width, y + height); + } + /// + /// Метод отрисовки фона + /// + /// + private void DrawBackground(Graphics g) + { + Pen pen = new(Color.Black, 3); + for (int i = 0; i < _pictureWidth / _placeSizeWidth; i++) + { + for (int j = 0; j < _pictureHeight / _placeSizeHeight + 1; ++j) + { + DrawHangar(g, i * _placeSizeWidth, j * _placeSizeHeight, _placeSizeWidth * 3 / 4, _placeSizeHeight - 55); + } + } + } + /// + /// Метод прорисовки объектов + /// + /// + private void DrawAirplanes(Graphics g) + { + int countInLine = _pictureWidth / _placeSizeWidth; + int maxLeft = (countInLine - 1) * _placeSizeWidth; + for (int i = 0; i < _setAirplanes.Count; i++) + { + var airplane = _setAirplanes.Get(i); + airplane?.SetObject(maxLeft - i % countInLine * _placeSizeWidth + 5, i / countInLine * _placeSizeHeight + 15, _pictureWidth, _pictureHeight); + airplane?.DrawningObject(g); + } + } + } +} \ No newline at end of file diff --git a/AirplaneWithRadar/AirplaneWithRadar/Program.cs b/AirplaneWithRadar/AirplaneWithRadar/Program.cs index f8a0be0..f9ad494 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 FormMapWithSetAirplanes()); } } } \ No newline at end of file diff --git a/AirplaneWithRadar/AirplaneWithRadar/SetAirplanesGeneric.cs b/AirplaneWithRadar/AirplaneWithRadar/SetAirplanesGeneric.cs new file mode 100644 index 0000000..7a3b185 --- /dev/null +++ b/AirplaneWithRadar/AirplaneWithRadar/SetAirplanesGeneric.cs @@ -0,0 +1,87 @@ +namespace AirplaneWithRadar +{ + /// + /// Параметризованный набор объектов + /// + /// + internal class SetAirplanesGeneric + where T : class + { + /// + /// Массив объектов, которые храним + /// + private readonly T[] _places; + /// + /// Количество объектов в массиве + /// + public int Count => _places.Length; + /// + /// Конструктор + /// + /// + public SetAirplanesGeneric(int count) + { + _places = new T[count]; + } + /// + /// Добавление объекта в набор + /// + /// Добавляемый самолёт + /// + public int Insert(T airplane) + { + return Insert(airplane, 0); + } + private bool isCorrectPosition(int position) + { + return 0 <= position && position < Count; + } + /// + /// Добавление объекта в набор на конкретную позицию + /// + /// Добавляемый самолет + /// Позиция + /// + public int Insert(T airplane, int position) + { + int positionNullElement = position; + while (Get(positionNullElement) != null) + { + positionNullElement++; + } + if (!isCorrectPosition(positionNullElement)) + { + return -1; + } + while (positionNullElement != position) // Смещение вправо + { + _places[positionNullElement] = _places[positionNullElement - 1]; + positionNullElement--; + } + _places[position] = airplane; + return position; + } + /// + /// Удаление объекта из набора с конкретной позиции + /// + /// + /// + public T Remove(int position) + { + if (!isCorrectPosition(position)) return null; + var result = _places[position]; + _places[position] = null; + return result; + } + /// + /// Получение объекта из набора по позиции + /// + /// + /// + public T Get(int position) + { + if (isCorrectPosition(position)) { return _places[position]; } + else { return null; } + } + } +}