fly/IDG-A32X
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'master' of https://www.github.com/it0uchpods/IDG-A32X into elecECAM

Browse source
This commit is contained in:
Jonathan Redpath 2017-10-31 11:30:14 +00:00
commit b3a7b4dc65
260 changed files with 284328 additions and 321132 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
A318-100-CFM-set.xml
View file

@ -49,7 +49,7 @@
<config> <config>
<x-offset-m archive="y">-0.45</x-offset-m> <x-offset-m archive="y">-0.45</x-offset-m>
<y-offset-m archive="y">2.34</y-offset-m> <y-offset-m archive="y">2.34</y-offset-m>
<z-offset-m archive="y">-11.618</z-offset-m> <z-offset-m archive="y">-11.636</z-offset-m>
<pitch-offset-deg archive="y">-14.6</pitch-offset-deg> <pitch-offset-deg archive="y">-14.6</pitch-offset-deg>
<default-field-of-view-deg type="double">63</default-field-of-view-deg> <default-field-of-view-deg type="double">63</default-field-of-view-deg>
</config> </config>
@ -62,7 +62,7 @@
<from-model type="bool">true</from-model> <from-model type="bool">true</from-model>
<x-offset-m archive="y">0.45</x-offset-m> <x-offset-m archive="y">0.45</x-offset-m>
<y-offset-m archive="y">2.34</y-offset-m> <y-offset-m archive="y">2.34</y-offset-m>
<z-offset-m archive="y">-11.618</z-offset-m> <z-offset-m archive="y">-11.636</z-offset-m>
<pitch-offset-deg archive="y">-14.6</pitch-offset-deg> <pitch-offset-deg archive="y">-14.6</pitch-offset-deg>
<default-field-of-view-deg type="double">63</default-field-of-view-deg> <default-field-of-view-deg type="double">63</default-field-of-view-deg>
</config> </config>
@ -75,7 +75,7 @@
<from-model type="bool">true</from-model> <from-model type="bool">true</from-model>
<x-offset-m archive="y">0</x-offset-m> <x-offset-m archive="y">0</x-offset-m>
<y-offset-m archive="y">2.3635023</y-offset-m> <y-offset-m archive="y">2.3635023</y-offset-m>
<z-offset-m archive="y">-11.578</z-offset-m> <z-offset-m archive="y">-11.596</z-offset-m>
<pitch-offset-deg archive="y">65.5</pitch-offset-deg> <pitch-offset-deg archive="y">65.5</pitch-offset-deg>
<default-field-of-view-deg type="double">115</default-field-of-view-deg> <default-field-of-view-deg type="double">115</default-field-of-view-deg>
</config> </config>

2
A318-100-CFM.xml
View file

@ -28,7 +28,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
<vtailarm unit="FT" > 57.33 </vtailarm> <vtailarm unit="FT" > 57.33 </vtailarm>
<location name="AERORP" unit="M"> <location name="AERORP" unit="M">
<x> 19.4974 </x> <x> 19.3974 </x>
<y> 0 </y> <y> 0 </y>
<z> 0.19249 </z> <z> 0.19249 </z>
</location> </location>

6
A319-100-CFM-set.xml
View file

@ -49,7 +49,7 @@
<config> <config>
<x-offset-m archive="y">-0.45</x-offset-m> <x-offset-m archive="y">-0.45</x-offset-m>
<y-offset-m archive="y">2.34</y-offset-m> <y-offset-m archive="y">2.34</y-offset-m>
<z-offset-m archive="y">-12.138</z-offset-m> <z-offset-m archive="y">-12.16684</z-offset-m>
<pitch-offset-deg archive="y">-14.6</pitch-offset-deg> <pitch-offset-deg archive="y">-14.6</pitch-offset-deg>
<default-field-of-view-deg type="double">63</default-field-of-view-deg> <default-field-of-view-deg type="double">63</default-field-of-view-deg>
</config> </config>
@ -62,7 +62,7 @@
<from-model type="bool">true</from-model> <from-model type="bool">true</from-model>
<x-offset-m archive="y">0.45</x-offset-m> <x-offset-m archive="y">0.45</x-offset-m>
<y-offset-m archive="y">2.34</y-offset-m> <y-offset-m archive="y">2.34</y-offset-m>
<z-offset-m archive="y">-12.138</z-offset-m> <z-offset-m archive="y">-12.16684</z-offset-m>
<pitch-offset-deg archive="y">-14.6</pitch-offset-deg> <pitch-offset-deg archive="y">-14.6</pitch-offset-deg>
<default-field-of-view-deg type="double">63</default-field-of-view-deg> <default-field-of-view-deg type="double">63</default-field-of-view-deg>
</config> </config>
@ -75,7 +75,7 @@
<from-model type="bool">true</from-model> <from-model type="bool">true</from-model>
<x-offset-m archive="y">0</x-offset-m> <x-offset-m archive="y">0</x-offset-m>
<y-offset-m archive="y">2.3635023</y-offset-m> <y-offset-m archive="y">2.3635023</y-offset-m>
<z-offset-m archive="y">-12.098</z-offset-m> <z-offset-m archive="y">-12.12684</z-offset-m>
<pitch-offset-deg archive="y">65.5</pitch-offset-deg> <pitch-offset-deg archive="y">65.5</pitch-offset-deg>
<default-field-of-view-deg type="double">115</default-field-of-view-deg> <default-field-of-view-deg type="double">115</default-field-of-view-deg>
</config> </config>

2
A319-100-CFM.xml
View file

@ -28,7 +28,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
<vtailarm unit="FT" > 57.33 </vtailarm> <vtailarm unit="FT" > 57.33 </vtailarm>
<location name="AERORP" unit="M"> <location name="AERORP" unit="M">
<x> 19.4974 </x> <x> 19.3974 </x>
<y> 0 </y> <y> 0 </y>
<z> 0.19249 </z> <z> 0.19249 </z>
</location> </location>

6
A319-100-IAE-set.xml
View file

@ -49,7 +49,7 @@
<config> <config>
<x-offset-m archive="y">-0.45</x-offset-m> <x-offset-m archive="y">-0.45</x-offset-m>
<y-offset-m archive="y">2.34</y-offset-m> <y-offset-m archive="y">2.34</y-offset-m>
<z-offset-m archive="y">-12.138</z-offset-m> <z-offset-m archive="y">-12.16684</z-offset-m>
<pitch-offset-deg archive="y">-14.6</pitch-offset-deg> <pitch-offset-deg archive="y">-14.6</pitch-offset-deg>
<default-field-of-view-deg type="double">63</default-field-of-view-deg> <default-field-of-view-deg type="double">63</default-field-of-view-deg>
</config> </config>
@ -62,7 +62,7 @@
<from-model type="bool">true</from-model> <from-model type="bool">true</from-model>
<x-offset-m archive="y">0.45</x-offset-m> <x-offset-m archive="y">0.45</x-offset-m>
<y-offset-m archive="y">2.34</y-offset-m> <y-offset-m archive="y">2.34</y-offset-m>
<z-offset-m archive="y">-12.138</z-offset-m> <z-offset-m archive="y">-12.16684</z-offset-m>
<pitch-offset-deg archive="y">-14.6</pitch-offset-deg> <pitch-offset-deg archive="y">-14.6</pitch-offset-deg>
<default-field-of-view-deg type="double">63</default-field-of-view-deg> <default-field-of-view-deg type="double">63</default-field-of-view-deg>
</config> </config>
@ -75,7 +75,7 @@
<from-model type="bool">true</from-model> <from-model type="bool">true</from-model>
<x-offset-m archive="y">0</x-offset-m> <x-offset-m archive="y">0</x-offset-m>
<y-offset-m archive="y">2.3635023</y-offset-m> <y-offset-m archive="y">2.3635023</y-offset-m>
<z-offset-m archive="y">-12.098</z-offset-m> <z-offset-m archive="y">-12.12684</z-offset-m>
<pitch-offset-deg archive="y">65.5</pitch-offset-deg> <pitch-offset-deg archive="y">65.5</pitch-offset-deg>
<default-field-of-view-deg type="double">115</default-field-of-view-deg> <default-field-of-view-deg type="double">115</default-field-of-view-deg>
</config> </config>

2
A319-100-IAE.xml
View file

@ -28,7 +28,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
<vtailarm unit="FT" > 57.33 </vtailarm> <vtailarm unit="FT" > 57.33 </vtailarm>
<location name="AERORP" unit="M"> <location name="AERORP" unit="M">
<x> 19.4974 </x> <x> 19.3974 </x>
<y> 0 </y> <y> 0 </y>
<z> 0.19249 </z> <z> 0.19249 </z>
</location> </location>

6
A320-100-CFM.xml
View file

@ -28,7 +28,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
<vtailarm unit="FT" > 57.33 </vtailarm> <vtailarm unit="FT" > 57.33 </vtailarm>
<location name="AERORP" unit="M"> <location name="AERORP" unit="M">
<x> 19.4974 </x> <x> 19.3974 </x>
<y> 0 </y> <y> 0 </y>
<z> 0.19249 </z> <z> 0.19249 </z>
</location> </location>
@ -334,7 +334,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
</ground_reactions> </ground_reactions>
<propulsion> <propulsion>
<engine file="cfm56_5a4"> <engine file="cfm56_5b4">
<location unit="M"> <location unit="M">
<x> 14.3962788 </x> <x> 14.3962788 </x>
<y> -5.755 </y> <y> -5.755 </y>
@ -360,7 +360,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
</thruster> </thruster>
</engine> </engine>
<engine file="cfm56_5a4"> <engine file="cfm56_5b4">
<location unit="M"> <location unit="M">
<x> 14.3962788 </x> <x> 14.3962788 </x>
<y> 5.755 </y> <y> 5.755 </y>

2
A320-200-CFM.xml
View file

@ -28,7 +28,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
<vtailarm unit="FT" > 57.33 </vtailarm> <vtailarm unit="FT" > 57.33 </vtailarm>
<location name="AERORP" unit="M"> <location name="AERORP" unit="M">
<x> 19.4974 </x> <x> 19.3974 </x>
<y> 0 </y> <y> 0 </y>
<z> 0.19249 </z> <z> 0.19249 </z>
</location> </location>

2
A320-200-IAE.xml
View file

@ -28,7 +28,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
<vtailarm unit="FT" > 57.33 </vtailarm> <vtailarm unit="FT" > 57.33 </vtailarm>
<location name="AERORP" unit="M"> <location name="AERORP" unit="M">
<x> 19.4974 </x> <x> 19.3974 </x>
<y> 0 </y> <y> 0 </y>
<z> 0.19249 </z> <z> 0.19249 </z>
</location> </location>

10
A320-main.xml
View file

@ -565,15 +565,19 @@
<cockpit type="bool">0</cockpit> <cockpit type="bool">0</cockpit>
<cones type="bool">true</cones> <cones type="bool">true</cones>
<dome-norm type="double">0</dome-norm> <dome-norm type="double">0</dome-norm>
<fcu-panel-knb type="double">0</fcu-panel-knb>
<fcu-panel-norm type="double">0</fcu-panel-norm> <fcu-panel-norm type="double">0</fcu-panel-norm>
<landing-lights n="0" type="bool">0</landing-lights> <landing-lights n="0" type="double">0</landing-lights>
<landing-lights n="1" type="double">0</landing-lights> <landing-lights n="1" type="double">0</landing-lights>
<landing-lights n="2" type="double">0</landing-lights> <landing-lights n="2" type="double">0</landing-lights>
<main-flood-knb type="double">0</main-flood-knb>
<main-flood-norm type="double">0</main-flood-norm> <main-flood-norm type="double">0</main-flood-norm>
<main-panel-knb type="double">0</main-panel-knb>
<main-panel-norm type="double">0</main-panel-norm> <main-panel-norm type="double">0</main-panel-norm>
<nav-lights-switch type="int">0</nav-lights-switch> <nav-lights-switch type="int">0</nav-lights-switch>
<overhead-panel-norm type="double">0.0</overhead-panel-norm> <overhead-panel-knb type="double">0</overhead-panel-knb>
<main-panel-pedestal-norm type="double">0.8</main-panel-pedestal-norm> <overhead-panel-norm type="double">0</overhead-panel-norm>
<main-panel-pedestal-norm type="double">0</main-panel-pedestal-norm>
<strobe type="bool">0</strobe> <strobe type="bool">0</strobe>
<taxi-light-switch type="float">0</taxi-light-switch> <taxi-light-switch type="float">0</taxi-light-switch>
</lighting> </lighting>

2
A320neo-CFM.xml
View file

@ -28,7 +28,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
<vtailarm unit="FT" > 57.33 </vtailarm> <vtailarm unit="FT" > 57.33 </vtailarm>
<location name="AERORP" unit="M"> <location name="AERORP" unit="M">
<x> 19.4974 </x> <x> 19.3974 </x>
<y> 0 </y> <y> 0 </y>
<z> 0.19249 </z> <z> 0.19249 </z>
</location> </location>

2
A320neo-PW.xml
View file

@ -28,7 +28,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
<vtailarm unit="FT" > 57.33 </vtailarm> <vtailarm unit="FT" > 57.33 </vtailarm>
<location name="AERORP" unit="M"> <location name="AERORP" unit="M">
<x> 19.4974 </x> <x> 19.3974 </x>
<y> 0 </y> <y> 0 </y>
<z> 0.19249 </z> <z> 0.19249 </z>
</location> </location>

2
A321-200-CFM.xml
View file

@ -28,7 +28,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
<vtailarm unit="FT" > 57.33 </vtailarm> <vtailarm unit="FT" > 57.33 </vtailarm>
<location name="AERORP" unit="M"> <location name="AERORP" unit="M">
<x> 19.4974 </x> <x> 19.3974 </x>
<y> 0 </y> <y> 0 </y>
<z> 0.19249 </z> <z> 0.19249 </z>
</location> </location>

2
A321-200-IAE.xml
View file

@ -28,7 +28,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
<vtailarm unit="FT" > 57.33 </vtailarm> <vtailarm unit="FT" > 57.33 </vtailarm>
<location name="AERORP" unit="M"> <location name="AERORP" unit="M">
<x> 19.4974 </x> <x> 19.3974 </x>
<y> 0 </y> <y> 0 </y>
<z> 0.19249 </z> <z> 0.19249 </z>
</location> </location>

2
A321neo-CFM.xml
View file

@ -28,7 +28,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
<vtailarm unit="FT" > 57.33 </vtailarm> <vtailarm unit="FT" > 57.33 </vtailarm>
<location name="AERORP" unit="M"> <location name="AERORP" unit="M">
<x> 19.4974 </x> <x> 19.3974 </x>
<y> 0 </y> <y> 0 </y>
<z> 0.19249 </z> <z> 0.19249 </z>
</location> </location>

2
A321neo-PW.xml
View file

@ -28,7 +28,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
<vtailarm unit="FT" > 57.33 </vtailarm> <vtailarm unit="FT" > 57.33 </vtailarm>
<location name="AERORP" unit="M"> <location name="AERORP" unit="M">
<x> 19.4974 </x> <x> 19.3974 </x>
<y> 0 </y> <y> 0 </y>
<z> 0.19249 </z> <z> 0.19249 </z>
</location> </location>

16
A32X-Checklists.xml
View file

@ -805,23 +805,23 @@
<and> <and>
<equals> <equals>
<property>controls/lighting/landing-lights[1]</property> <property>controls/lighting/landing-lights[1]</property>
<value>1</value> <value>true</value>
</equals> </equals>
<equals> <equals>
<property>controls/lighting/landing-lights[2]</property> <property>controls/lighting/landing-lights[2]</property>
<value>1</value> <value>true</value>
</equals> </equals>
</and> </and>
</condition> </condition>
<binding> <binding>
<command>property-assign</command> <command>property-assign</command>
<property>controls/lighting/landing-lights[1]</property> <property>controls/lighting/landing-lights[1]</property>
<value>1</value> <value>true</value>
</binding> </binding>
<binding> <binding>
<command>property-assign</command> <command>property-assign</command>
<property>controls/lighting/landing-lights[2]</property> <property>controls/lighting/landing-lights[2]</property>
<value>1</value> <value>true</value>
</binding> </binding>
</item> </item>
<item> <item>
@ -955,23 +955,23 @@
<and> <and>
<equals> <equals>
<property>controls/lighting/landing-lights[1]</property> <property>controls/lighting/landing-lights[1]</property>
<value>0.5</value> <value>false</value>
</equals> </equals>
<equals> <equals>
<property>controls/lighting/landing-lights[2]</property> <property>controls/lighting/landing-lights[2]</property>
<value>0.5</value> <value>false</value>
</equals> </equals>
</and> </and>
</condition> </condition>
<binding> <binding>
<command>property-assign</command> <command>property-assign</command>
<property>controls/lighting/landing-lights[1]</property> <property>controls/lighting/landing-lights[1]</property>
<value>0.5</value> <value>false</value>
</binding> </binding>
<binding> <binding>
<command>property-assign</command> <command>property-assign</command>
<property>controls/lighting/landing-lights[2]</property> <property>controls/lighting/landing-lights[2]</property>
<value>0.5</value> <value>false</value>
</binding> </binding>
</item> </item>
<item> <item>

2
AircraftConfig/about.xml
View file

@ -40,7 +40,7 @@
<text> <text>
<halign>left</halign> <halign>left</halign>
<label>A32X Professional by it0uchpods Design Group</label> <label>A32X by it0uchpods Design Group</label>
</text> </text>
<text> <text>
<halign>left</halign> <halign>left</halign>

2
AircraftConfig/welcome.xml
View file

@ -39,7 +39,7 @@
<text> <text>
<halign>center</halign> <halign>center</halign>
<label>Welcome to the IDG A32X Professional!</label> <label>Welcome to the IDG A32X Series!</label>
</text> </text>
<text> <text>
<halign>center</halign> <halign>center</halign>

4
Models/A318-100-CFM.xml
View file

@ -25,8 +25,8 @@
<name>Flightdeck</name> <name>Flightdeck</name>
<path>Aircraft/IDG-A32X/Models/FlightDeck/a320.flightdeck.xml</path> <path>Aircraft/IDG-A32X/Models/FlightDeck/a320.flightdeck.xml</path>
<offsets> <offsets>
<x-m>6.94984</x-m> <x-m>6.93184</x-m>
<y-m>0.00263</y-m> <y-m>0.0</y-m>
<z-m>0.0</z-m> <z-m>0.0</z-m>
</offsets> </offsets>
</model> </model>

4
Models/A319-100-CFM.xml
View file

@ -25,8 +25,8 @@
<name>Flightdeck</name> <name>Flightdeck</name>
<path>Aircraft/IDG-A32X/Models/FlightDeck/a320.flightdeck.xml</path> <path>Aircraft/IDG-A32X/Models/FlightDeck/a320.flightdeck.xml</path>
<offsets> <offsets>
<x-m>6.42984</x-m> <x-m>6.401</x-m>
<y-m>0.00263</y-m> <y-m>0.0</y-m>
<z-m>0.0</z-m> <z-m>0.0</z-m>
</offsets> </offsets>
</model> </model>

4
Models/A319-100-IAE.xml
View file

@ -25,8 +25,8 @@
<name>Flightdeck</name> <name>Flightdeck</name>
<path>Aircraft/IDG-A32X/Models/FlightDeck/a320.flightdeck.xml</path> <path>Aircraft/IDG-A32X/Models/FlightDeck/a320.flightdeck.xml</path>
<offsets> <offsets>
<x-m>6.42984</x-m> <x-m>6.401</x-m>
<y-m>0.00263</y-m> <y-m>0.0</y-m>
<z-m>0.0</z-m> <z-m>0.0</z-m>
</offsets> </offsets>
</model> </model>

2
Models/A320-100-CFM.xml
View file

@ -27,7 +27,7 @@
<path>Aircraft/IDG-A32X/Models/FlightDeck/a320.flightdeck.xml</path> <path>Aircraft/IDG-A32X/Models/FlightDeck/a320.flightdeck.xml</path>
<offsets> <offsets>
<x-m>4.81794</x-m> <x-m>4.81794</x-m>
<y-m>0.00263</y-m> <y-m>0.0</y-m>
<z-m>0.0</z-m> <z-m>0.0</z-m>
</offsets> </offsets>
</model> </model>

2
Models/A320-200-CFM.xml
View file

@ -26,7 +26,7 @@
<path>Aircraft/IDG-A32X/Models/FlightDeck/a320.flightdeck.xml</path> <path>Aircraft/IDG-A32X/Models/FlightDeck/a320.flightdeck.xml</path>
<offsets> <offsets>
<x-m>4.81794</x-m> <x-m>4.81794</x-m>
<y-m>0.00263</y-m> <y-m>0.0</y-m>
<z-m>0.0</z-m> <z-m>0.0</z-m>
</offsets> </offsets>
</model> </model>

2
Models/A320-200-IAE.xml
View file

@ -26,7 +26,7 @@
<path>Aircraft/IDG-A32X/Models/FlightDeck/a320.flightdeck.xml</path> <path>Aircraft/IDG-A32X/Models/FlightDeck/a320.flightdeck.xml</path>
<offsets> <offsets>
<x-m>4.81794</x-m> <x-m>4.81794</x-m>
<y-m>0.00263</y-m> <y-m>0.0</y-m>
<z-m>0.0</z-m> <z-m>0.0</z-m>
</offsets> </offsets>
</model> </model>

2
Models/A320neo-CFM.xml
View file

@ -27,7 +27,7 @@
<path>Aircraft/IDG-A32X/Models/FlightDeck/a320.flightdeck.xml</path> <path>Aircraft/IDG-A32X/Models/FlightDeck/a320.flightdeck.xml</path>
<offsets> <offsets>
<x-m>4.81794</x-m> <x-m>4.81794</x-m>
<y-m>0.00263</y-m> <y-m>0.0</y-m>
<z-m>0.0</z-m> <z-m>0.0</z-m>
</offsets> </offsets>
</model> </model>

2
Models/A320neo-PW.xml
View file

@ -27,7 +27,7 @@
<path>Aircraft/IDG-A32X/Models/FlightDeck/a320.flightdeck.xml</path> <path>Aircraft/IDG-A32X/Models/FlightDeck/a320.flightdeck.xml</path>
<offsets> <offsets>
<x-m>4.81794</x-m> <x-m>4.81794</x-m>
<y-m>0.00263</y-m> <y-m>0.0</y-m>
<z-m>0.0</z-m> <z-m>0.0</z-m>
</offsets> </offsets>
</model> </model>

2
Models/A321-200-CFM.xml
View file

@ -27,7 +27,7 @@
<path>Aircraft/IDG-A32X/Models/FlightDeck/a320.flightdeck.xml</path> <path>Aircraft/IDG-A32X/Models/FlightDeck/a320.flightdeck.xml</path>
<offsets> <offsets>
<x-m>0.57984</x-m> <x-m>0.57984</x-m>
<y-m>0.00263</y-m> <y-m>0.0</y-m>
<z-m>0.0</z-m> <z-m>0.0</z-m>
</offsets> </offsets>
</model> </model>

2
Models/A321-200-IAE.xml
View file

@ -27,7 +27,7 @@
<path>Aircraft/IDG-A32X/Models/FlightDeck/a320.flightdeck.xml</path> <path>Aircraft/IDG-A32X/Models/FlightDeck/a320.flightdeck.xml</path>
<offsets> <offsets>
<x-m>0.57984</x-m> <x-m>0.57984</x-m>
<y-m>0.00263</y-m> <y-m>0.0</y-m>
<z-m>0.0</z-m> <z-m>0.0</z-m>
</offsets> </offsets>
</model> </model>

2
Models/A321neo-CFM.xml
View file

@ -27,7 +27,7 @@
<path>Aircraft/IDG-A32X/Models/FlightDeck/a320.flightdeck.xml</path> <path>Aircraft/IDG-A32X/Models/FlightDeck/a320.flightdeck.xml</path>
<offsets> <offsets>
<x-m>0.57984</x-m> <x-m>0.57984</x-m>
<y-m>0.00263</y-m> <y-m>0.0</y-m>
<z-m>0.0</z-m> <z-m>0.0</z-m>
</offsets> </offsets>
</model> </model>

2
Models/A321neo-PW.xml
View file

@ -27,7 +27,7 @@
<path>Aircraft/IDG-A32X/Models/FlightDeck/a320.flightdeck.xml</path> <path>Aircraft/IDG-A32X/Models/FlightDeck/a320.flightdeck.xml</path>
<offsets> <offsets>
<x-m>0.57984</x-m> <x-m>0.57984</x-m>
<y-m>0.00263</y-m> <y-m>0.0</y-m>
<z-m>0.0</z-m> <z-m>0.0</z-m>
</offsets> </offsets>
</model> </model>

22
Models/FlightDeck/a320.flightdeck.xml
View file

@ -2368,7 +2368,7 @@
</condition> </condition>
<command>nasal</command> <command>nasal</command>
<script> <script>
if (getprop("/instrumentation/efis/inputs/ndb") != 1) { if (getprop("/instrumentation/efis/inputs/NDB") != 1) {
libraries.cpt_efis_btns("ndb"); libraries.cpt_efis_btns("ndb");
} else { } else {
libraries.cpt_efis_btns("off"); libraries.cpt_efis_btns("off");
@ -2416,7 +2416,7 @@
</condition> </condition>
<command>nasal</command> <command>nasal</command>
<script> <script>
if (getprop("/instrumentation/efis[1]/inputs/ndb") != 1) { if (getprop("/instrumentation/efis[1]/inputs/NDB") != 1) {
libraries.fo_efis_btns("ndb"); libraries.fo_efis_btns("ndb");
} else { } else {
libraries.fo_efis_btns("off"); libraries.fo_efis_btns("off");
@ -4640,7 +4640,7 @@
<repeatable>true</repeatable> <repeatable>true</repeatable>
<binding> <binding>
<command>property-adjust</command> <command>property-adjust</command>
<property>controls/lighting/main-flood-norm</property> <property>controls/lighting/main-flood-knb</property>
<step>0.05</step> <step>0.05</step>
<max>1</max> <max>1</max>
</binding> </binding>
@ -4651,7 +4651,7 @@
<repeatable>true</repeatable> <repeatable>true</repeatable>
<binding> <binding>
<command>property-adjust</command> <command>property-adjust</command>
<property>controls/lighting/main-flood-norm</property> <property>controls/lighting/main-flood-knb</property>
<step>-0.05</step> <step>-0.05</step>
<min>0</min> <min>0</min>
</binding> </binding>
@ -4660,7 +4660,7 @@
<animation> <animation>
<type>rotate</type> <type>rotate</type>
<object-name>flood_lt_main</object-name> <object-name>flood_lt_main</object-name>
<property>controls/lighting/main-flood-norm</property> <property>controls/lighting/main-flood-knb</property>
<interpolation> <interpolation>
<entry><ind>0</ind><dep>-129</dep></entry> <entry><ind>0</ind><dep>-129</dep></entry>
<entry><ind>1</ind><dep>129</dep></entry> <entry><ind>1</ind><dep>129</dep></entry>
@ -4679,7 +4679,7 @@
<repeatable>true</repeatable> <repeatable>true</repeatable>
<binding> <binding>
<command>property-adjust</command> <command>property-adjust</command>
<property>controls/lighting/main-panel-norm</property> <property>controls/lighting/main-panel-knb</property>
<step>0.05</step> <step>0.05</step>
<max>1</max> <max>1</max>
</binding> </binding>
@ -4690,7 +4690,7 @@
<repeatable>true</repeatable> <repeatable>true</repeatable>
<binding> <binding>
<command>property-adjust</command> <command>property-adjust</command>
<property>controls/lighting/main-panel-norm</property> <property>controls/lighting/main-panel-knb</property>
<step>-0.05</step> <step>-0.05</step>
<min>0</min> <min>0</min>
</binding> </binding>
@ -4699,7 +4699,7 @@
<animation> <animation>
<type>rotate</type> <type>rotate</type>
<object-name>integ_lt</object-name> <object-name>integ_lt</object-name>
<property>controls/lighting/main-panel-norm</property> <property>controls/lighting/main-panel-knb</property>
<interpolation> <interpolation>
<entry><ind>0</ind><dep>-129</dep></entry> <entry><ind>0</ind><dep>-129</dep></entry>
<entry><ind>1</ind><dep>129</dep></entry> <entry><ind>1</ind><dep>129</dep></entry>
@ -4718,7 +4718,7 @@
<repeatable>true</repeatable> <repeatable>true</repeatable>
<binding> <binding>
<command>property-adjust</command> <command>property-adjust</command>
<property>controls/lighting/fcu-panel-norm</property> <property>controls/lighting/fcu-panel-knb</property>
<step>0.05</step> <step>0.05</step>
<max>1</max> <max>1</max>
</binding> </binding>
@ -4729,7 +4729,7 @@
<repeatable>true</repeatable> <repeatable>true</repeatable>
<binding> <binding>
<command>property-adjust</command> <command>property-adjust</command>
<property>controls/lighting/fcu-panel-norm</property> <property>controls/lighting/fcu-panel-knb</property>
<step>-0.05</step> <step>-0.05</step>
<min>0</min> <min>0</min>
</binding> </binding>
@ -4739,7 +4739,7 @@
<!--animation> <!--animation>
<type>rotate</type> <type>rotate</type>
<object-name>fcu_integ_knb</object-name> <object-name>fcu_integ_knb</object-name>
<property>controls/lighting/fcu-panel-norm</property> <property>controls/lighting/fcu-panel-knb</property>
<factor>10</factor> <factor>10</factor>
<axis> <axis>
<x1-m>-0.45533</x1-m> <x1-m>-0.45533</x1-m>

4
Models/FlightDeck/res/fd_complete.ac
View file

@ -37560,7 +37560,7 @@ OBJECT poly
name "brightness_panel_left_glare" name "brightness_panel_left_glare"
data 32 data 32
brightness_panel_left_glare.mesh brightness_panel_left_glare.mesh
texture "Brightness.png" texture "brightness.png"
crease 40.000000 crease 40.000000
numvert 10 numvert 10
-0.5701 0.27597 0.76831 -0.5701 0.27597 0.76831
@ -37592,7 +37592,7 @@ OBJECT poly
name "brightness_panel_right_glare" name "brightness_panel_right_glare"
data 33 data 33
brightness_panel_right_glare.mesh brightness_panel_right_glare.mesh
texture "Brightness.png" texture "brightness.png"
crease 40.000000 crease 40.000000
numvert 10 numvert 10
-0.5701 0.27597 -0.76831 -0.5701 0.27597 -0.76831

BIN
Models/Fuselages/A318/res/A318-nose.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 26 KiB

After

Width:  |  Height:  |  Size: 24 KiB

BIN
Models/Fuselages/A318/res/A318.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 414 KiB

After

Width:  |  Height:  |  Size: 411 KiB

148451
Models/Fuselages/A318/res/fuselage.ac
View file

File diff suppressed because it is too large Load diff

103928
Models/Fuselages/A319/res/fuselage.ac
View file

File diff suppressed because it is too large Load diff

22
Models/Instruments/Lower-ECAM/Lower-ECAM.nas
View file

@ -229,7 +229,7 @@ var canvas_lowerECAM_apu = {
} }
if (getprop("/controls/pneumatic/switches/bleedapu") == 1) { if (getprop("/controls/pneumatic/switches/bleedapu") == 1) {
me["APUBleedValve"].setRotation(90*D2R); me["APUBleedValve"].setRotation(90 * D2R);
me["APUBleedOnline"].show(); me["APUBleedOnline"].show();
} else { } else {
me["APUBleedValve"].setRotation(0); me["APUBleedValve"].setRotation(0);
@ -253,8 +253,8 @@ var canvas_lowerECAM_apu = {
me["APUEGT"].setColor(0.7333,0.3803,0); me["APUEGT"].setColor(0.7333,0.3803,0);
me["APUEGT"].setText(sprintf("%s", "XX")); me["APUEGT"].setText(sprintf("%s", "XX"));
} }
me["APUN-needle"].setRotation((getprop("/ECAM/Lower/APU-N") + 90)*D2R); me["APUN-needle"].setRotation((getprop("/ECAM/Lower/APU-N") + 90) * D2R);
me["APUEGT-needle"].setRotation((getprop("/ECAM/Lower/APU-EGT") + 90)*D2R); me["APUEGT-needle"].setRotation((getprop("/ECAM/Lower/APU-EGT") + 90) * D2R);
me.updateBottomStatus(); me.updateBottomStatus();
}, },
@ -277,8 +277,8 @@ var canvas_lowerECAM_eng = {
me["OilQT1-decimal"].setText(sprintf("%s", int(10*math.mod(getprop("/engines/engine[0]/oil-qt-actual"),1)))); me["OilQT1-decimal"].setText(sprintf("%s", int(10*math.mod(getprop("/engines/engine[0]/oil-qt-actual"),1))));
me["OilQT2-decimal"].setText(sprintf("%s", int(10*math.mod(getprop("/engines/engine[1]/oil-qt-actual"),1)))); me["OilQT2-decimal"].setText(sprintf("%s", int(10*math.mod(getprop("/engines/engine[1]/oil-qt-actual"),1))));
me["OilQT1-needle"].setRotation((getprop("/ECAM/Lower/Oil-QT[0]") + 90)*D2R); me["OilQT1-needle"].setRotation((getprop("/ECAM/Lower/Oil-QT[0]") + 90) * D2R);
me["OilQT2-needle"].setRotation((getprop("/ECAM/Lower/Oil-QT[1]") + 90)*D2R); me["OilQT2-needle"].setRotation((getprop("/ECAM/Lower/Oil-QT[1]") + 90) * D2R);
# Oil Pressure # Oil Pressure
if (getprop("/engines/engine[0]/oil-psi-actual") >= 20) { if (getprop("/engines/engine[0]/oil-psi-actual") >= 20) {
@ -300,8 +300,8 @@ var canvas_lowerECAM_eng = {
me["OilPSI1"].setText(sprintf("%s", math.round(getprop("/engines/engine[0]/oil-psi-actual")))); me["OilPSI1"].setText(sprintf("%s", math.round(getprop("/engines/engine[0]/oil-psi-actual"))));
me["OilPSI2"].setText(sprintf("%s", math.round(getprop("/engines/engine[1]/oil-psi-actual")))); me["OilPSI2"].setText(sprintf("%s", math.round(getprop("/engines/engine[1]/oil-psi-actual"))));
me["OilPSI1-needle"].setRotation((getprop("/ECAM/Lower/Oil-PSI[0]") + 90)*D2R); me["OilPSI1-needle"].setRotation((getprop("/ECAM/Lower/Oil-PSI[0]") + 90) * D2R);
me["OilPSI2-needle"].setRotation((getprop("/ECAM/Lower/Oil-PSI[1]") + 90)*D2R); me["OilPSI2-needle"].setRotation((getprop("/ECAM/Lower/Oil-PSI[1]") + 90) * D2R);
me.updateBottomStatus(); me.updateBottomStatus();
}, },
@ -814,10 +814,10 @@ var canvas_lowerECAM_wheel = {
} }
# Gear Doors # Gear Doors
me["leftdoor"].setRotation(getprop("/ECAM/Lower/door-left")*D2R); me["leftdoor"].setRotation(getprop("/ECAM/Lower/door-left") * D2R);
me["rightdoor"].setRotation(getprop("/ECAM/Lower/door-right")*D2R); me["rightdoor"].setRotation(getprop("/ECAM/Lower/door-right") * D2R);
me["nosegeardoorL"].setRotation(getprop("/ECAM/Lower/door-nose-left")*D2R); me["nosegeardoorL"].setRotation(getprop("/ECAM/Lower/door-nose-left") * D2R);
me["nosegeardoorR"].setRotation(getprop("/ECAM/Lower/door-nose-right")*D2R); me["nosegeardoorR"].setRotation(getprop("/ECAM/Lower/door-nose-right") * D2R);
if (nosedoor == 0) { if (nosedoor == 0) {
me["nosegeardoorL"].setColorFill(0.0667,0.7294,0.3137); me["nosegeardoorL"].setColorFill(0.0667,0.7294,0.3137);

6
Models/Instruments/OHpanel/OHpanel.xml
View file

@ -5738,7 +5738,7 @@
<repeatable>true</repeatable> <repeatable>true</repeatable>
<binding> <binding>
<command>property-adjust</command> <command>property-adjust</command>
<property>controls/lighting/overhead-panel-norm</property> <property>controls/lighting/overhead-panel-knb</property>
<step>0.05</step> <step>0.05</step>
<max>1</max> <max>1</max>
</binding> </binding>
@ -5749,7 +5749,7 @@
<repeatable>true</repeatable> <repeatable>true</repeatable>
<binding> <binding>
<command>property-adjust</command> <command>property-adjust</command>
<property>controls/lighting/overhead-panel-norm</property> <property>controls/lighting/overhead-panel-knb</property>
<step>-0.05</step> <step>-0.05</step>
<min>0</min> <min>0</min>
</binding> </binding>
@ -5759,7 +5759,7 @@
<name>Overhead panel light rotate</name> <name>Overhead panel light rotate</name>
<type>rotate</type> <type>rotate</type>
<object-name>OHPMarkLtKnb</object-name> <object-name>OHPMarkLtKnb</object-name>
<property>controls/lighting/overhead-panel-norm</property> <property>controls/lighting/overhead-panel-knb</property>
<interpolation> <interpolation>
<entry><ind>0</ind><dep>129</dep></entry> <entry><ind>0</ind><dep>129</dep></entry>
<entry><ind>1</ind><dep>-129</dep></entry> <entry><ind>1</ind><dep>-129</dep></entry>

37
Models/Instruments/PFD-WIP/PFD1.nas
View file

@ -99,7 +99,7 @@ var canvas_PFD_1 = {
getKeys: func() { getKeys: func() {
return ["FMA_man","FMA_manmode","FMA_flxtemp","FMA_thrust","FMA_lvrclb","FMA_pitch","FMA_pitcharm","FMA_pitcharm2","FMA_roll","FMA_rollarm","FMA_combined","FMA_catmode","FMA_cattype","FMA_nodh","FMA_dh","FMA_dhn","FMA_ap","FMA_fd","FMA_athr", return ["FMA_man","FMA_manmode","FMA_flxtemp","FMA_thrust","FMA_lvrclb","FMA_pitch","FMA_pitcharm","FMA_pitcharm2","FMA_roll","FMA_rollarm","FMA_combined","FMA_catmode","FMA_cattype","FMA_nodh","FMA_dh","FMA_dhn","FMA_ap","FMA_fd","FMA_athr",
"FMA_man_box","FMA_flx_box","FMA_thrust_box","FMA_pitch_box","FMA_pitcharm_box","FMA_roll_box","FMA_rollarm_box","FMA_combined_box","FMA_catmode_box","FMA_cattype_box","FMA_cat_box","FMA_dh_box","FMA_ap_box","FMA_fd_box","FMA_athr_box","FMA_Middle1", "FMA_man_box","FMA_flx_box","FMA_thrust_box","FMA_pitch_box","FMA_pitcharm_box","FMA_roll_box","FMA_rollarm_box","FMA_combined_box","FMA_catmode_box","FMA_cattype_box","FMA_cat_box","FMA_dh_box","FMA_ap_box","FMA_fd_box","FMA_athr_box","FMA_Middle1",
"FMA_Middle2","ASI_scale","ASI_target","AI_center","AI_bank","AI_slipskid","FD_roll","FD_pitch","ALT_digits","ALT_tens","VS_pointer","QNH_setting","LOC_pointer","LOC_scale","GS_scale","GS_pointer"]; "FMA_Middle2","ASI_scale","ASI_target","AI_center","AI_bank","AI_slipskid","FD_roll","FD_pitch","ALT_digits","ALT_tens","VS_pointer","QNH_setting","LOC_pointer","LOC_scale","GS_scale","GS_pointer","HDG_target"];
}, },
update: func() { update: func() {
state1 = getprop("/systems/thrust/state1"); state1 = getprop("/systems/thrust/state1");
@ -327,7 +327,7 @@ var canvas_PFD_1 = {
me["ASI_target"].setTranslation(0, ASItrgt * -6.6); me["ASI_target"].setTranslation(0, ASItrgt * -6.6);
# Attitude Indicator # Attitude Indicator
me["AI_slipskid"].setTranslation(getprop("/instrumentation/slip-skid-ball/indicated-slip-skid") * -20, 0); me["AI_slipskid"].setTranslation(getprop("/instrumentation/slip-skid-ball/indicated-slip-skid") * -15, 0);
me["AI_bank"].setRotation(-roll * D2R); me["AI_bank"].setRotation(-roll * D2R);
if (fd1 == 1 and ((!wow1 and !wow2 and roll_mode != " ") or roll_mode != " ") and getprop("/it-autoflight/custom/trk-fpa") == 0 and pitch < 25 and pitch > -13 and roll < 45 and roll > -45) { if (fd1 == 1 and ((!wow1 and !wow2 and roll_mode != " ") or roll_mode != " ") and getprop("/it-autoflight/custom/trk-fpa") == 0 and pitch < 25 and pitch > -13 and roll < 45 and roll > -45) {
@ -343,15 +343,15 @@ var canvas_PFD_1 = {
} }
if (getprop("/it-autoflight/fd/roll-bar") != nil) { if (getprop("/it-autoflight/fd/roll-bar") != nil) {
me["FD_roll"].setTranslation((getprop("/it-autoflight/fd/roll-bar"))*2.0, 0); me["FD_roll"].setTranslation((getprop("/it-autoflight/fd/roll-bar")) * 2.2, 0);
} }
if (getprop("/it-autoflight/fd/pitch-bar") != nil) { if (getprop("/it-autoflight/fd/pitch-bar") != nil) {
me["FD_pitch"].setTranslation(0, -(getprop("/it-autoflight/fd/pitch-bar"))*3.8); me["FD_pitch"].setTranslation(0, -(getprop("/it-autoflight/fd/pitch-bar")) * 3.8);
} }
# Altitude # Altitude
me["ALT_digits"].setText(sprintf("%s", getprop("/instrumentation/altimeter/indicated-altitude-ft-pfd"))); me["ALT_digits"].setText(sprintf("%s", getprop("/instrumentation/altimeter/indicated-altitude-ft-pfd")));
altTens = num(right(sprintf("%02d", getprop("/instrumentation/altimeter/indicated-altitude-ft1")), 2)); altTens = num(right(sprintf("%02d", getprop("/instrumentation/altimeter/indicated-altitude-ft")), 2));
me["ALT_tens"].setTranslation(0, altTens * 1.392); me["ALT_tens"].setTranslation(0, altTens * 1.392);
# QNH # QNH
@ -368,19 +368,38 @@ var canvas_PFD_1 = {
# ILS # ILS
if (getprop("/modes/pfd/ILS1") == 1) { if (getprop("/modes/pfd/ILS1") == 1) {
me["LOC_pointer"].show();
me["LOC_scale"].show(); me["LOC_scale"].show();
me["GS_pointer"].show();
me["GS_scale"].show(); me["GS_scale"].show();
} else { } else {
me["LOC_pointer"].hide();
me["LOC_scale"].hide(); me["LOC_scale"].hide();
me["GS_pointer"].hide();
me["GS_scale"].hide(); me["GS_scale"].hide();
} }
if (getprop("/modes/pfd/ILS1") == 1 and getprop("/instrumentation/nav[0]/in-range") == 1 and getprop("/instrumentation/nav[0]/nav-loc") == 1) {
me["LOC_pointer"].show();
} else {
me["LOC_pointer"].hide();
}
if (getprop("/modes/pfd/ILS1") == 1 and getprop("/instrumentation/nav[0]/gs-in-range") == 1 and getprop("/instrumentation/nav[0]/has-gs") == 1) {
me["GS_pointer"].show();
} else {
me["GS_pointer"].hide();
}
me["LOC_pointer"].setTranslation(-(getprop("/instrumentation/nav[0]/heading-needle-deflection-norm")) * 197, 0);
me["GS_pointer"].setTranslation(0, getprop("/instrumentation/nav[0]/gs-needle-deflection-norm") * 197);
# Heading
# if (getprop("/it-autoflight/custom/show-hdg") == 1) {
# me["HDG_target"].show();
# } else {
me["HDG_target"].hide();
# }
}, },
}; };
setprop("/testing", 0); # REMOVE WHEN PFD FINISHED
setlistener("sim/signals/fdm-initialized", func { setlistener("sim/signals/fdm-initialized", func {
PFD_display = canvas.new({ PFD_display = canvas.new({
"name": "PFD", "name": "PFD",

807
Models/Instruments/PFD-WIP/res/pfd.svg
View file

@ -42,9 +42,9 @@
inkscape:window-height="1030" inkscape:window-height="1030"
id="namedview371" id="namedview371"
showgrid="true" showgrid="true"
inkscape:zoom="2" inkscape:zoom="0.5"
inkscape:cx="1154.5378" inkscape:cx="597.50413"
inkscape:cy="680.15216" inkscape:cy="374.5689"
inkscape:window-x="1592" inkscape:window-x="1592"
inkscape:window-y="-8" inkscape:window-y="-8"
inkscape:window-maximized="1" inkscape:window-maximized="1"
@ -70,7 +70,40 @@
preserveAspectRatio="none" preserveAspectRatio="none"
height="1023.9705" height="1023.9705"
width="1024" width="1024"
style="fill:#000000;fill-opacity:0" /> style="display:none;fill:#000000;fill-opacity:0" />
<rect
y="941.81335"
x="213.5808"
height="64.058205"
width="469.54089"
id="rect4416"
style="fill:#646364;fill-opacity:1;stroke:none;stroke-width:2.4000001;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
<path
sodipodi:nodetypes="cc"
inkscape:connector-curvature="0"
id="path4422"
d="m 211.98006,940.2104 472.74554,0"
style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995403;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
<rect
inkscape:label="#rect9211"
y="887.36865"
x="213.58055"
height="54.440548"
width="469.54053"
id="HDG_target_clip"
style="opacity:0.46000001;fill:#ff00ff;fill-opacity:1;stroke:none;stroke-width:1.27696717;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<path
sodipodi:nodetypes="cc"
inkscape:connector-curvature="0"
id="path4418"
d="m 684.7256,940.31065 3.2e-4,64.06045"
style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995403;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
<path
style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995403;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke"
d="m 211.98006,940.21065 0,64.06045"
id="path4420"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cc" />
<path <path
sodipodi:nodetypes="cc" sodipodi:nodetypes="cc"
inkscape:connector-curvature="0" inkscape:connector-curvature="0"
@ -80,9 +113,9 @@
<rect <rect
style="opacity:0.46000001;fill:#ff00ff;fill-opacity:1;stroke:none;stroke-width:1.27696717;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" style="opacity:0.46000001;fill:#ff00ff;fill-opacity:1;stroke:none;stroke-width:1.27696717;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="ASI_target_clip" id="ASI_target_clip"
width="35.522545" width="34.79776"
height="551.97998" height="551.97998"
x="124.63017" x="125.35496"
y="237.04402" y="237.04402"
inkscape:label="#rect9211" /> inkscape:label="#rect9211" />
<path <path
@ -91,7 +124,7 @@
inkscape:connector-curvature="0" inkscape:connector-curvature="0"
id="ASI_target" id="ASI_target"
d="m 157.88678,491.12121 -10e-6,43.41526 -40.47717,-21.70763 z" d="m 157.88678,491.12121 -10e-6,43.41526 -40.47717,-21.70763 z"
style="fill:none;fill-opacity:1;stroke:#ac5aae;stroke-width:4;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> style="fill:none;fill-opacity:1;stroke:#238995;stroke-width:4;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
<rect <rect
style="fill:#646364;fill-opacity:1;stroke:none;stroke-width:2.4000001;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" style="fill:#646364;fill-opacity:1;stroke:none;stroke-width:2.4000001;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke"
id="ASI_grey" id="ASI_grey"
@ -102,17 +135,226 @@
inkscape:label="#rect4351" /> inkscape:label="#rect4351" />
<rect <rect
inkscape:label="#rect9211" inkscape:label="#rect9211"
y="237.04402" y="237.03366"
x="10.8752" x="7.6752005"
height="551.97998" height="552.00073"
width="111.2864" width="117.69082"
id="ASI_scale_clip" id="ASI_scale_clip"
style="opacity:0.46000001;fill:#ff00ff;fill-opacity:1;stroke:none;stroke-width:1.27696717;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> style="opacity:0.46000001;fill:#ff00ff;fill-opacity:1;stroke:none;stroke-width:1.27696717;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<path
style="fill:#646364;fill-opacity:1;stroke:none;stroke-width:4.17444229;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 951.90716,178.46607 30.52166,-1.3e-4 31.97198,102.24587 0,464.27063 -31.97198,102.24587 -30.52166,1.5e-4 z"
id="rect5044"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccccc" />
<g
id="g5112"
transform="matrix(1.0666667,0,0,1.066636,0,-0.50381959)">
<text
xml:space="preserve"
style="font-style:normal;font-weight:normal;font-size:26.30309105px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#cecdce;fill-opacity:1;stroke:none;stroke-width:0.65757734"
x="1019.0017"
y="569.32635"
id="text5096"
transform="scale(0.87676975,1.1405503)"><tspan
sodipodi:role="line"
id="tspan5094"
x="1019.0017"
y="569.32635"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:29.77171135px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#cecdce;fill-opacity:1;stroke-width:0.65757734">1</tspan></text>
<text
transform="scale(0.87676975,1.1405503)"
id="text5100"
y="628.34387"
x="1019.0017"
style="font-style:normal;font-weight:normal;font-size:26.30309105px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#cecdce;fill-opacity:1;stroke:none;stroke-width:0.65757734"
xml:space="preserve"><tspan
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:29.77171135px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#cecdce;fill-opacity:1;stroke-width:0.65757734"
y="628.34387"
x="1019.0017"
id="tspan5098"
sodipodi:role="line">2</tspan></text>
<text
xml:space="preserve"
style="font-style:normal;font-weight:normal;font-size:26.30309105px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#cecdce;fill-opacity:1;stroke:none;stroke-width:0.65757734"
x="1019.0017"
y="687.27924"
id="text5104"
transform="scale(0.87676975,1.1405503)"><tspan
sodipodi:role="line"
id="tspan5102"
x="1019.0017"
y="687.27924"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:29.77171135px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#cecdce;fill-opacity:1;stroke-width:0.65757734">6</tspan></text>
</g>
<g
id="g5092"
transform="matrix(1.0666667,0,0,-1.066636,0,1026.1924)">
<rect
style="fill:#cecdce;fill-opacity:1;stroke:none;stroke-width:3.43548703;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect5080"
width="9.9375"
height="3.4620874"
x="911.8125"
y="400.32764" />
<rect
y="287.02451"
x="911.8125"
height="3.4620874"
width="9.9375"
id="rect5082"
style="fill:#cecdce;fill-opacity:1;stroke:none;stroke-width:3.43548703;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<rect
style="fill:#cecdce;fill-opacity:1;stroke:none;stroke-width:4.68189859;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect5084"
width="9.9375"
height="6.4299178"
x="911.8125"
y="319.32944" />
<rect
y="251.79059"
x="911.8125"
height="6.4299178"
width="9.9375"
id="rect5086"
style="fill:#cecdce;fill-opacity:1;stroke:none;stroke-width:4.68189859;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<rect
style="fill:#cecdce;fill-opacity:1;stroke:none;stroke-width:3.43548703;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect5088"
width="9.9375"
height="3.4620874"
x="911.8125"
y="219.53999" />
<rect
y="184.36314"
x="912.28125"
height="6.4299173"
width="9.9375"
id="rect5090"
style="fill:#cecdce;fill-opacity:1;stroke:none;stroke-width:4.68189859;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
</g>
<g
id="g4317">
<text
transform="scale(0.87678236,1.1405339)"
id="text5130"
y="183.6866"
x="1086.9194"
style="font-style:normal;font-weight:normal;font-size:28.05622673px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#cecdce;fill-opacity:1;stroke:none;stroke-width:0.65757734"
xml:space="preserve"><tspan
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:31.75603485px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#cecdce;fill-opacity:1;stroke-width:0.65757734"
y="183.6866"
x="1086.9194"
id="tspan5128"
sodipodi:role="line">6</tspan></text>
<text
xml:space="preserve"
style="font-style:normal;font-weight:normal;font-size:28.05622673px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#cecdce;fill-opacity:1;stroke:none;stroke-width:0.65757734"
x="1086.9194"
y="246.63768"
id="text5134"
transform="scale(0.87678236,1.1405339)"><tspan
sodipodi:role="line"
id="tspan5132"
x="1086.9194"
y="246.63768"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:31.75603485px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#cecdce;fill-opacity:1;stroke-width:0.65757734">2</tspan></text>
<text
transform="scale(0.87678236,1.1405339)"
id="text5138"
y="309.50116"
x="1086.9194"
style="font-style:normal;font-weight:normal;font-size:28.05622673px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#cecdce;fill-opacity:1;stroke:none;stroke-width:0.65757734"
xml:space="preserve"><tspan
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:31.75603485px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#cecdce;fill-opacity:1;stroke-width:0.65757734"
y="309.50116"
x="1086.9194"
id="tspan5136"
sodipodi:role="line">1</tspan></text>
</g>
<g
id="g5078"
transform="matrix(1.0666667,0,0,1.066636,0,-0.50381959)">
<rect
y="400.32764"
x="911.8125"
height="3.4620874"
width="9.9375"
id="rect5047"
style="fill:#cecdce;fill-opacity:1;stroke:none;stroke-width:3.43548703;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<rect
style="fill:#cecdce;fill-opacity:1;stroke:none;stroke-width:3.43548703;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect5049"
width="9.9375"
height="3.4620874"
x="911.8125"
y="287.02451" />
<rect
y="319.32944"
x="911.8125"
height="6.4299178"
width="9.9375"
id="rect5051"
style="fill:#cecdce;fill-opacity:1;stroke:none;stroke-width:4.68189859;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<rect
style="fill:#cecdce;fill-opacity:1;stroke:none;stroke-width:4.68189859;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect5053"
width="9.9375"
height="6.4299178"
x="911.8125"
y="251.79059" />
<rect
y="219.53999"
x="911.8125"
height="3.4620874"
width="9.9375"
id="rect5055"
style="fill:#cecdce;fill-opacity:1;stroke:none;stroke-width:3.43548703;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<rect
style="fill:#cecdce;fill-opacity:1;stroke:none;stroke-width:4.68189859;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect5053-8"
width="9.9375"
height="6.4299173"
x="912.28125"
y="184.36314" />
</g>
<path
style="opacity:0.46000001;fill:#ff00ff;fill-opacity:1;stroke:none;stroke-width:1.27696717;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 975.6317,177.03888 47.5897,0 c -0.052,113.09539 0.026,226.19024 0,339.28612 -0.026,110.77565 -0.158,221.55229 0,332.33137 l -47.5897,0 z"
id="VS_pointer_clip"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccsccc"
inkscape:label="#VS_pointer_clip" />
<rect
inkscape:label="#rect4954"
y="-983.19305"
x="509.09619"
height="33.214977"
width="7.7970567"
id="rect5040"
style="fill:#bfcc2a;fill-opacity:1;stroke:none;stroke-width:3.45797205;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
transform="matrix(0,1,-1,0,0,0)" />
<path
style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke"
d="m 854.63039,560.79086 0,226.6383"
id="path4309"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cc" />
<rect
transform="matrix(0,1,-1,0,0,0)"
style="fill:#11ba50;fill-opacity:1;stroke:none;stroke-width:3.89981294;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="VS_pointer"
width="6.5950012"
height="361.44022"
x="509.69724"
y="-1060.036"
inkscape:label="#rect4954"
inkscape:transform-center-x="170.07916" />
<g <g
id="ASI_scale" id="ASI_scale"
inkscape:label="#g4604" inkscape:label="#g3847">
transform="translate(0,-763.04395)">
<g <g
transform="translate(0,-763.04395)"
inkscape:label="#g4464" inkscape:label="#g4464"
id="ASI_scalenum"> id="ASI_scalenum">
<text <text
@ -377,6 +619,7 @@
sodipodi:role="line">420</tspan></text> sodipodi:role="line">420</tspan></text>
</g> </g>
<g <g
transform="translate(0,-763.04395)"
inkscape:label="#g4562" inkscape:label="#g4562"
id="ASI_scaletick"> id="ASI_scaletick">
<path <path
@ -615,227 +858,42 @@
style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995403;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995403;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
<path <path
style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995403;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995403;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke"
d="m 105.17928,-1298.3456 17.06206,0" d="m 105.17928,-1298.3456 17.06206,-10e-5"
id="path4560" id="path4560"
inkscape:connector-curvature="0" inkscape:connector-curvature="0"
sodipodi:nodetypes="cc" /> sodipodi:nodetypes="cc" />
</g> </g>
<path
style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995403;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke"
d="m 123.76482,-2061.3896 0,2574.1872"
id="ASI_line"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cc" />
</g> </g>
<path
style="fill:#646364;fill-opacity:1;stroke:none;stroke-width:4.17444229;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 951.90716,178.46607 30.52166,-1.3e-4 31.97198,102.24587 0,464.27063 -31.97198,102.24587 -30.52166,1.5e-4 z"
id="rect5044"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccccc" />
<g <g
id="g5112" id="ASI_index"
inkscape:label="#g949"
transform="matrix(1.0666667,0,0,1.066636,0,-0.50381959)"> transform="matrix(1.0666667,0,0,1.066636,0,-0.50381959)">
<text <path
xml:space="preserve" sodipodi:nodetypes="cc"
style="font-style:normal;font-weight:normal;font-size:26.30309105px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#cecdce;fill-opacity:1;stroke:none;stroke-width:0.65757734" inkscape:connector-curvature="0"
x="1019.0017" id="path930"
y="569.32635" d="m 92.069682,481.26097 42.765978,0"
id="text5096" style="fill:none;fill-opacity:1;stroke:#bfcc2a;stroke-width:4.5;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
transform="scale(0.87676975,1.1405503)"><tspan <path
sodipodi:role="line" sodipodi:nodetypes="cccc"
id="tspan5094" inkscape:connector-curvature="0"
x="1019.0017" id="path928"
y="569.32635" d="m 142.62916,491.54141 0,-20.391 -17.13886,10.1955 z"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:29.77171135px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#cecdce;fill-opacity:1;stroke-width:0.65757734">1</tspan></text> style="fill:#bfcc2a;fill-opacity:1;stroke:none;stroke-width:2.71116304;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke"
<text inkscape:label="#path905" />
transform="scale(0.87676975,1.1405503)" <path
id="text5100" style="fill:none;fill-opacity:1;stroke:#bfcc2a;stroke-width:4.5;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke"
y="628.34387" d="m 2.3529052,481.26097 6.5316019,0"
x="1019.0017" id="path944"
style="font-style:normal;font-weight:normal;font-size:26.30309105px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#cecdce;fill-opacity:1;stroke:none;stroke-width:0.65757734" inkscape:connector-curvature="0"
xml:space="preserve"><tspan sodipodi:nodetypes="cc" />
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:29.77171135px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#cecdce;fill-opacity:1;stroke-width:0.65757734"
y="628.34387"
x="1019.0017"
id="tspan5098"
sodipodi:role="line">2</tspan></text>
<text
xml:space="preserve"
style="font-style:normal;font-weight:normal;font-size:26.30309105px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#cecdce;fill-opacity:1;stroke:none;stroke-width:0.65757734"
x="1019.0017"
y="687.27924"
id="text5104"
transform="scale(0.87676975,1.1405503)"><tspan
sodipodi:role="line"
id="tspan5102"
x="1019.0017"
y="687.27924"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:29.77171135px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#cecdce;fill-opacity:1;stroke-width:0.65757734">6</tspan></text>
</g> </g>
<g
id="g5092"
transform="matrix(1.0666667,0,0,-1.066636,0,1026.1924)">
<rect
style="fill:#cecdce;fill-opacity:1;stroke:none;stroke-width:3.43548703;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect5080"
width="9.9375"
height="3.4620874"
x="911.8125"
y="400.32764" />
<rect
y="287.02451"
x="911.8125"
height="3.4620874"
width="9.9375"
id="rect5082"
style="fill:#cecdce;fill-opacity:1;stroke:none;stroke-width:3.43548703;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<rect
style="fill:#cecdce;fill-opacity:1;stroke:none;stroke-width:4.68189859;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect5084"
width="9.9375"
height="6.4299178"
x="911.8125"
y="319.32944" />
<rect
y="251.79059"
x="911.8125"
height="6.4299178"
width="9.9375"
id="rect5086"
style="fill:#cecdce;fill-opacity:1;stroke:none;stroke-width:4.68189859;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<rect
style="fill:#cecdce;fill-opacity:1;stroke:none;stroke-width:3.43548703;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect5088"
width="9.9375"
height="3.4620874"
x="911.8125"
y="219.53999" />
<rect
y="184.36314"
x="912.28125"
height="6.4299173"
width="9.9375"
id="rect5090"
style="fill:#cecdce;fill-opacity:1;stroke:none;stroke-width:4.68189859;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
</g>
<g
id="g4317">
<text
transform="scale(0.87678236,1.1405339)"
id="text5130"
y="183.6866"
x="1086.9194"
style="font-style:normal;font-weight:normal;font-size:28.05622673px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#cecdce;fill-opacity:1;stroke:none;stroke-width:0.65757734"
xml:space="preserve"><tspan
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:31.75603485px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#cecdce;fill-opacity:1;stroke-width:0.65757734"
y="183.6866"
x="1086.9194"
id="tspan5128"
sodipodi:role="line">6</tspan></text>
<text
xml:space="preserve"
style="font-style:normal;font-weight:normal;font-size:28.05622673px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#cecdce;fill-opacity:1;stroke:none;stroke-width:0.65757734"
x="1086.9194"
y="246.63768"
id="text5134"
transform="scale(0.87678236,1.1405339)"><tspan
sodipodi:role="line"
id="tspan5132"
x="1086.9194"
y="246.63768"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:31.75603485px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#cecdce;fill-opacity:1;stroke-width:0.65757734">2</tspan></text>
<text
transform="scale(0.87678236,1.1405339)"
id="text5138"
y="309.50116"
x="1086.9194"
style="font-style:normal;font-weight:normal;font-size:28.05622673px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#cecdce;fill-opacity:1;stroke:none;stroke-width:0.65757734"
xml:space="preserve"><tspan
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:31.75603485px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#cecdce;fill-opacity:1;stroke-width:0.65757734"
y="309.50116"
x="1086.9194"
id="tspan5136"
sodipodi:role="line">1</tspan></text>
</g>
<g
id="g5078"
transform="matrix(1.0666667,0,0,1.066636,0,-0.50381959)">
<rect
y="400.32764"
x="911.8125"
height="3.4620874"
width="9.9375"
id="rect5047"
style="fill:#cecdce;fill-opacity:1;stroke:none;stroke-width:3.43548703;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<rect
style="fill:#cecdce;fill-opacity:1;stroke:none;stroke-width:3.43548703;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect5049"
width="9.9375"
height="3.4620874"
x="911.8125"
y="287.02451" />
<rect
y="319.32944"
x="911.8125"
height="6.4299178"
width="9.9375"
id="rect5051"
style="fill:#cecdce;fill-opacity:1;stroke:none;stroke-width:4.68189859;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<rect
style="fill:#cecdce;fill-opacity:1;stroke:none;stroke-width:4.68189859;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect5053"
width="9.9375"
height="6.4299178"
x="911.8125"
y="251.79059" />
<rect
y="219.53999"
x="911.8125"
height="3.4620874"
width="9.9375"
id="rect5055"
style="fill:#cecdce;fill-opacity:1;stroke:none;stroke-width:3.43548703;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<rect
style="fill:#cecdce;fill-opacity:1;stroke:none;stroke-width:4.68189859;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect5053-8"
width="9.9375"
height="6.4299173"
x="912.28125"
y="184.36314" />
</g>
<path
style="opacity:0.46000001;fill:#ff00ff;fill-opacity:1;stroke:none;stroke-width:1.27696717;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 975.6317,177.03888 47.5897,0 c -0.052,113.09539 0.026,226.19024 0,339.28612 -0.026,110.77565 -0.158,221.55229 0,332.33137 l -47.5897,0 z"
id="VS_pointer_clip"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccsccc"
inkscape:label="#VS_pointer_clip" />
<rect
inkscape:label="#rect4954"
y="-983.19305"
x="509.09619"
height="33.214977"
width="7.7970567"
id="rect5040"
style="fill:#bfcc2a;fill-opacity:1;stroke:none;stroke-width:3.45797205;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
transform="matrix(0,1,-1,0,0,0)" />
<path
style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995403;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke"
d="m 854.63039,560.79086 0,226.6383"
id="path4309"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cc" />
<rect
transform="matrix(0,1,-1,0,0,0)"
style="fill:#11ba50;fill-opacity:1;stroke:none;stroke-width:3.89981294;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="VS_pointer"
width="6.5950012"
height="361.44022"
x="509.69724"
y="-1060.036"
inkscape:label="#rect4954"
inkscape:transform-center-x="170.07916" />
<path
sodipodi:nodetypes="cc"
inkscape:connector-curvature="0"
id="path4353"
d="m 123.76482,238.64456 0,548.7846"
style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995403;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
<rect <rect
style="fill:#646364;fill-opacity:1;stroke:none;stroke-width:2.4000001;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" style="fill:#646364;fill-opacity:1;stroke:none;stroke-width:2.4000001;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke"
id="rect4313" id="rect4313"
@ -1084,39 +1142,45 @@
</g> </g>
<g <g
id="LOC_scale" id="LOC_scale"
inkscape:label="#g4921" inkscape:label="#g4578">
transform="matrix(1.0666667,0,0,1.066636,-0.2,-0.50381959)">
<rect <rect
style="fill:#bfcc2a;fill-opacity:1;stroke:none;stroke-width:3.91476655;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" style="fill:#bfcc2a;fill-opacity:1;stroke:none;stroke-width:3.91476655;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect4858" id="rect4858"
width="7.3099508" width="7.7972813"
height="38.711491" height="41.291069"
x="416.67984" x="444.25851"
y="765.60675" /> y="816.11987" />
<path <g
style="fill:none;fill-opacity:1;stroke:#cecdce;stroke-width:2.25;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="g4523">
d="m 333.63842,785.11322 c 0,3.29678 -2.67256,5.96936 -5.96935,5.96936 -3.29679,0 -5.96936,-2.67257 -5.96936,-5.96936 0,-3.29679 2.67258,-5.96935 5.96936,-5.96935 3.29678,0 5.96935,2.67257 5.96935,5.96935 z" <path
id="path4874" sodipodi:nodetypes="zzzzz"
inkscape:connector-curvature="0" inkscape:connector-curvature="0"
sodipodi:nodetypes="zzzzz" /> id="path4874"
<path d="m 355.793,836.92648 c 0,3.51647 -2.85073,6.36714 -6.3673,6.36714 -3.51658,0 -6.36732,-2.85066 -6.36732,-6.36714 0,-3.51647 2.85075,-6.36712 6.36732,-6.36712 3.51656,0 6.3673,2.85066 6.3673,6.36712 z"
style="fill:none;fill-opacity:1;stroke:#cecdce;stroke-width:2.25;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" style="fill:none;fill-opacity:1;stroke:#cecdce;stroke-width:2.39996552;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
d="m 241.89132,785.11322 c 0,3.29678 -2.67256,5.96936 -5.96935,5.96936 -3.29679,0 -5.96936,-2.67257 -5.96936,-5.96936 0,-3.29679 2.67258,-5.96935 5.96936,-5.96935 3.29678,0 5.96935,2.67257 5.96935,5.96935 z" <path
id="circle4876" sodipodi:nodetypes="zzzzz"
inkscape:connector-curvature="0" inkscape:connector-curvature="0"
sodipodi:nodetypes="zzzzz" /> id="circle4876"
<path d="m 257.81742,836.9262 c 0,3.51647 -2.85073,6.36714 -6.36731,6.36714 -3.51658,0 -6.36732,-2.85066 -6.36732,-6.36714 0,-3.51647 2.85075,-6.36712 6.36732,-6.36712 3.51656,0 6.36731,2.85066 6.36731,6.36712 z"
style="fill:none;fill-opacity:1;stroke:#cecdce;stroke-width:2.25;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" style="fill:none;fill-opacity:1;stroke:#cecdce;stroke-width:2.39996552;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
d="m 608.70092,785.11322 c 0,3.29678 -2.67256,5.96936 -5.96935,5.96936 -3.29679,0 -5.96936,-2.67257 -5.96936,-5.96936 0,-3.29679 2.67258,-5.96935 5.96936,-5.96935 3.29678,0 5.96935,2.67257 5.96935,5.96935 z" </g>
id="circle4878" <g
inkscape:connector-curvature="0" transform="translate(1.8616028,0)"
sodipodi:nodetypes="zzzzz" /> id="g4527">
<path <path
style="fill:none;fill-opacity:1;stroke:#cecdce;stroke-width:2.25;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" sodipodi:nodetypes="zzzzz"
d="m 516.95382,785.11322 c 0,3.29678 -2.67256,5.96936 -5.96935,5.96936 -3.29679,0 -5.96936,-2.67257 -5.96936,-5.96936 0,-3.29679 2.67258,-5.96935 5.96936,-5.96935 3.29678,0 5.96935,2.67257 5.96935,5.96935 z" inkscape:connector-curvature="0"
id="circle4880" id="circle4878"
inkscape:connector-curvature="0" d="m 649.3818,836.9262 c 0,3.51647 -2.85073,6.36714 -6.36731,6.36714 -3.51657,0 -6.36731,-2.85066 -6.36731,-6.36714 0,-3.51647 2.85075,-6.36712 6.36731,-6.36712 3.51657,0 6.36731,2.85066 6.36731,6.36712 z"
sodipodi:nodetypes="zzzzz" /> style="fill:none;fill-opacity:1;stroke:#cecdce;stroke-width:2.39996552;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<path
sodipodi:nodetypes="zzzzz"
inkscape:connector-curvature="0"
id="circle4880"
d="m 551.40661,836.9262 c 0,3.51647 -2.85074,6.36714 -6.36731,6.36714 -3.51658,0 -6.36732,-2.85066 -6.36732,-6.36714 0,-3.51647 2.85075,-6.36712 6.36732,-6.36712 3.51656,0 6.36731,2.85066 6.36731,6.36712 z"
style="fill:none;fill-opacity:1;stroke:#cecdce;stroke-width:2.39996552;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
</g>
</g> </g>
<rect <rect
style="fill:none;fill-opacity:1;stroke:#ac5aae;stroke-width:4.0350337;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" style="fill:none;fill-opacity:1;stroke:#ac5aae;stroke-width:4.0350337;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
@ -1129,44 +1193,46 @@
inkscape:label="#rect4872" /> inkscape:label="#rect4872" />
<g <g
id="GS_scale" id="GS_scale"
inkscape:label="#g4952" inkscape:label="#g4569">
transform="matrix(1.0666667,0,0,1.066636,0,0.11184802)">
<rect <rect
transform="matrix(0,1,-1,0,0,0)" transform="matrix(0,1,-1,0,0,0)"
y="-700.08728" y="-746.75977"
x="477.56946" x="509.50464"
height="50.711491" height="54.092258"
width="7.3099508" width="7.7970567"
id="rect4925" id="rect4925"
style="fill:#bfcc2a;fill-opacity:1;stroke:none;stroke-width:4.4806304;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> style="fill:#bfcc2a;fill-opacity:1;stroke:none;stroke-width:4.4806304;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<path <g
transform="matrix(0,1,-1,0,0,0)" transform="translate(0,-1.0792028)"
style="fill:none;fill-opacity:1;stroke:#cecdce;stroke-width:2.25;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="g4531">
d="m 395.52413,-669.99731 c 0,3.29678 -2.67257,5.96935 -5.96935,5.96935 -3.29678,0 -5.96936,-2.67256 -5.96936,-5.96935 0,-3.29679 2.67257,-5.96936 5.96936,-5.96936 3.29679,0 5.96935,2.67258 5.96935,5.96936 z" <path
id="circle4927" sodipodi:nodetypes="zzzzz"
inkscape:connector-curvature="0" inkscape:connector-curvature="0"
sodipodi:nodetypes="zzzzz" /> id="circle4927"
<path d="m 714.66382,422.10642 c -3.51657,0 -6.36731,-2.85066 -6.36731,-6.36712 0,-3.51646 2.85073,-6.36713 6.36731,-6.36713 3.51658,0 6.36732,2.85066 6.36732,6.36713 0,3.51648 -2.85075,6.36712 -6.36732,6.36712 z"
transform="matrix(0,1,-1,0,0,0)" style="fill:none;fill-opacity:1;stroke:#cecdce;stroke-width:2.39996552;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
style="fill:none;fill-opacity:1;stroke:#cecdce;stroke-width:2.25;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" <path
d="m 303.77703,-669.99731 c 0,3.29678 -2.67257,5.96935 -5.96935,5.96935 -3.29678,0 -5.96936,-2.67256 -5.96936,-5.96935 0,-3.29679 2.67257,-5.96936 5.96936,-5.96936 3.29679,0 5.96935,2.67258 5.96935,5.96936 z" sodipodi:nodetypes="zzzzz"
id="circle4929" inkscape:connector-curvature="0"
inkscape:connector-curvature="0" id="circle4929"
sodipodi:nodetypes="zzzzz" /> d="m 714.66382,324.13136 c -3.51657,0 -6.36731,-2.85066 -6.36731,-6.36712 0,-3.51646 2.85073,-6.36713 6.36731,-6.36713 3.51658,0 6.36732,2.85066 6.36732,6.36713 0,3.51648 -2.85075,6.36712 -6.36732,6.36712 z"
<path style="fill:none;fill-opacity:1;stroke:#cecdce;stroke-width:2.39996552;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
transform="matrix(0,1,-1,0,0,0)" </g>
style="fill:none;fill-opacity:1;stroke:#cecdce;stroke-width:2.25;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" <g
d="m 670.58666,-669.99731 c 0,3.29678 -2.67257,5.96935 -5.96935,5.96935 -3.29678,0 -5.96936,-2.67256 -5.96936,-5.96935 0,-3.29679 2.67257,-5.96936 5.96936,-5.96936 3.29679,0 5.96935,2.67258 5.96935,5.96936 z" id="g4565">
id="circle4931" <path
inkscape:connector-curvature="0" sodipodi:nodetypes="zzzzz"
sodipodi:nodetypes="zzzzz" /> inkscape:connector-curvature="0"
<path id="circle4931"
transform="matrix(0,1,-1,0,0,0)" d="m 714.66382,716.47762 c -3.51657,0 -6.36731,-2.85066 -6.36731,-6.36712 0,-3.51647 2.85073,-6.36714 6.36731,-6.36714 3.51658,0 6.36732,2.85066 6.36732,6.36714 0,3.51647 -2.85075,6.36712 -6.36732,6.36712 z"
style="fill:none;fill-opacity:1;stroke:#cecdce;stroke-width:2.25;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" style="fill:none;fill-opacity:1;stroke:#cecdce;stroke-width:2.39996552;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
d="m 578.83953,-669.99731 c 0,3.29678 -2.67257,5.96935 -5.96935,5.96935 -3.29678,0 -5.96936,-2.67256 -5.96936,-5.96935 0,-3.29679 2.67257,-5.96936 5.96936,-5.96936 3.29679,0 5.96935,2.67258 5.96935,5.96936 z" <path
id="circle4933" sodipodi:nodetypes="zzzzz"
inkscape:connector-curvature="0" inkscape:connector-curvature="0"
sodipodi:nodetypes="zzzzz" /> id="circle4933"
d="m 714.66382,618.50242 c -3.51657,0 -6.36731,-2.85066 -6.36731,-6.36712 0,-3.51647 2.85073,-6.36714 6.36731,-6.36714 3.51658,0 6.36732,2.85066 6.36732,6.36714 0,3.51647 -2.85075,6.36712 -6.36732,6.36712 z"
style="fill:none;fill-opacity:1;stroke:#cecdce;stroke-width:2.39996552;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
</g>
</g> </g>
<rect <rect
inkscape:label="#rect4872" inkscape:label="#rect4872"
@ -1277,30 +1343,6 @@
id="path922" id="path922"
d="m 12.477577,790.62913 141.300723,0" d="m 12.477577,790.62913 141.300723,0"
style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995403;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995403;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
<g
id="ASI_index"
inkscape:label="#g949"
transform="matrix(1.0666667,0,0,1.066636,0,-0.50381959)">
<path
sodipodi:nodetypes="cc"
inkscape:connector-curvature="0"
id="path930"
d="m 92.069682,481.26097 42.765978,0"
style="fill:none;fill-opacity:1;stroke:#bfcc2a;stroke-width:4.5;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
<path
sodipodi:nodetypes="cccc"
inkscape:connector-curvature="0"
id="path928"
d="m 142.62916,491.54141 0,-20.391 -17.13886,10.1955 z"
style="fill:#bfcc2a;fill-opacity:1;stroke:none;stroke-width:2.71116304;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke"
inkscape:label="#path905" />
<path
style="fill:none;fill-opacity:1;stroke:#bfcc2a;stroke-width:4.5;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke"
d="m 2.3529052,481.26097 6.5316019,0"
id="path944"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cc" />
</g>
<rect <rect
style="opacity:0.46000001;fill:#ff00ff;fill-opacity:1;stroke:none;stroke-width:1.27696717;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" style="opacity:0.46000001;fill:#ff00ff;fill-opacity:1;stroke:none;stroke-width:1.27696717;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="ALT_tens_clip" id="ALT_tens_clip"
@ -1311,7 +1353,7 @@
inkscape:label="#rect9211" /> inkscape:label="#rect9211" />
<text <text
id="ALT_tens" id="ALT_tens"
y="289.57291" y="289.76563"
x="896.33405" x="896.33405"
style="font-style:normal;font-weight:normal;font-size:30.83641052px;line-height:87.00000048%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#11ba50;fill-opacity:1;stroke:none;stroke-width:0.75" style="font-style:normal;font-weight:normal;font-size:30.83641052px;line-height:87.00000048%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#11ba50;fill-opacity:1;stroke:none;stroke-width:0.75"
xml:space="preserve" xml:space="preserve"
@ -1319,57 +1361,57 @@
inkscape:label="#text913" inkscape:label="#text913"
transform="scale(0.96366556,1.0377044)"><tspan transform="scale(0.96366556,1.0377044)"><tspan
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:30.83641052px;line-height:94.99999881%;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#11ba50;fill-opacity:1;stroke-width:0.75" style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:30.83641052px;line-height:94.99999881%;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#11ba50;fill-opacity:1;stroke-width:0.75"
y="289.57291" y="289.76563"
x="896.33405" x="896.33405"
id="tspan911" id="tspan911"
sodipodi:role="line" /><tspan sodipodi:role="line" /><tspan
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:30.83641052px;line-height:87.00000048%;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#11ba50;fill-opacity:1;stroke-width:0.75" style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:30.83641052px;line-height:87.00000048%;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#11ba50;fill-opacity:1;stroke-width:0.75"
y="316.92538" y="317.1181"
x="896.33405" x="896.33405"
sodipodi:role="line" sodipodi:role="line"
id="tspan919">40</tspan><tspan id="tspan919">40</tspan><tspan
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:30.83641052px;line-height:87.00000048%;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#11ba50;fill-opacity:1;stroke-width:0.75" style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:30.83641052px;line-height:87.00000048%;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#11ba50;fill-opacity:1;stroke-width:0.75"
y="343.75308" y="343.9458"
x="896.33405" x="896.33405"
sodipodi:role="line" sodipodi:role="line"
id="tspan4300">20</tspan><tspan id="tspan4300">20</tspan><tspan
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:30.83641052px;line-height:87.00000048%;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#11ba50;fill-opacity:1;stroke-width:0.75" style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:30.83641052px;line-height:87.00000048%;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#11ba50;fill-opacity:1;stroke-width:0.75"
y="370.58075" y="370.77347"
x="896.33405" x="896.33405"
sodipodi:role="line" sodipodi:role="line"
id="tspan931">00</tspan><tspan id="tspan931">00</tspan><tspan
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:30.83641052px;line-height:87.00000048%;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#11ba50;fill-opacity:1;stroke-width:0.75" style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:30.83641052px;line-height:87.00000048%;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#11ba50;fill-opacity:1;stroke-width:0.75"
y="397.40842" y="397.60114"
x="896.33405" x="896.33405"
sodipodi:role="line" sodipodi:role="line"
id="tspan927">80</tspan><tspan id="tspan927">80</tspan><tspan
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:30.83641052px;line-height:87.00000048%;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#11ba50;fill-opacity:1;stroke-width:0.75" style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:30.83641052px;line-height:87.00000048%;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#11ba50;fill-opacity:1;stroke-width:0.75"
y="424.23611" y="424.42883"
x="896.33405" x="896.33405"
sodipodi:role="line" sodipodi:role="line"
id="tspan925">60</tspan><tspan id="tspan925">60</tspan><tspan
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:30.83641052px;line-height:87.00000048%;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#11ba50;fill-opacity:1;stroke-width:0.75" style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:30.83641052px;line-height:87.00000048%;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#11ba50;fill-opacity:1;stroke-width:0.75"
y="451.06378" y="451.2565"
x="896.33405" x="896.33405"
sodipodi:role="line" sodipodi:role="line"
id="tspan923">40</tspan><tspan id="tspan923">40</tspan><tspan
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:30.83641052px;line-height:87.00000048%;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#11ba50;fill-opacity:1;stroke-width:0.75" style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:30.83641052px;line-height:87.00000048%;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#11ba50;fill-opacity:1;stroke-width:0.75"
y="477.89145" y="478.08417"
x="896.33405" x="896.33405"
sodipodi:role="line" sodipodi:role="line"
id="tspan921">20</tspan><tspan id="tspan921">20</tspan><tspan
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:30.83641052px;line-height:87.00000048%;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#11ba50;fill-opacity:1;stroke-width:0.75" style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:30.83641052px;line-height:87.00000048%;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#11ba50;fill-opacity:1;stroke-width:0.75"
y="504.71915" y="504.91187"
x="896.33405" x="896.33405"
sodipodi:role="line" sodipodi:role="line"
id="tspan917">00</tspan><tspan id="tspan917">00</tspan><tspan
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:30.83641052px;line-height:87.00000048%;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#11ba50;fill-opacity:1;stroke-width:0.75" style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:30.83641052px;line-height:87.00000048%;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#11ba50;fill-opacity:1;stroke-width:0.75"
y="531.54681" y="531.73956"
x="896.33405" x="896.33405"
sodipodi:role="line" sodipodi:role="line"
id="tspan915">80</tspan><tspan id="tspan915">80</tspan><tspan
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:30.83641052px;line-height:87.00000048%;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#11ba50;fill-opacity:1;stroke-width:0.75" style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:30.83641052px;line-height:87.00000048%;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#11ba50;fill-opacity:1;stroke-width:0.75"
y="558.37451" y="558.56726"
x="896.33405" x="896.33405"
sodipodi:role="line" sodipodi:role="line"
id="tspan4302">60</tspan></text> id="tspan4302">60</tspan></text>
@ -1689,7 +1731,7 @@
y="114.70684" y="114.70684"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:35.99948502px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke-width:0.65757734">LVR CLB</tspan></text> style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:35.99948502px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke-width:0.65757734">LVR CLB</tspan></text>
<g <g
id="g4369"> id="g3944">
<path <path
style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995403;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995403;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke"
d="m 288.584,252.95092 12.66714,20.76999" d="m 288.584,252.95092 12.66714,20.76999"
@ -1709,6 +1751,30 @@
d="m 288.584,252.95092 13.8416,-7.96852" d="m 288.584,252.95092 13.8416,-7.96852"
style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995403;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995403;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
</g> </g>
<g
id="g3962">
<g
id="g3949">
<path
sodipodi:nodetypes="cc"
inkscape:connector-curvature="0"
id="path3932"
d="m 340.35189,239.5184 5.62182,14.20878"
style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995403;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
<path
style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995403;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke"
d="m 354.9152,234.0368 4.87069,14.48383"
id="path3934"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cc" />
<path
sodipodi:nodetypes="cc"
inkscape:connector-curvature="0"
id="path3936"
d="m 354.9152,234.0368 -14.5632,5.4816"
style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995403;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
</g>
</g>
<g <g
id="g4374" id="g4374"
transform="matrix(-1,0,0,1,896.78566,0)"> transform="matrix(-1,0,0,1,896.78566,0)">
@ -1735,17 +1801,17 @@
sodipodi:nodetypes="cc" sodipodi:nodetypes="cc"
inkscape:connector-curvature="0" inkscape:connector-curvature="0"
id="path4382" id="path4382"
d="m 193.91669,375.84042 14.13625,6.68826" d="m 193.91669,378.22448 14.13625,6.68826"
style="fill:none;fill-opacity:1;stroke:#11ba50;stroke-width:3.19995403;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> style="fill:none;fill-opacity:1;stroke:#11ba50;stroke-width:3.19995403;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
<path <path
style="fill:none;fill-opacity:1;stroke:#11ba50;stroke-width:3.19995403;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" style="fill:none;fill-opacity:1;stroke:#11ba50;stroke-width:3.19995403;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke"
d="m 193.80428,389.42701 14.36107,6.19082" d="m 193.80428,391.81107 14.36107,6.19082"
id="path4384" id="path4384"
inkscape:connector-curvature="0" inkscape:connector-curvature="0"
sodipodi:nodetypes="cc" /> sodipodi:nodetypes="cc" />
<path <path
style="fill:none;fill-opacity:1;stroke:#11ba50;stroke-width:3.19995403;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" style="fill:none;fill-opacity:1;stroke:#11ba50;stroke-width:3.19995403;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke"
d="m 702.88256,375.94042 -14.13625,6.68826" d="m 702.88256,378.32448 -14.13625,6.68826"
id="path4386" id="path4386"
inkscape:connector-curvature="0" inkscape:connector-curvature="0"
sodipodi:nodetypes="cc" /> sodipodi:nodetypes="cc" />
@ -1753,6 +1819,85 @@
sodipodi:nodetypes="cc" sodipodi:nodetypes="cc"
inkscape:connector-curvature="0" inkscape:connector-curvature="0"
id="path4388" id="path4388"
d="m 702.99497,389.52701 -14.36107,6.19082" d="m 702.99497,391.91107 -14.36107,6.19082"
style="fill:none;fill-opacity:1;stroke:#11ba50;stroke-width:3.19995403;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> style="fill:none;fill-opacity:1;stroke:#11ba50;stroke-width:3.19995403;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
<g
id="g3954"
transform="matrix(-1,0,0,1,896.72324,0)">
<path
sodipodi:nodetypes="cc"
inkscape:connector-curvature="0"
id="path3956"
d="m 340.35189,239.5184 5.62182,14.20878"
style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995403;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
<path
style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995403;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke"
d="m 354.9152,234.0368 4.87069,14.48383"
id="path3958"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cc" />
<path
sodipodi:nodetypes="cc"
inkscape:connector-curvature="0"
id="path3960"
d="m 354.9152,234.0368 -14.5632,5.4816"
style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995403;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
</g>
<g
id="g3968"
transform="matrix(0.98404072,0.17794355,-0.17794355,0.98404072,97.433196,-71.336811)">
<g
id="g3970">
<path
style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995403;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke"
d="m 340.35189,239.5184 5.62182,14.20878"
id="path3972"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cc" />
<path
sodipodi:nodetypes="cc"
inkscape:connector-curvature="0"
id="path3974"
d="m 354.9152,234.0368 4.87069,14.48383"
style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995403;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
<path
style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995403;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke"
d="m 354.9152,234.0368 -14.5632,5.4816"
id="path3976"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cc" />
</g>
</g>
<g
transform="matrix(-0.98404072,0.17794355,0.17794355,0.98404072,799.64735,-71.336811)"
id="g3978">
<g
id="g3980">
<path
sodipodi:nodetypes="cc"
inkscape:connector-curvature="0"
id="path3982"
d="m 340.35189,239.5184 5.62182,14.20878"
style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995403;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
<path
style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995403;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke"
d="m 354.9152,234.0368 4.87069,14.48383"
id="path3984"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cc" />
<path
sodipodi:nodetypes="cc"
inkscape:connector-curvature="0"
id="path3986"
d="m 354.9152,234.0368 -14.5632,5.4816"
style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995403;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
</g>
</g>
<path
style="fill:none;fill-opacity:1;stroke:#238995;stroke-width:4;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke"
d="m 426.05644,894.67034 43.41526,10e-6 -21.70763,40.47717 z"
id="HDG_target"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccc"
inkscape:label="#rect902" />
</svg> </svg>

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 293 KiB

After

Width:  |  Height:  |  Size: 300 KiB

44
Models/Instruments/Upper-ECAM/Upper-ECAM.nas
View file

@ -256,13 +256,13 @@ var canvas_upperECAM_cfm_eis2 = {
me["N12"].setText(sprintf("%s", math.floor(getprop("/engines/engine[1]/n1-actual") + 0.05))); me["N12"].setText(sprintf("%s", math.floor(getprop("/engines/engine[1]/n1-actual") + 0.05)));
me["N12-decimal"].setText(sprintf("%s", int(10*math.mod(getprop("/engines/engine[1]/n1-actual") + 0.05,1)))); me["N12-decimal"].setText(sprintf("%s", int(10*math.mod(getprop("/engines/engine[1]/n1-actual") + 0.05,1))));
me["N11-needle"].setRotation((getprop("/ECAM/Upper/N1[0]") + 90)*D2R); me["N11-needle"].setRotation((getprop("/ECAM/Upper/N1[0]") + 90) * D2R);
me["N11-thr"].setRotation((getprop("/ECAM/Upper/N1thr[0]") + 90)*D2R); me["N11-thr"].setRotation((getprop("/ECAM/Upper/N1thr[0]") + 90) * D2R);
me["N11-ylim"].setRotation((getprop("/ECAM/Upper/N1ylim") + 90)*D2R); me["N11-ylim"].setRotation((getprop("/ECAM/Upper/N1ylim") + 90) * D2R);
me["N12-needle"].setRotation((getprop("/ECAM/Upper/N1[1]") + 90)*D2R); me["N12-needle"].setRotation((getprop("/ECAM/Upper/N1[1]") + 90) * D2R);
me["N12-thr"].setRotation((getprop("/ECAM/Upper/N1thr[1]") + 90)*D2R); me["N12-thr"].setRotation((getprop("/ECAM/Upper/N1thr[1]") + 90) * D2R);
me["N12-ylim"].setRotation((getprop("/ECAM/Upper/N1ylim") + 90)*D2R); me["N12-ylim"].setRotation((getprop("/ECAM/Upper/N1ylim") + 90) * D2R);
if (getprop("/systems/fadec/eng1/n1") == 1) { if (getprop("/systems/fadec/eng1/n1") == 1) {
me["N11-scale"].setColor(0.8078,0.8039,0.8078); me["N11-scale"].setColor(0.8078,0.8039,0.8078);
@ -336,8 +336,8 @@ var canvas_upperECAM_cfm_eis2 = {
me["EGT1"].setText(sprintf("%s", math.round(getprop("/engines/engine[0]/egt-actual")))); me["EGT1"].setText(sprintf("%s", math.round(getprop("/engines/engine[0]/egt-actual"))));
me["EGT2"].setText(sprintf("%s", math.round(getprop("/engines/engine[1]/egt-actual")))); me["EGT2"].setText(sprintf("%s", math.round(getprop("/engines/engine[1]/egt-actual"))));
me["EGT1-needle"].setRotation((getprop("/ECAM/Upper/EGT[0]") + 90)*D2R); me["EGT1-needle"].setRotation((getprop("/ECAM/Upper/EGT[0]") + 90) * D2R);
me["EGT2-needle"].setRotation((getprop("/ECAM/Upper/EGT[1]") + 90)*D2R); me["EGT2-needle"].setRotation((getprop("/ECAM/Upper/EGT[1]") + 90) * D2R);
if (getprop("/systems/fadec/eng1/egt") == 1) { if (getprop("/systems/fadec/eng1/egt") == 1) {
me["EGT1-scale"].setColor(0.8078,0.8039,0.8078); me["EGT1-scale"].setColor(0.8078,0.8039,0.8078);
@ -470,12 +470,12 @@ var canvas_upperECAM_iae_eis2 = {
me["EPR1"].setText(sprintf("%1.3f", getprop("/engines/engine[0]/epr-actual"))); me["EPR1"].setText(sprintf("%1.3f", getprop("/engines/engine[0]/epr-actual")));
me["EPR2"].setText(sprintf("%1.3f", getprop("/engines/engine[1]/epr-actual"))); me["EPR2"].setText(sprintf("%1.3f", getprop("/engines/engine[1]/epr-actual")));
me["EPR1-needle"].setRotation((getprop("/ECAM/Upper/EPR[0]") + 90)*D2R); me["EPR1-needle"].setRotation((getprop("/ECAM/Upper/EPR[0]") + 90) * D2R);
me["EPR1-thr"].setRotation((getprop("/ECAM/Upper/EPRthr[0]") + 90)*D2R); me["EPR1-thr"].setRotation((getprop("/ECAM/Upper/EPRthr[0]") + 90) * D2R);
me["EPR1-ylim"].setRotation((getprop("/ECAM/Upper/EPRylim") + 90)*D2R); me["EPR1-ylim"].setRotation((getprop("/ECAM/Upper/EPRylim") + 90) * D2R);
me["EPR2-needle"].setRotation((getprop("/ECAM/Upper/EPR[1]") + 90)*D2R); me["EPR2-needle"].setRotation((getprop("/ECAM/Upper/EPR[1]") + 90) * D2R);
me["EPR2-thr"].setRotation((getprop("/ECAM/Upper/EPRthr[1]") + 90)*D2R); me["EPR2-thr"].setRotation((getprop("/ECAM/Upper/EPRthr[1]") + 90) * D2R);
me["EPR2-ylim"].setRotation((getprop("/ECAM/Upper/EPRylim") + 90)*D2R); me["EPR2-ylim"].setRotation((getprop("/ECAM/Upper/EPRylim") + 90) * D2R);
if (getprop("/systems/fadec/eng1/epr") == 1) { if (getprop("/systems/fadec/eng1/epr") == 1) {
me["EPR1-scale"].setColor(0.8078,0.8039,0.8078); me["EPR1-scale"].setColor(0.8078,0.8039,0.8078);
@ -533,8 +533,8 @@ var canvas_upperECAM_iae_eis2 = {
me["EGT1"].setText(sprintf("%s", math.round(getprop("/engines/engine[0]/egt-actual")))); me["EGT1"].setText(sprintf("%s", math.round(getprop("/engines/engine[0]/egt-actual"))));
me["EGT2"].setText(sprintf("%s", math.round(getprop("/engines/engine[1]/egt-actual")))); me["EGT2"].setText(sprintf("%s", math.round(getprop("/engines/engine[1]/egt-actual"))));
me["EGT1-needle"].setRotation((getprop("/ECAM/Upper/EGT[0]") + 90)*D2R); me["EGT1-needle"].setRotation((getprop("/ECAM/Upper/EGT[0]") + 90) * D2R);
me["EGT2-needle"].setRotation((getprop("/ECAM/Upper/EGT[1]") + 90)*D2R); me["EGT2-needle"].setRotation((getprop("/ECAM/Upper/EGT[1]") + 90) * D2R);
if (getprop("/systems/fadec/eng1/egt") == 1) { if (getprop("/systems/fadec/eng1/egt") == 1) {
me["EGT1-scale"].setColor(0.8078,0.8039,0.8078); me["EGT1-scale"].setColor(0.8078,0.8039,0.8078);
@ -579,13 +579,13 @@ var canvas_upperECAM_iae_eis2 = {
me["N12"].setText(sprintf("%s", math.floor(getprop("/engines/engine[1]/n1-actual") + 0.05))); me["N12"].setText(sprintf("%s", math.floor(getprop("/engines/engine[1]/n1-actual") + 0.05)));
me["N12-decimal"].setText(sprintf("%s", int(10*math.mod(getprop("/engines/engine[1]/n1-actual") + 0.05,1)))); me["N12-decimal"].setText(sprintf("%s", int(10*math.mod(getprop("/engines/engine[1]/n1-actual") + 0.05,1))));
me["N11-needle"].setRotation((getprop("/ECAM/Upper/N1[0]") + 90)*D2R); me["N11-needle"].setRotation((getprop("/ECAM/Upper/N1[0]") + 90) * D2R);
me["N11-thr"].setRotation((getprop("/ECAM/Upper/N1thr[0]") + 90)*D2R); me["N11-thr"].setRotation((getprop("/ECAM/Upper/N1thr[0]") + 90) * D2R);
me["N11-ylim"].setRotation((getprop("/ECAM/Upper/N1ylim") + 90)*D2R); me["N11-ylim"].setRotation((getprop("/ECAM/Upper/N1ylim") + 90) * D2R);
me["N12-needle"].setRotation((getprop("/ECAM/Upper/N1[1]") + 90)*D2R); me["N12-needle"].setRotation((getprop("/ECAM/Upper/N1[1]") + 90) * D2R);
me["N12-thr"].setRotation((getprop("/ECAM/Upper/N1thr[1]") + 90)*D2R); me["N12-thr"].setRotation((getprop("/ECAM/Upper/N1thr[1]") + 90) * D2R);
me["N12-ylim"].setRotation((getprop("/ECAM/Upper/N1ylim") + 90)*D2R); me["N12-ylim"].setRotation((getprop("/ECAM/Upper/N1ylim") + 90) * D2R);
if (getprop("/systems/fadec/eng1/n1") == 1) { if (getprop("/systems/fadec/eng1/n1") == 1) {
me["N11-scale"].setColor(0.8078,0.8039,0.8078); me["N11-scale"].setColor(0.8078,0.8039,0.8078);

8
Models/Interior/a319.interior.xml
View file

@ -32,7 +32,9 @@
</emission> </emission>
</animation> </animation>
<!-- Door animations placed in fuselage.xml (th) -->
<!-- PAX doors --> <!-- PAX doors -->
<!--
<animation> <animation>
<name>PAX left-front door pick</name> <name>PAX left-front door pick</name>
<type>pick</type> <type>pick</type>
@ -224,8 +226,10 @@
<z>0</z> <z>0</z>
</axis> </axis>
</animation> </animation>
-->
<!-- Animation for the doors of the main gears. --> <!-- Animation for the doors of the main gears. -->
<!--
<animation> <animation>
<name>Main_Gear_Doors.Left</name> <name>Main_Gear_Doors.Left</name>
<type>rotate</type> <type>rotate</type>
@ -265,8 +269,9 @@
<x>-1</x> <x>-1</x>
</axis> </axis>
</animation> </animation>
-->
<!-- Animation for the doors of the nose gear. --> <!-- Animation for the doors of the nose gear. -->
<!--
<animation> <animation>
<name>Nose_Gear_Doors.Left.01</name> <name>Nose_Gear_Doors.Left.01</name>
<type>rotate</type> <type>rotate</type>
@ -376,5 +381,6 @@
<y>-1</y> <y>-1</y>
</axis> </axis>
</animation> </animation>
-->
</PropertyList> </PropertyList>

351621
Models/Interior/res/a319.interior.ac
View file

File diff suppressed because it is too large Load diff

BIN
Models/Interior/res/carpet.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 685 KiB

After

Width:  |  Height:  |  Size: 538 KiB

BIN
Models/Interior/res/fabric.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 669 KiB

After

Width:  |  Height:  |  Size: 585 KiB

BIN
Models/Interior/res/lavatory.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 5.6 KiB

BIN
Models/Liveries/A318/CFM/BAW-nose.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 476 KiB

1
Models/Liveries/A318/CFM/BROKEN/1. README.txt Normal file
View file

@ -0,0 +1 @@
This folder contains liveries which are broken when the new 3D nose was implemented.

BIN
Models/Liveries/A318/CFM/BROKEN/BAW-nose.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 476 KiB

0
Models/Liveries/A318/CFM/BAW.png → Models/Liveries/A318/CFM/BROKEN/BAW.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 465 KiB

After

Width:  |  Height:  |  Size: 465 KiB

0
Models/Liveries/A318/CFM/BAW.xml → Models/Liveries/A318/CFM/BROKEN/BAW.xml
View file

0
Models/Liveries/A318/CFM/N801FR-nose.png → Models/Liveries/A318/CFM/BROKEN/N801FR-nose.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 195 KiB

After

Width:  |  Height:  |  Size: 195 KiB

0
Models/Liveries/A318/CFM/N801FR.png → Models/Liveries/A318/CFM/BROKEN/N801FR.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 535 KiB

After

Width:  |  Height:  |  Size: 535 KiB

0
Models/Liveries/A318/CFM/N801FR.xml → Models/Liveries/A318/CFM/BROKEN/N801FR.xml
View file

BIN
Models/Liveries/A318/CFM/White-nose.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 26 KiB

After

Width:  |  Height:  |  Size: 24 KiB

BIN
Models/Liveries/A318/CFM/White.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 414 KiB

After

Width:  |  Height:  |  Size: 411 KiB

BIN
Models/Liveries/A319/CFM/AEE.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 419 KiB

After

Width:  |  Height:  |  Size: 432 KiB

1
Models/Liveries/A319/CFM/BROKEN/1. README.txt Normal file
View file

@ -0,0 +1 @@
This folder contains liveries which are broken when the new 3D nose was implemented.

0
Models/Liveries/A319/CFM/CTN-SA.png → Models/Liveries/A319/CFM/BROKEN/CTN-SA.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 462 KiB

After

Width:  |  Height:  |  Size: 462 KiB

0
Models/Liveries/A319/CFM/CTN-SA.xml → Models/Liveries/A319/CFM/BROKEN/CTN-SA.xml
View file

0
Models/Liveries/A319/CFM/D-AKNO.png → Models/Liveries/A319/CFM/BROKEN/D-AKNO.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 576 KiB

After

Width:  |  Height:  |  Size: 576 KiB

0
Models/Liveries/A319/CFM/D-AKNO.xml → Models/Liveries/A319/CFM/BROKEN/D-AKNO.xml
View file

0
Models/Liveries/A319/CFM/DLH-StarAlliance.png → Models/Liveries/A319/CFM/BROKEN/DLH-StarAlliance.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 475 KiB

After

Width:  |  Height:  |  Size: 475 KiB

0
Models/Liveries/A319/CFM/DLH-StarAlliance.xml → Models/Liveries/A319/CFM/BROKEN/DLH-StarAlliance.xml
View file

0
Models/Liveries/A319/CFM/EI-IMI.png → Models/Liveries/A319/CFM/BROKEN/EI-IMI.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 452 KiB

After

Width:  |  Height:  |  Size: 452 KiB

0
Models/Liveries/A319/CFM/EI-IMI.xml → Models/Liveries/A319/CFM/BROKEN/EI-IMI.xml
View file

0
Models/Liveries/A319/CFM/FIN-OW.png → Models/Liveries/A319/CFM/BROKEN/FIN-OW.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 448 KiB

After

Width:  |  Height:  |  Size: 448 KiB

0
Models/Liveries/A319/CFM/FIN-OW.xml → Models/Liveries/A319/CFM/BROKEN/FIN-OW.xml
View file

0
Models/Liveries/A319/CFM/GMI.png → Models/Liveries/A319/CFM/BROKEN/GMI.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 484 KiB

After

Width:  |  Height:  |  Size: 484 KiB

0
Models/Liveries/A319/CFM/GMI.xml → Models/Liveries/A319/CFM/BROKEN/GMI.xml
View file

0
Models/Liveries/A319/CFM/GWI.png → Models/Liveries/A319/CFM/BROKEN/GWI.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 442 KiB

After

Width:  |  Height:  |  Size: 442 KiB

0
Models/Liveries/A319/CFM/GWI.xml → Models/Liveries/A319/CFM/BROKEN/GWI.xml
View file

0
Models/Liveries/A319/CFM/GWI2.png → Models/Liveries/A319/CFM/BROKEN/GWI2.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 731 KiB

After

Width:  |  Height:  |  Size: 731 KiB

0
Models/Liveries/A319/CFM/GWI2.xml → Models/Liveries/A319/CFM/BROKEN/GWI2.xml
View file

0
Models/Liveries/A319/CFM/N742PS.png → Models/Liveries/A319/CFM/BROKEN/N742PS.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 424 KiB

After

Width:  |  Height:  |  Size: 424 KiB

0
Models/Liveries/A319/CFM/N742PS.xml → Models/Liveries/A319/CFM/BROKEN/N742PS.xml
View file

0
Models/Liveries/A319/CFM/N744P.png → Models/Liveries/A319/CFM/BROKEN/N744P.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 411 KiB

After

Width:  |  Height:  |  Size: 411 KiB

0
Models/Liveries/A319/CFM/N744P.xml → Models/Liveries/A319/CFM/BROKEN/N744P.xml
View file

0
Models/Liveries/A319/CFM/N745VJ.png → Models/Liveries/A319/CFM/BROKEN/N745VJ.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 420 KiB

After

Width:  |  Height:  |  Size: 420 KiB

0
Models/Liveries/A319/CFM/N745VJ.xml → Models/Liveries/A319/CFM/BROKEN/N745VJ.xml
View file

0
Models/Liveries/A319/CFM/UAL.png → Models/Liveries/A319/CFM/BROKEN/UAL.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 544 KiB

After

Width:  |  Height:  |  Size: 544 KiB

0
Models/Liveries/A319/CFM/UAL.xml → Models/Liveries/A319/CFM/BROKEN/UAL.xml
View file

0
Models/Liveries/A319/CFM/USAirwaysStar.png → Models/Liveries/A319/CFM/BROKEN/USAirwaysStar.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 459 KiB

After

Width:  |  Height:  |  Size: 459 KiB

0
Models/Liveries/A319/CFM/USAirwaysStar.xml → Models/Liveries/A319/CFM/BROKEN/USAirwaysStar.xml
View file

BIN
Models/Liveries/A319/CFM/BRU-SA.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 462 KiB

After

Width:  |  Height:  |  Size: 493 KiB

BIN
Models/Liveries/A319/CFM/BRU.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 484 KiB

After

Width:  |  Height:  |  Size: 513 KiB

BIN
Models/Liveries/A319/CFM/CCA.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 MiB

After

Width:  |  Height:  |  Size: 1.5 MiB

BIN
Models/Liveries/A319/CFM/DLH.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 607 KiB

After

Width:  |  Height:  |  Size: 687 KiB

BIN
Models/Liveries/A319/CFM/EZY.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 506 KiB

After

Width:  |  Height:  |  Size: 464 KiB

BIN
Models/Liveries/A319/CFM/TPU.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 439 KiB

After

Width:  |  Height:  |  Size: 475 KiB

1
Models/Liveries/A319/IAE/BROKEN/1. README.txt Normal file
View file

@ -0,0 +1 @@
This folder contains liveries which are broken when the new 3D nose was implemented.

0
Models/Liveries/A319/IAE/AEE.png → Models/Liveries/A319/IAE/BROKEN/AEE.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 419 KiB

After

Width:  |  Height:  |  Size: 419 KiB

0
Models/Liveries/A319/IAE/AEE.xml → Models/Liveries/A319/IAE/BROKEN/AEE.xml
View file

0
Models/Liveries/A319/IAE/BAW.png → Models/Liveries/A319/IAE/BROKEN/BAW.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 440 KiB

After

Width:  |  Height:  |  Size: 440 KiB

0
Models/Liveries/A319/IAE/BAW.xml → Models/Liveries/A319/IAE/BROKEN/BAW.xml
View file

0
Models/Liveries/A319/IAE/CCA.png → Models/Liveries/A319/IAE/BROKEN/CCA.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 447 KiB

After

Width:  |  Height:  |  Size: 447 KiB

0
Models/Liveries/A319/IAE/CCA.xml → Models/Liveries/A319/IAE/BROKEN/CCA.xml
View file

0
Models/Liveries/A319/IAE/ETD-new.png → Models/Liveries/A319/IAE/BROKEN/ETD-new.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 426 KiB

After

Width:  |  Height:  |  Size: 426 KiB

0
Models/Liveries/A319/IAE/ETD-new.xml → Models/Liveries/A319/IAE/BROKEN/ETD-new.xml
View file

Some files were not shown because too many files have changed in this diff Show more