flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-31 21:15:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ref T231, Ref T236, Ref T238 allow to trigger logging from models view

Browse Source 
* uses the feature to send "dot commands" to contexts
* also uses the renamed developer flag from CApplication
This commit is contained in:
Klaus Basan
2018-01-28 04:48:15 +01:00
parent bdda413386
commit 9a862cab43
2 changed files with 43 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
src/blackgui/views/simulatedaircraftview.cpp
View File

@@ -11,14 +11,18 @@
#include "blackgui/models/simulatedaircraftlistmodel.h"
#include "blackgui/menus/menuaction.h"
#include "blackgui/views/simulatedaircraftview.h"
#include "blackgui/guiapplication.h"
#include "blackcore/context/contextsimulator.h"
#include "blackmisc/aviation/callsign.h"
#include "blackmisc/icons.h"
#include "blackmisc/simulation/simulatedaircraft.h"
#include <QtGlobal>
using namespace BlackConfig;
using namespace BlackMisc;
using namespace BlackMisc::Simulation;
using namespace BlackCore::Context;
using namespace BlackGui::Models;
using namespace BlackGui::Menus;
@@ -48,51 +52,63 @@ namespace BlackGui
void CSimulatedAircraftView::customMenu(CMenuActions &menuActions)
{
if (BlackConfig::CBuildConfig::isDebugBuild())
{
// tbd
}
if (this->hasSelection())
{
CSimulatedAircraft aircraft(selectedObject());
Q_ASSERT(!aircraft.getCallsign().isEmpty());
menuActions.addAction(CIcons::appTextMessages16(), "Show text messages", CMenuAction::pathClientCom(), { this, &CSimulatedAircraftView::ps_requestTextMessage });
if (m_withMenuEnable) { menuActions.addAction(CIcons::appAircraft16(), aircraft.isEnabled() ? "Disable aircraft" : "Enabled aircraft", CMenuAction::pathClientSimulation(), { this, &CSimulatedAircraftView::ps_toogleEnabledAircraft }); }
if (m_withMenuHighlight) { menuActions.addAction(CIcons::appSimulator16(), "Highlight in simulator", CMenuAction::pathClientSimulation(), { this, &CSimulatedAircraftView::ps_highlightInSimulator }); }
if (m_withMenuFastPosition) { menuActions.addAction(CIcons::globe16(), aircraft.fastPositionUpdates() ? "Normal updates" : "Fast position updates", CMenuAction::pathClientSimulation(), { this, &CSimulatedAircraftView::ps_fastPositionUpdates }); }
menuActions.addAction(CIcons::appTextMessages16(), "Show text messages", CMenuAction::pathClientCom(), { this, &CSimulatedAircraftView::requestTextMessage });
if (m_withMenuEnable) { menuActions.addAction(CIcons::appAircraft16(), aircraft.isEnabled() ? "Disable aircraft" : "Enabled aircraft", CMenuAction::pathClientSimulation(), { this, &CSimulatedAircraftView::toogleEnabledAircraft }); }
if (m_withMenuHighlight) { menuActions.addAction(CIcons::appSimulator16(), "Highlight in simulator", CMenuAction::pathClientSimulation(), { this, &CSimulatedAircraftView::highlightInSimulator }); }
if (m_withMenuFastPosition) { menuActions.addAction(CIcons::globe16(), aircraft.fastPositionUpdates() ? "Normal updates" : "Fast position updates", CMenuAction::pathClientSimulation(), { this, &CSimulatedAircraftView::fastPositionUpdates }); }
const bool any = m_withMenuEnable || m_withMenuFastPosition || m_withMenuHighlight;
if (any && (sApp && sApp->isDeveloperFlagSet()))
{
menuActions.addAction(CIcons::appSimulator16(), "Show position log.", CMenuAction::pathClientSimulation(), { this, &CSimulatedAircraftView::showPositionLogInSimulator });
}
}
CViewBase::customMenu(menuActions);
}
void CSimulatedAircraftView::ps_requestTextMessage()
void CSimulatedAircraftView::requestTextMessage()
{
CSimulatedAircraft aircraft(selectedObject());
const CSimulatedAircraft aircraft(selectedObject());
if (aircraft.getCallsign().isEmpty()) { return; }
emit requestTextMessageWidget(aircraft.getCallsign());
emit this->requestTextMessageWidget(aircraft.getCallsign());
}
void CSimulatedAircraftView::ps_toogleEnabledAircraft()
void CSimulatedAircraftView::toogleEnabledAircraft()
{
CSimulatedAircraft aircraft(selectedObject());
if (aircraft.getCallsign().isEmpty()) { return; }
aircraft.setEnabled(!aircraft.isEnabled());
emit requestEnableAircraft(aircraft);
emit this->requestEnableAircraft(aircraft);
}
void CSimulatedAircraftView::ps_fastPositionUpdates()
void CSimulatedAircraftView::fastPositionUpdates()
{
CSimulatedAircraft aircraft(selectedObject());
if (aircraft.getCallsign().isEmpty()) { return; }
aircraft.setFastPositionUpdates(!aircraft.fastPositionUpdates());
emit requestFastPositionUpdates(aircraft);
emit this->requestFastPositionUpdates(aircraft);
}
void CSimulatedAircraftView::ps_highlightInSimulator()
void CSimulatedAircraftView::highlightInSimulator()
{
CSimulatedAircraft aircraft(selectedObject());
const CSimulatedAircraft aircraft(selectedObject());
if (aircraft.getCallsign().isEmpty()) { return; }
emit requestHighlightInSimulator(aircraft);
emit this->requestHighlightInSimulator(aircraft);
}
void CSimulatedAircraftView::showPositionLogInSimulator()
{
if (!sGui || sGui->isShuttingDown()) { return; }
if (!sGui->getIContextSimulator()) { return; }
const CSimulatedAircraft aircraft(selectedObject());
if (aircraft.getCallsign().isEmpty()) { return; }
const CIdentifier i(this->objectName());
const QString dotCmd(".drv pos " + aircraft.getCallsignAsString());
sGui->getIContextSimulator()->parseCommandLine(dotCmd, i);
}
} // ns
} // ns

16
src/blackgui/views/simulatedaircraftview.h
View File

@@ -30,11 +30,11 @@ namespace BlackMisc
namespace BlackGui
{
namespace Menus { class CMenuActions; }
namespace Views
{
//! Aircraft view
class BLACKGUI_EXPORT CSimulatedAircraftView : public CViewWithCallsignObjects<Models::CSimulatedAircraftListModel, BlackMisc::Simulation::CSimulatedAircraftList, BlackMisc::Simulation::CSimulatedAircraft>
class BLACKGUI_EXPORT CSimulatedAircraftView :
public CViewWithCallsignObjects<Models::CSimulatedAircraftListModel, BlackMisc::Simulation::CSimulatedAircraftList, BlackMisc::Simulation::CSimulatedAircraft>
{
Q_OBJECT
@@ -65,13 +65,13 @@ namespace BlackGui
//! \copydoc CViewBase::customMenu
virtual void customMenu(BlackGui::Menus::CMenuActions &menuActions) override;
private slots:
void ps_requestTextMessage();
void ps_toogleEnabledAircraft();
void ps_fastPositionUpdates();
void ps_highlightInSimulator();
private:
void requestTextMessage();
void toogleEnabledAircraft();
void fastPositionUpdates();
void highlightInSimulator();
void showPositionLogInSimulator();
bool m_withMenuHighlight = true;
bool m_withMenuEnable = true;
bool m_withMenuFastPosition = true;