mirror of
https://github.com/iNavFlight/inav-configurator.git
synced 2025-07-15 12:25:13 +03:00
Dynamic mixer outputs image
First cut of code. It's pretty much there. I just need to decide how to handle changing the mixer type, then deciding to stick with the current mixer. Other than that, it's working as expected.
This commit is contained in:
Darren Lines
parent
66d682daba
commit
1c571ca681
10 changed files with 244 additions and 128 deletions
57
js/model.js
57
js/model.js
|
|
@ -336,6 +336,11 @@ const mixerList = [
|
||||||
name: 'Flying Wing',
|
name: 'Flying Wing',
|
||||||
model: 'flying_wing',
|
model: 'flying_wing',
|
||||||
image: 'flying_wing',
|
image: 'flying_wing',
|
||||||
|
imageOutputsNumbers: [
|
||||||
|
{input: INPUT_STABILIZED_ROLL, top: 123, left: 18, width: 18, height: 18, colour: "#ff0000"},
|
||||||
|
{input: INPUT_STABILIZED_ROLL, top: 123, left: 134, width: 18, height: 18, colour: "#00e000"},
|
||||||
|
{input: INPUT_STABILIZED_THROTTLE, top:93, left:71, colour: "#000000"},
|
||||||
|
],
|
||||||
enabled: true,
|
enabled: true,
|
||||||
legacy: true,
|
legacy: true,
|
||||||
platform: PLATFORM_AIRPLANE,
|
platform: PLATFORM_AIRPLANE,
|
||||||
|
|
@ -354,6 +359,11 @@ const mixerList = [
|
||||||
name: 'Flying Wing with differential thrust',
|
name: 'Flying Wing with differential thrust',
|
||||||
model: 'flying_wing',
|
model: 'flying_wing',
|
||||||
image: 'flying_wing',
|
image: 'flying_wing',
|
||||||
|
imageOutputsNumbers: [
|
||||||
|
{input: INPUT_STABILIZED_ROLL, top: 123, left: 18, colour: "#ff0000"},
|
||||||
|
{input: INPUT_STABILIZED_ROLL, top: 123, left: 134, colour: "#00e000"},
|
||||||
|
{input: INPUT_STABILIZED_THROTTLE, top:93, left:71, colour: "#000000"},
|
||||||
|
],
|
||||||
enabled: true,
|
enabled: true,
|
||||||
legacy: false,
|
legacy: false,
|
||||||
platform: PLATFORM_AIRPLANE,
|
platform: PLATFORM_AIRPLANE,
|
||||||
|
|
@ -373,6 +383,13 @@ const mixerList = [
|
||||||
name: 'Airplane',
|
name: 'Airplane',
|
||||||
model: 'twin_plane',
|
model: 'twin_plane',
|
||||||
image: 'airplane',
|
image: 'airplane',
|
||||||
|
imageOutputsNumbers: [
|
||||||
|
{input: INPUT_STABILIZED_PITCH, top: 151, left: 126, colour: "#ff7f00"},
|
||||||
|
{input: INPUT_STABILIZED_ROLL, top: 96, left: 18, colour: "#ff0000"},
|
||||||
|
{input: INPUT_STABILIZED_ROLL, top: 96, left: 134, colour: "#00e000"},
|
||||||
|
{input: INPUT_STABILIZED_YAW, top: 126, left: 52, colour: "#00a6ff"},
|
||||||
|
{input: INPUT_STABILIZED_THROTTLE, top:5, left:71, colour: "#000000"},
|
||||||
|
],
|
||||||
enabled: true,
|
enabled: true,
|
||||||
legacy: true,
|
legacy: true,
|
||||||
platform: PLATFORM_AIRPLANE,
|
platform: PLATFORM_AIRPLANE,
|
||||||
|
|
@ -394,6 +411,13 @@ const mixerList = [
|
||||||
name: 'Airplane with differential thrust',
|
name: 'Airplane with differential thrust',
|
||||||
model: 'twin_plane',
|
model: 'twin_plane',
|
||||||
image: 'airplane',
|
image: 'airplane',
|
||||||
|
imageOutputsNumbers: [
|
||||||
|
{input: INPUT_STABILIZED_PITCH, top: 151, left: 126, colour: "#ff7f00"},
|
||||||
|
{input: INPUT_STABILIZED_ROLL, top: 96, left: 18, colour: "#ff0000"},
|
||||||
|
{input: INPUT_STABILIZED_ROLL, top: 96, left: 134, colour: "#00e000"},
|
||||||
|
{input: INPUT_STABILIZED_YAW, top: 126, left: 52, colour: "#00a6ff"},
|
||||||
|
{input: INPUT_STABILIZED_THROTTLE, top:5, left:71, colour: "#000000"},
|
||||||
|
],
|
||||||
enabled: true,
|
enabled: true,
|
||||||
legacy: false,
|
legacy: false,
|
||||||
platform: PLATFORM_AIRPLANE,
|
platform: PLATFORM_AIRPLANE,
|
||||||
|
|
@ -416,6 +440,13 @@ const mixerList = [
|
||||||
name: 'Airplane V-tail',
|
name: 'Airplane V-tail',
|
||||||
model: 'vtail_plane',
|
model: 'vtail_plane',
|
||||||
image: 'airplane_vtail',
|
image: 'airplane_vtail',
|
||||||
|
imageOutputsNumbers: [
|
||||||
|
{input: INPUT_STABILIZED_ROLL, top: 96, left: 18, colour: "#ff0000"},
|
||||||
|
{input: INPUT_STABILIZED_ROLL, top: 96, left: 134, colour: "#00e000"},
|
||||||
|
{input: INPUT_STABILIZED_PITCH, top: 154, left: 20, colour: "#ff7f00"},
|
||||||
|
{input: INPUT_STABILIZED_PITCH, top: 154, left: 132, colour: "#00a6ff"},
|
||||||
|
{input: INPUT_STABILIZED_THROTTLE, top:5, left:71, colour: "#000000"},
|
||||||
|
],
|
||||||
enabled: true,
|
enabled: true,
|
||||||
legacy: false,
|
legacy: false,
|
||||||
platform: PLATFORM_AIRPLANE,
|
platform: PLATFORM_AIRPLANE,
|
||||||
|
|
@ -439,6 +470,13 @@ const mixerList = [
|
||||||
name: 'Airplane V-tail with differential thrust',
|
name: 'Airplane V-tail with differential thrust',
|
||||||
model: 'vtail_plane',
|
model: 'vtail_plane',
|
||||||
image: 'airplane_vtail',
|
image: 'airplane_vtail',
|
||||||
|
imageOutputsNumbers: [
|
||||||
|
{input: INPUT_STABILIZED_ROLL, top: 96, left: 18, colour: "#ff0000"},
|
||||||
|
{input: INPUT_STABILIZED_ROLL, top: 96, left: 134, colour: "#00e000"},
|
||||||
|
{input: INPUT_STABILIZED_PITCH, top: 154, left: 20, colour: "#ff7f00"},
|
||||||
|
{input: INPUT_STABILIZED_PITCH, top: 154, left: 132, colour: "#00a6ff"},
|
||||||
|
{input: INPUT_STABILIZED_THROTTLE, top:5, left:71, colour: "#000000"},
|
||||||
|
],
|
||||||
enabled: true,
|
enabled: true,
|
||||||
legacy: false,
|
legacy: false,
|
||||||
platform: PLATFORM_AIRPLANE,
|
platform: PLATFORM_AIRPLANE,
|
||||||
|
|
@ -463,6 +501,12 @@ const mixerList = [
|
||||||
name: 'Airplane V-tail (single aileron servo)',
|
name: 'Airplane V-tail (single aileron servo)',
|
||||||
model: 'vtail_single_servo_plane',
|
model: 'vtail_single_servo_plane',
|
||||||
image: 'airplane_vtail_single',
|
image: 'airplane_vtail_single',
|
||||||
|
imageOutputsNumbers: [
|
||||||
|
{input: INPUT_STABILIZED_ROLL, top: 96, left: 18, colour: "#ff7f00"},
|
||||||
|
{input: INPUT_STABILIZED_PITCH, top: 154, left: 20, colour: "#ff0000"},
|
||||||
|
{input: INPUT_STABILIZED_PITCH, top: 154, left: 132, colour: "#00e000"},
|
||||||
|
{input: INPUT_STABILIZED_THROTTLE, top:5, left:71, colour: "#000000"},
|
||||||
|
],
|
||||||
enabled: true,
|
enabled: true,
|
||||||
legacy: false,
|
legacy: false,
|
||||||
platform: PLATFORM_AIRPLANE,
|
platform: PLATFORM_AIRPLANE,
|
||||||
|
|
@ -482,6 +526,12 @@ const mixerList = [
|
||||||
name: 'Airplane without rudder',
|
name: 'Airplane without rudder',
|
||||||
model: 'rudderless_plane',
|
model: 'rudderless_plane',
|
||||||
image: 'airplane_norudder',
|
image: 'airplane_norudder',
|
||||||
|
imageOutputsNumbers: [
|
||||||
|
{input: INPUT_STABILIZED_PITCH, top: 151, left: 126, colour: "#ff7f00"},
|
||||||
|
{input: INPUT_STABILIZED_ROLL, top: 96, left: 18, colour: "#ff0000"},
|
||||||
|
{input: INPUT_STABILIZED_ROLL, top: 96, left: 134, colour: "#00e000"},
|
||||||
|
{input: INPUT_STABILIZED_THROTTLE, top:5, left:71, colour: "#000000"},
|
||||||
|
],
|
||||||
enabled: true,
|
enabled: true,
|
||||||
legacy: false,
|
legacy: false,
|
||||||
platform: PLATFORM_AIRPLANE,
|
platform: PLATFORM_AIRPLANE,
|
||||||
|
|
@ -502,6 +552,13 @@ const mixerList = [
|
||||||
name: 'Custom Airplane',
|
name: 'Custom Airplane',
|
||||||
model: 'twin_plane',
|
model: 'twin_plane',
|
||||||
image: 'airplane',
|
image: 'airplane',
|
||||||
|
imageOutputsNumbers: [
|
||||||
|
{input: INPUT_STABILIZED_PITCH, top: 151, left: 126, colour: "#ff7f00"},
|
||||||
|
{input: INPUT_STABILIZED_ROLL, top: 96, left: 18, colour: "#ff0000"},
|
||||||
|
{input: INPUT_STABILIZED_ROLL, top: 96, left: 134, colour: "#00e000"},
|
||||||
|
{input: INPUT_STABILIZED_YAW, top: 126, left: 52, colour: "#00a6ff"},
|
||||||
|
{input: INPUT_STABILIZED_THROTTLE, top:5, left:71, colour: "#000000"},
|
||||||
|
],
|
||||||
enabled: false,
|
enabled: false,
|
||||||
legacy: true,
|
legacy: true,
|
||||||
platform: PLATFORM_AIRPLANE,
|
platform: PLATFORM_AIRPLANE,
|
||||||
|
|
|
||||||
|
|
@ -72,6 +72,21 @@ let ServoMixerRuleCollection = function () {
|
||||||
return false;
|
return false;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
self.getServoMixRuleFromTarget = function(wantedTarget) {
|
||||||
|
let returnTarget = null;
|
||||||
|
|
||||||
|
for (let ruleIndex in data) {
|
||||||
|
if (data.hasOwnProperty(ruleIndex)) {
|
||||||
|
if (data[ruleIndex].getTarget() == wantedTarget) {
|
||||||
|
returnTarget = data[ruleIndex];
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return returnTarget;
|
||||||
|
}
|
||||||
|
|
||||||
self.getNumberOfConfiguredServos = function () {
|
self.getNumberOfConfiguredServos = function () {
|
||||||
let count = 0;
|
let count = 0;
|
||||||
for (let i = 0; i < self.getServoCount(); i ++) {
|
for (let i = 0; i < self.getServoCount(); i ++) {
|
||||||
|
|
|
||||||
|
|
@ -8,41 +8,22 @@ viewBox="0 0 850 850"
|
||||||
<defs>
|
<defs>
|
||||||
<style type="text/css">
|
<style type="text/css">
|
||||||
<![CDATA[
|
<![CDATA[
|
||||||
.str0 {stroke:black;stroke-width:10;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:22.9256}
|
.fil3 {fill:#00A6FF}
|
||||||
.str1 {stroke:#00A6FF;stroke-width:10;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:22.9256}
|
|
||||||
.str3 {stroke:#00E000;stroke-width:10;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:22.9256}
|
|
||||||
.str2 {stroke:red;stroke-width:10;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:22.9256}
|
|
||||||
.str4 {stroke:#FF7F00;stroke-width:10;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:22.9256}
|
|
||||||
.fil4 {fill:#00A6FF}
|
|
||||||
.fil1 {fill:#00E000}
|
.fil1 {fill:#00E000}
|
||||||
.fil0 {fill:#999999}
|
.fil0 {fill:#999999}
|
||||||
.fil6 {fill:red}
|
.fil4 {fill:red}
|
||||||
.fil3 {fill:#FF7F00}
|
.fil2 {fill:#FF7F00}
|
||||||
.fil2 {fill:white}
|
.fil5 {fill:white;fill-rule:nonzero}
|
||||||
.fil5 {fill:black;fill-rule:nonzero}
|
|
||||||
.fil7 {fill:white;fill-rule:nonzero}
|
|
||||||
]]>
|
]]>
|
||||||
</style>
|
</style>
|
||||||
</defs>
|
</defs>
|
||||||
<g id="Layer_x0020_1">
|
<g id="Layer_x0020_1">
|
||||||
<metadata id="CorelCorpID_0Corel-Layer"/>
|
<metadata id="CorelCorpID_0Corel-Layer"/>
|
||||||
<path class="fil0" d="M258.88 767.6l148.41 0c5.38,21.31 11.3,33.52 17.71,33.52 6.41,0 12.33,-12.21 17.71,-33.52l148.41 0 -10 -73.61 -119.52 -25.32c6.72,-69.54 21.76,-183.85 24.95,-267.2l326.09 40.02 0 -169.86 -312.14 -60.03c0.45,-66.81 1.32,-93.85 -1.5,-129.58 -11.36,45.38 -37.14,69.99 -74,69.99 -36.86,0 -65.43,-27.83 -74,-69.99 -2.82,35.73 -1.95,62.77 -1.5,129.58l-312.14 60.03 0 169.86 326.09 -40.02c3.19,83.35 18.23,197.66 24.95,267.2l-119.52 25.32 -10 73.61z"/>
|
<path class="fil0" d="M258.88 767.6l148.41 0c5.38,21.31 11.3,33.52 17.71,33.52 6.41,0 12.33,-12.21 17.71,-33.52l148.41 0 -10 -73.61 -119.52 -25.32c6.72,-69.54 21.76,-183.85 24.95,-267.2l326.09 40.02 0 -169.86 -312.14 -60.03c0.45,-66.81 4.39,-94.22 -1.5,-129.58 -6.01,-36.11 -37.14,-74.01 -74,-74.01 -36.86,0 -67.99,37.9 -74,74.01 -5.89,35.36 -1.95,62.77 -1.5,129.58l-312.14 60.03 0 169.86 326.09 -40.02c3.19,83.35 18.23,197.66 24.95,267.2l-119.52 25.32 -10 73.61z"/>
|
||||||
<polygon class="fil1" points="572.59,412.03 792.63,439.04 792.63,370 572.59,343 "/>
|
<polygon class="fil1" points="572.59,412.03 792.63,439.04 792.63,370 572.59,343 "/>
|
||||||
<circle class="fil2 str0" cx="425" cy="82.02" r="70"/>
|
<polygon class="fil2" points="272.88,767.6 577.12,767.6 571.12,718.58 278.88,718.58 "/>
|
||||||
<polygon class="fil3" points="272.88,767.6 577.12,767.6 571.12,718.58 278.88,718.58 "/>
|
<path class="fil3" d="M425 839.54c0,0 -38.43,-227.94 0,-227.94 38.43,0 0,227.94 0,227.94z"/>
|
||||||
<path class="fil4" d="M425 839.54c0,0 -38.43,-227.94 0,-227.94 38.43,0 0,227.94 0,227.94z"/>
|
<polygon class="fil4" points="57.37,439.04 277.41,412.03 277.41,343 57.37,370 "/>
|
||||||
<path class="fil5" d="M393.05 105.15l-8.61 0 0 -34.58c0,-4.12 0.09,-7.4 0.3,-9.81 -0.57,0.57 -1.26,1.23 -2.08,1.94 -0.81,0.71 -3.55,2.95 -8.23,6.73l-4.31 -5.46 15.75 -12.37 7.18 0 0 53.55z"/>
|
<path class="fil5" d="M405.45 376.22l0 -84.15 -27.27 0 46.82 -84.15 46.82 84.15 -27.27 0 0 84.15 -39.1 0zm0 -42.08m-13.64 -42.07m9.78 -42.08m46.82 0m9.77 42.08m-13.63 42.07m-19.55 42.08"/>
|
||||||
<polygon id="_1" class="fil5" points="435.91,51.6 416,105.15 407.87,105.15 427.82,51.6 "/>
|
|
||||||
<path id="_2" class="fil5" d="M476.15 105.15l-36.3 0 0 -6.51 13.81 -13.89c4.08,-4.18 6.78,-7.13 8.11,-8.88 1.33,-1.75 2.3,-3.38 2.92,-4.92 0.61,-1.54 0.91,-3.19 0.91,-4.95 0,-2.42 -0.73,-4.33 -2.18,-5.72 -1.45,-1.38 -3.46,-2.08 -6.02,-2.08 -2.05,0 -4.04,0.37 -5.96,1.14 -1.92,0.75 -4.13,2.12 -6.66,4.09l-4.65 -5.67c2.99,-2.51 5.88,-4.29 8.69,-5.34 2.82,-1.05 5.8,-1.57 8.98,-1.57 4.97,0 8.97,1.3 11.97,3.9 3.02,2.6 4.52,6.1 4.52,10.48 0,2.43 -0.44,4.72 -1.31,6.89 -0.87,2.18 -2.19,4.42 -3.99,6.73 -1.8,2.3 -4.78,5.42 -8.97,9.35l-9.3 9.01 0 0.36 25.43 0 0 7.58z"/>
|
|
||||||
<rect class="fil2 str1" x="268.91" y="608.35" width="90" height="90"/>
|
|
||||||
<path class="fil5" d="M296.12 657.32c0,-20.95 8.53,-31.43 25.6,-31.43 2.69,0 4.97,0.21 6.82,0.63l0 7.15c-1.85,-0.54 -4,-0.8 -6.45,-0.8 -5.74,0 -10.05,1.53 -12.93,4.61 -2.89,3.09 -4.45,8.02 -4.69,14.81l0.44 0c1.15,-1.97 2.76,-3.51 4.84,-4.6 2.07,-1.09 4.51,-1.62 7.32,-1.62 4.87,0 8.64,1.48 11.35,4.47 2.72,2.98 4.08,7.01 4.08,12.11 0,5.63 -1.58,10.07 -4.71,13.33 -3.14,3.26 -7.42,4.89 -12.84,4.89 -3.84,0 -7.18,-0.93 -10,-2.77 -2.84,-1.85 -5.01,-4.53 -6.54,-8.06 -1.52,-3.52 -2.29,-7.77 -2.29,-12.72zm18.68 16.42c2.96,0 5.24,-0.95 6.84,-2.86 1.6,-1.9 2.4,-4.63 2.4,-8.16 0,-3.09 -0.75,-5.5 -2.25,-7.27 -1.52,-1.76 -3.77,-2.63 -6.77,-2.63 -1.86,0 -3.57,0.4 -5.13,1.18 -1.57,0.8 -2.79,1.89 -3.7,3.27 -0.9,1.38 -1.35,2.78 -1.35,4.23 0,3.44 0.93,6.35 2.8,8.7 1.87,2.37 4.26,3.54 7.16,3.54z"/>
|
|
||||||
<rect class="fil2 str2" x="96.18" y="455.06" width="90" height="90"/>
|
|
||||||
<path class="fil5" d="M158.46 515.13l-7.23 0 0 11.7 -8.39 0 0 -11.7 -24.47 0 0 -6.61 24.47 -35.39 8.39 0 0 34.88 7.23 0 0 7.12zm-15.62 -7.12l0 -13.45c0,-4.79 0.13,-8.7 0.37,-11.76l-0.29 0c-0.69,1.61 -1.76,3.57 -3.23,5.86l-13.3 19.35 16.45 0z"/>
|
|
||||||
<rect class="fil2 str3" x="663.55" y="455.06" width="90" height="90"/>
|
|
||||||
<path class="fil5" d="M708.78 493.38c5.4,0 9.68,1.43 12.83,4.29 3.15,2.86 4.72,6.76 4.72,11.7 0,5.71 -1.78,10.18 -5.36,13.39 -3.57,3.21 -8.66,4.82 -15.26,4.82 -5.98,0 -10.69,-0.96 -14.1,-2.9l0 -7.81c1.97,1.13 4.25,1.99 6.81,2.6 2.56,0.61 4.95,0.91 7.15,0.91 3.88,0 6.84,-0.86 8.86,-2.6 2.03,-1.72 3.04,-4.26 3.04,-7.61 0,-6.39 -4.07,-9.59 -12.24,-9.59 -1.15,0 -2.56,0.12 -4.25,0.35 -1.68,0.23 -3.16,0.49 -4.42,0.79l-3.85 -2.27 2.05 -26.17 27.84 0 0 7.65 -20.27 0 -1.2 13.25c0.85,-0.13 1.89,-0.31 3.13,-0.51 1.24,-0.19 2.75,-0.29 4.52,-0.29z"/>
|
|
||||||
<rect class="fil2 str4" x="617.8" y="726.17" width="90" height="90"/>
|
|
||||||
<path class="fil5" d="M680.15 756.7c0,3.4 -0.98,6.23 -2.96,8.48 -1.99,2.26 -4.76,3.77 -8.36,4.56l0 0.29c4.3,0.53 7.52,1.87 9.67,4.01 2.15,2.14 3.23,4.99 3.23,8.52 0,5.15 -1.83,9.14 -5.46,11.93 -3.64,2.8 -8.82,4.2 -15.53,4.2 -5.94,0 -10.95,-0.96 -15.02,-2.9l0 -7.66c2.27,1.12 4.67,1.98 7.21,2.6 2.55,0.61 4.98,0.91 7.34,0.91 4.15,0 7.24,-0.78 9.3,-2.31 2.05,-1.54 3.07,-3.92 3.07,-7.14 0,-2.86 -1.12,-4.96 -3.4,-6.31 -2.27,-1.34 -5.84,-2.02 -10.7,-2.02l-4.65 0 0 -6.97 4.73 0c8.55,0 12.82,-2.95 12.82,-8.86 0,-2.3 -0.75,-4.08 -2.24,-5.33 -1.48,-1.24 -3.68,-1.86 -6.6,-1.86 -2.02,0 -3.97,0.29 -5.86,0.86 -1.87,0.58 -4.1,1.69 -6.66,3.35l-4.21 -6c4.9,-3.61 10.61,-5.41 17.1,-5.41 5.4,0 9.61,1.16 12.64,3.47 3.03,2.33 4.54,5.52 4.54,9.59z"/>
|
|
||||||
<polygon class="fil6" points="57.37,439.04 277.41,412.03 277.41,343 57.37,370 "/>
|
|
||||||
<path class="fil7" d="M405.45 376.22l0 -84.15 -27.27 0 46.82 -84.15 46.82 84.15 -27.27 0 0 84.15 -39.1 0zm0 -42.08m-13.64 -42.07m9.78 -42.08m46.82 0m9.77 42.08m-13.63 42.07m-19.55 42.08"/>
|
|
||||||
</g>
|
</g>
|
||||||
</svg>
|
</svg>
|
||||||
|
|
|
||||||
|
Before Width: | Height: | Size: 5.9 KiB After Width: | Height: | Size: 1.9 KiB |
|
|
@ -8,38 +8,22 @@ viewBox="0 0 850 850"
|
||||||
<defs>
|
<defs>
|
||||||
<style type="text/css">
|
<style type="text/css">
|
||||||
<![CDATA[
|
<![CDATA[
|
||||||
.str0 {stroke:black;stroke-width:10;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:22.9256}
|
|
||||||
.str2 {stroke:#00E000;stroke-width:10;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:22.9256}
|
|
||||||
.str1 {stroke:red;stroke-width:10;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:22.9256}
|
|
||||||
.str3 {stroke:#FF7F00;stroke-width:10;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:22.9256}
|
|
||||||
.fil1 {fill:#00E000}
|
.fil1 {fill:#00E000}
|
||||||
.fil4 {fill:gray}
|
.fil3 {fill:gray}
|
||||||
.fil0 {fill:#999999}
|
.fil0 {fill:#999999}
|
||||||
.fil6 {fill:red}
|
.fil4 {fill:red}
|
||||||
.fil3 {fill:#FF7F00}
|
.fil2 {fill:#FF7F00}
|
||||||
.fil2 {fill:white}
|
.fil5 {fill:white;fill-rule:nonzero}
|
||||||
.fil5 {fill:black;fill-rule:nonzero}
|
|
||||||
.fil7 {fill:white;fill-rule:nonzero}
|
|
||||||
]]>
|
]]>
|
||||||
</style>
|
</style>
|
||||||
</defs>
|
</defs>
|
||||||
<g id="Layer_x0020_1">
|
<g id="Layer_x0020_1">
|
||||||
<metadata id="CorelCorpID_0Corel-Layer"/>
|
<metadata id="CorelCorpID_0Corel-Layer"/>
|
||||||
<path class="fil0" d="M258.88 767.6l148.41 0c5.38,21.31 11.3,33.52 17.71,33.52 6.41,0 12.33,-12.21 17.71,-33.52l148.41 0 -10 -73.61 -119.52 -25.32c6.72,-69.54 21.76,-183.85 24.95,-267.2l326.09 40.02 0 -169.86 -312.14 -60.03c0.45,-66.81 1.32,-93.85 -1.5,-129.58 -11.36,45.38 -37.14,69.99 -74,69.99 -36.86,0 -65.43,-27.83 -74,-69.99 -2.82,35.73 -1.95,62.77 -1.5,129.58l-312.14 60.03 0 169.86 326.09 -40.02c3.19,83.35 18.23,197.66 24.95,267.2l-119.52 25.32 -10 73.61z"/>
|
<path class="fil0" d="M258.88 767.6l148.41 0c5.38,21.31 11.3,33.52 17.71,33.52 6.41,0 12.33,-12.21 17.71,-33.52l148.41 0 -10 -73.61 -119.52 -25.32c6.72,-69.54 21.76,-183.85 24.95,-267.2l326.09 40.02 0 -169.86 -312.14 -60.03c0.45,-66.81 4.39,-94.22 -1.5,-129.58 -6.01,-36.11 -37.14,-74.01 -74,-74.01 -36.86,0 -67.99,37.9 -74,74.01 -5.89,35.36 -1.95,62.77 -1.5,129.58l-312.14 60.03 0 169.86 326.09 -40.02c3.19,83.35 18.23,197.66 24.95,267.2l-119.52 25.32 -10 73.61z"/>
|
||||||
<polygon class="fil1" points="572.59,412.03 792.63,439.04 792.63,370 572.59,343 "/>
|
<polygon class="fil1" points="572.59,412.03 792.63,439.04 792.63,370 572.59,343 "/>
|
||||||
<circle class="fil2 str0" cx="425" cy="82.02" r="70"/>
|
<polygon class="fil2" points="272.88,767.6 577.12,767.6 571.12,718.58 278.88,718.58 "/>
|
||||||
<polygon class="fil3" points="272.88,767.6 577.12,767.6 571.12,718.58 278.88,718.58 "/>
|
<path class="fil3" d="M425 839.54c0,0 -38.43,-227.94 0,-227.94 38.43,0 0,227.94 0,227.94z"/>
|
||||||
<path class="fil4" d="M425 839.54c0,0 -38.43,-227.94 0,-227.94 38.43,0 0,227.94 0,227.94z"/>
|
<polygon class="fil4" points="57.37,439.04 277.41,412.03 277.41,343 57.37,370 "/>
|
||||||
<path class="fil5" d="M393.05 105.15l-8.61 0 0 -34.58c0,-4.12 0.09,-7.4 0.3,-9.81 -0.57,0.57 -1.26,1.23 -2.08,1.94 -0.81,0.71 -3.55,2.95 -8.23,6.73l-4.31 -5.46 15.75 -12.37 7.18 0 0 53.55z"/>
|
<path class="fil5" d="M405.45 376.22l0 -84.15 -27.27 0 46.82 -84.15 46.82 84.15 -27.27 0 0 84.15 -39.1 0zm0 -42.08m-13.64 -42.07m9.78 -42.08m46.82 0m9.77 42.08m-13.63 42.07m-19.55 42.08"/>
|
||||||
<polygon id="_1" class="fil5" points="435.91,51.6 416,105.15 407.87,105.15 427.82,51.6 "/>
|
|
||||||
<path id="_2" class="fil5" d="M476.15 105.15l-36.3 0 0 -6.51 13.81 -13.89c4.08,-4.18 6.78,-7.13 8.11,-8.88 1.33,-1.75 2.3,-3.38 2.92,-4.92 0.61,-1.54 0.91,-3.19 0.91,-4.95 0,-2.42 -0.73,-4.33 -2.18,-5.72 -1.45,-1.38 -3.46,-2.08 -6.02,-2.08 -2.05,0 -4.04,0.37 -5.96,1.14 -1.92,0.75 -4.13,2.12 -6.66,4.09l-4.65 -5.67c2.99,-2.51 5.88,-4.29 8.69,-5.34 2.82,-1.05 5.8,-1.57 8.98,-1.57 4.97,0 8.97,1.3 11.97,3.9 3.02,2.6 4.52,6.1 4.52,10.48 0,2.43 -0.44,4.72 -1.31,6.89 -0.87,2.18 -2.19,4.42 -3.99,6.73 -1.8,2.3 -4.78,5.42 -8.97,9.35l-9.3 9.01 0 0.36 25.43 0 0 7.58z"/>
|
|
||||||
<rect class="fil2 str1" x="96.18" y="455.06" width="90" height="90"/>
|
|
||||||
<path class="fil5" d="M158.46 515.13l-7.23 0 0 11.7 -8.39 0 0 -11.7 -24.47 0 0 -6.61 24.47 -35.39 8.39 0 0 34.88 7.23 0 0 7.12zm-15.62 -7.12l0 -13.45c0,-4.79 0.13,-8.7 0.37,-11.76l-0.29 0c-0.69,1.61 -1.76,3.57 -3.23,5.86l-13.3 19.35 16.45 0z"/>
|
|
||||||
<rect class="fil2 str2" x="663.55" y="455.06" width="90" height="90"/>
|
|
||||||
<path class="fil5" d="M708.78 493.38c5.4,0 9.68,1.43 12.83,4.29 3.15,2.86 4.72,6.76 4.72,11.7 0,5.71 -1.78,10.18 -5.36,13.39 -3.57,3.21 -8.66,4.82 -15.26,4.82 -5.98,0 -10.69,-0.96 -14.1,-2.9l0 -7.81c1.97,1.13 4.25,1.99 6.81,2.6 2.56,0.61 4.95,0.91 7.15,0.91 3.88,0 6.84,-0.86 8.86,-2.6 2.03,-1.72 3.04,-4.26 3.04,-7.61 0,-6.39 -4.07,-9.59 -12.24,-9.59 -1.15,0 -2.56,0.12 -4.25,0.35 -1.68,0.23 -3.16,0.49 -4.42,0.79l-3.85 -2.27 2.05 -26.17 27.84 0 0 7.65 -20.27 0 -1.2 13.25c0.85,-0.13 1.89,-0.31 3.13,-0.51 1.24,-0.19 2.75,-0.29 4.52,-0.29z"/>
|
|
||||||
<rect class="fil2 str3" x="617.8" y="726.17" width="90" height="90"/>
|
|
||||||
<path class="fil5" d="M680.15 756.7c0,3.4 -0.98,6.23 -2.96,8.48 -1.99,2.26 -4.76,3.77 -8.36,4.56l0 0.29c4.3,0.53 7.52,1.87 9.67,4.01 2.15,2.14 3.23,4.99 3.23,8.52 0,5.15 -1.83,9.14 -5.46,11.93 -3.64,2.8 -8.82,4.2 -15.53,4.2 -5.94,0 -10.95,-0.96 -15.02,-2.9l0 -7.66c2.27,1.12 4.67,1.98 7.21,2.6 2.55,0.61 4.98,0.91 7.34,0.91 4.15,0 7.24,-0.78 9.3,-2.31 2.05,-1.54 3.07,-3.92 3.07,-7.14 0,-2.86 -1.12,-4.96 -3.4,-6.31 -2.27,-1.34 -5.84,-2.02 -10.7,-2.02l-4.65 0 0 -6.97 4.73 0c8.55,0 12.82,-2.95 12.82,-8.86 0,-2.3 -0.75,-4.08 -2.24,-5.33 -1.48,-1.24 -3.68,-1.86 -6.6,-1.86 -2.02,0 -3.97,0.29 -5.86,0.86 -1.87,0.58 -4.1,1.69 -6.66,3.35l-4.21 -6c4.9,-3.61 10.61,-5.41 17.1,-5.41 5.4,0 9.61,1.16 12.64,3.47 3.03,2.33 4.54,5.52 4.54,9.59z"/>
|
|
||||||
<polygon class="fil6" points="57.37,439.04 277.41,412.03 277.41,343 57.37,370 "/>
|
|
||||||
<path class="fil7" d="M405.45 376.22l0 -84.15 -27.27 0 46.82 -84.15 46.82 84.15 -27.27 0 0 84.15 -39.1 0zm0 -42.08m-13.64 -42.07m9.78 -42.08m46.82 0m9.77 42.08m-13.63 42.07m-19.55 42.08"/>
|
|
||||||
</g>
|
</g>
|
||||||
</svg>
|
</svg>
|
||||||
|
|
|
||||||
|
Before Width: | Height: | Size: 5 KiB After Width: | Height: | Size: 1.9 KiB |
|
|
@ -8,41 +8,22 @@ viewBox="0 0 850 850"
|
||||||
<defs>
|
<defs>
|
||||||
<style type="text/css">
|
<style type="text/css">
|
||||||
<![CDATA[
|
<![CDATA[
|
||||||
.str0 {stroke:black;stroke-width:10;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:22.9256}
|
.fil5 {fill:#00A6FF}
|
||||||
.str4 {stroke:#00A6FF;stroke-width:10;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:22.9256}
|
|
||||||
.str2 {stroke:#00E000;stroke-width:10;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:22.9256}
|
|
||||||
.str1 {stroke:red;stroke-width:10;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:22.9256}
|
|
||||||
.str3 {stroke:#FF7F00;stroke-width:10;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:22.9256}
|
|
||||||
.fil7 {fill:#00A6FF}
|
|
||||||
.fil1 {fill:#00E000}
|
.fil1 {fill:#00E000}
|
||||||
.fil0 {fill:#999999}
|
.fil0 {fill:#999999}
|
||||||
.fil4 {fill:red}
|
.fil2 {fill:red}
|
||||||
.fil6 {fill:#FF7F00}
|
.fil4 {fill:#FF7F00}
|
||||||
.fil2 {fill:white}
|
.fil3 {fill:white;fill-rule:nonzero}
|
||||||
.fil3 {fill:black;fill-rule:nonzero}
|
|
||||||
.fil5 {fill:white;fill-rule:nonzero}
|
|
||||||
]]>
|
]]>
|
||||||
</style>
|
</style>
|
||||||
</defs>
|
</defs>
|
||||||
<g id="Layer_x0020_1">
|
<g id="Layer_x0020_1">
|
||||||
<metadata id="CorelCorpID_0Corel-Layer"/>
|
<metadata id="CorelCorpID_0Corel-Layer"/>
|
||||||
<path class="fil0" d="M218.86 837.63l188.43 -70.03c5.38,21.31 11.3,33.52 17.71,33.52 6.41,0 12.33,-12.21 17.71,-33.52l188.43 70.03 -10 -93.62 -154.54 -105.35c6.72,-69.54 16.76,-153.84 19.95,-237.19l326.09 40.02 0 -169.86 -312.14 -60.03c0.45,-66.81 1.32,-93.85 -1.5,-129.58 -11.36,45.38 -37.14,69.99 -74,69.99 -36.86,0 -65.43,-27.83 -74,-69.99 -2.82,35.73 -1.95,62.77 -1.5,129.58l-312.14 60.03 0 169.86 326.09 -40.02c3.19,83.35 13.23,167.65 19.95,237.19l-154.54 105.35 -10 93.62z"/>
|
<path class="fil0" d="M218.86 837.63l188.43 -70.03c5.38,21.31 11.3,33.52 17.71,33.52 6.41,0 12.33,-12.21 17.71,-33.52l188.43 70.03 -10 -93.62 -154.54 -105.35c6.72,-69.54 16.76,-153.84 19.95,-237.19l326.09 40.02 0 -169.86 -312.14 -60.03c0.45,-66.81 4.39,-94.22 -1.5,-129.58 -6.01,-36.11 -37.14,-74.01 -74,-74.01 -36.86,0 -67.99,37.9 -74,74.01 -5.89,35.36 -1.95,62.77 -1.5,129.58l-312.14 60.03 0 169.86 326.09 -40.02c3.19,83.35 13.23,167.65 19.95,237.19l-154.54 105.35 -10 93.62z"/>
|
||||||
<polygon class="fil1" points="572.59,412.03 792.63,439.04 792.63,370 572.59,343 "/>
|
<polygon class="fil1" points="572.59,412.03 792.63,439.04 792.63,370 572.59,343 "/>
|
||||||
<circle class="fil2 str0" cx="425" cy="82.02" r="70"/>
|
<polygon class="fil2" points="57.37,439.04 277.41,412.03 277.41,343 57.37,370 "/>
|
||||||
<path class="fil3" d="M393.05 105.15l-8.61 0 0 -34.58c0,-4.12 0.09,-7.4 0.3,-9.81 -0.57,0.57 -1.26,1.23 -2.08,1.94 -0.81,0.71 -3.55,2.95 -8.23,6.73l-4.31 -5.46 15.75 -12.37 7.18 0 0 53.55z"/>
|
<path class="fil3" d="M405.45 376.22l0 -84.15 -27.27 0 46.82 -84.15 46.82 84.15 -27.27 0 0 84.15 -39.1 0zm0 -42.08m-13.64 -42.07m9.78 -42.08m46.82 0m9.77 42.08m-13.63 42.07m-19.55 42.08"/>
|
||||||
<polygon id="_1" class="fil3" points="435.91,51.6 416,105.15 407.87,105.15 427.82,51.6 "/>
|
<polygon class="fil4" points="218.86,837.63 387.28,775.04 373.79,711.02 226.54,765.74 "/>
|
||||||
<path id="_2" class="fil3" d="M476.15 105.15l-36.3 0 0 -6.51 13.81 -13.89c4.08,-4.18 6.78,-7.13 8.11,-8.88 1.33,-1.75 2.3,-3.38 2.92,-4.92 0.61,-1.54 0.91,-3.19 0.91,-4.95 0,-2.42 -0.73,-4.33 -2.18,-5.72 -1.45,-1.38 -3.46,-2.08 -6.02,-2.08 -2.05,0 -4.04,0.37 -5.96,1.14 -1.92,0.75 -4.13,2.12 -6.66,4.09l-4.65 -5.67c2.99,-2.51 5.88,-4.29 8.69,-5.34 2.82,-1.05 5.8,-1.57 8.98,-1.57 4.97,0 8.97,1.3 11.97,3.9 3.02,2.6 4.52,6.1 4.52,10.48 0,2.43 -0.44,4.72 -1.31,6.89 -0.87,2.18 -2.19,4.42 -3.99,6.73 -1.8,2.3 -4.78,5.42 -8.97,9.35l-9.3 9.01 0 0.36 25.43 0 0 7.58z"/>
|
<polygon class="fil5" points="631.14,837.63 462.72,775.04 476.21,711.02 623.46,765.74 "/>
|
||||||
<rect class="fil2 str1" x="96.18" y="455.06" width="90" height="90"/>
|
|
||||||
<path class="fil3" d="M154.53 485.6c0,3.4 -0.99,6.22 -2.96,8.47 -1.99,2.26 -4.76,3.78 -8.36,4.56l0 0.29c4.3,0.54 7.52,1.88 9.67,4.01 2.15,2.14 3.23,4.99 3.23,8.53 0,5.15 -1.83,9.14 -5.47,11.92 -3.63,2.8 -8.81,4.2 -15.52,4.2 -5.94,0 -10.95,-0.96 -15.03,-2.9l0 -7.66c2.28,1.13 4.68,1.99 7.22,2.6 2.55,0.61 4.98,0.91 7.33,0.91 4.15,0 7.25,-0.77 9.3,-2.31 2.05,-1.54 3.08,-3.91 3.08,-7.14 0,-2.86 -1.13,-4.96 -3.4,-6.31 -2.28,-1.34 -5.84,-2.01 -10.7,-2.01l-4.65 0 0 -6.98 4.72 0c8.55,0 12.83,-2.95 12.83,-8.86 0,-2.3 -0.75,-4.07 -2.24,-5.32 -1.49,-1.24 -3.69,-1.87 -6.6,-1.87 -2.02,0 -3.97,0.29 -5.86,0.87 -1.88,0.57 -4.1,1.68 -6.66,3.35l-4.22 -6c4.9,-3.62 10.62,-5.42 17.1,-5.42 5.4,0 9.62,1.17 12.65,3.48 3.03,2.32 4.54,5.51 4.54,9.59z"/>
|
|
||||||
<rect class="fil2 str2" x="663.55" y="455.06" width="90" height="90"/>
|
|
||||||
<path class="fil3" d="M728.83 515.13l-7.22 0 0 11.7 -8.39 0 0 -11.7 -24.47 0 0 -6.61 24.47 -35.39 8.39 0 0 34.88 7.22 0 0 7.12zm-15.61 -7.12l0 -13.45c0,-4.79 0.13,-8.7 0.36,-11.76l-0.28 0c-0.69,1.61 -1.77,3.57 -3.23,5.86l-13.3 19.35 16.45 0z"/>
|
|
||||||
<rect class="fil2 str3" x="108.12" y="744.93" width="90" height="90"/>
|
|
||||||
<path class="fil3" d="M154.35 783.25c5.4,0 9.67,1.42 12.82,4.28 3.15,2.87 4.73,6.77 4.73,11.7 0,5.72 -1.79,10.18 -5.36,13.39 -3.58,3.21 -8.67,4.83 -15.27,4.83 -5.97,0 -10.68,-0.97 -14.1,-2.9l0 -7.82c1.98,1.13 4.25,1.99 6.82,2.6 2.56,0.62 4.95,0.92 7.15,0.92 3.87,0 6.83,-0.87 8.86,-2.6 2.02,-1.73 3.04,-4.27 3.04,-7.62 0,-6.39 -4.08,-9.58 -12.24,-9.58 -1.15,0 -2.56,0.11 -4.25,0.34 -1.69,0.23 -3.16,0.49 -4.43,0.79l-3.85 -2.27 2.05 -26.16 27.84 0 0 7.65 -20.26 0 -1.2 13.24c0.85,-0.13 1.89,-0.31 3.12,-0.51 1.24,-0.18 2.75,-0.28 4.53,-0.28z"/>
|
|
||||||
<polygon class="fil4" points="57.37,439.04 277.41,412.03 277.41,343 57.37,370 "/>
|
|
||||||
<path class="fil5" d="M405.45 376.22l0 -84.15 -27.27 0 46.82 -84.15 46.82 84.15 -27.27 0 0 84.15 -39.1 0zm0 -42.08m-13.64 -42.07m9.78 -42.08m46.82 0m9.77 42.08m-13.63 42.07m-19.55 42.08"/>
|
|
||||||
<polygon class="fil6" points="218.86,837.63 387.28,775.04 373.79,711.02 226.54,765.74 "/>
|
|
||||||
<polygon class="fil7" points="631.14,837.63 462.72,775.04 476.21,711.02 623.46,765.74 "/>
|
|
||||||
<rect class="fil2 str4" x="653.12" y="744.93" width="90" height="90"/>
|
|
||||||
<path class="fil3" d="M681.33 793.9c0,-20.96 8.53,-31.43 25.6,-31.43 2.69,0 4.96,0.21 6.82,0.63l0 7.14c-1.86,-0.53 -4,-0.79 -6.45,-0.79 -5.74,0 -10.05,1.53 -12.93,4.61 -2.89,3.08 -4.45,8.02 -4.69,14.81l0.44 0c1.15,-1.98 2.76,-3.51 4.84,-4.6 2.07,-1.09 4.51,-1.62 7.32,-1.62 4.87,0 8.64,1.48 11.35,4.47 2.72,2.98 4.08,7.01 4.08,12.11 0,5.63 -1.58,10.07 -4.71,13.33 -3.14,3.26 -7.42,4.89 -12.84,4.89 -3.84,0 -7.18,-0.93 -10,-2.77 -2.84,-1.85 -5.01,-4.54 -6.54,-8.06 -1.52,-3.53 -2.29,-7.77 -2.29,-12.72zm18.68 16.42c2.96,0 5.24,-0.95 6.84,-2.86 1.59,-1.9 2.4,-4.63 2.4,-8.16 0,-3.09 -0.75,-5.51 -2.25,-7.27 -1.52,-1.76 -3.77,-2.63 -6.77,-2.63 -1.86,0 -3.57,0.4 -5.14,1.18 -1.56,0.8 -2.78,1.89 -3.69,3.27 -0.9,1.38 -1.35,2.78 -1.35,4.23 0,3.44 0.93,6.35 2.79,8.7 1.88,2.37 4.27,3.54 7.17,3.54z"/>
|
|
||||||
</g>
|
</g>
|
||||||
</svg>
|
</svg>
|
||||||
|
|
|
||||||
|
Before Width: | Height: | Size: 6 KiB After Width: | Height: | Size: 1.9 KiB |
|
|
@ -8,37 +8,21 @@ viewBox="0 0 850 850"
|
||||||
<defs>
|
<defs>
|
||||||
<style type="text/css">
|
<style type="text/css">
|
||||||
<![CDATA[
|
<![CDATA[
|
||||||
.str0 {stroke:black;stroke-width:10;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:22.9256}
|
.fil4 {fill:#00E000}
|
||||||
.str3 {stroke:#00E000;stroke-width:10;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:22.9256}
|
|
||||||
.str2 {stroke:red;stroke-width:10;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:22.9256}
|
|
||||||
.str1 {stroke:#FF7F00;stroke-width:10;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:22.9256}
|
|
||||||
.fil6 {fill:#00E000}
|
|
||||||
.fil0 {fill:#999999}
|
.fil0 {fill:#999999}
|
||||||
.fil5 {fill:red}
|
.fil3 {fill:red}
|
||||||
.fil1 {fill:#FF7F00}
|
.fil1 {fill:#FF7F00}
|
||||||
.fil2 {fill:white}
|
.fil2 {fill:white;fill-rule:nonzero}
|
||||||
.fil3 {fill:black;fill-rule:nonzero}
|
|
||||||
.fil4 {fill:white;fill-rule:nonzero}
|
|
||||||
]]>
|
]]>
|
||||||
</style>
|
</style>
|
||||||
</defs>
|
</defs>
|
||||||
<g id="Layer_x0020_1">
|
<g id="Layer_x0020_1">
|
||||||
<metadata id="CorelCorpID_0Corel-Layer"/>
|
<metadata id="CorelCorpID_0Corel-Layer"/>
|
||||||
<path class="fil0" d="M218.86 837.63l188.43 -70.03c5.38,21.31 11.3,33.52 17.71,33.52 6.41,0 12.33,-12.21 17.71,-33.52l188.43 70.03 -10 -93.62 -154.54 -105.35c6.72,-69.54 16.76,-153.84 19.95,-237.19l326.09 40.02 0 -169.86 -312.14 -60.03c0.45,-66.81 1.32,-93.85 -1.5,-129.58 -11.36,45.38 -37.14,69.99 -74,69.99 -36.86,0 -65.43,-27.83 -74,-69.99 -2.82,35.73 -1.95,62.77 -1.5,129.58l-312.14 60.03 0 169.86 326.09 -40.02c3.19,83.35 13.23,167.65 19.95,237.19l-154.54 105.35 -10 93.62z"/>
|
<path class="fil0" d="M218.86 837.63l188.43 -70.03c5.38,21.31 11.3,33.52 17.71,33.52 6.41,0 12.33,-12.21 17.71,-33.52l188.43 70.03 -10 -93.62 -154.54 -105.35c6.72,-69.54 16.76,-153.84 19.95,-237.19l326.09 40.02 0 -169.86 -312.14 -60.03c0.45,-66.81 4.39,-94.22 -1.5,-129.58 -6.01,-36.11 -37.14,-74.01 -74,-74.01 -36.86,0 -67.99,37.9 -74,74.01 -5.89,35.36 -1.95,62.77 -1.5,129.58l-312.14 60.03 0 169.86 326.09 -40.02c3.19,83.35 13.23,167.65 19.95,237.19l-154.54 105.35 -10 93.62z"/>
|
||||||
<polygon class="fil1" points="572.59,412.03 792.63,439.04 792.63,370 572.59,343 "/>
|
<polygon class="fil1" points="572.59,412.03 792.63,439.04 792.63,370 572.59,343 "/>
|
||||||
<circle class="fil2 str0" cx="425" cy="82.02" r="70"/>
|
|
||||||
<path class="fil3" d="M393.05 105.15l-8.61 0 0 -34.58c0,-4.12 0.09,-7.4 0.3,-9.81 -0.57,0.57 -1.26,1.23 -2.08,1.94 -0.81,0.71 -3.55,2.95 -8.23,6.73l-4.31 -5.46 15.75 -12.37 7.18 0 0 53.55z"/>
|
|
||||||
<polygon id="_1" class="fil3" points="435.91,51.6 416,105.15 407.87,105.15 427.82,51.6 "/>
|
|
||||||
<path id="_2" class="fil3" d="M476.15 105.15l-36.3 0 0 -6.51 13.81 -13.89c4.08,-4.18 6.78,-7.13 8.11,-8.88 1.33,-1.75 2.3,-3.38 2.92,-4.92 0.61,-1.54 0.91,-3.19 0.91,-4.95 0,-2.42 -0.73,-4.33 -2.18,-5.72 -1.45,-1.38 -3.46,-2.08 -6.02,-2.08 -2.05,0 -4.04,0.37 -5.96,1.14 -1.92,0.75 -4.13,2.12 -6.66,4.09l-4.65 -5.67c2.99,-2.51 5.88,-4.29 8.69,-5.34 2.82,-1.05 5.8,-1.57 8.98,-1.57 4.97,0 8.97,1.3 11.97,3.9 3.02,2.6 4.52,6.1 4.52,10.48 0,2.43 -0.44,4.72 -1.31,6.89 -0.87,2.18 -2.19,4.42 -3.99,6.73 -1.8,2.3 -4.78,5.42 -8.97,9.35l-9.3 9.01 0 0.36 25.43 0 0 7.58z"/>
|
|
||||||
<rect class="fil2 str1" x="96.18" y="455.06" width="90" height="90"/>
|
|
||||||
<path class="fil3" d="M154.53 485.6c0,3.4 -0.99,6.22 -2.96,8.47 -1.99,2.26 -4.76,3.78 -8.36,4.56l0 0.29c4.3,0.54 7.52,1.88 9.67,4.01 2.15,2.14 3.23,4.99 3.23,8.53 0,5.15 -1.83,9.14 -5.47,11.92 -3.63,2.8 -8.81,4.2 -15.52,4.2 -5.94,0 -10.95,-0.96 -15.03,-2.9l0 -7.66c2.28,1.13 4.68,1.99 7.22,2.6 2.55,0.61 4.98,0.91 7.33,0.91 4.15,0 7.25,-0.77 9.3,-2.31 2.05,-1.54 3.08,-3.91 3.08,-7.14 0,-2.86 -1.13,-4.96 -3.4,-6.31 -2.28,-1.34 -5.84,-2.01 -10.7,-2.01l-4.65 0 0 -6.98 4.72 0c8.55,0 12.83,-2.95 12.83,-8.86 0,-2.3 -0.75,-4.07 -2.24,-5.32 -1.49,-1.24 -3.69,-1.87 -6.6,-1.87 -2.02,0 -3.97,0.29 -5.86,0.87 -1.88,0.57 -4.1,1.68 -6.66,3.35l-4.22 -6c4.9,-3.62 10.62,-5.42 17.1,-5.42 5.4,0 9.62,1.17 12.65,3.48 3.03,2.32 4.54,5.51 4.54,9.59z"/>
|
|
||||||
<rect class="fil2 str2" x="108.12" y="744.93" width="90" height="90"/>
|
|
||||||
<path class="fil3" d="M174.4 805l-7.23 0 0 11.7 -8.38 0 0 -11.7 -24.48 0 0 -6.62 24.48 -35.38 8.38 0 0 34.87 7.23 0 0 7.13zm-15.61 -7.13l0 -13.45c0,-4.79 0.12,-8.7 0.36,-11.76l-0.29 0c-0.69,1.61 -1.76,3.57 -3.22,5.86l-13.3 19.35 16.45 0z"/>
|
|
||||||
<polygon class="fil1" points="57.37,439.04 277.41,412.03 277.41,343 57.37,370 "/>
|
<polygon class="fil1" points="57.37,439.04 277.41,412.03 277.41,343 57.37,370 "/>
|
||||||
<path class="fil4" d="M405.45 376.22l0 -84.15 -27.27 0 46.82 -84.15 46.82 84.15 -27.27 0 0 84.15 -39.1 0zm0 -42.08m-13.64 -42.07m9.78 -42.08m46.82 0m9.77 42.08m-13.63 42.07m-19.55 42.08"/>
|
<path class="fil2" d="M405.45 376.22l0 -84.15 -27.27 0 46.82 -84.15 46.82 84.15 -27.27 0 0 84.15 -39.1 0zm0 -42.08m-13.64 -42.07m9.78 -42.08m46.82 0m9.77 42.08m-13.63 42.07m-19.55 42.08"/>
|
||||||
<polygon class="fil5" points="218.86,837.63 387.28,775.04 373.79,711.02 226.54,765.74 "/>
|
<polygon class="fil3" points="218.86,837.63 387.28,775.04 373.79,711.02 226.54,765.74 "/>
|
||||||
<polygon class="fil6" points="631.14,837.63 462.72,775.04 476.21,711.02 623.46,765.74 "/>
|
<polygon class="fil4" points="631.14,837.63 462.72,775.04 476.21,711.02 623.46,765.74 "/>
|
||||||
<rect class="fil2 str3" x="653.12" y="744.93" width="90" height="90"/>
|
|
||||||
<path class="fil3" d="M699.35 783.25c5.4,0 9.67,1.42 12.82,4.28 3.15,2.87 4.73,6.77 4.73,11.7 0,5.72 -1.79,10.18 -5.37,13.39 -3.57,3.21 -8.66,4.83 -15.26,4.83 -5.98,0 -10.69,-0.97 -14.1,-2.9l0 -7.82c1.97,1.13 4.25,1.99 6.81,2.6 2.57,0.62 4.95,0.92 7.15,0.92 3.88,0 6.84,-0.87 8.86,-2.6 2.03,-1.73 3.04,-4.27 3.04,-7.62 0,-6.39 -4.07,-9.58 -12.23,-9.58 -1.16,0 -2.57,0.11 -4.25,0.34 -1.69,0.23 -3.17,0.49 -4.43,0.79l-3.85 -2.27 2.05 -26.16 27.84 0 0 7.65 -20.26 0 -1.2 13.24c0.84,-0.13 1.88,-0.31 3.12,-0.51 1.24,-0.18 2.75,-0.28 4.53,-0.28z"/>
|
|
||||||
</g>
|
</g>
|
||||||
</svg>
|
</svg>
|
||||||
|
|
|
||||||
|
Before Width: | Height: | Size: 5 KiB After Width: | Height: | Size: 1.9 KiB |
|
|
@ -8,31 +8,18 @@ viewBox="0 0 850 850"
|
||||||
<defs>
|
<defs>
|
||||||
<style type="text/css">
|
<style type="text/css">
|
||||||
<![CDATA[
|
<![CDATA[
|
||||||
.str0 {stroke:black;stroke-width:10;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:22.9256}
|
.fil1 {fill:#00E000}
|
||||||
.str2 {stroke:#00E000;stroke-width:10;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:22.9256}
|
.fil0 {fill:#999999}
|
||||||
.str1 {stroke:red;stroke-width:10;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:22.9256}
|
.fil2 {fill:red}
|
||||||
.fil3 {fill:#00E000}
|
.fil3 {fill:white;fill-rule:nonzero}
|
||||||
.fil2 {fill:#999999}
|
|
||||||
.fil4 {fill:red}
|
|
||||||
.fil0 {fill:white}
|
|
||||||
.fil1 {fill:black;fill-rule:nonzero}
|
|
||||||
.fil5 {fill:white;fill-rule:nonzero}
|
|
||||||
]]>
|
]]>
|
||||||
</style>
|
</style>
|
||||||
</defs>
|
</defs>
|
||||||
<g id="Layer_x0020_1">
|
<g id="Layer_x0020_1">
|
||||||
<metadata id="CorelCorpID_0Corel-Layer"/>
|
<metadata id="CorelCorpID_0Corel-Layer"/>
|
||||||
<circle class="fil0 str0" cx="425" cy="500.92" r="70"/>
|
<path class="fil0" d="M490.19 412.07l345.42 169.55 0 -179.94 -376.74 -217.33c-18.77,-10.83 -46,-10.37 -65.03,0l-379.45 206.74 0 179.93 345.42 -158.95 130.38 0z"/>
|
||||||
<path class="fil1" d="M393.05 524.05l-8.61 0 0 -34.57c0,-4.13 0.1,-7.4 0.3,-9.81 -0.57,0.57 -1.25,1.22 -2.08,1.93 -0.81,0.72 -3.55,2.95 -8.22,6.74l-4.32 -5.46 15.75 -12.38 7.18 0 0 53.55z"/>
|
<polygon class="fil1" points="581.33,456.8 814.41,571.21 814.41,498.09 581.33,383.68 "/>
|
||||||
<polygon id="_1" class="fil1" points="435.91,470.5 416,524.05 407.87,524.05 427.82,470.5 "/>
|
<polygon class="fil2" points="35.59,561.27 268.67,454.01 268.67,380.88 35.59,488.14 "/>
|
||||||
<path id="_2" class="fil1" d="M476.15 524.05l-36.3 0 0 -6.51 13.81 -13.89c4.07,-4.17 6.77,-7.12 8.11,-8.87 1.33,-1.75 2.3,-3.39 2.91,-4.93 0.62,-1.53 0.92,-3.18 0.92,-4.95 0,-2.41 -0.73,-4.32 -2.18,-5.71 -1.45,-1.39 -3.46,-2.09 -6.02,-2.09 -2.05,0 -4.04,0.38 -5.97,1.14 -1.91,0.75 -4.12,2.13 -6.65,4.1l-4.65 -5.67c2.99,-2.52 5.88,-4.29 8.69,-5.34 2.81,-1.05 5.8,-1.58 8.98,-1.58 4.97,0 8.97,1.3 11.97,3.9 3.01,2.6 4.51,6.1 4.51,10.49 0,2.43 -0.43,4.71 -1.3,6.89 -0.87,2.17 -2.2,4.41 -4,6.72 -1.8,2.3 -4.77,5.43 -8.96,9.35l-9.3 9.02 0 0.36 25.43 0 0 7.57z"/>
|
<path class="fil3" d="M404.3 385.32l0 -89.14 -28.9 0 49.6 -89.14 49.6 89.14 -28.9 0 0 89.14 -41.4 0zm0 -44.57m-14.45 -44.57m10.35 -44.57m49.6 0m10.35 44.57m-14.45 44.57m-20.7 44.57"/>
|
||||||
<rect class="fil0 str1" x="108.12" y="583.6" width="90" height="90"/>
|
|
||||||
<path class="fil1" d="M170.47 614.13c0,3.4 -0.98,6.23 -2.96,8.48 -1.99,2.26 -4.76,3.77 -8.36,4.56l0 0.29c4.3,0.54 7.52,1.87 9.67,4.01 2.15,2.14 3.23,4.99 3.23,8.53 0,5.15 -1.83,9.13 -5.46,11.92 -3.64,2.8 -8.82,4.2 -15.53,4.2 -5.94,0 -10.95,-0.96 -15.02,-2.9l0 -7.66c2.27,1.12 4.67,1.99 7.21,2.6 2.55,0.61 4.99,0.91 7.34,0.91 4.15,0 7.25,-0.77 9.3,-2.31 2.05,-1.54 3.07,-3.91 3.07,-7.14 0,-2.86 -1.12,-4.96 -3.4,-6.31 -2.27,-1.34 -5.84,-2.01 -10.7,-2.01l-4.65 0 0 -6.98 4.73 0c8.55,0 12.82,-2.95 12.82,-8.86 0,-2.3 -0.75,-4.08 -2.24,-5.33 -1.48,-1.23 -3.68,-1.86 -6.6,-1.86 -2.02,0 -3.97,0.29 -5.86,0.86 -1.87,0.58 -4.1,1.69 -6.66,3.35l-4.21 -6c4.9,-3.61 10.61,-5.41 17.1,-5.41 5.4,0 9.61,1.16 12.65,3.48 3.02,2.32 4.53,5.51 4.53,9.58z"/>
|
|
||||||
<path class="fil2" d="M490.19 412.07l345.42 169.55 0 -179.94 -376.74 -217.33c-18.77,-10.83 -46,-10.37 -65.03,0l-379.45 206.74 0 179.93 345.42 -158.95 130.38 0z"/>
|
|
||||||
<polygon class="fil3" points="581.33,456.8 814.41,571.21 814.41,498.09 581.33,383.68 "/>
|
|
||||||
<polygon class="fil4" points="35.59,561.27 268.67,454.01 268.67,380.88 35.59,488.14 "/>
|
|
||||||
<path class="fil5" d="M404.3 385.32l0 -89.14 -28.9 0 49.6 -89.14 49.6 89.14 -28.9 0 0 89.14 -41.4 0zm0 -44.57m-14.45 -44.57m10.35 -44.57m49.6 0m10.35 44.57m-14.45 44.57m-20.7 44.57"/>
|
|
||||||
<rect class="fil0 str2" x="653.12" y="583.6" width="90" height="90"/>
|
|
||||||
<path class="fil1" d="M719.39 643.67l-7.22 0 0 11.7 -8.39 0 0 -11.7 -24.47 0 0 -6.61 24.47 -35.39 8.39 0 0 34.88 7.22 0 0 7.12zm-15.61 -7.12l0 -13.45c0,-4.79 0.13,-8.7 0.36,-11.77l-0.28 0c-0.69,1.62 -1.76,3.58 -3.23,5.87l-13.3 19.35 16.45 0z"/>
|
|
||||||
</g>
|
</g>
|
||||||
</svg>
|
</svg>
|
||||||
|
|
|
||||||
|
Before Width: | Height: | Size: 3.7 KiB After Width: | Height: | Size: 1.3 KiB |
|
|
@ -138,9 +138,7 @@ hr {
|
||||||
}
|
}
|
||||||
|
|
||||||
.tab-configuration .mixerPreview img {
|
.tab-configuration .mixerPreview img {
|
||||||
width: 90%;
|
width: 175px;
|
||||||
height: 90%;
|
|
||||||
padding: 5%;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.tab-configuration .gui_box {
|
.tab-configuration .gui_box {
|
||||||
|
|
|
||||||
|
|
@ -96,3 +96,20 @@
|
||||||
.mixer-fixed-value-col {
|
.mixer-fixed-value-col {
|
||||||
display: none;
|
display: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.outputImageNumber {
|
||||||
|
position: absolute;
|
||||||
|
background-color: #FFF;
|
||||||
|
font-family: 'open_sansbold', Arial, serif;
|
||||||
|
width: 18px;
|
||||||
|
height: 18px;
|
||||||
|
border: 2.5px solid #ff00ff;
|
||||||
|
border-radius: 4px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.outputImageNumber.isMotor {
|
||||||
|
width: 29px;
|
||||||
|
height: 29px;
|
||||||
|
line-height: 27px;
|
||||||
|
border-radius: 20px;
|
||||||
|
}
|
||||||
112
tabs/mixer.js
112
tabs/mixer.js
|
|
@ -86,6 +86,116 @@ TABS.mixer.initialize = function (callback, scrollPosition) {
|
||||||
for (let i = 1; i <= OUTPUT_MAPPING.getOutputCount(); i++) {
|
for (let i = 1; i <= OUTPUT_MAPPING.getOutputCount(); i++) {
|
||||||
$('#function-' + i).html(outputMap[i - 1]);
|
$('#function-' + i).html(outputMap[i - 1]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
renderServoOutputImage(outputMap);
|
||||||
|
}
|
||||||
|
|
||||||
|
function renderServoOutputImage(outputMap) {
|
||||||
|
let mixerPreview = $('.mixerPreview');
|
||||||
|
mixerPreview.find('.outputImageNumber').remove();
|
||||||
|
|
||||||
|
if (MIXER_CONFIG.platformType == PLATFORM_AIRPLANE) {
|
||||||
|
if (outputMap != null && currentMixerPreset.hasOwnProperty('imageOutputsNumbers')) {
|
||||||
|
let outputPad = 1;
|
||||||
|
let outputArea = null;
|
||||||
|
let surfaceSet = {
|
||||||
|
aileron: false,
|
||||||
|
elevator: false,
|
||||||
|
rudder: false,
|
||||||
|
};
|
||||||
|
let motors = [];
|
||||||
|
let servoRules = SERVO_RULES;
|
||||||
|
|
||||||
|
for (let omIndex of outputMap) {
|
||||||
|
if (omIndex != '-') {
|
||||||
|
omIndex = omIndex.split(' ');
|
||||||
|
if (omIndex[0] == "Motor") {
|
||||||
|
motors.push(outputPad);
|
||||||
|
} else {
|
||||||
|
let servo = servoRules.getServoMixRuleFromTarget(omIndex[1]);
|
||||||
|
let divID = "servoPreview" + omIndex[1];
|
||||||
|
|
||||||
|
switch (servo.getInput()) {
|
||||||
|
case INPUT_STABILIZED_PITCH:
|
||||||
|
case INPUT_RC_PITCH:
|
||||||
|
mixerPreview.append('<div id="' + divID + '" class="outputImageNumber">S' + outputPad + '</div>');
|
||||||
|
|
||||||
|
outputArea = getOutputImageArea(currentMixerPreset.imageOutputsNumbers, INPUT_STABILIZED_PITCH, surfaceSet.elevator);
|
||||||
|
if (outputArea != null) {
|
||||||
|
$("#"+divID).css("top", outputArea.top + "px");
|
||||||
|
$("#"+divID).css("left", outputArea.left + "px");
|
||||||
|
$("#"+divID).css("border-color", outputArea.colour);
|
||||||
|
surfaceSet.elevator = true;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case INPUT_STABILIZED_ROLL:
|
||||||
|
case INPUT_RC_ROLL:
|
||||||
|
mixerPreview.append('<div id="' + divID + '" class="outputImageNumber">S' + outputPad + '</div>');
|
||||||
|
|
||||||
|
outputArea = getOutputImageArea(currentMixerPreset.imageOutputsNumbers, INPUT_STABILIZED_ROLL, surfaceSet.aileron);
|
||||||
|
if (outputArea != null) {
|
||||||
|
$("#"+divID).css("top", outputArea.top + "px");
|
||||||
|
$("#"+divID).css("left", outputArea.left + "px");
|
||||||
|
$("#"+divID).css("border-color", outputArea.colour);
|
||||||
|
surfaceSet.aileron = true;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case INPUT_STABILIZED_YAW:
|
||||||
|
case INPUT_RC_YAW:
|
||||||
|
mixerPreview.append('<div id="' + divID + '" class="outputImageNumber">S' + outputPad + '</div>');
|
||||||
|
|
||||||
|
outputArea = getOutputImageArea(currentMixerPreset.imageOutputsNumbers, INPUT_STABILIZED_YAW, surfaceSet.rudder);
|
||||||
|
if (outputArea != null) {
|
||||||
|
$("#"+divID).css("top", outputArea.top + "px");
|
||||||
|
$("#"+divID).css("left", outputArea.left + "px");
|
||||||
|
$("#"+divID).css("border-color", outputArea.colour);
|
||||||
|
surfaceSet.rudder = true;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
outputPad++;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (motors.length > 0) {
|
||||||
|
mixerPreview.append('<div id="motorsPreview" class="outputImageNumber isMotor">S' + motors.join('/') + '</div>');
|
||||||
|
|
||||||
|
outputArea = getOutputImageArea(currentMixerPreset.imageOutputsNumbers, INPUT_STABILIZED_THROTTLE, false);
|
||||||
|
if (outputArea != null) {
|
||||||
|
$("#motorsPreview").css("top", outputArea.top + "px");
|
||||||
|
$("#motorsPreview").css("left", outputArea.left + "px");
|
||||||
|
$("#motorsPreview").css("border-color", outputArea.colour);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function getOutputImageArea(outputImageAreas, input, secondSurface) {
|
||||||
|
let returnArea = null;
|
||||||
|
let firstAileronFound = false;
|
||||||
|
let firstRuddervatorFound = false;
|
||||||
|
|
||||||
|
for (let area of outputImageAreas) {
|
||||||
|
if (area.input == input) {
|
||||||
|
if ( input === INPUT_STABILIZED_THROTTLE
|
||||||
|
|| (input === INPUT_STABILIZED_YAW && !secondSurface)
|
||||||
|
|| ((input === INPUT_STABILIZED_ROLL && !secondSurface) || (input === INPUT_STABILIZED_ROLL && secondSurface && firstAileronFound))
|
||||||
|
|| ((input === INPUT_STABILIZED_PITCH && !secondSurface) || (input === INPUT_STABILIZED_PITCH && secondSurface && firstRuddervatorFound))
|
||||||
|
) {
|
||||||
|
returnArea = area;
|
||||||
|
break;
|
||||||
|
} else if (input === INPUT_STABILIZED_ROLL) {
|
||||||
|
firstAileronFound = true;
|
||||||
|
} else if (input === INPUT_STABILIZED_PITCH) {
|
||||||
|
firstRuddervatorFound = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return returnArea;
|
||||||
}
|
}
|
||||||
|
|
||||||
function renderServoMixRules() {
|
function renderServoMixRules() {
|
||||||
|
|
@ -383,6 +493,8 @@ TABS.mixer.initialize = function (callback, scrollPosition) {
|
||||||
|
|
||||||
$('.mixerPreview img').attr('src', './resources/motor_order/'
|
$('.mixerPreview img').attr('src', './resources/motor_order/'
|
||||||
+ currentMixerPreset.image + '.svg');
|
+ currentMixerPreset.image + '.svg');
|
||||||
|
|
||||||
|
renderServoOutputImage();
|
||||||
});
|
});
|
||||||
|
|
||||||
if (MIXER_CONFIG.appliedMixerPreset > -1) {
|
if (MIXER_CONFIG.appliedMixerPreset > -1) {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue