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

refs #325, added some comments to simplify review

Browse Source
This commit is contained in:
Klaus Basan
2014-09-29 03:35:06 +02:00
parent e929423fc9
commit e745885906
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/blackgui/models/listmodelbase.h
View File

@@ -171,7 +171,7 @@ namespace BlackGui
* \param container used list * \param container used list
* \param column column inder * \param column column inder
* \param order sort order (ascending / descending) * \param order sort order (ascending / descending)
* \threadsafe * \threadsafe under normal conditions thread safe as long as the column metadata are not changed
*/ */
ContainerType sortContainerByColumn(const ContainerType &container, int column, Qt::SortOrder order) const; ContainerType sortContainerByColumn(const ContainerType &container, int column, Qt::SortOrder order) const;
@@ -247,6 +247,7 @@ namespace BlackGui
m_container = m_model->sortContainerByColumn(m_container, m_sortColumn, m_sortOrder); m_container = m_model->sortContainerByColumn(m_container, m_sortColumn, m_sortOrder);
} }
// now update model itself thread safe, but time for sort was saved // now update model itself thread safe, but time for sort was saved
// the invoked method itself will run in the main thread's event loop again
QMetaObject::invokeMethod(m_model, "updateContainer", Qt::QueuedConnection, QMetaObject::invokeMethod(m_model, "updateContainer", Qt::QueuedConnection,
Q_ARG(QVariant, m_container.toQVariant()), Q_ARG(bool, false)); Q_ARG(QVariant, m_container.toQVariant()), Q_ARG(bool, false));
} }

15
src/blackgui/updateworker.h
View File

@@ -18,7 +18,8 @@
namespace BlackGui namespace BlackGui
{ {
//! Base class for workers //! Base class for workers. Runs itself in newly created thread when started.
//! Provides access to related thread and cleans up itself when done.
class IUpdateWorker : public QObject class IUpdateWorker : public QObject
{ {
Q_OBJECT Q_OBJECT
@@ -45,15 +46,19 @@ namespace BlackGui
} }
//! Start thread, return nullptr if cannot be started //! Start thread, return nullptr if cannot be started
//! \remarks If start fails, object needs to be terminated manually //! \remarks If start fails (false), object needs to be terminated manually
bool start() bool start()
{ {
qDebug() << "before init thread" << QThread::currentThreadId();
if (!m_thread) { initializeThread(); } if (!m_thread) { initializeThread(); }
m_thread->start(); m_thread->start(); // starting, not yet doing anything
// m_thread will start with invocation by event loop
// invokeMethod "schedules" an update running in the newly created thread
bool ok = QMetaObject::invokeMethod(this, "ps_runUpdate", Qt::QueuedConnection); bool ok = QMetaObject::invokeMethod(this, "ps_runUpdate", Qt::QueuedConnection);
if (ok) { return true; } if (ok) { return true; }
// startup failed // invocation failed, so I can clean up thread straight away
this->terminateThread(); this->terminateThread();
return false; return false;
} }
@@ -71,7 +76,7 @@ namespace BlackGui
//! Update, call virtual method so inheriting class needs no slots //! Update, call virtual method so inheriting class needs no slots
void ps_runUpdate() void ps_runUpdate()
{ {
this->update(); this->update(); // call overridden method doing work
emit this->updateFinished(); emit this->updateFinished();
this->terminate(); // clean up thread, delete worker (myself) this->terminate(); // clean up thread, delete worker (myself)
} }