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

Ref T312, ignore not running listeners checking again via button

Browse Source
This commit is contained in:
Klaus Basan
2018-09-06 09:11:55 +02:00
committed by Roland Winklmeier
parent a2486981bd
commit 55690846fe
4 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/blackcore/context/contextnetworkimpl.cpp
View File

@@ -21,6 +21,7 @@
#include "blackmisc/aviation/aircrafticaocode.h"
#include "blackmisc/aviation/aircraftparts.h"
#include "blackmisc/aviation/atcstationlist.h"
#include "blackmisc/aviation/comsystem.h"
#include "blackmisc/aviation/callsign.h"
#include "blackmisc/aviation/comsystem.h"
#include "blackmisc/dbusserver.h"
@@ -296,7 +297,7 @@ namespace BlackCore
}
// set receiver
const QString receiver = parser.part(1).trimmed(); // receiver
const QString receiver = parser.part(1).trimmed().toLower(); // receiver
const CSimulatedAircraft ownAircraft(this->getIContextOwnAircraft()->getOwnAircraft());
if (ownAircraft.getCallsign().isEmpty())
{
@@ -307,15 +308,15 @@ namespace BlackCore
CTextMessage tm;
tm.setSenderCallsign(ownAircraft.getCallsign());
if (receiver == "c1" || receiver == "com1")
if (receiver.startsWith("c") && receiver.endsWith("1"))
{
tm.setFrequency(ownAircraft.getCom1System().getFrequencyActive());
}
else if (receiver == "c2" || receiver == "com2")
else if (receiver.startsWith("c") && receiver.endsWith("2"))
{
tm.setFrequency(ownAircraft.getCom2System().getFrequencyActive());
}
else if (receiver == "u" || receiver == "unicom" || receiver == "uni")
else if (receiver == "u" || receiver.startsWith("uni"))
{
tm.setFrequency(CPhysicalQuantitiesConstants::FrequencyUnicom());
}
@@ -326,6 +327,7 @@ namespace BlackCore
if (isNumber)
{
CFrequency radioFrequency = CFrequency(frequencyMhz, CFrequencyUnit::MHz());
CComSystem::roundToChannelSpacing(radioFrequency, CComSystem::ChannelSpacing8_33KHz);
if (CComSystem::isValidCivilAviationFrequency(radioFrequency))
{
tm.setFrequency(radioFrequency);
@@ -338,7 +340,7 @@ namespace BlackCore
}
else
{
CCallsign toCallsign(receiver);
const CCallsign toCallsign(receiver);
tm.setRecipientCallsign(toCallsign);
}
}

1
src/blackcore/pluginmanagersimulator.cpp
View File

@@ -79,6 +79,7 @@ namespace BlackCore
for (PluginExtended &pi : m_plugins.values())
{
if (!pi.listener) { continue; }
if (!pi.listener->isRunning()) { continue; }
pi.listener->check();
c++;
}

2
src/blackcore/simulator.cpp
View File

@@ -1165,7 +1165,7 @@ namespace BlackCore
void ISimulatorListener::check()
{
if (m_isRunning) { return; }
if (!m_isRunning) { return; }
if (!CThreadUtils::isCurrentThreadObjectThread(this))
{
// call in correct thread

3
src/blackcore/simulator.h
View File

@@ -585,6 +585,9 @@ namespace BlackCore
//! Info about the backend system (if available)
virtual QString backendInfo() const;
//! Running?
bool isRunning() const { return m_isRunning; }
public slots:
//! Start listening for the simulator to start.
//! \threadsafe