Changeset 28289 in osm for applications/editors/josm/plugins/videomapping
- Timestamp:
- 2012-04-14T12:58:31+02:00 (13 years ago)
- Location:
- applications/editors/josm/plugins/videomapping
- Files:
-
- 2 edited
-
build.xml (modified) (4 diffs)
-
src/org/openstreetmap/josm/plugins/videomapping/VideoPlugin.java (modified) (5 diffs)
Legend:
- Unmodified
- Added
- Removed
-
applications/editors/josm/plugins/videomapping/build.xml
r27852 r28289 29 29 --> 30 30 <project name="videomapping" default="dist" basedir="."> 31 31 32 <!-- enter the SVN commit message --> 32 33 <property name="commit.message" value="videomapping"/> 33 34 <!-- enter the *lowest* JOSM version this plugin is currently compatible with --> 34 35 <property name="plugin.main.version" value="4980"/> 35 <!-- 36 ************************************************ 37 ** should not be necessary to change the following properties 38 --> 39 <property name="josm" location="../../core/dist/josm-custom.jar"/> 40 <property name="plugin.build.dir" value="build"/> 41 <property name="plugin.src.dir" value="src"/> 42 <!-- this is the directory where the plugin jar is copied to --> 43 <property name="plugin.dist.dir" value="../../dist"/> 44 <property name="ant.build.javac.target" value="1.6"/> 45 <property name="plugin.jar" value="${plugin.dist.dir}/${ant.project.name}.jar"/> 46 <property name="vlcj" value="lib/vlcj-1.1.5.1.jar"/> 47 <property name="jna" value="lib/jna.jar"/> 48 <property name="platform" value="lib/platform.jar"/> 49 <property name="log4j" value="lib/log4j.jar"/> 36 50 37 <!-- 51 38 ********************************************************** 52 ** in it - initializes the build39 ** include targets that all plugins have in common 53 40 ********************************************************** 54 41 --> 55 <target name="init"> 56 <mkdir dir="${plugin.build.dir}"/> 57 </target> 42 <import file="../build-common.xml"/> 43 44 <property name="vlcj" value="${plugin.lib.dir}/vlcj-1.1.5.1.jar"/> 45 <property name="jna" value="${plugin.lib.dir}/jna.jar"/> 46 <property name="platform" value="${plugin.lib.dir}/platform.jar"/> 47 <property name="log4j" value="${plugin.lib.dir}/log4j.jar"/> 48 <!-- classpath --> 49 <path id="classpath"> 50 <pathelement path="${josm}"/> 51 <pathelement location="${vlcj}"/> 52 <!--Add extra libraries --> 53 <pathelement location="${jna}"/> 54 <pathelement location="${platform}"/> 55 <pathelement location="${log4j}"/> 56 </path> 58 57 <!-- 59 58 ********************************************************** 60 59 ** compile - complies the source tree 60 ** Overrides the target from build-common.xml 61 61 ********************************************************** 62 62 --> 63 63 <target name="compile" depends="init"> 64 <echo message="compiling sources for 65 <javac srcdir="src" classpath ="${josm}" debug="true" destdir="${plugin.build.dir}">64 <echo message="compiling sources for ${plugin.jar} ..."/> 65 <javac srcdir="src" classpathref="classpath" debug="true" destdir="${plugin.build.dir}"> 66 66 <compilerarg value="-Xlint:deprecation"/> 67 67 <compilerarg value="-Xlint:unchecked"/> 68 <classpath>69 <pathelement location="${vlcj}"/>70 <!--Add extra libraries -->71 <pathelement location="${jna}"/>72 <pathelement location="${platform}"/>73 <pathelement location="${log4j}"/>74 </classpath>75 68 </javac> 76 69 </target> 70 77 71 <!-- 78 72 ********************************************************** … … 98 92 </copy> 99 93 <jar destfile="${plugin.jar}" basedir="${plugin.build.dir}"> 100 94 <!-- 101 95 ************************************************ 102 96 ** configure these properties. Most of them will be copied to the plugins … … 105 99 ** 106 100 ************************************************ 107 --> 101 --> 108 102 <manifest> 109 103 <attribute name="Author" value="Matthias Meißer"/> … … 117 111 </manifest> 118 112 <!--added to bundle libs--> 119 <zipfileset src=" lib/jna.jar"/>120 <zipfileset src=" lib/log4j.jar"/>121 <zipfileset src=" lib/platform.jar"/>122 <zipfileset src=" lib/vlcj-1.1.5.1.jar"/>113 <zipfileset src="${jna}"/> 114 <zipfileset src="${log4j}"/> 115 <zipfileset src="${platform}"/> 116 <zipfileset src="${vlcj}"/> 123 117 </jar> 124 118 </target> 125 <!--126 **********************************************************127 ** revision - extracts the current revision number for the128 ** file build.number and stores it in the XML property129 ** version.*130 **********************************************************131 -->132 <target name="revision">133 <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">134 <env key="LANG" value="C"/>135 <arg value="info"/>136 <arg value="--xml"/>137 <arg value="."/>138 </exec>139 <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>140 <delete file="REVISION"/>141 </target>142 <!--143 **********************************************************144 ** clean - clean up the build environment145 **********************************************************146 -->147 <target name="clean">148 <delete dir="${plugin.build.dir}"/>149 <delete file="${plugin.jar}"/>150 </target>151 <!--152 **********************************************************153 ** install - install the plugin in your local JOSM installation154 **********************************************************155 -->156 <target name="install" depends="dist">157 <property environment="env"/>158 <condition property="josm.plugins.dir" value="${env.APPDATA}/JOSM/plugins" else="${user.home}/.josm/plugins">159 <and>160 <os family="windows"/>161 </and>162 </condition>163 <copy file="${plugin.jar}" todir="${josm.plugins.dir}"/>164 </target>165 <!--166 ************************** Publishing the plugin ***********************************167 -->168 <!--169 ** extracts the JOSM release for the JOSM version in ../core and saves it in the170 ** property ${coreversion.info.entry.revision}171 **172 -->173 <target name="core-info">174 <exec append="false" output="core.info.xml" executable="svn" failifexecutionfails="false">175 <env key="LANG" value="C"/>176 <arg value="info"/>177 <arg value="--xml"/>178 <arg value="../../core"/>179 </exec>180 <xmlproperty file="core.info.xml" prefix="coreversion" keepRoot="true" collapseAttributes="true"/>181 <echo>Building against core revision ${coreversion.info.entry.revision}.</echo>182 <echo>Plugin-Mainversion is set to ${plugin.main.version}.</echo>183 <delete file="core.info.xml"/>184 </target>185 <!--186 ** commits the source tree for this plugin187 -->188 <target name="commit-current">189 <echo>Commiting the plugin source with message '${commit.message}' ...</echo>190 <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">191 <env key="LANG" value="C"/>192 <arg value="commit"/>193 <arg value="-m '${commit.message}'"/>194 <arg value="."/>195 </exec>196 </target>197 <!--198 ** updates (svn up) the source tree for this plugin199 -->200 <target name="update-current">201 <echo>Updating plugin source ...</echo>202 <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">203 <env key="LANG" value="C"/>204 <arg value="up"/>205 <arg value="."/>206 </exec>207 <echo>Updating ${plugin.jar} ...</echo>208 <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">209 <env key="LANG" value="C"/>210 <arg value="up"/>211 <arg value="../dist/${plugin.jar}"/>212 </exec>213 </target>214 <!--215 ** commits the plugin.jar216 -->217 <target name="commit-dist">218 <echo>219 ***** Properties of published ${plugin.jar} *****220 Commit message : '${commit.message}'221 Plugin-Mainversion: ${plugin.main.version}222 JOSM build version: ${coreversion.info.entry.revision}223 Plugin-Version : ${version.entry.commit.revision}224 ***** / Properties of published ${plugin.jar} *****225 226 Now commiting ${plugin.jar} ...227 </echo>228 <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">229 <env key="LANG" value="C"/>230 <arg value="-m '${commit.message}'"/>231 <arg value="commit"/>232 <arg value="${plugin.jar}"/>233 </exec>234 </target>235 <!-- ** make sure svn is present as a command line tool ** -->236 <target name="ensure-svn-present">237 <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false" failonerror="false" resultproperty="svn.exit.code">238 <env key="LANG" value="C"/>239 <arg value="--version"/>240 </exec>241 <fail message="Fatal: command 'svn --version' failed. Please make sure svn is installed on your system.">242 <!-- return code not set at all? Most likely svn isn't installed -->243 <condition>244 <not>245 <isset property="svn.exit.code"/>246 </not>247 </condition>248 </fail>249 <fail message="Fatal: command 'svn --version' failed. Please make sure a working copy of svn is installed on your system.">250 <!-- error code from SVN? Most likely svn is not what we are looking on this system -->251 <condition>252 <isfailure code="${svn.exit.code}"/>253 </condition>254 </fail>255 </target>256 <target name="publish" depends="ensure-svn-present,core-info,commit-current,update-current,clean,dist,commit-dist">257 </target>258 119 </project> -
applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoPlugin.java
r27909 r28289 149 149 150 150 //now the options menu 151 VCenterIcon = new JCheckBoxMenuItem(new JosmAction(tr("Keep centered"), null, tr("follows the video icon automaticly"),null, false,"vm_keepcentered",false) { 151 VCenterIcon = new JCheckBoxMenuItem(new JosmAction(tr("Keep centered"), (String)null, tr("follows the video icon automaticly"),null, false,"vm_keepcentered",false) { 152 152 public void actionPerformed(ActionEvent e) { 153 153 videoPositionLayer.setAutoCenter(VCenterIcon.isSelected()); … … 155 155 }); 156 156 157 VSubTitles = new JCheckBoxMenuItem(new JosmAction(tr("Subtitles"), null, tr("Show subtitles in video"),null, false,"vm_subtitles",false) { 157 VSubTitles = new JCheckBoxMenuItem(new JosmAction(tr("Subtitles"), (String)null, tr("Show subtitles in video"),null, false,"vm_subtitles",false) { 158 158 public void actionPerformed(ActionEvent e) { 159 159 gpsVideoPlayer.setSubtitles(VSubTitles.isSelected()); … … 161 161 }); 162 162 163 VJumpLength = new JMenuItem(new JosmAction(tr("Jump length"), null, tr("Set the length of a jump"),null, false,"vm_jumplen",false) { 163 VJumpLength = new JMenuItem(new JosmAction(tr("Jump length"), (String)null, tr("Set the length of a jump"),null, false,"vm_jumplen",false) { 164 164 public void actionPerformed(ActionEvent e) { 165 165 Object[] possibilities = {"200", "500", "1000", "2000", "10000"}; … … 170 170 }); 171 171 172 VLoopLength = new JMenuItem(new JosmAction(tr("Loop length"), null, tr("Set the length around a looppoint"),null, false,"vm_looplen",false) { 172 VLoopLength = new JMenuItem(new JosmAction(tr("Loop length"), (String)null, tr("Set the length around a looppoint"),null, false,"vm_looplen",false) { 173 173 public void actionPerformed(ActionEvent e) { 174 174 Object[] possibilities = {"500", "1000", "3000", "5000", "10000"}; … … 180 180 //TODO read deinterlacers list out of videoengine 181 181 VDeinterlacer= new JMenu("Deinterlacer"); 182 VIntNone= new JRadioButtonMenuItem(new JosmAction(tr("none"), null, tr("no deinterlacing"),null, false,"vm_deinterlacer",false) { 182 VIntNone= new JRadioButtonMenuItem(new JosmAction(tr("none"), (String)null, tr("no deinterlacing"),null, false,"vm_deinterlacer",false) { 183 183 public void actionPerformed(ActionEvent e) { 184 184 gpsVideoPlayer.setDeinterlacer("none"); 185 185 } 186 186 }); 187 VIntBob= new JRadioButtonMenuItem(new JosmAction("bob", null, tr("deinterlacing using line doubling"),null, false,"vm_bobdeinterlace",false) { 187 VIntBob= new JRadioButtonMenuItem(new JosmAction("bob", (String)null, tr("deinterlacing using line doubling"),null, false,"vm_bobdeinterlace",false) { 188 188 public void actionPerformed(ActionEvent e) { 189 189 gpsVideoPlayer.setDeinterlacer("bob"); 190 190 } 191 191 }); 192 VIntLinear= new JRadioButtonMenuItem(new JosmAction("linear", null, tr("deinterlacing using linear interpolation"),null, false,"vm_lineardeinterlace",false) { 192 VIntLinear= new JRadioButtonMenuItem(new JosmAction("linear", (String)null, tr("deinterlacing using linear interpolation"),null, false,"vm_lineardeinterlace",false) { 193 193 public void actionPerformed(ActionEvent e) { 194 194 gpsVideoPlayer.setDeinterlacer("linear");
Note:
See TracChangeset
for help on using the changeset viewer.
