Mercurial > hg > Applications > AliceVNC
changeset 64:66f95be0daab
add zippedSizeData to ReceiveData for AliceVNC measurement
| author | Nozomi Teruya <e125769@ie.u-ryukyu.ac.jp> |
|---|---|
| date | Thu, 19 Nov 2015 03:25:54 +0900 |
| parents | 9662e582ffad |
| children | 3d2b82127a3c 29e061701aee |
| files | .gradle/2.2.1/taskArtifacts/cache.properties.lock .gradle/2.2.1/taskArtifacts/fileHashes.bin .gradle/2.2.1/taskArtifacts/fileSnapshots.bin .gradle/2.2.1/taskArtifacts/outputFileStates.bin .gradle/2.2.1/taskArtifacts/taskArtifacts.bin .idea/workspace.xml AliceVNC.iml build.gradle src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveMeasurement.java src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveUpdateRectangle.java |
| diffstat | 10 files changed, 157 insertions(+), 128 deletions(-) [+] |
line wrap: on
line diff
--- a/.idea/workspace.xml Tue Nov 17 18:17:03 2015 +0900 +++ b/.idea/workspace.xml Thu Nov 19 03:25:54 2015 +0900 @@ -1,11 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> <project version="4"> <component name="ChangeListManager"> - <list default="true" id="67895ab7-e42c-4945-84dd-04d10367335c" name="Default" comment=""> + <list default="true" id="60e2bf28-821b-4957-99b8-fce894a5c4c9" name="Default" comment=""> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gradle/2.2.1/taskArtifacts/cache.properties.lock" afterPath="$PROJECT_DIR$/.gradle/2.2.1/taskArtifacts/cache.properties.lock" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gradle/2.2.1/taskArtifacts/fileHashes.bin" afterPath="$PROJECT_DIR$/.gradle/2.2.1/taskArtifacts/fileHashes.bin" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin" afterPath="$PROJECT_DIR$/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gradle/2.2.1/taskArtifacts/outputFileStates.bin" afterPath="$PROJECT_DIR$/.gradle/2.2.1/taskArtifacts/outputFileStates.bin" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin" afterPath="$PROJECT_DIR$/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/AliceVNC.iml" afterPath="$PROJECT_DIR$/AliceVNC.iml" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/build.gradle" afterPath="$PROJECT_DIR$/build.gradle" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveMeasurement.java" afterPath="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveMeasurement.java" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveUpdateRectangle.java" afterPath="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveUpdateRectangle.java" /> </list> <ignored path="AliceVNC.iws" /> @@ -40,24 +45,22 @@ <favorites_list name="AliceVNC" /> </component> <component name="FileEditorManager"> - <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> - <file leaf-file-name="ReceiveMeasurement.java" pinned="false" current-in-tab="false"> + <leaf> + <file leaf-file-name="ReceiveMeasurement.java" pinned="false" current-in-tab="true"> <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveMeasurement.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="53" column="98" selection-start-line="53" selection-start-column="98" selection-end-line="53" selection-end-column="98" /> - <folding> - <element signature="imports" expanded="false" /> - </folding> + <state vertical-scroll-proportion="0.3451883"> + <caret line="22" column="32" selection-start-line="22" selection-start-column="21" selection-end-line="22" selection-end-column="32" /> + <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="ReceiveUpdateRectangle.java" pinned="false" current-in-tab="true"> + <file leaf-file-name="ReceiveUpdateRectangle.java" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveUpdateRectangle.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.8148148"> - <caret line="51" column="39" selection-start-line="51" selection-start-column="39" selection-end-line="51" selection-end-column="39" /> + <state vertical-scroll-proportion="0.0"> + <caret line="50" column="22" selection-start-line="50" selection-start-column="22" selection-end-line="50" selection-end-column="22" /> <folding /> </state> </provider> @@ -215,7 +218,7 @@ </option> <option name="modificationStamps"> <map> - <entry key="$PROJECT_DIR$" value="1447689368000" /> + <entry key="$PROJECT_DIR$" value="1447867749000" /> <entry key="$PROJECT_DIR$/../OldAliceVNC" value="1446365710000" /> <entry key="$PROJECT_DIR$/../tvnjviewer" value="1447682158000" /> <entry key="$PROJECT_DIR$/../../IdeaProjects/Alice" value="1447681048000" /> @@ -223,12 +226,98 @@ <entry key="$PROJECT_DIR$/../../IdeaProjects/OldAlice/Alice" value="1447598155000" /> </map> </option> + <option name="projectBuildClasspath"> + <map> + <entry key="$PROJECT_DIR$"> + <value> + <ExternalProjectBuildClasspathPojo> + <option name="modulesBuildClasspath"> + <map> + <entry key="$PROJECT_DIR$"> + <value> + <ExternalModuleBuildClasspathPojo> + <option name="entries"> + <list> + <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.glavsoft.viewer/tightvnc-jviewer/2.7.2/decc4479974ad66a272f51c37ffb92a1b71b0503/tightvnc-jviewer-2.7.2.jar" /> + <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/cr.ie.u_ryukyu.ac.jp/Alice/1.1/f87bfedf43a47f2296b73c6940e1f328ecc82164/Alice-1.1.jar" /> + </list> + </option> + <option name="path" value="$PROJECT_DIR$" /> + </ExternalModuleBuildClasspathPojo> + </value> + </entry> + </map> + </option> + <option name="name" value="AliceVNC" /> + <option name="projectBuildClasspath"> + <list> + <option value="/usr/local/Cellar/gradle/2.2.1/libexec/lib/ant-1.9.3.jar" /> + <option value="/usr/local/Cellar/gradle/2.2.1/libexec/lib/ant-launcher-1.9.3.jar" /> + <option value="/usr/local/Cellar/gradle/2.2.1/libexec/lib/gradle-base-services-2.2.1.jar" /> + <option value="/usr/local/Cellar/gradle/2.2.1/libexec/lib/gradle-base-services-groovy-2.2.1.jar" /> + <option value="/usr/local/Cellar/gradle/2.2.1/libexec/lib/gradle-cli-2.2.1.jar" /> + <option value="/usr/local/Cellar/gradle/2.2.1/libexec/lib/gradle-core-2.2.1.jar" /> + <option value="/usr/local/Cellar/gradle/2.2.1/libexec/lib/gradle-docs-2.2.1.jar" /> + <option value="/usr/local/Cellar/gradle/2.2.1/libexec/lib/gradle-launcher-2.2.1.jar" /> + <option value="/usr/local/Cellar/gradle/2.2.1/libexec/lib/gradle-messaging-2.2.1.jar" /> + <option value="/usr/local/Cellar/gradle/2.2.1/libexec/lib/gradle-model-core-2.2.1.jar" /> + <option value="/usr/local/Cellar/gradle/2.2.1/libexec/lib/gradle-model-groovy-2.2.1.jar" /> + <option value="/usr/local/Cellar/gradle/2.2.1/libexec/lib/gradle-native-2.2.1.jar" /> + <option value="/usr/local/Cellar/gradle/2.2.1/libexec/lib/gradle-open-api-2.2.1.jar" /> + <option value="/usr/local/Cellar/gradle/2.2.1/libexec/lib/gradle-resources-2.2.1.jar" /> + <option value="/usr/local/Cellar/gradle/2.2.1/libexec/lib/gradle-tooling-api-2.2.1.jar" /> + <option value="/usr/local/Cellar/gradle/2.2.1/libexec/lib/gradle-ui-2.2.1.jar" /> + <option value="/usr/local/Cellar/gradle/2.2.1/libexec/lib/gradle-wrapper-2.2.1.jar" /> + <option value="/usr/local/Cellar/gradle/2.2.1/libexec/lib/groovy-all-2.3.6.jar" /> + <option value="/usr/local/Cellar/gradle/2.2.1/libexec/lib/plugins/ant-antlr-1.9.3.jar" /> + <option value="/usr/local/Cellar/gradle/2.2.1/libexec/lib/plugins/gradle-announce-2.2.1.jar" /> + <option value="/usr/local/Cellar/gradle/2.2.1/libexec/lib/plugins/gradle-antlr-2.2.1.jar" /> + <option value="/usr/local/Cellar/gradle/2.2.1/libexec/lib/plugins/gradle-build-comparison-2.2.1.jar" /> + <option value="/usr/local/Cellar/gradle/2.2.1/libexec/lib/plugins/gradle-build-init-2.2.1.jar" /> + <option value="/usr/local/Cellar/gradle/2.2.1/libexec/lib/plugins/gradle-code-quality-2.2.1.jar" /> + <option value="/usr/local/Cellar/gradle/2.2.1/libexec/lib/plugins/gradle-cunit-2.2.1.jar" /> + <option value="/usr/local/Cellar/gradle/2.2.1/libexec/lib/plugins/gradle-dependency-management-2.2.1.jar" /> + <option value="/usr/local/Cellar/gradle/2.2.1/libexec/lib/plugins/gradle-diagnostics-2.2.1.jar" /> + <option value="/usr/local/Cellar/gradle/2.2.1/libexec/lib/plugins/gradle-ear-2.2.1.jar" /> + <option value="/usr/local/Cellar/gradle/2.2.1/libexec/lib/plugins/gradle-ide-2.2.1.jar" /> + <option value="/usr/local/Cellar/gradle/2.2.1/libexec/lib/plugins/gradle-ide-native-2.2.1.jar" /> + <option value="/usr/local/Cellar/gradle/2.2.1/libexec/lib/plugins/gradle-ivy-2.2.1.jar" /> + <option value="/usr/local/Cellar/gradle/2.2.1/libexec/lib/plugins/gradle-jacoco-2.2.1.jar" /> + <option value="/usr/local/Cellar/gradle/2.2.1/libexec/lib/plugins/gradle-javascript-2.2.1.jar" /> + <option value="/usr/local/Cellar/gradle/2.2.1/libexec/lib/plugins/gradle-jetty-2.2.1.jar" /> + <option value="/usr/local/Cellar/gradle/2.2.1/libexec/lib/plugins/gradle-language-groovy-2.2.1.jar" /> + <option value="/usr/local/Cellar/gradle/2.2.1/libexec/lib/plugins/gradle-language-java-2.2.1.jar" /> + <option value="/usr/local/Cellar/gradle/2.2.1/libexec/lib/plugins/gradle-language-jvm-2.2.1.jar" /> + <option value="/usr/local/Cellar/gradle/2.2.1/libexec/lib/plugins/gradle-language-native-2.2.1.jar" /> + <option value="/usr/local/Cellar/gradle/2.2.1/libexec/lib/plugins/gradle-maven-2.2.1.jar" /> + <option value="/usr/local/Cellar/gradle/2.2.1/libexec/lib/plugins/gradle-osgi-2.2.1.jar" /> + <option value="/usr/local/Cellar/gradle/2.2.1/libexec/lib/plugins/gradle-platform-base-2.2.1.jar" /> + <option value="/usr/local/Cellar/gradle/2.2.1/libexec/lib/plugins/gradle-platform-jvm-2.2.1.jar" /> + <option value="/usr/local/Cellar/gradle/2.2.1/libexec/lib/plugins/gradle-platform-native-2.2.1.jar" /> + <option value="/usr/local/Cellar/gradle/2.2.1/libexec/lib/plugins/gradle-plugin-development-2.2.1.jar" /> + <option value="/usr/local/Cellar/gradle/2.2.1/libexec/lib/plugins/gradle-plugin-use-2.2.1.jar" /> + <option value="/usr/local/Cellar/gradle/2.2.1/libexec/lib/plugins/gradle-plugins-2.2.1.jar" /> + <option value="/usr/local/Cellar/gradle/2.2.1/libexec/lib/plugins/gradle-publish-2.2.1.jar" /> + <option value="/usr/local/Cellar/gradle/2.2.1/libexec/lib/plugins/gradle-reporting-2.2.1.jar" /> + <option value="/usr/local/Cellar/gradle/2.2.1/libexec/lib/plugins/gradle-resources-http-2.2.1.jar" /> + <option value="/usr/local/Cellar/gradle/2.2.1/libexec/lib/plugins/gradle-scala-2.2.1.jar" /> + <option value="/usr/local/Cellar/gradle/2.2.1/libexec/lib/plugins/gradle-signing-2.2.1.jar" /> + <option value="/usr/local/Cellar/gradle/2.2.1/libexec/lib/plugins/gradle-sonar-2.2.1.jar" /> + <option value="/usr/local/Cellar/gradle/2.2.1/libexec/lib/plugins/ivy-2.2.0.jar" /> + <option value="$PROJECT_DIR$/buildSrc/src/main/java" /> + <option value="$PROJECT_DIR$/buildSrc/src/main/groovy" /> + </list> + </option> + </ExternalProjectBuildClasspathPojo> + </value> + </entry> + </map> + </option> </component> <component name="IdeDocumentHistory"> <option name="CHANGED_PATHS"> <list> <option value="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveMeasurement.java" /> - <option value="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveUpdateRectangle.java" /> </list> </option> </component> @@ -241,8 +330,8 @@ </component> <component name="ProjectFrameBounds"> <option name="y" value="23" /> - <option name="width" value="1280" /> - <option name="height" value="773" /> + <option name="width" value="1337" /> + <option name="height" value="873" /> </component> <component name="ProjectLevelVcsManager" settingsEditedManually="false"> <OptionsSetting value="true" id="Add" /> @@ -269,7 +358,6 @@ <foldersAlwaysOnTop value="true" /> </navigator> <panes> - <pane id="Scratches" /> <pane id="ProjectPane"> <subPane> <PATH> @@ -316,8 +404,9 @@ </PATH> </subPane> </pane> + <pane id="Scratches" /> + <pane id="PackagesPane" /> <pane id="Scope" /> - <pane id="PackagesPane" /> </panes> </component> <component name="PropertiesComponent"> @@ -329,7 +418,7 @@ <property name="MemberChooser.copyJavadoc" value="false" /> <property name="last_opened_file_path" value="$PROJECT_DIR$/build.gradle" /> </component> - <component name="RunManager" selected="Application.StartAliceVNC"> + <component name="RunManager"> <configuration default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin"> <module name="" /> <option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m -ea" /> @@ -574,84 +663,51 @@ <listeners /> <method /> </configuration> - <configuration default="false" name="StartAliceVNC" type="Application" factoryName="Application"> - <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" /> - <option name="MAIN_CLASS_NAME" value="jp.ac.u_ryukyu.alicevnc.StartAliceVNC" /> - <option name="VM_PARAMETERS" value="" /> - <option name="PROGRAM_PARAMETERS" value="-p 23000 -host 10.0.2.199 -level fatal" /> - <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" /> - <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> - <option name="ALTERNATIVE_JRE_PATH" /> - <option name="ENABLE_SWING_INSPECTOR" value="false" /> - <option name="ENV_VARIABLES" /> - <option name="PASS_PARENT_ENVS" value="true" /> - <module name="AliceVNC" /> - <envs /> - <method /> - </configuration> - <list size="1"> - <item index="0" class="java.lang.String" itemvalue="Application.StartAliceVNC" /> - </list> </component> <component name="ShelveChangesManager" show_recycled="false" /> <component name="TaskManager"> <task active="true" id="Default" summary="Default task"> - <changelist id="67895ab7-e42c-4945-84dd-04d10367335c" name="Default" comment="" /> - <created>1447689490713</created> + <changelist id="60e2bf28-821b-4957-99b8-fce894a5c4c9" name="Default" comment="" /> + <created>1447867983189</created> <option name="number" value="Default" /> - <updated>1447689490713</updated> + <updated>1447867983189</updated> </task> <servers /> </component> <component name="ToolWindowManager"> - <frame x="0" y="23" width="1280" height="773" extended-state="6" /> + <frame x="0" y="23" width="1337" height="873" extended-state="0" /> <editor active="true" /> <layout> - <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> + <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" /> <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> - <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32977098" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> - <window_info id="Palette	" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> - <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" /> - <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> - <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> - <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32824427" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> - <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> - <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2253635" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> - <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32891247" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> - <window_info id="Gradle" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> + <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" /> + <window_info id="Palette	" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" /> + <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="true" content_ui="tabs" /> + <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" /> + <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" /> + <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" /> + <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" /> + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.24942085" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> + <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32980132" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> + <window_info id="Gradle" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" /> <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> - <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> - <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" /> - <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.3389313" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> + <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" /> + <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="true" content_ui="tabs" /> <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> + <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" /> <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> - <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" /> + <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> + <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> </layout> </component> <component name="VcsContentAnnotationSettings"> <option name="myLimit" value="2678400000" /> </component> <component name="XDebuggerManager"> - <breakpoint-manager> - <breakpoints> - <line-breakpoint enabled="true" type="java-line"> - <url>file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveUpdateRectangle.java</url> - <line>53</line> - <properties /> - </line-breakpoint> - <line-breakpoint enabled="true" type="java-line"> - <url>file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveUpdateRectangle.java</url> - <line>39</line> - <properties /> - <option name="timeStamp" value="1" /> - </line-breakpoint> - </breakpoints> - <option name="time" value="2" /> - </breakpoint-manager> + <breakpoint-manager /> <watches-manager /> </component> <component name="antWorkspaceConfiguration"> @@ -659,75 +715,43 @@ <option name="FILTER_TARGETS" value="false" /> </component> <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveMeasurement.java"> + <entry file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.glavsoft.viewer/tightvnc-jviewer/2.7.2/decc4479974ad66a272f51c37ffb92a1b71b0503/tightvnc-jviewer-2.7.2.jar!/alice/datasegment/Receiver.class"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="53" column="98" selection-start-line="53" selection-start-column="98" selection-end-line="53" selection-end-column="98" /> + <state vertical-scroll-proportion="0.72727275"> + <caret line="113" column="23" selection-start-line="113" selection-start-column="23" selection-end-line="113" selection-end-column="23" /> <folding> - <element signature="imports" expanded="false" /> + <element signature="e#2795#2796#0" expanded="true" /> + <element signature="e#2827#2828#0" expanded="true" /> </folding> </state> </provider> </entry> + <entry file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.glavsoft.viewer/tightvnc-jviewer/2.7.2/decc4479974ad66a272f51c37ffb92a1b71b0503/tightvnc-jviewer-2.7.2.jar!/alice/datasegment/ReceiveData.class"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.19955654"> + <caret line="16" column="13" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" /> + <folding /> + </state> + </provider> + </entry> <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveUpdateRectangle.java"> <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> + <caret line="50" column="22" selection-start-line="50" selection-start-column="22" selection-end-line="50" selection-end-column="22" /> <folding /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveMeasurement.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="53" column="98" selection-start-line="53" selection-start-column="98" selection-end-line="53" selection-end-column="98" /> - <folding> - <element signature="imports" expanded="false" /> - </folding> - </state> - </provider> - </entry> - <entry file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.glavsoft.viewer/tightvnc-jviewer/2.7.2/d93943c14c762516e8bfeb0b42056ef8e4ebf60/tightvnc-jviewer-2.7.2.jar!/alice/datasegment/ReceiveData.class"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.35427135"> - <caret line="46" column="19" selection-start-line="46" selection-start-column="19" selection-end-line="46" selection-end-column="19" /> - <folding> - <element signature="e#1220#1221#0" expanded="true" /> - <element signature="e#1268#1269#0" expanded="true" /> - </folding> - </state> - </provider> - </entry> - <entry file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.glavsoft.viewer/tightvnc-jviewer/2.7.2/d93943c14c762516e8bfeb0b42056ef8e4ebf60/tightvnc-jviewer-2.7.2.jar!/alice/datasegment/Receiver.class"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.8040201"> - <caret line="118" column="31" selection-start-line="118" selection-start-column="31" selection-end-line="118" selection-end-column="31" /> - <folding> - <element signature="e#2864#2865#0" expanded="true" /> - <element signature="e#2909#2910#0" expanded="true" /> - </folding> - </state> - </provider> - </entry> - <entry file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.glavsoft.viewer/tightvnc-jviewer/2.7.2/d93943c14c762516e8bfeb0b42056ef8e4ebf60/tightvnc-jviewer-2.7.2.jar!/alice/codesegment/OutputDataSegment.class"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.3533654"> - <caret line="67" column="16" selection-start-line="67" selection-start-column="16" selection-end-line="67" selection-end-column="16" /> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveUpdateRectangle.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.8148148"> - <caret line="51" column="39" selection-start-line="51" selection-start-column="39" selection-end-line="51" selection-end-column="39" /> + <state vertical-scroll-proportion="0.3451883"> + <caret line="22" column="32" selection-start-line="22" selection-start-column="21" selection-end-line="22" selection-end-column="32" /> <folding /> </state> </provider> </entry> </component> <component name="hg4idea.settings"> - <option name="CHECK_INCOMING_OUTGOING" value="true" /> <option name="RECENT_HG_ROOT_PATH" value="$PROJECT_DIR$" /> </component> </project> \ No newline at end of file
--- a/AliceVNC.iml Tue Nov 17 18:17:03 2015 +0900 +++ b/AliceVNC.iml Thu Nov 19 03:25:54 2015 +0900 @@ -17,7 +17,7 @@ <orderEntry type="module-library" exported=""> <library name="Gradle: com.glavsoft.viewer:tightvnc-jviewer:2.7.2"> <CLASSES> - <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.glavsoft.viewer/tightvnc-jviewer/2.7.2/d93943c14c762516e8bfeb0b42056ef8e4ebf60/tightvnc-jviewer-2.7.2.jar!/" /> + <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.glavsoft.viewer/tightvnc-jviewer/2.7.2/decc4479974ad66a272f51c37ffb92a1b71b0503/tightvnc-jviewer-2.7.2.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -26,7 +26,7 @@ <orderEntry type="module-library" exported=""> <library name="Gradle: cr.ie.u_ryukyu.ac.jp:Alice:1.1"> <CLASSES> - <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/cr.ie.u_ryukyu.ac.jp/Alice/1.1/1f3dd0819b916db9455f6f99aab0d107f42562ce/Alice-1.1.jar!/" /> + <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/cr.ie.u_ryukyu.ac.jp/Alice/1.1/f87bfedf43a47f2296b73c6940e1f328ecc82164/Alice-1.1.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES />
--- a/build.gradle Tue Nov 17 18:17:03 2015 +0900 +++ b/build.gradle Thu Nov 19 03:25:54 2015 +0900 @@ -8,7 +8,7 @@ repositories { maven(){ - url 'http://www.cr.ie.u-ryukyu.ac.jp/hg/maven/raw-file/66ced1f875ea/' + url 'http://www.cr.ie.u-ryukyu.ac.jp/hg/maven/raw-file/9805e2f8823e/' } }
--- a/src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveMeasurement.java Tue Nov 17 18:17:03 2015 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveMeasurement.java Thu Nov 19 03:25:54 2015 +0900 @@ -28,7 +28,7 @@ @SuppressWarnings("unchecked") @Override public void run() { - long time = System.currentTimeMillis(); + long time = System.currentTimeMillis();//ミリ秒 ArrayList<String> clist = info1.asClass(ArrayList.class); boolean route = true; for (String node : clist){ @@ -51,11 +51,17 @@ PrintWriter pw = new PrintWriter(bw); ReceiveData r = info.getReceiveData(); - pw.println(r.getDepth()/2+" "+(time - r.getTime())/2+" "+((byte[])info.getObj()).length); + pw.println("depth:" + r.getDepth()/2 + " dataSize:" + r.getZippedDataSize() + " time:" + (time - r.getTime()));//画面データのサイズと現在の接続台数も pw.close(); } } else { - ods.put("parent", info.key, info.getReceiveData()); + ReceiveData r = info.getReceiveData(); + ReceiveData rData = new ReceiveData(null); + + rData.setZippedDataSize(r.getZippedDataSize()); + rData.setTimes(r.getTime(), r.getSetTime(), r.getDepth()); + + ods.put("parent", info.key, rData); } } catch (IOException e) {
--- a/src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveUpdateRectangle.java Tue Nov 17 18:17:03 2015 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveUpdateRectangle.java Thu Nov 19 03:25:54 2015 +0900 @@ -44,12 +44,11 @@ // not need send data comes from // Data Segment from other node is already serialized ods.flip(node, "updateRectangle", info1); //TODO need timeout counter - //ods.setCompressFlag(true); // for measurement ReceiveData r = info2.getReceiveData(); if (!r.getSetTime()) { - r.setTimes(System.currentTimeMillis(), true, 0); + r.setTimes(System.currentTimeMillis(), true, 0);//送信時間をセット } ods.flip(node, "pixelData", info2); }