diff --git a/plugins/channelrx/demodacars/acarsaero.h b/plugins/channelrx/demodacars/acarsaero.h index 9cfc1b16e..2d7d80add 100644 --- a/plugins/channelrx/demodacars/acarsaero.h +++ b/plugins/channelrx/demodacars/acarsaero.h @@ -44,7 +44,7 @@ #include "acarshfdl.h" // Inmarsat Classic Aero (aviation SATCOM) receiver, ICAO Annex 10 Volume III and -// ARINC 741. +// ARINC 741. // // Aero is the L band satellite protocol for ACARS, the complement to HFDL for oceanic // aircraft. Three data rates are in scope: diff --git a/plugins/channelrx/demodacars/acarsdemodgui.cpp b/plugins/channelrx/demodacars/acarsdemodgui.cpp index 90dd7f533..082fc5f86 100644 --- a/plugins/channelrx/demodacars/acarsdemodgui.cpp +++ b/plugins/channelrx/demodacars/acarsdemodgui.cpp @@ -1372,7 +1372,7 @@ void AcarsDemodGUI::tick() nbMagsqSamples); // Only update labels that can be seen, to avoid unncessary compositing - if (m_tickCount % 4 == 0) + if (m_tickCount % 4 == 0) { if (!ui->channelPower->visibleRegion().isEmpty()) { ui->channelPower->setText(QString::number(powDbAvg, 'f', 1)); diff --git a/plugins/channelrx/demodacars/acarsdemodsettings.h b/plugins/channelrx/demodacars/acarsdemodsettings.h index 866311549..068373e6a 100644 --- a/plugins/channelrx/demodacars/acarsdemodsettings.h +++ b/plugins/channelrx/demodacars/acarsdemodsettings.h @@ -37,7 +37,7 @@ struct AcarsDemodSettings VDL2 = 1, //!< VDL Mode 2: 10500 baud D8PSK, ACARS over AVLC HFDL = 2, //!< HFDL: 1800 baud M-PSK on a 1440 Hz subcarrier, ACARS over MPDU/LPDU Aero = 3, //!< Inmarsat Classic Aero: L band satellite, ACARS over signal units - Iridium = 4, //!< Iridium: L band satellite, burst DQPSK from low earth orbit. + Iridium = 4, //!< Iridium: L band satellite, burst DQPSK from low earth orbit. ModeCount }; diff --git a/plugins/channelrx/demodacars/acarsdemodworker.cpp b/plugins/channelrx/demodacars/acarsdemodworker.cpp index 3962671c3..e09e3542a 100644 --- a/plugins/channelrx/demodacars/acarsdemodworker.cpp +++ b/plugins/channelrx/demodacars/acarsdemodworker.cpp @@ -37,7 +37,7 @@ #ifdef _MSC_VER // For libacars/asn1/asn_system.h #define ASSUMESTDTYPES -#define ssize_t SSIZE_T +#define ssize_t SSIZE_T #endif #include @@ -77,58 +77,58 @@ MESSAGE_CLASS_DEFINITION(AcarsDemodWorker::MsgReplayPacket, Message) // Convert CPDCL altitude in to feet static int cpdlcAltitude(FANSAltitude_t altitude) { - switch(altitude.present) - { - case FANSAltitude_PR_altitudeQNH: - return altitude.choice.altitudeQNH * 10; - case FANSAltitude_PR_altitudeQNHMeters: - return Units::metresToIntegerFeet(altitude.choice.altitudeQNHMeters); - case FANSAltitude_PR_altitudeQFE: - return altitude.choice.altitudeQFE * 10; - case FANSAltitude_PR_altitudeQFEMeters: - return Units::metresToIntegerFeet(altitude.choice.altitudeQFEMeters); - case FANSAltitude_PR_altitudeGNSSFeet: - return altitude.choice.altitudeGNSSFeet; - case FANSAltitude_PR_altitudeGNSSMeters: - return Units::metresToIntegerFeet(altitude.choice.altitudeGNSSMeters); - case FANSAltitude_PR_altitudeFlightLevel: - return altitude.choice.altitudeFlightLevel * 100; - case FANSAltitude_PR_altitudeFlightLevelMetric: - return Units::metresToIntegerFeet(altitude.choice.altitudeFlightLevelMetric * 10.0); - case FANSAltitude_PR_NOTHING: /* No components present */ - default: + switch(altitude.present) + { + case FANSAltitude_PR_altitudeQNH: + return altitude.choice.altitudeQNH * 10; + case FANSAltitude_PR_altitudeQNHMeters: + return Units::metresToIntegerFeet(altitude.choice.altitudeQNHMeters); + case FANSAltitude_PR_altitudeQFE: + return altitude.choice.altitudeQFE * 10; + case FANSAltitude_PR_altitudeQFEMeters: + return Units::metresToIntegerFeet(altitude.choice.altitudeQFEMeters); + case FANSAltitude_PR_altitudeGNSSFeet: + return altitude.choice.altitudeGNSSFeet; + case FANSAltitude_PR_altitudeGNSSMeters: + return Units::metresToIntegerFeet(altitude.choice.altitudeGNSSMeters); + case FANSAltitude_PR_altitudeFlightLevel: + return altitude.choice.altitudeFlightLevel * 100; + case FANSAltitude_PR_altitudeFlightLevelMetric: + return Units::metresToIntegerFeet(altitude.choice.altitudeFlightLevelMetric * 10.0); + case FANSAltitude_PR_NOTHING: /* No components present */ + default: return -1; - } + } } static double cpdlcCoordinate(long degrees, long *tenthsofminutes) { - double result = (double)degrees; - if(tenthsofminutes != NULL) { - result += (double)(*tenthsofminutes) / 10.0f / 60.0f; - } - return result; + double result = (double)degrees; + if(tenthsofminutes != NULL) { + result += (double)(*tenthsofminutes) / 10.0f / 60.0f; + } + return result; } // Extract lat, lon, alt from FANSPositionReport static bool cpdlcExtractPosition(FANSPositionReport_t rpt, double &latitude, double &longitude, int &altitude) { - // FANSPositionCurrent_t can contain various types of position data (fix name, navaid, etc). - // We want only latitude/longitude coordinates. - FANSPositionCurrent_t pos = rpt.positioncurrent; - if(pos.present != FANSPosition_PR_latitudeLongitude) { - return false; - } - FANSLatitudeLongitude_t latlon = pos.choice.latitudeLongitude; - latitude = cpdlcCoordinate(latlon.latitude.latitudeDegrees, latlon.latitude.minutesLatLon); - if(latlon.latitude.latitudeDirection == FANSLatitudeDirection_south) { - latitude = -latitude; - } - longitude = cpdlcCoordinate(latlon.longitude.longitudeDegrees, latlon.longitude.minutesLatLon); - if(latlon.longitude.longitudeDirection == FANSLongitudeDirection_west) { - longitude = -longitude; - } - altitude = cpdlcAltitude(rpt.altitude); + // FANSPositionCurrent_t can contain various types of position data (fix name, navaid, etc). + // We want only latitude/longitude coordinates. + FANSPositionCurrent_t pos = rpt.positioncurrent; + if(pos.present != FANSPosition_PR_latitudeLongitude) { + return false; + } + FANSLatitudeLongitude_t latlon = pos.choice.latitudeLongitude; + latitude = cpdlcCoordinate(latlon.latitude.latitudeDegrees, latlon.latitude.minutesLatLon); + if(latlon.latitude.latitudeDirection == FANSLatitudeDirection_south) { + latitude = -latitude; + } + longitude = cpdlcCoordinate(latlon.longitude.longitudeDegrees, latlon.longitude.minutesLatLon); + if(latlon.longitude.longitudeDirection == FANSLongitudeDirection_west) { + longitude = -longitude; + } + altitude = cpdlcAltitude(rpt.altitude); return true; } @@ -960,16 +960,16 @@ void AcarsDemodWorker::processAcarsMessage(QByteArray messageBytes, QDateTime re la_adsc_msg_t *adsc = (la_adsc_msg_t *)adscNode->data; if (adsc && !adsc->err) { - la_list *l = adsc->tag_list; - la_adsc_basic_report_t *rpt = NULL; - while(l != NULL) + la_list *l = adsc->tag_list; + la_adsc_basic_report_t *rpt = NULL; + while(l != NULL) { - la_adsc_tag_t *tag_struct = (la_adsc_tag_t *)l->data; - uint8_t t = tag_struct->tag; - // Look for a Basic Report - if(t == 7 || t == 9 || t == 10 || t == 18 || t == 19 || t == 20) + la_adsc_tag_t *tag_struct = (la_adsc_tag_t *)l->data; + uint8_t t = tag_struct->tag; + // Look for a Basic Report + if(t == 7 || t == 9 || t == 10 || t == 18 || t == 19 || t == 20) { - rpt = (la_adsc_basic_report_t *)tag_struct->data; + rpt = (la_adsc_basic_report_t *)tag_struct->data; e.m_hasPosition = true; e.m_hasAltitude = true; e.m_latitude = rpt->lat; @@ -982,9 +982,9 @@ void AcarsDemodWorker::processAcarsMessage(QByteArray messageBytes, QDateTime re report.m_altitudeValid = true; report.m_altitudeFt = rpt->alt; report.m_documentKind = AircraftReport::PositionReport; - break; - } - l = la_list_next(l); + break; + } + l = la_list_next(l); } } } @@ -1006,7 +1006,7 @@ void AcarsDemodWorker::processAcarsMessage(QByteArray messageBytes, QDateTime re int altitudeFt; if(dm->aTCDownlinkmsgelementid.present == FANSATCDownlinkMsgElementId_PR_dM48PositionReport) { - positionValid = cpdlcExtractPosition(dm->aTCDownlinkmsgelementid.choice.dM48PositionReport, latitude, longitude, altitudeFt); + positionValid = cpdlcExtractPosition(dm->aTCDownlinkmsgelementid.choice.dM48PositionReport, latitude, longitude, altitudeFt); } else { @@ -1044,8 +1044,8 @@ void AcarsDemodWorker::processAcarsMessage(QByteArray messageBytes, QDateTime re } } - la_proto_tree_destroy(node); - } + la_proto_tree_destroy(node); + } else { e.m_textDecode = "Failed to la_acars_parse_and_reassemble"; diff --git a/plugins/channelrx/demodacars/readme.md b/plugins/channelrx/demodacars/readme.md index 6b7065ce3..9dd87a3ad 100644 --- a/plugins/channelrx/demodacars/readme.md +++ b/plugins/channelrx/demodacars/readme.md @@ -8,10 +8,10 @@ These packets can contain flight plans and other operational data as well as sta ACARS uses MSK modulation at 2,400 baud, which is then AM modulated on to the VHF carrier. In Europe, the main ACARS frequencies are: - - 131.525 MHz (SITA - Europe secondary) + - 131.525 MHz (SITA - Europe secondary) - 131.725 MHz (SITA - Europe primary) - 131.825 MHz (ARINC/Collins) - + VDL Mode 2 uses D8PSK modulation at 10,500 baud (bit rate 31,500 bps). It can contain ACARS or ATN packets. VDL Mode 2 frequencies in Europe are: @@ -24,7 +24,7 @@ VDL Mode 2 frequencies in Europe are: - 136.900 MHz - 136.975 MHz (SITA & ARINC, the common signalling channel) -HFDL uses M-PSK at 1,800 baud and frequencies are between 2 and 21 MHz. The active frequencies vary with propagation, and the +HFDL uses M-PSK at 1,800 baud and frequencies are between 2 and 21 MHz. The active frequencies vary with propagation, and the frequencies in use are reported in squitters transmitted by the ground stations. These are combined by the demodulator and displayed in the Ground Station Table dialog. You can find an initial frequency to try on: https://hfdl.observer/ @@ -82,7 +82,7 @@ Average total power in dB relative to a +/- 1.0 amplitude signal received in the

4: Mode and Aero rate

Selects the demodulator: ACARS, VDL-2, HFDL, Aero or Iridium - and, in Aero mode -only, the rate and channel selector appears beside it. +only, the rate and channel selector appears beside it. Changing either resets the demodulator and sets a default RF bandwidth. Each demodulator runs at its own fixed channel sample rate, which the channelizer is @@ -100,7 +100,7 @@ set to when the mode is selected.

5: RF Bandwidth

-This specifies the bandwidth of a LPF that is applied to the input signal to limit the RF bandwidth. +This specifies the bandwidth of a LPF that is applied to the input signal to limit the RF bandwidth. A default value is automatically set when selecting the Mode, and in Aero mode the rate and channel, from the combo boxes (4): @@ -227,7 +227,7 @@ parts have arrived - and the selected block. * Block Seq. - For multipart downlinks, the block sequence character used to order the blocks. * Flight - For downlinks, the six-character flight identifier carried in the message text header. * Message - The ACARS message payload after the standard downlink header fields and any recognized sublabel have been removed. -* Message Decode - A structured, human-readable decode of the message payload. +* Message Decode - A structured, human-readable decode of the message payload. Selecting the row displays the full multi-line decode below the table. * ATC - Air Traffic Control communication extracted from supported ARINC 622/CPDLC messages. @@ -246,7 +246,7 @@ have no ACARS header, so only the following columns are used: * Date/Time - The receiver's local date and time when the frame was received. * Dir - The transmission direction. An up arrow is an uplink to an aircraft; a down arrow is a downlink from an aircraft. -* GS - Ground Station Id. +* GS - Ground Station Id. * GS Decode - Ground Station name. * Registration - The aircraft side of the link. VDL-2 link frames identify aircraft by their 24-bit ICAO address (the same address the aircraft transmits in Mode S / ADS-B) rather than by registration, so the registration is looked up from the OpenSky database (14); when the address is not in the database, the address itself is shown in hexadecimal. Frames between ground stations show `GS` followed by the ground station's address, and broadcasts show `All`. * Label - The AVLC frame type: `I` (information), `UI`, `XID` (link management, including GSIF ground station broadcasts), `TEST`, or the supervisory types `RR`, `RNR`, `REJ`, `SREJ`, `DM`, `DISC`, `UA`, `FRMR`. @@ -260,7 +260,7 @@ have no ACARS header, so only the following columns are used:

HFDL Frames

-HFDL frames that are not carrying an ACARS message use the same columns as the VDL-2 link frames. +HFDL frames that are not carrying an ACARS message use the same columns as the VDL-2 link frames.

Aero Signal Units

@@ -271,7 +271,7 @@ units that are not carrying an ACARS message use only the following columns: * Dir - The transmission direction. An up arrow is a transmission from the ground earth station on a P channel; a down arrow is a transmission from an aircraft on an R or T channel. -* GS - Ground Earth Station (GES) Id. +* GS - Ground Earth Station (GES) Id. * GS Decode - Satellite name, for example 'AOR-E'. See frequency table above. * Registration - The aircraft, when the signal unit names one. The AES ID is the aircraft's 24-bit ICAO address - the same address it transmits in Mode S / ADS-B. diff --git a/plugins/channelrx/demodadsb/adsbdemodtrackerdecode.cpp b/plugins/channelrx/demodadsb/adsbdemodtrackerdecode.cpp index 75458c340..ec203124d 100644 --- a/plugins/channelrx/demodadsb/adsbdemodtrackerdecode.cpp +++ b/plugins/channelrx/demodadsb/adsbdemodtrackerdecode.cpp @@ -1488,10 +1488,10 @@ void ADSBDemodTracker::handleADSB( } } else if (tc == 29) - { + { if (aircraft->m_adsbVersionValid && (aircraft->m_adsbVersion == 0)) { - // Trajectory Change Point - according to the spec this shouldn't be transmitted + // Trajectory Change Point - according to the spec this shouldn't be transmitted } else if (aircraft->m_adsbVersionValid && (aircraft->m_adsbVersion == 1)) { @@ -1499,7 +1499,7 @@ void ADSBDemodTracker::handleADSB( } else if (aircraft->m_adsbVersionValid && (aircraft->m_adsbVersion == 2)) { - // Target state and status + // Target state and status //bool selAltitudeType = (data[5] >> 7) & 0x1; int selAltitudeFix = ((data[5] & 0x7f) << 4) | ((data[6] >> 4) & 0xf); if (selAltitudeFix != 0) @@ -3983,7 +3983,7 @@ QList * ADSBDemodTracker::animate(QDateTime date const int gearDownHeight = 2000; // Above the runway, as most operators fly it const int gearDownAirspeed = 180; // Indicated, which is what a crew flies to - const int gearDownSpeed = 150; // Groundspeed, the last resort + const int gearDownSpeed = 150; // Groundspeed, the last resort const int gearDownVerticalRate = -300; // A settled descent. const int gearUpAltitude = 200; const int gearUpVerticalRate = 1000; diff --git a/plugins/feature/aircraft/readme.md b/plugins/feature/aircraft/readme.md index de761e387..6f4ba0965 100644 --- a/plugins/feature/aircraft/readme.md +++ b/plugins/feature/aircraft/readme.md @@ -107,11 +107,11 @@ an ATC style; when unchecked just the callsign or registration is shown.

6: Statistics

-The statistics table can be shown and hidden with the statistic button. +The statistics table can be shown and hidden with the statistic button. Right click the button to reset the records. Every figure is given twice, side by side: for this session and for all time, each with -who set it and when. +who set it and when. * **Maximum range**, one row per protocol - the furthest aircraft heard on ADS-B, ACARS, VDL-2, HFDL and Aero. Per protocol rather than as one figure because the protocols are @@ -195,7 +195,7 @@ Click to open the settings dialog. This allows aircraft to be kept forever, but only their recent flights - which hold the tracks, profiles and ACARS documents, so are most of the database. An aircraft's most recent flight is always kept. Zero keeps flights for as long - as their aircraft. + as their aircraft. * ADS-B position for (mins) - how long an aircraft stays on the Map after its last ADS-B position * ACARS position for (mins) - the same for a position from ACARS, VDL-2, HFDL, Aero or Iridium. @@ -210,7 +210,7 @@ Unticked ones are ignored. **Use airline callsigns in Map labels** - writes the flight on the Map the way it is spoken on the radio rather than the way it is transmitted: SPEEDBIRD 123 instead of -BAW123, using the airline's radio callsign from the airline database. +BAW123, using the airline's radio callsign from the airline database. **Show the maximum range record on the Map** - keeps the aircraft that set the all time maximum range record permanently on the Map, drawn at the position it was in when it set @@ -221,7 +221,7 @@ reset, or this is turned off. **Favour airline livery over aircraft type (3D map)** - when no 3D model exists of the right type in the right livery, prefer a similar aircraft in the correct livery over an -exact type in the wrong one. +exact type in the wrong one. **Livery aircraft icons (2D map)** - display aircraft on the 2D map using icons showing their airline's livery, instead of black icons. diff --git a/plugins/feature/map/czml.cpp b/plugins/feature/map/czml.cpp index 175ef3f2c..a6a8ec0cf 100644 --- a/plugins/feature/map/czml.cpp +++ b/plugins/feature/map/czml.cpp @@ -34,7 +34,7 @@ const QStringList CZML::m_heightReferences = {"NONE", "CLAMP_TO_GROUND", "RELATIVE_TO_GROUND", "CLIP_TO_GROUND"}; // Using CLAMP_TO_GROUND on a label, billboard or point, results in all of them being visible through the globe. -// So use CLIP_TO_GROUND instead. +// So use CLIP_TO_GROUND instead. // A single CLAMP_TO_GROUND label, billboard or point latches _shaderDisableDepthDistance // on the Cesium collection it lands in, which recompiles every item in that collection // onto Cesium's manual globe-depth path. That path discards nothing beyond diff --git a/plugins/samplesource/remotetcpinput/remotetcpinputtcphandler.cpp b/plugins/samplesource/remotetcpinput/remotetcpinputtcphandler.cpp index ceedcf2dc..3ec9391d3 100644 --- a/plugins/samplesource/remotetcpinput/remotetcpinputtcphandler.cpp +++ b/plugins/samplesource/remotetcpinput/remotetcpinputtcphandler.cpp @@ -270,23 +270,23 @@ void RemoteTCPInputTCPHandler::cleanup(bool threadStopped) { if (m_webSocket) { - if (threadStopped) { - delete m_webSocket; - } else { - m_webSocket->deleteLater(); + if (threadStopped) { + delete m_webSocket; + } else { + m_webSocket->deleteLater(); } m_webSocket = nullptr; } if (m_tcpSocket) { - if (threadStopped) { - delete m_tcpSocket; - } else { - m_tcpSocket->deleteLater(); + if (threadStopped) { + delete m_tcpSocket; + } else { + m_tcpSocket->deleteLater(); } m_tcpSocket = nullptr; } - } + } m_compressedData.clear(); m_uncompressedData.clear(); @@ -919,7 +919,7 @@ FLAC__StreamDecoderWriteStatus RemoteTCPInputTCPHandler::flacWrite(const FLAC__S int nbSamples = frame->header.blocksize; if (nbSamples > (int) m_converterBufferNbSamples) { - if (m_converterBuffer) + if (m_converterBuffer) { delete[] m_converterBuffer; m_converterBuffer = nullptr; @@ -1049,7 +1049,7 @@ void RemoteTCPInputTCPHandler::processDecompressedZlibData(const char *inBuf, in // Ensure conversion buffer is large enough - FIXME: Don't use this buffer - just write in to FIFO if (nbSamples > (int) m_converterBufferNbSamples) { - if (m_converterBuffer) + if (m_converterBuffer) { delete[] m_converterBuffer; m_converterBuffer = nullptr; @@ -2323,7 +2323,7 @@ void RemoteTCPInputTCPHandler::processUncompressedData(const char *inBuf, int nb // Ensure conversion buffer is large enough if (nbSamples > (int) m_converterBufferNbSamples) { - if (m_converterBuffer) + if (m_converterBuffer) { delete[] m_converterBuffer; m_converterBuffer = nullptr; diff --git a/sdrbase/util/acarsmessage.cpp b/sdrbase/util/acarsmessage.cpp index 81fd6a1ec..1d07fc901 100644 --- a/sdrbase/util/acarsmessage.cpp +++ b/sdrbase/util/acarsmessage.cpp @@ -247,7 +247,7 @@ AcarsMessage *AcarsMessage::decodeBlock(const QByteArray &message, const QString if (!uplink) { start += 10; // Skip msg num and flight } - + QString text; qsizetype textSize = message.length() - start - 1 - 2 - 1; if (textSize > 0) { diff --git a/sdrbase/util/aircraft3dmodels.h b/sdrbase/util/aircraft3dmodels.h index a4e501484..e39d98619 100644 --- a/sdrbase/util/aircraft3dmodels.h +++ b/sdrbase/util/aircraft3dmodels.h @@ -202,7 +202,7 @@ private: mutable QMutex m_modelInfoMutex; mutable bool m_modelInfoLoaded = false; mutable QHash m_modelInfo; // Model path to what its glTF says - mutable QHash m_modelInfoStamp; // Model path to the size/mtime it was read at + mutable QHash m_modelInfoStamp; // Model path to the size/mtime it was read at mutable QHash m_modelInfoCheckedMs; // When each model was last stat()ed. mutable QElapsedTimer m_modelInfoClock; static constexpr qint64 m_modelInfoRecheckMs = 30000; diff --git a/sdrbase/util/do219.h b/sdrbase/util/do219.h index 8bc47cc90..a93f5bd30 100644 --- a/sdrbase/util/do219.h +++ b/sdrbase/util/do219.h @@ -16,7 +16,7 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef INCLUDE_DO219_H -#define INCLUDE_DO219_H +#define INCLUDE_DO219_H // RCTA DO-219 / CPDLC decoder class DO219Decoder { @@ -28,7 +28,7 @@ class DO219Decoder { public: QString m_msgIdentificationNumber; QString m_msgReferenceNumber; - QTime m_timeStamp; + QTime m_timeStamp; DO219Decoder() : m_byteIndex(0), @@ -49,7 +49,7 @@ public: s.append("\n(message truncated)"); } return s; - } + } protected: int getBit() @@ -72,31 +72,31 @@ protected: m_bitIndex = 0; m_byteIndex++; } - return bit; + return bit; } - + int getBits(int numberOfBits) { int bits = 0; - for (int i = 0; i < numberOfBits; i++) + for (int i = 0; i < numberOfBits; i++) { bits <<= 1; bits |= getBit(); } return bits; - } - + } + QString decodeATCDownlinkMessage() { bool flag = getBits(1); - + QString s; decodeATCMessageHeader(); s.append(decodeATCDownlinkMsgElementId()); if (flag) { int size = getBits(2) + 1; - for (int i = 0; i < size; i++) { + for (int i = 0; i < size; i++) { s.append("\n" + decodeATCDownlinkMsgElementId()); } } @@ -111,13 +111,13 @@ protected: if (flag) { int size = getBits(2) + 1; - for (int i = 0; i < size; i++) { + for (int i = 0; i < size; i++) { s.append("\n" + decodeATCUplinkMsgElementId()); } } return s; } - + void decodeATCMessageHeader() { bool flag = getBits(1); @@ -133,21 +133,21 @@ protected: m_timeStamp = QTime::fromString(decodeTimeHHMMSS()); } } - + QString decodeTimeHHMMSS() { QString hours = decodeTimeHours(); QString minutes = decodeTimeMinutes(); - QString seconds = decodeTimeSeconds(); - return hours + ":" + minutes + ":" + seconds; + QString seconds = decodeTimeSeconds(); + return hours + ":" + minutes + ":" + seconds; } - + QString decodeMsgIdentificationNumber() { int num = getBits(6); return QString::number(num); } - + QString decodeMsgReferenceNumber() { int num = getBits(6); @@ -188,13 +188,13 @@ protected: case 13: { QString time = decodeTime(); - QString altitude = decodeAltitude(); + QString altitude = decodeAltitude(); return "AT " + time + " EXPECT CLIMB TO " + altitude; } case 14: { QString position = decodePosition(); - QString altitude = decodeAltitude(); + QString altitude = decodeAltitude(); return "AT " + position + " EXPECT CLIMB TO " + altitude; } case 15: @@ -218,7 +218,7 @@ protected: case 18: { QString position = decodePosition(); - QString altitude = decodeAltitude(); + QString altitude = decodeAltitude(); return "AT " + position + " EXPECT CRUISE CLIMB TO " + altitude; } case 19: @@ -229,68 +229,68 @@ protected: { QString time = decodeTime(); QString altitude = decodeAltitude(); - return "AT " + time + " CLIMB AND MAINTAIN " + altitude; + return "AT " + time + " CLIMB AND MAINTAIN " + altitude; } case 22: { QString position = decodePosition(); - QString altitude = decodeAltitude(); - return "AT " + position + " CLIMB AND MAINTAIN " + altitude; + QString altitude = decodeAltitude(); + return "AT " + position + " CLIMB AND MAINTAIN " + altitude; } case 23: return "DESCEND AND MAINTAIN " + decodeAltitude(); case 24: { QString time = decodeTime(); - QString altitude = decodeAltitude(); - return "AT " + time + " DESCEND AND MAINTAIN " + altitude; + QString altitude = decodeAltitude(); + return "AT " + time + " DESCEND AND MAINTAIN " + altitude; } case 25: { QString position = decodePosition(); - QString altitude = decodeAltitude(); + QString altitude = decodeAltitude(); return "AT " + position + " DESCEND AND MAINTAIN " + altitude; } case 26: { - QString altitude = decodeAltitude(); + QString altitude = decodeAltitude(); QString time = decodeTime(); return "CLIMB TO REACH " + altitude + " BY " + time; } case 27: { QString altitude = decodeAltitude(); - QString position = decodePosition(); + QString position = decodePosition(); return "CLIMB TO REACH " + altitude + " BY " + position; } case 28: { QString altiutude = decodeAltitude(); - QString time = decodeTime(); + QString time = decodeTime(); return "DESCEND TO REACH " + altiutude + " BY " + time; } case 29: { QString altiutude = decodeAltitude(); - QString position = decodePosition(); + QString position = decodePosition(); return "DESCEND TO REACH " + altiutude + " BY " + position; } case 30: { QString altiutude1 = decodeAltitude(); - QString altiutude2 = decodeAltitude(); + QString altiutude2 = decodeAltitude(); return "MAINTAIN BLOCK " + altiutude1 + " TO " + altiutude2; } case 31: { QString altiutude1 = decodeAltitude(); - QString altiutude2 = decodeAltitude(); + QString altiutude2 = decodeAltitude(); return "CLIMB TO MAINTAIN BLOCK " + altiutude1 + " TO " + altiutude2; } case 32: { QString altiutude1 = decodeAltitude(); - QString altiutude2 = decodeAltitude(); + QString altiutude2 = decodeAltitude(); return "DESCEND TO MAINTAIN BLOCK " + altiutude1 + " TO " + altiutude2; } case 33: @@ -496,7 +496,7 @@ protected: QString position = decodePosition(); return "AT " + time + " PROCEED DIRECT TO " + position; } - case 77: + case 77: { QString position1 = decodePosition(); QString position2 = decodePosition(); @@ -650,9 +650,9 @@ protected: case 107: return "MAINTAIN PRESENT SPEED"; case 108: - return "MAINTAIN " + decodeSpeed() + " OR GREATER"; + return "MAINTAIN " + decodeSpeed() + " OR GREATER"; case 109: - return "MAINTAIN " + decodeSpeed() + " OR LESS"; + return "MAINTAIN " + decodeSpeed() + " OR LESS"; case 110: { QString speed1 = decodeSpeed(); @@ -662,7 +662,7 @@ protected: case 111: return "INCREASE SPEED TO " + decodeSpeed(); case 112: - return "INCREASE SPEED TO " + decodeSpeed() + " OR GREATER"; + return "INCREASE SPEED TO " + decodeSpeed() + " OR GREATER"; case 113: return "REDUCE SPEED TO " + decodeSpeed(); case 114: @@ -674,41 +674,41 @@ protected: case 117: { QString icaoUnitName = decodeICAOUnitName(); - QString frequency = decodeFrequency(); + QString frequency = decodeFrequency(); return "CONTACT " + icaoUnitName + " " + frequency; } case 118: { QString position = decodePosition(); QString icaoUnitName = decodeICAOUnitName(); - QString frequency = decodeFrequency(); + QString frequency = decodeFrequency(); return "AT " + position + " CONTACT " + icaoUnitName + " " + frequency; } case 119: { QString time = decodeTime(); QString icaoUnitName = decodeICAOUnitName(); - QString frequency = decodeFrequency(); + QString frequency = decodeFrequency(); return "AT " + time + " CONTACT " + icaoUnitName + " " + frequency; } case 120: { QString icaoUnitName = decodeICAOUnitName(); - QString frequency = decodeFrequency(); + QString frequency = decodeFrequency(); return "MONITOR " + icaoUnitName + " " + frequency; } case 121: { QString position = decodePosition(); QString icaoUnitName = decodeICAOUnitName(); - QString frequency = decodeFrequency(); + QString frequency = decodeFrequency(); return "AT " + position + " MONITOR " + icaoUnitName + " " + frequency; } case 122: { QString time = decodeTime(); QString icaoUnitName = decodeICAOUnitName(); - QString frequency = decodeFrequency(); + QString frequency = decodeFrequency(); return "AT " + time + " MONITOR " + icaoUnitName + " " + frequency; } case 123: @@ -768,7 +768,7 @@ protected: QString altitude = decodeAltitude(); QString position = decodePosition(); return "CAN YOU ACCEPT " + altitude + " AT " + position; - } + } case 150: { QString altitude = decodeAltitude(); @@ -800,7 +800,7 @@ protected: case 160: return "NEXT DATA AUTHORITY " + decodeICAOFacilityDesignation(); case 161: - return "END SERVICE"; + return "END SERVICE"; case 162: return "SERVICE UNAVAILABLE"; case 163: @@ -850,16 +850,16 @@ protected: case 181: { QString toFrom = decodeToFrom(); - QString position = decodePosition(); + QString position = decodePosition(); return "REPORT DISTANCE " + toFrom + " " + position; } case 182: - return "CONFIRM ATIS CODE"; + return "CONFIRM ATIS CODE"; default: - return "UNKNOWN ATCUplinkMsgElementId: " + QString::number(id); + return "UNKNOWN ATCUplinkMsgElementId: " + QString::number(id); } } - + QString decodeATCDownlinkMsgElementId() { int id = getBits(8); @@ -947,7 +947,7 @@ protected: return "REQUEST VOICE CONTACT"; case 21: return "REQUEST VOICE CONTACT " + decodeFrequency(); - case 22: + case 22: return "REQUEST DIRECT TO " + decodePosition(); case 23: return "REQUEST " + decodeProcedureName(); @@ -964,7 +964,7 @@ protected: case 27: { QString distanceOffset = decodeDistanceOffset(); - QString direction = decodeDirection(); + QString direction = decodeDirection(); return "REQUEST WEATHER DEVIATION UP TO " + distanceOffset + " " + direction + " OF ROUTE"; } case 28: @@ -1046,8 +1046,8 @@ protected: case 60: { QString distanceOffset = decodeDistanceOffset(); - QString direction = decodeDirection(); - return "OFFSETING " + distanceOffset + " " + direction + " OF ROUTE"; + QString direction = decodeDirection(); + return "OFFSETING " + distanceOffset + " " + direction + " OF ROUTE"; } case 61: return "DESCENDING TO ALTITUDE " + decodeAltitude(); @@ -1069,7 +1069,7 @@ protected: return "REQUEST VMC DESCENT"; case 70: return "REQUEST HEADING " + decodeDegrees(); - case 71: + case 71: return "REQUEST GROUND TRACK " + decodeDegrees(); case 72: return "REACHING ALTITUDE " + decodeAltitude(); @@ -1080,7 +1080,7 @@ protected: case 75: return "AT PILOTS DISCRETION"; case 76: - { + { QString altitude1 = decodeAltitude(); QString altitude2 = decodeAltitude(); return "REACHING BLOCK " + altitude1 + " TO " + altitude2; @@ -1102,14 +1102,14 @@ protected: case 79: return "ATIS " + decodeATISCode(); default: - return "UNKNOWN ATCDownlinkMsgElementId: " + QString::number(id); + return "UNKNOWN ATCDownlinkMsgElementId: " + QString::number(id); } } - - QString decodeAltitude() + + QString decodeAltitude() { int type = getBits(3); - switch (type) + switch (type) { case 0: return decodeAltitudeQNH(); @@ -1129,9 +1129,9 @@ protected: return decodeAltitudeFlightLevelMetric(); default: return QString("UNKOWNN ALTITUDE TYPE %1").arg(type); - } + } } - + QString decodeAltitudeQNH() { int v = getBits(12); @@ -1170,21 +1170,21 @@ protected: QString decodeAltitudeFlightLevel() { - int v = getBits(10); + int v = getBits(10); return QString("F%1").arg((v+30), 3, 10, QChar('0')); } QString decodeAltitudeFlightLevelMetric() { - int v = getBits(11); + int v = getBits(11); return QString("S%1").arg((v+10), 3, 10, QChar('0')); } - + QString decodeATISCode() - { + { return decodeIA5String(5); } - + QString decodeAltimeter() { bool flag = getBits(1); @@ -1194,7 +1194,7 @@ protected: return decodeAltimeterMetric(); } } - + QString decodeAltimeterEnglish() { bool alt = getBits(10); @@ -1206,7 +1206,7 @@ protected: bool alt = getBits(13); return QString("%1 HPA").arg((alt+7500)/10.0, 0, 'f', 1); } - + QString decodePredepartureClearance() { bool flag0 = getBits(1); @@ -1229,47 +1229,47 @@ protected: s.append(" " + decodePDCRevision()); return s; } - + QString decodeFrequencyDeparture() { return decodeFrequencyVHF(); } - + QString decodePDCRevision() { int rev = getBits(4); return QString::number(rev + 1); } - + QString decodeAircraftFlightIdentification() { int size = getBits(3) + 2; return decodeIA5String(size); } - + QString decodeAircraftType() { int size = getBits(3) + 2; return decodeIA5String(size); } - + QString decodeAircraftEquipmentCode() { QString s = decodeComNavApproachEquipmentAvailable(); int size = getBits(4) + 1; for (int i = 0; i < size; i++) { - s.append(" " + decodeComNavEquipmentStatus()); + s.append(" " + decodeComNavEquipmentStatus()); } s.append(" " + decodeSSREquipmentAvailable()); return s; } - + QString decodeComNavApproachEquipmentAvailable() { int d = getBits(1); return d == 0 ? "Y" : "N"; } - + QString decodeComNavEquipmentStatus() { int d = getBits(4); @@ -1300,7 +1300,7 @@ protected: case 11: return "P"; // Doppler case 12: - return "R"; // RNAV + return "R"; // RNAV case 13: return "T"; // TACAN case 14: @@ -1309,9 +1309,9 @@ protected: return "V"; // VHF RTF default: return QString("UNKNOWN EQUIPMENT STATUS %1").arg(d); - } + } } - + QString decodeSSREquipmentAvailable() { int d = getBits(3); @@ -1335,18 +1335,18 @@ protected: return QString("UNKNOWN SSR EQUIPMENT %1").arg(d); } } - + QString decodeTp4Table() { getBits(1); // Consumed to keep the bit position right; nothing to display return ""; } - + QString decodeTrackDetailMsg() { return ""; // FIMXE - } - + } + QString decodeDegrees() { int choice = getBits(1); @@ -1354,31 +1354,31 @@ protected: return decodeDegreesMagnetic(); } else { return decodeDegreesTrue(); - } + } } - + QString decodeDegreesMagnetic() { int degrees = getBits(9); return QString("%1").arg(degrees, 3, 10, QChar('0')); } - + QString decodeDegreesTrue() { int degrees = getBits(9); return QString("%1 T").arg(degrees, 3, 10, QChar('0')); } - + QString decodeDirection() { int dir = getBits(4); const QStringList dirs = {"L", "R", "L OR R", "N", "S", "E", "W", "NE", "NW", "SE", "SW"}; if (dir >= dirs.size()) { return QString("UNKNOWN DIRECTION %1").arg(dir); - } else { + } else { return dirs[dir]; } - } + } QString decodeDistance() { int unit = getBits(1); @@ -1388,7 +1388,7 @@ protected: return decodeDistanceKM(); } } - + QString decodeDistanceNM() { int d = getBits(14); @@ -1400,7 +1400,7 @@ protected: int d = getBits(10); return QString("%1 KM").arg(d + 1); } - + QString decodeDistanceOffset() { int unit = getBits(1); @@ -1410,7 +1410,7 @@ protected: return decodeDistanceOffsetKM(); } } - + QString decodeDistanceOffsetNM() { int d = getBits(7); @@ -1422,7 +1422,7 @@ protected: int d = getBits(8); return QString("%1 KM").arg(d + 1); } - + QString decodeErrorInformation() { int error = getBits(5); @@ -1445,19 +1445,19 @@ protected: return errors[error]; } } - + QString decodeFixName() { int size = getBits(3) + 1; return decodeIA5String(size); } - + QString decodeFreeText() { int size = getBits(8) + 1; return decodeIA5String(size); } - + QString decodeFrequency() { int choice = getBits(2); @@ -1475,13 +1475,13 @@ protected: return QString("UNKNOWN FREQUENCY %1").arg(choice); } } - + QString decodeFrequencyHF() { int f = getBits(15); return QString("%1 KHZ").arg(f + 2850); } - + QString decodeFrequencyVHF() { int f = getBits(15); @@ -1495,16 +1495,16 @@ protected: float freq = (225000.0f + f) / 1000.0f; return QString("%1").arg(freq, 7, 'f', 3); } - + QString decodeFrequencySatChannel() { - QString channel; + QString channel; for (int i = 0; i < 12; i++) { channel = channel + decodeDigit(); } return channel; } - + QString decodeIA5String(int size) { QString s; @@ -1530,22 +1530,22 @@ protected: { return decodeIA5String(4); } - + QString decodeBeaconCode() { QString s; for (int i = 0; i < 4; i++) { s.append(decodeBeaconOctalDigit()); } - return s; + return s; } - + QString decodeBeaconOctalDigit() { int bits = getBits(3); return QString::number(bits); } - + QString decodeICAOUnitName() { // DO-219 spec is inconsistent in it's description of this element - page 22 appears to be wrong @@ -1553,7 +1553,7 @@ protected: QString icaoFacilityFunction = decodeICAOFacilityFunction(); return icaoFacilityIndentification + " " + icaoFacilityFunction; } - + QString decodeICAOFacilityIdentification() { int type = getBits(1); @@ -1563,18 +1563,18 @@ protected: return decodeICAOFacilityName(); } } - + QString decodeICAOFacilityDesignation() { return decodeIA5String(4); } - + QString decodeICAOFacilityName() { int size = getBits(4) + 3; return decodeIA5String(size); } - + QString decodeICAOFacilityFunction() { int func = getBits(3); @@ -1590,14 +1590,14 @@ protected: }; return funcs[func]; } - + QString decodeLatitudeLongitude() { QString latitude = decodeLatitude(); QString longitude = decodeLongitude(); return latitude + " " + longitude; } - + QString decodeLatitude() { bool flag = getBits(1); @@ -1608,25 +1608,25 @@ protected: s.append(" " + decodeLatitudeDirection()); return s; } - + QString decodeLatitudeDegrees() { int degrees = getBits(7); return QString::number(degrees); } - + QString decodeMinutesLatLon() { int minutes = getBits(10); return QString::number(minutes / 10.0f, 'f', 1); } - + QString decodeLatitudeDirection() { int dir = getBits(1); return dir == 0 ? "N" : "S"; } - + QString decodeLongitude() { bool flag = getBits(1); @@ -1637,19 +1637,19 @@ protected: s.append(" " + decodeLongitudeDirection()); return s; } - + QString decodeLongitudeDegrees() { int degrees = getBits(8); return QString::number(degrees); } - + QString decodeLongitudeDirection() { int dir = getBits(1); return dir == 0 ? "E" : "W"; } - + QString decodePlaceBearingDistance() { bool flag = getBits(1); @@ -1661,7 +1661,7 @@ protected: s.append(" " + decodeDistance()); return s; } - + QString decodeProcedureName() { bool flag0 = getBits(1); @@ -1671,9 +1671,9 @@ protected: if (flag0) { s.append(decodeProcedureTransistion()); } - return s; + return s; } - + QString decodeProcedureType() { int type = getBits(2); @@ -1684,19 +1684,19 @@ protected: return types[type]; } } - + QString decodeProcedure() { int size = getBits(3) + 1; return decodeIA5String(size); } - + QString decodeProcedureTransistion() { int size = getBits(3) + 1; return decodeIA5String(size); } - + QString decodePosition() { int type = getBits(3); @@ -1722,7 +1722,7 @@ protected: int size = getBits(2) + 1; return decodeIA5String(size); } - + QString decodePositionReport() { bool flag0 = getBits(1); @@ -1792,9 +1792,9 @@ protected: if (flag15) { s.append("\nSupplementaryInformation: " + decodeSupplementaryInformation()); } - return s; + return s; } - + QString decodeTemperature() { bool scale = getBits(1); @@ -1804,7 +1804,7 @@ protected: return decodeTemperatureF(); } } - + QString decodeTemperatureC() { int temp = getBits(7); @@ -1816,20 +1816,20 @@ protected: int temp = getBits(8); return QString("%1 F").arg(temp - 105); } - + QString decodeWinds() { QString windDirection = decodeWindDirection(); QString windSpeed = decodeWindSpeed(); return windDirection + windSpeed; } - + QString decodeWindDirection() { int dir = getBits(9); return QString("%1/").arg(dir + 1); } - + QString decodeWindSpeed() { int units = getBits(1); @@ -1839,19 +1839,19 @@ protected: return decodeWindSpeedMetric(); } } - + QString decodeWindSpeedEnglish() { int speed = getBits(8); return QString("%1 KNTS").arg(speed); } - + QString decodeWindSpeedMetric() { int speed = getBits(9); return QString("%1 KPH").arg(speed); } - + QString decodeTurbulence() { int turb = getBits(2); @@ -1862,7 +1862,7 @@ protected: return turbs[turb]; } } - + QString decodeIcing() { int icing = getBits(2); @@ -1873,14 +1873,14 @@ protected: return icings[icing]; } } - + QString decodeVerticalChange() { QString verticalDirection = decodeVerticalDirection(); QString verticalRate = decodeVerticalRate(); return verticalDirection + " " + verticalRate; } - + QString decodeVerticalDirection() { int dir = getBits(1); @@ -1888,9 +1888,9 @@ protected: return "UP"; } else { return "DOWN"; - } + } } - + QString decodeVerticalRate() { int units = getBits(1); @@ -1900,19 +1900,19 @@ protected: return decodeVerticalRateMetric(); } } - + QString decodeVerticalRateEnglish() { int rate = getBits(6); return QString("%1 FT/MIN").arg(rate * 100); } - + QString decodeVerticalRateMetric() { int rate = getBits(8); return QString("%1 M/MIN").arg(rate * 10); } - + QString decodeSpeed() { int type = getBits(3); @@ -1938,62 +1938,62 @@ protected: return QString("UKNOWN SPEED TYPE %1").arg(type); } } - + QString decodeSpeedIndicated() { int speed = getBits(5); return QString("%1 IAS").arg((speed + 7) * 10); } - + QString decodeSpeedIndicatedMetric() { int speed = getBits(7); return QString("%1 KMIAS").arg((speed + 10) * 10); } - + QString decodeSpeedTrue() { int speed = getBits(6); return QString("%1 TAS").arg((speed + 7) * 10); } - + QString decodeSpeedTrueMetric() { int speed = getBits(7); return QString("%1 KMTAS").arg((speed + 10) * 10); } - + QString decodeSpeedGround() { int speed = getBits(6); return QString("%1 GS").arg((speed + 7) * 10); } - + QString decodeSpeedGroundMetric() { int speed = getBits(8); return QString("%1 KMGS").arg((speed + 10) * 10); } - + QString decodeSpeedMach() { int speed = getBits(5); return QString("%1M").arg((speed + 61) / 100.0f, 0, 'f', 2); } - + QString decodeSpeedMachLarge() { int speed = getBits(9); return QString("%1M").arg((speed + 93) / 100.0f, 0, 'f', 2); } - + QString decodeTime() { QString timeHours = decodeTimeHours(); QString timeMinutes = decodeTimeMinutes(); - return timeHours + ":" + timeMinutes; - } - + return timeHours + ":" + timeMinutes; + } + QString decodeTimeHours() { int h = getBits(5); @@ -2005,30 +2005,30 @@ protected: int m = getBits(6); return QString("%1").arg(m, 2, 10, QChar('0')); } - + QString decodeTimeSeconds() { int s = getBits(6); return QString("%1").arg(s, 2, 10, QChar('0')); } - + QString decodeToFrom() { int dir = getBits(1); - if (dir == 0) { + if (dir == 0) { return "TO"; } else { return "FROM"; } } - + QString decodeRemainingFuel() { QString timeHours = decodeTimeHours(); QString timeMinutes = decodeTimeMinutes(); - return timeHours + ":" + timeMinutes; + return timeHours + ":" + timeMinutes; } - + QString decodeRouteClearance() { bool flag0 = getBits(1); @@ -2042,7 +2042,7 @@ protected: bool flag8 = getBits(1); bool flag9 = getBits(1); QString s; - if (flag0) { + if (flag0) { s.append("\nAirportDeparture: " + decodeAirport()); } if (flag1) { @@ -2059,7 +2059,7 @@ protected: } if (flag5) { s.append("\nProcedureApproach: " + decodeProcedureName()); - } + } if (flag6) { s.append("\nProcedureArrival: " + decodeProcedureName()); } @@ -2078,7 +2078,7 @@ protected: } return s; } - + QString decodePublishedIdentifier() { bool flag = getBits(1); @@ -2094,39 +2094,39 @@ protected: int souls = getBits(10); return QString::number(souls + 1); } - + QString decodeVersionNumber() { int version = getBits(4); return QString::number(version); } - + QString decodeRunway() { QString runwayDirection = decodeRunwayDirection(); QString runwayConfiguration = decodeRunwayConfiguration(); return runwayDirection + runwayConfiguration; } - + QString decodeRunwayDirection() { int dir = getBits(6); return QString::number(dir); } - + QString decodeRunwayConfiguration() { int cfg = getBits(2); QStringList cfgs = {"L", "R", "C", ""}; return cfgs[cfg]; } - + QString decodeAirwayIntercept() { int size = getBits(3) + 1; return decodeIA5String(size); } - + QString decodeRouteInformation() { int type = getBits(3); @@ -2148,38 +2148,38 @@ protected: return QString("UNKOWN ROUTE INFORMATION TYPE %1").arg(type); } } - + QString decodePlaceBearing() { bool flag = getBits(1); QString s = decodeFixName(); - if (flag) { + if (flag) { s.append(" " + decodeLatitudeLongitude()); } s.append(" " + decodeDegrees()); return s; } - + QString decodePlaceBearingPlaceBearing() { QString placeBearing1 = decodePlaceBearing(); QString placeBearing2 = decodePlaceBearing(); return placeBearing1 + " " + placeBearing2; } - + QString decodeAirwayIdentifier() { int size = getBits(3) + 1; return decodeIA5String(size); } - + QString decodeTrackDetail() { int size = getBits(7) + 1; QString s; for (int i = 0; i < size; i++) { s.append(" " + decodeLatitudeLongitude()); - } + } return s; } @@ -2188,7 +2188,7 @@ protected: int size = getBits(2) + 3; return decodeIA5String(size); } - + QString decodeSupplementaryInformation() { return ""; @@ -2198,7 +2198,7 @@ protected: { return ""; } - + }; #endif // INCLUDE_DO219_H diff --git a/sdrgui/gui/acarsmessageview.cpp b/sdrgui/gui/acarsmessageview.cpp index 6c988ae82..581dff552 100644 --- a/sdrgui/gui/acarsmessageview.cpp +++ b/sdrgui/gui/acarsmessageview.cpp @@ -78,7 +78,7 @@ static const QHash& builtInAcronyms() {"SDU", "Satellite Data Unit"}, {"SID", "Standard Instrument Departure"}, {"SMI", "Standard Message Identifier"}, - {"STAR", "Standard Terminal Arrival Route"}, + {"STAR", "Standard Terminal Arrival Route"}, {"SITA", "Society Internationale de Telecommunications Aeronautiques"}, {"TCAS", "Traffic Alert/Collision Avoidance System"}, {"TEI", "Text Element Identifier"}, @@ -90,7 +90,7 @@ static const QHash& builtInAcronyms() {"VFR", "Visual Flight Rules"}, {"WILCO", "Will Comply"}, {"WXRQ", "Weather Request"}, - + // METAR {"SKC", "No Cloud/Sky Clear"}, {"NCD", "No Cloud Detected"}, @@ -113,7 +113,7 @@ static const QHash& builtInAcronyms() {"KT", "Knots"}, {"CAVOK", "Ceiling and Visibilty OK"}, {"NR", "Not Reported"}, - + // TEI codes from ARINC 620 Append B {"AC", "Estimated time approach clearance"}, {"AD", "Aerodrome of concern or arrival"}, @@ -179,8 +179,8 @@ static const QHash& builtInAcronyms() {"WX", "Weather report"}, {"WI", "Weather"}, {"ZW", "Zero fuel weight"}, - - // SMIs from ARINC 620 Table C-2 + + // SMIs from ARINC 620 Table C-2 {"HJK", "Hijack Situation Report"}, {"AVR", "Voice Contact Request"}, {"GVR", "Voice Go-ahead"}, @@ -248,11 +248,11 @@ static const QHash& builtInAcronyms() {"APR", "LRU Configuration Report/Request"}, {"MED", "Media Advisory"}, {"TEB", "Turbulence Event Report"}, - + // HFDL {"GS", "Ground Station"}, - // Loadsheet + // Loadsheet {"DOW", "Dry Operating Weight"}, {"ZFW", "Zero Fuel Weight"}, {"ZFWT", "Zero Fuel Weight Total"}, @@ -283,7 +283,7 @@ AcarsMessageView::AcarsMessageView(QWidget *parent) : { setMouseTracking(true); } - + bool AcarsMessageView::event(QEvent *event) { if (event->type() == QEvent::ToolTip) @@ -346,4 +346,4 @@ QString AcarsMessageView::explanation(const QString& text) const } return QString(); -} +} diff --git a/sdrgui/gui/levelmeter.h b/sdrgui/gui/levelmeter.h index dfe2d2594..36bda53d7 100644 --- a/sdrgui/gui/levelmeter.h +++ b/sdrgui/gui/levelmeter.h @@ -96,7 +96,7 @@ protected slots: void redrawTimerExpired(); protected: - /** Repaint only if the meter would actually look different. */ + /** Repaint only if the meter would actually look different. */ void requestUpdate(); /** Position of a level in pixels, as the renders below compute it */ diff --git a/sdrgui/gui/profiledialog.cpp b/sdrgui/gui/profiledialog.cpp index a7c813443..b84060f56 100644 --- a/sdrgui/gui/profiledialog.cpp +++ b/sdrgui/gui/profiledialog.cpp @@ -30,7 +30,7 @@ ProfileDialog::ProfileDialog(QWidget* parent) : ui(new Ui::ProfileDialog) { ui->setupUi(this); - + ui->table->setItemDelegate(new FastItemDelegate(ui->table)); ui->table->setItemDelegateForColumn(COL_TOTAL, new NanoSecondsDelegate());