# HG changeset patch
# User e095732
# Date 1359881366 -32400
# Node ID 5e6d40908c6093c4ebc78f64c3411b3a6dab9e29
# Parent  3458bde834d3d0e652020542b19a641fde455dd4
delete bug

diff -r 3458bde834d3 -r 5e6d40908c60 fxml/aquarium.fxml
--- a/fxml/aquarium.fxml	Sat Feb 02 02:24:05 2013 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import java.lang.*?>
-<?import java.util.*?>
-<?import javafx.scene.control.*?>
-<?import javafx.scene.image.*?>
-<?import javafx.scene.layout.*?>
-<?import javafx.scene.paint.*?>
-<?import javafx.scene.shape.*?>
-
-<AnchorPane id="AnchorPane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="800.0" prefWidth="800.0" xmlns:fx="http://javafx.com/fxml" fx:controller="alice.test.topology.aquarium.fx.AquariumController">
-  <children>
-    <TextField fx:id="text" layoutX="14.0" layoutY="564.0" minWidth="1.0" onKeyPressed="#PressedKey3" prefWidth="1.0" />
-    <ImageView fx:id="image" fitHeight="75.0" fitWidth="75.0" layoutX="245.0" layoutY="42.0" pickOnBounds="true" preserveRatio="true" />
-  </children>
-</AnchorPane>
diff -r 3458bde834d3 -r 5e6d40908c60 src/alice/test/topology/aquarium/fx/Aquarium.java
--- a/src/alice/test/topology/aquarium/fx/Aquarium.java	Sat Feb 02 02:24:05 2013 +0900
+++ b/src/alice/test/topology/aquarium/fx/Aquarium.java	Sun Feb 03 17:49:26 2013 +0900
@@ -48,10 +48,6 @@
         
         new AddObject(this);
 	}
-
-	public static void main(String[] args) {
-		launch(args);
-	}
 	
 	public void run(){
 		launch();
diff -r 3458bde834d3 -r 5e6d40908c60 src/alice/test/topology/aquarium/fx/SetTranslation.java
--- a/src/alice/test/topology/aquarium/fx/SetTranslation.java	Sat Feb 02 02:24:05 2013 +0900
+++ b/src/alice/test/topology/aquarium/fx/SetTranslation.java	Sun Feb 03 17:49:26 2013 +0900
@@ -33,8 +33,9 @@
 	public void run() {
 		int startX = data2.asInteger();
 		int width = data3.asInteger();
+		System.out.println(data2.val);
 		FishData fd = data1.asClass(FishData.class);
-		if (startX<fd.getX()&& fd.getX()<startX+width){
+		if (startX<=fd.getX()&& fd.getX()<=startX+width){
 			iv.setTranslateX(fd.getX() - startX);
 			iv.setTranslateY(fd.getY());
 			iv.setTranslateZ(fd.getZ());
diff -r 3458bde834d3 -r 5e6d40908c60 src/alice/test/topology/aquarium/fx/UpdateData.java
--- a/src/alice/test/topology/aquarium/fx/UpdateData.java	Sat Feb 02 02:24:05 2013 +0900
+++ b/src/alice/test/topology/aquarium/fx/UpdateData.java	Sun Feb 03 17:49:26 2013 +0900
@@ -20,10 +20,11 @@
 		FishData fd1 = data1.asClass(FishData.class);
 		FishData fd2 = data2.asClass(FishData.class);
 		
+		System.out.println(data1.val);
 		fd1.SetXYZ(fd1.getX()+fd2.getX(),
 				   fd1.getY()+fd2.getY(),
 				   fd1.getZ()+fd2.getZ());
 		ods.update("local", data1.key, fd1);
-		System.out.println("PUTDATA");
+		
 	}
 }
diff -r 3458bde834d3 -r 5e6d40908c60 src/alice/test/topology/aquarium/fx/aquarium.fxml
--- a/src/alice/test/topology/aquarium/fx/aquarium.fxml	Sat Feb 02 02:24:05 2013 +0900
+++ b/src/alice/test/topology/aquarium/fx/aquarium.fxml	Sun Feb 03 17:49:26 2013 +0900
@@ -11,6 +11,6 @@
 <AnchorPane id="AnchorPane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="800.0" prefWidth="800.0" xmlns:fx="http://javafx.com/fxml" fx:controller="alice.test.topology.aquarium.fx.AquariumController">
   <children>
     <TextField fx:id="text" layoutX="14.0" layoutY="564.0" minWidth="1.0" onKeyPressed="#PressedKey3" prefWidth="1.0" />
-    <ImageView fx:id="image" fitHeight="75.0" fitWidth="75.0" layoutX="245.0" layoutY="42.0" pickOnBounds="true" preserveRatio="true" />
+    <ImageView fx:id="image" fitHeight="75.0" fitWidth="75.0" layoutX="0.0" layoutY="0.0" pickOnBounds="true" preserveRatio="true" />
   </children>
 </AnchorPane>
diff -r 3458bde834d3 -r 5e6d40908c60 src/aquarium/test/local/StartCodeSegment.java
--- a/src/aquarium/test/local/StartCodeSegment.java	Sat Feb 02 02:24:05 2013 +0900
+++ b/src/aquarium/test/local/StartCodeSegment.java	Sun Feb 03 17:49:26 2013 +0900
@@ -9,6 +9,8 @@
 	@Override
 	public void run() {
 		ods.put("local", "objCnt", 5);
+		ods.put("local", "startX", 0);
+		ods.put("local", "width", 800);
 		Aquarium aqua = new Aquarium();
 		aqua.run();
 	}