# HG changeset patch
# User e095732
# Date 1359359979 -32400
# Node ID 75f7a75bec83a309a1bbc9ffa036be0f7904fd1c
# Parent  ae0a39622a588eb64234c373781f864fe31b46d1
use only ImageView

diff -r ae0a39622a58 -r 75f7a75bec83 src/alice/test/topology/aquarium/fx/AddObject.java
--- a/src/alice/test/topology/aquarium/fx/AddObject.java	Mon Jan 28 16:29:47 2013 +0900
+++ b/src/alice/test/topology/aquarium/fx/AddObject.java	Mon Jan 28 16:59:39 2013 +0900
@@ -8,9 +8,9 @@
 import javafx.application.Platform;
 import javafx.collections.ObservableList;
 import javafx.scene.Node;
-import javafx.scene.paint.Color;
-import javafx.scene.shape.Rectangle;
-import javafx.scene.shape.RectangleBuilder;
+import javafx.scene.image.Image;
+import javafx.scene.image.ImageView;
+import javafx.scene.image.ImageViewBuilder;
 
 public class AddObject extends CodeSegment{
 	
@@ -28,20 +28,20 @@
 			public void run() {
 				int num = data.asInteger();
 				double size = 75;
-				Color color = Color.RED;
 				Random rnd = new Random();
+				Image img = new Image("fish.jpg");
 				for (int i = 0;i < num; i++){
-					Rectangle rect = RectangleBuilder.create()
-							.width(size).height(size)
-							.fill(color.deriveColor(0.0, 1.0, 1.0, 1.0))
+					ImageView iv = ImageViewBuilder.create()
+							.fitWidth(size).fitHeight(size)
 							.translateX(rnd.nextInt(600))
 							.translateY(rnd.nextInt(600))
 							.translateZ(0)
 							.id("FISH"+i)
 							.build();
-					new SetTranslation(rect ,rect.getId());
-					list.add(rect);
-					new PositionController(rect.getId());
+					iv.setImage(img);
+					new SetTranslation(iv ,iv.getId());
+					list.add(iv);
+					new PositionController(iv.getId());
 				}
 				System.out.println("Create OBJ " + num);
 				System.out.println(list);
diff -r ae0a39622a58 -r 75f7a75bec83 src/alice/test/topology/aquarium/fx/PositionController.java
--- a/src/alice/test/topology/aquarium/fx/PositionController.java	Mon Jan 28 16:29:47 2013 +0900
+++ b/src/alice/test/topology/aquarium/fx/PositionController.java	Mon Jan 28 16:59:39 2013 +0900
@@ -30,7 +30,7 @@
 		
 		FishData fd = data.asClass(FishData.class);
 		if(fd.getX()+2.0>max){
-			System.out.println("over");
+			System.out.println("over "+this.data.key);
 			fd.SetXYZ(50, fd.getY(), fd.getZ());
 			
 		} else {
diff -r ae0a39622a58 -r 75f7a75bec83 src/alice/test/topology/aquarium/fx/SetTranslation.java
--- a/src/alice/test/topology/aquarium/fx/SetTranslation.java	Mon Jan 28 16:29:47 2013 +0900
+++ b/src/alice/test/topology/aquarium/fx/SetTranslation.java	Mon Jan 28 16:59:39 2013 +0900
@@ -1,7 +1,6 @@
 package alice.test.topology.aquarium.fx;
 
 import javafx.scene.image.ImageView;
-import javafx.scene.shape.Rectangle;
 import alice.codesegment.CodeSegment;
 import alice.datasegment.CommandType;
 import alice.datasegment.Receiver;
@@ -9,45 +8,28 @@
 public class SetTranslation extends CodeSegment {
 	
 	private Receiver data = ids.create(CommandType.PEEK);
-	private ImageView image;
-	private Rectangle rect;
-	
-	public SetTranslation(ImageView image, String key){
-		this.image = image;
+	private ImageView iv;
+
+	public SetTranslation(ImageView iv, String key){
+		ods.put("local", key, new FishData(iv.getTranslateX(),iv.getTranslateY(),iv.getTranslateZ()));
+		this.iv = iv;
 		data.setKey(key);
 	} 
 	
-	public SetTranslation(ImageView image, String key, int index) {
-		this.image = image;
-		data.setKey(key, index);
-	}
-
-	public SetTranslation(Rectangle rect, String key){
-		ods.put("local", key, new FishData(rect.getTranslateX(),rect.getTranslateY(),rect.getTranslateZ()));
-		this.rect = rect;
-		data.setKey(key);
-	} 
-	
-	public SetTranslation(Rectangle rect, String key, int index) {
-		this.rect = rect;
+	public SetTranslation(ImageView iv, String key, int index) {
+		this.iv = iv;
 		data.setKey(key, index);
 	}
 	
 	@Override
 	public void run() {
 		FishData fd = data.asClass(FishData.class);
-		if (image!=null){
-			image.setTranslateX(fd.x);
-			image.setTranslateY(fd.y);
-			image.setTranslateZ(fd.z);
+		if (iv!=null){
+			iv.setTranslateX(fd.x);
+			iv.setTranslateY(fd.y);
+			iv.setTranslateZ(fd.z);
 
-			new SetTranslation(image, data.key, data.index);
-		} else if (rect != null){
-			rect.setTranslateX(fd.x);
-			rect.setTranslateY(fd.y);
-			rect.setTranslateZ(fd.z);
-
-			new SetTranslation(rect, data.key, data.index);
+			new SetTranslation(iv, data.key, data.index);
 		}
 
 	}