fly/fgdata
1
0
Fork 0
Code Activity

Merge branch 'next' of git://git.code.sf.net/p/flightgear/fgdata into next

Browse source
This commit is contained in:
Scott Giese 2020-06-28 11:32:40 -05:00
commit 8d785cacbc
5 changed files with 52 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Nasal/volcano.nas
View file

@ -44,8 +44,8 @@ var volcano_manager = {
var state = getprop("/environment/volcanoes/enable-volcanoes"); var state = getprop("/environment/volcanoes/enable-volcanoes");
me.active = state; me.active = state;
if (state == 1) if (state == 1)
{print("Volcanic activity on.");} {logprint(LOG_INFO, "Volcanic activity on.");}
else {print ("Volcanic activity off.");} else {logprint(LOG_DEBUG, "Volcanic activity off.");}
}, },
set_state: func { set_state: func {
@ -53,10 +53,10 @@ var volcano_manager = {
me.active = state; me.active = state;
if (state == 1) if (state == 1)
{ {
print("Volcanic activity on."); logprint(LOG_INFO, "Volcanic activity on.");
me.run(0); me.run(0);
} }
else {print ("Volcanic activity off.");} else {logprint(LOG_INFO, "Volcanic activity off.");}
}, },
@ -80,7 +80,7 @@ var volcano_manager = {
if ((dist < me.dist_to_load) and (dist < visibility)) if ((dist < me.dist_to_load) and (dist < visibility))
{ {
print("Loading ", me.volcano_array[index].name, "."); logprint(LOG_INFO, "Loading ", me.volcano_array[index].name, ".");
me.volcano_array[index].set(); me.volcano_array[index].set();
me.volcano_array[index].loaded = 1; me.volcano_array[index].loaded = 1;
} }

2
gui/dialogs/location-in-air.xml
View file

@ -46,7 +46,7 @@
var found = navinfo(type,getprop(propname)); var found = navinfo(type,getprop(propname));
if( found == nil or size(found) == 0 ) { if( found == nil or size(found) == 0 ) {
print(type, " ", getprop(propname), " NOT found"); logrint(LOG_WARN, type, " ", getprop(propname), " NOT found");
setprop(propname, ""); setprop(propname, "");
setprop(freqpropname, ""); setprop(freqpropname, "");
return; return;

1
gui/dialogs/multiplayer.xml
View file

@ -207,7 +207,6 @@
<command>nasal</command> <command>nasal</command>
<script> <script>
var val = getprop("/sim/gui/dialogs/multiplay/protocol-version"); var val = getprop("/sim/gui/dialogs/multiplay/protocol-version");
print("MP Version :",val,":");
if (val == "Visible to all") { if (val == "Visible to all") {
setprop("/sim/multiplay/protocol-version", 1); setprop("/sim/multiplay/protocol-version", 1);
} }

52
gui/dialogs/terrasync.xml
View file

@ -17,10 +17,6 @@ var computeStatusText = func {
if (!getprop('/sim/terrasync/active')) if (!getprop('/sim/terrasync/active'))
return "Automatic download inactive"; return "Automatic download inactive";
var errCount = getprop('/sim/terrasync/error-count');
if (errCount > 0)
return "Errors occurred during download";
# we need to suggest some remedial action here! # we need to suggest some remedial action here!
if (getprop('/sim/terrasync/stalled')) if (getprop('/sim/terrasync/stalled'))
return "Downloading has stalled. Check your network connection and settings"; return "Downloading has stalled. Check your network connection and settings";
@ -303,17 +299,31 @@ setprop("/sim/gui/dialogs/terrasync/display-mode", "0");
</equals> </equals>
</visible> </visible>
<!-- status text is generated by Nasal dynamically -->
<text> <text>
<row>0</row> <row>0</row>
<col>0</col> <col>0</col>
<halign>left</halign>
<label>Status:</label>
<live>true</live>
<color>
<red>0.7</red>
<green>0.7</green>
<blue>0.7</blue>
<alpha>1</alpha>
</color>
</text>
<text>
<row>0</row>
<col>1</col>
<colspan>2</colspan> <colspan>2</colspan>
<halign>left</halign> <halign>left</halign>
<pref-width>200</pref-width> <!-- status text is generated by Nasal dynamically -->
<format>Status: %s</format>
<property>/sim/gui/dialogs/terrasync/status</property> <property>/sim/gui/dialogs/terrasync/status</property>
<live>true</live> <live>true</live>
<halign>right</halign>
<color> <color>
<red>0.7</red> <red>0.7</red>
<green>0.7</green> <green>0.7</green>
@ -405,6 +415,34 @@ setprop("/sim/gui/dialogs/terrasync/display-mode", "0");
<alpha>1</alpha> <alpha>1</alpha>
</color> </color>
</text> </text>
<text>
<halign>left</halign>
<row>4</row>
<col>0</col>
<label>Number of errors:</label>
<color>
<red>0.7</red>
<green>0.7</green>
<blue>0.7</blue>
<alpha>1</alpha>
</color>
</text>
<text>
<row>4</row>
<col>1</col>
<format>%s</format>
<property>/sim/terrasync/error-count</property>
<live>true</live>
<stretch>true</stretch>
<halign>right</halign>
<color>
<red>0.7</red>
<green>0.7</green>
<blue>0.7</blue>
<alpha>1</alpha>
</color>
</text>
</group> </group>
<loglist> <loglist>

2
gui/dialogs/weather.xml
View file

@ -276,7 +276,7 @@
var metar = getprop("environment/metar/data"); var metar = getprop("environment/metar/data");
if( metar == nil or metar == "" ) metar = "NIL"; if( metar == nil or metar == "" ) metar = "NIL";
metar = normalize_string(metar); metar = normalize_string(metar);
printlog( "info", "new METAR: " ~ metar ); logprint(LOG_DEBUG, "new METAR: " ~ metar );
setprop( me.base ~ "/metar-string", metar ); setprop( me.base ~ "/metar-string", metar );
gui.dialog_update( "weather-conditions", "metar-string" ); gui.dialog_update( "weather-conditions", "metar-string" );
}, },