Some minor network context upfront fixes discovered:

* readAtcBookingsFromSource() const; to non const, it changes data in the context
* better adjusting of update time for bookings
* No updates if URL is empty, checked.
This commit is contained in:
Klaus Basan
2014-02-07 15:46:39 +01:00
parent c4b458c97c
commit 2cbddeb5ee
5 changed files with 10 additions and 5 deletions

View File

@@ -38,7 +38,7 @@ namespace BlackCore
this->m_atcBookingTimer = new QTimer(this);
this->connect(this->m_networkManager, &QNetworkAccessManager::finished, this, &CContextNetwork::psAtcBookingsRead);
this->connect(this->m_atcBookingTimer, &QTimer::timeout, this, &CContextNetwork::readAtcBookingsFromSource);
this->m_atcBookingTimer->start(15 * 1000);
this->m_atcBookingTimer->start(10 * 1000); // will be reset in method to a longer time
// 4. connect signals and slots
this->connect(this->m_network, &INetwork::connectionStatusChanged, this, &CContextNetwork::psFsdConnectionStatusChanged);

View File

@@ -72,7 +72,7 @@ namespace BlackCore
/*!
* \copydoc IContextNetwork::readAtcBookingsFromSource()
*/
virtual void readAtcBookingsFromSource() const;
virtual void readAtcBookingsFromSource();
/*!
* \copydoc IContextNetwork::getAtcStationsOnline()

View File

@@ -28,9 +28,14 @@ namespace BlackCore
/*
* Read bookings
*/
void CContextNetwork::readAtcBookingsFromSource() const
void CContextNetwork::readAtcBookingsFromSource()
{
const int updateTime = 60 * 1000; // 1min
if (!(this->m_atcBookingTimer->interval() == updateTime)) this->m_atcBookingTimer->setInterval(updateTime); // 1min
QUrl url(this->getNetworkSettings().getBookingServiceUrl());
if (url.isEmpty()) return;
QNetworkRequest request(url);
this->m_networkManager->get(request);
}

View File

@@ -61,7 +61,7 @@ namespace BlackCore
qDebug() << " LOG: " << method << m1 << m2 << m3 << m4;
}
void IContextNetwork::readAtcBookingsFromSource() const
void IContextNetwork::readAtcBookingsFromSource()
{
this->m_dBusInterface->callDBus(QLatin1Literal("readAtcBookingsFromSource"));
}

View File

@@ -158,7 +158,7 @@ namespace BlackCore
* \brief Read ATC bookings
* \return
*/
virtual void readAtcBookingsFromSource() const;
virtual void readAtcBookingsFromSource();
/*!
* \brief The ATC list with online ATC controllers