# HG changeset patch # User Nozomi Teruya # Date 1448296428 -32400 # Node ID bd8da17bf383a1b5c1d2528449a718852ed4ea60 # Parent d1e2107e222ea1a323a0a1c10ba6f057c049d5f0 update Alice 561 : add setZipped diff -r d1e2107e222e -r bd8da17bf383 .gradle/2.2.1/taskArtifacts/cache.properties.lock Binary file .gradle/2.2.1/taskArtifacts/cache.properties.lock has changed diff -r d1e2107e222e -r bd8da17bf383 .gradle/2.2.1/taskArtifacts/fileHashes.bin Binary file .gradle/2.2.1/taskArtifacts/fileHashes.bin has changed diff -r d1e2107e222e -r bd8da17bf383 .gradle/2.2.1/taskArtifacts/fileSnapshots.bin Binary file .gradle/2.2.1/taskArtifacts/fileSnapshots.bin has changed diff -r d1e2107e222e -r bd8da17bf383 .gradle/2.2.1/taskArtifacts/taskArtifacts.bin Binary file .gradle/2.2.1/taskArtifacts/taskArtifacts.bin has changed diff -r d1e2107e222e -r bd8da17bf383 .idea/workspace.xml --- a/.idea/workspace.xml Tue Nov 24 00:51:28 2015 +0900 +++ b/.idea/workspace.xml Tue Nov 24 01:33:48 2015 +0900 @@ -1,13 +1,13 @@ - + - - + + @@ -41,32 +41,12 @@ - - - - - - - - - - - - + + - - - - - - - - - - - - + + @@ -224,108 +204,19 @@ - @@ -337,10 +228,10 @@ - @@ -367,9 +258,6 @@ - - - @@ -377,76 +265,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -486,6 +304,9 @@ + + + @@ -495,7 +316,7 @@ - + @@ -504,65 +325,6 @@ - - - - - - - - - - - - - @@ -623,61 +369,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - 1447867983189 + + 1448296304915 - + - + - - - - - - - - + + + + + + + + - - + + - + + - - @@ -789,93 +451,17 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - \ No newline at end of file diff -r d1e2107e222e -r bd8da17bf383 AliceVNC.iml --- a/AliceVNC.iml Tue Nov 24 00:51:28 2015 +0900 +++ b/AliceVNC.iml Tue Nov 24 01:33:48 2015 +0900 @@ -17,7 +17,7 @@ - + @@ -26,7 +26,7 @@ - + diff -r d1e2107e222e -r bd8da17bf383 build.gradle --- a/build.gradle Tue Nov 24 00:51:28 2015 +0900 +++ b/build.gradle Tue Nov 24 01:33:48 2015 +0900 @@ -8,7 +8,7 @@ repositories { maven(){ - url 'http://www.cr.ie.u-ryukyu.ac.jp/hg/maven/raw-file/1152247791c5/' + url 'http://www.cr.ie.u-ryukyu.ac.jp/hg/maven/raw-file/806896c923f9/' } } diff -r d1e2107e222e -r bd8da17bf383 src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveUpdateRectangle.java --- a/src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveUpdateRectangle.java Tue Nov 24 00:51:28 2015 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveUpdateRectangle.java Tue Nov 24 01:33:48 2015 +0900 @@ -39,7 +39,7 @@ if (info2.getReceiveData().getSetTime()) { ReceiveData r = info2.getReceiveData(); ReceiveData rData = new ReceiveData("measurement"); - rData.setZippedDataSize(r.getZippedDataSize()); + rData.setZipped(r.getZippedDataSize(), r.getSetZipped()); rData.setTimes(r.getTime(), r.getSetTime(), r.getDepth()); ods.put("parent", "measurement", rData);//pixelDataを受け取った時に計測用パケットを返す処理 }