diff --git a/Airbus/Airbus/CountPorthole.cs b/Airbus/Airbus/CountPorthole.cs index a64a5cb..4060b0f 100644 --- a/Airbus/Airbus/CountPorthole.cs +++ b/Airbus/Airbus/CountPorthole.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; namespace Airbus { - internal enum CountPorthole + public enum CountPorthole { None = 0, Ten = 10, diff --git a/Airbus/Airbus/Direction.cs b/Airbus/Airbus/Direction.cs index 6079158..3caf4fb 100644 --- a/Airbus/Airbus/Direction.cs +++ b/Airbus/Airbus/Direction.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; namespace Airbus { - internal enum Direction + public enum Direction { None = 0, Left = 1, //Влево diff --git a/Airbus/Airbus/DrawingAirplane.cs b/Airbus/Airbus/DrawingAirplane.cs index efe2fe7..8f82aa9 100644 --- a/Airbus/Airbus/DrawingAirplane.cs +++ b/Airbus/Airbus/DrawingAirplane.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; namespace Airbus { - internal class DrawningAirplane + public class DrawningAirplane { /// Класс-сущность public EntityAirplane airplane { protected set; get; } diff --git a/Airbus/Airbus/DrawingRhombPorthole.cs b/Airbus/Airbus/DrawingRhombPorthole.cs index 2d3ddbf..3c1d5f1 100644 --- a/Airbus/Airbus/DrawingRhombPorthole.cs +++ b/Airbus/Airbus/DrawingRhombPorthole.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; namespace Airbus { - internal class DrawingRhombPorthole : DrawningPorthole + public class DrawingRhombPorthole : DrawningPorthole { protected override void DrawPorthole(Graphics g, Color color, float posX, float posY) { diff --git a/Airbus/Airbus/DrawingSquarePorthole.cs b/Airbus/Airbus/DrawingSquarePorthole.cs index f04179f..399057e 100644 --- a/Airbus/Airbus/DrawingSquarePorthole.cs +++ b/Airbus/Airbus/DrawingSquarePorthole.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; namespace Airbus { - internal class DrawingSquarePorthole : DrawningPorthole + public class DrawingSquarePorthole : DrawningPorthole { protected override void DrawPorthole(Graphics g, Color color, float posX, float posY) { diff --git a/Airbus/Airbus/DrawningPorthole.cs b/Airbus/Airbus/DrawningPorthole.cs index faafef4..b037736 100644 --- a/Airbus/Airbus/DrawningPorthole.cs +++ b/Airbus/Airbus/DrawningPorthole.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; namespace Airbus { - internal class DrawningPorthole : IPorthole + public class DrawningPorthole : IPorthole { private CountPorthole _countpornhole; public int CountPorthole diff --git a/Airbus/Airbus/EntityAirplane.cs b/Airbus/Airbus/EntityAirplane.cs index 7b1cf93..30e4f41 100644 --- a/Airbus/Airbus/EntityAirplane.cs +++ b/Airbus/Airbus/EntityAirplane.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; namespace Airbus { - internal class EntityAirplane + public class EntityAirplane { public int Speed { get; private set; } //Скорость public float Weight { get; private set; } //Вес diff --git a/Airbus/Airbus/FormAirplane.Designer.cs b/Airbus/Airbus/FormAirplane.Designer.cs index 74ebcfa..4ed5ddf 100644 --- a/Airbus/Airbus/FormAirplane.Designer.cs +++ b/Airbus/Airbus/FormAirplane.Designer.cs @@ -38,6 +38,8 @@ this.buttonDown = new System.Windows.Forms.Button(); this.comboBoxPortholeSer = new System.Windows.Forms.ComboBox(); this.buttonModCreate = new System.Windows.Forms.Button(); + this.buttonSelectAirplane = new System.Windows.Forms.Button(); + this.comboBoxFormPorthole = new System.Windows.Forms.ComboBox(); this.statusStrip1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).BeginInit(); this.SuspendLayout(); @@ -166,11 +168,35 @@ this.buttonModCreate.UseVisualStyleBackColor = true; this.buttonModCreate.Click += new System.EventHandler(this.buttonModCreate_Click); // + // buttonSelectAirplane + // + this.buttonSelectAirplane.Location = new System.Drawing.Point(162, 402); + this.buttonSelectAirplane.Name = "buttonSelectAirplane"; + this.buttonSelectAirplane.Size = new System.Drawing.Size(75, 23); + this.buttonSelectAirplane.TabIndex = 8; + this.buttonSelectAirplane.Text = "Выбрать"; + this.buttonSelectAirplane.UseVisualStyleBackColor = true; + this.buttonSelectAirplane.Click += new System.EventHandler(this.buttonSelectAirplane_Click); + // + // comboBoxFormPorthole + // + this.comboBoxFormPorthole.FormattingEnabled = true; + this.comboBoxFormPorthole.Items.AddRange(new object[] { + "Обычные", + "Крадратные", + "Ромбом"}); + this.comboBoxFormPorthole.Location = new System.Drawing.Point(14, 41); + this.comboBoxFormPorthole.Name = "comboBoxFormPorthole"; + this.comboBoxFormPorthole.Size = new System.Drawing.Size(121, 23); + this.comboBoxFormPorthole.TabIndex = 11; + // // 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.comboBoxFormPorthole); + this.Controls.Add(this.buttonSelectAirplane); this.Controls.Add(this.buttonModCreate); this.Controls.Add(this.buttonDown); this.Controls.Add(this.buttonLeft); @@ -202,5 +228,7 @@ private Button buttonDown; private Button buttonModCreate; private ComboBox comboBoxPortholeSer; + private Button buttonSelectAirplane; + private ComboBox comboBoxFormPorthole; } } diff --git a/Airbus/Airbus/FormAirplane.cs b/Airbus/Airbus/FormAirplane.cs index 2ed6bb6..3aa8b2c 100644 --- a/Airbus/Airbus/FormAirplane.cs +++ b/Airbus/Airbus/FormAirplane.cs @@ -14,6 +14,7 @@ namespace Airbus public partial class FormAirplane : Form { private DrawningAirplane airplane; + public DrawningAirplane SelectedAirplane { get; private set; } public FormAirplane() { @@ -38,10 +39,43 @@ namespace Airbus } private void buttonCreate_Click(object sender, EventArgs e) { + IPorthole formPorthole = new DrawningPorthole(); + switch (comboBoxFormPorthole.Text) + { + case "Обычные": + formPorthole = new DrawningPorthole(); + break; + case "Крадратные": + formPorthole = new DrawingSquarePorthole(); - Random random = new Random(); - airplane = new DrawningAirplane(random.Next(100, 300), random.Next(1000, 3000), Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)), new DrawningPorthole()); + break; + case "Ромбом": + formPorthole = new DrawingRhombPorthole(); + break; + } + Random rnd = new(); + 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; + } + airplane = new DrawningAirplane(rnd.Next(100, 300), rnd.Next(1000, 2000), color, formPorthole); + CountPorthole count_porthole = CountPorthole.Ten; + switch (comboBoxPortholeSer.Text) + { + case "10": + count_porthole = CountPorthole.Ten; + break; + case "20": + count_porthole = CountPorthole.Twenty; + break; + case "30": + count_porthole = CountPorthole.Thirty; + break; + } + airplane.Upd_count_Porthole(count_porthole); SetData(); Draw(); } @@ -97,13 +131,59 @@ namespace Airbus } private void buttonModCreate_Click(object sender, EventArgs e) { - Random random = new Random(); - airplane = new DrawingAirbus(random.Next(100, 300), random.Next(1000, 3000), - Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)), - Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)), - true, true, new DrawningPorthole()); + IPorthole formPorthole = new DrawningPorthole(); + switch (comboBoxFormPorthole.Text) + { + case "Обычные": + formPorthole = new DrawningPorthole(); + break; + case "Крадратные": + formPorthole = new DrawingSquarePorthole(); + + break; + case "Ромбом": + formPorthole = new DrawingRhombPorthole(); + break; + } + Random rnd = new(); + 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; + } + airplane = new DrawingAirbus(rnd.Next(100, 300), rnd.Next(1000, 2000), color, dopColor, + Convert.ToBoolean(rnd.Next(0, 2)), Convert.ToBoolean(rnd.Next(0, 2)), formPorthole); + + CountPorthole count_porthole = CountPorthole.Ten; + switch (comboBoxPortholeSer.Text) + { + case "10": + count_porthole = CountPorthole.Ten; + break; + case "20": + count_porthole = CountPorthole.Twenty; + break; + case "30": + count_porthole = CountPorthole.Thirty; + break; + + } + airplane.Upd_count_Porthole(count_porthole); SetData(); Draw(); } + + private void buttonSelectAirplane_Click(object sender, EventArgs e) + { + SelectedAirplane = airplane; + DialogResult = DialogResult.OK; + } } } diff --git a/Airbus/Airbus/FormMapWithSetAirplane.Designer.cs b/Airbus/Airbus/FormMapWithSetAirplane.Designer.cs new file mode 100644 index 0000000..1f4e4c8 --- /dev/null +++ b/Airbus/Airbus/FormMapWithSetAirplane.Designer.cs @@ -0,0 +1,214 @@ +namespace Airbus +{ + partial class FormMapWithSetAirplane + { + /// + /// 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.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.buttonStorage = new System.Windows.Forms.Button(); + this.buttonRemoveAirplane = new System.Windows.Forms.Button(); + this.maskedTextBoxPosition = new System.Windows.Forms.MaskedTextBox(); + this.buttonAddAirplane = 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.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.buttonStorage); + this.groupBoxTools.Controls.Add(this.buttonRemoveAirplane); + this.groupBoxTools.Controls.Add(this.maskedTextBoxPosition); + this.groupBoxTools.Controls.Add(this.buttonAddAirplane); + this.groupBoxTools.Controls.Add(this.comboBoxSelectorMap); + this.groupBoxTools.Dock = System.Windows.Forms.DockStyle.Right; + this.groupBoxTools.Location = new System.Drawing.Point(600, 0); + this.groupBoxTools.Name = "groupBoxTools"; + this.groupBoxTools.Size = new System.Drawing.Size(200, 450); + this.groupBoxTools.TabIndex = 0; + this.groupBoxTools.TabStop = false; + this.groupBoxTools.Text = "Инструменты"; + // + // buttonDown + // + this.buttonDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.buttonDown.BackgroundImage = global::Airbus.Properties.Resources.v4; + this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.buttonDown.Location = new System.Drawing.Point(80, 380); + this.buttonDown.Name = "buttonDown"; + this.buttonDown.Size = new System.Drawing.Size(35, 35); + this.buttonDown.TabIndex = 9; + 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::Airbus.Properties.Resources.v3; + this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.buttonRight.Location = new System.Drawing.Point(112, 348); + this.buttonRight.Name = "buttonRight"; + this.buttonRight.Size = new System.Drawing.Size(35, 35); + this.buttonRight.TabIndex = 8; + 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::Airbus.Properties.Resources.v1; + this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.buttonLeft.Location = new System.Drawing.Point(49, 348); + this.buttonLeft.Name = "buttonLeft"; + this.buttonLeft.Size = new System.Drawing.Size(35, 35); + this.buttonLeft.TabIndex = 7; + 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::Airbus.Properties.Resources.v2; + this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.buttonUp.Location = new System.Drawing.Point(80, 316); + this.buttonUp.Name = "buttonUp"; + this.buttonUp.Size = new System.Drawing.Size(35, 35); + this.buttonUp.TabIndex = 6; + this.buttonUp.UseVisualStyleBackColor = true; + this.buttonUp.Click += new System.EventHandler(this.ButtonMove_Click); + // + // buttonShowOnMap + // + this.buttonShowOnMap.Location = new System.Drawing.Point(62, 268); + this.buttonShowOnMap.Name = "buttonShowOnMap"; + this.buttonShowOnMap.Size = new System.Drawing.Size(75, 23); + this.buttonShowOnMap.TabIndex = 5; + this.buttonShowOnMap.Text = "карта"; + this.buttonShowOnMap.UseVisualStyleBackColor = true; + this.buttonShowOnMap.Click += new System.EventHandler(this.buttonShowOnMap_Click); + // + // buttonStorage + // + this.buttonStorage.Location = new System.Drawing.Point(6, 239); + this.buttonStorage.Name = "buttonStorage"; + this.buttonStorage.Size = new System.Drawing.Size(188, 23); + this.buttonStorage.TabIndex = 4; + this.buttonStorage.Text = "Хранилище"; + this.buttonStorage.UseVisualStyleBackColor = true; + this.buttonStorage.Click += new System.EventHandler(this.buttonStorage_Click); + // + // buttonRemoveAirplane + // + this.buttonRemoveAirplane.Location = new System.Drawing.Point(6, 146); + this.buttonRemoveAirplane.Name = "buttonRemoveAirplane"; + this.buttonRemoveAirplane.Size = new System.Drawing.Size(182, 23); + this.buttonRemoveAirplane.TabIndex = 3; + this.buttonRemoveAirplane.Text = "Удалить"; + this.buttonRemoveAirplane.UseVisualStyleBackColor = true; + this.buttonRemoveAirplane.Click += new System.EventHandler(this.buttonRemoveAirplane_Click); + // + // maskedTextBoxPosition + // + this.maskedTextBoxPosition.Location = new System.Drawing.Point(6, 117); + this.maskedTextBoxPosition.Mask = "00"; + this.maskedTextBoxPosition.Name = "maskedTextBoxPosition"; + this.maskedTextBoxPosition.Size = new System.Drawing.Size(182, 23); + this.maskedTextBoxPosition.TabIndex = 2; + // + // buttonAddAirplane + // + this.buttonAddAirplane.Location = new System.Drawing.Point(6, 74); + this.buttonAddAirplane.Name = "buttonAddAirplane"; + this.buttonAddAirplane.Size = new System.Drawing.Size(182, 23); + this.buttonAddAirplane.TabIndex = 1; + this.buttonAddAirplane.Text = "Добавить Самолёт"; + this.buttonAddAirplane.UseVisualStyleBackColor = true; + this.buttonAddAirplane.Click += new System.EventHandler(this.buttonAddAirplane_Click); + // + // comboBoxSelectorMap + // + this.comboBoxSelectorMap.FormattingEnabled = true; + this.comboBoxSelectorMap.Items.AddRange(new object[] { + "Первая карта", + "Вторая карта", + "Третья карта"}); + this.comboBoxSelectorMap.Location = new System.Drawing.Point(6, 22); + this.comboBoxSelectorMap.Name = "comboBoxSelectorMap"; + this.comboBoxSelectorMap.Size = new System.Drawing.Size(182, 23); + 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(600, 450); + this.pictureBox.TabIndex = 1; + this.pictureBox.TabStop = false; + // + // FormMapWithSetAirplane + // + 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.pictureBox); + this.Controls.Add(this.groupBoxTools); + this.Name = "FormMapWithSetAirplane"; + this.Text = "FormMapWithSetAirplane"; + this.groupBoxTools.ResumeLayout(false); + this.groupBoxTools.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).EndInit(); + this.ResumeLayout(false); + + } + #endregion + private GroupBox groupBoxTools; + private Button buttonShowOnMap; + private Button buttonStorage; + private Button buttonRemoveAirplane; + private MaskedTextBox maskedTextBoxPosition; + private Button buttonAddAirplane; + private ComboBox comboBoxSelectorMap; + private PictureBox pictureBox; + private Button buttonUp; + private Button buttonLeft; + private Button buttonRight; + private Button buttonDown; + } +} \ No newline at end of file diff --git a/Airbus/Airbus/FormMapWithSetAirplane.cs b/Airbus/Airbus/FormMapWithSetAirplane.cs new file mode 100644 index 0000000..684a45f --- /dev/null +++ b/Airbus/Airbus/FormMapWithSetAirplane.cs @@ -0,0 +1,169 @@ +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 static System.Windows.Forms.DataFormats; + +namespace Airbus +{ + public partial class FormMapWithSetAirplane : Form + { + private AbstractMap _abstractMap; + private MapWithSetAirplaneGeneric _mapAirplanesCollectionGeneric; + /// + /// Конструктор + /// + public FormMapWithSetAirplane() + { + InitializeComponent(); + } + /// + /// Выбор карты + /// + /// + /// + private void ComboBoxSelectorMap_SelectedIndexChanged(object sender, + EventArgs e) + { + AbstractMap map = null; + switch (comboBoxSelectorMap.Text) + { + case "Первая карта": + map = new SimpleMap(); + break; + case "Вторая карта": + map = new SecondMap(); + break; + case "Третья карта": + map = new ThirdMap(); + break; + } + if (map != null) + { + _mapAirplanesCollectionGeneric = new + MapWithSetAirplaneGeneric( + pictureBox.Width, pictureBox.Height, map); + } + else + { + _mapAirplanesCollectionGeneric = null; + } + } + /// + /// Добавление объекта + /// + /// + /// + private void buttonAddAirplane_Click(object sender, EventArgs e) + { + if (_mapAirplanesCollectionGeneric == null) + { + return; + } + FormAirplane form = new(); + if (form.ShowDialog() == DialogResult.OK) + { + DrawningObjectAirplane airplane = new(form.SelectedAirplane); + if (_mapAirplanesCollectionGeneric + airplane > -1) + { + MessageBox.Show("Объект добавлен"); + pictureBox.Image = _mapAirplanesCollectionGeneric.ShowSet(); + } + else + { + MessageBox.Show("Не удалось добавить объект"); + } + } + } + /// + /// Удаление объекта + /// + /// + /// + 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 buttonStorage_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(); + + } + /// + /// Перемещение + /// + /// + /// + private void ButtonMove_Click(object sender, EventArgs e) + { + if (_mapAirplanesCollectionGeneric == 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 = _mapAirplanesCollectionGeneric.MoveObject(dir); + } + } +} diff --git a/Airbus/Airbus/FormMapWithSetAirplane.resx b/Airbus/Airbus/FormMapWithSetAirplane.resx new file mode 100644 index 0000000..f298a7b --- /dev/null +++ b/Airbus/Airbus/FormMapWithSetAirplane.resx @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/Airbus/Airbus/IPorthole.cs b/Airbus/Airbus/IPorthole.cs index b015ce8..3befd72 100644 --- a/Airbus/Airbus/IPorthole.cs +++ b/Airbus/Airbus/IPorthole.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; namespace Airbus { - internal interface IPorthole + public interface IPorthole { int CountPorthole { get; set; } diff --git a/Airbus/Airbus/MapWithSetAirplaneGeneric.cs b/Airbus/Airbus/MapWithSetAirplaneGeneric.cs new file mode 100644 index 0000000..00565b8 --- /dev/null +++ b/Airbus/Airbus/MapWithSetAirplaneGeneric.cs @@ -0,0 +1,185 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Airbus +{ + internal class MapWithSetAirplaneGeneric + where T : class, IDrawningObject + where U : AbstractMap + { + /// + /// Ширина окна отрисовки + /// + private readonly int _pictureWidth; + /// + /// Высота окна отрисовки + /// + private readonly int _pictureHeight; + /// + /// Размер занимаемого объектом места (ширина) + /// + private readonly int _placeSizeWidth = 300; + /// + /// Размер занимаемого объектом места (высота) + /// + private readonly int _placeSizeHeight = 70; + /// + /// Набор объектов + /// + private readonly SetAirplaneGeneric _setAirplane; + /// + /// Карта + /// + private readonly U _map; + /// + /// Конструктор + /// + /// + /// + /// + public MapWithSetAirplaneGeneric(int picWidth, int picHeight, U map) + { + int width = picWidth / _placeSizeWidth; + int height = picHeight / _placeSizeHeight; + _setAirplane = new SetAirplaneGeneric(width * height); + _pictureWidth = picWidth; + _pictureHeight = picHeight; + _map = map; + } + /// + /// Перегрузка оператора сложения + /// + /// + /// + /// + public static int operator +(MapWithSetAirplaneGeneric map, T airplane) + { + return map._setAirplane.Insert(airplane); + } + /// + /// Перегрузка оператора вычитания + /// + /// + /// + /// + public static T operator -(MapWithSetAirplaneGeneric map, int + position) + { + return map._setAirplane.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 < _setAirplane.Count; i++) + { + var airplane = _setAirplane.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 = _setAirplane.Count - 1; + for (int i = 0; i < _setAirplane.Count; i++) + { + if (_setAirplane.Get(i) == null) + { + for (; j > i; j--) + { + var airplane = _setAirplane.Get(j); + if (airplane != null) + { + _setAirplane.Insert(airplane, i); + _setAirplane.Remove(j); + break; + } + } + if (j <= i) + { + return; + } + } + } + } + /// + /// Метод отрисовки фона + /// + /// + private void DrawBackground(Graphics g) + { + Pen pen = new(Color.Black, 3); + for (int i = 0; i < _pictureWidth / _placeSizeWidth; i++) + { + for (int j = 1; j < _pictureHeight / _placeSizeHeight + 1; ++j) + { + pen = new(Color.Black, 3); + g.DrawLine(pen, i * _placeSizeWidth, j * _placeSizeHeight, i * _placeSizeWidth + _placeSizeWidth / 2, j * _placeSizeHeight); + g.DrawLine(pen, i * _placeSizeWidth + _placeSizeWidth / 2 + 15, j * _placeSizeHeight, i * _placeSizeWidth + _placeSizeWidth / 2 + 20, j * _placeSizeHeight - 30); + g.DrawLine(pen, i * _placeSizeWidth + _placeSizeWidth / 2 + 20, j * _placeSizeHeight - 30, i * _placeSizeWidth + _placeSizeWidth / 2 + 30, j * _placeSizeHeight - 30); + g.DrawLine(pen, i * _placeSizeWidth + _placeSizeWidth / 2 + 30, j * _placeSizeHeight - 30, i * _placeSizeWidth + _placeSizeWidth / 2 + 35, j * _placeSizeHeight ); + + g.DrawLine(pen, i * _placeSizeWidth + _placeSizeWidth / 2 + 15, j * _placeSizeHeight - 45, i * _placeSizeWidth + _placeSizeWidth / 2 + 35, j * _placeSizeHeight - 45); + pen = new(Color.Blue, 1); + g.DrawLine(pen, i * _placeSizeWidth + _placeSizeWidth / 2 + 30, j * _placeSizeHeight - 30, i * _placeSizeWidth + _placeSizeWidth / 2 + 45, j * _placeSizeHeight - 40); + g.DrawLine(pen, i * _placeSizeWidth + _placeSizeWidth / 2 + 45, j * _placeSizeHeight - 40, i * _placeSizeWidth + _placeSizeWidth / 2 + 35, j * _placeSizeHeight - 45); + + g.DrawLine(pen, i * _placeSizeWidth + _placeSizeWidth / 2 + 20, j * _placeSizeHeight - 30, i * _placeSizeWidth + _placeSizeWidth / 2 + 5, j * _placeSizeHeight - 40); + g.DrawLine(pen, i * _placeSizeWidth + _placeSizeWidth / 2 + 5, j * _placeSizeHeight - 40, i * _placeSizeWidth + _placeSizeWidth / 2 + 15, j * _placeSizeHeight - 45); + } + + } + } + /// + /// Метод прорисовки объектов + /// + /// + private void DrawAirplanes(Graphics g) + { + int countInLine = _pictureWidth / _placeSizeWidth; + int maxLeft = (countInLine - 1) * _placeSizeWidth; + for (int i = 0; i < _setAirplane.Count; i++) + { + _setAirplane.Get(i)?.SetObject(maxLeft - i % countInLine * _placeSizeWidth, (_pictureHeight - (i / 2 * _placeSizeHeight + _placeSizeHeight + 30)), _pictureWidth, _placeSizeHeight); + _setAirplane.Get(i)?.DrawningObject(g); + } + } + } + } diff --git a/Airbus/Airbus/Program.cs b/Airbus/Airbus/Program.cs index 3c7e1fb..9ffd8e1 100644 --- a/Airbus/Airbus/Program.cs +++ b/Airbus/Airbus/Program.cs @@ -11,7 +11,7 @@ namespace Airbus // 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 FormMapWithSetAirplane()); } } } \ No newline at end of file diff --git a/Airbus/Airbus/SetAirplaneGeneric.cs b/Airbus/Airbus/SetAirplaneGeneric.cs new file mode 100644 index 0000000..2fe2e02 --- /dev/null +++ b/Airbus/Airbus/SetAirplaneGeneric.cs @@ -0,0 +1,79 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Airbus +{ + internal class SetAirplaneGeneric + where T : class + { + private readonly T[] _places; + public int Count => _places.Length; + public SetAirplaneGeneric(int count) + { + _places = new T[count]; + } + + /// + /// Добавление объекта в набор на конкретную позицию + /// + /// Добавляемый автомобиль + /// Позиция + /// + private bool CanInsert(int position) + { + for (int i = position; i < _places.Length; i++) + if (_places[i] == null) + return true; + return false; + } + + public int Insert(T airplane) + { + return Insert(airplane, 0); + } + + public int Insert(T airplane, int position) + { + if (position < 0 || position > _places.Length) return 0; + if (_places[position] != null && CanInsert(position)) + { + for (int i = _places.Length - 1; i > position; --i) + { + if (_places[i] == null) + { + _places[i] = _places[i - 1]; + _places[i - 1] = null; + } + } + } + _places[position] = airplane; + return position; + } + /// + /// Удаление объекта из набора с конкретной позиции + /// + /// + /// + public T Remove(int position) + { + if (0 > position && position >= Count) + return null; + T delobj = _places[position]; + _places[position] = null; + return delobj; + } + /// + /// Получение объекта из набора по позиции + /// + /// + /// + public T Get(int position) + { + if (position < 0 || position > _places.Length) return null; + return _places[position]; + } + } +}