Changeset 21295 in osm for applications/editors/josm


Ignore:
Timestamp:
2010-05-16T10:53:53+02:00 (15 years ago)
Author:
guardian
Message:
 
Location:
applications/editors/josm/plugins/videomapping
Files:
3 added
8 edited

Legend:

Unmodified
Added
Removed

  • applications/editors/josm/plugins/videomapping/.classpath

    r21257 r21295  
    22<classpath>
    33        <classpathentry kind="src" path="src"/>
     4        <classpathentry kind="src" path="test"/>
    45        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
    56        <classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
    6         <classpathentry kind="lib" path="D:/Projekte/Studium/GeoProjekt/working/fmj/fmj.jar"/>
     7        <classpathentry kind="lib" path="D:/Projekte/Studium/GeoProjekt/working/vlcj/vlcj-1.1f.jar"/>
    78        <classpathentry kind="output" path="bin"/>
    89</classpath>

  • applications/editors/josm/plugins/videomapping/README

    r21226 r21295  
    44Third party components:
    55icon: http://www.openclipart.org/detail/16349
     6
     7VLCj binding (1.1.0f):
     8http://code.google.com/p/vlcj/
     9
     10for use with VLC 1.1.x
     11http://download.videolan.org/pub/videolan/testing/vlc-1.1.0-pre4/win32/

  • applications/editors/josm/plugins/videomapping/build.xml

    r21253 r21295  
    4848        <property name="plugin.dist.dir"        value="../../dist"/>
    4949        <property name="plugin.jar"             value="${plugin.dist.dir}/${ant.project.name}.jar"/>
    50 
     50        <property name="vlcj"                  value="lib/vlcj-1.0.1.jar"/>
    5151        <!--
    5252    **********************************************************
    … …  
    6868                        <compilerarg value="-Xlint:deprecation"/>
    6969                        <compilerarg value="-Xlint:unchecked"/>
     70                        <classpath>
     71                                <pathelement location="${vlcj}"/> <!--Add external library -->
     72                        </classpath>
    7073                </javac>
    7174        </target>
    … …  
    106109                                <attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/wiki/JOSM/Plugins/VideoMapping"/>
    107110                                <attribute name="Plugin-Mainversion" value="${plugin.main.version}"/>
    108                                 <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
     111                                <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>                             
    109112                        </manifest>
    110113                </jar>

  • applications/editors/josm/plugins/videomapping/resources/videomapping.ep

    r21258 r21295  
    11<?xml version="1.0"?>
    2 <Document xmlns="http://www.evolus.vn/Namespace/Pencil"><Properties/><Pages><Page><Properties><Property name="name">Untitled Page</Property><Property name="id">1273584296451_6971</Property><Property name="width">576</Property><Property name="height">423</Property><Property name="dimBackground">false</Property></Properties><Content><g xmlns="http://www.w3.org/2000/svg" p:type="Shape" xmlns:p="http://www.evolus.vn/Namespace/Pencil" p:def="Evolus.WindowsXP.Widgets:Frame" id="77aba34df25544ab938a29927e57d5f0" transform="matrix(1, 0, 0, 1, 10, 9)"><p:metadata><p:childTargets><p:childTarget childRef="#94e1ca1c1491466d9db735f9e65663b1" anchor="rightbottom"/><p:childTarget childRef="#b7356935baac49aa912a79bc87332e72" anchor="leftbottom"/><p:childTarget childRef="#8ad09f34263a4c648771a64d9efa0b86" anchor="rightbottom"/><p:childTarget childRef="#6291dd8320ba4e30813c91be09300fa9" anchor="righttop"/><p:childTarget childRef="#f9fe86723c974d03a77fea7f0dcc46c3" anchor="righttop"/><p:childTarget childRef="#f40f6cb501f34a20a828ad37b11cbe2c" anchor="rightbottom"/><p:childTarget childRef="#f2a6e10d7b394b35a3efc379a815b109" anchor="rightbottom"/><p:childTarget childRef="#184068076cb5436f9db5f1949645e1d7" anchor="leftbottom"/><p:childTarget childRef="#4361bf5e2f404f93a1b37460b665fb1d" anchor="rightbottom"/><p:childTarget childRef="#de283ce44c824c4fabb013da6c69ccc8" anchor="rightbottom"/><p:childTarget childRef="#f40eaa8c054e47cca87202d8bfae0c50" anchor="lefttop"/><p:childTarget childRef="#c392bddd5ba040f0ad578325e74b522d" anchor="leftbottom"/><p:childTarget childRef="#6313da63fe7c4da784f613df32b7a74e" anchor="leftbottom"/><p:childTarget childRef="#17686154d646406fa03ed05f53c77a30" anchor="leftbottom"/><p:childTarget childRef="#b1f4f9f023224e43a8131d3236f57c03" anchor="rightbottom"/></p:childTargets><p:property name="box"><![CDATA[558,412]]></p:property><p:property name="withClose"><![CDATA[true]]></p:property><p:property name="withMax"><![CDATA[true]]></p:property><p:property name="withMin"><![CDATA[true]]></p:property><p:property name="withShadow"><![CDATA[false]]></p:property><p:property name="titleText"><![CDATA[E:\video.org]]></p:property><p:property name="textColor"><![CDATA[#FFFFFFFF]]></p:property><p:property name="textFont"><![CDATA[Trebuchet MS|bold|normal|13px|none]]></p:property><p:property name="textAlign"><![CDATA[0,1]]></p:property><p:property name="withRoomForIcon"><![CDATA[false]]></p:property></p:metadata>
     2<Document xmlns="http://www.evolus.vn/Namespace/Pencil"><Properties/><Pages><Page><Properties><Property name="name">video player</Property><Property name="id">1273584296451_6971</Property><Property name="width">576</Property><Property name="height">423</Property><Property name="dimBackground"></Property></Properties><Content><g xmlns="http://www.w3.org/2000/svg" p:type="Shape" xmlns:p="http://www.evolus.vn/Namespace/Pencil" p:def="Evolus.WindowsXP.Widgets:Frame" id="77aba34df25544ab938a29927e57d5f0" transform="matrix(1, 0, 0, 1, 10, 9)"><p:metadata><p:childTargets><p:childTarget childRef="#94e1ca1c1491466d9db735f9e65663b1" anchor="rightbottom"/><p:childTarget childRef="#b7356935baac49aa912a79bc87332e72" anchor="leftbottom"/><p:childTarget childRef="#8ad09f34263a4c648771a64d9efa0b86" anchor="rightbottom"/><p:childTarget childRef="#6291dd8320ba4e30813c91be09300fa9" anchor="righttop"/><p:childTarget childRef="#f9fe86723c974d03a77fea7f0dcc46c3" anchor="righttop"/><p:childTarget childRef="#f40f6cb501f34a20a828ad37b11cbe2c" anchor="rightbottom"/><p:childTarget childRef="#f2a6e10d7b394b35a3efc379a815b109" anchor="rightbottom"/><p:childTarget childRef="#184068076cb5436f9db5f1949645e1d7" anchor="leftbottom"/><p:childTarget childRef="#4361bf5e2f404f93a1b37460b665fb1d" anchor="rightbottom"/><p:childTarget childRef="#de283ce44c824c4fabb013da6c69ccc8" anchor="rightbottom"/><p:childTarget childRef="#f40eaa8c054e47cca87202d8bfae0c50" anchor="lefttop"/><p:childTarget childRef="#c392bddd5ba040f0ad578325e74b522d" anchor="leftbottom"/><p:childTarget childRef="#6313da63fe7c4da784f613df32b7a74e" anchor="leftbottom"/><p:childTarget childRef="#17686154d646406fa03ed05f53c77a30" anchor="leftbottom"/><p:childTarget childRef="#b1f4f9f023224e43a8131d3236f57c03" anchor="rightbottom"/></p:childTargets><p:property name="box"><![CDATA[558,412]]></p:property><p:property name="withClose"><![CDATA[true]]></p:property><p:property name="withMax"><![CDATA[true]]></p:property><p:property name="withMin"><![CDATA[true]]></p:property><p:property name="withShadow"><![CDATA[false]]></p:property><p:property name="titleText"><![CDATA[E:\video.org]]></p:property><p:property name="textColor"><![CDATA[#FFFFFFFF]]></p:property><p:property name="textFont"><![CDATA[Trebuchet MS|bold|normal|13px|none]]></p:property><p:property name="textAlign"><![CDATA[0,1]]></p:property><p:property name="withRoomForIcon"><![CDATA[false]]></p:property></p:metadata>
    33            <defs>
    44                <pattern patternUnits="userSpaceOnUse" x="0" y="0" width="1" height="29" p:name="titlePattern" id="fbffa82ffe0d4b7f99f5b6292cd257cf">
    … …  
    5252            <text x="15" y="27" style="text-align: left; text-anchor: start; dominant-baseline: auto; fill: rgb(0, 0, 0); fill-opacity: 1; font-family: Tahoma; font-size: 11px; font-weight: normal; font-style: normal; text-decoration: none;" xml:space="preserve" p:name="text" id="49363978205a405588977623e630b4e1">play/pause</text><path id="49363978205a405588977623e630b4e1_underline" style="fill: none; stroke-width: 1px; visibility: hidden;"/>
    5353            <path style="fill: none; stroke-width: 1px; visibility: hidden;" p:name="accelIndicator" id="7adf6861b27d461ba7094d574e62b58e"/>
    54         </g><g xmlns="http://www.w3.org/2000/svg" p:type="Shape" xmlns:p="http://www.evolus.vn/Namespace/Pencil" p:def="Evolus.WindowsXP.Widgets:Button" id="6313da63fe7c4da784f613df32b7a74e" transform="matrix(1, 0, 0, 1, 133, 342)" p:parentRef="#77aba34df25544ab938a29927e57d5f0"><p:metadata><p:property name="box"><![CDATA[80,25]]></p:property><p:property name="buttonText"><![CDATA[RW]]></p:property><p:property name="textColor"><![CDATA[#000000FF]]></p:property><p:property name="textFont"><![CDATA[Tahoma|normal|normal|11px|none]]></p:property><p:property name="textAlign"><![CDATA[1,1]]></p:property><p:property name="disabled"><![CDATA[false]]></p:property><p:property name="defaultButton"><![CDATA[false]]></p:property><p:childTargets/></p:metadata>
    55             <defs p:name="defs2177" id="4f62cdfbe77540eb8dd0935611e20e30">
    56                 <linearGradient x1="0%" y1="0%" x2="0%" y2="100%" p:name="linearGradient4109" id="a74ea7620e1f46838ca3b8a4fbd54026">
    57                   <stop style="stop-color: rgb(255, 255, 255); stop-opacity: 1;" offset="0%" p:name="stop1" id="aae5dd163c454e939da3126536703f4b"/>
    58                   <stop style="stop-color: rgb(240, 240, 234); stop-opacity: 1;" offset="72%" p:name="stop2" id="2d0e39e8cb4043c5b5fca333a399ea17"/>
    59                   <stop style="stop-color: rgb(214, 208, 197); stop-opacity: 1;" offset="100%" p:name="stop3" id="ce71b9b9a33a4e4ab312eb51f7813d67"/>
    60                 </linearGradient>
    61             </defs>
    62             <rect width="79" height="24" rx="3" ry="3" x="0.5" y="0.5" style="overflow: visible; marker: none; opacity: 1; color: rgb(0, 0, 0); fill: url(#a74ea7620e1f46838ca3b8a4fbd54026) rgb(0, 0, 0); fill-opacity: 1; fill-rule: nonzero; stroke: rgb(0, 60, 116); stroke-width: 1; stroke-linecap: square; stroke-linejoin: miter; stroke-miterlimit: 4; stroke-dasharray: none; stroke-dashoffset: 0pt; stroke-opacity: 1; visibility: visible; display: inline;" p:name="rect" id="81fd31618b204a0b8f552e733c6536c3"/>
    63             <rect width="76" height="21" rx="2" ry="2" x="2" y="2" style="overflow: visible; marker: none; opacity: 1; color: rgb(0, 0, 0); fill: none; fill-opacity: 1; fill-rule: nonzero; stroke: rgb(125, 164, 228); stroke-width: 2; stroke-linecap: square; stroke-linejoin: miter; stroke-miterlimit: 4; stroke-dasharray: none; stroke-dashoffset: 0pt; stroke-opacity: 1; visibility: hidden; display: inline;" p:name="defaultMarker" id="dfb261f4a905421992df94b8e925a7b3"/>
    64             <text x="31" y="17" style="text-align: left; text-anchor: start; dominant-baseline: auto; fill: rgb(0, 0, 0); fill-opacity: 1; font-family: Tahoma; font-size: 11px; font-weight: normal; font-style: normal; text-decoration: none;" xml:space="preserve" p:name="text" id="7ae38535f5a0436a881f7b7db76eb40d">RW</text><path id="7ae38535f5a0436a881f7b7db76eb40d_underline" style="fill: none; stroke-width: 1px; visibility: hidden;"/><path id="154b25c2815740fd9a9a12ab42cadc3b" style="fill: none; stroke-width: 1px; visibility: hidden;"/>
    65             <path style="fill: none; stroke-width: 1px; visibility: hidden;" p:name="accelIndicator" id="908c44094f8f4b9390b57122d8abd94e"/>
    66         </g><g xmlns="http://www.w3.org/2000/svg" p:type="Shape" xmlns:p="http://www.evolus.vn/Namespace/Pencil" p:def="Evolus.WindowsXP.Widgets:Button" id="94e1ca1c1491466d9db735f9e65663b1" transform="matrix(1, 0, 0, 1, 238, 341)" p:parentRef="#77aba34df25544ab938a29927e57d5f0"><p:metadata><p:property name="box"><![CDATA[80,25]]></p:property><p:property name="buttonText"><![CDATA[FF]]></p:property><p:property name="textColor"><![CDATA[#000000FF]]></p:property><p:property name="textFont"><![CDATA[Tahoma|normal|normal|11px|none]]></p:property><p:property name="textAlign"><![CDATA[1,1]]></p:property><p:property name="disabled"><![CDATA[false]]></p:property><p:property name="defaultButton"><![CDATA[false]]></p:property><p:childTargets/></p:metadata>
    67             <defs p:name="defs2177" id="359e4198c2554099a7de8c9ca5d4cd06">
    68                 <linearGradient x1="0%" y1="0%" x2="0%" y2="100%" p:name="linearGradient4109" id="3da87a64ee65454da17e4ed91eb52479">
    69                   <stop style="stop-color: rgb(255, 255, 255); stop-opacity: 1;" offset="0%" p:name="stop1" id="07ba9e1be2fa48e3bfc80f6d6a335e6a"/>
    70                   <stop style="stop-color: rgb(240, 240, 234); stop-opacity: 1;" offset="72%" p:name="stop2" id="9f4d0a254dfd4ec783d0eec68aa778ff"/>
    71                   <stop style="stop-color: rgb(214, 208, 197); stop-opacity: 1;" offset="100%" p:name="stop3" id="6c3994234f624099a2ac90104b5c52c1"/>
    72                 </linearGradient>
    73             </defs>
    74             <rect width="79" height="24" rx="3" ry="3" x="0.5" y="0.5" style="overflow: visible; marker: none; opacity: 1; color: rgb(0, 0, 0); fill: url(#3da87a64ee65454da17e4ed91eb52479) rgb(0, 0, 0); fill-opacity: 1; fill-rule: nonzero; stroke: rgb(0, 60, 116); stroke-width: 1; stroke-linecap: square; stroke-linejoin: miter; stroke-miterlimit: 4; stroke-dasharray: none; stroke-dashoffset: 0pt; stroke-opacity: 1; visibility: visible; display: inline;" p:name="rect" id="247e64f3ab0c4500927fcaba1230935d"/>
    75             <rect width="76" height="21" rx="2" ry="2" x="2" y="2" style="overflow: visible; marker: none; opacity: 1; color: rgb(0, 0, 0); fill: none; fill-opacity: 1; fill-rule: nonzero; stroke: rgb(125, 164, 228); stroke-width: 2; stroke-linecap: square; stroke-linejoin: miter; stroke-miterlimit: 4; stroke-dasharray: none; stroke-dashoffset: 0pt; stroke-opacity: 1; visibility: hidden; display: inline;" p:name="defaultMarker" id="b020396848a8436b90f797ce6000cafd"/>
    76             <text x="33" y="17" style="text-align: left; text-anchor: start; dominant-baseline: auto; fill: rgb(0, 0, 0); fill-opacity: 1; font-family: Tahoma; font-size: 11px; font-weight: normal; font-style: normal; text-decoration: none;" xml:space="preserve" p:name="text" id="8a498694ff8f4da5a521f35ccef3a6b8">FF</text><path id="8a498694ff8f4da5a521f35ccef3a6b8_underline" style="fill: none; stroke-width: 1px; visibility: hidden;"/><path id="7a630bd5165045279cdfa0a55e4cc155" style="fill: none; stroke-width: 1px; visibility: hidden;"/><path id="a2287c2e44cf4f1a90e99249dd166477" style="fill: none; stroke-width: 1px; visibility: hidden;"/>
    77             <path style="fill: none; stroke-width: 1px; visibility: hidden;" p:name="accelIndicator" id="c186d621030b46dc861798d01ead59dd"/>
    7854        </g><g xmlns="http://www.w3.org/2000/svg" p:type="Shape" xmlns:p="http://www.evolus.vn/Namespace/Pencil" p:def="Evolus.NativeGUI:Scrollbar" id="c392bddd5ba040f0ad578325e74b522d" transform="matrix(-4.37114e-08, 1, -1, -4.37114e-08, 438, 310)" p:parentRef="#77aba34df25544ab938a29927e57d5f0"><p:metadata><p:childTargets/><p:property name="box"><![CDATA[22,398]]></p:property><p:property name="startHandle"><![CDATA[5.5,208]]></p:property><p:property name="disabled"><![CDATA[false]]></p:property></p:metadata>
    7955            <foreignObject x="0" y="0" width="22" height="398" p:name="htmlObject" id="12f7806289e14cf191eadf57bcb9a74f">
    … …  
    8359                </html:div>
    8460            </foreignObject>
    85         </g><g xmlns="http://www.w3.org/2000/svg" p:type="Shape" xmlns:p="http://www.evolus.vn/Namespace/Pencil" p:def="Evolus.NativeGUI:Scrollbar" id="6291dd8320ba4e30813c91be09300fa9" transform="matrix(1, 0, 0, 1, 456, 93)" p:parentRef="#77aba34df25544ab938a29927e57d5f0"><p:metadata><p:childTargets/><p:property name="box"><![CDATA[20,200]]></p:property><p:property name="startHandle"><![CDATA[5,30]]></p:property><p:property name="disabled"><![CDATA[false]]></p:property></p:metadata>
    86             <foreignObject x="0" y="0" width="20" height="200" p:name="htmlObject" id="483aec1c63f1470884394f91cd60f95d">
    87                 <html:div xmlns:html="http://www.w3.org/1999/xhtml" style="overflow: hidden; -moz-box-sizing: border-box; position: relative; line-height: 0px ! important; font-size: 0px; width: 20px; height: 200px;" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" p:name="div" id="2dfacdb46d494cf9bbb9f8a249045e63">
    88                 <scrollbar orient="vertical" style="margin: 0px ! important; padding: 0px ! important; min-height: 0px ! important; min-width: 0px ! important; -moz-box-sizing: border-box; width: 20px; height: 200px;" p:name="xulControl" id="942b5995280a4e6192e9545ebd00d8a0" width="20" height="200" disabled="false" maxpos="100" curpos="15"/>
    89                     <html:div style="position: absolute; top: 0px; left: 0px; width: 100%; height: 100%;"/>
    90                 </html:div>
    91             </foreignObject>
    92         </g><g xmlns="http://www.w3.org/2000/svg" p:type="Shape" xmlns:p="http://www.evolus.vn/Namespace/Pencil" p:def="Evolus.NativeGUI:Scrollbar" id="f9fe86723c974d03a77fea7f0dcc46c3" transform="matrix(1, 0, 0, 1, 508, 93)" p:parentRef="#77aba34df25544ab938a29927e57d5f0"><p:metadata><p:property name="box"><![CDATA[20,200]]></p:property><p:property name="startHandle"><![CDATA[5,30]]></p:property><p:property name="disabled"><![CDATA[false]]></p:property><p:childTargets/></p:metadata>
    93             <foreignObject x="0" y="0" width="20" height="200" p:name="htmlObject" id="4da13051750544e5b82610591ad35bb5">
    94                 <html:div xmlns:html="http://www.w3.org/1999/xhtml" style="overflow: hidden; -moz-box-sizing: border-box; position: relative; line-height: 0px ! important; font-size: 0px; width: 20px; height: 200px;" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" p:name="div" id="1ecc7447909846dfb5f6dce75cfe9500">
    95                 <scrollbar orient="vertical" style="margin: 0px ! important; padding: 0px ! important; min-height: 0px ! important; min-width: 0px ! important; -moz-box-sizing: border-box; width: 20px; height: 200px;" p:name="xulControl" id="72a2307fd4a24c3c94595c1eabd0345d" width="20" height="200" disabled="false" maxpos="100" curpos="15"/>
    96                     <html:div style="position: absolute; top: 0px; left: 0px; width: 100%; height: 100%;"/>
    97                 </html:div>
    98             </foreignObject>
    99         </g><g xmlns="http://www.w3.org/2000/svg" p:type="Shape" xmlns:p="http://www.evolus.vn/Namespace/Pencil" p:def="Evolus.WindowsXP.Widgets:Label" id="f40f6cb501f34a20a828ad37b11cbe2c" transform="matrix(1, 0, 0, 1, 457, 304)" p:parentRef="#77aba34df25544ab938a29927e57d5f0"><p:metadata><p:childTargets/><p:property name="disabled"><![CDATA[false]]></p:property><p:property name="label"><![CDATA[jump]]></p:property><p:property name="textColor"><![CDATA[#000000FF]]></p:property><p:property name="textFont"><![CDATA[Tahoma|normal|normal|11px|none]]></p:property></p:metadata>
    100               <text y="11" x="0" style="font-size: 11px; font-style: normal; font-weight: normal; text-align: left; text-anchor: start; dominant-baseline: auto; fill: rgb(0, 0, 0); font-family: Tahoma; fill-opacity: 1; text-decoration: none;" xml:space="preserve" p:name="text" id="a9c77286ebcf49b88ef285b9d3a4dcc7">jump</text><path id="a9c77286ebcf49b88ef285b9d3a4dcc7_underline" style="fill: none; stroke-width: 1px; visibility: hidden;"/>
    101              <path style="fill: none; stroke-width: 1px; visibility: hidden;" p:name="accelIndicator" id="c5439c9d93994adfb447eb738defbec9"/>
    102         </g><g xmlns="http://www.w3.org/2000/svg" p:type="Shape" xmlns:p="http://www.evolus.vn/Namespace/Pencil" p:def="Evolus.WindowsXP.Widgets:Label" id="f2a6e10d7b394b35a3efc379a815b109" transform="matrix(1, 0, 0, 1, 504, 304)" p:parentRef="#77aba34df25544ab938a29927e57d5f0"><p:metadata><p:property name="disabled"><![CDATA[false]]></p:property><p:property name="label"><![CDATA[loop]]></p:property><p:property name="textColor"><![CDATA[#000000FF]]></p:property><p:property name="textFont"><![CDATA[Tahoma|normal|normal|11px|none]]></p:property><p:childTargets/></p:metadata>
    103               <text y="11" x="0" style="font-size: 11px; font-style: normal; font-weight: normal; text-align: left; text-anchor: start; dominant-baseline: auto; fill: rgb(0, 0, 0); font-family: Tahoma; fill-opacity: 1; text-decoration: none;" xml:space="preserve" p:name="text" id="17b9ec864d544e4ab6d91ec8ed3cb70b">loop</text><path id="17b9ec864d544e4ab6d91ec8ed3cb70b_underline" style="fill: none; stroke-width: 1px; visibility: hidden;"/><path id="4eefe415943d4ef6b92d365cc0e8c8d4" style="fill: none; stroke-width: 1px; visibility: hidden;"/>
    104              <path style="fill: none; stroke-width: 1px; visibility: hidden;" p:name="accelIndicator" id="430fbd22f12943cb824ea5ca71f40076"/>
    10561        </g><g xmlns="http://www.w3.org/2000/svg" p:type="Shape" xmlns:p="http://www.evolus.vn/Namespace/Pencil" p:def="Evolus.WindowsXP.Widgets:Button" id="184068076cb5436f9db5f1949645e1d7" transform="matrix(1, 0, 0, 1, 353, 355)" p:parentRef="#77aba34df25544ab938a29927e57d5f0"><p:metadata><p:property name="box"><![CDATA[82,38]]></p:property><p:property name="buttonText"><![CDATA[loop]]></p:property><p:property name="textColor"><![CDATA[#000000FF]]></p:property><p:property name="textFont"><![CDATA[Tahoma|normal|normal|11px|none]]></p:property><p:property name="textAlign"><![CDATA[1,1]]></p:property><p:property name="disabled"><![CDATA[false]]></p:property><p:property name="defaultButton"><![CDATA[false]]></p:property><p:childTargets/></p:metadata>
    10662            <defs p:name="defs2177" id="a279ab7944a54a29809057f8ecb5c4fc">
    … …  
    11571            <text x="32" y="23" style="text-align: left; text-anchor: start; dominant-baseline: auto; fill: rgb(0, 0, 0); fill-opacity: 1; font-family: Tahoma; font-size: 11px; font-weight: normal; font-style: normal; text-decoration: none;" xml:space="preserve" p:name="text" id="68e4150b96154438b08871431c42af31">loop</text><path id="68e4150b96154438b08871431c42af31_underline" style="fill: none; stroke-width: 1px; visibility: hidden;"/><path id="ba660051dc0d43c39c7020521b718cf7" style="fill: none; stroke-width: 1px; visibility: hidden;"/><path id="a7abb683c2ea4c8fa74992c510bce823" style="fill: none; stroke-width: 1px; visibility: hidden;"/>
    11672            <path style="fill: none; stroke-width: 1px; visibility: hidden;" p:name="accelIndicator" id="13325e31108445428c9cb7bb1c743962"/>
    117         </g><g xmlns="http://www.w3.org/2000/svg" p:type="Shape" xmlns:p="http://www.evolus.vn/Namespace/Pencil" p:def="Evolus.WindowsXP.Widgets:Combo" id="de283ce44c824c4fabb013da6c69ccc8" transform="matrix(1, 0, 0, 1, 475, 333)" p:parentRef="#77aba34df25544ab938a29927e57d5f0"><p:metadata><p:childTargets/><p:property name="box"><![CDATA[53,25]]></p:property><p:property name="buttonText"><![CDATA[speed]]></p:property><p:property name="textColor"><![CDATA[#000000FF]]></p:property><p:property name="textFont"><![CDATA[Tahoma|normal|normal|11px|none]]></p:property><p:property name="textAlign"><![CDATA[0,1]]></p:property><p:property name="disabled"><![CDATA[false]]></p:property><p:property name="focused"><![CDATA[false]]></p:property></p:metadata>
    118 
    119           <defs p:name="defs2177" id="abde33ce257e474d99bfa4fdcaa2e1c9">
    120             <linearGradient x1="0%" y1="0%" x2="100%" y2="100%" p:name="linearGradient4129" id="9a0bb46a44b447f4bf317e79d85ac94d">
    121               <stop style="stop-color: rgb(231, 238, 255); stop-opacity: 1;" offset="0" p:name="stop1" id="a748897c43af42e8828de94990e9428f"/>
    122               <stop style="stop-color: rgb(174, 200, 247); stop-opacity: 1;" offset="1" p:name="stop2" id="47aad9ef488c4f11aeb71d6830dd5052"/>
    123             </linearGradient>
    124           </defs>
    125             <rect width="52" height="24" x="0.5" y="0.5" style="opacity: 1; color: rgb(0, 0, 0); fill: rgb(255, 255, 255); fill-opacity: 1; fill-rule: nonzero; stroke: none;" p:name="bgRect1" id="01737408e203470b80559a1b471dce08"/>
    126             <rect width="20" height="25" x="33" y="0" style="opacity: 1; color: rgb(0, 0, 0); fill: rgb(255, 255, 255); fill-opacity: 1; fill-rule: nonzero; stroke: none;" p:name="bgRect2" id="6a90143772d1498eb6888216bb5dd955"/>
    127             <rect width="52" height="24" x="0.5" y="0.5" style="overflow: visible; marker: none; opacity: 1; color: rgb(0, 0, 0); fill: none; fill-opacity: 1; fill-rule: nonzero; stroke: rgb(127, 157, 185); stroke-width: 1; stroke-linecap: square; stroke-linejoin: miter; stroke-miterlimit: 4; stroke-dasharray: none; stroke-dashoffset: 0pt; stroke-opacity: 1; visibility: visible; display: inline;" p:name="rect" id="3a93ef9704e64e598b29c724e8e6c48f"/>
    128             <rect width="16" height="20" rx="1" ry="1" x="34.5" y="2.5" style="overflow: visible; marker: none; opacity: 1; color: rgb(0, 0, 0); fill: url(#9a0bb46a44b447f4bf317e79d85ac94d) rgb(0, 0, 0); fill-opacity: 1; fill-rule: nonzero; stroke: rgb(195, 211, 248); stroke-width: 0.969547; stroke-linecap: square; stroke-linejoin: miter; stroke-miterlimit: 4; stroke-dasharray: none; stroke-dashoffset: 0pt; stroke-opacity: 1; visibility: visible; display: inline;" p:name="dropRect" id="6421ab2da8b64532b63b3f08cc63fdda"/>
    129             <path d="M 46.5,10.5 L 42.5,14.5 L 38.5,10.5" style="overflow: visible; marker: none; color: rgb(0, 0, 0); fill: none; fill-opacity: 1; fill-rule: nonzero; stroke: rgb(77, 97, 133); stroke-width: 2; stroke-linecap: butt; stroke-linejoin: miter; stroke-miterlimit: 4; stroke-dashoffset: 0pt; stroke-opacity: 1; visibility: visible; display: inline;" p:name="marker" id="f87c27d99a9e4cc79c895cb4aa27819c"/>
    130             <rect width="29" height="20" x="2.5" y="2.5" style="opacity: 1; color: rgb(0, 0, 0); fill: rgb(49, 106, 197); fill-opacity: 1; fill-rule: nonzero; stroke: rgb(255, 255, 255); stroke-dasharray: 1, 1; visibility: hidden;" p:name="focusRect" id="8b9ebc8174824468b6653cc7c93a38b8"/>
    131             <text x="5" y="17" style="text-align: left; text-anchor: start; dominant-baseline: auto; fill: rgb(0, 0, 0); fill-opacity: 1; font-family: Tahoma; font-size: 11px; font-weight: normal; font-style: normal; text-decoration: none;" xml:space="preserve" p:name="text" id="22d8c91ba6ec4f9bb357c265e24221c9">speed</text><path id="22d8c91ba6ec4f9bb357c265e24221c9_underline" style="fill: none; stroke-width: 1px; visibility: hidden;"/>
    132           </g><g xmlns="http://www.w3.org/2000/svg" p:type="Shape" xmlns:p="http://www.evolus.vn/Namespace/Pencil" p:def="Evolus.WindowsXP.Widgets:Combo" id="4361bf5e2f404f93a1b37460b665fb1d" transform="matrix(1, 0, 0, 1, 475, 367)" p:parentRef="#77aba34df25544ab938a29927e57d5f0"><p:metadata><p:property name="box"><![CDATA[53,25]]></p:property><p:property name="buttonText"><![CDATA[FF speed]]></p:property><p:property name="textColor"><![CDATA[#000000FF]]></p:property><p:property name="textFont"><![CDATA[Tahoma|normal|normal|11px|none]]></p:property><p:property name="textAlign"><![CDATA[0,1]]></p:property><p:property name="disabled"><![CDATA[false]]></p:property><p:property name="focused"><![CDATA[false]]></p:property><p:childTargets/></p:metadata>
    133 
    134           <defs p:name="defs2177" id="ad2e69aa4d5b45a184f4b4b72e7b3758">
    135             <linearGradient x1="0%" y1="0%" x2="100%" y2="100%" p:name="linearGradient4129" id="c7c6fa2b36024f84af1918db00d069fe">
    136               <stop style="stop-color: rgb(231, 238, 255); stop-opacity: 1;" offset="0" p:name="stop1" id="82708fd98d0c4beb9cb7812eebf2bcc9"/>
    137               <stop style="stop-color: rgb(174, 200, 247); stop-opacity: 1;" offset="1" p:name="stop2" id="f6b2132670e241aab45e4b4d74bcd913"/>
    138             </linearGradient>
    139           </defs>
    140             <rect width="52" height="24" x="0.5" y="0.5" style="opacity: 1; color: rgb(0, 0, 0); fill: rgb(255, 255, 255); fill-opacity: 1; fill-rule: nonzero; stroke: none;" p:name="bgRect1" id="2db01d61b7e840dd89f01bdc473f279f"/>
    141             <rect width="20" height="25" x="33" y="0" style="opacity: 1; color: rgb(0, 0, 0); fill: rgb(255, 255, 255); fill-opacity: 1; fill-rule: nonzero; stroke: none;" p:name="bgRect2" id="638bbe1daebb4b1f8b40dc1ec6e57ec0"/>
    142             <rect width="52" height="24" x="0.5" y="0.5" style="overflow: visible; marker: none; opacity: 1; color: rgb(0, 0, 0); fill: none; fill-opacity: 1; fill-rule: nonzero; stroke: rgb(127, 157, 185); stroke-width: 1; stroke-linecap: square; stroke-linejoin: miter; stroke-miterlimit: 4; stroke-dasharray: none; stroke-dashoffset: 0pt; stroke-opacity: 1; visibility: visible; display: inline;" p:name="rect" id="25efc6df26294acdb52e0ca3e8b63a41"/>
    143             <rect width="16" height="20" rx="1" ry="1" x="34.5" y="2.5" style="overflow: visible; marker: none; opacity: 1; color: rgb(0, 0, 0); fill: url(#c7c6fa2b36024f84af1918db00d069fe) rgb(0, 0, 0); fill-opacity: 1; fill-rule: nonzero; stroke: rgb(195, 211, 248); stroke-width: 0.969547; stroke-linecap: square; stroke-linejoin: miter; stroke-miterlimit: 4; stroke-dasharray: none; stroke-dashoffset: 0pt; stroke-opacity: 1; visibility: visible; display: inline;" p:name="dropRect" id="8289dd0ee5c447ebbd27d9d9337d86d1"/>
    144             <path d="M 46.5,10.5 L 42.5,14.5 L 38.5,10.5" style="overflow: visible; marker: none; color: rgb(0, 0, 0); fill: none; fill-opacity: 1; fill-rule: nonzero; stroke: rgb(77, 97, 133); stroke-width: 2; stroke-linecap: butt; stroke-linejoin: miter; stroke-miterlimit: 4; stroke-dashoffset: 0pt; stroke-opacity: 1; visibility: visible; display: inline;" p:name="marker" id="9a590a15fc34452cb772bcc473f40fc5"/>
    145             <rect width="29" height="20" x="2.5" y="2.5" style="opacity: 1; color: rgb(0, 0, 0); fill: rgb(49, 106, 197); fill-opacity: 1; fill-rule: nonzero; stroke: rgb(255, 255, 255); stroke-dasharray: 1, 1; visibility: hidden;" p:name="focusRect" id="1ba00f28ddf342e3901927a34e5f33f7"/>
    146             <text x="5" y="17" style="text-align: left; text-anchor: start; dominant-baseline: auto; fill: rgb(0, 0, 0); fill-opacity: 1; font-family: Tahoma; font-size: 11px; font-weight: normal; font-style: normal; text-decoration: none;" xml:space="preserve" p:name="text" id="bd924d1ecf7849d1840ce18fbc802f1e">FF speed</text><path id="bd924d1ecf7849d1840ce18fbc802f1e_underline" style="fill: none; stroke-width: 1px; visibility: hidden;"/><path id="de0c42a1ed2648a4a3f49c3bb6f967a5" style="fill: none; stroke-width: 1px; visibility: hidden;"/>
    147           </g><g xmlns="http://www.w3.org/2000/svg" p:type="Shape" xmlns:p="http://www.evolus.vn/Namespace/Pencil" p:def="Evolus.WindowsXP.Widgets:Button" id="17686154d646406fa03ed05f53c77a30" transform="matrix(1, 0, 0, 1, 133, 370)" p:parentRef="#77aba34df25544ab938a29927e57d5f0"><p:metadata><p:property name="box"><![CDATA[80,25]]></p:property><p:property name="buttonText"><![CDATA[<-]]></p:property><p:property name="textColor"><![CDATA[#000000FF]]></p:property><p:property name="textFont"><![CDATA[Tahoma|normal|normal|11px|none]]></p:property><p:property name="textAlign"><![CDATA[1,1]]></p:property><p:property name="disabled"><![CDATA[false]]></p:property><p:property name="defaultButton"><![CDATA[false]]></p:property><p:childTargets/></p:metadata>
     73        </g><g xmlns="http://www.w3.org/2000/svg" p:type="Shape" xmlns:p="http://www.evolus.vn/Namespace/Pencil" p:def="Evolus.WindowsXP.Widgets:Button" id="17686154d646406fa03ed05f53c77a30" transform="matrix(1, 0, 0, 1, 133, 370)" p:parentRef="#77aba34df25544ab938a29927e57d5f0"><p:metadata><p:property name="box"><![CDATA[80,25]]></p:property><p:property name="buttonText"><![CDATA[<-]]></p:property><p:property name="textColor"><![CDATA[#000000FF]]></p:property><p:property name="textFont"><![CDATA[Tahoma|normal|normal|11px|none]]></p:property><p:property name="textAlign"><![CDATA[1,1]]></p:property><p:property name="disabled"><![CDATA[false]]></p:property><p:property name="defaultButton"><![CDATA[false]]></p:property><p:childTargets/></p:metadata>
    14874            <defs p:name="defs2177" id="0fcd066fbb83416892d325c0ddf8b422">
    14975                <linearGradient x1="0%" y1="0%" x2="0%" y2="100%" p:name="linearGradient4109" id="be98056198ed439c8ca73730a18cb76f">
    … …  
    183109              <text y="11" x="0" style="font-size: 11px; font-style: normal; font-weight: normal; text-align: left; text-anchor: start; dominant-baseline: auto; fill: rgb(0, 0, 0); font-family: Tahoma; fill-opacity: 1; text-decoration: none;" xml:space="preserve" p:name="text" id="ad37c12529694116827f55438573f1d0">x/12345s</text><path id="ad37c12529694116827f55438573f1d0_underline" style="fill: none; stroke-width: 1px; visibility: hidden;"/>
    184110             <path style="fill: none; stroke-width: 1px; visibility: hidden;" p:name="accelIndicator" id="578c3c87710a4b04af07917366b26701"/>
     111        </g><g xmlns="http://www.w3.org/2000/svg" p:type="Shape" xmlns:p="http://www.evolus.vn/Namespace/Pencil" p:def="Evolus.NativeGUI:Scrollbar" id="c392bddd5ba040f0ad578325e74b522d" transform="matrix(-1, -8.74228e-08, 8.74228e-08, -1, 516, 303)" p:parentRef="#77aba34df25544ab938a29927e57d5f0"><p:metadata><p:childTargets/><p:property name="box"><![CDATA[25,247]]></p:property><p:property name="startHandle"><![CDATA[6.25,129]]></p:property><p:property name="disabled"><![CDATA[false]]></p:property></p:metadata>
     112            <foreignObject x="0" y="0" width="25" height="247" p:name="htmlObject" id="93f878d322384717bf71cf65e532ecff">
     113                <html:div xmlns:html="http://www.w3.org/1999/xhtml" style="overflow: hidden; -moz-box-sizing: border-box; position: relative; line-height: 0px ! important; font-size: 0px; width: 25px; height: 247px;" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" p:name="div" id="f7de80235a3f4e0e9b65ce8a9ded1139">
     114                <scrollbar orient="vertical" style="margin: 0px ! important; padding: 0px ! important; min-height: 0px ! important; min-width: 0px ! important; -moz-box-sizing: border-box; width: 25px; height: 247px;" p:name="xulControl" id="d0ae84b1f4ef44eaa06762af35557989" width="25" height="247" disabled="false" maxpos="100" curpos="52.22672064777328"/>
     115                    <html:div style="position: absolute; top: 0px; left: 0px; width: 100%; height: 100%;"/>
     116                </html:div>
     117            </foreignObject>
     118        </g><g xmlns="http://www.w3.org/2000/svg" p:type="Shape" xmlns:p="http://www.evolus.vn/Namespace/Pencil" p:def="Evolus.WindowsXP.Widgets:Label" id="8ad09f34263a4c648771a64d9efa0b86" transform="matrix(1, 0, 0, 1, 492, 310)" p:parentRef="#77aba34df25544ab938a29927e57d5f0"><p:metadata><p:childTargets/><p:property name="disabled"><![CDATA[false]]></p:property><p:property name="label"><![CDATA[speed]]></p:property><p:property name="textColor"><![CDATA[#000000FF]]></p:property><p:property name="textFont"><![CDATA[Tahoma|normal|normal|11px|none]]></p:property></p:metadata>
     119              <text y="10" x="0" style="font-size: 11px; font-style: normal; font-weight: normal; text-align: left; text-anchor: start; dominant-baseline: auto; fill: rgb(0, 0, 0); font-family: Tahoma; fill-opacity: 1; text-decoration: none;" xml:space="preserve" p:name="text" id="3e2bd01fa1f1460180d3c05f74d5ab4f">speed</text><path id="3e2bd01fa1f1460180d3c05f74d5ab4f_underline" style="fill: none; stroke-width: 1px; visibility: hidden;"/><path id="c9124cc1ae8f4535b0fff30422e66103" style="fill: none; stroke-width: 1px; visibility: hidden;"/>
     120             <path style="fill: none; stroke-width: 1px; visibility: hidden;" p:name="accelIndicator" id="cd15e8ded7d44b1da5420c39e7dab8a3"/>
    185121        </g></Content></Page></Pages></Document>

  • applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java

    r21257 r21295  
    11package org.openstreetmap.josm.plugins.videomapping;
     2
     3
     4import java.util.Iterator;
     5import java.util.Timer;
     6import java.util.TimerTask;
    27
    38import java.awt.Color;
    49import java.awt.Component;
     10import java.awt.Dimension;
    511import java.awt.Graphics2D;
    612import java.awt.Point;
     13import java.awt.Rectangle;
    714import java.awt.event.MouseEvent;
    815import java.awt.event.MouseListener;
    … …  
    1522import org.openstreetmap.josm.data.Bounds;
    1623import org.openstreetmap.josm.data.gpx.GpxData;
     24import org.openstreetmap.josm.data.osm.DataSet;
     25import org.openstreetmap.josm.data.osm.Node;
    1726import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
    1827import org.openstreetmap.josm.gui.MapView;
    … …  
    2332
    2433public class PositionLayer extends Layer implements MouseListener {
    25         private GpxData gps;
    26         public PositionLayer(String name,GpxData gps) {
     34        private DataSet ds;
     35        private Node sel;
     36        private Iterator<Node> it;
     37               
     38        public PositionLayer(String name, final DataSet ds) {
    2739                super(name);           
    28                 this.gps = gps;
    29                 Main.map.mapView.addMouseListener(this);
     40                this.ds = ds;
     41                Main.map.mapView.addMouseListener(this);               
     42                Timer t  = new Timer();
     43                it=ds.getNodes().iterator();
     44               
     45                t.schedule(new TimerTask() {
     46                       
     47                        @Override
     48                        public void run() {
     49                                // TODO Auto-generated method stub
     50                                sel=it.next();
     51                                System.out.println(sel.getTimestamp());
     52                                Main.map.mapView.repaint();
     53                        }
     54                },1000,1000);
     55               
    3056        }
    3157
    … …  
    6086        }
    6187
     88        // no merging nescesarry
    6289        @Override
    6390        public boolean isMergable(Layer arg0) {
    … …  
    6794        @Override
    6895        public void mergeFrom(Layer arg0) {
    69                 // no merging nescesarry
     96               
    7097        }
    7198
     99       
     100       
    72101        @Override
     102        //Draw the current position
    73103        public void paint(Graphics2D g, MapView map, Bounds bound) {
    74                 //TODO this is just an blue screen test
    75                 g.setColor(Color.BLUE);
    76                 g.fillRect(0, 0, map.getWidth(),map.getHeight());
     104                Point p;
     105                for(Node n: ds.getNodes()) {
     106                        p = Main.map.mapView.getPoint(n.getEastNorth());
     107                        if(n.isHighlighted())
     108                        {
     109                                g.setColor(Color.red);
     110                                g.drawString(n.getTimestamp().toString(), p.x+10, p.y);
     111                        }
     112                        else
     113                        {
     114                                g.setColor(Color.green);
     115                        }
     116                        g.drawOval(p.x - 2, p.y - 2, 4, 4); // small circles
     117                }
     118                if (sel!=null){
     119                        p=Main.map.mapView.getPoint(sel.getEastNorth());;
     120                        g.setColor(Color.CYAN);
     121                        g.drawRect(p.x, p.y, 100, 100);
     122                };
    77123        }
    78124
    … …  
    84130
    85131        //jump to the right position in video
    86         public void mouseClicked(MouseEvent e) {
     132        public void mouseClicked(MouseEvent e) {               
     133                //only on leftclicks of our layer
    87134                if(e.getButton() == MouseEvent.BUTTON1) {
    88                         if(Main.map.mapView.getActiveLayer() == this) {
    89                                 //only on leftclicks of our layer
    90                                 getNearestPoint(e.getPoint());
    91                         }
     135                        JOptionPane.showMessageDialog(Main.parent,"test");
     136                        getNearestNode(e.getPoint());
     137                        Main.map.mapView.repaint();
    92138                }
    93139               
    94140        }
    95141
    96         //finds the corresponding timecode in GPXtrack
    97         private Point getNearestPoint(Point point) {
    98 
    99                 return point;
    100                
     142        //finds the corresponding timecode in GPXtrack by given screen coordinates
     143        private void getNearestNode(Point mouse) {
     144                Point p;
     145                Rectangle rect = new Rectangle(mouse, new Dimension(30, 30));           
     146                //iterate through all possible notes
     147                for(Node node : ds.getNodes())
     148                {
     149                        p = Main.map.mapView.getPoint(node);
     150                        if (rect.contains(p))
     151                        {                               
     152                                node.setHighlighted(true);
     153                        }
     154                       
     155                }       
    101156        }
    102157

  • applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoAction.java

    r21226 r21295  
    33import java.awt.event.ActionEvent;
    44import java.io.File;
     5import java.util.List;
     6
    57
    68import javax.swing.JFileChooser;
    … …  
    911import org.openstreetmap.josm.Main;
    1012import org.openstreetmap.josm.actions.JosmAction;
    11 import org.openstreetmap.josm.data.gpx.GpxData;
     13import org.openstreetmap.josm.data.gpx.*;
     14import org.openstreetmap.josm.data.osm.DataSet;
     15import org.openstreetmap.josm.data.osm.Node;
     16import org.openstreetmap.josm.data.osm.Way;
     17import org.openstreetmap.josm.gui.layer.GpxLayer;
     18import org.openstreetmap.josm.tools.DateUtils;
    1219import org.openstreetmap.josm.tools.Shortcut;
    1320import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
    … …  
    1724
    1825        private GpxData gps;
     26        private DataSet ds; //all extracted GPS points
     27        private List<WayPoint> ls;
    1928
    2029        public VideoAction() {
    … …  
    2534        public void actionPerformed(ActionEvent arg0) {
    2635       
    27 //              JFileChooser fc = new JFileChooser();
    28 //              fc.setAcceptAllFileFilterUsed( false );
    29 //              fc.setFileFilter( new VideoFileFilter() );
    30 //              if (fc.showOpenDialog( Main.parent )==JFileChooser.APPROVE_OPTION)
    31 //              {
    32 //                      VideoWindow w = new VideoWindow(fc.getSelectedFile());
    33 //              }
    34                 Main.main.addLayer(new PositionLayer("test",gps));
     36                copyGPSLayer();
     37                Main.main.addLayer(new PositionLayer("test",ds));
    3538        }
    36        
    37         //restrict the file chooser
    38         private class VideoFileFilter extends FileFilter {
    39 
    40                 @Override
    41                 public boolean accept(File f) {
    42                    
    43                     String ext3 = ( f.getName().length() > 4 ) ?  f.getName().substring( f.getName().length() - 4 ).toLowerCase() : "";
    44                     String ext4 = ( f.getName().length() > 5 ) ?  f.getName().substring( f.getName().length() - 5 ).toLowerCase() : "";
    45 
    46                     // TODO: check what is supported by JMF or if there is a build in filter
    47                     return ( f.isDirectory()
    48                         ||      ext3.equals( ".avi" )
    49                         ||      ext4.equals( ".wmv" )
    50                         ||      ext3.equals( ".mpg" )
    51                         );
    52                 }
    53 
    54 
    55                 @Override
    56                 public String getDescription() {
    57                         return tr("Video files");
    58                 }
    5939               
    60         }
    6140       
    6241        public void setGps(GpxData gps) {
    6342                this.gps = gps;
    6443        }
     44       
     45        //makes a private flat copy for interaction
     46        private void copyGPSLayer()
     47        {
     48                //TODO we assume that GPS points are in the correct order!
     49                ds = new DataSet();
     50            for (GpxTrack trk : gps.tracks) {
     51                for (GpxTrackSegment segment : trk.getSegments()) {
     52                    Way w = new Way();
     53                    for (WayPoint p : segment.getWayPoints()) {
     54                        Node n = new Node(p.getCoor());
     55                        String timestr = p.getString("time");
     56                        if(timestr != null)
     57                            n.setTimestamp(DateUtils.fromString(timestr));
     58                        ds.addPrimitive(n);
     59                        w.addNode(n);
     60                        //ls.add
     61                    }
     62                    ds.addPrimitive(w);
     63                }
     64            }
     65        }
    6566
    6667}

  • applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java

    r21226 r21295  
    3030                super(info);
    3131                //Register for GPS menu
    32                 VMenu = Main.main.menu.addMenu(tr("Video"), KeyEvent.VK_V, Main.main.menu.defaultMenuPos,ht("/Plugin/Videomapping"));
     32                VMenu = Main.main.menu.addMenu(tr(" Video"), KeyEvent.VK_V, Main.main.menu.defaultMenuPos,ht("/Plugin/Videomapping"));//TODO no more ugly " video" hack
    3333                VMenu.setEnabled(false); //enabled only on GPS Layers
    3434                VAction = new VideoAction();

  • applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoWindow.java

    r21226 r21295  
    22
    33import java.awt.BorderLayout;
     4import java.awt.Canvas;
    45import java.awt.Component;
    56import java.awt.GraphicsConfiguration;
    … …  
    78import java.io.File;
    89import java.io.IOException;
    9 import javax.media.CannotRealizeException;
    10 import javax.media.Manager;
    11 import javax.media.NoPlayerException;
    12 import javax.media.Player;
    1310
    1411import javax.swing.JFrame;
    … …  
    1613import org.openstreetmap.josm.Main;
    1714
     15import uk.co.caprica.vlcj.player.*;
     16
    1817public class VideoWindow extends JFrame {
    1918
    20         /**
    21          *
    22          */
    2319        private static final long serialVersionUID = 2099614201397118560L;
    2420
    2521        public VideoWindow(File vfile) throws HeadlessException {
    2622                super();
     23                MediaPlayerFactory mediaPlayerFactory = new MediaPlayerFactory(null);
     24                FullScreenStrategy fullScreenStrategy = new DefaultFullScreenStrategy(this);
     25                MediaPlayer mediaPlayer = mediaPlayerFactory.newMediaPlayer(fullScreenStrategy);
     26                mediaPlayer.setStandardMediaOptions(null);
     27                //mediaPlayer.addMediaPlayerEventListener
     28                Canvas videoSurface = new Canvas();             
     29                mediaPlayer.setVideoSurface(videoSurface);
     30                add(videoSurface);
    2731                try {
    28                         setTitle(vfile.getCanonicalPath());
    29                         setSize(200,200);                       
    30                         setAlwaysOnTop(true);
    31                        
    32                         try {
    33                                 setLayout( new BorderLayout());
    34                                 Player mediaPlayer = Manager.createRealizedPlayer( vfile.toURL() );
    35                                  Component video = mediaPlayer.getVisualComponent();
    36                                  Component controls = mediaPlayer.getControlPanelComponent();
    37                                 add( video, BorderLayout.CENTER );
    38                                 add( controls, BorderLayout.SOUTH );
    39                         } catch (NoPlayerException e) {
    40                                 // TODO Auto-generated catch block
    41                                 e.printStackTrace();
    42                         } catch (CannotRealizeException e) {
    43                                 // TODO Auto-generated catch block
    44                                 e.printStackTrace();
    45                         }
     32                        mediaPlayer.playMedia(vfile.getCanonicalPath(),null);
    4633                } catch (IOException e) {
    4734                        // TODO Auto-generated catch block
    … …  
    4936                }
    5037                setVisible(true);               
    51                
     38                mediaPlayer.release();
     39                mediaPlayerFactory.release();
    5240        }
    5341
Note: See TracChangeset for help on using the changeset viewer.