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

refs #702, better callsign syncronization

Browse Source
This commit is contained in:
Klaus Basan
2016-07-05 01:28:20 +02:00
parent 2dcb9536c9
commit a3b5632a5c
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/blackmisc/aviation/atcstation.cpp
View File

@@ -74,6 +74,12 @@ namespace BlackMisc
this->m_controller.setCallsign(callsign);
}
void CAtcStation::setController(const CUser &controller)
{
this->m_controller = controller;
this->m_controller.setCallsign(this->m_callsign);
}
QString CAtcStation::convertToQString(bool i18n) const
{
QString s = i18n ?
@@ -436,6 +442,5 @@ namespace BlackMisc
break;
}
}
} // namespace
} // namespace

2
src/blackmisc/aviation/atcstation.h
View File

@@ -115,7 +115,7 @@ namespace BlackMisc
QString getControllerId() const { return m_controller.getId(); }
//! Set controller
void setController(const BlackMisc::Network::CUser &controller) { this->m_controller = controller; this->m_controller.setCallsign(this->m_callsign); }
void setController(const BlackMisc::Network::CUser &controller);
//! Set controller's name
void setControllerRealName(const QString &controllerName) { this->m_controller.setRealName(controllerName); }

4
src/blackmisc/simulation/simulatedaircraft.cpp
View File

@@ -97,7 +97,7 @@ namespace BlackMisc
void CSimulatedAircraft::setPilot(const Network::CUser &user)
{
m_pilot = user;
this->m_pilot = user;
this->m_pilot.setCallsign(this->m_callsign);
}
@@ -427,6 +427,7 @@ namespace BlackMisc
{
this->m_callsign = callsign;
this->m_model.setCallsign(callsign);
this->m_pilot.setCallsign(callsign);
}
bool CSimulatedAircraft::isActiveFrequencyWithin8_33kHzChannel(const CFrequency &comFrequency) const
@@ -463,6 +464,5 @@ namespace BlackMisc
s += this->m_model.toQString(i18n);
return s;
}
} // namespace
} // namespace