From 889177b47ccd1abc06c23e1a3c729c61aee0a0be Mon Sep 17 00:00:00 2001 From: Pavel_Sorokin Date: Mon, 10 Oct 2022 07:17:57 +0400 Subject: [PATCH 1/4] Generic classes. --- Liner/Liner/MapWithSetShipsGeneric.cs | 145 ++++++++++++++++++++++++++ Liner/Liner/SetShipsGeneric.cs | 72 +++++++++++++ 2 files changed, 217 insertions(+) create mode 100644 Liner/Liner/MapWithSetShipsGeneric.cs create mode 100644 Liner/Liner/SetShipsGeneric.cs diff --git a/Liner/Liner/MapWithSetShipsGeneric.cs b/Liner/Liner/MapWithSetShipsGeneric.cs new file mode 100644 index 0000000..624fa39 --- /dev/null +++ b/Liner/Liner/MapWithSetShipsGeneric.cs @@ -0,0 +1,145 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Liner +{ + internal class MapWithSetShipsGeneric + where T : class, IDrawingObject + where U : AbstractMap + { + private readonly int _pictureWidth; + private readonly int _pictureHeight; + private readonly int _placeSizeWidth = 170; + private readonly int _placeSizeHeight = 90; + private readonly SetShipsGeneric _setShips; + private readonly U _map; + public MapWithSetShipsGeneric(int picWidth, int picHeight, U map) + { + int width = picWidth / _placeSizeWidth; + int height = picHeight / _placeSizeHeight; + _setShips = new SetShipsGeneric(width * height); + _pictureWidth = picWidth; + _pictureHeight = picHeight; + _map = map; + } + public static bool operator +(MapWithSetShipsGeneric map, T car) + { + if (map._setShips.Insert(car) == -1) + { + return false; + } + else + { + return true; + } + } + public static bool operator -(MapWithSetShipsGeneric map, int position) + { + if (map._setShips.Remove(position) == null) + { + return false; + } + else + { + return true; + } + } + 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 < _setShips.Count; i++) + { + var ship = _setShips.Get(i); + if (ship != null) + { + return _map.CreateMap(_pictureWidth, _pictureHeight, ship); + } + } + 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 = _setShips.Count - 1; + for (int i = 0; i < _setShips.Count; i++) + { + if (_setShips.Get(i) == null) + { + for (; j > i; j--) + { + var car = _setShips.Get(j); + if (car != null) + { + _setShips.Insert(car, i); + _setShips.Remove(j); + break; + } + } + if (j <= i) + { + return; + } + } + } + } + private void DrawBackground(Graphics g) + { + Pen pen = new(Color.Sienna, 3); + Brush brush = new SolidBrush(Color.DodgerBlue); + g.FillRectangle(brush, 0, 0, _pictureWidth, _pictureHeight); + for (int i = 0; i < _pictureWidth / _placeSizeWidth; i++) + { + for (int j = 0; j < _pictureHeight / _placeSizeHeight + 1; ++j) + { + g.DrawLine(pen, i * _placeSizeWidth, j * _placeSizeHeight, i * _placeSizeWidth + _placeSizeWidth / 2 + 40, j * _placeSizeHeight); + } + g.DrawLine(pen, i * _placeSizeWidth, 0, i * _placeSizeWidth, (_pictureHeight / _placeSizeHeight) * _placeSizeHeight); + g.DrawLine(pen, i * _placeSizeWidth - 4, 0, i * _placeSizeWidth - 4, (_pictureHeight / _placeSizeHeight) * _placeSizeHeight); + } + } + private void DrawCars(Graphics g) + { + int widthEl = _pictureWidth / _placeSizeWidth; + int heightEl = _pictureHeight / _placeSizeHeight; + int curWidth = 1; + int curHeight = 0; + for (int i = 0; i < _setShips.Count; i++) + { + _setShips.Get(i)?.SetObject(_pictureWidth - _placeSizeWidth * curWidth - (_pictureWidth / 8), + curHeight * _placeSizeHeight + 10, _pictureWidth, _pictureHeight); + _setShips.Get(i)?.DrawningObject(g); + + if (curWidth < widthEl) + curWidth++; + else + { + curWidth = 1; + curHeight++; + } + if (curHeight > heightEl) + { + return; + } + + } + } + } +} diff --git a/Liner/Liner/SetShipsGeneric.cs b/Liner/Liner/SetShipsGeneric.cs new file mode 100644 index 0000000..e311083 --- /dev/null +++ b/Liner/Liner/SetShipsGeneric.cs @@ -0,0 +1,72 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Liner +{ + internal class SetShipsGeneric + where T : class + { + private readonly T[] _places; + public int Count => _places.Length; + public SetShipsGeneric(int count) + { + _places = new T[count]; + } + public int Insert(T ship) + { + return Insert(ship, 0); + } + public int Insert(T ship, int position) + { + if (position >= _places.Length || position < 0) + { + return -1; + } + if (_places[position] == null) + { + _places[position] = ship; + return position; + } + int emptyIndex = -1; + for (int i = position + 1; i < _places.Length; i++) + { + if (_places[i] == null) + { + emptyIndex = i; + break; + } + } + if (emptyIndex < 0) + { + return -1; + } + for (int i = emptyIndex; i > position; i--) + { + _places[i] = _places[i - 1]; + } + _places[position] = ship; + return position; + } + public T Remove(int position) + { + if (position >= _places.Length || position < 0) + { + return null; + } + T ship = _places[position]; + _places[position] = null; + return ship; + } + public T Get(int position) + { + if (position >= _places.Length || position < 0) + { + return null; + } + return _places[position]; + } + } +} \ No newline at end of file From 976db2fa2b8be43ee60e4b1c14fa1bb2e4741e05 Mon Sep 17 00:00:00 2001 From: Pavel_Sorokin Date: Mon, 10 Oct 2022 07:58:16 +0400 Subject: [PATCH 2/4] Changes forms. --- Liner/Liner/Direction.cs | 2 +- Liner/Liner/DrawingShip.cs | 2 +- Liner/Liner/EntityShip.cs | 2 +- Liner/Liner/FormMap.Designer.cs | 212 ----------------- Liner/Liner/FormMap.cs | 91 -------- Liner/Liner/FormMapWithSetShips.Designer.cs | 217 ++++++++++++++++++ Liner/Liner/FormMapWithSetShips.cs | 135 +++++++++++ ...{FormMap.resx => FormMapWithSetShips.resx} | 3 - Liner/Liner/FormShip.Designer.cs | 14 ++ Liner/Liner/FormShip.cs | 34 ++- Liner/Liner/MapWithSetShipsGeneric.cs | 2 +- Liner/Liner/Program.cs | 2 +- 12 files changed, 396 insertions(+), 320 deletions(-) delete mode 100644 Liner/Liner/FormMap.Designer.cs delete mode 100644 Liner/Liner/FormMap.cs create mode 100644 Liner/Liner/FormMapWithSetShips.Designer.cs create mode 100644 Liner/Liner/FormMapWithSetShips.cs rename Liner/Liner/{FormMap.resx => FormMapWithSetShips.resx} (93%) diff --git a/Liner/Liner/Direction.cs b/Liner/Liner/Direction.cs index 95a7a8d..24ae061 100644 --- a/Liner/Liner/Direction.cs +++ b/Liner/Liner/Direction.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; namespace Liner { - internal enum Direction + public enum Direction { None=0, Up = 1, diff --git a/Liner/Liner/DrawingShip.cs b/Liner/Liner/DrawingShip.cs index 7c3b324..848019b 100644 --- a/Liner/Liner/DrawingShip.cs +++ b/Liner/Liner/DrawingShip.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; namespace Liner { - internal class DrawingShip + public class DrawingShip { public EntityShip Ship { get; protected set; } protected float _startPosX; diff --git a/Liner/Liner/EntityShip.cs b/Liner/Liner/EntityShip.cs index 7946fa5..08b2b0b 100644 --- a/Liner/Liner/EntityShip.cs +++ b/Liner/Liner/EntityShip.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; namespace Liner { - internal class EntityShip + public class EntityShip { public int Speed { get; private set; } diff --git a/Liner/Liner/FormMap.Designer.cs b/Liner/Liner/FormMap.Designer.cs deleted file mode 100644 index 4e97c18..0000000 --- a/Liner/Liner/FormMap.Designer.cs +++ /dev/null @@ -1,212 +0,0 @@ -namespace Liner -{ - 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.pictureBoxShip = 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.buttonLeft = new System.Windows.Forms.Button(); - this.buttonUp = 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.pictureBoxShip)).BeginInit(); - this.statusStrip.SuspendLayout(); - this.SuspendLayout(); - // - // pictureBoxShip - // - this.pictureBoxShip.Dock = System.Windows.Forms.DockStyle.Fill; - this.pictureBoxShip.Location = new System.Drawing.Point(0, 0); - this.pictureBoxShip.Name = "pictureBoxShip"; - this.pictureBoxShip.Size = new System.Drawing.Size(800, 424); - this.pictureBoxShip.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; - this.pictureBoxShip.TabIndex = 0; - this.pictureBoxShip.TabStop = false; - // - // statusStrip - // - this.statusStrip.ImageScalingSize = new System.Drawing.Size(20, 20); - this.statusStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.toolStripStatusLabelSpeed, - this.toolStripStatusLabelWeight, - this.toolStripStatusLabelBodyColor}); - this.statusStrip.Location = new System.Drawing.Point(0, 424); - this.statusStrip.Name = "statusStrip"; - this.statusStrip.Size = new System.Drawing.Size(800, 26); - this.statusStrip.TabIndex = 1; - this.statusStrip.Text = "statusStrip1"; - // - // toolStripStatusLabelSpeed - // - this.toolStripStatusLabelSpeed.Name = "toolStripStatusLabelSpeed"; - this.toolStripStatusLabelSpeed.Size = new System.Drawing.Size(76, 20); - this.toolStripStatusLabelSpeed.Text = "Скорость:"; - // - // toolStripStatusLabelWeight - // - this.toolStripStatusLabelWeight.Name = "toolStripStatusLabelWeight"; - this.toolStripStatusLabelWeight.Size = new System.Drawing.Size(36, 20); - this.toolStripStatusLabelWeight.Text = "Вес:"; - // - // toolStripStatusLabelBodyColor - // - this.toolStripStatusLabelBodyColor.Name = "toolStripStatusLabelBodyColor"; - this.toolStripStatusLabelBodyColor.Size = new System.Drawing.Size(45, 20); - 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(12, 392); - this.buttonCreate.Name = "buttonCreate"; - this.buttonCreate.Size = new System.Drawing.Size(94, 29); - this.buttonCreate.TabIndex = 2; - this.buttonCreate.Text = "Создать"; - this.buttonCreate.UseVisualStyleBackColor = true; - this.buttonCreate.Click += new System.EventHandler(this.ButtonCreate_Click); - // - // buttonLeft - // - this.buttonLeft.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.buttonLeft.BackgroundImage = global::Liner.Properties.Resources._1; - this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.buttonLeft.Location = new System.Drawing.Point(686, 391); - this.buttonLeft.Name = "buttonLeft"; - this.buttonLeft.Size = new System.Drawing.Size(30, 30); - this.buttonLeft.TabIndex = 3; - 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::Liner.Properties.Resources._4; - this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.buttonUp.Location = new System.Drawing.Point(722, 355); - this.buttonUp.Name = "buttonUp"; - this.buttonUp.Size = new System.Drawing.Size(30, 30); - this.buttonUp.TabIndex = 4; - this.buttonUp.UseVisualStyleBackColor = true; - this.buttonUp.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::Liner.Properties.Resources._2; - this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.buttonDown.Location = new System.Drawing.Point(722, 391); - 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::Liner.Properties.Resources._3; - this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.buttonRight.Location = new System.Drawing.Point(758, 391); - 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.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.buttonCreateModif.Location = new System.Drawing.Point(112, 391); - this.buttonCreateModif.Name = "buttonCreateModif"; - this.buttonCreateModif.Size = new System.Drawing.Size(121, 29); - 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(12, 12); - this.comboBoxSelectorMap.Name = "comboBoxSelectorMap"; - this.comboBoxSelectorMap.Size = new System.Drawing.Size(151, 28); - this.comboBoxSelectorMap.TabIndex = 8; - this.comboBoxSelectorMap.SelectedIndexChanged += new System.EventHandler(this.ComboBoxSelectorMap_SelectedIndexChanged_1); - // - // FormMap - // - this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(800, 450); - this.Controls.Add(this.comboBoxSelectorMap); - this.Controls.Add(this.buttonCreateModif); - this.Controls.Add(this.buttonRight); - this.Controls.Add(this.buttonDown); - this.Controls.Add(this.buttonUp); - this.Controls.Add(this.buttonLeft); - this.Controls.Add(this.buttonCreate); - this.Controls.Add(this.pictureBoxShip); - this.Controls.Add(this.statusStrip); - this.Name = "FormMap"; - this.Text = "Карта"; - ((System.ComponentModel.ISupportInitialize)(this.pictureBoxShip)).EndInit(); - this.statusStrip.ResumeLayout(false); - this.statusStrip.PerformLayout(); - this.ResumeLayout(false); - this.PerformLayout(); - - } - - #endregion - - private PictureBox pictureBoxShip; - private StatusStrip statusStrip; - private ToolStripStatusLabel toolStripStatusLabelSpeed; - private ToolStripStatusLabel toolStripStatusLabelWeight; - private ToolStripStatusLabel toolStripStatusLabelBodyColor; - private Button buttonCreate; - private Button buttonUp; - private Button buttonLeft; - private Button buttonRight; - private Button buttonDown; - private Button buttonCreateModif; - private ComboBox comboBoxSelectorMap; - - } -} \ No newline at end of file diff --git a/Liner/Liner/FormMap.cs b/Liner/Liner/FormMap.cs deleted file mode 100644 index 4315453..0000000 --- a/Liner/Liner/FormMap.cs +++ /dev/null @@ -1,91 +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 Liner -{ - public partial class FormMap : Form - { - private AbstractMap _abstractMap; - public FormMap() - { - InitializeComponent(); - _abstractMap = new SimpleMap(); - } - private void SetData(DrawingShip ship) - { - Random rnd = new(); - toolStripStatusLabelSpeed.Text = $"Скорость: {ship.Ship.Speed}"; - toolStripStatusLabelWeight.Text = $"Вес: {ship.Ship.Weight}"; - toolStripStatusLabelBodyColor.Text = $"Цвет: {ship.Ship.BodyColor.Name}"; - pictureBoxShip.Image = _abstractMap.CreateMap(pictureBoxShip.Width, pictureBoxShip.Height, new DrawingObjectShip(ship)); - new DrawingObjectShip(ship); - } - - - - private void ButtonCreate_Click(object sender, EventArgs e) - { - Random rnd = new(); - var ship = new DrawingShip(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256))); - SetData(ship); - - } - 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; - } - pictureBoxShip.Image = _abstractMap?.MoveObject(dir); - } - - private void ButtonCreateModif_Click(object sender, EventArgs e) - { - Random rnd = new(); - var ship = new DrawningLiner(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(ship); - - } - - - - private void ComboBoxSelectorMap_SelectedIndexChanged_1(object sender, EventArgs e) - { - switch (comboBoxSelectorMap.Text) - { - case "Простая карта": - _abstractMap = new SimpleMap(); - break; - case "Море и айсберги": - _abstractMap = new SeaMap(); - break; - case "Болото": - _abstractMap = new SwampMap(); - break; - - } - } - - - } -} diff --git a/Liner/Liner/FormMapWithSetShips.Designer.cs b/Liner/Liner/FormMapWithSetShips.Designer.cs new file mode 100644 index 0000000..b2e1d3e --- /dev/null +++ b/Liner/Liner/FormMapWithSetShips.Designer.cs @@ -0,0 +1,217 @@ +namespace Liner +{ + partial class FormMapWithSetShips + { + /// + /// 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.groupBox = new System.Windows.Forms.GroupBox(); + this.buttonRight = new System.Windows.Forms.Button(); + this.buttonDown = new System.Windows.Forms.Button(); + this.buttonUp = new System.Windows.Forms.Button(); + this.buttonLeft = new System.Windows.Forms.Button(); + this.ButtonShowOnMap = new System.Windows.Forms.Button(); + this.ButtonShowStorage = new System.Windows.Forms.Button(); + this.ButtonRemoveShip = new System.Windows.Forms.Button(); + this.maskedTextBoxPosition = new System.Windows.Forms.MaskedTextBox(); + this.ButtonAddShip = new System.Windows.Forms.Button(); + this.ComboBoxSelectorMap = new System.Windows.Forms.ComboBox(); + this.pictureBox = new System.Windows.Forms.PictureBox(); + this.groupBox.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).BeginInit(); + this.SuspendLayout(); + // + // groupBox + // + this.groupBox.Controls.Add(this.buttonRight); + this.groupBox.Controls.Add(this.buttonDown); + this.groupBox.Controls.Add(this.buttonUp); + this.groupBox.Controls.Add(this.buttonLeft); + this.groupBox.Controls.Add(this.ButtonShowOnMap); + this.groupBox.Controls.Add(this.ButtonShowStorage); + this.groupBox.Controls.Add(this.ButtonRemoveShip); + this.groupBox.Controls.Add(this.maskedTextBoxPosition); + this.groupBox.Controls.Add(this.ButtonAddShip); + this.groupBox.Controls.Add(this.ComboBoxSelectorMap); + this.groupBox.Dock = System.Windows.Forms.DockStyle.Right; + this.groupBox.Location = new System.Drawing.Point(627, 0); + this.groupBox.Name = "groupBox"; + this.groupBox.Size = new System.Drawing.Size(250, 450); + this.groupBox.TabIndex = 0; + this.groupBox.TabStop = false; + this.groupBox.Text = "Инструменты"; + // + // buttonRight + // + this.buttonRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.buttonRight.BackgroundImage = global::Liner.Properties.Resources._3; + this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.buttonRight.Location = new System.Drawing.Point(204, 408); + this.buttonRight.Name = "buttonRight"; + this.buttonRight.Size = new System.Drawing.Size(30, 30); + this.buttonRight.TabIndex = 17; + 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::Liner.Properties.Resources._2; + this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.buttonDown.Location = new System.Drawing.Point(168, 408); + this.buttonDown.Name = "buttonDown"; + this.buttonDown.Size = new System.Drawing.Size(30, 30); + this.buttonDown.TabIndex = 16; + 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::Liner.Properties.Resources._4; + this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.buttonUp.Location = new System.Drawing.Point(168, 372); + this.buttonUp.Name = "buttonUp"; + this.buttonUp.Size = new System.Drawing.Size(30, 30); + this.buttonUp.TabIndex = 15; + 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::Liner.Properties.Resources._1; + this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.buttonLeft.Location = new System.Drawing.Point(132, 408); + this.buttonLeft.Name = "buttonLeft"; + this.buttonLeft.Size = new System.Drawing.Size(30, 30); + this.buttonLeft.TabIndex = 14; + this.buttonLeft.UseVisualStyleBackColor = true; + this.buttonLeft.Click += new System.EventHandler(this.ButtonMove_Click); + // + // ButtonShowOnMap + // + this.ButtonShowOnMap.Location = new System.Drawing.Point(28, 323); + this.ButtonShowOnMap.Name = "ButtonShowOnMap"; + this.ButtonShowOnMap.Size = new System.Drawing.Size(200, 29); + this.ButtonShowOnMap.TabIndex = 13; + this.ButtonShowOnMap.Text = "Посмотреть карту"; + this.ButtonShowOnMap.UseVisualStyleBackColor = true; + this.ButtonShowOnMap.Click += new System.EventHandler(this.ButtonShowOnMap_Click); + // + // ButtonShowStorage + // + this.ButtonShowStorage.Location = new System.Drawing.Point(28, 258); + this.ButtonShowStorage.Name = "ButtonShowStorage"; + this.ButtonShowStorage.Size = new System.Drawing.Size(200, 29); + this.ButtonShowStorage.TabIndex = 12; + this.ButtonShowStorage.Text = "Посмотреть хранилище"; + this.ButtonShowStorage.UseVisualStyleBackColor = true; + this.ButtonShowStorage.Click += new System.EventHandler(this.ButtonShowStorage_Click); + // + // ButtonRemoveShip + // + this.ButtonRemoveShip.Location = new System.Drawing.Point(28, 191); + this.ButtonRemoveShip.Name = "ButtonRemoveShip"; + this.ButtonRemoveShip.Size = new System.Drawing.Size(200, 29); + this.ButtonRemoveShip.TabIndex = 11; + this.ButtonRemoveShip.Text = "Удалить корабль"; + this.ButtonRemoveShip.UseVisualStyleBackColor = true; + this.ButtonRemoveShip.Click += new System.EventHandler(this.ButtonRemoveShip_Click); + // + // maskedTextBoxPosition + // + this.maskedTextBoxPosition.Location = new System.Drawing.Point(28, 158); + this.maskedTextBoxPosition.Mask = "00"; + this.maskedTextBoxPosition.Name = "maskedTextBoxPosition"; + this.maskedTextBoxPosition.Size = new System.Drawing.Size(200, 27); + this.maskedTextBoxPosition.TabIndex = 10; + // + // ButtonAddShip + // + this.ButtonAddShip.Location = new System.Drawing.Point(28, 110); + this.ButtonAddShip.Name = "ButtonAddShip"; + this.ButtonAddShip.Size = new System.Drawing.Size(200, 29); + this.ButtonAddShip.TabIndex = 2; + this.ButtonAddShip.Text = "Добавить корабль"; + this.ButtonAddShip.UseVisualStyleBackColor = true; + this.ButtonAddShip.Click += new System.EventHandler(this.ButtonAddShip_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(28, 38); + this.ComboBoxSelectorMap.Name = "ComboBoxSelectorMap"; + this.ComboBoxSelectorMap.Size = new System.Drawing.Size(200, 28); + this.ComboBoxSelectorMap.TabIndex = 9; + 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(627, 450); + this.pictureBox.TabIndex = 1; + this.pictureBox.TabStop = false; + // + // FormMapWithSetShips + // + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(877, 450); + this.Controls.Add(this.pictureBox); + this.Controls.Add(this.groupBox); + this.Name = "FormMapWithSetShips"; + this.Text = "FormMapWithSetShips"; + this.groupBox.ResumeLayout(false); + this.groupBox.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).EndInit(); + this.ResumeLayout(false); + + } + + #endregion + + private GroupBox groupBox; + private PictureBox pictureBox; + private ComboBox ComboBoxSelectorMap; + private Button ButtonShowOnMap; + private Button ButtonShowStorage; + private Button ButtonRemoveShip; + private MaskedTextBox maskedTextBoxPosition; + private Button ButtonAddShip; + private Button buttonRight; + private Button buttonDown; + private Button buttonUp; + private Button buttonLeft; + } +} \ No newline at end of file diff --git a/Liner/Liner/FormMapWithSetShips.cs b/Liner/Liner/FormMapWithSetShips.cs new file mode 100644 index 0000000..ee40e34 --- /dev/null +++ b/Liner/Liner/FormMapWithSetShips.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; +using static System.Windows.Forms.DataFormats; + +namespace Liner +{ + public partial class FormMapWithSetShips : Form + { + private MapWithSetShipsGeneric _mapShipsCollectionGeneric; + public FormMapWithSetShips() + { + InitializeComponent(); + } + + private void ComboBoxSelectorMap_SelectedIndexChanged(object sender, EventArgs e) + { + AbstractMap map = null; + switch (ComboBoxSelectorMap.Text) + { + case "Простая карта": + map = new SimpleMap(); + break; + case "Море и айсберги": + map = new SeaMap(); + break; + case "Болото": + map = new SwampMap(); + break; + } + if (map != null) + { + _mapShipsCollectionGeneric = new MapWithSetShipsGeneric( + pictureBox.Width, pictureBox.Height, map); + } + else + { + _mapShipsCollectionGeneric = null; + } + } + + private void ButtonAddShip_Click(object sender, EventArgs e) + { + if (_mapShipsCollectionGeneric == null) + { + return; + } + FormShip form = new(); + if (form.ShowDialog() == DialogResult.OK) + { + DrawingObjectShip ship = new(form.SelectedShip); + if (_mapShipsCollectionGeneric + ship) + { + MessageBox.Show("Объект добавлен"); + pictureBox.Image = _mapShipsCollectionGeneric.ShowSet(); + } + else + { + MessageBox.Show("Не удалось добавить объект"); + } + } + } + + private void ButtonRemoveShip_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 (_mapShipsCollectionGeneric - pos) + { + MessageBox.Show("Объект удален"); + pictureBox.Image = _mapShipsCollectionGeneric.ShowSet(); + } + else + { + MessageBox.Show("Не удалось удалить объект"); + } + } + + private void ButtonShowStorage_Click(object sender, EventArgs e) + { + if (_mapShipsCollectionGeneric == null) + { + return; + } + pictureBox.Image = _mapShipsCollectionGeneric.ShowSet(); + } + + private void ButtonShowOnMap_Click(object sender, EventArgs e) + { + if (_mapShipsCollectionGeneric == null) + { + return; + } + pictureBox.Image = _mapShipsCollectionGeneric.ShowOnMap(); + } + private void ButtonMove_Click(object sender, EventArgs e) + { + if (_mapShipsCollectionGeneric == 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 = _mapShipsCollectionGeneric.MoveObject(dir); + } + } +} diff --git a/Liner/Liner/FormMap.resx b/Liner/Liner/FormMapWithSetShips.resx similarity index 93% rename from Liner/Liner/FormMap.resx rename to Liner/Liner/FormMapWithSetShips.resx index 2c0949d..f298a7b 100644 --- a/Liner/Liner/FormMap.resx +++ b/Liner/Liner/FormMapWithSetShips.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/Liner/Liner/FormShip.Designer.cs b/Liner/Liner/FormShip.Designer.cs index 341b36c..c30db94 100644 --- a/Liner/Liner/FormShip.Designer.cs +++ b/Liner/Liner/FormShip.Designer.cs @@ -39,6 +39,7 @@ this.buttonRight = new System.Windows.Forms.Button(); this.buttonLeft = new System.Windows.Forms.Button(); this.buttonCreateModif = new System.Windows.Forms.Button(); + this.ButtonSelectShip = new System.Windows.Forms.Button(); ((System.ComponentModel.ISupportInitialize)(this.pictureBoxShip)).BeginInit(); this.statusStrip.SuspendLayout(); this.SuspendLayout(); @@ -155,11 +156,23 @@ this.buttonCreateModif.UseVisualStyleBackColor = true; this.buttonCreateModif.Click += new System.EventHandler(this.ButtonCreateModif_Click); // + // ButtonSelectShip + // + this.ButtonSelectShip.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.ButtonSelectShip.Location = new System.Drawing.Point(552, 373); + this.ButtonSelectShip.Name = "ButtonSelectShip"; + this.ButtonSelectShip.Size = new System.Drawing.Size(94, 29); + this.ButtonSelectShip.TabIndex = 8; + this.ButtonSelectShip.Text = "Выбрать"; + this.ButtonSelectShip.UseVisualStyleBackColor = true; + this.ButtonSelectShip.Click += new System.EventHandler(this.ButtonSelectShip_Click); + // // FormShip // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(800, 450); + this.Controls.Add(this.ButtonSelectShip); this.Controls.Add(this.buttonCreateModif); this.Controls.Add(this.buttonLeft); this.Controls.Add(this.buttonRight); @@ -191,5 +204,6 @@ private Button buttonRight; private Button buttonLeft; private Button buttonCreateModif; + private Button ButtonSelectShip; } } \ No newline at end of file diff --git a/Liner/Liner/FormShip.cs b/Liner/Liner/FormShip.cs index 10f9e4d..c86206e 100644 --- a/Liner/Liner/FormShip.cs +++ b/Liner/Liner/FormShip.cs @@ -5,12 +5,11 @@ namespace Liner { private DrawingShip _ship; - + public DrawingShip SelectedShip { get; private set; } public FormShip() { InitializeComponent(); } - private void Draw() { Bitmap bmp = new Bitmap(pictureBoxShip.Width, pictureBoxShip.Height); @@ -19,7 +18,6 @@ namespace Liner pictureBoxShip.Image = bmp; } - private void SetData() { Random rnd = new(); @@ -30,8 +28,13 @@ namespace Liner } private void ButtonCreate_Click(object sender, EventArgs e) { - Random rnd = new(); - _ship = new DrawingShip(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256))); + Random random = new(); + Color myColor = new Color(); + ColorDialog MyDialog = new ColorDialog(); + if (MyDialog.ShowDialog() == DialogResult.OK) + myColor = MyDialog.Color; + _ship = new DrawingShip(random.Next(30, 50), random.Next(1000, 2000), + myColor); SetData(); Draw(); } @@ -56,19 +59,32 @@ namespace Liner } Draw(); } - private void PictureBoxShip_Resize(object sender, EventArgs e) { _ship?.ChangeBorders(pictureBoxShip.Width, pictureBoxShip.Height); Draw(); } - private void ButtonCreateModif_Click(object sender, EventArgs e) { - Random rnd = new(); - _ship = new DrawningLiner(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))); + Random random = new(); + Color firstColor = new Color(); + Color secondColor = new Color(); + ColorDialog MyDialog = new ColorDialog(); + if (MyDialog.ShowDialog() == DialogResult.OK) + firstColor = MyDialog.Color; + MyDialog = new ColorDialog(); + if (MyDialog.ShowDialog() == DialogResult.OK) + secondColor = MyDialog.Color; + _ship = new DrawningLiner(random.Next(30, 50), random.Next(1000, 2000), + firstColor, secondColor, Convert.ToBoolean(random.Next(0, 2)), + Convert.ToBoolean(random.Next(0, 2))); SetData(); Draw(); } + private void ButtonSelectShip_Click(object sender, EventArgs e) + { + SelectedShip = _ship; + DialogResult = DialogResult.OK; + } } } \ No newline at end of file diff --git a/Liner/Liner/MapWithSetShipsGeneric.cs b/Liner/Liner/MapWithSetShipsGeneric.cs index 624fa39..a61420d 100644 --- a/Liner/Liner/MapWithSetShipsGeneric.cs +++ b/Liner/Liner/MapWithSetShipsGeneric.cs @@ -123,7 +123,7 @@ namespace Liner int curHeight = 0; for (int i = 0; i < _setShips.Count; i++) { - _setShips.Get(i)?.SetObject(_pictureWidth - _placeSizeWidth * curWidth - (_pictureWidth / 8), + _setShips.Get(i)?.SetObject(_pictureWidth - _placeSizeWidth * curWidth - (_pictureWidth / 7), curHeight * _placeSizeHeight + 10, _pictureWidth, _pictureHeight); _setShips.Get(i)?.DrawningObject(g); diff --git a/Liner/Liner/Program.cs b/Liner/Liner/Program.cs index d04dba2..9edbf87 100644 --- a/Liner/Liner/Program.cs +++ b/Liner/Liner/Program.cs @@ -11,7 +11,7 @@ namespace Liner // 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 FormMapWithSetShips()); } } } \ No newline at end of file From c8a7dece5be3a643ebf62c1c4fa0a5dc2739d000 Mon Sep 17 00:00:00 2001 From: Pavel_Sorokin Date: Wed, 19 Oct 2022 16:11:11 +0400 Subject: [PATCH 3/4] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D0=B4=D0=B5=D0=BB?= =?UTF-8?q?=D0=B0=D0=BD=D1=8B=20=D0=BD=D0=B0=D0=B7=D0=B2=D0=B0=D0=BD=D0=B8?= =?UTF-8?q?=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Liner/Liner/MapWithSetShipsGeneric.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Liner/Liner/MapWithSetShipsGeneric.cs b/Liner/Liner/MapWithSetShipsGeneric.cs index a61420d..e76dee0 100644 --- a/Liner/Liner/MapWithSetShipsGeneric.cs +++ b/Liner/Liner/MapWithSetShipsGeneric.cs @@ -25,9 +25,9 @@ namespace Liner _pictureHeight = picHeight; _map = map; } - public static bool operator +(MapWithSetShipsGeneric map, T car) + public static bool operator +(MapWithSetShipsGeneric map, T ship) { - if (map._setShips.Insert(car) == -1) + if (map._setShips.Insert(ship) == -1) { return false; } @@ -52,7 +52,7 @@ namespace Liner Bitmap bmp = new(_pictureWidth, _pictureHeight); Graphics gr = Graphics.FromImage(bmp); DrawBackground(gr); - DrawCars(gr); + DrawShips(gr); return bmp; } public Bitmap ShowOnMap() @@ -115,7 +115,7 @@ namespace Liner g.DrawLine(pen, i * _placeSizeWidth - 4, 0, i * _placeSizeWidth - 4, (_pictureHeight / _placeSizeHeight) * _placeSizeHeight); } } - private void DrawCars(Graphics g) + private void DrawShips(Graphics g) { int widthEl = _pictureWidth / _placeSizeWidth; int heightEl = _pictureHeight / _placeSizeHeight; From 50d81bcc0807da07837861eb00989d24bdd71829 Mon Sep 17 00:00:00 2001 From: Pavel_Sorokin Date: Wed, 19 Oct 2022 16:49:18 +0400 Subject: [PATCH 4/4] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BD=D0=B0=D0=B7=D0=B2=D0=B0=D0=BD?= =?UTF-8?q?=D0=B8=D0=B9=20=D0=B8=20=D0=BB=D0=BE=D0=B3=D0=B8=D0=BA=D0=B8.?= =?UTF-8?q?=20=D0=A3=D0=B1=D1=80=D0=B0=D0=BD=D1=8B=20=D0=BB=D0=B8=D1=88?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D1=81=D1=82=D1=80=D0=BE=D1=87=D0=BA=D0=B8?= =?UTF-8?q?(=D0=BF=D1=83=D1=81=D1=82=D1=8B=D0=B5)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Liner/Liner/AbstractMap.cs | 4 ---- Liner/Liner/DrawingObjectShip.cs | 5 ----- Liner/Liner/DrawingShip.cs | 4 ---- Liner/Liner/FormMapWithSetShips.cs | 9 ++------- Liner/Liner/IDrawingObject.cs | 2 -- Liner/Liner/MapWithSetShipsGeneric.cs | 28 +++++++-------------------- Liner/Liner/SeaMap.cs | 2 -- Liner/Liner/SetShipsGeneric.cs | 2 +- Liner/Liner/SimpleMap.cs | 2 -- Liner/Liner/SwampMap.cs | 2 -- 10 files changed, 10 insertions(+), 50 deletions(-) diff --git a/Liner/Liner/AbstractMap.cs b/Liner/Liner/AbstractMap.cs index 94a906b..faa99df 100644 --- a/Liner/Liner/AbstractMap.cs +++ b/Liner/Liner/AbstractMap.cs @@ -17,7 +17,6 @@ namespace Liner protected readonly Random _random = new(); protected readonly int _freeRoad = 0; protected readonly int _barrier = 1; - public Bitmap CreateMap(int width, int height, IDrawingObject drawningObject) { _width = width; @@ -111,8 +110,6 @@ namespace Liner startY += _size_y; } return false; - - } private Bitmap DrawMapWithObject() { @@ -139,7 +136,6 @@ namespace Liner _drawningObject.DrawningObject(gr); return bmp; } - protected abstract void GenerateMap(); protected abstract void DrawRoadPart(Graphics g, int i, int j); protected abstract void DrawBarrierPart(Graphics g, int i, int j); diff --git a/Liner/Liner/DrawingObjectShip.cs b/Liner/Liner/DrawingObjectShip.cs index 39ade25..3686c49 100644 --- a/Liner/Liner/DrawingObjectShip.cs +++ b/Liner/Liner/DrawingObjectShip.cs @@ -9,7 +9,6 @@ namespace Liner internal class DrawingObjectShip : IDrawingObject { private DrawingShip _ship = null; - public DrawingObjectShip(DrawingShip ship) { _ship = ship; @@ -23,17 +22,13 @@ namespace Liner { _ship?.MoveTransport(direction); } - public void SetObject(int x, int y, int width, int height) { _ship.SetPosition(x, y, width, height); } - - void IDrawingObject.DrawningObject(Graphics g) { _ship.DrawTransport(g); } - } } diff --git a/Liner/Liner/DrawingShip.cs b/Liner/Liner/DrawingShip.cs index 848019b..6a68c2a 100644 --- a/Liner/Liner/DrawingShip.cs +++ b/Liner/Liner/DrawingShip.cs @@ -38,7 +38,6 @@ namespace Liner _pictureWidth = width; _pictureHeight = height; } - public void MoveTransport(Direction direction) { if (!_pictureWidth.HasValue || !_pictureHeight.HasValue) @@ -72,10 +71,8 @@ namespace Liner _startPosY += Ship.Step; } break; - } } - public virtual void DrawTransport(Graphics g) { if (_startPosX < 0 || _startPosY < 0 || !_pictureWidth.HasValue || !_pictureHeight.HasValue) @@ -100,7 +97,6 @@ namespace Liner g.DrawLine(pen, _startPosX, _startPosY + 20, _startPosX + 20, _startPosY + 40); g.DrawLine(pen, _startPosX + 20, _startPosY + 40, _startPosX + 100, _startPosY + 40); } - public void ChangeBorders(int width, int height) { _pictureWidth = width; diff --git a/Liner/Liner/FormMapWithSetShips.cs b/Liner/Liner/FormMapWithSetShips.cs index ee40e34..500b974 100644 --- a/Liner/Liner/FormMapWithSetShips.cs +++ b/Liner/Liner/FormMapWithSetShips.cs @@ -18,7 +18,6 @@ namespace Liner { InitializeComponent(); } - private void ComboBoxSelectorMap_SelectedIndexChanged(object sender, EventArgs e) { AbstractMap map = null; @@ -44,7 +43,6 @@ namespace Liner _mapShipsCollectionGeneric = null; } } - private void ButtonAddShip_Click(object sender, EventArgs e) { if (_mapShipsCollectionGeneric == null) @@ -55,7 +53,7 @@ namespace Liner if (form.ShowDialog() == DialogResult.OK) { DrawingObjectShip ship = new(form.SelectedShip); - if (_mapShipsCollectionGeneric + ship) + if (_mapShipsCollectionGeneric + ship != -1) { MessageBox.Show("Объект добавлен"); pictureBox.Image = _mapShipsCollectionGeneric.ShowSet(); @@ -66,7 +64,6 @@ namespace Liner } } } - private void ButtonRemoveShip_Click(object sender, EventArgs e) { if (string.IsNullOrEmpty(maskedTextBoxPosition.Text)) @@ -78,7 +75,7 @@ namespace Liner return; } int pos = Convert.ToInt32(maskedTextBoxPosition.Text); - if (_mapShipsCollectionGeneric - pos) + if (_mapShipsCollectionGeneric - pos != null) { MessageBox.Show("Объект удален"); pictureBox.Image = _mapShipsCollectionGeneric.ShowSet(); @@ -88,7 +85,6 @@ namespace Liner MessageBox.Show("Не удалось удалить объект"); } } - private void ButtonShowStorage_Click(object sender, EventArgs e) { if (_mapShipsCollectionGeneric == null) @@ -97,7 +93,6 @@ namespace Liner } pictureBox.Image = _mapShipsCollectionGeneric.ShowSet(); } - private void ButtonShowOnMap_Click(object sender, EventArgs e) { if (_mapShipsCollectionGeneric == null) diff --git a/Liner/Liner/IDrawingObject.cs b/Liner/Liner/IDrawingObject.cs index d849ded..aad8465 100644 --- a/Liner/Liner/IDrawingObject.cs +++ b/Liner/Liner/IDrawingObject.cs @@ -13,8 +13,6 @@ namespace Liner void MoveObject(Direction direction); void DrawningObject(Graphics g); - - (float Left, float Right, float Top, float Bottom) GetCurrentPosition(); } } diff --git a/Liner/Liner/MapWithSetShipsGeneric.cs b/Liner/Liner/MapWithSetShipsGeneric.cs index e76dee0..b8e16b9 100644 --- a/Liner/Liner/MapWithSetShipsGeneric.cs +++ b/Liner/Liner/MapWithSetShipsGeneric.cs @@ -25,27 +25,13 @@ namespace Liner _pictureHeight = picHeight; _map = map; } - public static bool operator +(MapWithSetShipsGeneric map, T ship) + public static int operator +(MapWithSetShipsGeneric map, T ship) { - if (map._setShips.Insert(ship) == -1) - { - return false; - } - else - { - return true; - } + return map._setShips.Insert(ship); } - public static bool operator -(MapWithSetShipsGeneric map, int position) + public static T operator -(MapWithSetShipsGeneric map, int position) { - if (map._setShips.Remove(position) == null) - { - return false; - } - else - { - return true; - } + return map._setShips.Remove(position); } public Bitmap ShowSet() { @@ -85,10 +71,10 @@ namespace Liner { for (; j > i; j--) { - var car = _setShips.Get(j); - if (car != null) + var ship = _setShips.Get(j); + if (ship != null) { - _setShips.Insert(car, i); + _setShips.Insert(ship, i); _setShips.Remove(j); break; } diff --git a/Liner/Liner/SeaMap.cs b/Liner/Liner/SeaMap.cs index 43b2616..d47ed86 100644 --- a/Liner/Liner/SeaMap.cs +++ b/Liner/Liner/SeaMap.cs @@ -9,9 +9,7 @@ namespace Liner internal class SeaMap : AbstractMap { private readonly Brush barrierColor = new SolidBrush(Color.White); - private readonly Brush roadColor = new SolidBrush(Color.Blue); - protected override void DrawBarrierPart(Graphics g, int i, int j) { g.FillRectangle(barrierColor, i * _size_x, j * _size_y, i * (_size_x + 1), j * (_size_y + 1)); diff --git a/Liner/Liner/SetShipsGeneric.cs b/Liner/Liner/SetShipsGeneric.cs index e311083..0f4b0f0 100644 --- a/Liner/Liner/SetShipsGeneric.cs +++ b/Liner/Liner/SetShipsGeneric.cs @@ -31,7 +31,7 @@ namespace Liner return position; } int emptyIndex = -1; - for (int i = position + 1; i < _places.Length; i++) + for (int i = position + 1; i < Count; i++) { if (_places[i] == null) { diff --git a/Liner/Liner/SimpleMap.cs b/Liner/Liner/SimpleMap.cs index cec355f..97d2731 100644 --- a/Liner/Liner/SimpleMap.cs +++ b/Liner/Liner/SimpleMap.cs @@ -9,9 +9,7 @@ namespace Liner internal class SimpleMap : AbstractMap { private readonly Brush barrierColor = new SolidBrush(Color.Black); - private readonly Brush roadColor = new SolidBrush(Color.Gray); - protected override void DrawBarrierPart(Graphics g, int i, int j) { g.FillRectangle(barrierColor, i * _size_x, j * _size_y, i * (_size_x + 1), j * (_size_y + 1)); diff --git a/Liner/Liner/SwampMap.cs b/Liner/Liner/SwampMap.cs index 6d19977..fb46fad 100644 --- a/Liner/Liner/SwampMap.cs +++ b/Liner/Liner/SwampMap.cs @@ -9,9 +9,7 @@ namespace Liner internal class SwampMap : AbstractMap { private readonly Brush barrierColor = new SolidBrush(Color.DarkGreen); - private readonly Brush roadColor = new SolidBrush(Color.AliceBlue); - protected override void DrawBarrierPart(Graphics g, int i, int j) { g.FillRectangle(barrierColor, i * _size_x, j * _size_y, i * (_size_x + 1), j * (_size_y + 1));