fly/flightgear
1
0
Fork 0
Code Activity

Include default airport in the location history

Browse source 
Only a quick hack, need to show more context to make this really
useful as a feature.
This commit is contained in:
James Turner 2017-09-26 16:38:39 +02:00
parent 06d206828a
commit 3b1b43f864
1 changed files with 27 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
src/GUI/LocationWidget.cxx
View file

@ -32,6 +32,7 @@
#include "AirportDiagram.hxx" #include "AirportDiagram.hxx"
#include "NavaidDiagram.hxx" #include "NavaidDiagram.hxx"
#include "LaunchConfig.hxx" #include "LaunchConfig.hxx"
#include "DefaultAircraftLocator.hxx"
#include <Airports/airport.hxx> #include <Airports/airport.hxx>
#include <Airports/groundnetwork.hxx> #include <Airports/groundnetwork.hxx>
@ -56,6 +57,8 @@ QString fixNavaidName(QString s)
QString up = w.toUpper(); QString up = w.toUpper();
// expand common abbreviations // expand common abbreviations
// note these are not translated, since they are abbreivations
// for English-langauge airports, mostly in the US/Canada
if (up == "FLD") { if (up == "FLD") {
changedWords.append("Field"); changedWords.append("Field");
continue; continue;
@ -229,10 +232,11 @@ public:
IdentSearchFilter filter(aircraft); IdentSearchFilter filter(aircraft);
FGPositionedList exactMatches = NavDataCache::instance()->findAllWithIdent(term, &filter, true); FGPositionedList exactMatches = NavDataCache::instance()->findAllWithIdent(term, &filter, true);
m_ids.reserve(exactMatches.size());
for (unsigned int i=0; i<exactMatches.size(); ++i) { m_items.reserve(exactMatches.size());
m_ids.push_back(exactMatches[i]->guid()); for (auto match : exactMatches) {
m_items.push_back(exactMatches[i]); m_ids.push_back(match->guid());
m_items.push_back(match);
} }
endResetModel(); endResetModel();
@ -322,11 +326,11 @@ private slots:
} }
PositionedIDVec newIds = m_search->results(); PositionedIDVec newIds = m_search->results();
m_ids.reserve(newIds.size());
beginInsertRows(QModelIndex(), m_ids.size(), newIds.size() - 1); beginInsertRows(QModelIndex(), m_ids.size(), newIds.size() - 1);
for (unsigned int i=m_ids.size(); i < newIds.size(); ++i) { for (auto id : newIds) {
m_ids.push_back(newIds[i]); m_ids.push_back(id);
m_items.push_back(FGPositionedRef()); // null ref m_items.push_back({}); // null ref
} }
endInsertRows(); endInsertRows();
@ -434,7 +438,7 @@ void LocationWidget::restoreSettings()
{ {
QSettings settings; QSettings settings;
m_recentLocations = loadPositionedList(settings.value("recent-locations")); m_recentLocations = loadPositionedList(settings.value("recent-locations"));
m_searchModel->setItems(m_recentLocations); onShowHistory();
} }
void LocationWidget::restoreLocation(QVariantMap l) void LocationWidget::restoreLocation(QVariantMap l)
@ -1072,8 +1076,20 @@ void LocationWidget::addToRecent(FGPositionedRef pos)
void LocationWidget::onShowHistory() void LocationWidget::onShowHistory()
{ {
qDebug() << Q_FUNC_INFO; // prepend the default location
m_searchModel->setItems(m_recentLocations); FGPositionedList locs = m_recentLocations;
const std::string defaultICAO = flightgear::defaultAirportICAO();
auto it = std::find_if(locs.begin(), locs.end(), [defaultICAO](FGPositionedRef pos) {
return pos->ident() == defaultICAO;
});
if (it == locs.end()) {
FGAirportRef apt = FGAirport::findByIdent(defaultICAO);
locs.insert(locs.begin(), apt);
}
m_searchModel->setItems(locs);
} }
void LocationWidget::setBaseLocation(FGPositionedRef ref) void LocationWidget::setBaseLocation(FGPositionedRef ref)