bulatova_karina/PIbd-22_Bulatova_K.R._WarmlyShip._BASE
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Внесла корректировки

Browse Source
This commit is contained in:
bulatova_karina 2023-10-24 13:21:27 +03:00
parent d71beac455
commit 7a45baf1c5
4 changed files with 0 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
WarmlyShip/WarmlyShip/DrawingWarmlyShip.cs
View File

@ -9,45 +9,13 @@ namespace WarmlyShip.DrawingObjects
{
public class DrawingWarmlyShip
{
/// <summary>
/// Класс-сущность
/// </summary>
public EntityWarmlyShip? EntityWarmlyShip { get; protected set; }
/// <summary>
/// Ширина окна
/// </summary>
private int _pictureWidth;
/// <summary>
/// Высота окна
/// </summary>
private int _pictureHeight;
/// <summary>
/// Левая координата прорисовки
/// </summary>
protected int _startPosX;
/// <summary>
/// Верхняя кооридната прорисовки
/// </summary>
protected int _startPosY;
/// <summary>
/// Ширина прорисовки
/// </summary>
protected readonly int _WarmlyShipWidth = 185;
/// <summary>
/// Высота прорисовки
/// </summary>
protected readonly int _WarmlyShipHeight = 180;
/// <summary>
/// Инициализация свойств
/// </summary>
/// <param name="speed">Скорость</param>
/// <param name="weight">Вес</param>
/// <param name="bodyColor">Цвет основы</param>
/// <param name="width">Ширина картинки</param>
/// <param name="height">Высота картинки</param>
/// <returns>true - объект создан, false - проверка не пройдена,
///нельзя создать объект в этих размерах</retu rns>
public DrawingWarmlyShip(int speed, double weight, Color bodyColor, int width, int height)
{
if (width < _WarmlyShipWidth || height < _WarmlyShipHeight)
@ -59,16 +27,6 @@ namespace WarmlyShip.DrawingObjects
EntityWarmlyShip = new EntityWarmlyShip(speed, weight, bodyColor);
}
/// <summary>
/// Конструктор
/// </summary>
/// <param name="speed">Скорость</param>
/// <param name="weight">Вес</param>
/// <param name="bodyColor">Основной цвет</param>
/// <param name="width">Ширина картинки</param>
/// <param name="height">Высота картинки</param>
/// <param name="buttleshipWidth">Ширина прорисовки автомобиля</param>
/// <param name="buttleshipHeight">Высота прорисовки автомобиля</param>
protected DrawingWarmlyShip(int speed, double weight, Color bodyColor, int
width, int height, int warmlyShipWidth, int warmlyShipHeight)
{
@ -80,11 +38,6 @@ namespace WarmlyShip.DrawingObjects
_WarmlyShipHeight = warmlyShipHeight;
EntityWarmlyShip = new EntityWarmlyShip(speed, weight, bodyColor);
}
/// <summary>
/// Установка позиции
/// </summary>
/// <param name="x">Координата X</param>
/// <param name="y">Координата Y</param>
public void SetPosition(int x, int y)
{
if (x >= 0 && x + _WarmlyShipWidth <= _pictureWidth && y >= 0 && y + _WarmlyShipHeight <= _pictureHeight)
@ -93,15 +46,6 @@ namespace WarmlyShip.DrawingObjects
_startPosY = y;
}
}
/// <summary>
/// Изменение направления перемещения
/// </summary>
/// <param name="direction">Направление</param>
/// <summary>
/// Прорисовка объекта
/// </summary>
/// <param name="g"></param>
public virtual void DrawTransport(Graphics g)
{
if (EntityWarmlyShip == null)
@ -131,23 +75,9 @@ namespace WarmlyShip.DrawingObjects
g.DrawLine(anchor, new Point(_startPosX + 45, _startPosY + 150), new Point(_startPosX + 55, _startPosY + 150));
}
public int GetPosX => _startPosX;
/// <summary>
/// Координата Y объекта
/// /// </summary>
public int GetPosY => _startPosY;
/// <summary>
/// Ширина объекта
/// </summary>
public int GetWidth => _WarmlyShipWidth;
/// <summary>
/// Высота объекта
/// </summary>
public int GetHeight => _WarmlyShipHeight;
/// <summary>
/// Проверка, что объект может переместится по указанному направлению
/// </summary>
/// <param name="direction">Направление</param>
/// <returns>true - можно переместится по указанному направлению</returns>
public bool CanMove(DirectionType direction)
{
if (EntityWarmlyShip == null)
@ -167,10 +97,6 @@ namespace WarmlyShip.DrawingObjects
_ => false,
};
}
/// <summary>
/// Изменение направления перемещения
/// </summary>
/// <param name="direction">Направление</param>
public void MoveTransport(DirectionType direction)
{
if (!CanMove(direction) || EntityWarmlyShip == null)

1
WarmlyShip/WarmlyShip/DrawingWarmlyShipWithPipes.cs
View File

@ -26,7 +26,6 @@ namespace WarmlyShip.DrawingObjects
return;
}
Pen pen = new(Color.Black, 2);
Pen anchor = new(Color.Black, 4);
Brush additionalBrush = new SolidBrush(warmlyShip.AdditionalColor);
base.DrawTransport(g);
//отсек для топлива

1
WarmlyShip/WarmlyShip/FormWarmlyShip.Designer.cs generated
View File

@ -164,7 +164,6 @@
}
#endregion
private PictureBox pictureBoxWarmlyShip;
private Button buttonCreateWarmlyShip;
private Button buttonCreate;

25
WarmlyShip/WarmlyShip/ObjectParameters.cs
View File

@ -12,37 +12,12 @@ namespace WarmlyShip.MovementStrategy
private readonly int _y;
private readonly int _width;
private readonly int _height;
/// <summary>
/// Левая граница
/// </summary>
public int LeftBorder => _x;
/// <summary>
/// Верхняя граница
/// </summary>
public int TopBorder => _y;
/// <summary>
/// Правая граница
/// </summary>
public int RightBorder => _x + _width;
/// <summary>
/// Нижняя граница
/// </summary>
public int DownBorder => _y + _height;
/// <summary>
/// Середина объекта
/// </summary>
public int ObjectMiddleHorizontal => _x + _width / 2;
/// <summary>
/// Середина объекта
/// </summary>
public int ObjectMiddleVertical => _y + _height / 2;
/// <summary>
/// Конструктор
/// </summary>
/// <param name="x">Координата X</param>
/// <param name="y">Координата Y</param>
/// <param name="width">Ширина</param>
/// <param name="height">Высота</param>
public ObjectParameters(int x, int y, int width, int height)
{
_x = x;