diff --git a/ProjectWarmlyShip/ProjectWarmlyShip/DirectionType.cs b/ProjectWarmlyShip/ProjectWarmlyShip/Drawnings/DirectionType.cs
similarity index 72%
rename from ProjectWarmlyShip/ProjectWarmlyShip/DirectionType.cs
rename to ProjectWarmlyShip/ProjectWarmlyShip/Drawnings/DirectionType.cs
index 07d8193..c645a8d 100644
--- a/ProjectWarmlyShip/ProjectWarmlyShip/DirectionType.cs
+++ b/ProjectWarmlyShip/ProjectWarmlyShip/Drawnings/DirectionType.cs
@@ -1,9 +1,13 @@
-namespace ProjectWarmlyShip;
+namespace ProjectWarmlyShip.Drawnings;
///
/// Направления при перемещении
///
public enum DirectionType
{
+ ///
+ /// Неизвестное направление
+ ///
+ Unknow = -1,
///
/// Вверх
///
diff --git a/ProjectWarmlyShip/ProjectWarmlyShip/DrawningWarmlyShip.cs b/ProjectWarmlyShip/ProjectWarmlyShip/Drawnings/DrawningShip.cs
similarity index 51%
rename from ProjectWarmlyShip/ProjectWarmlyShip/DrawningWarmlyShip.cs
rename to ProjectWarmlyShip/ProjectWarmlyShip/Drawnings/DrawningShip.cs
index 1f5f2dc..4fe08b1 100644
--- a/ProjectWarmlyShip/ProjectWarmlyShip/DrawningWarmlyShip.cs
+++ b/ProjectWarmlyShip/ProjectWarmlyShip/Drawnings/DrawningShip.cs
@@ -1,60 +1,83 @@
-namespace ProjectWarmlyShip;
+using ProjectWarmlyShip.Entities;
-public class DrawningWarmlyShip
+namespace ProjectWarmlyShip.Drawnings;
+
+public class DrawningShip
{
///
/// Класс-сущность
///
- public EntityWarmlyShip? EntityWarmlyShip { get; private set; }
-
+ public EntityShip? EntityShip { get; protected set; }
///
/// Ширина окна
///
private int? _pictureWidth;
-
///
/// Высота окна
///
private int? _pictureHeight;
-
///
/// Левая координата прорисовки
///
- private int? _startPosX;
-
+ protected int? _startPosX;
///
/// Верхняя кооридната прорисовки
///
- private int? _startPosY;
-
+ protected int? _startPosY;
///
/// Ширина прорисовки
///
private readonly int _drawningShipWidth = 150;
-
///
/// Высота прорисовки
///
- private int _drawningShipHeight = 140;
-
+ protected int _drawningShipHeight = 80;
///
- /// Инициализация свойств
+ /// Координаты Х
///
- ///
- ///
- ///
- ///
- ///
- ///
- public void Init(int speed, double weight, Color bodycolor, Color additionalcolor, bool shpipipes, bool fueltank)
+ public int? GetPosX => _startPosX;
+ ///
+ /// Координтаы У
+ ///
+ public int? GetPosY => _startPosY;
+ ///
+ /// Ширина объекта
+ ///
+ public int GetWidht => _drawningShipWidth;
+ ///
+ /// Высота объекта
+ ///
+ public int GetHeight => _drawningShipHeight;
+ ///
+ /// Пустой конструктор
+ ///
+ private DrawningShip()
{
- EntityWarmlyShip = new EntityWarmlyShip();
- EntityWarmlyShip.Init(speed, weight, bodycolor, additionalcolor, shpipipes, fueltank);
_pictureWidth = null;
_pictureHeight = null;
_startPosX = null;
_startPosY = null;
}
+ ///
+ /// Конструктор
+ ///
+ ///
+ ///
+ ///
+ public DrawningShip(int speed, double weight, Color bodycolor) : this()
+ {
+ EntityShip = new EntityShip(speed, weight, bodycolor);
+ }
+ ///
+ /// Конструктор для наследования
+ ///
+ ///
+ ///
+ protected DrawningShip(int _drawningShipWidth, int _drawnShipHeight) : this()
+ {
+ this._drawningShipWidth= _drawningShipWidth;
+ this._drawningShipHeight = _drawnShipHeight;
+ }
public bool SetPictureSize(int width, int height)
{
// TODO проверка, что объект "влезает" в размеры поля
@@ -105,7 +128,7 @@ public class DrawningWarmlyShip
}
public bool MoveTransport(DirectionType direction)
{
- if (EntityWarmlyShip == null || !_startPosX.HasValue || !_startPosY.HasValue)
+ if (EntityShip == null || !_startPosX.HasValue || !_startPosY.HasValue)
{
return false;
}
@@ -113,32 +136,32 @@ public class DrawningWarmlyShip
{
//влево
case DirectionType.Left:
- if (_startPosX.Value - EntityWarmlyShip.Step > 0)
+ if (_startPosX.Value - EntityShip.Step > 0)
{
- _startPosX -= (int)EntityWarmlyShip.Step;
+ _startPosX -= (int)EntityShip.Step;
}
return true;
//вверх
case DirectionType.Up:
- if (_startPosY.Value - EntityWarmlyShip.Step > 0)
+ if (_startPosY.Value - EntityShip.Step > 0)
{
- _startPosY -= (int)EntityWarmlyShip.Step;
+ _startPosY -= (int)EntityShip.Step;
}
return true;
// вправо
case DirectionType.Right:
- if (_startPosX.Value + _drawningShipWidth + EntityWarmlyShip.Step < _pictureWidth)
+ if (_startPosX.Value + _drawningShipWidth + EntityShip.Step < _pictureWidth)
{
- _startPosX += (int)EntityWarmlyShip.Step;
+ _startPosX += (int)EntityShip.Step;
}
return true;
//вниз
case DirectionType.Down:
- if (_startPosY.Value + _drawningShipHeight + EntityWarmlyShip.Step < _pictureHeight)
+ if (_startPosY.Value + _drawningShipHeight + EntityShip.Step < _pictureHeight)
{
- _startPosY += (int)EntityWarmlyShip.Step;
+ _startPosY += (int)EntityShip.Step;
}
- return true;
+ return true;
default:
return false;
}
@@ -147,58 +170,24 @@ public class DrawningWarmlyShip
/// Отрисовка объекта
///
///
- public void DrawTransport(Graphics g)
+ public virtual void DrawTransport(Graphics g)
{
- if (EntityWarmlyShip == null || !_startPosX.HasValue || !_startPosY.HasValue)
+ if (EntityShip == null || !_startPosX.HasValue || !_startPosY.HasValue)
{
return;
}
- Pen pen = new(Color.Black , 5);
-
- //трубы
- Brush brush = new SolidBrush(EntityWarmlyShip.AdditionalColor);
- if (EntityWarmlyShip.ShipPipes)
+ Pen pen = new(Color.Black, 5);
+ //надстройка
+ Brush brush = new SolidBrush(EntityShip.BodyColor);
+ g.FillRectangle(brush, _startPosX.Value + 30, _startPosY.Value, 100, 30);
+ //корпус
+ g.FillPolygon(brush, new Point[]
{
- g.FillRectangle(brush, _startPosX.Value + 70, _startPosY.Value, 12, 60);
- g.FillRectangle(brush, _startPosX.Value + 90, _startPosY.Value, 12, 60);
- //надстройка
- brush = new SolidBrush(EntityWarmlyShip.BodyColor);
- g.FillRectangle(brush, _startPosX.Value + 30, _startPosY.Value + 60, 100, 30);
- //корпус
- g.FillPolygon(brush, new Point[]
- {
- new Point(_startPosX.Value,_startPosY.Value + 90), new Point(_startPosX.Value + 150, _startPosY.Value + 90),
- new Point(_startPosX.Value + 150, _startPosY.Value + 90), new Point(_startPosX.Value + 120,_startPosY.Value + 140),
- new Point(_startPosX.Value + 120,_startPosY.Value + 140), new Point(_startPosX.Value + 30,_startPosY.Value + 140),
- new Point(_startPosX.Value + 30,_startPosY.Value + 140), new Point(_startPosX.Value,_startPosY.Value + 90),
- });
- _drawningShipHeight = 140;
- }
- else
- {
- //надстройка
- brush = new SolidBrush(EntityWarmlyShip.BodyColor);
- g.FillRectangle(brush, _startPosX.Value + 30, _startPosY.Value, 100, 30);
- //корпус
- g.FillPolygon(brush, new Point[]
- {
- new Point(_startPosX.Value,_startPosY.Value + 30), new Point(_startPosX.Value + 150, _startPosY.Value + 30),
- new Point(_startPosX.Value + 150, _startPosY.Value + 30), new Point(_startPosX.Value + 120,_startPosY.Value + 80),
- new Point(_startPosX.Value + 120,_startPosY.Value + 80), new Point(_startPosX.Value + 30,_startPosY.Value + 80),
- new Point(_startPosX.Value + 30,_startPosY.Value + 80), new Point(_startPosX.Value,_startPosY.Value + 30),
- });
- _drawningShipHeight = 80;
- }
- //топливный бак
- if (EntityWarmlyShip.FuelTank)
- {
- brush = new SolidBrush(EntityWarmlyShip.AdditionalColor);
- if (EntityWarmlyShip.ShipPipes)
- g.FillRectangle(brush, _startPosX.Value + 40, _startPosY.Value + 120, 70, 10);
- else
- g.FillRectangle(brush, _startPosX.Value + 40, _startPosY.Value + 60, 70, 10);
- }
-
+ new Point(_startPosX.Value,_startPosY.Value + 30), new Point(_startPosX.Value + 150, _startPosY.Value + 30),
+ new Point(_startPosX.Value + 150, _startPosY.Value + 30), new Point(_startPosX.Value + 120,_startPosY.Value + 80),
+ new Point(_startPosX.Value + 120,_startPosY.Value + 80), new Point(_startPosX.Value + 30,_startPosY.Value + 80),
+ new Point(_startPosX.Value + 30,_startPosY.Value + 80), new Point(_startPosX.Value,_startPosY.Value + 30),
+ });
}
-
}
+
diff --git a/ProjectWarmlyShip/ProjectWarmlyShip/Drawnings/DrawningWarmlyShip.cs b/ProjectWarmlyShip/ProjectWarmlyShip/Drawnings/DrawningWarmlyShip.cs
new file mode 100644
index 0000000..fd00dc6
--- /dev/null
+++ b/ProjectWarmlyShip/ProjectWarmlyShip/Drawnings/DrawningWarmlyShip.cs
@@ -0,0 +1,39 @@
+using ProjectWarmlyShip.Entities;
+
+namespace ProjectWarmlyShip.Drawnings;
+
+public class DrawningWarmlyShip : DrawningShip
+{
+ ///
+ /// Конструктор
+ ///
+ ///
+ ///
+ ///
+ public DrawningWarmlyShip(int speed, double weight, Color bodycolor, Color additionalcolor, bool shpipipes, bool fueltank) : base(150,80)
+ {
+ EntityShip = new EntityWarmlyShip(speed, weight, bodycolor, additionalcolor, shpipipes, fueltank); //дописать конструктор
+ }
+ public override void DrawTransport(Graphics g)
+ {
+ //оператор is совместимость объекта с заданным типом
+ if (EntityShip == null || EntityShip is not EntityWarmlyShip warmlyship || !_startPosX.HasValue || !_startPosY.HasValue)
+ {
+ return;
+ }
+ Brush brush = new SolidBrush(warmlyship.AdditionalColor);
+ if (warmlyship.ShipPipes)
+ {
+ _drawningShipHeight = 140;
+ g.FillRectangle(brush, _startPosX.Value + 70, _startPosY.Value, 12, 60);
+ g.FillRectangle(brush, _startPosX.Value + 90, _startPosY.Value, 12, 60);
+ _startPosY += 60;
+ }
+ base.DrawTransport(g);
+ if (warmlyship.FuelTank)
+ {
+ g.FillRectangle(brush, _startPosX.Value + 40, _startPosY.Value + 60, 70, 10);
+ }
+ if (warmlyship.ShipPipes) _startPosY -= 60;
+ }
+}
diff --git a/ProjectWarmlyShip/ProjectWarmlyShip/Entities/EntityShip.cs b/ProjectWarmlyShip/ProjectWarmlyShip/Entities/EntityShip.cs
new file mode 100644
index 0000000..4da86e7
--- /dev/null
+++ b/ProjectWarmlyShip/ProjectWarmlyShip/Entities/EntityShip.cs
@@ -0,0 +1,34 @@
+namespace ProjectWarmlyShip.Entities;
+
+public class EntityShip
+{
+ ///
+ /// Скорость
+ ///
+ public int Speed { get; private set; }
+ ///
+ /// Вес
+ ///
+ public double Weight { get; private set; }
+ ///
+ /// Основной цвет
+ ///
+ public Color BodyColor { get; private set; }
+ ///
+ /// Шаг перемещения судна
+ ///
+ public double Step => Speed * 100 / Weight;
+ ///
+ /// Конструктор сущности
+ ///
+ ///
+ ///
+ ///
+ public EntityShip(int speed, double weight, Color bodycolor)
+ {
+ Speed = speed;
+ Weight = weight;
+ BodyColor = bodycolor;
+ }
+}
+
diff --git a/ProjectWarmlyShip/ProjectWarmlyShip/Entities/EntityWarmlyShip.cs b/ProjectWarmlyShip/ProjectWarmlyShip/Entities/EntityWarmlyShip.cs
new file mode 100644
index 0000000..a4a6396
--- /dev/null
+++ b/ProjectWarmlyShip/ProjectWarmlyShip/Entities/EntityWarmlyShip.cs
@@ -0,0 +1,29 @@
+namespace ProjectWarmlyShip.Entities;
+
+public class EntityWarmlyShip : EntityShip
+{
+ ///
+ /// Дополнительтный цвет
+ ///
+ public Color AdditionalColor { get; private set; }
+ ///
+ /// Признак наличия труб
+ ///
+ public bool ShipPipes { get; private set; }
+ ///
+ /// Признак наличия топливного бака
+ ///
+ public bool FuelTank { get; private set; }
+ ///
+ /// Инициализация полей класса EntityWarmlyShip
+ ///
+ ///
+ ///
+ ///
+ public EntityWarmlyShip(int speed, double weight, Color bodycolor, Color additionalcolor, bool shpipipes, bool fueltank) : base(speed, weight, bodycolor)
+ {
+ AdditionalColor = additionalcolor;
+ ShipPipes = shpipipes;
+ FuelTank = fueltank;
+ }
+}
diff --git a/ProjectWarmlyShip/ProjectWarmlyShip/EntityWarmlyShip.cs b/ProjectWarmlyShip/ProjectWarmlyShip/EntityWarmlyShip.cs
deleted file mode 100644
index 1784315..0000000
--- a/ProjectWarmlyShip/ProjectWarmlyShip/EntityWarmlyShip.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-namespace ProjectWarmlyShip;
-
-public class EntityWarmlyShip
-{
- ///
- /// Скорость
- ///
- public int Speed { get; private set; }
- ///
- /// Вес
- ///
- public double Weight { get; private set; }
- ///
- /// Основной цвет
- ///
- public Color BodyColor { get; private set; }
- ///
- /// Дополнительтный цвет
- ///
- public Color AdditionalColor { get; private set; }
- ///
- /// Признак наличия труб
- ///
- public bool ShipPipes { get; private set; }
- ///
- /// Признак наличия топливного бака
- ///
- public bool FuelTank { get; private set; }
- ///
- /// Шаг перемещения судна
- ///
- public double Step => Speed * 100 / Weight;
- ///
- /// Инициализация полей класса WarmlyShip
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- public void Init(int speed, double weight, Color bodycolor, Color additionalcolor, bool shpipipes, bool fueltank)
- {
- Speed = speed;
- Weight = weight;
- BodyColor = bodycolor;
- AdditionalColor = additionalcolor;
- ShipPipes = shpipipes;
- FuelTank = fueltank;
- }
-}
diff --git a/ProjectWarmlyShip/ProjectWarmlyShip/FormWarmlyShip.Designer.cs b/ProjectWarmlyShip/ProjectWarmlyShip/FormWarmlyShip.Designer.cs
index ba3ee26..2d76590 100644
--- a/ProjectWarmlyShip/ProjectWarmlyShip/FormWarmlyShip.Designer.cs
+++ b/ProjectWarmlyShip/ProjectWarmlyShip/FormWarmlyShip.Designer.cs
@@ -34,6 +34,9 @@
buttonRight = new Button();
buttonLeft = new Button();
buttonDown = new Button();
+ buttonСreateShip = new Button();
+ comboBoxStrategy = new ComboBox();
+ buttonStrategyStep = new Button();
((System.ComponentModel.ISupportInitialize)pictureBoxWarmlyShip).BeginInit();
SuspendLayout();
//
@@ -55,9 +58,9 @@
buttonCreate.ForeColor = SystemColors.ControlText;
buttonCreate.Location = new Point(12, 331);
buttonCreate.Name = "buttonCreate";
- buttonCreate.Size = new Size(75, 23);
+ buttonCreate.Size = new Size(118, 23);
buttonCreate.TabIndex = 1;
- buttonCreate.Text = "Создать";
+ buttonCreate.Text = "Создать теплоход";
buttonCreate.UseVisualStyleBackColor = false;
buttonCreate.Click += ButtonCreate_Click;
//
@@ -109,11 +112,48 @@
buttonDown.UseVisualStyleBackColor = true;
buttonDown.Click += ButtonMove_Click;
//
+ // buttonСreateShip
+ //
+ buttonСreateShip.Anchor = AnchorStyles.Bottom | AnchorStyles.Left;
+ buttonСreateShip.BackColor = SystemColors.ButtonHighlight;
+ buttonСreateShip.Cursor = Cursors.IBeam;
+ buttonСreateShip.ForeColor = SystemColors.ControlText;
+ buttonСreateShip.Location = new Point(146, 331);
+ buttonСreateShip.Name = "buttonСreateShip";
+ buttonСreateShip.Size = new Size(118, 23);
+ buttonСreateShip.TabIndex = 6;
+ buttonСreateShip.Text = "Создать судно";
+ buttonСreateShip.UseVisualStyleBackColor = false;
+ buttonСreateShip.Click += buttonСreateShip_Click;
+ //
+ // comboBoxStrategy
+ //
+ comboBoxStrategy.DropDownStyle = ComboBoxStyle.DropDownList;
+ comboBoxStrategy.FormattingEnabled = true;
+ comboBoxStrategy.Items.AddRange(new object[] { "К центру", "К краю" });
+ comboBoxStrategy.Location = new Point(685, 12);
+ comboBoxStrategy.Name = "comboBoxStrategy";
+ comboBoxStrategy.Size = new Size(133, 23);
+ comboBoxStrategy.TabIndex = 7;
+ //
+ // buttonStrategyStep
+ //
+ buttonStrategyStep.Location = new Point(732, 41);
+ buttonStrategyStep.Name = "buttonStrategyStep";
+ buttonStrategyStep.Size = new Size(86, 23);
+ buttonStrategyStep.TabIndex = 8;
+ buttonStrategyStep.Text = "Шаг";
+ buttonStrategyStep.UseVisualStyleBackColor = true;
+ buttonStrategyStep.Click += buttonStrategyStep_Click;
+ //
// FormWarmlyShip
//
AutoScaleDimensions = new SizeF(7F, 15F);
AutoScaleMode = AutoScaleMode.Font;
ClientSize = new Size(830, 366);
+ Controls.Add(buttonStrategyStep);
+ Controls.Add(comboBoxStrategy);
+ Controls.Add(buttonСreateShip);
Controls.Add(buttonDown);
Controls.Add(buttonLeft);
Controls.Add(buttonRight);
@@ -135,5 +175,8 @@
private Button buttonRight;
private Button buttonLeft;
private Button buttonDown;
+ private Button buttonСreateShip;
+ private ComboBox comboBoxStrategy;
+ private Button buttonStrategyStep;
}
}
\ No newline at end of file
diff --git a/ProjectWarmlyShip/ProjectWarmlyShip/FormWarmlyShip.cs b/ProjectWarmlyShip/ProjectWarmlyShip/FormWarmlyShip.cs
index e625356..65c0832 100644
--- a/ProjectWarmlyShip/ProjectWarmlyShip/FormWarmlyShip.cs
+++ b/ProjectWarmlyShip/ProjectWarmlyShip/FormWarmlyShip.cs
@@ -1,31 +1,73 @@
-namespace ProjectWarmlyShip
+using ProjectWarmlyShip.Drawnings;
+using ProjectWarmlyShip.MovementStrategy;
+
+namespace ProjectWarmlyShip
{
public partial class FormWarmlyShip : Form
{
- private DrawningWarmlyShip? _drawningWarmlyShip;
+ private DrawningShip? _drawningShip;
+ private AbstractStrategy? _strategy;
public FormWarmlyShip()
{
InitializeComponent();
+ _strategy = null;
}
- private void ButtonCreate_Click(object sender, EventArgs e)
+ private void Draw()
{
- Random random = new();
- _drawningWarmlyShip = new DrawningWarmlyShip();
- _drawningWarmlyShip.Init(random.Next(100, 300), random.Next(1000, 3000),
- Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)),
- Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)),
- Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2)));
- _drawningWarmlyShip.SetPictureSize(pictureBoxWarmlyShip.Width, pictureBoxWarmlyShip.Height);
- _drawningWarmlyShip.SetPosition(random.Next(10, 100), random.Next(10, 100));
-
+ if (_drawningShip == null)
+ {
+ return;
+ }
Bitmap bmp = new(pictureBoxWarmlyShip.Width, pictureBoxWarmlyShip.Height);
Graphics gr = Graphics.FromImage(bmp);
- _drawningWarmlyShip.DrawTransport(gr);
+ _drawningShip.DrawTransport(gr);
pictureBoxWarmlyShip.Image = bmp;
}
+ private void CreateObject(string type)
+ {
+ Random random = new Random();
+ switch (type)
+ {
+ case nameof(DrawningShip):
+ _drawningShip = new DrawningShip(random.Next(100, 300), random.Next(1000, 3000),
+ Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)));
+ break;
+ case nameof(DrawningWarmlyShip):
+ _drawningShip = new DrawningWarmlyShip(random.Next(100, 300), random.Next(1000, 3000),
+ Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)),
+ Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)),
+ Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2)));
+ break;
+ default:
+ return;
+ }
+ _drawningShip.SetPictureSize(pictureBoxWarmlyShip.Width, pictureBoxWarmlyShip.Height);
+ _drawningShip.SetPosition(random.Next(10, 100), random.Next(10, 100));
+ _strategy = null;
+ comboBoxStrategy.Enabled = true;
+ Draw();
+ }
+ ///
+ /// Кнопка создания теплохода
+ ///
+ ///
+ ///
+ private void ButtonCreate_Click(object sender, EventArgs e)
+ {
+ CreateObject(nameof(DrawningWarmlyShip));
+ }
+ ///
+ /// Кнопка создания судна
+ ///
+ ///
+ ///
+ private void buttonСreateShip_Click(object sender, EventArgs e)
+ {
+ CreateObject(nameof(DrawningShip));
+ }
private void ButtonMove_Click(object sender, EventArgs e)
{
- if (_drawningWarmlyShip == null)
+ if (_drawningShip == null)
{
return;
}
@@ -34,27 +76,56 @@
switch (name)
{
case "buttonUp":
- result = _drawningWarmlyShip.MoveTransport(DirectionType.Up);
+ result = _drawningShip.MoveTransport(DirectionType.Up);
break;
case "buttonDown":
- result = _drawningWarmlyShip.MoveTransport(DirectionType.Down);
+ result = _drawningShip.MoveTransport(DirectionType.Down);
break;
case "buttonLeft":
- result = _drawningWarmlyShip.MoveTransport(DirectionType.Left);
+ result = _drawningShip.MoveTransport(DirectionType.Left);
break;
case "buttonRight":
- result = _drawningWarmlyShip.MoveTransport(DirectionType.Right);
+ result = _drawningShip.MoveTransport(DirectionType.Right);
break;
}
if (result)
{
- Bitmap bmp = new(pictureBoxWarmlyShip.Width, pictureBoxWarmlyShip.Height);
- Graphics gr = Graphics.FromImage(bmp);
- _drawningWarmlyShip.DrawTransport(gr);
- pictureBoxWarmlyShip.Image = bmp;
+ Draw();
+ }
+ }
+ private void buttonStrategyStep_Click(object sender, EventArgs e)
+ {
+ if (_drawningShip == null)
+ {
+ return;
+ }
+ if (comboBoxStrategy.Enabled)
+ {
+ _strategy = comboBoxStrategy.SelectedIndex switch
+ {
+ 0 => new MoveToCenter(),
+ 1 => new MoveToBorder(),
+ _ => null,
+ };
+ if (_strategy == null)
+ {
+ return;
+ }
+ _strategy.SetData(new MoveableShip(_drawningShip),
+ pictureBoxWarmlyShip.Width, pictureBoxWarmlyShip.Height);
+ }
+ if (_strategy == null)
+ {
+ return;
+ }
+ comboBoxStrategy.Enabled = false;
+ _strategy.MakeStep();
+ Draw();
+ if (_strategy.GetStatus == StrategyStatus.Finish)
+ {
+ comboBoxStrategy.Enabled = true;
+ _strategy = null;
}
}
-
}
-
}
diff --git a/ProjectWarmlyShip/ProjectWarmlyShip/MovementStrategy/AbstractStrategy.cs b/ProjectWarmlyShip/ProjectWarmlyShip/MovementStrategy/AbstractStrategy.cs
new file mode 100644
index 0000000..9647eaf
--- /dev/null
+++ b/ProjectWarmlyShip/ProjectWarmlyShip/MovementStrategy/AbstractStrategy.cs
@@ -0,0 +1,115 @@
+namespace ProjectWarmlyShip.MovementStrategy;
+
+public abstract class AbstractStrategy
+{
+ ///
+ /// Перемещаемый объект
+ ///
+ private IMoveableObjects? _moveableObject;
+ ///
+ /// Статус перемещения
+ ///
+ private StrategyStatus _state = StrategyStatus.NotInit;
+ ///
+ /// Ширина поля
+ ///
+ protected int FieldWidth { get; private set; }
+ ///
+ /// Высота поля
+ ///
+ protected int FieldHeight { get; private set; }
+ ///
+ /// Статус перемещения
+ ///
+ public StrategyStatus GetStatus {get { return _state; }}
+ ///
+ /// Установка данных
+ ///
+ ///
+ ///
+ ///
+ public void SetData(IMoveableObjects moveableObjects, int width, int height)
+ {
+ if (moveableObjects == null)
+ {
+ _state = StrategyStatus.NotInit;
+ return;
+ }
+ _state = StrategyStatus.InProgress;
+ _moveableObject = moveableObjects;
+ FieldWidth = width;
+ FieldHeight = height;
+ }
+ ///
+ /// Шаг перемещения
+ ///
+ public void MakeStep()
+ {
+ if (_state != StrategyStatus.InProgress) return;
+ if (IsTargetDestinaion())
+ {
+ _state = StrategyStatus.Finish;
+ return;
+ }
+ MoveToTarget();
+ }
+ ///
+ /// Перемещение влево
+ ///
+ /// Результат перемещения (true - удалось переместиться, false -неудача)
+ protected bool MoveLeft() => MoveTo(MovementDirection.Left);
+ ///
+ /// Перемещение вправо
+ ///
+ /// Результат перемещения (true - удалось переместиться, false -неудача)
+ protected bool MoveRight() => MoveTo(MovementDirection.Right);
+ ///
+ /// Перемещение вверх
+ ///
+ /// Результат перемещения (true - удалось переместиться, false -неудача)
+ protected bool MoveUp() => MoveTo(MovementDirection.Up);
+ ///
+ /// Перемещение вниз
+ ///
+ /// Результат перемещения (true - удалось переместиться, false -неудача)
+ protected bool MoveDown() => MoveTo(MovementDirection.Down);
+ ///
+ /// Параметры объекта
+ ///
+ protected ObjectParameters? GetObjectParameters =>_moveableObject?.GetObjectPosition;
+ ///
+ /// Шаг объекта
+ ///
+ ///
+ protected int? GetStep()
+ {
+ if (_state != StrategyStatus.InProgress)
+ {
+ return null;
+ }
+ return _moveableObject?.GetStep;
+ }
+ ///
+ /// Перемещение к цели
+ ///
+ protected abstract void MoveToTarget();
+ ///
+ /// Достигнута ли цель
+ ///
+ ///
+ protected abstract bool IsTargetDestinaion();
+ ///
+ /// Попытка перемещения в требуемом направлении
+ ///
+ /// Направление
+ /// Результат попытки (true - удалось переместиться, false -неудача)
+ private bool MoveTo(MovementDirection movementDirection)
+ {
+ if (_state != StrategyStatus.InProgress)
+ {
+ return false;
+ }
+ return _moveableObject?.TryMoveObject(movementDirection) ?? false;
+ }
+}
+
diff --git a/ProjectWarmlyShip/ProjectWarmlyShip/MovementStrategy/IMoveableObjects.cs b/ProjectWarmlyShip/ProjectWarmlyShip/MovementStrategy/IMoveableObjects.cs
new file mode 100644
index 0000000..efb09a7
--- /dev/null
+++ b/ProjectWarmlyShip/ProjectWarmlyShip/MovementStrategy/IMoveableObjects.cs
@@ -0,0 +1,16 @@
+namespace ProjectWarmlyShip.MovementStrategy;
+
+public interface IMoveableObjects
+{
+ ObjectParameters? GetObjectPosition { get; }
+ ///
+ /// Шаг объекта
+ ///
+ int GetStep { get; }
+ ///
+ /// Попытка переместить объект в указанном направлении
+ ///
+ ///
+ ///
+ bool TryMoveObject(MovementDirection direction);
+}
diff --git a/ProjectWarmlyShip/ProjectWarmlyShip/MovementStrategy/MoveToBorder.cs b/ProjectWarmlyShip/ProjectWarmlyShip/MovementStrategy/MoveToBorder.cs
new file mode 100644
index 0000000..c57aa17
--- /dev/null
+++ b/ProjectWarmlyShip/ProjectWarmlyShip/MovementStrategy/MoveToBorder.cs
@@ -0,0 +1,31 @@
+namespace ProjectWarmlyShip.MovementStrategy;
+
+public class MoveToBorder : AbstractStrategy
+{
+ protected override bool IsTargetDestinaion()
+ {
+ ObjectParameters? objParams = GetObjectParameters;
+ if (objParams == null)
+ {
+ return false;
+ }
+ return objParams.LeftBorder - GetStep() <= 0 ||
+ objParams.RightBorder + GetStep() >= FieldWidth ||
+ objParams.TopBorder - GetStep() <= 0
+ || objParams.ObjectMiddleVertical + GetStep() >= FieldHeight;
+ }
+
+ protected override void MoveToTarget()
+ {
+ ObjectParameters? objParams = GetObjectParameters;
+ if (objParams == null)
+ {
+ return;
+ }
+ //реализация в правый нижний угол
+ int x = objParams.RightBorder;
+ if (x + GetStep() < FieldWidth) MoveRight();
+ int y = objParams.DownBorder;
+ if (y + GetStep() < FieldHeight) MoveDown();
+ }
+}
diff --git a/ProjectWarmlyShip/ProjectWarmlyShip/MovementStrategy/MoveToCenter.cs b/ProjectWarmlyShip/ProjectWarmlyShip/MovementStrategy/MoveToCenter.cs
new file mode 100644
index 0000000..f72d05c
--- /dev/null
+++ b/ProjectWarmlyShip/ProjectWarmlyShip/MovementStrategy/MoveToCenter.cs
@@ -0,0 +1,49 @@
+namespace ProjectWarmlyShip.MovementStrategy;
+
+public class MoveToCenter : AbstractStrategy
+{
+ protected override bool IsTargetDestinaion()
+ {
+ ObjectParameters? objParams = GetObjectParameters;
+ if (objParams == null)
+ {
+ return false;
+ }
+ return objParams.ObjectMiddleHorizontal - GetStep() <= FieldWidth / 2 &&
+ objParams.ObjectMiddleHorizontal + GetStep() >= FieldWidth / 2 &&
+ objParams.ObjectMiddleVertical - GetStep() <= FieldHeight / 2
+ && objParams.ObjectMiddleVertical + GetStep() >= FieldHeight / 2;
+ }
+ protected override void MoveToTarget()
+ {
+ ObjectParameters? objParams = GetObjectParameters;
+ if (objParams == null)
+ {
+ return;
+ }
+ int diffX = objParams.ObjectMiddleHorizontal - FieldWidth / 2;
+ if (Math.Abs(diffX) > GetStep())
+ {
+ if (diffX > 0)
+ {
+ MoveLeft();
+ }
+ else
+ {
+ MoveRight();
+ }
+ }
+ int diffY = objParams.ObjectMiddleVertical - FieldHeight / 2;
+ if (Math.Abs(diffY) > GetStep())
+ {
+ if (diffY > 0)
+ {
+ MoveUp();
+ }
+ else
+ {
+ MoveDown();
+ }
+ }
+ }
+}
diff --git a/ProjectWarmlyShip/ProjectWarmlyShip/MovementStrategy/MoveableShip.cs b/ProjectWarmlyShip/ProjectWarmlyShip/MovementStrategy/MoveableShip.cs
new file mode 100644
index 0000000..23ac656
--- /dev/null
+++ b/ProjectWarmlyShip/ProjectWarmlyShip/MovementStrategy/MoveableShip.cs
@@ -0,0 +1,48 @@
+using ProjectWarmlyShip.Drawnings;
+
+namespace ProjectWarmlyShip.MovementStrategy;
+
+public class MoveableShip : IMoveableObjects
+{
+ private DrawningShip? _drawningship;
+ public MoveableShip(DrawningShip? drawningship)
+ {
+ _drawningship = drawningship;
+ }
+ public ObjectParameters? GetObjectPosition
+ {
+ get
+ {
+ if (_drawningship == null || _drawningship.EntityShip == null || !_drawningship.GetPosX.HasValue || !_drawningship.GetPosY.HasValue)
+ {
+ return null;
+ }
+ return new ObjectParameters(_drawningship.GetPosX.Value, _drawningship.GetPosY.Value, _drawningship.GetWidht, _drawningship.GetHeight);
+ }
+ }
+ public int GetStep => (int)(_drawningship?.EntityShip?.Step ?? 0);
+ public bool TryMoveObject(MovementDirection direction)
+ {
+ if (_drawningship == null || _drawningship.EntityShip == null)
+ {
+ return false;
+ }
+ return _drawningship.MoveTransport(GetDirectionType(direction));
+ }
+ ///
+ /// Конвертация из MovementDirection в DirectionType
+ ///
+ /// MovementDirection
+ /// DirectionType
+ private static DirectionType GetDirectionType(MovementDirection direction)
+ {
+ return direction switch
+ {
+ MovementDirection.Left => DirectionType.Left,
+ MovementDirection.Right => DirectionType.Right,
+ MovementDirection.Up => DirectionType.Up,
+ MovementDirection.Down => DirectionType.Down,
+ _ => DirectionType.Unknow,
+ };
+ }
+}
diff --git a/ProjectWarmlyShip/ProjectWarmlyShip/MovementStrategy/MovementDirection.cs b/ProjectWarmlyShip/ProjectWarmlyShip/MovementStrategy/MovementDirection.cs
new file mode 100644
index 0000000..23d2856
--- /dev/null
+++ b/ProjectWarmlyShip/ProjectWarmlyShip/MovementStrategy/MovementDirection.cs
@@ -0,0 +1,21 @@
+namespace ProjectWarmlyShip.MovementStrategy;
+
+public enum MovementDirection
+{
+ ///
+ /// Вверх
+ ///
+ Up = 1,
+ ///
+ /// Вниз
+ ///
+ Down = 2,
+ ///
+ /// Влево
+ ///
+ Left = 3,
+ ///
+ /// Вправо
+ ///
+ Right = 4
+}
diff --git a/ProjectWarmlyShip/ProjectWarmlyShip/MovementStrategy/ObjectParameters.cs b/ProjectWarmlyShip/ProjectWarmlyShip/MovementStrategy/ObjectParameters.cs
new file mode 100644
index 0000000..1790454
--- /dev/null
+++ b/ProjectWarmlyShip/ProjectWarmlyShip/MovementStrategy/ObjectParameters.cs
@@ -0,0 +1,59 @@
+namespace ProjectWarmlyShip.MovementStrategy;
+
+public class ObjectParameters
+{
+ ///
+ /// Координата х
+ ///
+ private readonly int _x;
+ ///
+ /// Координата у
+ ///
+ private readonly int _y;
+ ///
+ /// Ширина объекта
+ ///
+ private readonly int _width;
+ ///
+ /// Высота объекта
+ ///
+ private readonly int _height;
+ ///
+ /// Левая граница
+ ///
+ public int LeftBorder => _x;
+ ///
+ /// Правая граница
+ ///
+ public int TopBorder => _y;
+ ///
+ /// Правая граница
+ ///
+ public int RightBorder => _x + _width;
+ ///
+ /// Нижняя граница
+ ///
+ public int DownBorder => _y + _height;
+ ///
+ /// Середина объекта
+ ///
+ public int ObjectMiddleHorizontal => _x + _width / 2;
+ ///
+ /// Середина объекта
+ ///
+ public int ObjectMiddleVertical => _y + _height / 2;
+ ///
+ /// Конструктор
+ ///
+ ///
+ ///
+ ///
+ ///
+ public ObjectParameters(int x, int y, int width, int height)
+ {
+ _x = x;
+ _y = y;
+ _width = width;
+ _height = height;
+ }
+}
diff --git a/ProjectWarmlyShip/ProjectWarmlyShip/MovementStrategy/StrategyStatus.cs b/ProjectWarmlyShip/ProjectWarmlyShip/MovementStrategy/StrategyStatus.cs
new file mode 100644
index 0000000..117b98d
--- /dev/null
+++ b/ProjectWarmlyShip/ProjectWarmlyShip/MovementStrategy/StrategyStatus.cs
@@ -0,0 +1,15 @@
+namespace ProjectWarmlyShip.MovementStrategy;
+
+public enum StrategyStatus
+{
+ ///
+ /// Все готово к началу
+ ///
+ NotInit,
+ ///
+ /// Выполняется
+ ///
+ InProgress,
+ // Завершена
+ Finish
+}