From e87456943d53fc317f0caca1407d330c250ad315 Mon Sep 17 00:00:00 2001 From: "d.agil" Date: Wed, 19 Oct 2022 10:30:36 +0400 Subject: [PATCH 1/4] generic classes --- .../AirBomber/MapWithSetAirBomberGeneric.cs | 119 ++++++++++++++++++ AirBomber/AirBomber/SetAirBomberGeneric.cs | 42 +++++++ 2 files changed, 161 insertions(+) create mode 100644 AirBomber/AirBomber/MapWithSetAirBomberGeneric.cs create mode 100644 AirBomber/AirBomber/SetAirBomberGeneric.cs diff --git a/AirBomber/AirBomber/MapWithSetAirBomberGeneric.cs b/AirBomber/AirBomber/MapWithSetAirBomberGeneric.cs new file mode 100644 index 0000000..f18f006 --- /dev/null +++ b/AirBomber/AirBomber/MapWithSetAirBomberGeneric.cs @@ -0,0 +1,119 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AirBomber +{ + internal class MapWithSetAirBomberGeneric + 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 SetAirBomberGeneric _setAirBomber; + private readonly U _map; + + public MapWithSetAirBomberGeneric(int picWidth, int picHeight, U map) + { + int width = picWidth / _placeSizeWidth; + int height = picHeight / _placeSizeHeight; + _setAirBomber = new SetAirBomberGeneric(width * height); + _pictureWidth = picWidth; + _pictureHeight = picHeight; + _map = map; + } + + public static bool operator +(MapWithSetAirBomberGeneric map, T airBomber) + { + return map._setAirBomber.Insert(airBomber); + } + + public static bool operator -(MapWithSetAirBomberGeneric map, int position) + { + return map._setAirBomber.Remove(position); + } + + public Bitmap ShowSet() + { + Bitmap bmp = new(_pictureWidth, _pictureHeight); + Graphics gr = Graphics.FromImage(bmp); + DrawBackground(gr); + DrawCars(gr); + return bmp; + } + + public Bitmap ShowOnMap() + { + Shaking(); + for (int i = 0; i < _setAirBomber.Count; i++) + { + var airBomber = _setAirBomber.Get(i); + if (airBomber != null) + { + return _map.CreateMap(_pictureWidth, _pictureHeight, airBomber); + } + } + 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 = _setAirBomber.Count - 1; + for (int i = 0; i < _setAirBomber.Count; i++) + { + if (_setAirBomber.Get(i) == null) + { + for (; j > i; j--) + { + var airBomber = _setAirBomber.Get(j); + if (airBomber != null) + { + _setAirBomber.Insert(airBomber, i); + _setAirBomber.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 = 0; j < _pictureHeight / _placeSizeHeight; ++j) + { + g.DrawLine(pen, i * _placeSizeWidth, j * _placeSizeHeight, i * _placeSizeWidth + _placeSizeWidth / 2, j * _placeSizeHeight); + } + g.DrawLine(pen, i * _placeSizeWidth, 0, i * _placeSizeWidth, _pictureHeight); + } + } + + private void DrawCars(Graphics g) + { + for (int i = 0; i < _setAirBomber.Count; ++i) + { + _setAirBomber.Get(i)?.DrawningObject(g); + } + } + } +} diff --git a/AirBomber/AirBomber/SetAirBomberGeneric.cs b/AirBomber/AirBomber/SetAirBomberGeneric.cs new file mode 100644 index 0000000..11d1258 --- /dev/null +++ b/AirBomber/AirBomber/SetAirBomberGeneric.cs @@ -0,0 +1,42 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AirBomber +{ + internal class SetAirBomberGeneric + where T : class + { + private readonly T[] _places; + + public int Count => _places.Length; + + public SetAirBomberGeneric(int count) + { + _places = new T[count]; + } + + public bool Insert(T car) + { + return true; + } + + public bool Insert(T car, int position) + { + _places[position] = car; + return true; + } + + public bool Remove(int position) + { + return true; + } + + public T Get(int position) + { + return _places[position]; + } + } +} From c71cf901c818d1b268d908cf75cf8778d2b39fb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D1=80=D1=82=D1=91=D0=BC=20=D0=90=D0=BB=D0=B5=D0=B9?= =?UTF-8?q?=D0=BA=D0=B8=D0=BD?= Date: Sat, 29 Oct 2022 14:46:00 +0400 Subject: [PATCH 2/4] changes forms --- AirBomber/AirBomber/Direction.cs | 2 +- AirBomber/AirBomber/DrawningBomber.cs | 2 +- AirBomber/AirBomber/EntityAirBomber.cs | 2 +- AirBomber/AirBomber/FormAirBomber.Designer.cs | 13 ++ AirBomber/AirBomber/FormAirBomber.cs | 8 + AirBomber/AirBomber/FormMap.Designer.cs | 211 ------------------ AirBomber/AirBomber/FormMap.cs | 88 -------- .../FormMapWithSetAirBomber.Designer.cs | 203 +++++++++++++++++ .../AirBomber/FormMapWithSetAirBomber.cs | 135 +++++++++++ ...mMap.resx => FormMapWithSetAirBomber.resx} | 3 - AirBomber/AirBomber/Program.cs | 2 +- 11 files changed, 363 insertions(+), 306 deletions(-) delete mode 100644 AirBomber/AirBomber/FormMap.Designer.cs delete mode 100644 AirBomber/AirBomber/FormMap.cs create mode 100644 AirBomber/AirBomber/FormMapWithSetAirBomber.Designer.cs create mode 100644 AirBomber/AirBomber/FormMapWithSetAirBomber.cs rename AirBomber/AirBomber/{FormMap.resx => FormMapWithSetAirBomber.resx} (93%) diff --git a/AirBomber/AirBomber/Direction.cs b/AirBomber/AirBomber/Direction.cs index 5f01285..9731062 100644 --- a/AirBomber/AirBomber/Direction.cs +++ b/AirBomber/AirBomber/Direction.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; namespace AirBomber { - internal enum Direction + public enum Direction { None = 0, Up = 1, diff --git a/AirBomber/AirBomber/DrawningBomber.cs b/AirBomber/AirBomber/DrawningBomber.cs index dcb4edf..8393fc7 100644 --- a/AirBomber/AirBomber/DrawningBomber.cs +++ b/AirBomber/AirBomber/DrawningBomber.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; namespace AirBomber { - internal class DrawningBomber + public class DrawningBomber { public EntityAirBomber AirBomber { protected set; get; } protected float _startPosX; diff --git a/AirBomber/AirBomber/EntityAirBomber.cs b/AirBomber/AirBomber/EntityAirBomber.cs index 8c5f25d..c778c91 100644 --- a/AirBomber/AirBomber/EntityAirBomber.cs +++ b/AirBomber/AirBomber/EntityAirBomber.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; namespace AirBomber { - internal class EntityAirBomber + public class EntityAirBomber { public int Speed { get; private set; } public float Weight { get; private set; } diff --git a/AirBomber/AirBomber/FormAirBomber.Designer.cs b/AirBomber/AirBomber/FormAirBomber.Designer.cs index 47ac65b..5df5a91 100644 --- a/AirBomber/AirBomber/FormAirBomber.Designer.cs +++ b/AirBomber/AirBomber/FormAirBomber.Designer.cs @@ -39,6 +39,7 @@ this.buttonDown = new System.Windows.Forms.Button(); this.buttonRight = new System.Windows.Forms.Button(); this.buttonCreateModif = new System.Windows.Forms.Button(); + this.buttonSelectAirBomber = new System.Windows.Forms.Button(); ((System.ComponentModel.ISupportInitialize)(this.pictureBoxAirBomber)).BeginInit(); this.statusStrip.SuspendLayout(); this.SuspendLayout(); @@ -153,11 +154,22 @@ this.buttonCreateModif.UseVisualStyleBackColor = true; this.buttonCreateModif.Click += new System.EventHandler(this.ButtonCreateModif_Click); // + // buttonSelectAirBomber + // + this.buttonSelectAirBomber.Location = new System.Drawing.Point(663, 472); + this.buttonSelectAirBomber.Name = "buttonSelectAirBomber"; + this.buttonSelectAirBomber.Size = new System.Drawing.Size(75, 23); + this.buttonSelectAirBomber.TabIndex = 8; + this.buttonSelectAirBomber.Text = "Выбрать"; + this.buttonSelectAirBomber.UseVisualStyleBackColor = true; + this.buttonSelectAirBomber.Click += new System.EventHandler(this.buttonSelectAirBomber_Click); + // // FormAirBomber // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(874, 515); + this.Controls.Add(this.buttonSelectAirBomber); this.Controls.Add(this.buttonCreateModif); this.Controls.Add(this.buttonRight); this.Controls.Add(this.buttonDown); @@ -189,5 +201,6 @@ private Button buttonDown; private Button buttonRight; private Button buttonCreateModif; + private Button buttonSelectAirBomber; } } \ No newline at end of file diff --git a/AirBomber/AirBomber/FormAirBomber.cs b/AirBomber/AirBomber/FormAirBomber.cs index 059297a..5ce80af 100644 --- a/AirBomber/AirBomber/FormAirBomber.cs +++ b/AirBomber/AirBomber/FormAirBomber.cs @@ -5,6 +5,9 @@ namespace AirBomber public partial class FormAirBomber : Form { private DrawningBomber _airBomber; + + public DrawningBomber SelectedAirBomber { get; private set; } + public FormAirBomber() { InitializeComponent(); @@ -73,5 +76,10 @@ namespace AirBomber Draw(); } + private void buttonSelectAirBomber_Click(object sender, EventArgs e) + { + SelectedAirBomber = _airBomber; + DialogResult = DialogResult.OK; + } } } \ No newline at end of file diff --git a/AirBomber/AirBomber/FormMap.Designer.cs b/AirBomber/AirBomber/FormMap.Designer.cs deleted file mode 100644 index 99527c8..0000000 --- a/AirBomber/AirBomber/FormMap.Designer.cs +++ /dev/null @@ -1,211 +0,0 @@ -namespace AirBomber -{ - 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.pictureBoxAirBomber = 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.toolStripStatusLabelBodyColor = new System.Windows.Forms.ToolStripStatusLabel(); - 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(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBoxAirBomber)).BeginInit(); - this.statusStrip.SuspendLayout(); - this.SuspendLayout(); - // - // pictureBoxAirBomber - // - this.pictureBoxAirBomber.Dock = System.Windows.Forms.DockStyle.Fill; - this.pictureBoxAirBomber.Location = new System.Drawing.Point(0, 0); - this.pictureBoxAirBomber.Name = "pictureBoxAirBomber"; - this.pictureBoxAirBomber.Size = new System.Drawing.Size(858, 476); - this.pictureBoxAirBomber.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; - this.pictureBoxAirBomber.TabIndex = 0; - this.pictureBoxAirBomber.TabStop = false; - // - // statusStrip - // - this.statusStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.toolStripStatusLabelSpeed, - this.toolStripStatusLabelWeight, - this.toolStripStatusLabelBodyColor}); - this.statusStrip.Location = new System.Drawing.Point(0, 454); - this.statusStrip.Name = "statusStrip"; - this.statusStrip.Size = new System.Drawing.Size(858, 22); - this.statusStrip.TabIndex = 1; - // - // 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 = "Цвет:"; - // - // 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(20, 402); - this.buttonCreate.Name = "buttonCreate"; - this.buttonCreate.Size = new System.Drawing.Size(79, 35); - 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::AirBomber.Properties.Resources.ArrowUp; - this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.buttonUp.Location = new System.Drawing.Point(780, 371); - 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.ButtonCreate_Move); - // - // buttonLeft - // - this.buttonLeft.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.buttonLeft.BackgroundImage = global::AirBomber.Properties.Resources.ArrowLeft; - this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.buttonLeft.Location = new System.Drawing.Point(744, 407); - 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.ButtonCreate_Move); - // - // buttonDown - // - this.buttonDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.buttonDown.BackgroundImage = global::AirBomber.Properties.Resources.ArrowDown; - this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.buttonDown.Location = new System.Drawing.Point(780, 407); - 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.ButtonCreate_Move); - // - // buttonRight - // - this.buttonRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.buttonRight.BackgroundImage = global::AirBomber.Properties.Resources.ArrowRight; - this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.buttonRight.Location = new System.Drawing.Point(816, 407); - 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.ButtonCreate_Move); - // - // buttonCreateModif - // - this.buttonCreateModif.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.buttonCreateModif.Location = new System.Drawing.Point(117, 402); - this.buttonCreateModif.Name = "buttonCreateModif"; - this.buttonCreateModif.Size = new System.Drawing.Size(110, 35); - this.buttonCreateModif.TabIndex = 7; - this.buttonCreateModif.Text = "Модификация"; - this.buttonCreateModif.UseVisualStyleBackColor = true; - this.buttonCreateModif.Click += new System.EventHandler(this.ButtonCreateModif_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(20, 12); - this.comboBoxSelectorMap.Name = "comboBoxSelectorMap"; - this.comboBoxSelectorMap.Size = new System.Drawing.Size(121, 23); - this.comboBoxSelectorMap.TabIndex = 8; - this.comboBoxSelectorMap.SelectedIndexChanged += new System.EventHandler(this.comboBoxSelectorMap_SelectedIndexChanged); - // - // FormMap - // - this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(858, 476); - 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.statusStrip); - this.Controls.Add(this.pictureBoxAirBomber); - this.Name = "FormMap"; - this.Text = "FormMap"; - ((System.ComponentModel.ISupportInitialize)(this.pictureBoxAirBomber)).EndInit(); - this.statusStrip.ResumeLayout(false); - this.statusStrip.PerformLayout(); - this.ResumeLayout(false); - this.PerformLayout(); - - } - - - - #endregion - - private PictureBox pictureBoxAirBomber; - private StatusStrip statusStrip; - private ToolStripStatusLabel toolStripStatusLabelSpeed; - private ToolStripStatusLabel toolStripStatusLabelWeight; - private ToolStripStatusLabel toolStripStatusLabelBodyColor; - private Button buttonCreate; - private Button buttonUp; - private Button buttonLeft; - private Button buttonDown; - private Button buttonRight; - private Button buttonCreateModif; - private ComboBox comboBoxSelectorMap; - } -} \ No newline at end of file diff --git a/AirBomber/AirBomber/FormMap.cs b/AirBomber/AirBomber/FormMap.cs deleted file mode 100644 index 8bbcf54..0000000 --- a/AirBomber/AirBomber/FormMap.cs +++ /dev/null @@ -1,88 +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 AirBomber -{ - public partial class FormMap : Form - { - private AbstractMap _abstractMap; - - public FormMap() - { - InitializeComponent(); - comboBoxSelectorMap.SelectedIndex = 0; - _abstractMap = new SimpleMap(); - } - - private void SetData(DrawningBomber airBomber) - { - toolStripStatusLabelSpeed.Text = $"Скорость: {airBomber.AirBomber.Speed}"; - toolStripStatusLabelWeight.Text = $"Вес: {airBomber.AirBomber.Weight}"; - toolStripStatusLabelBodyColor.Text = $"Цвет: {airBomber.AirBomber.BodyColor.Name}"; - pictureBoxAirBomber.Image = _abstractMap.CreateMap(pictureBoxAirBomber.Width, pictureBoxAirBomber.Height, - new DrawningObjectBomber(airBomber)); - } - - private void ButtonCreate_Click(object sender, EventArgs e) - { - Random rnd = new(); - var airBomber = new DrawningBomber(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256))); - SetData(airBomber); - } - - private void ButtonCreate_Move(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; - } - pictureBoxAirBomber.Image = _abstractMap?.MoveObject(dir); - } - - private void ButtonCreateModif_Click(object sender, EventArgs e) - { - Random rnd = new(); - var airBomber = new DrawningWarplane(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(airBomber); - } - - private void comboBoxSelectorMap_SelectedIndexChanged(object sender, EventArgs e) - { - switch (comboBoxSelectorMap.Text) - { - case "Простая карта": - _abstractMap = new SimpleMap(); - break; - case "Вторая карта": - _abstractMap = new SecondMap(); - break; - case "Третья карта": - _abstractMap = new ThirdMap(); - break; - } - } - } -} diff --git a/AirBomber/AirBomber/FormMapWithSetAirBomber.Designer.cs b/AirBomber/AirBomber/FormMapWithSetAirBomber.Designer.cs new file mode 100644 index 0000000..96b2687 --- /dev/null +++ b/AirBomber/AirBomber/FormMapWithSetAirBomber.Designer.cs @@ -0,0 +1,203 @@ +namespace AirBomber +{ + partial class FormMapWithSetAirBomber + { + /// + /// 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.groupBox1 = new System.Windows.Forms.GroupBox(); + this.maskedTextBoxPosition = new System.Windows.Forms.MaskedTextBox(); + this.buttonAddAirBomber = new System.Windows.Forms.Button(); + this.comboBoxSelectorMap = new System.Windows.Forms.ComboBox(); + this.pictureBox = new System.Windows.Forms.PictureBox(); + this.buttonRemoveAirBomber = new System.Windows.Forms.Button(); + this.buttonShowStorage = new System.Windows.Forms.Button(); + this.buttonShowOnMap = new System.Windows.Forms.Button(); + this.buttonRight = new System.Windows.Forms.Button(); + this.buttonDown = new System.Windows.Forms.Button(); + this.buttonLeft = new System.Windows.Forms.Button(); + this.buttonUp = new System.Windows.Forms.Button(); + this.groupBox1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).BeginInit(); + this.SuspendLayout(); + // + // groupBox1 + // + this.groupBox1.Controls.Add(this.buttonRight); + this.groupBox1.Controls.Add(this.buttonDown); + this.groupBox1.Controls.Add(this.buttonLeft); + this.groupBox1.Controls.Add(this.buttonUp); + this.groupBox1.Controls.Add(this.buttonShowOnMap); + this.groupBox1.Controls.Add(this.buttonShowStorage); + this.groupBox1.Controls.Add(this.buttonRemoveAirBomber); + this.groupBox1.Controls.Add(this.maskedTextBoxPosition); + this.groupBox1.Controls.Add(this.buttonAddAirBomber); + this.groupBox1.Controls.Add(this.comboBoxSelectorMap); + this.groupBox1.Dock = System.Windows.Forms.DockStyle.Right; + this.groupBox1.Location = new System.Drawing.Point(600, 0); + this.groupBox1.Name = "groupBox1"; + this.groupBox1.Size = new System.Drawing.Size(200, 450); + this.groupBox1.TabIndex = 0; + this.groupBox1.TabStop = false; + this.groupBox1.Text = "Инструменты"; + // + // maskedTextBoxPosition + // + this.maskedTextBoxPosition.Location = new System.Drawing.Point(22, 166); + this.maskedTextBoxPosition.Mask = "00"; + this.maskedTextBoxPosition.Name = "maskedTextBoxPosition"; + this.maskedTextBoxPosition.Size = new System.Drawing.Size(150, 23); + this.maskedTextBoxPosition.TabIndex = 2; + // + // buttonAddAirBomber + // + this.buttonAddAirBomber.Location = new System.Drawing.Point(22, 94); + this.buttonAddAirBomber.Name = "buttonAddAirBomber"; + this.buttonAddAirBomber.Size = new System.Drawing.Size(150, 35); + this.buttonAddAirBomber.TabIndex = 1; + this.buttonAddAirBomber.Text = "Добавить самолет"; + this.buttonAddAirBomber.UseVisualStyleBackColor = true; + // + // comboBoxSelectorMap + // + this.comboBoxSelectorMap.FormattingEnabled = true; + this.comboBoxSelectorMap.Location = new System.Drawing.Point(22, 44); + this.comboBoxSelectorMap.Name = "comboBoxSelectorMap"; + this.comboBoxSelectorMap.Size = new System.Drawing.Size(150, 23); + this.comboBoxSelectorMap.TabIndex = 0; + // + // 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; + // + // buttonRemoveAirBomber + // + this.buttonRemoveAirBomber.Location = new System.Drawing.Point(22, 195); + this.buttonRemoveAirBomber.Name = "buttonRemoveAirBomber"; + this.buttonRemoveAirBomber.Size = new System.Drawing.Size(150, 36); + this.buttonRemoveAirBomber.TabIndex = 3; + this.buttonRemoveAirBomber.Text = "Удалить самолет"; + this.buttonRemoveAirBomber.UseVisualStyleBackColor = true; + // + // buttonShowStorage + // + this.buttonShowStorage.Location = new System.Drawing.Point(22, 258); + this.buttonShowStorage.Name = "buttonShowStorage"; + this.buttonShowStorage.Size = new System.Drawing.Size(150, 36); + this.buttonShowStorage.TabIndex = 4; + this.buttonShowStorage.Text = "Посмотреть хранилище"; + this.buttonShowStorage.UseVisualStyleBackColor = true; + // + // buttonShowOnMap + // + this.buttonShowOnMap.Location = new System.Drawing.Point(22, 319); + this.buttonShowOnMap.Name = "buttonShowOnMap"; + this.buttonShowOnMap.Size = new System.Drawing.Size(150, 33); + this.buttonShowOnMap.TabIndex = 5; + this.buttonShowOnMap.Text = "Посмотреть карту"; + this.buttonShowOnMap.UseVisualStyleBackColor = true; + // + // buttonRight + // + this.buttonRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.buttonRight.BackgroundImage = global::AirBomber.Properties.Resources.ArrowRight; + this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.buttonRight.Location = new System.Drawing.Point(116, 404); + this.buttonRight.Name = "buttonRight"; + this.buttonRight.Size = new System.Drawing.Size(30, 30); + this.buttonRight.TabIndex = 10; + this.buttonRight.UseVisualStyleBackColor = true; + // + // buttonDown + // + this.buttonDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.buttonDown.BackgroundImage = global::AirBomber.Properties.Resources.ArrowDown; + this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.buttonDown.Location = new System.Drawing.Point(80, 404); + this.buttonDown.Name = "buttonDown"; + this.buttonDown.Size = new System.Drawing.Size(30, 30); + this.buttonDown.TabIndex = 9; + this.buttonDown.UseVisualStyleBackColor = true; + // + // buttonLeft + // + this.buttonLeft.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.buttonLeft.BackgroundImage = global::AirBomber.Properties.Resources.ArrowLeft; + this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.buttonLeft.Location = new System.Drawing.Point(44, 404); + this.buttonLeft.Name = "buttonLeft"; + this.buttonLeft.Size = new System.Drawing.Size(30, 30); + this.buttonLeft.TabIndex = 8; + this.buttonLeft.UseVisualStyleBackColor = true; + // + // buttonUp + // + this.buttonUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.buttonUp.BackgroundImage = global::AirBomber.Properties.Resources.ArrowUp; + this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.buttonUp.Location = new System.Drawing.Point(80, 368); + this.buttonUp.Name = "buttonUp"; + this.buttonUp.Size = new System.Drawing.Size(30, 30); + this.buttonUp.TabIndex = 7; + this.buttonUp.UseVisualStyleBackColor = true; + // + // FormMapWithSetAirBomber + // + 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.groupBox1); + this.Name = "FormMapWithSetAirBomber"; + this.Text = "FormMapWithSetAirBomber"; + this.groupBox1.ResumeLayout(false); + this.groupBox1.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).EndInit(); + this.ResumeLayout(false); + + } + + #endregion + + private GroupBox groupBox1; + private MaskedTextBox maskedTextBoxPosition; + private Button buttonAddAirBomber; + private ComboBox comboBoxSelectorMap; + private PictureBox pictureBox; + private Button buttonShowOnMap; + private Button buttonShowStorage; + private Button buttonRemoveAirBomber; + private Button buttonRight; + private Button buttonDown; + private Button buttonLeft; + private Button buttonUp; + } +} \ No newline at end of file diff --git a/AirBomber/AirBomber/FormMapWithSetAirBomber.cs b/AirBomber/AirBomber/FormMapWithSetAirBomber.cs new file mode 100644 index 0000000..0541b16 --- /dev/null +++ b/AirBomber/AirBomber/FormMapWithSetAirBomber.cs @@ -0,0 +1,135 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace AirBomber +{ + public partial class FormMapWithSetAirBomber : Form + { + private MapWithSetAirBomberGeneric _mapAirBomberCollectionGeneric; + + public FormMapWithSetAirBomber() + { + InitializeComponent(); + } + + private void ComboBoxSelectorMap_SelectedIndexChanged(object sende, 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) + { + _mapAirBomberCollectionGeneric = new MapWithSetAirBomberGeneric(pictureBox.Width, pictureBox.Height, map); + } + else + { + _mapAirBomberCollectionGeneric = null; + } + } + + private void ButtonAddCar_Click(object sender, EventArgs e) + { + if (_mapAirBomberCollectionGeneric == null) + { + return; + } + FormAirBomber form = new(); + if(form.ShowDialog() == DialogResult.OK) + { + DrawningObjectBomber airBomber = new(form.SelectedAirBomber); + if(_mapAirBomberCollectionGeneric + airBomber) + { + MessageBox.Show("Объект добавлен"); + pictureBox.Image = _mapAirBomberCollectionGeneric.ShowSet(); + } + else + { + MessageBox.Show("Не удалось добавить объект"); + } + } + } + + private void ButtonRemoveCar_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 (_mapAirBomberCollectionGeneric - pos) + { + MessageBox.Show("Объект удален"); + pictureBox.Image = _mapAirBomberCollectionGeneric.ShowSet(); + } + else + { + MessageBox.Show("Не удалось удалить объект"); + } + } + + private void ButtonShowStorage_Click(object sender, EventArgs e) + { + if (_mapAirBomberCollectionGeneric == null) + { + return; + } + pictureBox.Image = _mapAirBomberCollectionGeneric.ShowSet(); + } + + private void ButtonShowOnMap_Click(object sender, EventArgs e) + { + if (_mapAirBomberCollectionGeneric == null) + { + return; + } + pictureBox.Image = _mapAirBomberCollectionGeneric.ShowOnMap(); + } + + private void ButtonMove_Click(object sender, EventArgs e) + { + if (_mapAirBomberCollectionGeneric == null) + { + return; + } + string name = ((Button)sender)?.Name ?? string.Empty; + Direction dir = Direction.None; + switch (name) + { + case "butttonUp": + dir = Direction.Up; + break; + case "butttonDown": + dir = Direction.Down; + break; + case "butttonLeft": + dir = Direction.Left; + break; + case "butttonRight": + dir = Direction.Right; + break; + } + pictureBox.Image = _mapAirBomberCollectionGeneric.MoveObject(dir); + } + } +} diff --git a/AirBomber/AirBomber/FormMap.resx b/AirBomber/AirBomber/FormMapWithSetAirBomber.resx similarity index 93% rename from AirBomber/AirBomber/FormMap.resx rename to AirBomber/AirBomber/FormMapWithSetAirBomber.resx index 2c0949d..f298a7b 100644 --- a/AirBomber/AirBomber/FormMap.resx +++ b/AirBomber/AirBomber/FormMapWithSetAirBomber.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/AirBomber/AirBomber/Program.cs b/AirBomber/AirBomber/Program.cs index e462fb5..4c9e3e7 100644 --- a/AirBomber/AirBomber/Program.cs +++ b/AirBomber/AirBomber/Program.cs @@ -11,7 +11,7 @@ namespace AirBomber // 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 FormMapWithSetAirBomber()); } } } \ No newline at end of file From a3df0cf2854d3f6ed40be3240d7b3d564acf15a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D1=80=D1=82=D1=91=D0=BC=20=D0=90=D0=BB=D0=B5=D0=B9?= =?UTF-8?q?=D0=BA=D0=B8=D0=BD?= Date: Sat, 29 Oct 2022 19:02:08 +0400 Subject: [PATCH 3/4] =?UTF-8?q?=D0=9F=D0=BE=D0=BB=D0=BD=D0=BE=D1=81=D1=82?= =?UTF-8?q?=D1=8C=D1=8E=20=D1=81=D0=B4=D0=B5=D0=BB=D0=B0=D0=BD=D0=BD=D0=B0?= =?UTF-8?q?=D1=8F=203-=D1=8F=20=D0=BB=D0=B0=D0=B1=D0=BE=D1=80=D0=B0=D1=82?= =?UTF-8?q?=D0=BE=D1=80=D0=BD=D0=B0=D1=8F=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82?= =?UTF-8?q?=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AirBomber/AirBomber/FormAirBomber.cs | 25 ++- .../FormMapWithSetAirBomber.Designer.cs | 169 ++++++++++-------- .../AirBomber/FormMapWithSetAirBomber.cs | 72 ++++---- .../AirBomber/MapWithSetAirBomberGeneric.cs | 22 ++- AirBomber/AirBomber/SetAirBomberGeneric.cs | 58 +++++- 5 files changed, 212 insertions(+), 134 deletions(-) diff --git a/AirBomber/AirBomber/FormAirBomber.cs b/AirBomber/AirBomber/FormAirBomber.cs index 5ce80af..ae7c3fa 100644 --- a/AirBomber/AirBomber/FormAirBomber.cs +++ b/AirBomber/AirBomber/FormAirBomber.cs @@ -33,7 +33,13 @@ namespace AirBomber private void ButtonCreate_Click(object sender, EventArgs e) { Random rnd = new(); - _airBomber = new DrawningBomber(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; + } + _airBomber = new DrawningBomber(rnd.Next(100, 300), rnd.Next(1000, 2000), color); SetData(); Draw(); } @@ -68,10 +74,19 @@ namespace AirBomber private void ButtonCreateModif_Click(object sender, EventArgs e) { Random rnd = new(); - _airBomber = new DrawningWarplane(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))); + 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; + } + _airBomber = new DrawningWarplane(rnd.Next(100, 300), rnd.Next(1000, 2000), color, dopColor, Convert.ToBoolean(rnd.Next(0, 2)), Convert.ToBoolean(rnd.Next(0, 2))); SetData(); Draw(); } diff --git a/AirBomber/AirBomber/FormMapWithSetAirBomber.Designer.cs b/AirBomber/AirBomber/FormMapWithSetAirBomber.Designer.cs index 96b2687..a4477a6 100644 --- a/AirBomber/AirBomber/FormMapWithSetAirBomber.Designer.cs +++ b/AirBomber/AirBomber/FormMapWithSetAirBomber.Designer.cs @@ -29,17 +29,17 @@ private void InitializeComponent() { this.groupBox1 = new System.Windows.Forms.GroupBox(); - this.maskedTextBoxPosition = new System.Windows.Forms.MaskedTextBox(); - this.buttonAddAirBomber = new System.Windows.Forms.Button(); - this.comboBoxSelectorMap = new System.Windows.Forms.ComboBox(); - this.pictureBox = new System.Windows.Forms.PictureBox(); - this.buttonRemoveAirBomber = new System.Windows.Forms.Button(); - this.buttonShowStorage = new System.Windows.Forms.Button(); - this.buttonShowOnMap = new System.Windows.Forms.Button(); this.buttonRight = new System.Windows.Forms.Button(); this.buttonDown = 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.buttonShowStorage = new System.Windows.Forms.Button(); + this.buttonRemoveAirBomber = new System.Windows.Forms.Button(); + this.maskedTextBoxPosition = new System.Windows.Forms.MaskedTextBox(); + this.buttonAddAirBomber = new System.Windows.Forms.Button(); + this.comboBoxSelectorMap = new System.Windows.Forms.ComboBox(); + this.pictureBox = new System.Windows.Forms.PictureBox(); this.groupBox1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).BeginInit(); this.SuspendLayout(); @@ -64,6 +64,84 @@ this.groupBox1.TabStop = false; this.groupBox1.Text = "Инструменты"; // + // buttonRight + // + this.buttonRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.buttonRight.BackgroundImage = global::AirBomber.Properties.Resources.ArrowRight; + this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.buttonRight.Location = new System.Drawing.Point(116, 404); + this.buttonRight.Name = "buttonRight"; + this.buttonRight.Size = new System.Drawing.Size(30, 30); + this.buttonRight.TabIndex = 10; + this.buttonRight.UseVisualStyleBackColor = true; + this.buttonRight.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::AirBomber.Properties.Resources.ArrowDown; + this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.buttonDown.Location = new System.Drawing.Point(80, 404); + this.buttonDown.Name = "buttonDown"; + this.buttonDown.Size = new System.Drawing.Size(30, 30); + this.buttonDown.TabIndex = 9; + this.buttonDown.UseVisualStyleBackColor = true; + this.buttonDown.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::AirBomber.Properties.Resources.ArrowLeft; + this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.buttonLeft.Location = new System.Drawing.Point(44, 404); + 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::AirBomber.Properties.Resources.ArrowUp; + this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.buttonUp.Location = new System.Drawing.Point(80, 368); + 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(22, 319); + this.buttonShowOnMap.Name = "buttonShowOnMap"; + this.buttonShowOnMap.Size = new System.Drawing.Size(150, 33); + this.buttonShowOnMap.TabIndex = 5; + this.buttonShowOnMap.Text = "Посмотреть карту"; + this.buttonShowOnMap.UseVisualStyleBackColor = true; + this.buttonShowOnMap.Click += new System.EventHandler(this.ButtonShowOnMap_Click); + // + // buttonShowStorage + // + this.buttonShowStorage.Location = new System.Drawing.Point(22, 258); + this.buttonShowStorage.Name = "buttonShowStorage"; + this.buttonShowStorage.Size = new System.Drawing.Size(150, 36); + this.buttonShowStorage.TabIndex = 4; + this.buttonShowStorage.Text = "Посмотреть хранилище"; + this.buttonShowStorage.UseVisualStyleBackColor = true; + this.buttonShowStorage.Click += new System.EventHandler(this.ButtonShowStorage_Click); + // + // buttonRemoveAirBomber + // + this.buttonRemoveAirBomber.Location = new System.Drawing.Point(22, 195); + this.buttonRemoveAirBomber.Name = "buttonRemoveAirBomber"; + this.buttonRemoveAirBomber.Size = new System.Drawing.Size(150, 36); + this.buttonRemoveAirBomber.TabIndex = 3; + this.buttonRemoveAirBomber.Text = "Удалить самолет"; + this.buttonRemoveAirBomber.UseVisualStyleBackColor = true; + this.buttonRemoveAirBomber.Click += new System.EventHandler(this.ButtonRemoveAirBomber_Click); + // // maskedTextBoxPosition // this.maskedTextBoxPosition.Location = new System.Drawing.Point(22, 166); @@ -80,14 +158,20 @@ this.buttonAddAirBomber.TabIndex = 1; this.buttonAddAirBomber.Text = "Добавить самолет"; this.buttonAddAirBomber.UseVisualStyleBackColor = true; + this.buttonAddAirBomber.Click += new System.EventHandler(this.ButtonAddAirBomber_Click); // // comboBoxSelectorMap // this.comboBoxSelectorMap.FormattingEnabled = true; + this.comboBoxSelectorMap.Items.AddRange(new object[] { + "Простая карта", + "Вторая карта", + "Третья карта"}); this.comboBoxSelectorMap.Location = new System.Drawing.Point(22, 44); this.comboBoxSelectorMap.Name = "comboBoxSelectorMap"; this.comboBoxSelectorMap.Size = new System.Drawing.Size(150, 23); this.comboBoxSelectorMap.TabIndex = 0; + this.comboBoxSelectorMap.SelectedIndexChanged += new System.EventHandler(this.ComboBoxSelectorMap_SelectedIndexChanged); // // pictureBox // @@ -98,77 +182,6 @@ this.pictureBox.TabIndex = 1; this.pictureBox.TabStop = false; // - // buttonRemoveAirBomber - // - this.buttonRemoveAirBomber.Location = new System.Drawing.Point(22, 195); - this.buttonRemoveAirBomber.Name = "buttonRemoveAirBomber"; - this.buttonRemoveAirBomber.Size = new System.Drawing.Size(150, 36); - this.buttonRemoveAirBomber.TabIndex = 3; - this.buttonRemoveAirBomber.Text = "Удалить самолет"; - this.buttonRemoveAirBomber.UseVisualStyleBackColor = true; - // - // buttonShowStorage - // - this.buttonShowStorage.Location = new System.Drawing.Point(22, 258); - this.buttonShowStorage.Name = "buttonShowStorage"; - this.buttonShowStorage.Size = new System.Drawing.Size(150, 36); - this.buttonShowStorage.TabIndex = 4; - this.buttonShowStorage.Text = "Посмотреть хранилище"; - this.buttonShowStorage.UseVisualStyleBackColor = true; - // - // buttonShowOnMap - // - this.buttonShowOnMap.Location = new System.Drawing.Point(22, 319); - this.buttonShowOnMap.Name = "buttonShowOnMap"; - this.buttonShowOnMap.Size = new System.Drawing.Size(150, 33); - this.buttonShowOnMap.TabIndex = 5; - this.buttonShowOnMap.Text = "Посмотреть карту"; - this.buttonShowOnMap.UseVisualStyleBackColor = true; - // - // buttonRight - // - this.buttonRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.buttonRight.BackgroundImage = global::AirBomber.Properties.Resources.ArrowRight; - this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.buttonRight.Location = new System.Drawing.Point(116, 404); - this.buttonRight.Name = "buttonRight"; - this.buttonRight.Size = new System.Drawing.Size(30, 30); - this.buttonRight.TabIndex = 10; - this.buttonRight.UseVisualStyleBackColor = true; - // - // buttonDown - // - this.buttonDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.buttonDown.BackgroundImage = global::AirBomber.Properties.Resources.ArrowDown; - this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.buttonDown.Location = new System.Drawing.Point(80, 404); - this.buttonDown.Name = "buttonDown"; - this.buttonDown.Size = new System.Drawing.Size(30, 30); - this.buttonDown.TabIndex = 9; - this.buttonDown.UseVisualStyleBackColor = true; - // - // buttonLeft - // - this.buttonLeft.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.buttonLeft.BackgroundImage = global::AirBomber.Properties.Resources.ArrowLeft; - this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.buttonLeft.Location = new System.Drawing.Point(44, 404); - this.buttonLeft.Name = "buttonLeft"; - this.buttonLeft.Size = new System.Drawing.Size(30, 30); - this.buttonLeft.TabIndex = 8; - this.buttonLeft.UseVisualStyleBackColor = true; - // - // buttonUp - // - this.buttonUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.buttonUp.BackgroundImage = global::AirBomber.Properties.Resources.ArrowUp; - this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.buttonUp.Location = new System.Drawing.Point(80, 368); - this.buttonUp.Name = "buttonUp"; - this.buttonUp.Size = new System.Drawing.Size(30, 30); - this.buttonUp.TabIndex = 7; - this.buttonUp.UseVisualStyleBackColor = true; - // // FormMapWithSetAirBomber // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); diff --git a/AirBomber/AirBomber/FormMapWithSetAirBomber.cs b/AirBomber/AirBomber/FormMapWithSetAirBomber.cs index 0541b16..3c13999 100644 --- a/AirBomber/AirBomber/FormMapWithSetAirBomber.cs +++ b/AirBomber/AirBomber/FormMapWithSetAirBomber.cs @@ -17,44 +17,19 @@ namespace AirBomber public FormMapWithSetAirBomber() { InitializeComponent(); - } + } - private void ComboBoxSelectorMap_SelectedIndexChanged(object sende, 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) - { - _mapAirBomberCollectionGeneric = new MapWithSetAirBomberGeneric(pictureBox.Width, pictureBox.Height, map); - } - else - { - _mapAirBomberCollectionGeneric = null; - } - } - - private void ButtonAddCar_Click(object sender, EventArgs e) + private void ButtonAddAirBomber_Click(object sender, EventArgs e) { if (_mapAirBomberCollectionGeneric == null) { return; } FormAirBomber form = new(); - if(form.ShowDialog() == DialogResult.OK) + if (form.ShowDialog() == DialogResult.OK) { DrawningObjectBomber airBomber = new(form.SelectedAirBomber); - if(_mapAirBomberCollectionGeneric + airBomber) + if (_mapAirBomberCollectionGeneric + airBomber == 1) { MessageBox.Show("Объект добавлен"); pictureBox.Image = _mapAirBomberCollectionGeneric.ShowSet(); @@ -66,7 +41,7 @@ namespace AirBomber } } - private void ButtonRemoveCar_Click(object sender, EventArgs e) + private void ButtonRemoveAirBomber_Click(object sender, EventArgs e) { if (string.IsNullOrEmpty(maskedTextBoxPosition.Text)) { @@ -77,7 +52,7 @@ namespace AirBomber return; } int pos = Convert.ToInt32(maskedTextBoxPosition.Text); - if (_mapAirBomberCollectionGeneric - pos) + if (_mapAirBomberCollectionGeneric - pos == 1) { MessageBox.Show("Объект удален"); pictureBox.Image = _mapAirBomberCollectionGeneric.ShowSet(); @@ -106,6 +81,31 @@ namespace AirBomber pictureBox.Image = _mapAirBomberCollectionGeneric.ShowOnMap(); } + 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) + { + _mapAirBomberCollectionGeneric = new MapWithSetAirBomberGeneric(pictureBox.Width, pictureBox.Height, map); + } + else + { + _mapAirBomberCollectionGeneric = null; + } + } + private void ButtonMove_Click(object sender, EventArgs e) { if (_mapAirBomberCollectionGeneric == null) @@ -116,20 +116,20 @@ namespace AirBomber Direction dir = Direction.None; switch (name) { - case "butttonUp": + case "buttonUp": dir = Direction.Up; break; - case "butttonDown": + case "buttonDown": dir = Direction.Down; break; - case "butttonLeft": + case "buttonLeft": dir = Direction.Left; break; - case "butttonRight": + case "buttonRight": dir = Direction.Right; break; } pictureBox.Image = _mapAirBomberCollectionGeneric.MoveObject(dir); - } + } } } diff --git a/AirBomber/AirBomber/MapWithSetAirBomberGeneric.cs b/AirBomber/AirBomber/MapWithSetAirBomberGeneric.cs index f18f006..bafc36e 100644 --- a/AirBomber/AirBomber/MapWithSetAirBomberGeneric.cs +++ b/AirBomber/AirBomber/MapWithSetAirBomberGeneric.cs @@ -13,7 +13,7 @@ namespace AirBomber private readonly int _pictureWidth; private readonly int _pictureHeight; private readonly int _placeSizeWidth = 210; - private readonly int _placeSizeHeight = 90; + private readonly int _placeSizeHeight = 120; private readonly SetAirBomberGeneric _setAirBomber; private readonly U _map; @@ -27,12 +27,12 @@ namespace AirBomber _map = map; } - public static bool operator +(MapWithSetAirBomberGeneric map, T airBomber) + public static int operator +(MapWithSetAirBomberGeneric map, T airBomber) { return map._setAirBomber.Insert(airBomber); } - public static bool operator -(MapWithSetAirBomberGeneric map, int position) + public static int operator -(MapWithSetAirBomberGeneric map, int position) { return map._setAirBomber.Remove(position); } @@ -42,7 +42,7 @@ namespace AirBomber Bitmap bmp = new(_pictureWidth, _pictureHeight); Graphics gr = Graphics.FromImage(bmp); DrawBackground(gr); - DrawCars(gr); + DrawAirBomber(gr); return bmp; } @@ -97,22 +97,28 @@ namespace AirBomber private void DrawBackground(Graphics g) { - Pen pen = new(Color.Black, 3); + Pen pen = new(Color.DarkGreen, 3); + SolidBrush brush = new(Color.DarkGreen); for (int i = 0; i < _pictureWidth / _placeSizeWidth; ++i) { for (int j = 0; j < _pictureHeight / _placeSizeHeight; ++j) { g.DrawLine(pen, i * _placeSizeWidth, j * _placeSizeHeight, i * _placeSizeWidth + _placeSizeWidth / 2, j * _placeSizeHeight); + g.DrawPie(pen, new Rectangle(i * _placeSizeWidth - 25, j * _placeSizeHeight, 50, 120), -90, 180); + g.FillPie(brush, new Rectangle((i + 1) * _placeSizeWidth - _placeSizeHeight - 10, j * _placeSizeHeight, 50, 120), -90, 180); } - g.DrawLine(pen, i * _placeSizeWidth, 0, i * _placeSizeWidth, _pictureHeight); } } - private void DrawCars(Graphics g) + private void DrawAirBomber(Graphics g) { for (int i = 0; i < _setAirBomber.Count; ++i) { - _setAirBomber.Get(i)?.DrawningObject(g); + if (_setAirBomber.Get(i) != null) + { + _setAirBomber.Get(i).SetObject((_pictureWidth / _placeSizeWidth - (i % (_pictureWidth / _placeSizeWidth)) - 1) * _placeSizeWidth, (i / (_pictureWidth / _placeSizeWidth)) * _placeSizeHeight, _pictureWidth, _pictureHeight); + _setAirBomber.Get(i).DrawningObject(g); + } } } } diff --git a/AirBomber/AirBomber/SetAirBomberGeneric.cs b/AirBomber/AirBomber/SetAirBomberGeneric.cs index 11d1258..cb25d74 100644 --- a/AirBomber/AirBomber/SetAirBomberGeneric.cs +++ b/AirBomber/AirBomber/SetAirBomberGeneric.cs @@ -18,24 +18,68 @@ namespace AirBomber _places = new T[count]; } - public bool Insert(T car) + public int Insert(T airBomber) { - return true; + return Insert(airBomber, 0); } - public bool Insert(T car, int position) + public int Insert(T airBomber, int position) { - _places[position] = car; - return true; + if (position < 0 || position >= Count) + { + return 0; + } + int emptyPos = -1; + if (_places[position] == null) + { + _places[position] = airBomber; + return 1; + } + else + { + for (int i = position + 1; i < Count; ++i) + { + if (_places[i] == null) + { + emptyPos = i; + break; + } + } + if (emptyPos != -1) + { + for (int i = emptyPos; i > position; --i) + { + _places[i] = _places[i - 1]; + } + } + } + if (emptyPos != -1) + { + _places[position] = airBomber; + return 1; + } + else + { + return 0; + } } - public bool Remove(int position) + public int Remove(int position) { - return true; + if (position < 0 || position >= Count) + { + return 0; + } + _places[position] = null; + return 1; } public T Get(int position) { + if (position < 0 || position >= Count) + { + return null; + } return _places[position]; } } From 5181a68461a8fbc6254e41192191538af831c00f Mon Sep 17 00:00:00 2001 From: "d.agil" Date: Wed, 2 Nov 2022 09:49:17 +0400 Subject: [PATCH 4/4] =?UTF-8?q?=D0=9F=D1=80=D0=BE=D0=B2=D0=B5=D1=80=D0=B5?= =?UTF-8?q?=D0=BD=D0=BD=D0=B0=D1=8F=203=20=D0=BB=D0=B0=D0=B1=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AirBomber/AirBomber/FormMapWithSetAirBomber.cs | 4 ++-- AirBomber/AirBomber/MapWithSetAirBomberGeneric.cs | 2 +- AirBomber/AirBomber/SetAirBomberGeneric.cs | 15 ++++++++------- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/AirBomber/AirBomber/FormMapWithSetAirBomber.cs b/AirBomber/AirBomber/FormMapWithSetAirBomber.cs index 3c13999..5344495 100644 --- a/AirBomber/AirBomber/FormMapWithSetAirBomber.cs +++ b/AirBomber/AirBomber/FormMapWithSetAirBomber.cs @@ -29,7 +29,7 @@ namespace AirBomber if (form.ShowDialog() == DialogResult.OK) { DrawningObjectBomber airBomber = new(form.SelectedAirBomber); - if (_mapAirBomberCollectionGeneric + airBomber == 1) + if (_mapAirBomberCollectionGeneric + airBomber > -1) { MessageBox.Show("Объект добавлен"); pictureBox.Image = _mapAirBomberCollectionGeneric.ShowSet(); @@ -52,7 +52,7 @@ namespace AirBomber return; } int pos = Convert.ToInt32(maskedTextBoxPosition.Text); - if (_mapAirBomberCollectionGeneric - pos == 1) + if (_mapAirBomberCollectionGeneric - pos != null) { MessageBox.Show("Объект удален"); pictureBox.Image = _mapAirBomberCollectionGeneric.ShowSet(); diff --git a/AirBomber/AirBomber/MapWithSetAirBomberGeneric.cs b/AirBomber/AirBomber/MapWithSetAirBomberGeneric.cs index bafc36e..6b7ecbf 100644 --- a/AirBomber/AirBomber/MapWithSetAirBomberGeneric.cs +++ b/AirBomber/AirBomber/MapWithSetAirBomberGeneric.cs @@ -32,7 +32,7 @@ namespace AirBomber return map._setAirBomber.Insert(airBomber); } - public static int operator -(MapWithSetAirBomberGeneric map, int position) + public static T operator -(MapWithSetAirBomberGeneric map, int position) { return map._setAirBomber.Remove(position); } diff --git a/AirBomber/AirBomber/SetAirBomberGeneric.cs b/AirBomber/AirBomber/SetAirBomberGeneric.cs index cb25d74..cb41a83 100644 --- a/AirBomber/AirBomber/SetAirBomberGeneric.cs +++ b/AirBomber/AirBomber/SetAirBomberGeneric.cs @@ -27,13 +27,13 @@ namespace AirBomber { if (position < 0 || position >= Count) { - return 0; + return -1; } int emptyPos = -1; if (_places[position] == null) { _places[position] = airBomber; - return 1; + return position; } else { @@ -56,22 +56,23 @@ namespace AirBomber if (emptyPos != -1) { _places[position] = airBomber; - return 1; + return position; } else { - return 0; + return -1; } } - public int Remove(int position) + public T Remove(int position) { if (position < 0 || position >= Count) { - return 0; + return null; } + T elem = _places[position]; _places[position] = null; - return 1; + return elem; } public T Get(int position)