1
0
Fork 0
Commit graph

133 commits

Author SHA1 Message Date
Thomas Geymayer
45e3b7e2d1 Clean up/prepare for porting NasalPositioned to cppbind 2013-03-04 16:31:37 +01:00
James Turner
1eb8ae1fbf Give the FGAirport class a sane filename.
simple.[cxx|hxx] -> airport.[cxx|hxx]
2013-02-21 11:32:02 +00:00
ThorstenB
32b9c61528 ATIS upgrade
Add missing ATIS elements (transition level, expected approach,
precipitation, runway surface warnings).
Minor phraseology fixes for US/Europe.
Adds "/sim/atis/concise-report" option to use abbreviations (CAVOK etc),
and omit "obvious" units (depends on airport).
Trigger ATIS updates for significant pressure changes.
2012-10-13 16:48:56 +02:00
ThorstenB
395c317627 ATCVoice: support multiple voice files
so we can split ATIS voice files into separate files, i.e. for airport
names and phraseology, so we don't need to regenerate airport names when
extending/changing phraseology. Also allows to add custom airport names.
Enable switching voice files at run-time (different airports could have
different voices...).
2012-10-13 15:45:15 +02:00
ThorstenB
2bdcde5a4b Split ATIS generator into smaller, more readable methods. 2012-10-05 00:22:02 +02:00
ThorstenB
109d04b605 Fix ATIS output.
Need to call inherited update to control volume and enable/disable
depending on sound ATC switch.
2012-10-05 00:07:40 +02:00
James Turner
7b8804bd40 Tolerate refactored SGSound headers.
An upcoming commit will make the sound headers standalone, and no longer include various other headers / using std:: declarations. Prepare for this by making includes and usage of namespaces explicit.
2012-09-30 19:40:08 +01:00
Thomas Geymayer
65f2881770 Fix finding ATIS CommStation 2012-09-27 17:03:14 +02:00
Thomas Geymayer
f00bcad479 Fix ATIS /environment/attention handling
Using a tied property works only for one single usage of the
property. In reality FGATIS is normally instantiated four
times (nav/comm/1/2) where only the first instantiation
works correctly. All subsequent instantions fail to tie
and show some error messages.
Also tied properties shouldn't be used anymore.
2012-09-27 00:42:06 +02:00
ThorstenB
7415696492 Create FGSoundManager as a wrapper for SGSoundMgr_OpenAl
and sink all sound related code from main.cxx in there.
2012-09-17 13:45:31 +02:00
ThorstenB
f675d51c29 Correct ATIS pressure phraseology
Unit is spoken for all values <1000hPa (to avoid confusion with inHg).
Unit is not spoken for values >=1000hPa (but don't drop highest digit).
(And we should replace "millibars" with "hectopascal" - we're missing the
necessary voice sample though.)
2012-09-16 14:21:11 +02:00
James Turner
45d2e693ee Fix a crash encountered with ATC.
This might need to be back-ported to 2.8 (to make a 2.8.1), unless it's been exposed by some of my other changes. Which I think is unlikely but not impossible.
2012-08-21 18:12:25 +01:00
ThorstenB
a2bd520a3b ATISMgr clean-up / improvements
Adds serviceable/operable properties to comm radio.
Obey comm radio power source (no power => no radio => no ATIS).
Also further clean-up to stuff belonging to former ATCmgr module.
2012-07-17 19:32:12 +02:00
ThorstenB
e4c3b77f15 Restore ATIS reception with nav receivers.
nav radios can be used for comm reception - mainly to receive ATIS. This
had worked with FG 2.6, but was lost in the ATCMgr->ATISMgr conversion.
2012-07-15 19:02:05 +02:00
ThorstenB
91198ebc8e Clean-up, part III.
Consistent white-spacing only. Also move all dead code to bottom section
(to be removed later).
2012-05-13 00:11:20 +02:00
ThorstenB
a2922e2e23 ATCDCL cleanup, part II.
Remove/comment out obsolete code.
Refactor ATCmgr(-old) into ATISmgr(-new), only keeping the COM radio / ATIS
support.
2012-05-12 23:53:30 +02:00
ThorstenB
d6ef7bb091 Drop obsolete ATCDCL dialog. 2012-05-12 23:53:29 +02:00
ThorstenB
d2fa9e26a0 #767: stop ATIS when switching off volume or loosing station 2012-05-12 23:53:29 +02:00
Frederic Bouvier
75fc136931 Remove redundant inclusion of math/SGMath.hxx 2012-05-05 11:20:04 +02:00
ThorstenB
b9260f543b Ganael Laplanche: fix include dependencies for FreeBSD support 2012-05-05 01:08:20 +02:00
James Turner
c831d9c857 Get the ATC frequency dialogs working again for the 2.6 release. 2011-12-27 22:55:52 +00:00
Erik Hofman
1fb790eb60 comment out unused variables and function and properly initialize variables 2011-12-19 16:50:21 +01:00
ThorstenB
d47342a5a4 Add --log-class option, improve logging classes.
Replace SG_GENERAL by more specific log classes in many places.
Allow "," to separate logging classes (using "|" is odd on the
command-line).
Also add new option to make logging more useful for developers.
You can use:
  --log-level=debug --log-class=environment
to only get environment debug messages, or
  --log-level=debug --log-class=sound,ai
to only get debug messages related to the sound or AI subsystem.
2011-12-11 14:06:17 +01:00
James Turner
a05ea36acb Restructure GUI code, isolate PLIB in source files, to ease future refactoring and alternative GUI layers. 2011-11-19 20:25:51 +00:00
ThorstenB
1e184bb0f4 Avoid segfault on shutdown
Fixes double-delete of old ATC manager.
2011-11-14 20:38:50 +01:00
James Turner
07a627680e Get ATIS working again temporarily, since a proper refactoring will take a few days. 2011-11-13 20:32:30 +00:00
ThorstenB
12b6e8952a Avoid crash in ATIS/ATC modules.
The old ATC_mgr is no longer available/initialized, which caused ATIS/ATC
modules to crash when selecting ATIS frequencies. This adds a guard to
avoid the crash, but doesn't revive the ATIS feature.
2011-11-12 20:51:03 +01:00
James Turner
70b4f38ebc Goodbye automake. 2011-11-01 11:15:53 +00:00
James Turner
b1b4b7ecf4 Fix (nearly) all the std:: namespace violations in headers, in preparation for fixing SGsmplstat.hxx to *not* do a 'using namespace std'. 2011-10-17 17:41:59 +01:00
James Turner
dbda2fb95d Switch ATCmgr comm station search to filter by range in cartesian, not geodetic, space, to avoid numerical instability with extremely distant stations. 2011-09-28 09:06:31 +01:00
Curtis L. Olson
a5de08e240 Fix a couple issues with non-referenced files missing from the source
distribution (and thus breaking the build.)
2011-08-15 22:50:39 -05:00
Durk Talsma
acb2bc9286 Bugfixes:
- Allow the ATC/AI code to start from a non-airport location
	- Windows compilation fixes.
2011-07-25 12:53:10 +02:00
Durk Talsma
561282b2f9 Rename ATCDCL/ATCDialog.[ch]xx to ATCDCL/ATCDialogOld.[ch]xx to prevent compilation problems under windows (as reported by Alan Teeder). 2011-07-24 19:19:20 +02:00
Durk Talsma
5228053f7f Merge branch 'next' into durk-atc 2011-07-24 08:44:22 +02:00
Torsten Dreyer
5303d15aa3 Fix #369: ATIS receiver has excessive range
Add a range filter when searching for CommStations,
searching by frequency is not enough.
2011-07-08 10:56:18 +02:00
Durk Talsma
348ff2ec23 Merge branch 'next' into durk-atc
Merge with next.
Conflicts:
	src/Airports/dynamics.cxx
	src/Airports/dynamics.hxx
2011-06-03 09:31:04 +02:00
James Turner
d5f81f0eac Push some of the ATIS logic into AirportDynamics, in preparation for ATIS being owned by the airport 2011-06-02 23:28:40 +01:00
Durk Talsma
f9a5f921a4 Merge branch 'next' into durk-atc
Resolving merge conflicts indicated below.
Conflicts:
	src/ATC/CMakeLists.txt
	src/ATC/Makefile.am
	src/Main/fg_init.cxx
2011-06-01 20:46:34 +02:00
James Turner
2b967608a0 Expose FGPositioned data via property tree, and make comm-stations a real FGPositioned subclass. 2011-06-01 17:45:22 +01:00
Durk Talsma
52b0baace1 adding changed files for previous commit. 2011-04-03 17:58:16 +02:00
Dave Luff
f7c487fd4e ATIS: revert to using inches globally by default.
Revert to using inches globally by default, unless the user sets the
property /sim/atc/use-millibars.  Whilst this is therefore wrong by
default, it is probably the best thing in the short term since
FlightGear's altimeter dialog and the altimeters on the default
aircraft set using inches.
2011-01-05 20:12:18 +00:00
Dave Luff
dd690909af ATIS improvements from John Denker
Primarily an improvment to the internationalisation.  Previously the ATIS considered
the world as either the UK or the rest of the world.  Now it considers it as US+Canada
or the rest of the world.  This is much more consistent with global usage of pressure
units as either inches or millibars, which is the most important difference.  Also
some other tweaks and cleanups.
2011-01-05 00:27:18 +00:00
Dave Luff
2cb67b06b7 ATIS fixes from John Denker 2011-01-03 01:19:01 +00:00
Dave Luff
1758c11889 ATIS: Slight tweak
Add a slight gap between the end of the time and the start of the weather
2010-12-31 00:15:17 +00:00
Frederic Bouvier
445306cac7 Win32 fix 2010-12-30 19:07:49 +01:00
Dave Luff
c4ae902d75 ATIS: evaluate airport abbreviations case-insensitively
The apt.dat file contains inconsistent case for many airport name abbreviations,
e.g. MUNI/Muni and intl/Intl.  Evaluate the abbreviations in lower-case when
expanding them in order to avoid missing any.
2010-12-30 16:24:43 +00:00
Dave Luff
9a987a3709 ATIS fixes/refactoring from John Denker
Some fixes, and refactoring of the lexicon and abbreviation remapping
into headers where it can be picked up by the scripts that generate
the voice files.
2010-12-30 16:24:43 +00:00
Frederic Bouvier
4eb0634c9a Space change to trigger a rebuild on Hudson 2010-12-29 23:55:01 +01:00
Dave Luff
07d430c129 More fixes to the ATCDCL & ATC compilation
Rename ATC/atis.[ch]xx to ATC/atis_mgr.[ch]xx, to avoid confusingly
having 2 atis.cxx and 2 atis.hxx in the source tree.  Also fix a copy
and paste error in src/ATCDCL/CMakeLists.txt.
2010-12-29 18:52:39 +00:00
Dave Luff
4042385a21 ATIS fixes from John Denker 2010-12-28 20:47:33 +00:00