From 276959bbf817c7f6805d1516bc98501cdff5fd76 Mon Sep 17 00:00:00 2001 From: Mike Gray Date: Tue, 15 Oct 2019 21:14:04 -0400 Subject: [PATCH] Changed the picture used as a test. --- Picture/Picture.java | 153 +++++++++++++++++++++++++++++++++++++----- Picture/package.bluej | 52 +++++++------- Shapes/package.bluej | 14 ++-- 3 files changed, 168 insertions(+), 51 deletions(-) diff --git a/Picture/Picture.java b/Picture/Picture.java index c5c557a..b56ed05 100644 --- a/Picture/Picture.java +++ b/Picture/Picture.java @@ -13,9 +13,22 @@ public class Picture { private Square wall; + private Square wall2; + private Square line; + private Triangle line2; + private Triangle shader; private Square window; + private Square window2; + private Square door; + private Square door2; private Triangle roof; - private Circle sun; + private Triangle roof2; + private Circle moon; + private Circle shader2; + private Square background; + private Square background2; + private Square ground; + private Triangle tree; /** * Constructor for objects of class Picture @@ -30,29 +43,133 @@ public Picture() */ public void draw() { + background = new Square(); + background.changeColor("black"); + background.moveVertical(-50); + background.moveHorizontal(-60); + background.changeSize(300); + background.makeVisible(); + + ground = new Square(); + ground.changeColor("green"); + ground.moveVertical(125); + ground.moveHorizontal(-60); + ground.changeSize(300); + ground.makeVisible(); + + roof2 = new Triangle(); + roof2.changeColor("yellow"); + roof2.changeSize(50, 230); + roof2.moveHorizontal(35); + roof2.moveVertical(55); + roof2.makeVisible(); + + background2 = new Square(); + background2.changeColor("black"); + background2.moveVertical(0); + background2.moveHorizontal(-74); + background2.changeSize(100); + background2.makeVisible(); + + + wall2 = new Square(); + wall2.moveVertical(70); + wall2.moveHorizontal(10); + wall2.changeSize(120); + wall2.makeVisible(); + + shader = new Triangle(); + shader.changeColor("green"); + shader.changeSize(50, 170); + shader.moveHorizontal(160); + shader.moveVertical(190); + shader.makeVisible(); + + + line = new Square(); + line.changeColor("black"); + line.moveVertical(70); + line.moveHorizontal(-29); + line.changeSize(120); + line.makeVisible(); + wall = new Square(); - wall.moveVertical(80); - wall.changeSize(100); + wall.moveVertical(70); + wall.moveHorizontal(-30); + wall.changeSize(120); wall.makeVisible(); - + window = new Square(); - window.changeColor("black"); - window.moveHorizontal(20); - window.moveVertical(100); + window.changeColor("white"); + window.moveHorizontal(-20); + window.moveVertical(90); window.makeVisible(); + + window2 = new Square(); + window2.changeColor("white"); + window2.moveHorizontal(40); + window2.moveVertical(90); + window2.makeVisible(); + + + door = new Square(); + door.changeColor("black"); + door.moveHorizontal(15); + door.moveVertical(155); + door.changeSize(20); + door.makeVisible(); + + door2 = new Square(); + door2.changeColor("black"); + door2.moveHorizontal(15); + door2.moveVertical(170); + door2.changeSize(20); + door2.makeVisible(); + + + line2 = new Triangle(); + line2.changeColor("black"); + line2.changeSize(50, 140); + line2.moveHorizontal(36); + line2.moveVertical(55); + line2.makeVisible(); + roof = new Triangle(); + roof.changeColor("yellow"); roof.changeSize(50, 140); - roof.moveHorizontal(60); - roof.moveVertical(70); + roof.moveHorizontal(35); + roof.moveVertical(55); roof.makeVisible(); - - sun = new Circle(); - sun.changeColor("yellow"); - sun.moveHorizontal(180); - sun.moveVertical(-10); - sun.changeSize(60); - sun.makeVisible(); + + + moon = new Circle(); + moon.changeColor("white"); + moon.moveHorizontal(200); + moon.moveVertical(-50); + moon.changeSize(30); + moon.makeVisible(); + + shader2 = new Circle(); + shader2.changeColor("black"); + shader2.moveHorizontal(210); + shader2.moveVertical(-55); + shader2.changeSize(30); + shader2.makeVisible(); + + tree = new Triangle(); + tree.changeColor("green"); + tree.changeSize(90, 20); + tree.moveHorizontal(180); + tree.moveVertical(80); + tree.makeVisible(); + + + + + + + } /** @@ -65,7 +182,7 @@ public void setBlackAndWhite() wall.changeColor("black"); window.changeColor("white"); roof.changeColor("black"); - sun.changeColor("black"); + moon.changeColor("black"); } } @@ -79,7 +196,7 @@ public void setColor() wall.changeColor("red"); window.changeColor("black"); roof.changeColor("green"); - sun.changeColor("yellow"); + moon.changeColor("yellow"); } } diff --git a/Picture/package.bluej b/Picture/package.bluej index 4a5eed1..9687e41 100644 --- a/Picture/package.bluej +++ b/Picture/package.bluej @@ -2,38 +2,38 @@ dependency1.from=Circle dependency1.to=Canvas dependency1.type=UsesDependency -dependency2.from=Picture -dependency2.to=Square +dependency2.from=Triangle +dependency2.to=Canvas dependency2.type=UsesDependency -dependency3.from=Picture -dependency3.to=Triangle +dependency3.from=Square +dependency3.to=Canvas dependency3.type=UsesDependency -dependency4.from=Picture -dependency4.to=Circle +dependency4.from=PictureTest +dependency4.to=Picture dependency4.type=UsesDependency -dependency5.from=Triangle -dependency5.to=Canvas +dependency5.from=Picture +dependency5.to=Square dependency5.type=UsesDependency -dependency6.from=Square -dependency6.to=Canvas +dependency6.from=Picture +dependency6.to=Triangle dependency6.type=UsesDependency -dependency7.from=PictureTest -dependency7.to=Picture +dependency7.from=Picture +dependency7.to=Circle dependency7.type=UsesDependency -editor.fx.0.height=722 -editor.fx.0.width=800 -editor.fx.0.x=2086 -editor.fx.0.y=284 +editor.fx.0.height=751 +editor.fx.0.width=793 +editor.fx.0.x=647 +editor.fx.0.y=66 objectbench.height=101 -objectbench.width=461 +objectbench.width=618 package.divider.horizontal=0.6 package.divider.vertical=0.8007380073800738 -package.editor.height=427 -package.editor.width=674 -package.editor.x=239 -package.editor.y=118 +package.editor.height=411 +package.editor.width=516 +package.editor.x=4 +package.editor.y=171 package.frame.height=600 -package.frame.width=800 +package.frame.width=642 package.numDependencies=7 package.numTargets=6 package.showExtends=true @@ -57,8 +57,8 @@ target2.name=Picture target2.showInterface=false target2.type=ClassTarget target2.width=80 -target2.x=420 -target2.y=160 +target2.x=470 +target2.y=180 target3.height=40 target3.name=Canvas target3.showInterface=false @@ -85,5 +85,5 @@ target6.name=PictureTest target6.showInterface=false target6.type=UnitTestTargetJunit4 target6.width=80 -target6.x=450 -target6.y=130 +target6.x=500 +target6.y=150 diff --git a/Shapes/package.bluej b/Shapes/package.bluej index 5e6c247..0b81de6 100644 --- a/Shapes/package.bluej +++ b/Shapes/package.bluej @@ -12,15 +12,15 @@ editor.fx.0.height=0 editor.fx.0.width=0 editor.fx.0.x=0 editor.fx.0.y=0 -objectbench.height=160 -objectbench.width=769 +objectbench.height=157 +objectbench.width=1290 package.divider.horizontal=0.5996908809891809 -package.divider.vertical=0.7822685788787483 -package.editor.height=593 +package.divider.vertical=0.7813333333333333 +package.editor.height=579 package.editor.width=1188 -package.editor.x=246 -package.editor.y=192 -package.frame.height=825 +package.editor.x=126 +package.editor.y=24 +package.frame.height=808 package.frame.width=1314 package.numDependencies=3 package.numTargets=4