tyxzo/PI-12_Zaytsev_A.V_Base
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

-лишний else +описания свойств сущности

Browse Source
This commit is contained in:
tyxz0 2024-02-20 08:10:37 +04:00
parent 8d4d56e692
commit 005c3818e2
3 changed files with 29 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
DoubleDeckerBus/DoubleDeckerBus/DrawingDoubleDeckerBus.cs
View File

@ -39,25 +39,29 @@ public class DrawingDoubleDeckerBus
{
return false;
}
else
_pictureWidth = width;
_pictureHeight = hight;
if (_startPosX.HasValue && (_startPosX.Value + _DrawingBusWidth > _pictureWidth))
{
_pictureWidth = width;
_pictureHeight = hight;
if (_startPosX.HasValue && (_startPosX.Value + _DrawingBusWidth > _pictureWidth))
{
_startPosX = _pictureWidth - _DrawingBusWidth;
}
if (_startPosY.HasValue && (_startPosY + _DrawingBusHight > _pictureHeight))
{
_startPosY = _pictureHeight - _DrawingBusHight;
}
return true;
_startPosX = _pictureWidth - _DrawingBusWidth;
}
}
if (_startPosY.HasValue && (_startPosY + _DrawingBusHight > _pictureHeight))
{
_startPosY = _pictureHeight - _DrawingBusHight;
}
return true;
}
/// <summary>
/// установить начальную позицию
/// </summary>
/// <param name="x"></param>
/// <param name="y"></param>
public void SetPosition(int x, int y)
{
if (!_pictureHeight.HasValue || !_pictureWidth.HasValue)
@ -100,7 +104,7 @@ public class DrawingDoubleDeckerBus
return false;
}
switch(direction)
switch (direction)
{
case DirectionType.Left:
if (_startPosX.Value - EntityDoubleDeckerBus.Step > 0)
@ -155,14 +159,14 @@ public class DrawingDoubleDeckerBus
}
//кузов
PointF[] bus = {new PointF((float)_startPosX + 5, (float)_startPosY + 5), new PointF((float)_startPosX + 5, (float)_startPosY + 45), new PointF((float)_startPosX+ 105, (float)_startPosY + 45), new PointF((float)_startPosX + 105, (float)_startPosY + 25), new PointF((float)_startPosX + 95, (float)_startPosY + 5)};
PointF[] bus = { new PointF((float)_startPosX + 5, (float)_startPosY + 5), new PointF((float)_startPosX + 5, (float)_startPosY + 45), new PointF((float)_startPosX + 105, (float)_startPosY + 45), new PointF((float)_startPosX + 105, (float)_startPosY + 25), new PointF((float)_startPosX + 95, (float)_startPosY + 5) };
g.DrawPolygon(pen, bus);
g.FillPolygon(mainBrush, bus);
//вехний отсек
if (EntityDoubleDeckerBus.TopSection)
{
PointF[] section = { new PointF((float)_startPosX + 27, (float)_startPosY + 5), new PointF((float)_startPosX + 37, (float)_startPosY + 1), new PointF((float)_startPosX + 65, (float)_startPosY + 1), new PointF((float)_startPosX + 75, (float)_startPosY + 5)};
PointF[] section = { new PointF((float)_startPosX + 27, (float)_startPosY + 5), new PointF((float)_startPosX + 37, (float)_startPosY + 1), new PointF((float)_startPosX + 65, (float)_startPosY + 1), new PointF((float)_startPosX + 75, (float)_startPosY + 5) };
g.DrawPolygon(pen, section);
g.FillPolygon(additionalBrush, section);
}

10
DoubleDeckerBus/DoubleDeckerBus/EntityDoubleDeckerBus.cs
View File

@ -13,23 +13,23 @@
/// </summary>
public Color AdditionalColor { get; private set; }
/// <summary>
/// Признак (опция) наличия обвеса
/// Признак (опция) наличия боковых зеркал
/// </summary>
public bool SideMirrors { get; private set; }
/// <summary>
/// Признак (опция) наличия антикрыла
/// Признак (опция) наличия верхней панели
/// </summary>
public bool TopSection { get; private set; }
/// <summary>
/// Признак (опция) наличия гоночной полосы
/// Признак (опция) наличия полосок на автобусе
/// </summary>
public bool Stripes { get; private set; }
/// <summary>
///
/// Признак (опция) наличия лестницы
/// </summary>
public bool Stairs { get; private set; }
/// <summary>
/// Шаг перемещения автомобиля
/// Шаг перемещения автобуса
/// </summary>
public double Step => Speed * 100 / Weight;
/// <summary>

2
DoubleDeckerBus/DoubleDeckerBus/FormDoubleDeckerBus.cs
View File

@ -81,7 +81,5 @@ namespace DoubleDeckerBus
Draw();
}
}
}
}