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

refs #428 Use COriginator instead of QString in internal API

Browse Source
This commit is contained in:
Roland Winklmeier
2015-05-24 13:36:20 +02:00
parent 136587f564
commit ee0bfd62fa
61 changed files with 265 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/blackgui/components/atcstationcomponent.cpp
View File

@@ -275,12 +275,12 @@ namespace BlackGui
}
}
const QString &CAtcStationComponent::originator()
COriginator CAtcStationComponent::originator()
{
// string is generated once, the timestamp allows to use multiple
// components (as long as they are not generated at the same ms)
static const QString o = QString("ATCSTATIOCOMPONENT:").append(QString::number(QDateTime::currentMSecsSinceEpoch()));
return o;
if (m_originator.getName().isEmpty())
m_originator = COriginator(QStringLiteral("ATCSTATIOCOMPONENT"));
return m_originator;
}
void CAtcStationComponent::ps_onlineAtcStationSelected(QModelIndex index)

4
src/blackgui/components/atcstationcomponent.h
View File

@@ -16,6 +16,7 @@
#include "blackgui/components/enableforruntime.h"
#include "blackgui/components/enablefordockwidgetinfoarea.h"
#include "blackgui/components/updatetimer.h"
#include "blackmisc/originator.h"
#include "blackmisc/aviation/atcstation.h"
#include <QTabWidget>
#include <QModelIndex>
@@ -111,7 +112,7 @@ namespace BlackGui
private:
void updateTreeView();
const QString &originator();
BlackMisc::COriginator originator();
QScopedPointer<Ui::CAtcStationComponent> ui;
QScopedPointer<CUpdateTimer> m_updateTimer;
@@ -119,6 +120,7 @@ namespace BlackGui
QDateTime m_timestampOnlineStationsChanged = CUpdateTimer::epoch(); //!< stations marked as changed
QDateTime m_timestampLastReadBookedStations = CUpdateTimer::epoch(); //!< stations read
QDateTime m_timestampBookedStationsChanged = CUpdateTimer::epoch(); //!< stations marked as changed
BlackMisc::COriginator m_originator;
};
} // namespace

16
src/blackgui/components/cockpitcomcomponent.cpp
View File

@@ -62,7 +62,7 @@ namespace BlackGui
// init from aircraft
CAircraft ownAircraft = this->getOwnAircraft();
this->ps_updateCockpitFromContext(ownAircraft, "dummyInitialValues");
this->ps_updateCockpitFromContext(ownAircraft, COriginator("dummyInitialValues"));
// SELCAL pairs in cockpit
this->ui->frp_ComPanelSelcalBottom->clear();
@@ -114,7 +114,7 @@ namespace BlackGui
this->getIContextOwnAircraft()->updateSelcal(this->getSelcal(), cockpitOriginator());
}
void CCockpitComComponent::ps_updateCockpitFromContext(const CAircraft &ownAircraft, const QString &originator)
void CCockpitComComponent::ps_updateCockpitFromContext(const CAircraft &ownAircraft, const COriginator &originator)
{
if (originator == CCockpitComComponent::cockpitOriginator()) return; // comes from myself
@@ -182,7 +182,7 @@ namespace BlackGui
}
}
void CCockpitComComponent::ps_onChangedSelcal(const CSelcal &selcal, const QString &originator)
void CCockpitComComponent::ps_onChangedSelcal(const CSelcal &selcal, const COriginator &originator)
{
if (originator == CCockpitComComponent::cockpitOriginator()) return; // comes from myself
this->ui->frp_ComPanelSelcalBottom->setSelcalCode(selcal);
@@ -286,12 +286,12 @@ namespace BlackGui
Q_UNUSED(connected);
}
const QString &CCockpitComComponent::cockpitOriginator()
COriginator CCockpitComComponent::cockpitOriginator()
{
// string is generated once, the timestamp allows to use multiple
// components (as long as they are not generated at the same ms)
static const QString o = QString("COCKPITCOMCOMPONENT:").append(QString::number(QDateTime::currentMSecsSinceEpoch()));
return o;
if (m_originator.getName().isEmpty())
m_originator = COriginator(QStringLiteral("COCKPITCOMCOMPONENT"));
return m_originator;
}
} // namespace

8
src/blackgui/components/cockpitcomcomponent.h
View File

@@ -13,6 +13,7 @@
#include "blackgui/blackguiexport.h"
#include "enablefordockwidgetinfoarea.h"
#include "enableforruntime.h"
#include "blackmisc/originator.h"
#include "blackmisc/aviation/aircraft.h"
#include "blackmisc/aviation/transponder.h"
#include "blackmisc/audio/voiceroomlist.h"
@@ -66,13 +67,13 @@ namespace BlackGui
void ps_guiChangedSelcal();
//! Update cockpit from context
void ps_updateCockpitFromContext(const BlackMisc::Aviation::CAircraft &ownAircraft, const QString &originator);
void ps_updateCockpitFromContext(const BlackMisc::Aviation::CAircraft &ownAircraft, const BlackMisc::COriginator &originator);
//! Cockpit values have been changed in GUI
void ps_testSelcal();
//! SELCAL was changed
void ps_onChangedSelcal(const BlackMisc::Aviation::CSelcal &selcal, const QString &originator);
void ps_onChangedSelcal(const BlackMisc::Aviation::CSelcal &selcal, const BlackMisc::COriginator &originator);
//! Update voice room related information
void ps_onChangedVoiceRoomStatus(const BlackMisc::Audio::CVoiceRoomList &selectedVoiceRooms, bool connected);
@@ -97,9 +98,10 @@ namespace BlackGui
void updateFrequencyDisplaysFromComSystems(const BlackMisc::Aviation::CComSystem &com1, const BlackMisc::Aviation::CComSystem &com2);
//! Identifies sender of cockpit updates
static const QString &cockpitOriginator();
BlackMisc::COriginator cockpitOriginator();
QScopedPointer<Ui::CCockpitMainComponent> ui;
BlackMisc::COriginator m_originator;
};
} // namespace

13
src/blackgui/components/cockpittranspondermodeledscomponent.cpp
View File

@@ -12,6 +12,7 @@
#include <QVBoxLayout>
#include <QHBoxLayout>
using namespace BlackMisc;
using namespace BlackMisc::Aviation;
using namespace BlackCore;
@@ -35,7 +36,7 @@ namespace BlackGui
this->setMode(getOwnTransponder().getTransponderMode());
}
void CCockpitTransponderModeLedsComponent::ps_onAircraftCockpitChanged(const CAircraft &aircraft, const QString &originator)
void CCockpitTransponderModeLedsComponent::ps_onAircraftCockpitChanged(const CAircraft &aircraft, const BlackMisc::COriginator &originator)
{
if (ledsOriginator() == originator) { return; }
this->setMode(aircraft.getTransponderMode());
@@ -132,12 +133,12 @@ namespace BlackGui
return getIContextOwnAircraft()->getOwnAircraft();
}
const QString &CCockpitTransponderModeLedsComponent::ledsOriginator()
BlackMisc::COriginator CCockpitTransponderModeLedsComponent::ledsOriginator()
{
// string is generated once, the timestamp allows to use multiple
// components (as long as they are not generated at the same ms)
static const QString o = QString("XPDRLEDSCOMCOMPONENT:").append(QString::number(QDateTime::currentMSecsSinceEpoch()));
return o;
if (m_originator.getName().isEmpty())
m_originator = COriginator(QStringLiteral("XPDRLEDSCOMCOMPONENT"));
return m_originator;
}
} // namespace

6
src/blackgui/components/cockpittranspondermodeledscomponent.h
View File

@@ -15,6 +15,7 @@
#include "blackgui/blackguiexport.h"
#include "enableforruntime.h"
#include "../led.h"
#include "blackmisc/originator.h"
#include "blackmisc/aviation/aircraft.h"
#include "blackmisc/aviation/transponder.h"
#include <QFrame>
@@ -39,7 +40,7 @@ namespace BlackGui
private slots:
//! \copydoc IContextOwnAircraft::changedAircraftCockpit
void ps_onAircraftCockpitChanged(const BlackMisc::Aviation::CAircraft &aircraft, const QString &originator);
void ps_onAircraftCockpitChanged(const BlackMisc::Aviation::CAircraft &aircraft, const BlackMisc::COriginator &originator);
//! LED clicked
void ps_onLedClicked();
@@ -60,11 +61,12 @@ namespace BlackGui
BlackMisc::Aviation::CAircraft getOwnAircraft() const;
//! Identifies sender of cockpit updates
static const QString &ledsOriginator();
BlackMisc::COriginator ledsOriginator();
QScopedPointer<BlackGui::CLedWidget> m_ledStandby;
QScopedPointer<BlackGui::CLedWidget> m_ledModes;
QScopedPointer<BlackGui::CLedWidget> m_ledIdent;
BlackMisc::COriginator m_originator;
};

10
src/blackgui/components/flightplancomponent.cpp
View File

@@ -417,12 +417,12 @@ namespace BlackGui
this->setCurrentWidget(this->ui->tb_RemarksGenerator);
}
const QString &CFlightPlanComponent::flightPlanOriginator()
COriginator CFlightPlanComponent::flightPlanOriginator()
{
// string is generated once, the timestamp allows to use multiple
// components (as long as they are not generated at the same ms)
static const QString o = QString("FLIGHTPLANCOMPONENT:").append(QString::number(QDateTime::currentMSecsSinceEpoch()));
return o;
if (m_originator.getName().isEmpty())
m_originator = COriginator(QStringLiteral("FLIGHTPLANCOMPONENT"));
return m_originator;
}
} // namespace

6
src/blackgui/components/flightplancomponent.h
View File

@@ -14,6 +14,7 @@
#include "blackgui/blackguiexport.h"
#include "blackgui/components/enableforruntime.h"
#include "blackmisc/originator.h"
#include "blackmisc/aviation/aircraft.h"
#include "blackmisc/aviation/flightplan.h"
@@ -65,6 +66,9 @@ namespace BlackGui
//! Validate, generates status messages
BlackMisc::CStatusMessageList validateAndInitializeFlightPlan(BlackMisc::Aviation::CFlightPlan &fligtPlan);
//! Flightplan originator
BlackMisc::COriginator m_originator;
//! Default value for airport ICAO airports
static const QString &defaultIcao() { static QString d("ICAO"); return d; }
@@ -72,7 +76,7 @@ namespace BlackGui
static const QString &defaultTime() { static QString t("00:00"); return t; }
//! Originator
static const QString &flightPlanOriginator();
BlackMisc::COriginator flightPlanOriginator();
private slots:
//! Call \sa ps_buildRemarksString from combo box signal

12
src/blackgui/components/mainkeypadareacomponent.cpp
View File

@@ -158,7 +158,7 @@ namespace BlackGui
this->ui->le_CommandLineInput->clear();
}
void CMainKeypadAreaComponent::ps_ownAircraftCockpitChanged(const CAircraft &aircraft, const QString &originator)
void CMainKeypadAreaComponent::ps_ownAircraftCockpitChanged(const CAircraft &aircraft, const COriginator &originator)
{
Q_UNUSED(originator);
bool ident = aircraft.getTransponder().getTransponderMode() == CTransponder::StateIdent;
@@ -236,12 +236,12 @@ namespace BlackGui
ui->pb_MainWeather->setChecked(false);
}
const QString &CMainKeypadAreaComponent::keypadOriginator()
COriginator CMainKeypadAreaComponent::keypadOriginator()
{
// string is generated once, the timestamp allows to use multiple
// components (as long as they are not generated at the same ms)
static const QString o = QString("KEYPADAREACOMPONENT:").append(QString::number(QDateTime::currentMSecsSinceEpoch()));
return o;
if (m_originator.getName().isEmpty())
m_originator = COriginator(QStringLiteral("KEYPADAREACOMPONENT"));
return m_originator;
}
} // namespace

8
src/blackgui/components/mainkeypadareacomponent.h
View File

@@ -15,6 +15,7 @@
#include "blackgui/blackguiexport.h"
#include "maininfoareacomponent.h"
#include "enableforruntime.h"
#include "blackmisc/originator.h"
#include "blackmisc/aviation/aircraft.h"
#include <QFrame>
@@ -44,7 +45,7 @@ namespace BlackGui
~CMainKeypadAreaComponent();
//! Originator
static const QString &keypadOriginator();
BlackMisc::COriginator keypadOriginator();
signals:
//! Button to select main info area has been pressed
@@ -55,7 +56,7 @@ namespace BlackGui
void changedOpacity(int opacity);
//! Command was entered
void commandEntered(const QString &commandLine, const QString &originator);
void commandEntered(const QString &commandLine, const BlackMisc::COriginator &originator);
//! Connect was pressed
void connectPressed();
@@ -82,7 +83,7 @@ namespace BlackGui
void ps_commandEntered();
//! \copydoc BlackCore::IContextOwnAircraft::changedAircraftCockpit
void ps_ownAircraftCockpitChanged(const BlackMisc::Aviation::CAircraft &aircraft, const QString &originator);
void ps_ownAircraftCockpitChanged(const BlackMisc::Aviation::CAircraft &aircraft, const BlackMisc::COriginator &originator);
//! \copydoc BlackCore::IContextAudio::changedMute
void ps_muteChanged(bool muted);
@@ -101,6 +102,7 @@ namespace BlackGui
void unsetInfoAreaButtons();
QScopedPointer<Ui::CMainKeypadAreaComponent> ui;
BlackMisc::COriginator m_originator;
};
} // namespace

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

@@ -308,21 +308,21 @@ namespace BlackGui
this->ui->le_AircraftModel->setCompleter(this->m_modelCompleter);
}
void CMappingComponent::ps_onRemoteAircraftModelChanged(const CSimulatedAircraft &aircraft, const QString &originator)
void CMappingComponent::ps_onRemoteAircraftModelChanged(const CSimulatedAircraft &aircraft, const COriginator &originator)
{
this->updateSimulatedAircraftView();
Q_UNUSED(originator);
Q_UNUSED(aircraft);
}
void CMappingComponent::ps_onChangedAircraftEnabled(const CSimulatedAircraft &aircraft, const QString &originator)
void CMappingComponent::ps_onChangedAircraftEnabled(const CSimulatedAircraft &aircraft, const COriginator &originator)
{
this->updateSimulatedAircraftView();
Q_UNUSED(originator);
Q_UNUSED(aircraft);
}
void CMappingComponent::ps_onFastPositionUpdatesEnabled(const CSimulatedAircraft &aircraft, const QString &originator)
void CMappingComponent::ps_onFastPositionUpdatesEnabled(const CSimulatedAircraft &aircraft, const COriginator &originator)
{
this->updateSimulatedAircraftView();
Q_UNUSED(originator);
@@ -378,12 +378,12 @@ namespace BlackGui
}
}
const QString &CMappingComponent::mappingtOriginator()
COriginator CMappingComponent::mappingtOriginator()
{
// string is generated once, the timestamp allows to use multiple
// components (as long as they are not generated at the same ms)
static const QString o = QString("MAPPINGCOMPONENT:").append(QString::number(QDateTime::currentMSecsSinceEpoch()));
return o;
if (m_originator.getName().isEmpty())
m_originator = COriginator(QStringLiteral("MAPPINGCOMPONENT"));
return m_originator;
}
void CMappingComponent::updateSimulatedAircraftView(bool forceUpdate)

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

@@ -17,6 +17,7 @@
#include "blackgui/components/enablefordockwidgetinfoarea.h"
#include "blackgui/components/updatetimer.h"
#include "blackgui/views/checkboxdelegate.h"
#include "blackmisc/originator.h"
#include "blackmisc/simulation/simulatedaircraft.h"
#include "blackmisc/simulation/aircraftmodellist.h"
#include <QTabWidget>
@@ -94,13 +95,13 @@ namespace BlackGui
void ps_onModelsUpdateRequested();
//! Rendered aircraft changed in backend
void ps_onRemoteAircraftModelChanged(const BlackMisc::Simulation::CSimulatedAircraft &aircraft, const QString &originator);
void ps_onRemoteAircraftModelChanged(const BlackMisc::Simulation::CSimulatedAircraft &aircraft, const BlackMisc::COriginator &originator);
//! Aircraft enabled, disabled in backend
void ps_onChangedAircraftEnabled(const BlackMisc::Simulation::CSimulatedAircraft &aircraft, const QString &originator);
void ps_onChangedAircraftEnabled(const BlackMisc::Simulation::CSimulatedAircraft &aircraft, const BlackMisc::COriginator &originator);
//! Fast position updates on/off in backend
void ps_onFastPositionUpdatesEnabled(const BlackMisc::Simulation::CSimulatedAircraft &aircraft, const QString &originator);
void ps_onFastPositionUpdatesEnabled(const BlackMisc::Simulation::CSimulatedAircraft &aircraft, const BlackMisc::COriginator &originator);
//! Connection status has been changed
void ps_onConnectionStatusChanged(uint from, uint to);
@@ -121,13 +122,14 @@ namespace BlackGui
void ps_onMenuHighlightInSimulator(const BlackMisc::Simulation::CSimulatedAircraft &aircraft);
private:
static const QString &mappingtOriginator();
BlackMisc::COriginator mappingtOriginator();
void updateSimulatedAircraftView(bool forceUpdate = false);
QScopedPointer<Ui::CMappingComponent> ui;
QScopedPointer<CUpdateTimer> m_updateTimer;
QCompleter *m_modelCompleter = nullptr;
bool m_missedSimulatedAircraftUpdate = true;
BlackGui::Views::CCheckBoxDelegate *m_currentMappingsViewDelegate = nullptr;
BlackMisc::COriginator m_originator;
private slots:
void ps_backgroundUpdate();

12
src/blackgui/components/textmessagecomponent.cpp
View File

@@ -148,12 +148,12 @@ namespace BlackGui
}
}
const QString &CTextMessageComponent::componentOriginator()
COriginator CTextMessageComponent::componentOriginator()
{
// string is generated once, the timestamp allows to use multiple
// components (as long as they are not generated at the same ms)
static const QString o = QString("TEXTMESSAGECOMPONENT:").append(QString::number(QDateTime::currentMSecsSinceEpoch()));
return o;
if (m_originator.getName().isEmpty())
m_originator = COriginator(QStringLiteral("TEXTMESSAGECOMPONENT"));
return m_originator;
}
void CTextMessageComponent::ps_onChangedAircraftCockpit()
@@ -433,7 +433,7 @@ namespace BlackGui
this->displayTextMessage(sentMessage);
}
bool CTextMessageComponent::handleGlobalCommandLine(const QString &commandLine, const QString &originator)
bool CTextMessageComponent::handleGlobalCommandLine(const QString &commandLine, const COriginator &originator)
{
if (originator == componentOriginator()) { return false; }
if (commandLine.isEmpty() || commandLine.startsWith(".")) { return false; }

8
src/blackgui/components/textmessagecomponent.h
View File

@@ -16,6 +16,7 @@
#include "blackgui/components/enableforruntime.h"
#include "blackgui/components/enablefordockwidgetinfoarea.h"
#include "blackgui/textmessagetextedit.h"
#include "blackmisc/originator.h"
#include "blackmisc/network/textmessage.h"
#include "blackmisc/aviation/aircraft.h"
#include "blackmisc/network/textmessagelist.h"
@@ -59,7 +60,7 @@ namespace BlackGui
void displayInInfoWindow(const BlackMisc::CVariant &message, int displayDurationMs) const;
//! Command line was entered
void commandEntered(const QString commandLine, const QString &orignator);
void commandEntered(const QString commandLine, const BlackMisc::COriginator &orignator);
public slots:
//! Text messages received
@@ -69,7 +70,7 @@ namespace BlackGui
void onTextMessageSent(const BlackMisc::Network::CTextMessage &sentMessage);
//! Used to allow direct input from global command line when visible
bool handleGlobalCommandLine(const QString &commandLine, const QString &originator);
bool handleGlobalCommandLine(const QString &commandLine, const BlackMisc::COriginator &originator);
//! Display the tab for given callsign
void showCorrespondingTab(const BlackMisc::Aviation::CCallsign &callsign);
@@ -80,6 +81,7 @@ namespace BlackGui
private:
QScopedPointer<Ui::CTextMessageComponent> ui;
BlackMisc::COriginator m_originator;
//! Enum to widget
QWidget *getTabWidget(Tab tab) const;
@@ -123,7 +125,7 @@ namespace BlackGui
QString textMessageToCommand(const QString &enteredLine);
//! Originator
static const QString &componentOriginator();
BlackMisc::COriginator componentOriginator();
//! Handle a text message entered
void handleEnteredTextMessage(const QString &textMessage);