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№2 #2

Closed
MorozovDanil wants to merge 5 commits from Lab2_base into Lab1_base
pull from: Lab2_base
merge into: MorozovDanil:Lab1_base
Conversation 1 Commits 5 Files Changed 16 +14 -12
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c387d6137b - Show all commits

26
ProjectContainerShip/ProjectContainerShip/Drawnings/DrawningContainerShip.cs
View File

@ -19,10 +19,10 @@ public class DrawningContainerShip : DrawningShip
/// <param name="container">Признак наличия контейнеров</param>
public DrawningContainerShip(int speed, double weight, Color bodyColor, Color additionalColor, bool crane, bool container) : base(125, 60)
{
EntityShip = new EntityContainerShip(speed, weight, bodyColor, additionalColor, crane, container);
EntityShip = new EntityContainerShip(speed, weight, bodyColor, additionalColor, crane, container);
}
/// <returns>true - объект создан, false - проверка не пройдена, нельзя создать объект в этих размерах</returns>
public override void DrawTransport(Graphics g)
public override void DrawTransport(Graphics g)
{
if (EntityShip == null || EntityShip is not EntityContainerShip containerShip || !_startPosX.HasValue || !_startPosY.HasValue)
{
@ -35,6 +35,18 @@ public class DrawningContainerShip : DrawningShip
base.DrawTransport(g);
_startPosX -= 5;
_startPosY -= 30;
// контейнеры
if (containerShip.Container)
{
g.DrawRectangle(pen, _startPosX.Value + 60, _startPosY.Value + 55, 40, 5);
g.FillRectangle(additionalBrush, _startPosX.Value + 60, _startPosY.Value + 55, 40, 5);
g.DrawRectangle(pen, _startPosX.Value + 60, _startPosY.Value + 50, 40, 5);
g.FillRectangle(additionalBrush, _startPosX.Value + 60, _startPosY.Value + 50, 40, 5);
g.DrawRectangle(pen, _startPosX.Value + 60, _startPosY.Value + 45, 40, 5);
g.FillRectangle(additionalBrush, _startPosX.Value + 60, _startPosY.Value + 45, 40, 5);
}
// кран
if (containerShip.Crane)
eegov commented 2024-03-30 19:08:19 +04:00
Review
Copy Link

Закомментированного кода быть не должно

Закомментированного кода быть не должно
{
@ -47,16 +59,6 @@ public class DrawningContainerShip : DrawningShip
}
// контейнеры
if (containerShip.Container)
{
g.DrawRectangle(pen, _startPosX.Value + 60, _startPosY.Value + 55, 40, 5);
g.FillRectangle(additionalBrush, _startPosX.Value + 60, _startPosY.Value + 55, 40, 5);
g.DrawRectangle(pen, _startPosX.Value + 60, _startPosY.Value + 50, 40, 5);
g.FillRectangle(additionalBrush, _startPosX.Value + 60, _startPosY.Value + 50, 40, 5);
g.DrawRectangle(pen, _startPosX.Value + 60, _startPosY.Value + 45, 40, 5);
g.FillRectangle(additionalBrush, _startPosX.Value + 60, _startPosY.Value + 45, 40, 5);
}
_startPosX += 5;
_startPosY += 30;