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

ref #780, streamlined mapping component

Browse Source 
* remove a lot redundant slots
* renamed to rendered aircraft in code
* also use aircraftRemoved signal
This commit is contained in:
Klaus Basan
2016-10-24 16:52:04 +02:00
parent 313aa9f679
commit 44fcba296b
3 changed files with 56 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

112
src/blackgui/components/mappingcomponent.cpp
View File

@@ -68,26 +68,26 @@ namespace BlackGui
ui->tvp_AircraftModels->addFilterDialog(); ui->tvp_AircraftModels->addFilterDialog();
ui->tvp_AircraftModels->menuRemoveItems(CViewBaseNonTemplate::MenuBackend); ui->tvp_AircraftModels->menuRemoveItems(CViewBaseNonTemplate::MenuBackend);
ui->tvp_SimulatedAircraft->setAircraftMode(CSimulatedAircraftListModel::ModelMode); ui->tvp_RenderedAircraft->setAircraftMode(CSimulatedAircraftListModel::ModelMode);
ui->tvp_SimulatedAircraft->setResizeMode(CAircraftModelView::ResizingOnce); ui->tvp_RenderedAircraft->setResizeMode(CAircraftModelView::ResizingOnce);
connect(ui->tvp_AircraftModels, &CAircraftModelView::requestUpdate, this, &CMappingComponent::ps_onModelsUpdateRequested); connect(ui->tvp_AircraftModels, &CAircraftModelView::requestUpdate, this, &CMappingComponent::ps_onModelsUpdateRequested);
connect(ui->tvp_AircraftModels, &CAircraftModelView::modelDataChanged, this, &CMappingComponent::ps_onRowCountChanged); connect(ui->tvp_AircraftModels, &CAircraftModelView::modelDataChanged, this, &CMappingComponent::ps_onRowCountChanged);
connect(ui->tvp_AircraftModels, &CAircraftModelView::clicked, this, &CMappingComponent::ps_onModelSelectedInView); connect(ui->tvp_AircraftModels, &CAircraftModelView::clicked, this, &CMappingComponent::ps_onModelSelectedInView);
connect(ui->tvp_SimulatedAircraft, &CSimulatedAircraftView::modelDataChanged, this, &CMappingComponent::ps_onRowCountChanged); connect(ui->tvp_RenderedAircraft, &CSimulatedAircraftView::modelDataChanged, this, &CMappingComponent::ps_onRowCountChanged);
connect(ui->tvp_SimulatedAircraft, &CSimulatedAircraftView::clicked, this, &CMappingComponent::ps_onAircraftSelectedInView); connect(ui->tvp_RenderedAircraft, &CSimulatedAircraftView::clicked, this, &CMappingComponent::ps_onAircraftSelectedInView);
connect(ui->tvp_SimulatedAircraft, &CSimulatedAircraftView::requestUpdate, this, &CMappingComponent::ps_onSimulatedAircraftUpdateRequested); connect(ui->tvp_RenderedAircraft, &CSimulatedAircraftView::requestUpdate, this, &CMappingComponent::ps_markRenderedViewForUpdate);
connect(ui->tvp_SimulatedAircraft, &CSimulatedAircraftView::requestTextMessageWidget, this, &CMappingComponent::requestTextMessageWidget); connect(ui->tvp_RenderedAircraft, &CSimulatedAircraftView::requestTextMessageWidget, this, &CMappingComponent::requestTextMessageWidget);
connect(ui->tvp_SimulatedAircraft, &CSimulatedAircraftView::requestEnableAircraft, this, &CMappingComponent::ps_onMenuEnableAircraft); connect(ui->tvp_RenderedAircraft, &CSimulatedAircraftView::requestEnableAircraft, this, &CMappingComponent::ps_onMenuEnableAircraft);
connect(ui->tvp_SimulatedAircraft, &CSimulatedAircraftView::requestFastPositionUpdates, this, &CMappingComponent::ps_onMenuChangeFastPositionUpdates); connect(ui->tvp_RenderedAircraft, &CSimulatedAircraftView::requestFastPositionUpdates, this, &CMappingComponent::ps_onMenuChangeFastPositionUpdates);
connect(ui->tvp_SimulatedAircraft, &CSimulatedAircraftView::requestHighlightInSimulator, this, &CMappingComponent::ps_onMenuHighlightInSimulator); connect(ui->tvp_RenderedAircraft, &CSimulatedAircraftView::requestHighlightInSimulator, this, &CMappingComponent::ps_onMenuHighlightInSimulator);
connect(ui->pb_SaveAircraft, &QPushButton::clicked, this, &CMappingComponent::ps_onSaveAircraft); connect(ui->pb_SaveAircraft, &QPushButton::clicked, this, &CMappingComponent::ps_onSaveAircraft);
this->m_modelCompleter = new QCompleter(this); this->m_modelCompleter = new QCompleter(this);
this->m_currentMappingsViewDelegate = new CCheckBoxDelegate(":/diagona/icons/diagona/icons/tick.png", ":/diagona/icons/diagona/icons/cross.png", this); this->m_currentMappingsViewDelegate = new CCheckBoxDelegate(":/diagona/icons/diagona/icons/tick.png", ":/diagona/icons/diagona/icons/cross.png", this);
ui->tvp_SimulatedAircraft->setItemDelegateForColumn(0, this->m_currentMappingsViewDelegate); ui->tvp_RenderedAircraft->setItemDelegateForColumn(0, this->m_currentMappingsViewDelegate);
// Aircraft previews // Aircraft previews
connect(ui->cb_AircraftIconDisplayed, &QCheckBox::stateChanged, this, &CMappingComponent::ps_onModelPreviewChanged); connect(ui->cb_AircraftIconDisplayed, &QCheckBox::stateChanged, this, &CMappingComponent::ps_onModelPreviewChanged);
@@ -97,20 +97,21 @@ namespace BlackGui
ui->tvp_AircraftModels->setDisplayAutomatically(false); ui->tvp_AircraftModels->setDisplayAutomatically(false);
this->m_updateTimer->setUpdateInterval(10 * 1000); this->m_updateTimer->setUpdateInterval(10 * 1000);
connect(sGui->getIContextSimulator(), &IContextSimulator::installedAircraftModelsChanged, this, &CMappingComponent::ps_onAircraftModelsLoaded); connect(sGui->getIContextSimulator(), &IContextSimulator::modelSetChanged, this, &CMappingComponent::ps_onModelSetChanged);
connect(sGui->getIContextSimulator(), &IContextSimulator::modelMatchingCompleted, this, &CMappingComponent::ps_onModelMatchingCompleted); connect(sGui->getIContextSimulator(), &IContextSimulator::modelMatchingCompleted, this, &CMappingComponent::ps_markRenderedAircraftForUpdate);
connect(sGui->getIContextSimulator(), &IContextSimulator::aircraftRenderingChanged, this, &CMappingComponent::ps_onAircraftRenderingChanged); connect(sGui->getIContextSimulator(), &IContextSimulator::aircraftRenderingChanged, this, &CMappingComponent::ps_markRenderedAircraftForUpdate);
connect(sGui->getIContextSimulator(), &IContextSimulator::airspaceSnapshotHandled, this, &CMappingComponent::ps_onAirspaceSnapshotHandled); connect(sGui->getIContextSimulator(), &IContextSimulator::airspaceSnapshotHandled, this, &CMappingComponent::ps_markRenderedViewForUpdate);
connect(sGui->getIContextNetwork(), &IContextNetwork::changedRemoteAircraftModel, this, &CMappingComponent::ps_onRemoteAircraftModelChanged); connect(sGui->getIContextNetwork(), &IContextNetwork::changedRemoteAircraftModel, this, &CMappingComponent::ps_onRemoteAircraftModelChanged);
connect(sGui->getIContextNetwork(), &IContextNetwork::changedRemoteAircraftEnabled, this, &CMappingComponent::ps_onChangedAircraftEnabled); connect(sGui->getIContextNetwork(), &IContextNetwork::changedRemoteAircraftEnabled, this, &CMappingComponent::ps_markRenderedAircraftForUpdate);
connect(sGui->getIContextNetwork(), &IContextNetwork::changedFastPositionUpdates, this, &CMappingComponent::ps_onFastPositionUpdatesEnabled); connect(sGui->getIContextNetwork(), &IContextNetwork::changedFastPositionUpdates, this, &CMappingComponent::ps_markRenderedAircraftForUpdate);
connect(sGui->getIContextNetwork(), &IContextNetwork::removedAircraft, this, &CMappingComponent::ps_markRenderedViewForUpdate);
connect(sGui->getIContextNetwork(), &IContextNetwork::connectionStatusChanged, this, &CMappingComponent::ps_onConnectionStatusChanged); connect(sGui->getIContextNetwork(), &IContextNetwork::connectionStatusChanged, this, &CMappingComponent::ps_onConnectionStatusChanged);
// requires simulator context // requires simulator context
connect(ui->tvp_SimulatedAircraft, &CAircraftModelView::objectChanged, this, &CMappingComponent::ps_onChangedSimulatedAircraftInView); connect(ui->tvp_RenderedAircraft, &CAircraftModelView::objectChanged, this, &CMappingComponent::ps_onChangedSimulatedAircraftInView);
// with external core models might be already available // with external core models might be already available
this->ps_onAircraftModelsLoaded(); this->ps_onModelSetChanged();
} }
CMappingComponent::~CMappingComponent() CMappingComponent::~CMappingComponent()
@@ -118,8 +119,8 @@ namespace BlackGui
int CMappingComponent::countCurrentMappings() const int CMappingComponent::countCurrentMappings() const
{ {
Q_ASSERT(ui->tvp_SimulatedAircraft); Q_ASSERT(ui->tvp_RenderedAircraft);
return ui->tvp_SimulatedAircraft->rowCount(); return ui->tvp_RenderedAircraft->rowCount();
} }
int CMappingComponent::countAircraftModels() const int CMappingComponent::countAircraftModels() const
@@ -134,7 +135,7 @@ namespace BlackGui
return ui->tvp_AircraftModels->container().findModelsStartingWith(modelName, cs); return ui->tvp_AircraftModels->container().findModelsStartingWith(modelName, cs);
} }
void CMappingComponent::ps_onAircraftModelsLoaded() void CMappingComponent::ps_onModelSetChanged()
{ {
if (ui->tvp_AircraftModels->displayAutomatically()) if (ui->tvp_AircraftModels->displayAutomatically())
{ {
@@ -146,18 +147,6 @@ namespace BlackGui
} }
} }
void CMappingComponent::ps_onModelMatchingCompleted(const BlackMisc::Simulation::CSimulatedAircraft &aircraft)
{
Q_UNUSED(aircraft);
this->ps_onSimulatedAircraftUpdateRequested();
}
void CMappingComponent::ps_onAircraftRenderingChanged(const BlackMisc::Simulation::CSimulatedAircraft &aircraft)
{
Q_UNUSED(aircraft);
this->ps_onSimulatedAircraftUpdateRequested();
}
void CMappingComponent::ps_onRowCountChanged(int count, bool withFilter) void CMappingComponent::ps_onRowCountChanged(int count, bool withFilter)
{ {
Q_UNUSED(count); Q_UNUSED(count);
@@ -193,7 +182,7 @@ namespace BlackGui
void CMappingComponent::ps_onAircraftSelectedInView(const QModelIndex &index) void CMappingComponent::ps_onAircraftSelectedInView(const QModelIndex &index)
{ {
const CSimulatedAircraft simAircraft = ui->tvp_SimulatedAircraft->at(index); const CSimulatedAircraft simAircraft = ui->tvp_RenderedAircraft->at(index);
ui->cb_AircraftEnabled->setChecked(simAircraft.isEnabled()); ui->cb_AircraftEnabled->setChecked(simAircraft.isEnabled());
ui->le_Callsign->setText(simAircraft.getCallsign().asString()); ui->le_Callsign->setText(simAircraft.getCallsign().asString());
ui->completer_ModelStrings->setModel(simAircraft.getModel()); ui->completer_ModelStrings->setModel(simAircraft.getModel());
@@ -241,7 +230,7 @@ namespace BlackGui
} }
const CCallsign callsign(cs); const CCallsign callsign(cs);
bool hasCallsign = ui->tvp_SimulatedAircraft->container().containsCallsign(callsign); bool hasCallsign = ui->tvp_RenderedAircraft->container().containsCallsign(callsign);
if (!hasCallsign) if (!hasCallsign)
{ {
CLogMessage(this).validationError("Unmapped callsign %1 for mapping") << callsign.asString(); CLogMessage(this).validationError("Unmapped callsign %1 for mapping") << callsign.asString();
@@ -313,11 +302,6 @@ namespace BlackGui
} }
} }
void CMappingComponent::ps_onSimulatedAircraftUpdateRequested()
{
this->updateSimulatedAircraftView();
}
void CMappingComponent::ps_onModelsUpdateRequested() void CMappingComponent::ps_onModelsUpdateRequested()
{ {
const CAircraftModelList ml(sGui->getIContextSimulator()->getModelSet()); const CAircraftModelList ml(sGui->getIContextSimulator()->getModelSet());
@@ -327,20 +311,7 @@ namespace BlackGui
void CMappingComponent::ps_onRemoteAircraftModelChanged(const CSimulatedAircraft &aircraft, const CIdentifier &originator) void CMappingComponent::ps_onRemoteAircraftModelChanged(const CSimulatedAircraft &aircraft, const CIdentifier &originator)
{ {
if (CIdentifiable::isMyIdentifier(originator)) { return; } if (CIdentifiable::isMyIdentifier(originator)) { return; }
this->updateSimulatedAircraftView(); this->ps_markRenderedAircraftForUpdate(aircraft);
Q_UNUSED(aircraft);
}
void CMappingComponent::ps_onChangedAircraftEnabled(const CSimulatedAircraft &aircraft)
{
this->updateSimulatedAircraftView();
Q_UNUSED(aircraft);
}
void CMappingComponent::ps_onFastPositionUpdatesEnabled(const CSimulatedAircraft &aircraft)
{
this->updateSimulatedAircraftView();
Q_UNUSED(aircraft);
} }
void CMappingComponent::ps_onConnectionStatusChanged(INetwork::ConnectionStatus from, INetwork::ConnectionStatus to) void CMappingComponent::ps_onConnectionStatusChanged(INetwork::ConnectionStatus from, INetwork::ConnectionStatus to)
@@ -348,15 +319,11 @@ namespace BlackGui
Q_UNUSED(from); Q_UNUSED(from);
if (INetwork::isDisconnectedStatus(to)) if (INetwork::isDisconnectedStatus(to))
{ {
ui->tvp_SimulatedAircraft->clear(); this->ps_markRenderedViewForUpdate();
ui->tvp_RenderedAircraft->clear();
} }
} }
void CMappingComponent::ps_onAirspaceSnapshotHandled()
{
this->updateSimulatedAircraftView();
}
void CMappingComponent::ps_onMenuChangeFastPositionUpdates(const CSimulatedAircraft &aircraft) void CMappingComponent::ps_onMenuChangeFastPositionUpdates(const CSimulatedAircraft &aircraft)
{ {
if (sGui->getIContextNetwork()) if (sGui->getIContextNetwork())
@@ -373,6 +340,17 @@ namespace BlackGui
} }
} }
void CMappingComponent::ps_markRenderedAircraftForUpdate(const CSimulatedAircraft &aircraft)
{
Q_UNUSED(aircraft);
m_missedRenderedAircraftUpdate = true;
}
void CMappingComponent::ps_markRenderedViewForUpdate()
{
m_missedRenderedAircraftUpdate = true;
}
void CMappingComponent::ps_onMenuEnableAircraft(const CSimulatedAircraft &aircraft) void CMappingComponent::ps_onMenuEnableAircraft(const CSimulatedAircraft &aircraft)
{ {
if (sGui->getIContextNetwork()) if (sGui->getIContextNetwork())
@@ -390,33 +368,33 @@ namespace BlackGui
return m_identifier; return m_identifier;
} }
void CMappingComponent::updateSimulatedAircraftView(bool forceUpdate) void CMappingComponent::updateRenderedAircraftView(bool forceUpdate)
{ {
if (!forceUpdate && !this->isVisibleWidget()) if (!forceUpdate && !this->isVisibleWidget())
{ {
m_missedSimulatedAircraftUpdate = true; m_missedRenderedAircraftUpdate = true;
return; return;
} }
m_missedSimulatedAircraftUpdate = false; m_missedRenderedAircraftUpdate = false;
if (sGui->getIContextSimulator()->getSimulatorStatus() > 0) if (sGui->getIContextSimulator()->getSimulatorStatus() > 0)
{ {
const CSimulatedAircraftList aircraft(sGui->getIContextNetwork()->getAircraftInRange()); const CSimulatedAircraftList aircraft(sGui->getIContextNetwork()->getAircraftInRange());
ui->tvp_SimulatedAircraft->updateContainer(aircraft); ui->tvp_RenderedAircraft->updateContainer(aircraft);
} }
else else
{ {
ui->tvp_SimulatedAircraft->clear(); ui->tvp_RenderedAircraft->clear();
} }
} }
void CMappingComponent::ps_backgroundUpdate() void CMappingComponent::ps_backgroundUpdate()
{ {
if (this->m_missedSimulatedAircraftUpdate) if (this->m_missedRenderedAircraftUpdate)
{ {
// update, normally when view is invisible, // update, normally when view is invisible,
// but we want an update from time to have some data when user switches to view // but we want an update from time to have some data when user switches to view
this->updateSimulatedAircraftView(true); this->updateRenderedAircraftView(true);
} }
} }
} // namespace } // namespace

31
src/blackgui/components/mappingcomponent.h
View File

@@ -76,13 +76,7 @@ namespace BlackGui
private slots: private slots:
//! Aircraft models available //! Aircraft models available
void ps_onAircraftModelsLoaded(); void ps_onModelSetChanged();
//! Model matched
void ps_onModelMatchingCompleted(const BlackMisc::Simulation::CSimulatedAircraft &aircraft);
//! Model matched
void ps_onAircraftRenderingChanged(const BlackMisc::Simulation::CSimulatedAircraft &aircraft);
//! Changed count //! Changed count
void ps_onRowCountChanged(int count, bool withFilter); void ps_onRowCountChanged(int count, bool withFilter);
@@ -103,27 +97,15 @@ namespace BlackGui
//! Model preview //! Model preview
void ps_onModelPreviewChanged(int state); void ps_onModelPreviewChanged(int state);
//! Request update for mappings from backend
void ps_onSimulatedAircraftUpdateRequested();
//! Request update for models from backend //! Request update for models from backend
void ps_onModelsUpdateRequested(); void ps_onModelsUpdateRequested();
//! Rendered aircraft changed in backend //! Rendered aircraft changed in backend
void ps_onRemoteAircraftModelChanged(const BlackMisc::Simulation::CSimulatedAircraft &aircraft, const BlackMisc::CIdentifier &originator); void ps_onRemoteAircraftModelChanged(const BlackMisc::Simulation::CSimulatedAircraft &aircraft, const BlackMisc::CIdentifier &originator);
//! Aircraft enabled, disabled in backend
void ps_onChangedAircraftEnabled(const BlackMisc::Simulation::CSimulatedAircraft &aircraft);
//! Fast position updates on/off in backend
void ps_onFastPositionUpdatesEnabled(const BlackMisc::Simulation::CSimulatedAircraft &aircraft);
//! Connection status has been changed //! Connection status has been changed
void ps_onConnectionStatusChanged(BlackCore::INetwork::ConnectionStatus from, BlackCore::INetwork::ConnectionStatus to); void ps_onConnectionStatusChanged(BlackCore::INetwork::ConnectionStatus from, BlackCore::INetwork::ConnectionStatus to);
//! Simulator has handled airspace snapshot
void ps_onAirspaceSnapshotHandled();
//! Fast position updates onf/off //! Fast position updates onf/off
void ps_onMenuChangeFastPositionUpdates(const BlackMisc::Simulation::CSimulatedAircraft &aircraft); void ps_onMenuChangeFastPositionUpdates(const BlackMisc::Simulation::CSimulatedAircraft &aircraft);
@@ -133,17 +115,24 @@ namespace BlackGui
//! Highlight in simulator //! Highlight in simulator
void ps_onMenuHighlightInSimulator(const BlackMisc::Simulation::CSimulatedAircraft &aircraft); void ps_onMenuHighlightInSimulator(const BlackMisc::Simulation::CSimulatedAircraft &aircraft);
//! Update with next cycle
void ps_markRenderedAircraftForUpdate(const BlackMisc::Simulation::CSimulatedAircraft &aircraft);
//! Update with next cycle
void ps_markRenderedViewForUpdate();
private: private:
//! Identifier for data send from this component //! Identifier for data send from this component
BlackMisc::CIdentifier mappingIdentifier(); BlackMisc::CIdentifier mappingIdentifier();
//! Update simulated aircraft view //! Update simulated aircraft view
void updateSimulatedAircraftView(bool forceUpdate = false); void updateRenderedAircraftView(bool forceUpdate = false);
QScopedPointer<Ui::CMappingComponent> ui; QScopedPointer<Ui::CMappingComponent> ui;
bool m_missedRenderedAircraftUpdate = true;
QScopedPointer<CUpdateTimer> m_updateTimer; QScopedPointer<CUpdateTimer> m_updateTimer;
QCompleter *m_modelCompleter = nullptr; QCompleter *m_modelCompleter = nullptr;
bool m_missedSimulatedAircraftUpdate = true;
BlackGui::Views::CCheckBoxDelegate *m_currentMappingsViewDelegate = nullptr; BlackGui::Views::CCheckBoxDelegate *m_currentMappingsViewDelegate = nullptr;
BlackMisc::CIdentifier m_identifier; BlackMisc::CIdentifier m_identifier;

2
src/blackgui/components/mappingcomponent.ui
View File

@@ -49,7 +49,7 @@
<number>0</number> <number>0</number>
</property> </property>
<item> <item>
<widget class="BlackGui::Views::CSimulatedAircraftView" name="tvp_SimulatedAircraft"> <widget class="BlackGui::Views::CSimulatedAircraftView" name="tvp_RenderedAircraft">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred"> <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch> <horstretch>0</horstretch>