# HG changeset patch # User Nozomi Teruya # Date 1447689709 -32400 # Node ID 8f60ba0d29ae602d8e413a29d29739a4e0dfb764 # Parent 9d52d34b708d4931fdabb40a85c4eec214a58d73 change put to flip, add setter/getter setTime diff -r 9d52d34b708d -r 8f60ba0d29ae .gradle/2.2.1/taskArtifacts/cache.properties.lock Binary file .gradle/2.2.1/taskArtifacts/cache.properties.lock has changed diff -r 9d52d34b708d -r 8f60ba0d29ae .gradle/2.2.1/taskArtifacts/fileHashes.bin Binary file .gradle/2.2.1/taskArtifacts/fileHashes.bin has changed diff -r 9d52d34b708d -r 8f60ba0d29ae .gradle/2.2.1/taskArtifacts/fileSnapshots.bin Binary file .gradle/2.2.1/taskArtifacts/fileSnapshots.bin has changed diff -r 9d52d34b708d -r 8f60ba0d29ae .gradle/2.2.1/taskArtifacts/outputFileStates.bin Binary file .gradle/2.2.1/taskArtifacts/outputFileStates.bin has changed diff -r 9d52d34b708d -r 8f60ba0d29ae .gradle/2.2.1/taskArtifacts/taskArtifacts.bin Binary file .gradle/2.2.1/taskArtifacts/taskArtifacts.bin has changed diff -r 9d52d34b708d -r 8f60ba0d29ae .idea/workspace.xml --- a/.idea/workspace.xml Tue Nov 17 00:07:17 2015 +0900 +++ b/.idea/workspace.xml Tue Nov 17 01:01:49 2015 +0900 @@ -1,10 +1,18 @@ - + + + + + + + + + - - - - - - - - - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -283,21 +216,20 @@ @@ -309,9 +241,10 @@ + @@ -338,9 +271,6 @@ - - - @@ -351,6 +281,9 @@ + + + @@ -360,74 +293,15 @@ - + - + - - - - - - - - - - - - - @@ -488,61 +346,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1447676756220 + + 1447689490713 - - + + - + - - - - - - - - + + + + + + + + + - - + + - + + - - - - + + - - - - file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveMeasurement.java - 57 - - - - file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveAliceVNCMessage.java - 28 - - - - file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveAliceVNCMessage.java - 56 - - - - file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/CheckCurrentInfo.java - 21 - - - - file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveMeasurement.java - 31 - - - - file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/SendChangeRequest.java - 26 - - - - file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/StopProxy.java - 18 - - - - file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/CheckCurrentInfo.java - 31 - - - - file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/CheckCurrentInfo.java - 40 - - - - file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/CheckCurrentInfo.java - 46 - - - - file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/SendChangeRequest.java - 42 - - - - file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/CreateWindow.java - 24 - - - - file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveAliceVNCMessage.java - 26 - - - - file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/CreateWindow.java - 45 - - - - - - - +

@@ -767,285 +434,24 @@ - + - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - \ No newline at end of file diff -r 9d52d34b708d -r 8f60ba0d29ae AliceVNC.iml --- a/AliceVNC.iml Tue Nov 17 00:07:17 2015 +0900 +++ b/AliceVNC.iml Tue Nov 17 01:01:49 2015 +0900 @@ -15,9 +15,9 @@ - + - + @@ -26,7 +26,7 @@ - + diff -r 9d52d34b708d -r 8f60ba0d29ae build.gradle --- a/build.gradle Tue Nov 17 00:07:17 2015 +0900 +++ b/build.gradle Tue Nov 17 01:01:49 2015 +0900 @@ -8,7 +8,7 @@ repositories { maven(){ - url 'http://www.cr.ie.u-ryukyu.ac.jp/hg/maven/raw-file/0792624d53b5/' + url 'http://www.cr.ie.u-ryukyu.ac.jp/hg/maven/raw-file/66ced1f875ea/' } } diff -r 9d52d34b708d -r 8f60ba0d29ae src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveMeasurement.java --- a/src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveMeasurement.java Tue Nov 17 00:07:17 2015 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveMeasurement.java Tue Nov 17 01:01:49 2015 +0900 @@ -51,7 +51,7 @@ PrintWriter pw = new PrintWriter(bw); ReceiveData r = info.getReceiveData(); - pw.println(r.depth/2+" "+(time - r.time)/2+" "+((byte[])info.getObj()).length); + pw.println(r.getDepth()/2+" "+(time - r.getTime())/2+" "+((byte[])info.getObj()).length); pw.close(); } } else { diff -r 9d52d34b708d -r 8f60ba0d29ae src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveUpdateRectangle.java --- a/src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveUpdateRectangle.java Tue Nov 17 00:07:17 2015 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveUpdateRectangle.java Tue Nov 17 01:01:49 2015 +0900 @@ -36,24 +36,22 @@ // send other node ArrayList clist = info3.asClass(ArrayList.class); // for measurement - if (info2.getReceiveData().setTime) { - ods.put("compressedparent", "measurement", info2.getReceiveData()); + if (info2.getReceiveData().getSetTime()) { + ods.flip("compressedparent", "measurement", info2); } for (String node : clist){ if (!info1.from.equals(node)) { // not need send data comes from // Data Segment from other node is already serialized - ods.put("compressed" + node, "updateRectangle", info1.getReceiveData()); //TODO need timeout counter + ods.flip("compressed" + node, "updateRectangle", info1); //TODO need timeout counter //ods.setCompressFlag(true); // for measurement ReceiveData r = info2.getReceiveData(); - if (!r.setTime) { - r.depth = 0; - r.setTime = true; - r.time = System.currentTimeMillis(); + if (!r.getSetTime()) { + r.setTimes(System.currentTimeMillis(), true, 0); } - ods.put("compressed" + node, "pixelData", info2.getReceiveData()); + ods.flip("compressed" + node, "pixelData", info2); } }