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

Some bugfixes

Browse Source 
* Missing registration
* wrong frequency in text messages, also some minor tweaks in text message
This commit is contained in:
Klaus Basan
2014-06-09 02:00:56 +02:00
parent 6b55b10b9b
commit 63b0fac72f
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/blackcore/network_vatlib.cpp
View File

@@ -525,7 +525,7 @@ namespace BlackCore
// if this is really required, I need to group by message // if this is really required, I need to group by message
// currently I send individual messages // currently I send individual messages
QVector<INT> freqsVec; QVector<INT> freqsVec;
freqsVec.push_back(message.getFrequency().value(CFrequencyUnit::kHz())); freqsVec.push_back(message.getFrequency().valueRounded(CFrequencyUnit::kHz(), 0));
m_net->SendRadioTextMessage(freqsVec.size(), freqsVec.data(), toFSD(message.getMessage())); m_net->SendRadioTextMessage(freqsVec.size(), freqsVec.data(), toFSD(message.getMessage()));
} }
} }

7
src/blackgui/textmessagecomponent.cpp
View File

@@ -162,10 +162,11 @@ namespace BlackGui
else else
{ {
// frequency message // frequency message
const CAircraft ownAircraft = this->getOwnAircraft();
if (this->currentWidget() == this->ui->tb_TextMessagesAll) return true; if (this->currentWidget() == this->ui->tb_TextMessagesAll) return true;
if (textMessage.isSendToFrequency(this->getOwnAircraft().getCom1System().getFrequencyActive())) if (textMessage.isSendToFrequency(ownAircraft.getCom1System().getFrequencyActive()))
return this->currentWidget() == this->ui->tb_TextMessagesCOM1; return this->currentWidget() == this->ui->tb_TextMessagesCOM1;
if (textMessage.isSendToFrequency(this->getOwnAircraft().getCom2System().getFrequencyActive())) if (textMessage.isSendToFrequency(ownAircraft.getCom2System().getFrequencyActive()))
return this->currentWidget() == this->ui->tb_TextMessagesCOM2; return this->currentWidget() == this->ui->tb_TextMessagesCOM2;
return false; return false;
} }
@@ -173,7 +174,7 @@ namespace BlackGui
void CTextMessageComponent::showCurrentFrequenciesFromCockpit() void CTextMessageComponent::showCurrentFrequenciesFromCockpit()
{ {
CAircraft ownAircraft = this->getOwnAircraft(); const CAircraft ownAircraft = this->getOwnAircraft();
const QString f1 = QString("COM1: %1").arg(ownAircraft.getCom1System().getFrequencyActive().valueRounded(CFrequencyUnit::MHz(), 3)); const QString f1 = QString("COM1: %1").arg(ownAircraft.getCom1System().getFrequencyActive().valueRounded(CFrequencyUnit::MHz(), 3));
const QString f2 = QString("COM2: %1").arg(ownAircraft.getCom2System().getFrequencyActive().valueRounded(CFrequencyUnit::MHz(), 3)); const QString f2 = QString("COM2: %1").arg(ownAircraft.getCom2System().getFrequencyActive().valueRounded(CFrequencyUnit::MHz(), 3));
this->ui->tb_TextMessagesCOM1->setToolTip(f1); this->ui->tb_TextMessagesCOM1->setToolTip(f1);

1
src/blackmisc/blackmiscfreefunctions.cpp
View File

@@ -55,6 +55,7 @@ void BlackMisc::Aviation::registerMetadata()
CAircraftList::registerMetadata(); CAircraftList::registerMetadata();
CAircraftSituation::registerMetadata(); CAircraftSituation::registerMetadata();
CAircraftIcao::registerMetadata(); CAircraftIcao::registerMetadata();
CAirportIcao::registerMetadata();
CSelcal::registerMetadata(); CSelcal::registerMetadata();
CFlightPlan::registerMetadata(); CFlightPlan::registerMetadata();
} }