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

refs #748 Make airport completer work

Browse Source 
* fixed typo in CWebDataServices
* trigger CAirportDataReader::dataRead() when read from cache, too
* make AirportReader part of AllSwiftDbReaders
* fixed typo in CLoginComponent
This commit is contained in:
Michał Garapich
2016-09-04 21:03:18 +02:00
committed by Mathew Sutcliffe
parent cafd724aaf
commit 281b6d11a6
4 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/blackcore/airportdatareader.cpp
View File

@@ -96,10 +96,12 @@ namespace BlackCore
m_airportCache.synchronize(); m_airportCache.synchronize();
if (m_airportCache.get().size() > 0 && int size = m_airportCache.get().size();
if (size > 0 &&
m_airportCache.getAvailableTimestamp().toMSecsSinceEpoch() >= static_cast<qint64>(m_lastModified)) // cache is up-to-date m_airportCache.getAvailableTimestamp().toMSecsSinceEpoch() >= static_cast<qint64>(m_lastModified)) // cache is up-to-date
{ {
CLogMessage(this).info("Loaded %1 airports from cache") << m_airportCache.get().size(); CLogMessage(this).info("Loaded %1 airports from cache") << m_airportCache.get().size();
emit dataRead(CEntityFlags::AirportEntity, CEntityFlags::ReadFinished, size);
} }
else else
{ {

7
src/blackcore/webdataservices.cpp
View File

@@ -94,7 +94,7 @@ namespace BlackCore
CEntityFlags::Entity restEntities = entities & ~icaoPart; CEntityFlags::Entity restEntities = entities & ~icaoPart;
restEntities &= ~modelPart; restEntities &= ~modelPart;
this->readDeferredInBackground(modelPart, 3000); this->readDeferredInBackground(restEntities, 3000);
} }
CServerList CWebDataServices::getVatsimFsdServers() const CServerList CWebDataServices::getVatsimFsdServers() const
@@ -689,9 +689,10 @@ namespace BlackCore
if (flags.testFlag(CWebReaderFlags::WebReaderFlag::AirportReader)) if (flags.testFlag(CWebReaderFlags::WebReaderFlag::AirportReader))
{ {
this->m_airportDataReader = new CAirportDataReader(this); this->m_airportDataReader = new CAirportDataReader(this);
bool c = connect(this->m_airportDataReader, &CAirportDataReader::dataRead, this, &CWebDataServices::ps_readFromAirportDb); c = connect(this->m_airportDataReader, &CAirportDataReader::dataRead, this, &CWebDataServices::ps_readFromAirportDb);
Q_ASSERT_X(c, Q_FUNC_INFO, "Airport reader signals"); Q_ASSERT_X(c, Q_FUNC_INFO, "Airport reader signals");
Q_UNUSED(c); c = connect(this->m_airportDataReader, &CAirportDataReader::dataRead, this, &CWebDataServices::dataRead);
Q_ASSERT_X(c, Q_FUNC_INFO, "connect failed for airports");
this->m_airportDataReader->start(QThread::LowPriority); this->m_airportDataReader->start(QThread::LowPriority);
} }
} }

4
src/blackcore/webreaderflags.h
View File

@@ -39,8 +39,8 @@ namespace BlackCore
AirportReader = 1 << 6, //!< reader for airport list AirportReader = 1 << 6, //!< reader for airport list
InfoDataReader = 1 << 7, //!< DB info data (metdata, how many data, when updated) InfoDataReader = 1 << 7, //!< DB info data (metdata, how many data, when updated)
AllVatsimReaders = VatsimBookingReader | VatsimDataReader | VatsimMetarReader | VatsimStatusReader, //!< all VATSIM readers AllVatsimReaders = VatsimBookingReader | VatsimDataReader | VatsimMetarReader | VatsimStatusReader, //!< all VATSIM readers
AllSwiftDbReaders = IcaoDataReader | ModelReader | InfoDataReader, //!< all swift data AllSwiftDbReaders = IcaoDataReader | ModelReader | InfoDataReader | AirportReader, //!< all swift data
AllReaders = AirportReader | AllSwiftDbReaders | AllVatsimReaders //!< everything AllReaders = AllSwiftDbReaders | AllVatsimReaders //!< everything
}; };
Q_DECLARE_FLAGS(WebReader, WebReaderFlag) Q_DECLARE_FLAGS(WebReader, WebReaderFlag)

2
src/blackgui/components/logincomponent.cpp
View File

@@ -605,7 +605,7 @@ namespace BlackGui
QCompleter *completer = new QCompleter(airports, this); QCompleter *completer = new QCompleter(airports, this);
QStyledItemDelegate *itemDelegate = new QStyledItemDelegate(completer); QStyledItemDelegate *itemDelegate = new QStyledItemDelegate(completer);
completer->popup()->setItemDelegate(itemDelegate); completer->popup()->setItemDelegate(itemDelegate);
ui->le_AirlineIcaoDesignator->setCompleter(completer); ui->le_VatsimHomeAirport->setCompleter(completer);
completer->popup()->setObjectName("AirportCompleter"); completer->popup()->setObjectName("AirportCompleter");
completer->popup()->setMinimumWidth(175); completer->popup()->setMinimumWidth(175);
} }