diff --git a/MotorBoat/MotorBoat/AbstractMap.cs b/MotorBoat/MotorBoat/AbstractMap.cs
index 413d614..e6cd207 100644
--- a/MotorBoat/MotorBoat/AbstractMap.cs
+++ b/MotorBoat/MotorBoat/AbstractMap.cs
@@ -34,13 +34,13 @@ namespace MotorBoat
// TODO проверка, что объект может переместится в требуемом направлении
(float leftX, float topY, float rightX, float bottomY) = _drawningObject.GetCurrentPosition();
bool can = true;
-
+ //координаты в системе массива
int topYinS = Convert.ToInt32((topY) / _size_y);
int rightXinS = Convert.ToInt32((rightX) / _size_x);
int leftXinS = Convert.ToInt32((leftX) / _size_x);
int bottomYinS = Convert.ToInt32(bottomY / _size_y);
- int stepinS = 0;
+ int stepinS = 0;
switch (direction)
{
diff --git a/MotorBoat/MotorBoat/Direction.cs b/MotorBoat/MotorBoat/Direction.cs
index 9ae1f69..8370820 100644
--- a/MotorBoat/MotorBoat/Direction.cs
+++ b/MotorBoat/MotorBoat/Direction.cs
@@ -6,7 +6,7 @@ using System.Threading.Tasks;
namespace MotorBoat
{
- internal enum Direction
+ public enum Direction
{
None = 0,
Up = 1,
diff --git a/MotorBoat/MotorBoat/DrawningBoat.cs b/MotorBoat/MotorBoat/DrawningBoat.cs
index 1b834bf..2f072b5 100644
--- a/MotorBoat/MotorBoat/DrawningBoat.cs
+++ b/MotorBoat/MotorBoat/DrawningBoat.cs
@@ -7,7 +7,7 @@ using System.Threading.Tasks;
namespace MotorBoat
{
- class DrawningBoat
+ public class DrawningBoat
{
public EntityBoat Boat { get; protected set; }
diff --git a/MotorBoat/MotorBoat/DrawningObjectBoat.cs b/MotorBoat/MotorBoat/DrawningObjectBoat.cs
index 09a0531..f551b37 100644
--- a/MotorBoat/MotorBoat/DrawningObjectBoat.cs
+++ b/MotorBoat/MotorBoat/DrawningObjectBoat.cs
@@ -9,29 +9,23 @@ namespace MotorBoat
internal class DrawningObjectBoat : IDrawningObject
{
private DrawningBoat _boat = null;
-
public DrawningObjectBoat(DrawningBoat boat)
{
_boat = boat;
}
-
public float Step => _boat?.Boat?.Step ?? 0;
-
public (float Left, float Right, float Top, float Bottom) GetCurrentPosition()
{
return _boat?.GetCurrentPosition() ?? default;
}
-
public void MoveObject(Direction direction)
{
_boat?.MoveTransport(direction);
}
-
public void SetObject(int x, int y, int width, int height)
{
_boat.SetPosition(x, y, width, height);
}
-
void IDrawningObject.DrawningObject(Graphics g)
{
_boat.DrawTransport(g);
diff --git a/MotorBoat/MotorBoat/EntityBoat.cs b/MotorBoat/MotorBoat/EntityBoat.cs
index 2b1b66e..58a4e38 100644
--- a/MotorBoat/MotorBoat/EntityBoat.cs
+++ b/MotorBoat/MotorBoat/EntityBoat.cs
@@ -7,7 +7,7 @@ using System.Threading.Tasks;
namespace MotorBoat
{
- class EntityBoat
+ public class EntityBoat
{
public int Speed { get; private set; }
public float Weight { get; private set; }
diff --git a/MotorBoat/MotorBoat/FormBoat.Designer.cs b/MotorBoat/MotorBoat/FormBoat.Designer.cs
index d760163..c286b39 100644
--- a/MotorBoat/MotorBoat/FormBoat.Designer.cs
+++ b/MotorBoat/MotorBoat/FormBoat.Designer.cs
@@ -39,6 +39,7 @@
this.buttonDown = new System.Windows.Forms.Button();
this.buttonCreate = new System.Windows.Forms.Button();
this.buttonCreateModif = new System.Windows.Forms.Button();
+ this.buttonSelectBoat = new System.Windows.Forms.Button();
((System.ComponentModel.ISupportInitialize)(this.pictureBoxMotorBoat)).BeginInit();
this.statusStrip1.SuspendLayout();
this.SuspendLayout();
@@ -153,11 +154,23 @@
this.buttonCreateModif.UseVisualStyleBackColor = true;
this.buttonCreateModif.Click += new System.EventHandler(this.buttonCreateModif_Click);
//
+ // buttonSelectBoat
+ //
+ this.buttonSelectBoat.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+ this.buttonSelectBoat.Location = new System.Drawing.Point(487, 366);
+ this.buttonSelectBoat.Name = "buttonSelectBoat";
+ this.buttonSelectBoat.Size = new System.Drawing.Size(111, 44);
+ this.buttonSelectBoat.TabIndex = 7;
+ this.buttonSelectBoat.Text = "Выбрать";
+ this.buttonSelectBoat.UseVisualStyleBackColor = true;
+ this.buttonSelectBoat.Click += new System.EventHandler(this.buttonSelectBoat_Click);
+ //
// FormBoat
//
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.buttonSelectBoat);
this.Controls.Add(this.buttonCreateModif);
this.Controls.Add(this.buttonCreate);
this.Controls.Add(this.buttonDown);
@@ -189,5 +202,6 @@
private Button buttonDown;
private Button buttonCreate;
private Button buttonCreateModif;
+ private Button buttonSelectBoat;
}
}
\ No newline at end of file
diff --git a/MotorBoat/MotorBoat/FormBoat.cs b/MotorBoat/MotorBoat/FormBoat.cs
index ed9b678..b133f0d 100644
--- a/MotorBoat/MotorBoat/FormBoat.cs
+++ b/MotorBoat/MotorBoat/FormBoat.cs
@@ -11,16 +11,26 @@ namespace MotorBoat
public partial class FormBoat : Form
{
private DrawningBoat _boat;
+ public DrawningBoat SelectedBoat { get; private set; }
public FormBoat()
{
InitializeComponent();
}
private void ButtonCreate_Click(object sender, EventArgs e)
{
- Random rnd = new Random();
- _boat = new DrawningBoat(rnd.Next(50, 150), rnd.Next(100, 200), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)));
+ Random rnd = new();
+ Color color = Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256),
+ rnd.Next(0, 256));
+ ColorDialog dialog = new();
+ if (dialog.ShowDialog() == DialogResult.OK)
+ {
+ color = dialog.Color;
+ }
+ _boat = new DrawningBoat(rnd.Next(100, 300), rnd.Next(1000, 2000),
+ color);
SetData();
Draw();
+
}
private void Draw()
{
@@ -71,12 +81,32 @@ namespace MotorBoat
private void buttonCreateModif_Click(object sender, EventArgs e)
{
Random rnd = new();
- _boat = new DrawningMotorBoat(rnd.Next(100, 200), rnd.Next(100, 200),
- 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)), 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;
+ }
+ _boat = new DrawningMotorBoat(rnd.Next(100, 300), rnd.Next(1000, 2000),
+ color, dopColor,
+ Convert.ToBoolean(rnd.Next(0, 2)), Convert.ToBoolean(rnd.Next(0,
+ 2)), Convert.ToBoolean(rnd.Next(0, 2)));
SetData();
Draw();
}
+
+ private void buttonSelectBoat_Click(object sender, EventArgs e)
+ {
+ SelectedBoat = _boat;
+ DialogResult = DialogResult.OK;
+ }
}
}
diff --git a/MotorBoat/MotorBoat/FormMap.Designer.cs b/MotorBoat/MotorBoat/FormMap.Designer.cs
deleted file mode 100644
index c16d767..0000000
--- a/MotorBoat/MotorBoat/FormMap.Designer.cs
+++ /dev/null
@@ -1,209 +0,0 @@
-namespace MotorBoat
-{
- 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.pictureBoxMotorBoat = new System.Windows.Forms.PictureBox();
- this.statusStrip1 = new System.Windows.Forms.StatusStrip();
- this.toolStripStatusLabelSpeed = new System.Windows.Forms.ToolStripStatusLabel();
- this.toolStripStatusLabelWeight = new System.Windows.Forms.ToolStripStatusLabel();
- this.toolStripStatusLabelBodyColor = new System.Windows.Forms.ToolStripStatusLabel();
- this.buttonRight = 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.buttonCreate = new System.Windows.Forms.Button();
- this.buttonCreateModif = new System.Windows.Forms.Button();
- this.comboBoxSelectorMap = new System.Windows.Forms.ComboBox();
- ((System.ComponentModel.ISupportInitialize)(this.pictureBoxMotorBoat)).BeginInit();
- this.statusStrip1.SuspendLayout();
- this.SuspendLayout();
- //
- // pictureBoxMotorBoat
- //
- this.pictureBoxMotorBoat.Dock = System.Windows.Forms.DockStyle.Fill;
- this.pictureBoxMotorBoat.Location = new System.Drawing.Point(0, 0);
- this.pictureBoxMotorBoat.Name = "pictureBoxMotorBoat";
- this.pictureBoxMotorBoat.Size = new System.Drawing.Size(800, 428);
- this.pictureBoxMotorBoat.TabIndex = 1;
- this.pictureBoxMotorBoat.TabStop = false;
- //
- // statusStrip1
- //
- this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
- this.toolStripStatusLabelSpeed,
- this.toolStripStatusLabelWeight,
- this.toolStripStatusLabelBodyColor});
- this.statusStrip1.Location = new System.Drawing.Point(0, 428);
- this.statusStrip1.Name = "statusStrip1";
- this.statusStrip1.Size = new System.Drawing.Size(800, 22);
- this.statusStrip1.TabIndex = 0;
- this.statusStrip1.Text = "statusStrip1";
- //
- // toolStripStatusLabelSpeed
- //
- this.toolStripStatusLabelSpeed.Name = "toolStripStatusLabelSpeed";
- this.toolStripStatusLabelSpeed.Size = new System.Drawing.Size(62, 17);
- this.toolStripStatusLabelSpeed.Text = "Скорость:";
- //
- // toolStripStatusLabelWeight
- //
- this.toolStripStatusLabelWeight.Name = "toolStripStatusLabelWeight";
- this.toolStripStatusLabelWeight.Size = new System.Drawing.Size(29, 17);
- this.toolStripStatusLabelWeight.Text = "Вес:";
- //
- // toolStripStatusLabelBodyColor
- //
- this.toolStripStatusLabelBodyColor.Name = "toolStripStatusLabelBodyColor";
- this.toolStripStatusLabelBodyColor.Size = new System.Drawing.Size(36, 17);
- this.toolStripStatusLabelBodyColor.Text = "Цвет:";
- //
- // buttonRight
- //
- this.buttonRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
- this.buttonRight.Image = global::MotorBoat.Properties.Resources.up;
- this.buttonRight.Location = new System.Drawing.Point(715, 370);
- this.buttonRight.Name = "buttonRight";
- this.buttonRight.Size = new System.Drawing.Size(40, 40);
- this.buttonRight.TabIndex = 2;
- this.buttonRight.TabStop = false;
- this.buttonRight.UseVisualStyleBackColor = true;
- this.buttonRight.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.Image = global::MotorBoat.Properties.Resources.r;
- this.buttonUp.Location = new System.Drawing.Point(669, 324);
- this.buttonUp.Name = "buttonUp";
- this.buttonUp.Size = new System.Drawing.Size(40, 40);
- this.buttonUp.TabIndex = 3;
- this.buttonUp.TabStop = false;
- 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.Image = global::MotorBoat.Properties.Resources.left;
- this.buttonLeft.Location = new System.Drawing.Point(623, 371);
- this.buttonLeft.Name = "buttonLeft";
- this.buttonLeft.Size = new System.Drawing.Size(40, 40);
- this.buttonLeft.TabIndex = 4;
- this.buttonLeft.TabStop = false;
- this.buttonLeft.UseVisualStyleBackColor = true;
- this.buttonLeft.Click += new System.EventHandler(this.ButtonMove_Click);
- //
- // buttonDown
- //
- this.buttonDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
- this.buttonDown.Image = global::MotorBoat.Properties.Resources.d;
- this.buttonDown.Location = new System.Drawing.Point(669, 370);
- this.buttonDown.Name = "buttonDown";
- this.buttonDown.Size = new System.Drawing.Size(40, 40);
- this.buttonDown.TabIndex = 5;
- this.buttonDown.TabStop = false;
- this.buttonDown.UseVisualStyleBackColor = true;
- this.buttonDown.Click += new System.EventHandler(this.ButtonMove_Click);
- //
- // buttonCreate
- //
- this.buttonCreate.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
- this.buttonCreate.Location = new System.Drawing.Point(16, 370);
- this.buttonCreate.Name = "buttonCreate";
- this.buttonCreate.Size = new System.Drawing.Size(111, 44);
- this.buttonCreate.TabIndex = 2;
- this.buttonCreate.Text = "Создать";
- this.buttonCreate.UseVisualStyleBackColor = true;
- this.buttonCreate.Click += new System.EventHandler(this.ButtonCreate_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(133, 369);
- this.buttonCreateModif.Name = "buttonCreateModif";
- this.buttonCreateModif.Size = new System.Drawing.Size(111, 44);
- this.buttonCreateModif.TabIndex = 6;
- 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(8, 8);
- this.comboBoxSelectorMap.Name = "comboBoxSelectorMap";
- this.comboBoxSelectorMap.Size = new System.Drawing.Size(121, 23);
- this.comboBoxSelectorMap.TabIndex = 7;
- 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(800, 450);
- this.Controls.Add(this.comboBoxSelectorMap);
- this.Controls.Add(this.buttonCreateModif);
- this.Controls.Add(this.buttonCreate);
- this.Controls.Add(this.buttonDown);
- this.Controls.Add(this.buttonLeft);
- this.Controls.Add(this.buttonUp);
- this.Controls.Add(this.buttonRight);
- this.Controls.Add(this.pictureBoxMotorBoat);
- this.Controls.Add(this.statusStrip1);
- this.Name = "FormMap";
- this.Text = "FormMap";
- ((System.ComponentModel.ISupportInitialize)(this.pictureBoxMotorBoat)).EndInit();
- this.statusStrip1.ResumeLayout(false);
- this.statusStrip1.PerformLayout();
- this.ResumeLayout(false);
- this.PerformLayout();
-
- }
-
- #endregion
- private StatusStrip statusStrip1;
- private ToolStripStatusLabel toolStripStatusLabelSpeed;
- private ToolStripStatusLabel toolStripStatusLabelWeight;
- private ToolStripStatusLabel toolStripStatusLabelBodyColor;
- private PictureBox pictureBoxMotorBoat;
- private Button buttonRight;
- private Button buttonUp;
- private Button buttonLeft;
- private Button buttonDown;
- private Button buttonCreate;
- private Button buttonCreateModif;
- private ComboBox comboBoxSelectorMap;
- }
-}
\ No newline at end of file
diff --git a/MotorBoat/MotorBoat/FormMap.cs b/MotorBoat/MotorBoat/FormMap.cs
deleted file mode 100644
index 24b199d..0000000
--- a/MotorBoat/MotorBoat/FormMap.cs
+++ /dev/null
@@ -1,107 +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 MotorBoat
-{
- public partial class FormMap : Form
- {
- private AbstractMap _abstractMap;
-
- public FormMap()
- {
- InitializeComponent();
- _abstractMap = new SimpleMap();
- }
- ///
- /// Заполнение информации по объекту
- ///
- ///
- private void SetData(DrawningBoat boat)
- {
- toolStripStatusLabelSpeed.Text = $"Скорость: {boat.Boat.Speed}";
- toolStripStatusLabelWeight.Text = $"Вес: {boat.Boat.Weight}";
- toolStripStatusLabelBodyColor.Text = $"Цвет: {boat.Boat.BodyColor.Name}";
- pictureBoxMotorBoat.Image = _abstractMap.CreateMap(pictureBoxMotorBoat.Width, pictureBoxMotorBoat.Height,
- new DrawningObjectBoat(boat));
- }
- ///
- /// Обработка нажатия кнопки "Создать"
- ///
- ///
- ///
- private void ButtonCreate_Click(object sender, EventArgs e)
- {
- Random rnd = new();
- var boat = new DrawningBoat(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)));
- SetData(boat);
- }
- ///
- /// Изменение размеров формы
- ///
- ///
- ///
- 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;
- }
- pictureBoxMotorBoat.Image = _abstractMap?.MoveObject(dir);
- }
- ///
- /// Обработка нажатия кнопки "Модификация"
- ///
- ///
- ///
- private void ButtonCreateModif_Click(object sender, EventArgs e)
- {
- Random rnd = new();
- var boat = new DrawningMotorBoat(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)), Convert.ToBoolean(rnd.Next(0, 2)));
- SetData(boat);
- }
- ///
- /// Смена карты
- ///
- ///
- ///
- private void ComboBoxSelectorMap_SelectedIndexChanged(object sender, EventArgs e)
- {
- switch (comboBoxSelectorMap.Text)
- {
- case "Простая карта":
- _abstractMap = new SimpleMap();
- break;
- case "Розовая карта":
- _abstractMap = new PinkMap();
- break;
- case "Морская карта":
- _abstractMap = new SeaMap();
- break;
- }
- }
- }
-}
diff --git a/MotorBoat/MotorBoat/FormMapWithSetBoats.Designer.cs b/MotorBoat/MotorBoat/FormMapWithSetBoats.Designer.cs
new file mode 100644
index 0000000..0bdda33
--- /dev/null
+++ b/MotorBoat/MotorBoat/FormMapWithSetBoats.Designer.cs
@@ -0,0 +1,218 @@
+namespace MotorBoat
+{
+ partial class FormMapWithSetBoats
+ {
+ ///
+ /// Required designer variable.
+ ///
+ private System.ComponentModel.IContainer components = null;
+
+ ///
+ /// Clean up any resources being used.
+ ///
+ /// true if managed resources should be disposed; otherwise, false.
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows Form Designer generated code
+
+ ///
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ ///
+ private void InitializeComponent()
+ {
+ this.groupBoxTools = new System.Windows.Forms.GroupBox();
+ this.maskedTextBoxPosition = new System.Windows.Forms.MaskedTextBox();
+ this.buttonRemoveBoat = new System.Windows.Forms.Button();
+ this.buttonShowStorage = new System.Windows.Forms.Button();
+ this.buttonDown = new System.Windows.Forms.Button();
+ this.buttonRight = new System.Windows.Forms.Button();
+ this.buttonLeft = new System.Windows.Forms.Button();
+ this.buttonUp = new System.Windows.Forms.Button();
+ this.buttonShowOnMap = new System.Windows.Forms.Button();
+ this.buttonAddBoat = new System.Windows.Forms.Button();
+ this.comboBoxSelectorMap = new System.Windows.Forms.ComboBox();
+ this.pictureBox = new System.Windows.Forms.PictureBox();
+ this.groupBoxTools.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).BeginInit();
+ this.SuspendLayout();
+ //
+ // groupBoxTools
+ //
+ this.groupBoxTools.Controls.Add(this.maskedTextBoxPosition);
+ this.groupBoxTools.Controls.Add(this.buttonRemoveBoat);
+ this.groupBoxTools.Controls.Add(this.buttonShowStorage);
+ this.groupBoxTools.Controls.Add(this.buttonDown);
+ this.groupBoxTools.Controls.Add(this.buttonRight);
+ this.groupBoxTools.Controls.Add(this.buttonLeft);
+ this.groupBoxTools.Controls.Add(this.buttonUp);
+ this.groupBoxTools.Controls.Add(this.buttonShowOnMap);
+ this.groupBoxTools.Controls.Add(this.buttonAddBoat);
+ this.groupBoxTools.Controls.Add(this.comboBoxSelectorMap);
+ this.groupBoxTools.Dock = System.Windows.Forms.DockStyle.Right;
+ this.groupBoxTools.Location = new System.Drawing.Point(738, 0);
+ this.groupBoxTools.Name = "groupBoxTools";
+ this.groupBoxTools.Size = new System.Drawing.Size(251, 561);
+ this.groupBoxTools.TabIndex = 0;
+ this.groupBoxTools.TabStop = false;
+ this.groupBoxTools.Text = "Инструменты";
+ //
+ // maskedTextBoxPosition
+ //
+ this.maskedTextBoxPosition.Location = new System.Drawing.Point(38, 174);
+ this.maskedTextBoxPosition.Mask = "00";
+ this.maskedTextBoxPosition.Name = "maskedTextBoxPosition";
+ this.maskedTextBoxPosition.Size = new System.Drawing.Size(175, 23);
+ this.maskedTextBoxPosition.TabIndex = 13;
+ this.maskedTextBoxPosition.ValidatingType = typeof(int);
+ //
+ // buttonRemoveBoat
+ //
+ this.buttonRemoveBoat.Location = new System.Drawing.Point(38, 203);
+ this.buttonRemoveBoat.Name = "buttonRemoveBoat";
+ this.buttonRemoveBoat.Size = new System.Drawing.Size(175, 35);
+ this.buttonRemoveBoat.TabIndex = 14;
+ this.buttonRemoveBoat.Text = "Удалить лодку";
+ this.buttonRemoveBoat.UseVisualStyleBackColor = true;
+ this.buttonRemoveBoat.Click += new System.EventHandler(this.ButtonRemoveBoat_Click);
+ //
+ // buttonShowStorage
+ //
+ this.buttonShowStorage.Location = new System.Drawing.Point(38, 298);
+ this.buttonShowStorage.Name = "buttonShowStorage";
+ this.buttonShowStorage.Size = new System.Drawing.Size(175, 35);
+ this.buttonShowStorage.TabIndex = 15;
+ this.buttonShowStorage.Text = "Посмотреть хранилище";
+ this.buttonShowStorage.UseVisualStyleBackColor = true;
+ this.buttonShowStorage.Click += new System.EventHandler(this.ButtonShowStorage_Click);
+ //
+ // buttonDown
+ //
+ this.buttonDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+ this.buttonDown.BackgroundImage = global::MotorBoat.Properties.Resources.d;
+ this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+ this.buttonDown.Location = new System.Drawing.Point(112, 469);
+ this.buttonDown.Name = "buttonDown";
+ this.buttonDown.Size = new System.Drawing.Size(30, 30);
+ this.buttonDown.TabIndex = 20;
+ 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::MotorBoat.Properties.Resources.up;
+ this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+ this.buttonRight.Location = new System.Drawing.Point(148, 469);
+ this.buttonRight.Name = "buttonRight";
+ this.buttonRight.Size = new System.Drawing.Size(30, 30);
+ this.buttonRight.TabIndex = 19;
+ this.buttonRight.UseVisualStyleBackColor = true;
+ this.buttonRight.Click += new System.EventHandler(this.ButtonMove_Click);
+ //
+ // buttonLeft
+ //
+ this.buttonLeft.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+ this.buttonLeft.BackgroundImage = global::MotorBoat.Properties.Resources.left;
+ this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+ this.buttonLeft.Location = new System.Drawing.Point(76, 469);
+ this.buttonLeft.Name = "buttonLeft";
+ this.buttonLeft.Size = new System.Drawing.Size(30, 30);
+ this.buttonLeft.TabIndex = 18;
+ 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::MotorBoat.Properties.Resources.r;
+ this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+ this.buttonUp.Location = new System.Drawing.Point(112, 433);
+ this.buttonUp.Name = "buttonUp";
+ this.buttonUp.Size = new System.Drawing.Size(30, 30);
+ this.buttonUp.TabIndex = 17;
+ this.buttonUp.UseVisualStyleBackColor = true;
+ this.buttonUp.Click += new System.EventHandler(this.ButtonMove_Click);
+ //
+ // buttonShowOnMap
+ //
+ this.buttonShowOnMap.Location = new System.Drawing.Point(38, 377);
+ this.buttonShowOnMap.Name = "buttonShowOnMap";
+ this.buttonShowOnMap.Size = new System.Drawing.Size(175, 35);
+ this.buttonShowOnMap.TabIndex = 16;
+ this.buttonShowOnMap.Text = "Посмотреть карту";
+ this.buttonShowOnMap.UseVisualStyleBackColor = true;
+ this.buttonShowOnMap.Click += new System.EventHandler(this.ButtonShowOnMap_Click);
+ //
+ // buttonAddBoat
+ //
+ this.buttonAddBoat.Location = new System.Drawing.Point(38, 115);
+ this.buttonAddBoat.Name = "buttonAddBoat";
+ this.buttonAddBoat.Size = new System.Drawing.Size(175, 35);
+ this.buttonAddBoat.TabIndex = 12;
+ this.buttonAddBoat.Text = "Добавить лодку";
+ this.buttonAddBoat.UseVisualStyleBackColor = true;
+ this.buttonAddBoat.Click += new System.EventHandler(this.ButtonAddBoat_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(38, 44);
+ this.comboBoxSelectorMap.Name = "comboBoxSelectorMap";
+ this.comboBoxSelectorMap.Size = new System.Drawing.Size(175, 23);
+ this.comboBoxSelectorMap.TabIndex = 11;
+ 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(738, 561);
+ this.pictureBox.TabIndex = 0;
+ this.pictureBox.TabStop = false;
+ //
+ // FormMapWithSetBoats
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(989, 561);
+ this.Controls.Add(this.pictureBox);
+ this.Controls.Add(this.groupBoxTools);
+ this.Name = "FormMapWithSetBoats";
+ this.Text = "FormMapWithSetBoats";
+ this.groupBoxTools.ResumeLayout(false);
+ this.groupBoxTools.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).EndInit();
+ this.ResumeLayout(false);
+
+ }
+
+ #endregion
+
+ private GroupBox groupBoxTools;
+ private MaskedTextBox maskedTextBoxPosition;
+ private Button buttonRemoveBoat;
+ private Button buttonShowStorage;
+ private Button buttonDown;
+ private Button buttonRight;
+ private Button buttonLeft;
+ private Button buttonUp;
+ private Button buttonShowOnMap;
+ private Button buttonAddBoat;
+ private ComboBox comboBoxSelectorMap;
+ private PictureBox pictureBox;
+ }
+}
\ No newline at end of file
diff --git a/MotorBoat/MotorBoat/FormMapWithSetBoats.cs b/MotorBoat/MotorBoat/FormMapWithSetBoats.cs
new file mode 100644
index 0000000..f9155e4
--- /dev/null
+++ b/MotorBoat/MotorBoat/FormMapWithSetBoats.cs
@@ -0,0 +1,130 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace MotorBoat
+{
+ public partial class FormMapWithSetBoats : Form
+ {
+ private MapWithSetBoatsGeneric _mapBoatsCollectionGeneric;
+ public FormMapWithSetBoats()
+ {
+ InitializeComponent();
+ }
+ private void ComboBoxSelectorMap_SelectedIndexChanged(object sender, EventArgs e)
+ {
+ AbstractMap map = null;
+ switch (comboBoxSelectorMap.Text)
+ {
+ case "Простая карта":
+ map = new SimpleMap();
+ break;
+ case "Розовая карта":
+ map = new PinkMap();
+ break;
+ case "Морская карта":
+ map = new SeaMap();
+ break;
+ }
+ if (map != null)
+ {
+ _mapBoatsCollectionGeneric = new MapWithSetBoatsGeneric(
+ pictureBox.Width, pictureBox.Height, map);
+ }
+ else
+ {
+ _mapBoatsCollectionGeneric = null;
+ }
+ }
+ private void ButtonAddBoat_Click(object sender, EventArgs e)
+ {
+ if (_mapBoatsCollectionGeneric == null)
+ {
+ return;
+ }
+ FormBoat form = new();
+ if (form.ShowDialog() == DialogResult.OK)
+ {
+ DrawningObjectBoat boat = new(form.SelectedBoat);
+ if (_mapBoatsCollectionGeneric + boat != -1)
+ {
+ MessageBox.Show("Объект добавлен");
+ pictureBox.Image = _mapBoatsCollectionGeneric.ShowSet();
+ }
+ else
+ {
+ MessageBox.Show("Не удалось добавить объект");
+ }
+ }
+ }
+ private void ButtonRemoveBoat_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 (_mapBoatsCollectionGeneric - pos != null)
+ {
+ MessageBox.Show("Объект удален");
+ pictureBox.Image = _mapBoatsCollectionGeneric.ShowSet();
+ }
+ else
+ {
+ MessageBox.Show("Не удалось удалить объект");
+ }
+ }
+ private void ButtonShowStorage_Click(object sender, EventArgs e)
+ {
+ if (_mapBoatsCollectionGeneric == null)
+ {
+ return;
+ }
+ pictureBox.Image = _mapBoatsCollectionGeneric.ShowSet();
+ }
+ private void ButtonShowOnMap_Click(object sender, EventArgs e)
+ {
+ if (_mapBoatsCollectionGeneric == null)
+ {
+ return;
+ }
+ pictureBox.Image = _mapBoatsCollectionGeneric.ShowOnMap();
+ }
+ private void ButtonMove_Click(object sender, EventArgs e)
+ {
+ if (_mapBoatsCollectionGeneric == 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 = _mapBoatsCollectionGeneric.MoveObject(dir);
+ }
+ }
+
+}
diff --git a/MotorBoat/MotorBoat/FormMap.resx b/MotorBoat/MotorBoat/FormMapWithSetBoats.resx
similarity index 93%
rename from MotorBoat/MotorBoat/FormMap.resx
rename to MotorBoat/MotorBoat/FormMapWithSetBoats.resx
index 5cb320f..f298a7b 100644
--- a/MotorBoat/MotorBoat/FormMap.resx
+++ b/MotorBoat/MotorBoat/FormMapWithSetBoats.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/MotorBoat/MotorBoat/MapWithSetBoatsGeneric.cs b/MotorBoat/MotorBoat/MapWithSetBoatsGeneric.cs
new file mode 100644
index 0000000..08e38f4
--- /dev/null
+++ b/MotorBoat/MotorBoat/MapWithSetBoatsGeneric.cs
@@ -0,0 +1,171 @@
+namespace MotorBoat
+{
+ /// Карта с набром объектов под нее
+ internal class MapWithSetBoatsGeneric
+ where T : class, IDrawningObject
+ where U : AbstractMap
+ {
+ /// Ширина окна отрисовки
+ private readonly int _pictureWidth;
+ /// Высота окна отрисовки
+ private readonly int _pictureHeight;
+ /// Размер занимаемого объектом места (ширина)
+ private readonly int _placeSizeWidth = 210;
+ /// Размер занимаемого объектом места (высота)
+ private readonly int _placeSizeHeight = 70;
+ /// Набор объектов
+ private readonly SetBoatsGeneric _setBoats;
+ /// Карта
+ private readonly U _map;
+ /// Конструктор
+ public MapWithSetBoatsGeneric(int picWidth, int picHeight, U map)
+ {
+ int width = picWidth / _placeSizeWidth;
+ int height = picHeight / _placeSizeHeight;
+ _setBoats = new SetBoatsGeneric(width * height);
+ _pictureWidth = picWidth;
+ _pictureHeight = picHeight;
+ _map = map;
+ }
+ /// Перегрузка оператора сложения
+ public static int operator +(MapWithSetBoatsGeneric map, T boat)
+ {
+ return map._setBoats.Insert(boat);
+ }
+ /// Перегрузка оператора вычитания
+ public static T operator -(MapWithSetBoatsGeneric map, int position)
+ {
+ return map._setBoats.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 < _setBoats.Count; i++)
+ {
+ var boat = _setBoats.Get(i);
+ if (boat != null)
+ {
+ return _map.CreateMap(_pictureWidth, _pictureHeight, boat);
+ }
+ }
+ 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 = _setBoats.Count - 1;
+ for (int i = 0; i < _setBoats.Count; i++)
+ {
+ if (_setBoats.Get(i) == null)
+ {
+ for (; j > i; j--)
+ {
+ var car = _setBoats.Get(j);
+ if (car != null)
+ {
+ _setBoats.Insert(car, i);
+ _setBoats.Remove(j);
+ break;
+ }
+ }
+ if (j <= i)
+ {
+ return;
+ }
+ }
+ }
+ }
+ /// Метод отрисовки фона
+ private void DrawBackground(Graphics g)
+ {
+ g.FillRectangle(new SolidBrush(Color.LightBlue), 0, 0, _pictureWidth, _pictureHeight);
+ Brush brGavan = new SolidBrush(Color.Gray);
+ Brush brGreen = new SolidBrush(Color.Khaki);
+ g.FillRectangle(brGreen, 0, 0, _pictureWidth, 30);
+ g.FillRectangle(brGreen, _pictureWidth - 30, 0, 30, _pictureHeight);
+
+ g.FillRectangle(brGavan, 30, 30, _pictureWidth - 60, 30);
+ g.FillRectangle(brGavan, _pictureWidth - 60, 30, 30, _pictureHeight - 60);
+ g.FillRectangle(brGavan, _pictureWidth / 2, 60, 60, _pictureHeight - 100);
+ }
+ /// Метод прорисовки объектов
+ private void DrawCars(Graphics g)
+ {
+ int curWidth = 50;
+ int curHeight = 60;
+ bool right = true;
+ bool down = false;
+ bool rightdown = false;
+
+ for (int i = 0; i < _setBoats.Count; i++)
+ {
+ if (right)
+ {
+ _setBoats.Get(i)?.SetObject(curWidth, curHeight + _placeSizeHeight, _placeSizeWidth, _placeSizeHeight);
+ g.RotateTransform(270, 0);
+ g.TranslateTransform(-190, 0);
+ _setBoats.Get(i)?.DrawningObject(g);
+ g.TranslateTransform(190, 0);
+ g.RotateTransform(-270, 0);
+
+ if (curHeight > 300 && curHeight < 400)
+ {
+ curHeight += 80;
+ }
+ curHeight += _placeSizeHeight;
+
+ if (curHeight >= _pictureWidth - 100)
+ {
+ right = false;
+ down = true;
+ g.TranslateTransform(_pictureWidth / 2 + _placeSizeWidth, 0);
+ curWidth = 500;
+ curHeight = 200;
+ }
+ }
+ else if (down)
+ {
+ if (rightdown)
+ {
+ rightdown = false;
+ _setBoats.Get(i)?.SetObject(curWidth, curHeight + _placeSizeHeight, _placeSizeWidth, _placeSizeHeight);
+ g.TranslateTransform(_placeSizeWidth + 90, 0);
+ _setBoats.Get(i)?.DrawningObject(g);
+ curHeight += _placeSizeHeight;
+ }
+ else
+ {
+ rightdown = true;
+ _setBoats.Get(i)?.SetObject(curWidth, curHeight + _placeSizeHeight, _placeSizeWidth, _placeSizeHeight);
+
+ g.TranslateTransform(-_placeSizeWidth - 90, 0);
+ _setBoats.Get(i)?.DrawningObject(g);
+
+ }
+ if (curHeight >= _pictureHeight - 30) { down = false; return; }
+
+ }
+
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/MotorBoat/MotorBoat/Program.cs b/MotorBoat/MotorBoat/Program.cs
index 5f309a4..fff7c6a 100644
--- a/MotorBoat/MotorBoat/Program.cs
+++ b/MotorBoat/MotorBoat/Program.cs
@@ -11,7 +11,7 @@ namespace MotorBoat
// 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 FormMapWithSetBoats());
}
}
}
\ No newline at end of file
diff --git a/MotorBoat/MotorBoat/SetBoatsGeneric.cs b/MotorBoat/MotorBoat/SetBoatsGeneric.cs
new file mode 100644
index 0000000..0c788f4
--- /dev/null
+++ b/MotorBoat/MotorBoat/SetBoatsGeneric.cs
@@ -0,0 +1,71 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MotorBoat
+{
+ internal class SetBoatsGeneric
+ where T : class
+ {
+ private readonly T[] _places;
+ public int Count => _places.Length;
+ public SetBoatsGeneric(int count)
+ {
+ _places = new T[count];
+ }
+ public int Insert(T boat)
+ {
+ return Insert(boat, 0);
+ }
+ public int Insert(T boat, int position)
+ {
+ // TODO проверка позиции
+ if (position >= _places.Length || position < 0)
+ return -1;
+ // TODO проверка, что элемент массива по этой позиции пустой, если нет, то
+ if (_places[position] == null)
+ {
+ _places[position] = boat;
+ return position;
+ }
+ // проверка, что после вставляемого элемента в массиве есть пустой элемент
+ int EmptyPos = -1;
+
+ for (int i = position + 1; i < Count; i++)
+ {
+ if (_places[i] == null)
+ {
+ EmptyPos = i;
+ break;
+ }
+ }
+ if (EmptyPos < 0) return -1;
+ // сдвиг всех объектов, находящихся справа от позиции до первого пустого элемента
+ for (int i = EmptyPos; i > position; i--)
+ {
+ _places[i] = _places[i - 1];
+ }
+ // вставка по позиции
+ _places[position] = boat;
+ return position;
+ }
+ public T Remove(int position)
+ {
+ // TODO проверка позиции
+ if (position >= _places.Length || position < 0) return null;
+ // TODO удаление объекта из массива, присовив элементу массива значение null
+ T temp = _places[position];
+ _places[position] = null;
+ return temp;
+ }
+ public T Get(int position)
+ {
+ // TODO проверка позиции
+ if (position >= _places.Length || position < 0)
+ return null;
+ return _places[position];
+ }
+ }
+}
\ No newline at end of file