MorozovDanil/PIBD-12_Morozov_D.V._Simple
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PIBD-12 Morozov_D.V. LabWork№1 Simple #1

Closed
MorozovDanil wants to merge 7 commits from Lab1_base into main
pull from: Lab1_base
merge into: MorozovDanil:main
Conversation 0 Commits 7 Files Changed 16 +13 -14
2 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 2fc9f2e8cb - Show all commits

11
ProjectContainerShip/ProjectContainerShip/DrawningContainerShip.cs
View File

@ -50,12 +50,12 @@ public class DrawningContainerShip
/// <param name="weight">Вес</param>
/// <param name="bodyColor">Основной цвет</param>
/// <param name="additionalColor">Дополнительный цвет</param>
/// <param name="bodyKit">Признак наличия контейнеров</param>
/// <param name="container">Признак наличия контейнеров</param>
/// <param name="Crane">Признак наличия крана</param>
public void Init(int speed, double weight, Color bodyColor, Color additionalColor, bool bodyKit, bool Crane)
public void Init(int speed, double weight, Color bodyColor, Color additionalColor, bool container, bool Crane)
{
EntityContainerShip = new EntityContainerShip();
EntityContainerShip.Init(speed, weight, bodyColor, additionalColor, bodyKit, Crane);
EntityContainerShip.Init(speed, weight, bodyColor, additionalColor, container, Crane);
_pictureWidth = null;
_pictureHeight = null;
_startPosX = null;
@ -176,7 +176,7 @@ public class DrawningContainerShip
// контейнеры
if (EntityContainerShip.BodyKit)
if (EntityContainerShip.Container)
{
g.DrawRectangle(pen, _startPosX.Value + 60, _startPosY.Value + 55, 40, 5);
g.FillRectangle(additionalBrush, _startPosX.Value + 60, _startPosY.Value + 55, 40, 5);
@ -184,7 +184,6 @@ public class DrawningContainerShip
g.FillRectangle(additionalBrush, _startPosX.Value + 60, _startPosY.Value + 45, 40, 5);
g.DrawRectangle(pen, _startPosX.Value + 60, _startPosY.Value + 45, 40, 5);
g.FillRectangle(additionalBrush, _startPosX.Value + 60, _startPosY.Value + 50, 40, 5);
}
//границы лодки
@ -205,9 +204,9 @@ public class DrawningContainerShip
//палуба
//Brush brYellow = new SolidBrush(Color.LightYellow);
g.DrawRectangle(pen, _startPosX.Value + 20, _startPosY.Value + 30, 30, 30);
g.FillRectangle(br, _startPosX.Value + 20, _startPosY.Value + 30, 30, 30);
// кран
if (EntityContainerShip.Crane)

16
ProjectContainerShip/ProjectContainerShip/EntityContainerShip.cs
View File

@ -28,35 +28,35 @@ public class EntityContainerShip
/// <summary>
/// Признак (опция) наличия Контейнеров
/// </summary>
public bool BodyKit { get; private set; }
public bool Container { get; private set; }
/// <summary>
/// Признак (опция) наличия антикрыла
/// Признак (опция) наличия крана
/// </summary>
public bool Crane { get; private set; }
/// <summary>
/// Шаг перемещения автомобиля
/// Шаг перемещения контейнеровоза
/// </summary>
public double Step => Speed * 100 / Weight;
/// <summary>
/// Инициализация полей объекта-класса спортивного автомобиля
/// Инициализация полей объекта-класса контейнеровоза
/// </summary>
/// <param name="speed">Скорость</param>
/// <param name="weight">Вес контейнеровоза</param>
/// <param name="bodyColor">Основной цвет</param>
/// <param name="additionalColor">Дополнительный цвет</param>
/// <param name="bodyKit">Признак наличия контейнеров</param>
/// <param name="crane">Признак наличия антикрыла</param>
public void Init(int speed, double weight, Color bodyColor, Color additionalColor, bool bodyKit, bool crane)
/// <param name="container">Признак наличия контейнеров</param>
/// <param name="crane">Признак наличия крана</param>
public void Init(int speed, double weight, Color bodyColor, Color additionalColor, bool container, bool crane)
{
Speed = speed;
Weight = weight;
BodyColor = bodyColor;
AdditionalColor = additionalColor;
BodyKit = bodyKit;
Container = container;
Crane = crane;
}
}