PIbd-14 Ivleev D.A. Lab01 #1

Closed
Pyro wants to merge 6 commits from Lab01 into main
2 changed files with 12 additions and 12 deletions
Showing only changes of commit 867060b716 - Show all commits

View File

@ -9,7 +9,7 @@ namespace ProjectMotorBoat;
public class DrawingMotorBoat
{
/// <summary>
/// Класс-сущность
/// Класс-сущность "Катер"
/// </summary>
public EntityMotorBoat? EntityMotorBoat { get; private set; }
@ -52,12 +52,12 @@ public class DrawingMotorBoat
/// <param name="bodyColor"></param>
/// <param name="additionalColor"></param>
/// <param name="inboardEngine"></param>
/// <param name="paddle"></param>
/// <param name="oar"></param>
/// <param name="protectiveGlass"></param>
public void Init(int speed, double weight, Color bodyColor, Color additionalColor, bool inboardEngine, bool paddle, bool protectiveGlass)
public void Init(int speed, double weight, Color bodyColor, Color additionalColor, bool inboardEngine, bool oar, bool protectiveGlass)
{
EntityMotorBoat = new EntityMotorBoat();
EntityMotorBoat.Init(speed, weight, bodyColor, additionalColor, inboardEngine, paddle, protectiveGlass);
EntityMotorBoat.Init(speed, weight, bodyColor, additionalColor, inboardEngine, oar, protectiveGlass);
_pictureWidth = null;
_pictureHeight = null;
_startPosX = null;
@ -245,7 +245,7 @@ public class DrawingMotorBoat
}
// Вёсла
if (EntityMotorBoat.Paddle)
if (EntityMotorBoat.Oar)
{
g.DrawRectangle(pen, _startPosX.Value + 32, _startPosY.Value + 3, 2, 17);
g.DrawRectangle(pen, _startPosX.Value + 32, _startPosY.Value + 30, 2, 17);

View File

@ -31,12 +31,12 @@ public class EntityMotorBoat
public bool InboardEngine { get; private set; }
/// <summary>
/// Признак (опция) наличия вёсел
/// Признак (опция) наличия весла
/// </summary>
public bool Paddle { get; private set; }
public bool Oar { get; private set; }
/// <summary>
/// Возможность глиссирования
/// Признак (опция) наличия защитного стекла
/// </summary>
public bool ProtectiveGlass { get; private set; }
@ -53,16 +53,16 @@ public class EntityMotorBoat
/// <param name="bodyColor"></param>
/// <param name="additionalColor"></param>
/// <param name="inboardEngine"></param>
/// <param name="inflatable"></param>
/// <param name="planing"></param>
public void Init(int speed, double weight, Color bodyColor, Color additionalColor, bool inboardEngine, bool paddle, bool protectiveGlass)
/// <param name="oar"></param>
/// <param name="protectiveGlass"></param>
public void Init(int speed, double weight, Color bodyColor, Color additionalColor, bool inboardEngine, bool oar, bool protectiveGlass)
{
Speed = speed;
Weight = weight;
BodyColor = bodyColor;
AdditionalColor = additionalColor;
InboardEngine = inboardEngine;
Paddle = paddle;
Oar = oar;
ProtectiveGlass = protectiveGlass;
}
}