PIBD-12_Morozov_D.V. LabWork№3 #6

Closed
MorozovDanil wants to merge 8 commits from Lab3_base into Lab2_base
Showing only changes of commit c20e24d2ed - Show all commits

View File

@ -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)
{
@ -47,21 +59,6 @@ public class DrawningContainerShip : DrawningShip
}
//base.DrawTransport(g);
// контейнеры
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);
}
//base.DrawTransport(g);
_startPosX += 5;
_startPosY += 30;