flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-04 16:56:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #358, consolidated mapping and model classes

Browse Source 
* removed redundant classes in blacksim
* more detailed attributes for mapping
* more finder functions in mapping list
* aircraft model extended as simulator independent description for models
This commit is contained in:
Klaus Basan
2014-12-15 00:26:19 +01:00
parent def17124db
commit bdcb031591
15 changed files with 269 additions and 504 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/blackmisc/nwaircraftmapping.cpp
View File

@@ -22,8 +22,8 @@ namespace BlackMisc
/*
* Constructor
*/
CAircraftMapping::CAircraftMapping(const QString &aircraftDesignator, const QString &airlineDesignator, const QString &model) :
m_icao(CAircraftIcao(aircraftDesignator, airlineDesignator)), m_model(CAircraftModel(model, false))
CAircraftMapping::CAircraftMapping(const QString &source, const QString &packageName, const QString &aircraftDesignator, const QString &airlineDesignator, const QString &model) :
m_source(source.trimmed()), m_packageName(packageName.trimmed()), m_icao(CAircraftIcao(aircraftDesignator, airlineDesignator)), m_model(CAircraftModel(model, CAircraftModel::TypeModelMapping))
{ }
/*
@@ -54,16 +54,15 @@ namespace BlackMisc
{
case IndexModel:
return this->m_model.propertyByIndex(index.copyFrontRemoved());
break;
case IndexIcaoCode:
case IndexIcao:
return this->m_model.propertyByIndex(index.copyFrontRemoved());
break;
case IndexPackageName:
return QVariant::fromValue(this->m_packageName);
case IndexSource:
return QVariant::fromValue(this->m_source);
default:
break;
return CValueObject::propertyByIndex(index);
}
Q_ASSERT_X(false, "CAircraftMapping", "index unknown");
QString m = QString("no property, index ").append(index.toQString());
return CVariant::fromValue(m);
}
/*
@@ -82,11 +81,17 @@ namespace BlackMisc
case IndexModel:
this->m_model.setPropertyByIndex(variant, index.copyFrontRemoved());
break;
case IndexIcaoCode:
case IndexIcao:
this->m_icao.setPropertyByIndex(variant, index.copyFrontRemoved());
break;
case IndexPackageName:
this->m_packageName = variant.toQString();
break;
case IndexSource:
this->m_source = variant.toQString();
break;
default:
Q_ASSERT_X(false, "CAircraftMapping", "index unknown");
CValueObject::setPropertyByIndex(variant, index);
break;
}
}