mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-04-14 00:25:35 +08:00
refs #702, better callsign syncronization
This commit is contained in:
@@ -74,6 +74,12 @@ namespace BlackMisc
|
|||||||
this->m_controller.setCallsign(callsign);
|
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 CAtcStation::convertToQString(bool i18n) const
|
||||||
{
|
{
|
||||||
QString s = i18n ?
|
QString s = i18n ?
|
||||||
@@ -436,6 +442,5 @@ namespace BlackMisc
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
} // namespace
|
} // namespace
|
||||||
} // namespace
|
} // namespace
|
||||||
|
|||||||
@@ -115,7 +115,7 @@ namespace BlackMisc
|
|||||||
QString getControllerId() const { return m_controller.getId(); }
|
QString getControllerId() const { return m_controller.getId(); }
|
||||||
|
|
||||||
//! Set controller
|
//! 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
|
//! Set controller's name
|
||||||
void setControllerRealName(const QString &controllerName) { this->m_controller.setRealName(controllerName); }
|
void setControllerRealName(const QString &controllerName) { this->m_controller.setRealName(controllerName); }
|
||||||
|
|||||||
@@ -97,7 +97,7 @@ namespace BlackMisc
|
|||||||
|
|
||||||
void CSimulatedAircraft::setPilot(const Network::CUser &user)
|
void CSimulatedAircraft::setPilot(const Network::CUser &user)
|
||||||
{
|
{
|
||||||
m_pilot = user;
|
this->m_pilot = user;
|
||||||
this->m_pilot.setCallsign(this->m_callsign);
|
this->m_pilot.setCallsign(this->m_callsign);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -427,6 +427,7 @@ namespace BlackMisc
|
|||||||
{
|
{
|
||||||
this->m_callsign = callsign;
|
this->m_callsign = callsign;
|
||||||
this->m_model.setCallsign(callsign);
|
this->m_model.setCallsign(callsign);
|
||||||
|
this->m_pilot.setCallsign(callsign);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool CSimulatedAircraft::isActiveFrequencyWithin8_33kHzChannel(const CFrequency &comFrequency) const
|
bool CSimulatedAircraft::isActiveFrequencyWithin8_33kHzChannel(const CFrequency &comFrequency) const
|
||||||
@@ -463,6 +464,5 @@ namespace BlackMisc
|
|||||||
s += this->m_model.toQString(i18n);
|
s += this->m_model.toQString(i18n);
|
||||||
return s;
|
return s;
|
||||||
}
|
}
|
||||||
|
|
||||||
} // namespace
|
} // namespace
|
||||||
} // namespace
|
} // namespace
|
||||||
|
|||||||
Reference in New Issue
Block a user