Merge branch 'master' of gitorious.org:fg/fgdata
This commit is contained in:
BARANGER Emmanuel
commit
de52ebe073
8 changed files with 121 additions and 24 deletions
|
|
@ -169,7 +169,7 @@
|
|||
<desc>open/close model select dialog</desc>
|
||||
</key>
|
||||
<key>
|
||||
<name>tab</name>
|
||||
<name>=</name>
|
||||
<desc>open/close cursor dialog</desc>
|
||||
</key>
|
||||
|
||||
|
|
@ -184,7 +184,7 @@
|
|||
<line>  ~/.fgfs/Export/ufo-model-export.xml (Unix)</line>
|
||||
<line>  %APPDATA%\flightgear.org\Export\ufo-model-export.xml (Microsoft Windows)</line>
|
||||
<line/>
|
||||
<line>In the adjustment dialog (TAB-key) holding the Ctrl or Shift key down</line>
|
||||
<line>In the adjustment dialog (= key) holding the Ctrl or Shift key down</line>
|
||||
<line>makes slider effects coarser/finer.</line>
|
||||
</help>
|
||||
</sim>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<?xml version="1.0" ?>
|
||||
<?xml version="1.0" ?>
|
||||
<!--
|
||||
This file is part of FlightGear, the free flight simulator
|
||||
http://www.flightgear.org/
|
||||
|
|
@ -17,7 +17,7 @@
|
|||
-->
|
||||
<!--
|
||||
Cloud shapes and layers. See Docs/README.3DClouds for details.
|
||||
|
||||
|
||||
short Explanation:
|
||||
cb = Cumulonimbus (Thunderstorm cloud)
|
||||
cb-cal = Cumulonimbus Calvus (without amboss)
|
||||
|
|
@ -199,7 +199,18 @@ ns = Nimbostratus (Rain cloud)
|
|||
<vdist>1</vdist>
|
||||
</box>
|
||||
</ac-str>
|
||||
|
||||
|
||||
<ac>
|
||||
<box>
|
||||
<type>cu-large</type>
|
||||
<count>6</count>
|
||||
<width>4000</width>
|
||||
<height>0</height>
|
||||
<hdist>1</hdist>
|
||||
<vdist>1</vdist>
|
||||
</box>
|
||||
</ac>
|
||||
|
||||
<cu-hum>
|
||||
<box>
|
||||
<type>cu-small</type>
|
||||
|
|
@ -210,7 +221,7 @@ ns = Nimbostratus (Rain cloud)
|
|||
<vdist>2</vdist>
|
||||
</box>
|
||||
</cu-hum>
|
||||
|
||||
|
||||
<cu-con>
|
||||
<box>
|
||||
<type>cu-con</type>
|
||||
|
|
@ -229,7 +240,7 @@ ns = Nimbostratus (Rain cloud)
|
|||
<vdist>2</vdist>
|
||||
</box>
|
||||
</cu-con>
|
||||
|
||||
|
||||
<cb-cal>
|
||||
<box>
|
||||
<type>cb-large</type>
|
||||
|
|
@ -240,8 +251,8 @@ ns = Nimbostratus (Rain cloud)
|
|||
<vdist>2</vdist>
|
||||
</box>
|
||||
</cb-cal>
|
||||
|
||||
|
||||
|
||||
|
||||
<cb-inc>
|
||||
<box>
|
||||
<type>cb-large</type>
|
||||
|
|
@ -250,7 +261,7 @@ ns = Nimbostratus (Rain cloud)
|
|||
<height>1000</height>
|
||||
</box>
|
||||
</cb-inc>
|
||||
|
||||
|
||||
<st>
|
||||
<box>
|
||||
<type>st-large</type>
|
||||
|
|
@ -265,7 +276,7 @@ ns = Nimbostratus (Rain cloud)
|
|||
<height>100</height>
|
||||
</box>
|
||||
</st>
|
||||
|
||||
|
||||
<st-small>
|
||||
<box>
|
||||
<type>st-small</type>
|
||||
|
|
@ -274,7 +285,7 @@ ns = Nimbostratus (Rain cloud)
|
|||
<height>200</height>
|
||||
</box>
|
||||
</st-small>
|
||||
|
||||
|
||||
<ns>
|
||||
<box>
|
||||
<type>ns-large</type>
|
||||
|
|
@ -283,7 +294,7 @@ ns = Nimbostratus (Rain cloud)
|
|||
<height>300</height>
|
||||
</box>
|
||||
</ns>
|
||||
|
||||
|
||||
<sc>
|
||||
<box>
|
||||
<type>sc</type>
|
||||
|
|
@ -292,7 +303,7 @@ ns = Nimbostratus (Rain cloud)
|
|||
<height>300</height>
|
||||
</box>
|
||||
</sc>
|
||||
|
||||
|
||||
<xx>
|
||||
<box>
|
||||
<type>cu-large</type>
|
||||
|
|
@ -303,8 +314,8 @@ ns = Nimbostratus (Rain cloud)
|
|||
</box>
|
||||
</xx>
|
||||
</boxes>
|
||||
|
||||
|
||||
|
||||
|
||||
<layers>
|
||||
<cu>
|
||||
<cloud>
|
||||
|
|
@ -337,7 +348,7 @@ ns = Nimbostratus (Rain cloud)
|
|||
</cb>
|
||||
<ac>
|
||||
<cloud>
|
||||
<name>ac-str</name>
|
||||
<name>ac</name>
|
||||
<count>1</count>
|
||||
</cloud>
|
||||
<grid-z-rand type="double">100.0</grid-z-rand>
|
||||
|
|
|
|||
31
Nasal/canvas/map/altitude-profile.draw
Normal file
31
Nasal/canvas/map/altitude-profile.draw
Normal file
|
|
@ -0,0 +1,31 @@
|
|||
##
|
||||
# Draw a altitude profile position on the route with text
|
||||
#
|
||||
|
||||
var drawprofile = func (group, property, disptext)
|
||||
{
|
||||
var symNode = props.globals.getNode("autopilot/route-manager/vnav/"~property, 1);
|
||||
var lon = symNode.getNode("longitude-deg", 1).getValue();
|
||||
var lat = symNode.getNode("latitude-deg", 1).getValue();
|
||||
var sym_group = group.createChild("group", property);
|
||||
if(lon != nil)
|
||||
{
|
||||
var radius = 13;
|
||||
sym_group.createChild("path", property)
|
||||
.setStrokeLineWidth(5)
|
||||
.moveTo(-radius, 0)
|
||||
.arcLargeCW(radius, radius, 0, 2 * radius, 0)
|
||||
.arcLargeCW(radius, radius, 0, -2 * radius, 0)
|
||||
.setColor(0.195,0.96,0.097);
|
||||
sym_group.createChild("text", property)
|
||||
.setDrawMode( canvas.Text.TEXT )
|
||||
.setText(disptext)
|
||||
.setFont("LiberationFonts/LiberationSans-Regular.ttf")
|
||||
.setFontSize(28)
|
||||
.setTranslation(25,35)
|
||||
.setColor(0.195,0.96,0.097);
|
||||
sym_group.setGeoPosition(lat, lon)
|
||||
.set("z-index",4);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -147,8 +147,11 @@ var NDStyles = {
|
|||
|
||||
{ name:'mp-traffic', update_on:['toggle_range','toggle_traffic'],
|
||||
predicate: func(nd, layer) {
|
||||
trigger_update( layer ); # clear & redraw
|
||||
layer._view.setVisible( 1 ); #nd.get_switch('toggle_traffic')
|
||||
var visible = nd.get_switch('toggle_traffic');
|
||||
layer._view.setVisible( visible );
|
||||
if (visible) {
|
||||
trigger_update( layer ); # clear & redraw
|
||||
}
|
||||
}, # end of layer update predicate
|
||||
}, # end of traffic layer
|
||||
|
||||
|
|
@ -349,7 +352,7 @@ var default_switches = {
|
|||
'toggle_position': {path: '/inputs/pos', value:0, type:'BOOL'},
|
||||
'toggle_data': {path: '/inputs/data',value:0, type:'BOOL'},
|
||||
'toggle_terrain': {path: '/inputs/terr',value:0, type:'BOOL'},
|
||||
'toggle_traffic': {path: '/inputs/tcas',value:0, type:'BOOL'},
|
||||
'toggle_traffic': {path: '/inputs/tfc',value:0, type:'BOOL'},
|
||||
'toggle_centered': {path: '/inputs/nd-centered',value:0, type:'BOOL'},
|
||||
'toggle_lh_vor_adf': {path: '/inputs/lh-vor-adf',value:0, type:'INT'},
|
||||
'toggle_rh_vor_adf': {path: '/inputs/rh-vor-adf',value:0, type:'INT'},
|
||||
|
|
@ -382,7 +385,7 @@ update_apl_sym();
|
|||
var NavDisplay = {
|
||||
|
||||
# reset handler
|
||||
handle_reinit: func {
|
||||
del: func {
|
||||
print("Cleaning up NavDisplay");
|
||||
# shut down all timers and other loops here
|
||||
me.update_timer.stop();
|
||||
|
|
@ -496,7 +499,7 @@ var NavDisplay = {
|
|||
{
|
||||
if (me.inited) die("MFD already was added to scene");
|
||||
me.inited = 1;
|
||||
me.listen("/sim/signals/reinit", func(n) me.handle_reinit() );
|
||||
#me.listen("/sim/signals/reinit", func(n) me.del() );
|
||||
me.update_timer = maketimer(0.05, func me.update() ); # TODO: make interval configurable via ctor
|
||||
me.nd = canvas_group;
|
||||
me.canvas_handle = parent;
|
||||
|
|
|
|||
|
|
@ -59,10 +59,22 @@ var draw_route = func (group, theroute, controller=nil, lod=0)
|
|||
append(cmds,4);
|
||||
canvas.drawwp(group, leg.path()[1].lat, leg.path()[1].lon, leg.alt_cstr, leg.wp_name, i, wp);
|
||||
}
|
||||
|
||||
|
||||
# Set Top Of Crimb coordinate
|
||||
canvas.drawprofile(route_group, "tc", "T/C");
|
||||
# Set Top Of Descent coordinate
|
||||
canvas.drawprofile(route_group, "td", "T/D");
|
||||
# Set Step Crimb coordinate
|
||||
canvas.drawprofile(route_group, "sc", "S/C");
|
||||
# Set Top Of Descent coordinate
|
||||
canvas.drawprofile(route_group, "ed", "E/D");
|
||||
|
||||
# Update route coordinates
|
||||
debug.dump(cmds);
|
||||
debug.dump(coords);
|
||||
route.setDataGeo(cmds, coords);
|
||||
updatewp(0);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -154,6 +154,13 @@
|
|||
<node>/sim/sound/atc/volume</node>
|
||||
</chunk>
|
||||
|
||||
<chunk>
|
||||
<name>silence-threshold</name>
|
||||
<type>double</type>
|
||||
<format>SILENCE_THD=%1.1f</format>
|
||||
<node>/sim/fgcom/silence-threshold</node>
|
||||
</chunk>
|
||||
|
||||
</output>
|
||||
|
||||
</generic>
|
||||
|
|
|
|||
|
|
@ -29,6 +29,7 @@
|
|||
<snap-shot>Capture d'écran</snap-shot> <!-- English: "Screenshot " -->
|
||||
<snap-shot-dir>Répertoire des captures</snap-shot-dir> <!-- English: "Screenshot Directory" -->
|
||||
<sound-config>Configuration du son</sound-config> <!-- English: "Sound Configuration" -->
|
||||
<input-config>Configuration des périphériques</input-config> <!-- English: "Input Configuration" -->
|
||||
<exit>Quitter</exit> <!-- English: "Quit " -->
|
||||
|
||||
<!-- View menu -->
|
||||
|
|
@ -91,6 +92,7 @@
|
|||
<!-- Multiplayer menu -->
|
||||
<multiplayer>Multijoueurs</multiplayer> <!-- English: "Multiplayer" -->
|
||||
<mp-settings>Paramètres</mp-settings> <!-- English: "Multiplayer Settings" -->
|
||||
<fgcom-settings>Paramètres FGCom</fgcom-settings> <!-- English: "FGCom Settings" -->
|
||||
<mp-chat>Fenêtre de clavardage</mp-chat> <!-- English: "Chat Dialog" -->
|
||||
<mp-chat-menu>Menu de clavardage</mp-chat-menu> <!-- English: "Chat Menu" -->
|
||||
<mp-list>Liste des pilotes</mp-list> <!-- English: "Pilot List" -->
|
||||
|
|
@ -129,6 +131,7 @@
|
|||
<help-browser>Aide (s'ouvre dans le navigateur)</help-browser> <!-- English: "Help (opens in browser)" -->
|
||||
<doc-browser>Naviguer dans la documentation</doc-browser> <!-- English: "Documentation Browser" -->
|
||||
<aircraft-keys>Aide de l'aéronef</aircraft-keys> <!-- English: "Aircraft Help" -->
|
||||
<aircraft-checklists>Checklists de l'aéronef</aircraft-checklists>
|
||||
<common-keys>Touches communes aux aéronefs</common-keys> <!-- English: "Common Aircraft Keys" -->
|
||||
<basic-keys>Touches de base du simulateur</basic-keys> <!-- English: "Basic Simulator Keys" -->
|
||||
<joystick-config>Configuration du joystick</joystick-config> <!-- English: "Joystick Configuration" -->
|
||||
|
|
|
|||
|
|
@ -237,6 +237,36 @@
|
|||
<live>true</live>
|
||||
<property>/sim/fgcom/speaker-level</property>
|
||||
</text>
|
||||
|
||||
<text>
|
||||
<row>5</row>
|
||||
<col>0</col>
|
||||
<label>Silence threshold:</label>
|
||||
<halign>right</halign>
|
||||
</text>
|
||||
<slider>
|
||||
<row>5</row>
|
||||
<col>1</col>
|
||||
<halign>left</halign>
|
||||
<name>silence-thd</name>
|
||||
<label></label>
|
||||
<min>-60.0</min>
|
||||
<max>0.0</max>
|
||||
<step>1</step>
|
||||
<property>/sim/fgcom/silence-threshold</property>
|
||||
<binding>
|
||||
<command>dialog-apply</command>
|
||||
<object-name>silence-thd</object-name>
|
||||
</binding>
|
||||
</slider>
|
||||
<text>
|
||||
<row>5</row>
|
||||
<col>2</col>
|
||||
<label>1234</label>
|
||||
<format>%.1f</format>
|
||||
<live>true</live>
|
||||
<property>/sim/fgcom/silence-threshold</property>
|
||||
</text>
|
||||
</group>
|
||||
|
||||
<hrule/>
|
||||
|
|
|
|||
Loading…
Reference in a new issue