# HG changeset patch # User Nozomi Teruya # Date 1448636922 -32400 # Node ID 6295918b8a97bc6cd76e8fc50a1baa634be396a2 # Parent 281b667970de1a128d65620e7693124852c60e50 don't using compressed&flip version for mersurement diff -r 281b667970de -r 6295918b8a97 .gradle/2.2.1/taskArtifacts/cache.properties.lock Binary file .gradle/2.2.1/taskArtifacts/cache.properties.lock has changed diff -r 281b667970de -r 6295918b8a97 .gradle/2.2.1/taskArtifacts/fileHashes.bin Binary file .gradle/2.2.1/taskArtifacts/fileHashes.bin has changed diff -r 281b667970de -r 6295918b8a97 .gradle/2.2.1/taskArtifacts/fileSnapshots.bin Binary file .gradle/2.2.1/taskArtifacts/fileSnapshots.bin has changed diff -r 281b667970de -r 6295918b8a97 .gradle/2.2.1/taskArtifacts/outputFileStates.bin Binary file .gradle/2.2.1/taskArtifacts/outputFileStates.bin has changed diff -r 281b667970de -r 6295918b8a97 .gradle/2.2.1/taskArtifacts/taskArtifacts.bin Binary file .gradle/2.2.1/taskArtifacts/taskArtifacts.bin has changed diff -r 281b667970de -r 6295918b8a97 .idea/misc.xml --- a/.idea/misc.xml Thu Nov 26 03:39:36 2015 +0900 +++ b/.idea/misc.xml Sat Nov 28 00:08:42 2015 +0900 @@ -1,5 +1,8 @@ + + + @@ -10,7 +13,7 @@ - + diff -r 281b667970de -r 6295918b8a97 .idea/workspace.xml --- a/.idea/workspace.xml Thu Nov 26 03:39:36 2015 +0900 +++ b/.idea/workspace.xml Sat Nov 28 00:08:42 2015 +0900 @@ -1,19 +1,18 @@ - + - - - + + @@ -48,11 +47,21 @@ - + - - + + + + + + + + + + + + @@ -216,16 +225,97 @@ - - + + + - - - @@ -237,8 +327,8 @@ @@ -265,8 +355,7 @@ - - + @@ -278,6 +367,198 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -317,7 +598,8 @@ - + + @@ -327,7 +609,7 @@ - + @@ -422,27 +704,26 @@ - - 1448458936205 + + 1448604706276 - + - - + - + @@ -465,31 +746,35 @@ - - - + - - + + - + - - + + - - + + + + + + + + + + diff -r 281b667970de -r 6295918b8a97 AliceVNC.iml --- a/AliceVNC.iml Thu Nov 26 03:39:36 2015 +0900 +++ b/AliceVNC.iml Sat Nov 28 00:08:42 2015 +0900 @@ -17,7 +17,7 @@ - + @@ -26,7 +26,7 @@ - + diff -r 281b667970de -r 6295918b8a97 build.gradle --- a/build.gradle Thu Nov 26 03:39:36 2015 +0900 +++ b/build.gradle Sat Nov 28 00:08:42 2015 +0900 @@ -8,7 +8,7 @@ repositories { maven(){ - url 'http://www.cr.ie.u-ryukyu.ac.jp/hg/maven/raw-file/tip/' + url 'http://www.cr.ie.u-ryukyu.ac.jp/hg/maven/raw-file/f2c44c2c559c/' } } diff -r 281b667970de -r 6295918b8a97 src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveMeasurement.java --- a/src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveMeasurement.java Thu Nov 26 03:39:36 2015 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveMeasurement.java Sat Nov 28 00:08:42 2015 +0900 @@ -55,7 +55,7 @@ pw.close(); } } else { - ods.flip("parent", info.key, info);//下から計測用パケットがきたときの処理 + ods.put("parent", info.key, info.getReceiveData());//下から計測用パケットがきたときの処理 } } catch (IOException e) { diff -r 281b667970de -r 6295918b8a97 src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveUpdateRectangle.java --- a/src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveUpdateRectangle.java Thu Nov 26 03:39:36 2015 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveUpdateRectangle.java Sat Nov 28 00:08:42 2015 +0900 @@ -47,14 +47,14 @@ if (!info1.from.equals(node)) { // not need send data comes from // Data Segment from other node is already serialized - ods.flip(node, "updateRectangle", info1); //TODO need timeout counter + ods.put(node, "updateRectangle", info1.getReceiveData()); //TODO need timeout counter // for measurement ReceiveData r = info2.getReceiveData(); if (!r.getSetTime()) { r.setTimes(System.currentTimeMillis(), true, 0);//送信時間をセット } - ods.flip(node, "pixelData", info2); + ods.put(node, "pixelData", info2.getReceiveData()); } }