# HG changeset patch # User Nozomi Teruya # Date 1447751823 -32400 # Node ID 9662e582ffaddacdb6b071d67f25a6bd8dfd551e # Parent 8f60ba0d29ae602d8e413a29d29739a4e0dfb764 work AliceVNC (don't work ServerChangeRequest) diff -r 8f60ba0d29ae -r 9662e582ffad .gradle/2.2.1/taskArtifacts/cache.properties.lock Binary file .gradle/2.2.1/taskArtifacts/cache.properties.lock has changed diff -r 8f60ba0d29ae -r 9662e582ffad .gradle/2.2.1/taskArtifacts/fileHashes.bin Binary file .gradle/2.2.1/taskArtifacts/fileHashes.bin has changed diff -r 8f60ba0d29ae -r 9662e582ffad .gradle/2.2.1/taskArtifacts/fileSnapshots.bin Binary file .gradle/2.2.1/taskArtifacts/fileSnapshots.bin has changed diff -r 8f60ba0d29ae -r 9662e582ffad .gradle/2.2.1/taskArtifacts/taskArtifacts.bin Binary file .gradle/2.2.1/taskArtifacts/taskArtifacts.bin has changed diff -r 8f60ba0d29ae -r 9662e582ffad .idea/workspace.xml --- a/.idea/workspace.xml Tue Nov 17 01:01:49 2015 +0900 +++ b/.idea/workspace.xml Tue Nov 17 18:17:03 2015 +0900 @@ -4,11 +4,8 @@ - - - - - + + @@ -43,13 +40,15 @@ - + - + + + @@ -57,8 +56,8 @@ - - + + @@ -241,9 +240,8 @@ - @@ -271,6 +269,7 @@ + @@ -279,10 +278,45 @@ + + + + + + + + + + + + + + + + + + + + - @@ -295,13 +329,72 @@ - + + + + + + + + + + + + + + @@ -346,6 +455,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -394,39 +604,54 @@ - + - + - - - - - - - - - + + + + + + + + + + + - - + + + - - - - + - + + + + file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveUpdateRectangle.java + 53 + + + + file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveUpdateRectangle.java + 39 + + + +

@@ -438,20 +663,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + \ No newline at end of file diff -r 8f60ba0d29ae -r 9662e582ffad src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveUpdateRectangle.java --- a/src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveUpdateRectangle.java Tue Nov 17 01:01:49 2015 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveUpdateRectangle.java Tue Nov 17 18:17:03 2015 +0900 @@ -37,13 +37,13 @@ ArrayList clist = info3.asClass(ArrayList.class); // for measurement if (info2.getReceiveData().getSetTime()) { - ods.flip("compressedparent", "measurement", info2); + ods.flip("parent", "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.flip("compressed" + node, "updateRectangle", info1); //TODO need timeout counter + ods.flip(node, "updateRectangle", info1); //TODO need timeout counter //ods.setCompressFlag(true); // for measurement @@ -51,7 +51,7 @@ if (!r.getSetTime()) { r.setTimes(System.currentTimeMillis(), true, 0); } - ods.flip("compressed" + node, "pixelData", info2); + ods.flip(node, "pixelData", info2); } }