Skip to content

Q
qgroundcontrol
Commit fc71fe94 authored by Lionel Heng's avatar Lionel Heng
Browse files
Options

Merge branch 'dev' of pixhawk.ethz.ch:qgroundcontrol into dev

parents 1b796433 3b24c21b
Hide whitespace changes
Inline Side-by-side
Showing with 384 additions and 0 deletions
images/mapproviders/googleearth.svg 0 → 100644
View file @ fc71fe94
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://web.resource.org/cc/"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="48"
height="48"
id="svg3209"
sodipodi:version="0.32"
inkscape:version="0.45"
sodipodi:docbase="/home/bertrand/thèmes/icons"
sodipodi:docname="googleearth.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape"
version="1.0"
inkscape:export-filename="/home/bertrand/thèmes/icons/googleearth.png"
inkscape:export-xdpi="960"
inkscape:export-ydpi="960"
sodipodi:modified="TRUE">
<defs
id="defs3211">
<linearGradient
id="linearGradient4471">
<stop
style="stop-color:#ffffff;stop-opacity:1;"
offset="0"
id="stop4473" />
<stop
id="stop4544"
offset="0.5"
style="stop-color:#f6f6f6;stop-opacity:1;" />
<stop
style="stop-color:#e1e1e1;stop-opacity:1;"
offset="1"
id="stop4475" />
</linearGradient>
<linearGradient
id="linearGradient4463">
<stop
id="stop4465"
offset="0"
style="stop-color:#000000;stop-opacity:0;" />
<stop
style="stop-color:#000000;stop-opacity:0;"
offset="0.91000003"
id="stop4467" />
<stop
id="stop4469"
offset="1"
style="stop-color:#000000;stop-opacity:1;" />
</linearGradient>
<linearGradient
id="linearGradient4326">
<stop
style="stop-color:#000000;stop-opacity:1;"
offset="0"
id="stop4328" />
<stop
id="stop4334"
offset="0.91000003"
style="stop-color:#000000;stop-opacity:1;" />
<stop
style="stop-color:#000000;stop-opacity:0;"
offset="1"
id="stop4330" />
</linearGradient>
<linearGradient
id="linearGradient4224">
<stop
style="stop-color:#95d2f8;stop-opacity:1;"
offset="0"
id="stop4226" />
<stop
id="stop4240"
offset="0.41"
style="stop-color:#357bb5;stop-opacity:1;" />
<stop
style="stop-color:#13324e;stop-opacity:1;"
offset="1"
id="stop4228" />
</linearGradient>
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient4224"
id="radialGradient4305"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.164251,0,0,1.1066309,-7.7152118,3.6172807)"
cx="46.972088"
cy="-33.92337"
fx="46.972088"
fy="-33.92337"
r="60.306107" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient4326"
id="radialGradient4337"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1,0,0,0.9068628,0,-5.2669822)"
cx="-54.952297"
cy="-56.550789"
fx="-54.952297"
fy="-56.550789"
r="20.607111" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient4224"
id="radialGradient4388"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.164251,0,0,1.1066309,-7.7152118,3.6172807)"
cx="46.972088"
cy="-33.92337"
fx="46.972088"
fy="-33.92337"
r="60.306107" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient4224"
id="radialGradient4390"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(2.1125941,0,0,-2.0080394,19.606479,22.674501)"
cx="46.972088"
cy="-33.92337"
fx="46.972088"
fy="-33.92337"
r="60.306107" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient4463"
id="radialGradient4461"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.1373136,0,0,1.1082148,-5.9284,3.6296571)"
cx="65.260735"
cy="-19.960367"
fx="65.260735"
fy="-19.960367"
r="60.306107" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient4471"
id="radialGradient4477"
cx="148.67188"
cy="23.953125"
fx="148.67188"
fy="23.953125"
r="49.921875"
gradientTransform="matrix(1,0,0,0.3452269,0,15.683862)"
gradientUnits="userSpaceOnUse" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient4471"
id="radialGradient4479"
cx="150.32812"
cy="-27.078125"
fx="150.32812"
fy="-27.078125"
r="56.234375"
gradientTransform="matrix(1,0,0,0.5665463,0,-11.737114)"
gradientUnits="userSpaceOnUse" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient4471"
id="radialGradient4481"
cx="167.20312"
cy="-47.105568"
fx="167.20312"
fy="-47.105568"
r="37.546875"
gradientTransform="matrix(1,0,0,0.5964393,0,-19.009954)"
gradientUnits="userSpaceOnUse" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient4224"
id="radialGradient4525"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.1583414,0,0,-1.1010138,78.50486,39.534321)"
cx="46.972088"
cy="-33.92337"
fx="46.972088"
fy="-33.92337"
r="60.306107" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient4224"
id="radialGradient4528"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.1583414,0,0,1.1010138,78.50486,8.465679)"
cx="46.972088"
cy="-33.92337"
fx="46.972088"
fy="-33.92337"
r="60.306107" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient4224"
id="radialGradient4531"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.1583414,0,0,-1.1010138,78.50486,39.534321)"
cx="46.972088"
cy="-33.92337"
fx="46.972088"
fy="-33.92337"
r="60.306107" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient4224"
id="radialGradient4534"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.1583414,0,0,-1.1010138,-59.769574,38.849794)"
cx="46.972088"
cy="-33.92337"
fx="46.972088"
fy="-33.92337"
r="60.306107" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient4471"
id="radialGradient4542"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.164251,0,0,1.1066309,-7.7152118,3.6172807)"
cx="46.972088"
cy="-33.92337"
fx="46.972088"
fy="-33.92337"
r="60.306107" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient4224"
id="radialGradient4551"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.1583414,0,0,-1.1010138,78.504862,39.534322)"
cx="46.972088"
cy="-33.92337"
fx="46.972088"
fy="-33.92337"
r="60.306107" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient4471"
id="radialGradient4555"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.1583414,0,0,-1.1010138,78.50486,39.534321)"
cx="46.972088"
cy="-33.92337"
fx="46.972088"
fy="-33.92337"
r="60.306107" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient4471"
id="radialGradient4558"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.1583414,0,0,1.1010138,78.50486,8.465679)"
cx="46.972088"
cy="-33.92337"
fx="46.972088"
fy="-33.92337"
r="60.306107" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient4326"
id="radialGradient4591"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1,0,0,0.9068628,0,-5.2669822)"
cx="-54.952297"
cy="-56.550789"
fx="-54.952297"
fy="-56.550789"
r="20.607111" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient4224"
id="radialGradient4593"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.164251,0,0,1.1066309,-7.7152118,3.6172807)"
cx="46.972088"
cy="-33.92337"
fx="46.972088"
fy="-33.92337"
r="60.306107" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient4463"
id="radialGradient4595"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.1373136,0,0,1.1082148,-5.9284,3.6296571)"
cx="65.260735"
cy="-19.960367"
fx="65.260735"
fy="-19.960367"
r="60.306107" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient4471"
id="radialGradient4597"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.1583414,0,0,1.1010138,78.50486,8.465679)"
cx="46.972088"
cy="-33.92337"
fx="46.972088"
fy="-33.92337"
r="60.306107" />
</defs>
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="2.1912945"
inkscape:cx="90.556983"
inkscape:cy="62.870696"
inkscape:current-layer="layer2"
showgrid="false"
inkscape:grid-bbox="true"
inkscape:document-units="px"
showguides="true"
inkscape:guide-bbox="true"
inkscape:window-width="1280"
inkscape:window-height="971"
inkscape:window-x="1280"
inkscape:window-y="53" />
<metadata
id="metadata3214">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:groupmode="layer"
id="layer2"
inkscape:label="Layer 1"
style="display:inline">
<g
id="g4585"
transform="matrix(0.375,0,0,0.375,-32.250002,28.499999)">
<path
transform="matrix(3.105724,0,0,3.4246901,320.66667,181.66893)"
d="M -34.345186 -56.550789 A 20.607111 18.687822 0 1 1 -75.559408,-56.550789 A 20.607111 18.687822 0 1 1 -34.345186 -56.550789 z"
sodipodi:ry="18.687822"
sodipodi:rx="20.607111"
sodipodi:cy="-56.550789"
sodipodi:cx="-54.952297"
id="path4307"
style="opacity:0.54828659;color:#000000;fill:url(#radialGradient4591);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.42105264;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
sodipodi:type="arc" />
<path
transform="matrix(0.9949241,0,0,0.9949241,86.18091,4.8667588)"
d="M 124.45079 -16.952808 A 60.306107 60.306107 0 1 1 3.8385773,-16.952808 A 60.306107 60.306107 0 1 1 124.45079 -16.952808 z"
sodipodi:ry="60.306107"
sodipodi:rx="60.306107"
sodipodi:cy="-16.952808"
sodipodi:cx="64.144684"
id="path3253"
style="opacity:1;color:#000000;fill:url(#radialGradient4593);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.42105264;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
sodipodi:type="arc" />
<path
transform="matrix(0.9949241,0,0,0.9949241,86.18091,4.8667588)"
d="M 124.45079 -16.952808 A 60.306107 60.306107 0 1 1 3.8385773,-16.952808 A 60.306107 60.306107 0 1 1 124.45079 -16.952808 z"
sodipodi:ry="60.306107"
sodipodi:rx="60.306107"
sodipodi:cy="-16.952808"
sodipodi:cx="64.144684"
id="path4449"
style="opacity:1;color:#000000;fill:url(#radialGradient4595);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.42105264;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
sodipodi:type="arc" />
<path
id="path4540"
d="M 150,-69.5 C 142.83037,-69.5 135.98765,-68.150808 129.65625,-65.75 C 147.08483,-65.444227 156.92068,-63.634228 165.84375,-58.75 C 166.58734,-58.342981 167.32795,-57.919334 168.0625,-57.46875 C 170.26616,-56.116999 172.45785,-54.557678 174.71875,-52.78125 C 184.46361,-45.124541 185.31647,-35.806865 193.59375,-28.6875 C 198.63301,-24.35318 197.95095,-24.718751 200.28125,-24.71875 C 202.83164,-24.71875 204.12996,-27.024001 204.75,-29.53125 C 197.32889,-52.702654 175.62459,-69.500002 150,-69.5 z M 126.9375,-58.9375 C 125.71891,-58.9375 124.50452,-58.806172 123.3125,-58.5625 C 122.91516,-58.481276 122.51852,-58.386673 122.125,-58.28125 C 111.10642,-55.329397 101.67793,-43.173927 98.59375,-37.59375 C 98.397564,-37.238793 98.175214,-36.821586 97.96875,-36.4375 C 96.33105,-32.960142 95.012359,-29.315516 94.09375,-25.5 C 94.975993,-26.628774 95.834585,-27.688244 96.6875,-28.6875 C 102.65791,-35.682293 108.12167,-39.468749 115.96875,-39.46875 C 129.97043,-39.468751 131.74931,-33.230672 157.40625,-16.5 C 170.03357,-8.2658364 189.19518,3.0892866 205,4.78125 C 205.64834,2.6554377 206.16192,0.47219546 206.5625,-1.75 C 200.64939,-2.1768904 195.32265,-4.4309275 189.5625,-8.25 C 188.73962,-8.7955818 187.90585,-9.3595061 187.0625,-9.96875 C 180.31573,-14.842701 172.81758,-21.73368 163.0625,-30.28125 C 155.6349,-36.789448 136.95382,-58.937499 126.9375,-58.9375 z M 106.875,6.71875 C 102.43548,6.71875 99.122712,8.9689884 98.75,14.03125 C 104.97372,26.249869 115.42634,35.94422 128.1875,41.1875 C 128.01834,40.950836 127.85777,40.701503 127.6875,40.4375 C 126.49562,38.589481 125.34375,36.090037 125.34375,33.21875 C 125.34375,29.878317 127.504,28.5625 129.9375,28.5625 C 133.17844,28.5625 143.8763,33.65625 161.78125,33.65625 C 170.73699,33.65625 181.91007,32.344387 190.09375,29.1875 C 193.32597,26.040414 196.17002,22.51695 198.59375,18.6875 C 193.36291,20.808098 183.69005,23.874999 171.09375,23.875 C 146.75952,23.875 124.56774,13.488267 118.15625,10.15625 C 116.45557,9.272415 112.09631,6.7187499 106.875,6.71875 z "
style="opacity:1;color:#000000;fill:url(#radialGradient4597);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.42105264;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
</g>
</g>
</svg>
mavground.qrc
View file @ fc71fe94
......@@ -83,6 +83,7 @@
<file>images/mapproviders/google.png</file>
<file>images/mapproviders/yahoo.png</file>
<file>images/earth.html</file>
<file>images/mapproviders/googleearth.svg</file>
</qresource>
<qresource prefix="/general">
<file alias="vera.ttf">images/Vera.ttf</file>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment