From 96189f530b50c5b31b6e5738efe765a991e3142b Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Thu, 5 May 2016 12:25:00 +0200 Subject: [PATCH] Fixed typo setGroundSpeed --- src/blackcore/airspacemonitor.cpp | 2 +- src/blackcore/interpolatorlinear.cpp | 2 +- src/blackcore/vatsimdatafilereader.cpp | 2 +- src/blackmisc/aviation/aircraftsituation.cpp | 10 +++++----- src/blackmisc/aviation/aircraftsituation.h | 12 ++++++------ src/plugins/simulator/fs9/simulatorfs9.cpp | 2 +- src/plugins/simulator/fscommon/fsuipc.cpp | 2 +- src/plugins/simulator/fsx/simulatorfsx.cpp | 2 +- src/plugins/simulator/xplane/simulatorxplane.cpp | 2 +- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/blackcore/airspacemonitor.cpp b/src/blackcore/airspacemonitor.cpp index 5116c4b76..676a7b592 100644 --- a/src/blackcore/airspacemonitor.cpp +++ b/src/blackcore/airspacemonitor.cpp @@ -965,7 +965,7 @@ namespace BlackCore auto history = this->m_situationsByCallsign[callsign]; if (history.empty()) { return; } // we need one full situation interimSituation.setCurrentUtcTime(); - interimSituation.setGroundspeed(history.latestObject().getGroundSpeed()); + interimSituation.setGroundSpeed(history.latestObject().getGroundSpeed()); } // store situation history diff --git a/src/blackcore/interpolatorlinear.cpp b/src/blackcore/interpolatorlinear.cpp index 751f90b66..c09d1751a 100644 --- a/src/blackcore/interpolatorlinear.cpp +++ b/src/blackcore/interpolatorlinear.cpp @@ -161,7 +161,7 @@ namespace BlackCore bank *= -1.0; currentSituation.setBank(bank); - currentSituation.setGroundspeed((newSituation.getGroundSpeed() - oldSituation.getGroundSpeed()) + currentSituation.setGroundSpeed((newSituation.getGroundSpeed() - oldSituation.getGroundSpeed()) * simulationTimeFraction + oldSituation.getGroundSpeed()); status.changedPosition = true; diff --git a/src/blackcore/vatsimdatafilereader.cpp b/src/blackcore/vatsimdatafilereader.cpp index 7c4297861..6e7c59c53 100644 --- a/src/blackcore/vatsimdatafilereader.cpp +++ b/src/blackcore/vatsimdatafilereader.cpp @@ -265,7 +265,7 @@ namespace BlackCore // Pilot section const double groundspeed = clientPartsMap["groundspeed"].toDouble(); CAircraftSituation situation(position, altitude); - situation.setGroundspeed(CSpeed(groundspeed, CSpeedUnit::kts())); + situation.setGroundSpeed(CSpeed(groundspeed, CSpeedUnit::kts())); CSimulatedAircraft currentAircraft(user.getCallsign().getStringAsSet(), user, situation); QString aircraftIcaoCode = clientPartsMap["planned_aircraft"]; diff --git a/src/blackmisc/aviation/aircraftsituation.cpp b/src/blackmisc/aviation/aircraftsituation.cpp index a59f3901a..8ab89225d 100644 --- a/src/blackmisc/aviation/aircraftsituation.cpp +++ b/src/blackmisc/aviation/aircraftsituation.cpp @@ -22,12 +22,12 @@ namespace BlackMisc CAircraftSituation::CAircraftSituation(const CCoordinateGeodetic &position, const CAltitude &altitude, const CHeading &heading, const CAngle &pitch, const CAngle &bank, const CSpeed &gs) : m_position(position), m_altitude(altitude), m_heading(heading), m_pitch(pitch), - m_bank(bank), m_groundspeed(gs) {} + m_bank(bank), m_groundSpeed(gs) {} CAircraftSituation::CAircraftSituation(const CCallsign &correspondingCallsign, const CCoordinateGeodetic &position, const CAltitude &altitude, const CHeading &heading, const CAngle &pitch, const CAngle &bank, const CSpeed &gs) : m_correspondingCallsign(correspondingCallsign), m_position(position), m_altitude(altitude), m_heading(heading), m_pitch(pitch), - m_bank(bank), m_groundspeed(gs) + m_bank(bank), m_groundSpeed(gs) { m_correspondingCallsign.setTypeHint(CCallsign::Aircraft); } @@ -38,7 +38,7 @@ namespace BlackMisc s.append(" altitude: ").append(this->m_altitude.toQString(i18n)); s.append(" bank: ").append(this->m_bank.toQString(i18n)); s.append(" pitch: ").append(this->m_pitch.toQString(i18n)); - s.append(" gs: ").append(this->m_groundspeed.toQString(i18n)); + s.append(" gs: ").append(this->m_groundSpeed.toQString(i18n)); s.append(" heading: ").append(this->m_heading.toQString(i18n)); s.append(" timestamp: ").append(this->getFormattedUtcTimestampDhms()); return s; @@ -70,7 +70,7 @@ namespace BlackMisc case IndexBank: return this->m_bank.propertyByIndex(index.copyFrontRemoved()); case IndexGroundspeed: - return this->m_groundspeed.propertyByIndex(index.copyFrontRemoved()); + return this->m_groundSpeed.propertyByIndex(index.copyFrontRemoved()); case IndexCallsign: return this->m_correspondingCallsign.propertyByIndex(index.copyFrontRemoved()); default: @@ -103,7 +103,7 @@ namespace BlackMisc this->m_bank.setPropertyByIndex(variant, index.copyFrontRemoved()); break; case IndexGroundspeed: - this->m_groundspeed.setPropertyByIndex(variant, index.copyFrontRemoved()); + this->m_groundSpeed.setPropertyByIndex(variant, index.copyFrontRemoved()); break; case IndexCallsign: this->m_correspondingCallsign.setPropertyByIndex(variant, index.copyFrontRemoved()); diff --git a/src/blackmisc/aviation/aircraftsituation.h b/src/blackmisc/aviation/aircraftsituation.h index f7aad7459..6aa03598a 100644 --- a/src/blackmisc/aviation/aircraftsituation.h +++ b/src/blackmisc/aviation/aircraftsituation.h @@ -131,11 +131,11 @@ namespace BlackMisc //! Set bank (angle) void setBank(const BlackMisc::PhysicalQuantities::CAngle &bank) { this->m_bank = bank; } - //! Get groundspeed - const BlackMisc::PhysicalQuantities::CSpeed &getGroundSpeed() const { return this->m_groundspeed; } + //! Get ground speed + const BlackMisc::PhysicalQuantities::CSpeed &getGroundSpeed() const { return this->m_groundSpeed; } - //! Set groundspeed - void setGroundspeed(const BlackMisc::PhysicalQuantities::CSpeed &groundspeed) { this->m_groundspeed = groundspeed; } + //! Set ground speed + void setGroundSpeed(const BlackMisc::PhysicalQuantities::CSpeed &groundspeed) { this->m_groundSpeed = groundspeed; } //! Corresponding callsign const BlackMisc::Aviation::CCallsign &getCallsign() const { return this->m_correspondingCallsign; } @@ -153,7 +153,7 @@ namespace BlackMisc BlackMisc::Aviation::CHeading m_heading; BlackMisc::PhysicalQuantities::CAngle m_pitch; BlackMisc::PhysicalQuantities::CAngle m_bank; - BlackMisc::PhysicalQuantities::CSpeed m_groundspeed; + BlackMisc::PhysicalQuantities::CSpeed m_groundSpeed; BLACK_METACLASS( CAircraftSituation, @@ -163,7 +163,7 @@ namespace BlackMisc BLACK_METAMEMBER(heading), BLACK_METAMEMBER(pitch), BLACK_METAMEMBER(bank), - BLACK_METAMEMBER(groundspeed), + BLACK_METAMEMBER(groundSpeed), BLACK_METAMEMBER(timestampMSecsSinceEpoch) ); }; diff --git a/src/plugins/simulator/fs9/simulatorfs9.cpp b/src/plugins/simulator/fs9/simulatorfs9.cpp index a0be8056f..bd910800d 100644 --- a/src/plugins/simulator/fs9/simulatorfs9.cpp +++ b/src/plugins/simulator/fs9/simulatorfs9.cpp @@ -73,7 +73,7 @@ namespace BlackSimPlugin situation.setPosition(position); situation.setAltitude(CAltitude(dHigh + dLow, CAltitude::MeanSeaLevel, CLengthUnit::m())); double groundSpeed = positionVelocity.ground_velocity / 65536.0; - situation.setGroundspeed(CSpeed(groundSpeed, CSpeedUnit::m_s())); + situation.setGroundSpeed(CSpeed(groundSpeed, CSpeedUnit::m_s())); FS_PBH pbhstrct; pbhstrct.pbh = positionVelocity.pbh; diff --git a/src/plugins/simulator/fscommon/fsuipc.cpp b/src/plugins/simulator/fscommon/fsuipc.cpp index 34f9d19da..a99392a88 100644 --- a/src/plugins/simulator/fscommon/fsuipc.cpp +++ b/src/plugins/simulator/fscommon/fsuipc.cpp @@ -367,7 +367,7 @@ namespace BlackSimPlugin situation.setBank(bank); situation.setHeading(heading); situation.setPitch(pitch); - situation.setGroundspeed(groundspeed); + situation.setGroundSpeed(groundspeed); situation.setAltitude(altitude); aircraft.setSituation(situation); diff --git a/src/plugins/simulator/fsx/simulatorfsx.cpp b/src/plugins/simulator/fsx/simulatorfsx.cpp index 374aad42c..c576785bd 100644 --- a/src/plugins/simulator/fsx/simulatorfsx.cpp +++ b/src/plugins/simulator/fsx/simulatorfsx.cpp @@ -364,7 +364,7 @@ namespace BlackSimPlugin aircraftSituation.setPitch(CAngle(simulatorOwnAircraft.pitch, CAngleUnit::deg())); aircraftSituation.setBank(CAngle(simulatorOwnAircraft.bank, CAngleUnit::deg())); aircraftSituation.setHeading(CHeading(simulatorOwnAircraft.trueHeading, CHeading::True, CAngleUnit::deg())); - aircraftSituation.setGroundspeed(CSpeed(simulatorOwnAircraft.velocity, CSpeedUnit::kts())); + aircraftSituation.setGroundSpeed(CSpeed(simulatorOwnAircraft.velocity, CSpeedUnit::kts())); aircraftSituation.setAltitude(CAltitude(simulatorOwnAircraft.altitude, CAltitude::MeanSeaLevel, CLengthUnit::ft())); CAircraftLights lights(simulatorOwnAircraft.lightStrobe, diff --git a/src/plugins/simulator/xplane/simulatorxplane.cpp b/src/plugins/simulator/xplane/simulatorxplane.cpp index 331c3a66e..5703b9b05 100644 --- a/src/plugins/simulator/xplane/simulatorxplane.cpp +++ b/src/plugins/simulator/xplane/simulatorxplane.cpp @@ -114,7 +114,7 @@ namespace BlackSimPlugin situation.setHeading({ m_xplaneData.trueHeading, Aviation::CHeading::True, CAngleUnit::deg() }); situation.setPitch({ m_xplaneData.pitch, CAngleUnit::deg() }); situation.setBank({ m_xplaneData.roll, CAngleUnit::deg() }); - situation.setGroundspeed({ m_xplaneData.groundspeed, CSpeedUnit::m_s() }); + situation.setGroundSpeed({ m_xplaneData.groundspeed, CSpeedUnit::m_s() }); // updates updateOwnIcaoCodes(m_xplaneData.aircraftIcaoCode, CAirlineIcaoCode());