Skip to content

Q
qgroundcontrol
Commit 6364e628 authored by Patrick José Pereira's avatar Patrick José Pereira
Browse files
Options

new wind rose version 

Signed-off-by: 's avatarPatrick José Pereira <patrickelectric@gmail.com>
parent 5040a42d
Hide whitespace changes
Inline Side-by-side
Showing with 135 additions and 145 deletions
qgcresources.qrc
View file @ 6364e628
...@@ -194,7 +194,7 @@ ...@@ -194,7 +194,7 @@
<file alias="TrashDelete.svg">resources/TrashDelete.svg</file> <file alias="TrashDelete.svg">resources/TrashDelete.svg</file>
<file alias="waves.svg">resources/waves.svg</file> <file alias="waves.svg">resources/waves.svg</file>
<file alias="wind-rose.svg">resources/wind-rose.svg</file> <file alias="wind-rose.svg">resources/wind-rose.svg</file>
<file alias="wind-rose-arrows.svg">resources/wind-rose-arrows.svg</file> <file alias="wind-rose-arrow.svg">resources/wind-rose-arrow.svg</file>
<file alias="XDelete.svg">resources/XDelete.svg</file> <file alias="XDelete.svg">resources/XDelete.svg</file>
<file alias="XDeleteBlack.svg">resources/XDeleteBlack.svg</file> <file alias="XDeleteBlack.svg">resources/XDeleteBlack.svg</file>
<file>resources/icons/qgroundcontrol.ico</file> <file>resources/icons/qgroundcontrol.ico</file>
......
resources/wind-rose-arrow.svg 0 → 100644
View file @ 6364e628
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Generator: IcoMoon.io -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="352"
height="512"
viewBox="0 0 352 512"
version="1.1"
id="svg3740"
sodipodi:docname="wind-rose-arrow.svg"
style="fill:#000000"
inkscape:version="0.92.1 r">
<metadata
id="metadata3746">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<defs
id="defs3744" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1366"
inkscape:window-height="722"
id="namedview3742"
showgrid="false"
inkscape:pagecheckerboard="true"
inkscape:zoom="0.65186406"
inkscape:cx="-149.4937"
inkscape:cy="264.4641"
inkscape:window-x="1366"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:current-layer="svg3740" />
<g
id="g3758">
<path
inkscape:connector-curvature="0"
id="path3738"
d="M 0,416 96,512 352,256 96,0 0,96 160,256 Z" />
</g>
</svg>
resources/wind-rose-arrows.svg deleted 100644 → 0
View file @ 5040a42d
<?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://creativecommons.org/ns#"
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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
version="1.1"
id="svg64"
width="250"
height="250"
viewBox="0 0 250 250"
sodipodi:docname="wind-rose-arrows.svg"
inkscape:export-filename="/mnt/cd7c8fe2-0fea-413c-be99-fcf387c77815/git/qgroundcontrol/resources/wind-rose-arrows.svg.png"
inkscape:export-xdpi="76.92308"
inkscape:export-ydpi="76.92308"
inkscape:version="0.92.1 r">
<metadata
id="metadata70">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<defs
id="defs68" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1366"
inkscape:window-height="722"
id="namedview66"
showgrid="false"
inkscape:zoom="0.85016287"
inkscape:cx="132.57725"
inkscape:cy="254.93415"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:current-layer="svg64" />
<g
transform="matrix(0.90486382,0,0,0.89998007,-15.173873,-10.011308)"
id="g74">
<path
style="fill:#e6e6e6;fill-opacity:1"
d="m 151.62775,287.47231 c -0.34526,-0.89974 -0.63655,-15.88658 -0.6473,-33.3041 L 150.9609,222.5 l -4.96637,5.25 c -2.7315,2.8875 -5.39056,5.25 -5.90902,5.25 C 139.19544,233 136,230.26487 136,229.50301 c 0,-0.87685 15.27249,-33.12641 16.23958,-34.29169 0.59698,-0.71931 1.99069,-1.17362 3.09715,-1.00958 1.52741,0.22645 3.884,4.27067 9.78844,16.79826 4.27719,9.075 7.79878,17.48218 7.82577,18.68261 0.0308,1.36997 -0.73794,2.4324 -2.0647,2.8535 -1.66575,0.52868 -3.25243,-0.45365 -7.48608,-4.63471 l -5.37231,-5.30558 -0.26393,32.95209 L 157.5,288.5 l -2.62225,0.3041 c -1.70869,0.19815 -2.84096,-0.26583 -3.25,-1.33179 z M 56.229187,248.82919 C 55.553134,248.15313 55,246.92489 55,246.09976 55,245.27463 65.125,234.64983 77.5,222.48911 89.875,210.32838 100,200.0882 100,199.73316 c 0,-0.35505 -3.2625,-0.77776 -7.25,-0.93935 -6.981551,-0.28293 -7.261209,-0.39037 -7.552712,-2.90173 -0.293103,-2.52513 0.274211,-2.81629 17.871602,-9.17195 9.99588,-3.61022 18.7598,-6.33936 19.4754,-6.06476 2.43269,0.93351 2.45897,3.49487 0.0993,9.67522 -1.29553,3.39318 -3.58575,9.54441 -5.08937,13.66941 -1.50361,4.125 -3.31321,9.06209 -4.02133,10.97132 C 110.4663,223.23941 106,221.10864 106,211.37756 106,207.8699 105.75492,205 105.45539,205 c -0.29954,0 -10.656414,10.0125 -23.015277,22.25 -12.358864,12.2375 -23.035654,22.37563 -23.7262,22.52919 -0.690547,0.15355 -1.808673,-0.27395 -2.484726,-0.95 z M 228.80059,227.49347 C 216.31592,215.12206 205.85342,205 205.55059,205 205.24777,205 205,207.8699 205,211.37756 c 0,9.73108 -4.4663,11.86185 -7.53287,3.59376 -0.70812,-1.90923 -2.51772,-6.84632 -4.02133,-10.97132 -1.50362,-4.125 -3.79384,-10.27623 -5.08937,-13.66941 -2.35969,-6.18035 -2.33341,-8.74171 0.0993,-9.67522 0.7156,-0.2746 9.47952,2.45454 19.4754,6.06476 17.59739,6.35566 18.16471,6.64682 17.8716,9.17195 -0.2915,2.51136 -0.57116,2.6188 -7.55271,2.90173 -3.9875,0.16159 -7.25,0.59617 -7.25,0.96573 0,0.36955 10.125,10.60766 22.5,22.75135 12.375,12.14368 22.5,22.75661 22.5,23.58427 0,1.73976 -1.91874,3.90783 -3.45,3.89831 -0.5775,-0.004 -11.26473,-10.12858 -23.74941,-22.5 z M 74.666667,166.33333 C 72.892873,164.55954 74.39534,161.25371 78.75,157.34892 l 4.75,-4.2593 -31.315741,-0.0448 c -19.586256,-0.028 -32.040229,-0.43254 -33.25,-1.07999 C 17.870416,151.39547 17,150.0613 17,149 c 0,-1.0613 0.870416,-2.39547 1.934259,-2.96482 1.213091,-0.64922 13.609994,-1.04171 33.25,-1.05269 L 83.5,144.96498 78.25,140.08027 c -2.8875,-2.6866 -5.25,-5.28872 -5.25,-5.78249 0,-1.41857 2.25085,-3.29778 3.95,-3.2978 0.8525,-2e-5 9.085713,3.48748 18.296029,7.75 14.368141,6.64954 16.746591,8.06831 16.750001,9.99155 0.005,2.71914 0.12955,2.64263 -18.418428,11.29632 -14.369249,6.70407 -17.470074,7.73634 -18.910935,6.29548 z m 139.587423,-7.16519 c -21.96122,-10.36579 -21.9697,-10.01929 0.49988,-20.41816 9.21032,-4.26252 17.44353,-7.75002 18.29603,-7.75 1.69915,2e-5 3.95,1.87923 3.95,3.2978 0,0.49377 -2.3625,3.09589 -5.25,5.78249 l -5.25,4.88471 31.31574,0.0175 c 19.64001,0.011 32.03691,0.40347 33.25,1.05269 C 292.12958,146.60453 293,147.9387 293,149 c 0,1.0613 -0.87042,2.39547 -1.93426,2.96482 -1.20977,0.64745 -13.66374,1.05196 -33.25,1.07999 l -31.31574,0.0448 4.83538,4.33443 c 3.65083,3.27259 4.75321,4.9152 4.5,6.70518 -0.56923,4.02388 -4.42187,3.13824 -21.58129,-4.96109 z M 101.69682,113.25848 C 84.480295,106.9409 83.903622,106.63952 84.196816,104.11281 84.488927,101.59543 84.764794,101.48927 91.75,101.20619 95.7375,101.0446 99,100.62189 99,100.26684 99,99.911799 88.875,89.671621 76.5,77.510894 64.125,65.350167 54,54.690473 54,53.822685 54,51.972826 56.487342,49.658861 57.941997,50.155459 58.49708,50.344957 69.067134,60.5125 81.431006,72.75 93.794878,84.9875 104.15585,95 104.45539,95 104.75492,95 105,92.1301 105,88.622445 c 0,-9.731081 4.4663,-11.861852 7.53287,-3.593761 0.70812,1.909224 2.51772,6.846316 4.02133,10.971316 1.50362,4.125 3.79404,10.27675 5.08983,13.67056 1.29578,3.3938 2.35597,6.39916 2.35597,6.67857 0,0.80893 -3.07367,3.66151 -3.82143,3.54654 -0.37321,-0.0574 -8.69,-3.04411 -18.48175,-6.63719 z m 85.93212,5.2276 c -2.02961,-2.0296 -2.07526,-1.476 0.72703,-8.81552 1.29579,-3.39381 3.58621,-9.54556 5.08983,-13.67056 1.50361,-4.125 3.31321,-9.062092 4.02133,-10.971316 C 200.5337,76.760593 205,78.891364 205,88.622445 205,92.1301 205.24508,95 205.54461,95 c 0.29954,0 10.66051,-10.0125 23.02438,-22.25 12.36388,-12.2375 22.93393,-22.405043 23.48901,-22.594541 1.45628,-0.497151 3.942,1.818212 3.942,3.671828 0,0.870318 -10.125,11.51814 -22.5,23.661827 C 221.125,89.6328 211,99.870907 211,100.24046 c 0,0.36956 3.2625,0.80414 7.25,0.96573 6.98943,0.28325 7.26092,0.38792 7.55373,2.9123 0.29379,2.53274 -0.24653,2.81668 -16.5,8.67095 -9.24205,3.32885 -17.53321,6.33891 -18.42479,6.68902 -0.91472,0.35919 -2.33084,-0.0732 -3.25,-0.99238 z m -35.38936,-13.6974 C 151.27249,103.6234 136,71.373841 136,70.49699 136,69.735134 139.19544,67 140.08551,67 c 0.51846,0 3.17752,2.3625 5.90902,5.25 l 4.96637,5.25 0.0349,-32 c 0.0192,-17.6 0.41637,-32.601871 0.88264,-33.337492 0.46628,-0.735621 1.92189,-1.185621 3.23469,-1 L 157.5,11.5 l 0.26392,32.95209 0.26393,32.952089 5.37231,-5.305583 c 4.23365,-4.18106 5.82033,-5.163389 7.48608,-4.634702 1.32676,0.421096 2.09549,1.483521 2.0647,2.853494 -0.027,1.200436 -3.54858,9.607612 -7.82577,18.682612 -5.90444,12.52759 -8.26103,16.57181 -9.78844,16.79826 -1.10646,0.16404 -2.50017,-0.29027 -3.09715,-1.00958 z"
id="path80"
inkscape:connector-curvature="0" />
<path
style="fill:#8c8c8c;fill-opacity:1"
d="M 151.62775,287.47231 C 151.28249,286.57257 151,271.63295 151,254.27316 v -31.56327 l -5.43381,5.13907 c -5.32758,5.0386 -7.74164,5.74215 -8.94477,2.60686 -0.55721,-1.45206 13.58682,-32.95266 15.85384,-35.3086 2.8952,-3.00875 5.03133,-0.26839 12.80517,16.42725 4.24577,9.11849 7.71957,17.16442 7.71957,17.87985 0,0.71544 -0.64623,1.83712 -1.43608,2.49263 -1.85202,1.53704 -3.87266,0.44088 -9.06392,-4.91704 l -4,-4.12842 -0.5,32.79925 -0.5,32.79926 -2.62225,0.3041 c -1.70869,0.19815 -2.84096,-0.26583 -3.25,-1.33179 z M 56.571429,248.42857 C 55.707143,247.56429 55,246.5553 55,246.18639 55,245.81747 65.458909,235.04961 78.24202,222.25782 L 101.48404,199 H 94.823808 C 86.958308,199 85,198.40505 85,196.01546 c 0,-1.9976 1.551564,-3.46945 4.5,-4.26884 1.1,-0.29823 7.175,-2.44494 13.5,-4.77046 16.5944,-6.10128 18.55418,-6.59105 20.36384,-5.08916 1.4059,1.16679 1.3866,2.1232 -0.12341,6.113 -0.31223,0.825 -0.61984,1.725 -0.68357,2 -0.0637,0.275 -1.39469,3.875 -2.95769,8 -2.88558,7.61546 -5.94273,16.05481 -6.98154,19.27268 -0.77937,2.4142 -3.31224,3.22566 -5.19395,1.66398 -1.10011,-0.91301 -1.50856,-2.90734 -1.40536,-6.86187 0.08,-3.06614 0.10862,-6.2371 0.0636,-7.04658 -0.0451,-0.80949 -10.566353,8.97801 -23.380685,21.75 C 69.886883,239.55019 59.119026,250 58.772643,250 c -0.346382,0 -1.336929,-0.70714 -2.201214,-1.57143 z M 228.33198,226.8113 c -12.83259,-12.79019 -23.36883,-22.59258 -23.41388,-21.78309 -0.045,0.80948 -0.0164,3.98044 0.0636,7.04658 0.1032,3.95453 -0.30525,5.94886 -1.40536,6.86187 -1.88171,1.56168 -4.41458,0.75022 -5.19395,-1.66398 -1.03881,-3.21787 -4.09596,-11.65722 -6.98154,-19.27268 -1.563,-4.125 -2.89397,-7.725 -2.95769,-8 -0.0637,-0.275 -0.37134,-1.175 -0.68357,-2 -1.51001,-3.9898 -1.52931,-4.94621 -0.12341,-6.113 1.80966,-1.50189 3.76944,-1.01212 20.36384,5.08916 6.325,2.32552 12.4,4.47223 13.5,4.77046 2.94844,0.79939 4.5,2.27124 4.5,4.26884 0,2.38959 -1.95831,2.98454 -9.82381,2.98454 h -6.66023 l 23.28649,23.30232 c 23.36577,23.38164 24.91642,25.44037 20.45222,27.15345 -1.13636,0.43606 -8.25492,-6.03178 -24.92269,-22.64447 z M 74.666667,166.33333 c -1.716341,-1.71634 -0.276701,-4.92445 3.833333,-8.54225 2.475,-2.17858 4.5,-4.36666 4.5,-4.8624 0,-0.51142 -14.167968,-1.01542 -32.75,-1.16502 L 17.5,151.5 v -2.5 -2.5 l 32.75,-0.26366 c 18.582032,-0.1496 32.75,-0.6536 32.75,-1.16502 0,-0.49574 -2.059613,-2.71429 -4.576918,-4.93011 -4.963002,-4.36861 -5.833373,-8.39582 -1.923082,-8.89812 2.479668,-0.31852 33.62755,14.12481 34.99489,16.2272 0.65984,1.01456 0.65984,2.04486 0,3.05942 -1.10432,1.69798 -32.071664,16.43668 -34.578223,16.45728 -0.870834,0.007 -1.883334,-0.28699 -2.25,-0.65366 z M 215.5,159.53662 c -8.8,-4.11246 -16.4477,-8.16556 -16.99489,-9.00691 -0.65984,-1.01456 -0.65984,-2.04486 0,-3.05942 1.36734,-2.10239 32.51522,-16.54572 34.99489,-16.2272 3.91029,0.5023 3.03992,4.52951 -1.92308,8.89812 -2.51731,2.21582 -4.57692,4.43437 -4.57692,4.93011 0,0.51142 14.16797,1.01542 32.75,1.16502 L 292.5,146.5 v 2.5 2.5 l -32.75,0.26366 c -18.58203,0.1496 -32.75,0.6536 -32.75,1.16502 0,0.49574 2.05961,2.71429 4.57692,4.93011 4.963,4.36861 5.83337,8.39582 1.92308,8.89812 -1.1,0.1413 -9.2,-3.10783 -18,-7.22029 z m -106,-43.69308 c -4.4,-1.66726 -11.15,-4.14168 -15,-5.49872 -9.000137,-3.17233 -9.928549,-3.69557 -10.348393,-5.83218 -0.524832,-2.67089 1.6373,-3.48046 9.340413,-3.49733 L 100.48404,101 77.197548,77.697682 C 53.831784,54.316039 52.281129,52.257306 56.745335,50.54423 c 1.136353,-0.43606 8.25491,6.031782 24.922681,22.644472 12.832591,12.790184 23.368834,22.592575 23.413884,21.783089 0.045,-0.809485 0.0164,-3.980444 -0.0636,-7.046576 -0.1032,-3.954531 0.30525,-5.948865 1.40536,-6.861876 1.88171,-1.561677 4.41458,-0.750221 5.19395,1.66398 1.03881,3.217875 4.09596,11.657218 6.98154,19.272681 1.563,4.125 2.89397,7.725 2.95769,8 0.0637,0.275 0.41451,1.2875 0.77951,2.25 1.41439,3.72977 1.47013,4.5435 0.38549,5.62814 -1.70616,1.70616 -4.47367,1.28029 -13.22186,-2.0346 z m 77.77814,2.0346 c -1.13025,-1.13025 -1.0983,-1.7238 0.28956,-5.37814 0.41776,-1.1 0.81171,-2.225 0.87544,-2.5 0.0637,-0.275 1.39469,-3.875 2.95769,-8 2.88558,-7.615463 5.94273,-16.054806 6.98154,-19.272681 0.77937,-2.414201 3.31224,-3.225657 5.19395,-1.66398 1.10011,0.913011 1.50856,2.907345 1.40536,6.861876 -0.08,3.066132 -0.10862,6.237091 -0.0636,7.046576 0.0451,0.809486 10.58129,-8.992905 23.41388,-21.783089 16.66777,-16.61269 23.78633,-23.080532 24.92269,-22.644472 4.4642,1.713076 2.91355,3.771809 -20.45222,27.153452 L 209.51596,101 l 6.99202,0.0153 c 7.70311,0.0169 9.86524,0.82644 9.34041,3.49733 -0.41991,2.13696 -1.34968,2.66082 -10.34839,5.83054 -3.85,1.35613 -10.75095,3.8587 -15.33544,5.56126 -9.0548,3.36271 -11.17298,3.68714 -12.88642,1.9737 z M 152.22654,104.75 c -2.32039,-2.84821 -16.096,-33.926594 -15.60512,-35.205816 1.20313,-3.135299 3.61719,-2.431746 8.94477,2.606859 L 151,77.290114 151.0153,45.395057 c 0.008,-17.542281 0.39682,-32.496928 0.86309,-33.232549 0.46628,-0.735621 1.92189,-1.185621 3.23469,-1 L 157.5,11.5 l 0.5,32.799256 0.5,32.799255 4,-4.128418 c 5.19126,-5.357923 7.2119,-6.454088 9.06392,-4.917042 0.78985,0.655511 1.43608,1.786188 1.43608,2.512614 0,1.952264 -15.03781,33.810665 -16.36448,34.669025 -1.68863,1.09255 -3.26524,0.91923 -4.40898,-0.48469 z"
id="path78"
inkscape:connector-curvature="0" />
<path
style="fill:#333333;fill-opacity:1"
d="M 152.23832,287.83832 C 151.30547,286.90547 151,278.70316 151,254.58759 v -32.01241 l -4.78435,4.71241 C 140.80487,232.61701 137,233.56412 137,229.58157 c 0,-2.49788 13.32194,-32.03186 15.53236,-34.43435 2.75556,-2.995 4.95995,-0.14428 12.71764,16.44647 4.2625,9.11586 7.75,17.1564 7.75,17.86786 0,0.71146 -0.67275,1.85189 -1.49499,2.5343 -1.94077,1.61069 -5.11212,-0.37936 -9.69461,-6.08345 L 158.5,221.79175 158,255.14588 c -0.48667,32.46496 -0.55363,33.36181 -2.51168,33.64244 -1.10642,0.15858 -2.56892,-0.26892 -3.25,-0.95 z M 56,246.74167 C 56,245.13031 62.445873,238.04223 78.5,222 90.875,209.63417 101,199.27321 101,198.97565 c 0,-0.29757 -3.057111,-0.36829 -6.793581,-0.15716 -7.09044,0.40065 -9.886468,-0.88274 -8.693898,-3.99052 0.689512,-1.79684 34.895729,-14.26903 36.960839,-13.47657 0.83965,0.32221 1.52664,1.18963 1.52664,1.9276 0,1.18114 -6.03032,18.95129 -8.72846,25.721 -0.54802,1.375 -1.59305,4.17188 -2.3223,6.21528 -1.40014,3.9233 -3.60893,5.52503 -5.29456,3.8394 -0.55598,-0.55598 -0.926,-4.17074 -0.82226,-8.03278 C 106.93617,207.15985 106.67506,204 106.25219,204 105.82932,204 95.365832,214.125 83,226.5 66.957766,242.55413 59.869694,249 58.258334,249 56.580555,249 56,248.41944 56,246.74167 Z M 228,226.5 C 215.63417,214.125 205.17068,204 204.74781,204 c -0.42287,0 -0.68398,3.15985 -0.58023,7.0219 0.10374,3.86204 -0.26628,7.4768 -0.82226,8.03278 -1.68563,1.68563 -3.89442,0.0839 -5.29456,-3.8394 C 197.32151,213.17188 196.27648,210.375 195.72846,209 193.03032,202.23029 187,184.46014 187,183.279 c 0,-0.73797 0.67997,-1.6027 1.51105,-1.92161 2.04012,-0.78287 36.30257,11.71452 36.9839,13.49005 1.18516,3.08847 -1.62491,4.37091 -8.70137,3.97105 C 213.05711,198.60736 210,198.67808 210,198.97565 210,199.27321 220.125,209.63417 232.5,222 248.55413,238.04223 255,245.13031 255,246.74167 255,248.41944 254.41944,249 252.74167,249 251.13031,249 244.04223,242.55413 228,226.5 Z M 74.666667,166.33333 c -1.617034,-1.61703 -0.318596,-4.25128 4.372532,-8.87092 L 84.078398,152.5 50.789199,152 17.5,151.5 v -2.5 -2.5 l 33.452278,-0.26373 33.452278,-0.26373 -5.298858,-5.36551 c -5.498038,-5.5672 -6.418069,-8.882 -2.595482,-9.35134 1.094381,-0.13436 9.414784,3.2602 18.489784,7.54347 14.62325,6.90198 16.5,8.06225 16.5,10.20084 0,2.13939 -1.87128,3.29403 -16.5,10.18101 -15.986972,7.52643 -18.925565,8.56009 -20.333333,7.15232 z M 215,159.20084 C 200.37675,152.29886 198.5,151.13859 198.5,149 c 0,-2.13859 1.87675,-3.29886 16.5,-10.20084 9.075,-4.28327 17.3954,-7.67783 18.48978,-7.54347 3.82259,0.46934 2.90256,3.78414 -2.59548,9.35134 l -5.29886,5.36551 33.45228,0.26373 L 292.5,146.5 v 2.5 2.5 l -33.45228,0.26373 -33.45228,0.26373 5.29886,5.36551 c 5.49804,5.5672 6.41807,8.882 2.59548,9.35134 C 232.3954,166.87867 224.075,163.48411 215,159.20084 Z M 101.77814,112.72979 c -9.197019,-3.3774 -16.967283,-6.7803 -17.26725,-7.56201 -1.190952,-3.10357 1.608132,-4.38675 8.695529,-3.98627 C 96.942889,101.39264 100,101.32192 100,101.02435 100,100.72679 89.875,90.365832 77.5,78 61.445873,61.957766 55,54.869694 55,53.258334 55,51.580555 55.580555,51 57.258334,51 58.869694,51 65.957766,57.445873 82,73.5 94.365832,85.875 104.82932,96 105.25219,96 c 0.42287,0 0.68398,-3.159854 0.58023,-7.021899 -0.10374,-3.862044 0.26628,-7.476796 0.82226,-8.032782 1.68867,-1.688672 3.89684,-0.08057 5.27208,3.839399 0.71689,2.043405 1.87925,5.065282 2.58303,6.715282 3.55053,8.324186 8.65922,24.61719 8.14164,25.96597 -0.89496,2.33225 -2.80594,1.89864 -20.87329,-4.73618 z m 85.57043,4.73618 c -0.51758,-1.34878 4.59111,-17.641784 8.14164,-25.96597 0.70378,-1.65 1.86614,-4.671877 2.58303,-6.715282 1.37524,-3.91997 3.58341,-5.528071 5.27208,-3.839399 0.55598,0.555986 0.926,4.170738 0.82226,8.032782 C 204.06383,92.840146 204.32494,96 204.74781,96 205.17068,96 215.63417,85.875 228,73.5 244.04223,57.445873 251.13031,51 252.74167,51 254.41944,51 255,51.580555 255,53.258334 255,54.869694 248.55413,61.957766 232.5,78 220.125,90.365832 210,100.72679 210,101.02435 c 0,0.29757 3.05711,0.36829 6.79358,0.15716 7.07646,-0.39986 9.88653,0.88258 8.70137,3.97105 -0.50105,1.30572 -33.42682,13.88466 -36.27633,13.85898 -0.70477,-0.006 -1.54629,-0.70185 -1.87005,-1.54557 z M 152.27994,104.75 C 149.9763,101.76584 137,72.61018 137,70.418433 c 0,-4.00556 3.93347,-3.081012 9.04179,2.125243 L 150.5,77.087351 151,44.901914 c 0.43782,-28.182634 0.70074,-32.311967 2.11408,-33.202823 0.88774,-0.559562 2.35024,-0.734892 3.25,-0.389623 1.46903,0.563722 1.63658,4.022904 1.64238,33.909147 l 0.006,33.281385 4.08152,-4.761901 c 5.01819,-5.854702 7.48246,-7.334138 9.46949,-5.685048 0.78985,0.655511 1.43608,1.786447 1.43608,2.513191 0,1.849414 -15.13203,33.770548 -16.43438,34.668448 -1.59341,1.09856 -3.20409,0.9164 -4.28568,-0.48469 z"
id="path76"
inkscape:connector-curvature="0" />
</g>
</svg>
src/PlanView/SurveyItemEditor.qml
View file @ 6364e628
...@@ -422,7 +422,7 @@ Rectangle { ...@@ -422,7 +422,7 @@ Rectangle {
onClicked: { onClicked: {
var cords = windRoseButton.mapToItem(_root, 0, 0) var cords = windRoseButton.mapToItem(_root, 0, 0)
windRose.popup(cords.x + windRoseButton.width/2, cords.y + windRoseButton.height/2); windRosePie.popup(cords.x + windRoseButton.width / 2, cords.y + windRoseButton.height / 2);
} }
} }
} }
...@@ -547,83 +547,86 @@ Rectangle { ...@@ -547,83 +547,86 @@ Rectangle {
} }
} }
Image {
PieMenu { id: windRoseArrow
id: windRose source: "/res/wind-rose-arrow.svg"
triggerMode: TriggerMode.TriggerOnPress visible: windRosePie.visible
height: 2.75*windRoseButton.height width: windRosePie.width / 5
width: 2.75*windRoseButton.width height: width * 1.454
smooth: true
onVisibleChanged: { transform: Rotation {
windRoseSvg.visible = visible origin.x: windRoseArrow.width / 2
origin.y: windRoseArrow.height / 2
axis { x: 0; y: 0; z: 1 } angle: windRosePie.angle
} }
x: windRosePie.x + Math.sin(- windRosePie.angle*Math.PI/180 - Math.PI/2)*(windRosePie.width/2 - windRoseArrow.width/2) + windRosePie.width / 2 - windRoseArrow.width / 2
y: windRosePie.y + Math.cos(- windRosePie.angle*Math.PI/180 - Math.PI/2)*(windRosePie.height/2 - windRoseArrow.width/2) + windRosePie.height / 2 - windRoseArrow.height / 2
z: windRosePie.z
}
style: PieMenuStyle { Item {
cancelRadius: windRoseButton.height*0.5 id: windRosePie
shadowRadius: 0 height: 2.6*windRoseButton.height
startAngle: -22.5 width: 2.6*windRoseButton.width
endAngle: 337.5 visible: false
property string colorCircle: Qt.rgba(0, 0, 0, 0.45)
property string colorBackground: Qt.rgba(0, 0, 0, 0.75)
property real lineWidth: windRoseButton.width / 3
property real angle: 0
Canvas {
id: windRoseCanvas
anchors.fill: parent
onPaint: {
var ctx = getContext("2d")
var x = width / 2
var y = height / 2
var angleWidth = 0.03 * Math.PI
var start = windRosePie.angle*Math.PI/180 - angleWidth
var end = windRosePie.angle*Math.PI/180 + angleWidth
ctx.reset()
ctx.beginPath();
ctx.arc(x, y, (width / 3) - windRosePie.lineWidth / 2, 0, 2*Math.PI, false)
ctx.lineWidth = windRosePie.lineWidth
ctx.strokeStyle = windRosePie.colorBackground
ctx.stroke()
ctx.beginPath();
ctx.arc(x, y, (width / 3) - windRosePie.lineWidth / 2, start, end, false)
ctx.lineWidth = windRosePie.lineWidth
ctx.strokeStyle = windRosePie.colorCircle
ctx.stroke()
}
} }
function popup(x, y) {
if (x !== undefined)
windRosePie.x = x - windRosePie.width / 2;
if (y !== undefined)
windRosePie.y = y - windRosePie.height / 2;
MenuItem { windRosePie.visible = true;
onTriggered: {
gridAngleText.text = "-90";
gridAngleText.editingFinished();
}
} }
MenuItem {
onTriggered: { MouseArea {
gridAngleText.text = "-45"; id: mouseArea
gridAngleText.editingFinished(); anchors.fill: parent
} acceptedButtons: Qt.LeftButton | Qt.RightButton
}
MenuItem { onClicked: {
onTriggered: { windRosePie.visible = false;
gridAngleText.text = "0";
gridAngleText.editingFinished();
}
}
MenuItem {
onTriggered: {
gridAngleText.text = "45";
gridAngleText.editingFinished();
}
}
MenuItem {
onTriggered: {
gridAngleText.text = "90";
gridAngleText.editingFinished();
}
}
MenuItem {
onTriggered: {
gridAngleText.text = "135";
gridAngleText.editingFinished();
}
}
MenuItem {
onTriggered: {
gridAngleText.text = "180";
gridAngleText.editingFinished();
} }
} onPositionChanged: {
MenuItem { var point = Qt.point(mouseX - parent.width / 2, mouseY - parent.height / 2)
onTriggered: { var angle = Math.round(Math.atan2(point.y, point.x) * 180 / Math.PI)
gridAngleText.text = "-135"; windRoseCanvas.requestPaint()
windRosePie.angle = angle
gridAngleText.text = angle
gridAngleText.editingFinished(); gridAngleText.editingFinished();
} }
} }
} }
Image {
id: windRoseSvg
source: "/res/wind-rose-arrows.svg"
visible: false
width: windRose.width
height: windRose.height
x: windRose.x;
y: windRose.y;
z: windRose.z;
}
} }
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