Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 25 additions & 4 deletions Picture/Canvas.java
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ public class Canvas
public static Canvas getCanvas()
{
if(canvasSingleton == null) {
canvasSingleton = new Canvas("BlueJ Shapes Demo", 300, 300,
Color.white);
canvasSingleton = new Canvas("BlueJ Shapes Demo", 700, 700,
new Color(25, 25, 112));
}
canvasSingleton.setVisible(true);
return canvasSingleton;
Expand Down Expand Up @@ -83,6 +83,7 @@ public void setVisible(boolean visible)
graphic.setColor(backgroundColour);
graphic.fillRect(0, 0, size.width, size.height);
graphic.setColor(Color.black);

}
frame.setVisible(visible);
}
Expand Down Expand Up @@ -119,7 +120,8 @@ public void erase(Object referenceObject)
* Set the foreground colour of the Canvas.
* @param newColour the new colour for the foreground of the Canvas
*/
public void setForegroundColor(String colorString)
public void setForegroundColor(String colorString
)
{
if(colorString.equals("red"))
graphic.setColor(Color.red);
Expand All @@ -135,7 +137,26 @@ else if(colorString.equals("magenta"))
graphic.setColor(Color.magenta);
else if(colorString.equals("white"))
graphic.setColor(Color.white);
else
else if(colorString.equals("brown"))
graphic.setColor(new Color(188,143,143));
else if(colorString.equals("dark green"))
graphic.setColor(new Color(0,100,0));
else if(colorString.equals("tan"))
graphic.setColor(new Color(210,180,140));
else if(colorString.equals("dark brown"))
graphic.setColor(new Color(78,53,36));
else if(colorString.equals("Midnight blue"))
graphic.setColor(new Color(25,25,112));
else if (colorString.equals("Moon Yellow"))
graphic.setColor(new Color(254, 252, 215));
else if (colorString.equals("Gray"))
graphic.setColor(new Color(183,179,164));
else if (colorString.equals("gravel"))
graphic.setColor(new Color(83,84,78));
else if (colorString.equals("gold"))
graphic.setColor(new Color(255,215,0));

else
graphic.setColor(Color.black);
}

Expand Down
285 changes: 268 additions & 17 deletions Picture/Picture.java
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,34 @@
*/
public class Picture
{
private Square wall;
private Rectangl wall;
private Square window;
private Triangle roof;
private Circle sun;
private Rectangl pool;
private Triangle tree;
private Rectangl wall2;
private Rectangl wall3;
private Rectangl door;
private Rectangl door2;
private Square window2;
private Rectangl ground;
private Rectangl walkway;
private Rectangl ground2;
private Rectangl ground3;
private Rectangl boardWalk;
private Rectangl window3;
private Rectangl window4;
private Circle windowRound;
private Rectangl rectangleWindow;
private Rectangl rectangleWindow2;
private Rectangl rectWind;
private Rectangl squareGarage;
private Rectangl squareGarageColor;
private Square stars;
private Rectangl treeBark;
private Rectangl roofRec;


/**
* Constructor for objects of class Picture
Expand All @@ -30,29 +54,256 @@ public Picture()
*/
public void draw()
{
wall = new Square();
wall.moveVertical(80);
wall.changeSize(100);
wall.makeVisible();



sun = new Circle();
sun.changeColor("Moon Yellow");
//sun.moveHorizontal(600);
//sun.moveVertical(-10);
sun.makeInvisible();


boardWalk = new Rectangl();
boardWalk.changeWidth(400);
boardWalk.changeHeight(20);
boardWalk.moveVertical(400);
boardWalk.moveHorizontal(300);
boardWalk.changeColor("dark brown");
boardWalk.makeVisible();

tree = new Triangle();
tree.changeColor("green");
tree.changeSize(150, 10);
tree.moveHorizontal(350);
tree.moveVertical(250);
tree.makeVisible();

treeBark = new Rectangl();
treeBark.changeHeight(40);
treeBark.changeWidth(10);
treeBark.moveHorizontal(365);
treeBark.moveVertical(360);
treeBark.changeColor("dark brown");
treeBark.makeVisible();

tree = new Triangle();
tree.changeColor("green");
tree.changeSize(150, 10);
tree.moveHorizontal(380);
tree.moveVertical(250);
tree.makeVisible();

treeBark = new Rectangl();
treeBark.changeHeight(40);
treeBark.changeWidth(10);
treeBark.moveHorizontal(395);
treeBark.moveVertical(360);
treeBark.changeColor("dark brown");
treeBark.makeVisible();

tree = new Triangle();
tree.changeColor("green");
tree.changeSize(150, 10);
tree.moveHorizontal(410);
tree.moveVertical(250);
tree.makeVisible();

treeBark = new Rectangl();
treeBark.changeHeight(40);
treeBark.changeWidth(10);
treeBark.moveHorizontal(425);
treeBark.moveVertical(360);
treeBark.changeColor("dark brown");
treeBark.makeVisible();




wall3 = new Rectangl();
wall3.changeWidth(200);
wall3.changeHeight(90);
wall3.moveVertical(280);
wall3.moveHorizontal(99);
wall3.changeColor("tan");
wall3.makeVisible();

wall2 = new Rectangl();
wall2.changeWidth(200);
wall2.changeHeight(90);
wall2.moveVertical(320);
wall2.moveHorizontal(99);
wall2.changeColor("tan");
wall2.makeVisible();

window2 = new Square();
window2.changeColor("yellow");
window2.moveVertical(300);
window2.moveHorizontal(200);
window2.makeVisible();


window = new Square();
window.changeColor("black");
window.moveHorizontal(20);
window.moveVertical(100);
window.changeColor("yellow");
window.moveVertical(300);
window.moveHorizontal(110);
window.makeVisible();



window3 = new Rectangl ();
window3.changeColor("yellow");
window3.moveVertical(350);
window3.moveHorizontal(110);
window3.changeHeight(45);
window3.changeWidth(60);
window3.makeVisible();


window4 = new Rectangl ();
window4.changeColor("yellow");
window4.moveVertical(350);
window4.moveHorizontal(230);
window4.changeHeight(45);
window4.changeWidth(55);
window4.makeVisible();




door2 = new Rectangl();
door2.moveVertical(350);
door2.moveHorizontal(180);
door2.changeHeight(50);
door2.changeWidth(40);
door2.changeColor("dark brown");
door2.makeVisible();

door2 = new Rectangl();
door2.moveVertical(370);
door2.moveHorizontal(185);
door2.changeHeight(5);
door2.changeWidth(5);
door2.changeColor("gold");
door2.makeVisible();



pool = new Rectangl();
pool.changeWidth(400);
pool.changeHeight(20);
pool.moveVertical(400);
pool.moveHorizontal(500);
pool.changeColor("blue");
pool.makeVisible();



ground = new Rectangl();
ground.changeWidth(300);
ground.changeHeight(300);
ground.moveVertical(400);
ground.moveHorizontal(-100);
ground.changeColor("dark green");
ground.makeVisible();

ground2 = new Rectangl();
ground2.changeWidth(80);
ground2.changeHeight(400);
ground2.moveVertical(400);
ground2.moveHorizontal(220);
ground2.changeColor("dark green");
ground2.makeVisible();


ground3 = new Rectangl();
ground3.changeWidth(700);
ground3.changeHeight(300);
ground3.moveVertical(420);
ground3.moveHorizontal(270);
ground3.changeColor("dark green");
ground3.makeVisible();

walkway = new Rectangl();
walkway.changeWidth(50);
walkway.changeHeight(500);
walkway.moveVertical(400);
walkway.moveHorizontal(180);
walkway.changeColor("brown");
walkway.makeVisible();



roof = new Triangle();
roof.changeSize(50, 140);
roof.moveHorizontal(60);
roof.moveVertical(70);
roof.changeColor("black");
roof.changeSize(100, 300);
roof.moveVertical(230);
roof.moveHorizontal(180);
roof.makeVisible();

windowRound = new Circle();
windowRound.changeColor("yellow");
windowRound.moveVertical(220);
windowRound.moveHorizontal(185);
windowRound.changeSize(50);
windowRound.makeVisible();

rectangleWindow = new Rectangl();
rectangleWindow.moveVertical(250);
rectangleWindow.moveHorizontal(175);
rectangleWindow.changeHeight(10);
rectangleWindow.changeWidth(50);
rectangleWindow.changeColor("dark brown");
rectangleWindow.makeVisible();

rectangleWindow2 = new Rectangl();
rectangleWindow2.moveVertical(230);
rectangleWindow2.moveHorizontal(195);
rectangleWindow2.changeHeight(50);
rectangleWindow2.changeWidth(10);
rectangleWindow2.changeColor("dark brown");
rectangleWindow2.makeVisible();


sun = new Circle();
sun.changeColor("yellow");
sun.moveHorizontal(180);
sun.moveVertical(-10);
sun.changeSize(60);


squareGarage = new Rectangl();
squareGarage.changeColor("tan");
squareGarage.moveVertical(320);
squareGarage.moveHorizontal(-50);
squareGarage.changeHeight(80);
squareGarage.changeWidth(150);
squareGarage.makeVisible();

squareGarageColor = new Rectangl();
squareGarageColor.changeColor("Gray");
squareGarageColor.moveVertical(330);
squareGarageColor.moveHorizontal(-50);
squareGarageColor.changeHeight(70);
squareGarageColor.changeWidth(150);
squareGarageColor.makeVisible();

roofRec = new Rectangl();
roofRec.changeColor("black");
roofRec.changeHeight(10);
roofRec.changeWidth(148);
roofRec.moveVertical(310);
roofRec.moveHorizontal(-50);
roofRec.makeVisible();

walkway = new Rectangl();
walkway.changeWidth(150);
walkway.changeHeight(500);
walkway.moveVertical(400);
walkway.moveHorizontal(-50);
walkway.changeColor("gravel");
walkway.makeVisible();

sun.makeVisible();
sun.slowMoveHorizontal(600);




}

/**
Expand Down
Loading