flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-31 12:55:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixes of MS'review as proposed

Browse Source 
https://dev.vatsim-germany.org/issues/368#change-2380 (1,2)
https://dev.vatsim-germany.org/issues/364#change-2379 (1-11,13)
This commit is contained in:
Klaus Basan
2015-01-18 22:02:07 +01:00
parent 054db94997
commit 4e1db5c837
19 changed files with 100 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/blackmisc/simulation/aircraftmodellist.cpp
View File

@@ -44,18 +44,13 @@ namespace BlackMisc
CAircraftModelList CAircraftModelList::findModelsStartingWith(const QString &modelString, Qt::CaseSensitivity sensitivity) const
{
CAircraftModelList ml;
for (const CAircraftModel &model : (*this))
return this->findBy([ = ](const CAircraftModel & model)
{
if (model.getModelString().startsWith(modelString, sensitivity))
{
ml.push_back(model);
}
}
return ml;
return model.getModelString().startsWith(modelString, sensitivity);
});
}
QStringList CAircraftModelList::getModelStrings() const
QStringList CAircraftModelList::getSortedModelStrings() const
{
QStringList ms;
for (const CAircraftModel &model : (*this))

2
src/blackmisc/simulation/aircraftmodellist.h
View File

@@ -48,7 +48,7 @@ namespace BlackMisc
CAircraftModelList findModelsStartingWith(const QString &modelString, Qt::CaseSensitivity sensitivity = Qt::CaseInsensitive) const;
//! Model strings
QStringList getModelStrings() const;
QStringList getSortedModelStrings() const;
//! \copydoc CValueObject::convertFromQVariant
virtual void convertFromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); }

9
src/blackmisc/simulation/simulatedaircraft.cpp
View File

@@ -121,10 +121,13 @@ namespace BlackMisc
}
//! \todo Smarter way to do this?
void CSimulatedAircraft::update(const CAircraft &aircraft)
void CSimulatedAircraft::setAircraft(const CAircraft &aircraft)
{
// override
(*this) = CSimulatedAircraft(aircraft, this->getModel(), this->getClient());
static_cast<CAircraft &>(*this) = aircraft;
this->m_model.setCallsign(aircraft.getCallsign());
this->m_client.setAircraftModel(this->getModel());
this->m_client.setUser(aircraft.getPilot());
this->m_client.setUserCallsign(aircraft.getCallsign());
}
QString CSimulatedAircraft::convertToQString(bool i18n) const

6
src/blackmisc/simulation/simulatedaircraft.h
View File

@@ -38,8 +38,8 @@ namespace BlackMisc
//! Constructor.
CSimulatedAircraft(const BlackMisc::Aviation::CAircraft &aircraft,
const BlackMisc::Simulation::CAircraftModel &model = BlackMisc::Simulation::CAircraftModel(),
const BlackMisc::Network::CClient &client = BlackMisc::Network::CClient());
const BlackMisc::Simulation::CAircraftModel &model = {},
const BlackMisc::Network::CClient &client = {});
//! \copydoc CValueObject::propertyByIndex
virtual CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const override;
@@ -75,7 +75,7 @@ namespace BlackMisc
void setEnabled(bool enabled) { m_enabled = enabled; }
//! Update from aviation aircraft
void update(const BlackMisc::Aviation::CAircraft &aircraft);
void setAircraft(const BlackMisc::Aviation::CAircraft &aircraft);
protected:
//! \copydoc CValueObject::convertToQString()