Kashin M.I. Lab work 2 #2

Closed
Sosees04ka wants to merge 6 commits from LabWork02 into LabWork01
Showing only changes of commit 39fe319e0b - Show all commits

View File

@ -22,9 +22,9 @@ public class DrawingOrnamentWheelsSecond implements IDrawningObjectWheels{
g.setColor(Color.BLACK);
g.drawOval(_startPosX + 10, _startPosY + 35, 20, 20);
g.fillOval(_startPosX + 10, _startPosY + 35, 20, 20);
g.setColor(Color.RED);
g.drawOval(_startPosX + 130, _startPosY + 45, 20, 5);
g.drawOval(_startPosX + 10, _startPosY + 45, 20, 5);
g.setColor(Color.GRAY);
g.drawRect(_startPosX + 130, _startPosY + 45, 20, 5);
g.drawRect(_startPosX + 10, _startPosY + 45, 20, 5);
}
if (_wheels.getCountWheels() == 3) {
g.setColor(Color.BLACK);
@ -32,10 +32,10 @@ public class DrawingOrnamentWheelsSecond implements IDrawningObjectWheels{
g.fillOval(_startPosX + 10, _startPosY + 35, 20, 20);
g.drawOval(_startPosX + 30, _startPosY + 35, 20, 20);
g.fillOval(_startPosX + 30, _startPosY + 35, 20, 20);
g.setColor(Color.RED);
g.drawOval(_startPosX + 130, _startPosY + 45, 20, 5);
g.drawOval(_startPosX + 30, _startPosY + 45, 20, 5);
g.drawOval(_startPosX + 10, _startPosY + 45, 20, 5);
g.setColor(Color.GRAY);
g.drawRect(_startPosX + 130, _startPosY + 45, 20, 5);
g.drawRect(_startPosX + 30, _startPosY + 45, 20, 5);
g.drawRect(_startPosX + 10, _startPosY + 45, 20, 5);
}
if (_wheels.getCountWheels() == 4) {
g.setColor(Color.BLACK);
@ -45,11 +45,11 @@ public class DrawingOrnamentWheelsSecond implements IDrawningObjectWheels{
g.fillOval(_startPosX + 30, _startPosY + 35, 20, 20);
g.drawOval(_startPosX + 50, _startPosY + 35, 20, 20);
g.fillOval(_startPosX + 50, _startPosY + 35, 20, 20);
g.setColor(Color.RED);
g.drawOval(_startPosX + 130, _startPosY + 45, 20, 5);
g.drawOval(_startPosX + 50, _startPosY + 45, 20, 5);
g.drawOval(_startPosX + 30, _startPosY + 45, 20, 5);
g.drawOval(_startPosX + 10, _startPosY + 45, 20, 5);
g.setColor(Color.GRAY);
g.drawRect(_startPosX + 130, _startPosY + 45, 20, 5);
g.drawRect(_startPosX + 50, _startPosY + 45, 20, 5);
g.drawRect(_startPosX + 30, _startPosY + 45, 20, 5);
g.drawRect(_startPosX + 10, _startPosY + 45, 20, 5);
}
}
}