alyona.panina/PIbd-23_Panina_A.D.Cruiser.base
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

без доп

Browse Source
This commit is contained in:
Alenka 2023-10-13 11:21:23 +04:00
parent 065b937d2c
commit f08466a718
19 changed files with 324 additions and 255 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Cruiser/Cruiser/AbstractStrategy.cs
View File

@ -1,14 +1,19 @@
using System;
using Cruiser;
using DumpTruck.MovementStrategy;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using static System.Windows.Forms.VisualStyles.VisualStyleElement;
namespace Cruiser.MovementStrategy
namespace DumpTruck.MovementStrategy
{
public abstract class AbstractStrategy
{
/// <summary>
/// Перемещаемый объект
/// </summary>
private IMoveableObject? _moveableObject;
/// <summary>
/// Статус перемещения
@ -65,22 +70,22 @@ namespace Cruiser.MovementStrategy
/// Перемещение влево
/// </summary>
/// <returns>Результат перемещения (true - удалось переместиться, false - неудача)</returns>
protected bool MoveLeft() => MoveTo(Direction.Left);
protected bool MoveLeft() => MoveTo(DirectionType.Left);
/// <summary>
/// Перемещение вправо
/// </summary>
/// <returns>Результат перемещения (true - удалось переместиться, false - неудача)</returns>
protected bool MoveRight() => MoveTo(Direction.Right);
protected bool MoveRight() => MoveTo(DirectionType.Right);
/// <summary>
/// Перемещение вверх
/// </summary>
/// <returns>Результат перемещения (true - удалось переместиться, false - неудача)</returns>
protected bool MoveUp() => MoveTo(Direction.Up);
protected bool MoveUp() => MoveTo(DirectionType.Up);
/// <summary>
/// Перемещение вниз
/// </summary>
/// <returns>Результат перемещения (true - удалось переместиться,false - неудача)</returns>
protected bool MoveDown() => MoveTo(Direction.Down);
protected bool MoveDown() => MoveTo(DirectionType.Down);
/// <summary>
/// Параметры объекта
/// </summary>
@ -112,7 +117,7 @@ namespace Cruiser.MovementStrategy
/// </summary>
/// <param name="directionType">Направление</param>
/// <returns>Результат попытки (true - удалось переместиться, false - неудача)</returns>
private bool MoveTo(Direction directionType)
private bool MoveTo(DirectionType directionType)
{
if (_state != Status.InProgress)
{
@ -127,4 +132,3 @@ namespace Cruiser.MovementStrategy
}
}
}

22
Cruiser/Cruiser/CarsGenericCollection.cs
View File

@ -4,15 +4,15 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Cruiser.Generics;
using Cruiser.MovementStrategy;
using Cruiser.DrawningObjects;
using Cruiser.Entities;
using Cruiser.MovementStrategy;
using DumpTruck.DrawningObjects;
using DumpTruck.Entities;
using DumpTruck.MovementStrategy;
namespace DumpTruck.Generics
{
internal class CarsGenericCollection<T, U>
where T : DrawningCruiser
where T : DrawningCar
where U : IMoveableObject
{
/// <summary>
@ -54,14 +54,14 @@ namespace DumpTruck.Generics
/// <param name="collect"></param>
/// <param name="obj"></param>
/// <returns></returns>
public static T? operator +(CarsGenericCollection<T, U> collect, T?
public static int operator +(CarsGenericCollection<T, U> collect, T?
obj)
{
if (obj == null)
{
return null;
return -1;
}
return collect?._collection.Insert(obj) ?? null;
return collect._collection.Insert(obj) ;
}
/// <summary>
/// Перегрузка оператора вычитания
@ -69,7 +69,7 @@ namespace DumpTruck.Generics
/// <param name="collect"></param>
/// <param name="pos"></param>
/// <returns></returns>
public static T? operator -(CarsGenericCollection<T, U> collect, int
public static bool operator -(CarsGenericCollection<T, U> collect, int
pos)
{
T? obj = collect._collection.Get(pos);
@ -77,7 +77,7 @@ namespace DumpTruck.Generics
{
collect._collection.Remove(pos);
}
return obj;
return true;
}
/// <summary>
/// Получение объекта IMoveableObject
@ -126,7 +126,7 @@ namespace DumpTruck.Generics
/// <param name="g"></param>
private void DrawObjects(Graphics g)
{
DrawningCruiser car;
DrawningCar car;
int numPlacesInRow = _pictureWidth / _placeSizeWidth;
for (int i = 0; i < _collection.Count; i++)
{

38
Cruiser/Cruiser/Cruiser.cs
View File

@ -4,33 +4,33 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Cruiser.Entities
namespace DumpTruck.Entities
{
public class EntityCruiser
public class EntityCar
{
/// <summary>
/// Скорость
/// </summary>
public int Speed { get; private set; }
/// <summary>
/// Вес
/// </summary>
public double Weight { get; private set; }
/// <summary>
/// Основной цвет
/// </summary>
public Color BodyColor { get; private set; }
// public Color AdditionalColor { get; private set; }
// public bool Headlights { get; private set; }
// public bool HelicopterPad { get; private set; }
// public bool Coating { get; private set; }
/// <summary>
/// Шаг перемещения автомобиля
/// </summary>
public double Step => (double)Speed * 100 / Weight;
/// <summary>
/// Конструктор с параметрами
/// </summary>
/// <param name="speed">Скорость</param>
/// <param name="weight">Вес автомобиля</param>
/// <param name="bodyColor">Основной цвет</param>
public EntityCruiser(int speed, double weight, Color bodyColor)
public EntityCar(int speed, double weight, Color bodyColor)
{
Speed = speed;
Weight = weight;
@ -38,4 +38,4 @@ namespace Cruiser.Entities
}
}
}
}

2
Cruiser/Cruiser/Direction.cs
View File

@ -6,7 +6,7 @@ using System.Threading.Tasks;
namespace Cruiser
{
public enum Direction
public enum DirectionType
{
/// Вверх

144
Cruiser/Cruiser/DrawningCruiser.cs
View File

@ -3,15 +3,17 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Cruiser.Entities;
using Cruiser.MovementStrategy;
namespace Cruiser.DrawningObjects
using DumpTruck.Entities;
using DumpTruck.MovementStrategy;
using Cruiser;
namespace DumpTruck.DrawningObjects
{
public class DrawningCruiser
public class DrawningCar
{
public EntityCruiser ? EntityCruiser { get; protected set; }
public EntityCar? EntityCar { get; protected set; }
private int _pictureWidth;
@ -21,11 +23,13 @@ namespace Cruiser.DrawningObjects
protected int _startPosY;
private readonly int _cruiserWidth = 150;
private readonly int _carWidth = 110;
private readonly int _carHeight = 60;
private readonly int _cruiserHeight = 50;
/// <summary>
/// Координата X объекта
/// </summary>
public int GetPosX => _startPosX;
/// <summary>
/// Координата Y объекта
@ -34,58 +38,46 @@ namespace Cruiser.DrawningObjects
/// <summary>
/// Ширина объекта
/// </summary>
public int GetWidth => _cruiserWidth;
public int GetWidth => _carWidth;
/// <summary>
/// Высота объекта
/// </summary>
public int GetHeight => _cruiserHeight;
public int GetHeight => _carHeight;
/// <summary>
/// Получение объекта IMoveableObject из объекта DrawningCar
/// </summary>
public IMoveableObject GetMoveableObject => new DrawningObjectCar(this);
/// <param name="speed">Скорость</param>
/// <param name="weight">Вес</param>
/// <param name="bodyColor">Цвет кузова</param>
/// <param name="width">Ширина картинки</param>
/// <param name="height">Высота картинки</param>
public DrawningCruiser(int speed, double weight, Color bodyColor, int width, int height)
public DrawningCar(int speed, double weight, Color bodyColor, int width, int height)
{
if (width < _cruiserWidth || height < _cruiserHeight)
if (width < _carWidth || height < _carHeight)
{
return;
}
_pictureWidth = width;
_pictureHeight = height;
EntityCruiser = new EntityCruiser(speed, weight, bodyColor);
EntityCar = new EntityCar(speed, weight, bodyColor);
}
protected DrawningCruiser(int speed, double weight, Color bodyColor, int
protected DrawningCar(int speed, double weight, Color bodyColor, int
width, int height, int carWidth, int carHeight)
{
if (width <= _cruiserWidth || height <= _cruiserHeight)
if (width <= _carWidth || height <= _carHeight)
{
return;
}
_pictureWidth = width;
_pictureHeight = height;
_cruiserWidth = carWidth;
_cruiserHeight = carHeight;
EntityCruiser = new EntityCruiser(speed, weight, bodyColor);
_carWidth = carWidth;
_carHeight = carHeight;
EntityCar = new EntityCar(speed, weight, bodyColor);
}
/// <param name="x">Координата X</param>
/// <param name="y">Координата Y</param>
public void SetPosition(int x, int y)
{
if (x < 0 || x >= _pictureWidth || y < 0 || y >= _pictureHeight)
@ -95,68 +87,68 @@ width, int height, int carWidth, int carHeight)
}
_startPosX = x;
_startPosY = y;
}
/// <param name="direction">Направление</param>
public void MoveTransport(Direction direction)
public void MoveTransport(DirectionType direction)
{
if (!CanMove(direction) || EntityCruiser == null)
if (!CanMove(direction) || EntityCar == null)
{
return;
}
switch (direction)
{
//влево
case Direction.Left:
_startPosX -= (int)EntityCruiser.Step;
case DirectionType.Left:
_startPosX -= (int)EntityCar.Step;
break;
//вверх
case Direction.Up:
_startPosY -= (int)EntityCruiser.Step;
case DirectionType.Up:
_startPosY -= (int)EntityCar.Step;
break;
// вправо
case Direction.Right:
_startPosX += (int)EntityCruiser.Step;
case DirectionType.Right:
_startPosX += (int)EntityCar.Step;
break;
//вниз
case Direction.Down:
_startPosY += (int)EntityCruiser.Step;
case DirectionType.Down:
_startPosY += (int)EntityCar.Step;
break;
}
}
public bool CanMove(Direction direction)
public bool CanMove(DirectionType direction)
{
if (EntityCruiser == null)
if (EntityCar == null)
{
return false;
}
return direction switch
{
//влево
Direction.Left => _startPosX - EntityCruiser.Step > 0,
DirectionType.Left => _startPosX - EntityCar.Step > 0,
//вверх
Direction.Up => _startPosY - EntityCruiser.Step > 0,
DirectionType.Up => _startPosY - EntityCar.Step > 0,
// вправо
Direction.Right => _startPosX + EntityCruiser.Step + _cruiserWidth < _pictureWidth,
DirectionType.Right => _startPosX + EntityCar.Step + _carWidth < _pictureWidth,
//вниз
Direction.Down => _startPosY + EntityCruiser.Step + _cruiserHeight < _pictureHeight,
DirectionType.Down => _startPosY + EntityCar.Step + _carHeight < _pictureHeight,
_ => false,
};
}
/// <param name="g"></param>
public virtual void DrawTransport(Graphics g)
{
if (EntityCruiser == null)
if (EntityCar == null)
{
return;
}
Pen pen = new Pen(Color.Black);
Brush brush = new SolidBrush(EntityCruiser.BodyColor);
Brush brush = new SolidBrush(EntityCar.BodyColor);
//границы автомобиля
//SolidBrush(Cruiser.AdditionalColor);
@ -171,17 +163,17 @@ width, int height, int carWidth, int carHeight)
g.DrawRectangle(pen, _startPosX + 20, _startPosY + 4, 70, 52);
//если есть доп.фонари
/* if (Cruiser.Headlights)
{
/* if (Cruiser.Headlights)
{
Brush brYellow = new SolidBrush(Color.Yellow);
g.FillEllipse(brYellow, _startPosX + 80, _startPosY + 5, 20,
20);
g.FillEllipse(brYellow, _startPosX + 80, _startPosY + 35, 20,
20);
}*/
Brush brYellow = new SolidBrush(Color.Yellow);
g.FillEllipse(brYellow, _startPosX + 80, _startPosY + 5, 20,
20);
g.FillEllipse(brYellow, _startPosX + 80, _startPosY + 35, 20,
20);
}*/
//основание лодки!!!
Brush br = new SolidBrush(EntityCruiser.BodyColor);
Brush br = new SolidBrush(EntityCar.BodyColor);
g.FillRectangle(br, _startPosX + 10, _startPosY + 15, 10, 30);
g.FillRectangle(br, _startPosX + 90, _startPosY + 15, 10, 30);
g.FillRectangle(br, _startPosX + 20, _startPosY + 5, 70, 50);
@ -205,22 +197,8 @@ width, int height, int carWidth, int carHeight)
g.DrawRectangle(Pens.Black, _startPosX + 50,
_startPosY + 19, 30, 25);
/* if (Cruiser.HelicopterPad)
{
//если есть площадка под вертолет
g.DrawEllipse(pen, _startPosX + 90, _startPosY + 20, 20, 20);
}
if (Cruiser.Coating)
{
//если есть спец покрытие для площадки под вертолет
g.FillEllipse(Brushes.Red, _startPosX + 90, _startPosY + 20, 20, 20);
}*/
}
}
}
}

33
Cruiser/Cruiser/DrawningObjectCar.cs
View File

@ -3,36 +3,37 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Cruiser.DrawningObjects;
using Cruiser.MovementStrategy;
namespace Cruiser.MovementStrategy
using Cruiser;
using DumpTruck.DrawningObjects;
using DumpTruck.MovementStrategy;
namespace DumpTruck.MovementStrategy
{
internal class DrawningObjectCar : IMoveableObject
{
private readonly DrawningCruiser? _drawningCruiser = null;
public DrawningObjectCar(DrawningCruiser drawningCruiser)
private readonly DrawningCar? _drawningCar = null;
public DrawningObjectCar(DrawningCar drawningCar)
{
_drawningCruiser = drawningCruiser;
_drawningCar = drawningCar;
}
public ObjectParameters? GetObjectPosition
{
get
{
if (_drawningCruiser == null || _drawningCruiser.EntityCruiser ==
if (_drawningCar == null || _drawningCar.EntityCar ==
null)
{
return null;
}
return new ObjectParameters(_drawningCruiser.GetPosX,
_drawningCruiser.GetPosY, _drawningCruiser.GetWidth, _drawningCruiser.GetHeight);
return new ObjectParameters(_drawningCar.GetPosX,
_drawningCar.GetPosY, _drawningCar.GetWidth, _drawningCar.GetHeight);
}
}
public int GetStep => (int)(_drawningCruiser?.EntityCruiser?.Step ?? 0);
public bool CheckCanMove(Direction direction) =>
_drawningCruiser?.CanMove(direction) ?? false;
public void MoveObject(Direction direction) =>
_drawningCruiser?.MoveTransport(direction);
public int GetStep => (int)(_drawningCar?.EntityCar?.Step ?? 0);
public bool CheckCanMove(DirectionType direction) =>
_drawningCar?.CanMove(direction) ?? false;
public void MoveObject(DirectionType direction) =>
_drawningCar?.MoveTransport(direction);
}
}
}

48
Cruiser/Cruiser/DrawningPro.cs
View File

@ -1,39 +1,44 @@
using Cruiser.DrawningObjects;
using DumpTruck;
using System;
using System.Collections.Generic;
using System.Drawing;
using System.Linq;
using System.Net.NetworkInformation;
using System.Text;
using System.Threading.Tasks;
using Cruiser.Entities;
using Cruiser;
using System.Windows.Forms;
using DumpTruck.Entities;
namespace Cruiser.DrawningObjects
namespace DumpTruck.DrawningObjects
{
public class DrawningPro : DrawningCruiser
public class DrawningDumpTruck : DrawningCar
{
public DrawningPro(int speed, double weight, Color bodyColor, Color additionalColor, bool headlights, bool helicopterPad, bool coating, int width, int height) : base(speed, weight, bodyColor, width, height, 150, 50)
public DrawningDumpTruck(int speed, double weight, Color bodyColor, Color additionalColor, bool bodyKit, bool tent, int width, int height) : base(speed, weight, bodyColor, width, height, 110, 60)
{
if (EntityCruiser != null)
if (EntityCar != null)
{
EntityCruiser = new Pro(speed, weight, bodyColor, additionalColor, headlights, helicopterPad, coating);
EntityCar = new EntityDumpTruck(speed, weight, bodyColor, additionalColor, bodyKit, tent);
}
}
public override void DrawTransport(Graphics g)
{
if (EntityCruiser is not Pro cruiser)
if (EntityCar is not EntityDumpTruck dumpTruck)
{
return;
}
Pen pen = new Pen(Color.Black);
Brush addBrush = new SolidBrush(cruiser.AdditionalColor);
Brush brush = new SolidBrush(cruiser.BodyColor);
Brush addBrush = new SolidBrush(dumpTruck.AdditionalColor);
Brush brush = new SolidBrush(dumpTruck.BodyColor);
base.DrawTransport(g);
if (cruiser.Headlights)
if (dumpTruck.Tent)
{
Brush brYellow = new SolidBrush(Color.Yellow);
g.FillEllipse(brYellow, _startPosX + 80, _startPosY + 5, 20,
20);
@ -41,20 +46,15 @@ namespace Cruiser.DrawningObjects
20);
}
if (cruiser.HelicopterPad)
if (dumpTruck.BodyKit)
{
//если есть площадка под вертолет
g.FillEllipse(Brushes.Green, _startPosX + 90, _startPosY + 20, 20, 20);
}
/* if (cruiser.Coating)
{
//если есть спец покрытие для площадки под вертолет
g.FillEllipse(Brushes.Red, _startPosX + 90, _startPosY + 20, 20, 20);
}*/
}
}
}
}

4
Cruiser/Cruiser/Form1.Designer.cs generated
View File

@ -110,7 +110,7 @@
this.buttonCreate.Name = "buttonCreate";
this.buttonCreate.Size = new System.Drawing.Size(218, 34);
this.buttonCreate.TabIndex = 5;
this.buttonCreate.Text = "Создать Про версию";
this.buttonCreate.Text = "Создать простую";
this.buttonCreate.UseVisualStyleBackColor = true;
this.buttonCreate.Click += new System.EventHandler(this.buttonCreate_Click);
//
@ -121,7 +121,7 @@
this.button2.Name = "button2";
this.button2.Size = new System.Drawing.Size(251, 37);
this.button2.TabIndex = 6;
this.button2.Text = "Создать простую версию";
this.button2.Text = "Создать про версию";
this.button2.UseVisualStyleBackColor = true;
this.button2.Click += new System.EventHandler(this.button2_Click);
//

77
Cruiser/Cruiser/Form1.cs
View File

@ -1,18 +1,21 @@
using System.Windows.Forms;
using Cruiser.DrawningObjects;
using DumpTruck.DrawningObjects;
using DumpTruck.Entities;
using Cruiser.MovementStrategy;
using DumpTruck.MovementStrategy;
namespace Cruiser
{
public partial class CruiserForm : Form
{
private DrawningCruiser? _drawningCruiser;
private DrawningCar? _drawningCar;
private AbstractStrategy? _abstractStrategy;
private AbstractStrategy? _strategy;
public DrawningCruiser? SelectedCar { get; private set; }
public DrawningCar? SelectedCar { get; private set; }
public CruiserForm()
{
InitializeComponent();
@ -21,18 +24,18 @@ namespace Cruiser
}
private void Draw()
{
if (_drawningCruiser == null)
if (_drawningCar == null)
{
return;
}
Bitmap bmp = new Bitmap(pictureBox1.Width, pictureBox1.Height);
Graphics gr = Graphics.FromImage(bmp);
_drawningCruiser.DrawTransport(gr);
_drawningCar.DrawTransport(gr);
pictureBox1.Image = bmp;
}
private void buttonMove_Click(object sender, EventArgs e)
{
if (_drawningCruiser == null)
if (_drawningCar == null)
{
return;
}
@ -40,16 +43,16 @@ namespace Cruiser
switch (name)
{
case "buttonUp":
_drawningCruiser.MoveTransport(Direction.Up);
_drawningCar.MoveTransport(DirectionType.Up);
break;
case "buttonDown":
_drawningCruiser.MoveTransport(Direction.Down);
_drawningCar.MoveTransport(DirectionType.Down);
break;
case "buttonLeft":
_drawningCruiser.MoveTransport(Direction.Left);
_drawningCar.MoveTransport(DirectionType.Left);
break;
case "buttonRight":
_drawningCruiser.MoveTransport(Direction.Right);
_drawningCar.MoveTransport(DirectionType.Right);
break;
}
Draw();
@ -58,12 +61,27 @@ namespace Cruiser
private void button2_Click(object sender, EventArgs e)
{
Random random = new();
_drawningCruiser = new DrawningCruiser(random.Next(100, 300),
Color color = Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256));
Color dopColor = Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256));
ColorDialog dialog = new();
if (dialog.ShowDialog() == DialogResult.OK)
{
color = dialog.Color;
}
if (dialog.ShowDialog() == DialogResult.OK)
{
dopColor = dialog.Color;
}
_drawningCar = new DrawningDumpTruck(random.Next(100, 300),
random.Next(1000, 3000),
Color.FromArgb(random.Next(0, 256), random.Next(0, 256),
random.Next(0, 256)),
color,
dopColor,
Convert.ToBoolean(random.Next(0, 2)),
Convert.ToBoolean(random.Next(0, 2)),
pictureBox1.Width, pictureBox1.Height);
_drawningCruiser.SetPosition(random.Next(10, 100), random.Next(10,
_drawningCar.SetPosition(random.Next(10, 100), random.Next(10,
100));
Draw();
}
@ -74,7 +92,7 @@ namespace Cruiser
private void ButtonStep_Click(object sender, EventArgs e)
{
if (_drawningCruiser == null)
if (_drawningCar == null)
{
return;
}
@ -91,7 +109,7 @@ namespace Cruiser
{
return;
}
_abstractStrategy.SetData(new DrawningObjectCar(_drawningCruiser), pictureBox1.Width,
_abstractStrategy.SetData(new DrawningObjectCar(_drawningCar), pictureBox1.Width,
pictureBox1.Height);
comboBox1.Enabled = false;
}
@ -111,25 +129,26 @@ namespace Cruiser
private void buttonCreate_Click(object sender, EventArgs e)
{
Random random = new();
_drawningCruiser = new DrawningPro(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)),
Convert.ToBoolean(random.Next(0, 2)),
Color color = Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256));
Color dopColor = Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256));
ColorDialog dialog = new();
if (dialog.ShowDialog() == DialogResult.OK)
{
color = dialog.Color;
}
_drawningCar = new DrawningCar(random.Next(100, 300),
random.Next(1000, 3000),
color,
pictureBox1.Width, pictureBox1.Height);
_drawningCruiser.SetPosition(random.Next(10, 100), random.Next(10,
_drawningCar.SetPosition(random.Next(10, 100), random.Next(10,
100));
Draw();
}
public void SelectedCruiser_Click(object sender, EventArgs e)
{
//SelectedCruiser = _drawningCruiser;
SelectedCar = _drawningCar;
DialogResult = DialogResult.OK;
}
}

22
Cruiser/Cruiser/FormCruiserCollection.Designer.cs generated
View File

@ -30,7 +30,7 @@
{
this.pictureBox1 = new System.Windows.Forms.PictureBox();
this.panel1 = new System.Windows.Forms.Panel();
this.button2 = new System.Windows.Forms.Button();
this.ButtonRemoveCar = new System.Windows.Forms.Button();
this.ButtonAddCruiser = new System.Windows.Forms.Button();
this.textBox1 = new System.Windows.Forms.TextBox();
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
@ -50,7 +50,7 @@
//
// panel1
//
this.panel1.Controls.Add(this.button2);
this.panel1.Controls.Add(this.ButtonRemoveCar);
this.panel1.Controls.Add(this.ButtonAddCruiser);
this.panel1.Controls.Add(this.textBox1);
this.panel1.Location = new System.Drawing.Point(589, 12);
@ -58,14 +58,15 @@
this.panel1.Size = new System.Drawing.Size(211, 438);
this.panel1.TabIndex = 1;
//
// button2
// ButtonRemoveCar
//
this.button2.Location = new System.Drawing.Point(31, 168);
this.button2.Name = "button2";
this.button2.Size = new System.Drawing.Size(150, 34);
this.button2.TabIndex = 2;
this.button2.Text = "Удалить";
this.button2.UseVisualStyleBackColor = true;
this.ButtonRemoveCar.Location = new System.Drawing.Point(31, 168);
this.ButtonRemoveCar.Name = "ButtonRemoveCar";
this.ButtonRemoveCar.Size = new System.Drawing.Size(150, 34);
this.ButtonRemoveCar.TabIndex = 2;
this.ButtonRemoveCar.Text = "Удалить";
this.ButtonRemoveCar.UseVisualStyleBackColor = true;
this.ButtonRemoveCar.Click += new System.EventHandler(this.ButtonRemoveCar_Click);
//
// ButtonAddCruiser
//
@ -83,6 +84,7 @@
this.textBox1.Name = "textBox1";
this.textBox1.Size = new System.Drawing.Size(150, 31);
this.textBox1.TabIndex = 2;
this.textBox1.TextChanged += new System.EventHandler(this.textBox1_TextChanged);
//
// FormCruiserCollection
//
@ -105,7 +107,7 @@
private PictureBox pictureBox1;
private Panel panel1;
private Button button2;
private Button ButtonRemoveCar;
private Button ButtonAddCruiser;
private TextBox textBox1;
}

64
Cruiser/Cruiser/FormCruiserCollection.cs
View File

@ -1,4 +1,4 @@
using Cruiser.MovementStrategy;

using DumpTruck.Generics;
using System;
using System.Collections.Generic;
@ -10,18 +10,21 @@ using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
using Cruiser;
using Cruiser.DrawningObjects;
using Cruiser.Generics;
using DumpTruck.DrawningObjects;
using DumpTruck.Generics;
using DumpTruck.MovementStrategy;
namespace Cruiser
{
public partial class FormCruiserCollection : Form
{
private readonly CarsGenericCollection<DrawningCruiser, DrawningObjectCar> _cars;
private readonly CarsGenericCollection<DrawningCar, DrawningObjectCar> _cars;
public FormCruiserCollection()
{
InitializeComponent();
_cars = new CarsGenericCollection<DrawningCruiser, DrawningObjectCar>(pictureBox1.Width, pictureBox1.Height);
_cars = new CarsGenericCollection<DrawningCar, DrawningObjectCar>(pictureBox1.Width, pictureBox1.Height);
}
private void pictureBox1_Click(object sender, EventArgs e)
@ -33,9 +36,12 @@ namespace Cruiser
{
CruiserForm form = new();
if (form.ShowDialog() == DialogResult.OK)
{
if (_cars + form.SelectedCar)
if (_cars + form.SelectedCar != null)
{
MessageBox.Show("Объект добавлен");
pictureBox1.Image = _cars.ShowCars();
@ -47,7 +53,47 @@ namespace Cruiser
}
}
}
}
}
private void ButtonRemoveCar_Click(object sender, EventArgs e)
{
if (MessageBox.Show("Удалить объект?", "Удаление",
MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
{
return;
}
int pos;
if (textBox1.Text == null || !int.TryParse(textBox1.Text, out pos))
{
MessageBox.Show("Введите номер парковочного места");
return;
}
if (_cars - pos != null)
{
MessageBox.Show("Объект удален");
pictureBox1.Image = _cars.ShowCars();
}
else
{
MessageBox.Show("Не удалось удалить объект");
}
}
private void ButtonRefreshCollection_Click(object sender, EventArgs e)
{
pictureBox1.Image = _cars.ShowCars();
}
private void maskedTextBoxNumber_MaskInputRejected(object sender, MaskInputRejectedEventArgs e)
{
}
private void textBox1_TextChanged(object sender, EventArgs e)
{
}
}
}

21
Cruiser/Cruiser/IMoveableObject.cs
View File

@ -1,14 +1,23 @@
using System;
using DumpTruck;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using DumpTruck.MovementStrategy;
namespace Cruiser.MovementStrategy
using Cruiser;
namespace DumpTruck.MovementStrategy
{
/// <summary>
/// Интерфейс для работы с перемещаемым объектом
/// </summary>
public interface IMoveableObject
{
/// <summary>
/// Получение координаты X объекта
/// </summary>
ObjectParameters? GetObjectPosition { get; }
/// <summary>
/// Шаг объекта
@ -19,12 +28,12 @@ namespace Cruiser.MovementStrategy
/// </summary>
/// <param name="direction"></param>
/// <returns></returns>
bool CheckCanMove(Direction direction);
bool CheckCanMove(DirectionType direction);
/// <summary>
/// Изменение направления пермещения объекта
/// </summary>
/// <param name="direction">Направление</param>
void MoveObject(Direction direction);
void MoveObject(DirectionType direction);
}
}
}

9
Cruiser/Cruiser/MoveToBorder.cs
View File

@ -1,11 +1,11 @@
using System;
using DumpTruck.MovementStrategy;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Cruiser.MovementStrategy;
namespace Cruiser.MovementStrategy
namespace DumpTruck.MovementStrategy
{
internal class MoveToBorder : AbstractStrategy
{
@ -47,5 +47,4 @@ namespace Cruiser.MovementStrategy
}
}
}

10
Cruiser/Cruiser/MoveToCenter.cs
View File

@ -1,10 +1,11 @@
using System;
using DumpTruck.MovementStrategy;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Cruiser.MovementStrategy;
namespace Cruiser.MovementStrategy
namespace DumpTruck.MovementStrategy
{
internal class MoveToCenter : AbstractStrategy
{
@ -54,5 +55,4 @@ namespace Cruiser.MovementStrategy
}
}
}
}
}

8
Cruiser/Cruiser/ObjectParameters.cs
View File

@ -4,8 +4,11 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Cruiser.MovementStrategy
namespace DumpTruck.MovementStrategy
{
/// <summary>
/// Параметры-координаты объекта
/// </summary>
public class ObjectParameters
{
private readonly int _x;
@ -51,5 +54,4 @@ namespace Cruiser.MovementStrategy
_height = height;
}
}
}
}

41
Cruiser/Cruiser/Pro.cs
View File

@ -1,33 +1,42 @@
using System;
using System.Collections.Generic;
using System.Drawing;
using System.Linq;
using System.Net.NetworkInformation;
using System.Text;
using System.Threading.Tasks;
using static System.Net.Mime.MediaTypeNames;
using System.Windows.Forms;
namespace Cruiser.Entities
namespace DumpTruck.Entities
{
public class Pro : EntityCruiser
public class EntityDumpTruck : EntityCar
{
/// <summary>
/// Дополнительный цвет (для опциональных элементов)
/// </summary>
public Color AdditionalColor { get; private set; }
/// <summary>
/// Признак (опция) наличия кузова
/// </summary>
public bool BodyKit { get; private set; }
public bool Headlights { get; private set; }
public bool HelicopterPad { get; private set; }
/// <summary>
/// Признак (опция) наличия tent
/// </summary>
public bool Tent { get; private set; }
public bool Coating { get; private set; }
public Pro(int speed, double weight, Color bodyColor, Color
additionalColor, bool headlights, bool helicopterPad, bool coating) : base(speed, weight, bodyColor)
{
AdditionalColor = additionalColor;
Headlights = headlights;
HelicopterPad = helicopterPad;
Coating = coating;
public EntityDumpTruck(int speed, double weight, Color bodyColor, Color
additionalColor, bool bodyKit, bool tent) : base(speed, weight, bodyColor)
{
AdditionalColor = additionalColor;
BodyKit = bodyKit;
Tent = tent;
}
}
}
}

2
Cruiser/Cruiser/Program.cs
View File

@ -11,7 +11,7 @@ namespace Cruiser
// To customize application configuration such as set high DPI settings or default font,
// see https://aka.ms/applicationconfiguration.
ApplicationConfiguration.Initialize();
Application.Run(new CruiserForm());
Application.Run(new FormCruiserCollection());
}
}
}

10
Cruiser/Cruiser/SetGeneric.cs
View File

@ -32,10 +32,10 @@ namespace Cruiser.Generics
/// </summary>
/// <param name="car">Добавляемый автомобиль</param>
/// <returns></returns>
public T? Insert(T car)
public int Insert(T car)
{
if (_places[Count - 1] != null)
return null;
return -1;
return Insert(car, 0);
}
/// <summary>
@ -44,10 +44,10 @@ namespace Cruiser.Generics
/// <param name="car">Добавляемый автомобиль</param>
/// <param name="position">Позиция</param>
/// <returns></returns>
public T? Insert(T car, int position)
public int Insert(T car, int position)
{
if (!(position >= 0 && position < Count))
return null;
return -1;
if (_places[position] != null)
{
int indexEnd = position + 1;
@ -62,7 +62,7 @@ namespace Cruiser.Generics
}
_places[position] = car;
return car;
return position;
}
// TODO проверка, что элемент массива по этой позиции пустой, если нет, то
// проверка, что после вставляемого элемента в массиве есть пустой элемент

2
Cruiser/Cruiser/Status.cs
View File

@ -4,7 +4,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Cruiser.MovementStrategy
namespace DumpTruck.MovementStrategy
{
public enum Status
{