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

Fixed missing compare index + style for matching statistics

Browse Source
This commit is contained in:
Klaus Basan
2018-08-24 17:00:23 +02:00
parent e0e47a46f6
commit 2fcb5fd304
2 changed files with 36 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/blackgui/models/matchingstatisticsmodel.cpp
View File

@@ -33,21 +33,21 @@ namespace BlackGui
void CMatchingStatisticsModel::setMode(CMatchingStatisticsModel::MatchingStatisticsMode mode) void CMatchingStatisticsModel::setMode(CMatchingStatisticsModel::MatchingStatisticsMode mode)
{ {
if (this->m_mode == mode) { return; } if (m_mode == mode) { return; }
this->m_mode = mode; m_mode = mode;
this->m_columns.clear(); m_columns.clear();
switch (mode) switch (mode)
{ {
case ForMultiSessions: case ForMultiSessions:
this->m_columns.addColumn(CColumn::standardString("session", CMatchingStatisticsEntry::IndexSessionId)); m_columns.addColumn(CColumn::standardString("session", CMatchingStatisticsEntry::IndexSessionId));
this->m_columns.addColumn(CColumn::standardString("model set", CMatchingStatisticsEntry::IndexModelSetId)); m_columns.addColumn(CColumn::standardString("model set", CMatchingStatisticsEntry::IndexModelSetId));
// fall thru // fall thru
case ForSingleSession: case ForSingleSession:
this->m_columns.addColumn(CColumn("type", CMatchingStatisticsEntry::IndexEntryTypeAsIcon)); m_columns.addColumn(CColumn("type", CMatchingStatisticsEntry::IndexEntryTypeAsIcon));
this->m_columns.addColumn(CColumn::standardString("aircraft", CMatchingStatisticsEntry::IndexAircraftDesignator)); m_columns.addColumn(CColumn::standardString("aircraft", CMatchingStatisticsEntry::IndexAircraftDesignator));
this->m_columns.addColumn(CColumn::standardString("airline", CMatchingStatisticsEntry::IndexAirlineDesignator)); m_columns.addColumn(CColumn::standardString("airline", CMatchingStatisticsEntry::IndexAirlineDesignator));
this->m_columns.addColumn(CColumn::standardString("description", CMatchingStatisticsEntry::IndexDescription)); m_columns.addColumn(CColumn::standardInteger("#", "count", CMatchingStatisticsEntry::IndexCount));
this->m_columns.addColumn(CColumn::standardInteger("#", "count", CMatchingStatisticsEntry::IndexCount)); m_columns.addColumn(CColumn::standardString("description", CMatchingStatisticsEntry::IndexDescription));
break; break;
default: default:
break; break;

70
src/blackmisc/simulation/matchingstatisticsentry.cpp
View File

@@ -98,18 +98,17 @@ namespace BlackMisc
const ColumnIndex i = index.frontCasted<ColumnIndex>(); const ColumnIndex i = index.frontCasted<ColumnIndex>();
switch (i) switch (i)
{ {
case IndexSessionId: return CVariant::from(this->m_sessionId); case IndexSessionId: return CVariant::from(m_sessionId);
case IndexModelSetId: return CVariant::from(this->m_modelSetId); case IndexModelSetId: return CVariant::from(m_modelSetId);
case IndexCount: return CVariant::from(this->m_count); case IndexCount: return CVariant::from(m_count);
case IndexEntryType: return CVariant::from(this->m_entryType); case IndexEntryType: return CVariant::from(m_entryType);
case IndexEntryTypeAsString: return CVariant::from(entryTypeToString(this->getEntryType())); case IndexEntryTypeAsString: return CVariant::from(entryTypeToString(this->getEntryType()));
case IndexEntryTypeAsIcon: return CVariant::from(entryTypeToIcon(this->getEntryType())); case IndexEntryTypeAsIcon: return CVariant::from(entryTypeToIcon(this->getEntryType()));
case IndexAircraftDesignator: return CVariant::from(this->m_aircraftDesignator); case IndexAircraftDesignator: return CVariant::from(m_aircraftDesignator);
case IndexAirlineDesignator: return CVariant::from(this->m_airlineDesignator); case IndexAirlineDesignator: return CVariant::from(m_airlineDesignator);
case IndexDescription: return CVariant::from(this->m_description); case IndexDescription: return CVariant::from(m_description);
case IndexHasAircraftAirlineCombination: return CVariant::from(this->hasAircraftAirlineCombination()); case IndexHasAircraftAirlineCombination: return CVariant::from(this->hasAircraftAirlineCombination());
default: default: return CValueObject::propertyByIndex(index);
return CValueObject::propertyByIndex(index);
} }
} }
@@ -121,30 +120,14 @@ namespace BlackMisc
const ColumnIndex i = index.frontCasted<ColumnIndex>(); const ColumnIndex i = index.frontCasted<ColumnIndex>();
switch (i) switch (i)
{ {
case IndexSessionId: case IndexSessionId: this->setSessionId(variant.value<QString>()); break;
this->setSessionId(variant.value<QString>()); case IndexModelSetId: this->setModelSetId(variant.value<QString>()); break;
break; case IndexAircraftDesignator: m_aircraftDesignator = variant.value<QString>(); break;
case IndexModelSetId: case IndexEntryType: this->setEntryType(static_cast<EntryType>(variant.toInt())); break;
this->setModelSetId(variant.value<QString>()); case IndexCount: m_count = variant.toInt(); break;
break; case IndexAirlineDesignator: m_airlineDesignator = variant.value<QString>(); break;
case IndexAircraftDesignator: case IndexDescription: m_description = variant.value<QString>(); break;
this->m_aircraftDesignator = variant.value<QString>(); default: CValueObject::setPropertyByIndex(index, variant); break;
break;
case IndexEntryType:
this->setEntryType(static_cast<EntryType>(variant.toInt()));
break;
case IndexCount:
this->m_count = variant.toInt();
break;
case IndexAirlineDesignator:
this->m_airlineDesignator = variant.value<QString>();
break;
case IndexDescription:
this->m_description = variant.value<QString>();
break;
default:
CValueObject::setPropertyByIndex(index, variant);
break;
} }
} }
@@ -154,17 +137,17 @@ namespace BlackMisc
const ColumnIndex i = index.frontCasted<ColumnIndex>(); const ColumnIndex i = index.frontCasted<ColumnIndex>();
switch (i) switch (i)
{ {
case IndexSessionId: return this->m_sessionId.compare(compareValue.m_sessionId, Qt::CaseInsensitive); case IndexSessionId: return m_sessionId.compare(compareValue.m_sessionId, Qt::CaseInsensitive);
case IndexModelSetId: return this->m_modelSetId.compare(compareValue.getModelSetId(), Qt::CaseInsensitive); case IndexModelSetId: return m_modelSetId.compare(compareValue.getModelSetId(), Qt::CaseInsensitive);
case IndexEntryTypeAsIcon: case IndexEntryTypeAsIcon:
case IndexEntryTypeAsString: case IndexEntryTypeAsString:
case IndexEntryType: return Compare::compare(this->m_entryType, compareValue.m_entryType); case IndexEntryType: return Compare::compare(m_entryType, compareValue.m_entryType);
case IndexCount: return Compare::compare(this->m_count, compareValue.m_count); case IndexDescription: return m_description.compare(compareValue.getDescription(), Qt::CaseInsensitive);
case IndexAircraftDesignator: return this->m_aircraftDesignator.compare(compareValue.m_aircraftDesignator, Qt::CaseInsensitive); case IndexCount: return Compare::compare(m_count, compareValue.m_count);
case IndexAirlineDesignator: return this->m_airlineDesignator.compare(compareValue.m_airlineDesignator, Qt::CaseInsensitive); case IndexAircraftDesignator: return m_aircraftDesignator.compare(compareValue.m_aircraftDesignator, Qt::CaseInsensitive);
case IndexAirlineDesignator: return m_airlineDesignator.compare(compareValue.m_airlineDesignator, Qt::CaseInsensitive);
case IndexHasAircraftAirlineCombination: return Compare::compare(this->hasAircraftAirlineCombination(), compareValue.hasAircraftAirlineCombination()); case IndexHasAircraftAirlineCombination: return Compare::compare(this->hasAircraftAirlineCombination(), compareValue.hasAircraftAirlineCombination());
default: default: return CValueObject::comparePropertyByIndex(index, compareValue);
break;
} }
Q_ASSERT_X(false, Q_FUNC_INFO, "Compare failed"); Q_ASSERT_X(false, Q_FUNC_INFO, "Compare failed");
return 0; return 0;
@@ -173,9 +156,8 @@ namespace BlackMisc
QString CMatchingStatisticsEntry::convertToQString(bool i18n) const QString CMatchingStatisticsEntry::convertToQString(bool i18n) const
{ {
Q_UNUSED(i18n); Q_UNUSED(i18n);
const QString s = QString("%1 Session: '%2' model set: '%3' aircraft: '%4' airline: '%5' description: '%6'") static const QString s("%1 Session: '%2' model set: '%3' aircraft: '%4' airline: '%5' description: '%6'");
.arg(entryTypeToString(getEntryType()), m_sessionId, m_modelSetId, m_aircraftDesignator, m_airlineDesignator, m_description); return s.arg(entryTypeToString(getEntryType()), m_sessionId, m_modelSetId, m_aircraftDesignator, m_airlineDesignator, m_description);
return s;
} }
} // namespace } // namespace
} // namespace } // namespace