diff --git a/ExcavatorDifficult/ExcavatorDifficult/DrawingExcavator.cs b/ExcavatorDifficult/ExcavatorDifficult/DrawingExcavator.cs index 827197b..f124887 100644 --- a/ExcavatorDifficult/ExcavatorDifficult/DrawingExcavator.cs +++ b/ExcavatorDifficult/ExcavatorDifficult/DrawingExcavator.cs @@ -104,7 +104,6 @@ public class DrawingExcavator else if (y > _pictureHeight.Value - _drawningExcavatorWidth) { y = _pictureHeight.Value - _drawningExcavatorHeight; - //return; } _startPosX = x; _startPosY = y; @@ -181,26 +180,14 @@ public class DrawingExcavator g.DrawArc(pen, _startPosX.Value, _startPosY.Value + 45, 30, 40, 130, 100); g.DrawArc(pen, _startPosX.Value + 80, _startPosY.Value + 50, 30, 40, 285, 110); g.DrawLine(pen, _startPosX.Value + 5, _startPosY.Value + 80, _startPosX.Value + 109, _startPosY.Value + 80); - //g.DrawEllipse(pen, _startPosX.Value + 5, _startPosY.Value + 53, 25, 25); - //g.DrawEllipse(pen, _startPosX.Value + 80, _startPosY.Value + 53, 25, 25); - //g.DrawEllipse(pen, _startPosX.Value + 30, _startPosY.Value + 69, 10, 10); - //g.DrawEllipse(pen, _startPosX.Value + 48, _startPosY.Value + 69, 10, 10); - //g.DrawEllipse(pen, _startPosX.Value + 65, _startPosY.Value + 69, 10, 10); - //g.DrawEllipse(pen, _startPosX.Value + 40, _startPosY.Value + 53, 7, 7); - //g.DrawEllipse(pen, _startPosX.Value + 60, _startPosY.Value + 53, 7, 7); + //заливка кабины и основного железа Brush br = new SolidBrush(Color.Black); g.FillRectangle(bodybrush, _startPosX.Value, _startPosY.Value + 20, 100, 30); g.FillRectangle(bodybrush, _startPosX.Value + 30, _startPosY.Value, 10, 20); g.FillRectangle(bodybrush, _startPosX.Value + 80, _startPosY.Value, 20, 20); - //g.FillEllipse(br, _startPosX.Value + 5, _startPosY.Value + 53, 25, 25); - //g.FillEllipse(br, _startPosX.Value + 80, _startPosY.Value + 53, 25, 25); - //g.FillEllipse(br, _startPosX.Value + 30, _startPosY.Value + 69, 10, 10); - //g.FillEllipse(br, _startPosX.Value + 48, _startPosY.Value + 69, 10, 10); - //g.FillEllipse(br, _startPosX.Value + 65, _startPosY.Value + 69, 10, 10); - //g.FillEllipse(br, _startPosX.Value + 40, _startPosY.Value + 53, 7, 7); - //g.FillEllipse(br, _startPosX.Value + 60, _startPosY.Value + 53, 7, 7); + Rink.DrawRinks(g, _startPosX.Value + 5, _startPosY.Value + 10);