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

Renaming

Browse Source
This commit is contained in:
Klaus Basan
2018-01-24 01:30:50 +01:00
parent cec94e2819
commit b5106167d9
3 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/blackgui/components/settingssimulatormessagescomponent.cpp
View File

@@ -59,7 +59,7 @@ namespace BlackGui
if (ui->cb_SupervisorMessages->isChecked()) { mt |= CSimulatorMessagesSettings::TextMessageSupervisor; }
if (ui->cb_Com1->isChecked()) { mt |= CSimulatorMessagesSettings::TextMessagesCom1; }
if (ui->cb_Com2->isChecked()) { mt |= CSimulatorMessagesSettings::TextMessagesCom2; };
settings.setRelayedTextMessages(mt);
settings.setRelayTextMessages(mt);
// save
this->m_settings.setAndSave(settings);
@@ -69,27 +69,27 @@ namespace BlackGui
{
const CSimulatorMessagesSettings settings(this->m_settings.get());
ui->cb_Messages->setChecked(settings.isGloballyEnabled());
if (settings.isRelayedInfoMessages())
if (settings.isRelayInfoMessages())
{
ui->rb_ErrorWarningsInfo->setChecked(true);
}
else if (settings.isRelayedWarningMessages())
else if (settings.isRelayWarningMessages())
{
ui->rb_ErrorsAndWarnings->setChecked(true);
}
else if (settings.isRelayedErrorsMessages())
else if (settings.isRelayErrorsMessages())
{
ui->rb_ErrorsOnly->setChecked(true);
}
else if (!settings.isRelayedTechnicalMessages())
else if (!settings.isRelayTechnicalMessages())
{
ui->rb_NoTechnicalMessages->setChecked(true);
}
ui->cb_PrivateMessages->setChecked(settings.isRelayedPrivateTextMessages());
ui->cb_SupervisorMessages->setChecked(settings.isRelayedSupervisorTextMessages());
ui->cb_Com1->setChecked(settings.isRelayedCom1TextMessages());
ui->cb_Com2->setChecked(settings.isRelayedCom2TextMessages());
ui->cb_PrivateMessages->setChecked(settings.isRelayPrivateTextMessages());
ui->cb_SupervisorMessages->setChecked(settings.isRelaySupervisorTextMessages());
ui->cb_Com1->setChecked(settings.isRelayCom1TextMessages());
ui->cb_Com2->setChecked(settings.isRelayCom2TextMessages());
}
} // ns
} // ns

28
src/blackmisc/simulation/settings/simulatorsettings.cpp
View File

@@ -326,55 +326,55 @@ namespace BlackMisc
m_technicalLogLevel = -1;
}
bool CSimulatorMessagesSettings::isRelayedErrorsMessages() const
bool CSimulatorMessagesSettings::isRelayErrorsMessages() const
{
if (m_technicalLogLevel < 0) { return false; }
return (m_technicalLogLevel <= CStatusMessage::SeverityError);
}
bool CSimulatorMessagesSettings::isRelayedWarningMessages() const
bool CSimulatorMessagesSettings::isRelayWarningMessages() const
{
if (m_technicalLogLevel < 0) { return false; }
return (m_technicalLogLevel <= CStatusMessage::SeverityWarning);
}
bool CSimulatorMessagesSettings::isRelayedInfoMessages() const
bool CSimulatorMessagesSettings::isRelayInfoMessages() const
{
if (m_technicalLogLevel < 0) { return false; }
return (m_technicalLogLevel <= CStatusMessage::SeverityInfo);
}
bool CSimulatorMessagesSettings::isRelayedTechnicalMessages() const
bool CSimulatorMessagesSettings::isRelayTechnicalMessages() const
{
return (m_technicalLogLevel >= 0);
}
void CSimulatorMessagesSettings::setRelayedTextMessages(CSimulatorMessagesSettings::TextMessageType messageType)
void CSimulatorMessagesSettings::setRelayTextMessages(CSimulatorMessagesSettings::TextMessageType messageType)
{
m_messageType = static_cast<int>(messageType);
}
bool CSimulatorMessagesSettings::isRelayedSupervisorTextMessages() const
bool CSimulatorMessagesSettings::isRelaySupervisorTextMessages() const
{
return this->getRelayedTextMessageTypes().testFlag(TextMessageSupervisor);
}
bool CSimulatorMessagesSettings::isRelayedPrivateTextMessages() const
bool CSimulatorMessagesSettings::isRelayPrivateTextMessages() const
{
return this->getRelayedTextMessageTypes().testFlag(TextMessagePrivate);
}
bool CSimulatorMessagesSettings::isRelayedUnicomTextMessages() const
bool CSimulatorMessagesSettings::isRelayUnicomTextMessages() const
{
return this->getRelayedTextMessageTypes().testFlag(TextMessagesUnicom);
}
bool CSimulatorMessagesSettings::isRelayedCom1TextMessages() const
bool CSimulatorMessagesSettings::isRelayCom1TextMessages() const
{
return this->getRelayedTextMessageTypes().testFlag(TextMessagesCom1);
}
bool CSimulatorMessagesSettings::isRelayedCom2TextMessages() const
bool CSimulatorMessagesSettings::isRelayCom2TextMessages() const
{
return this->getRelayedTextMessageTypes().testFlag(TextMessagesCom2);
}
@@ -383,8 +383,8 @@ namespace BlackMisc
{
if (message.isEmpty()) { return false; }
if (!this->isGloballyEnabled()) { return false; }
if (!this->isRelayedTechnicalMessages()) { return false; }
int s = static_cast<int>(message.getSeverity());
if (!this->isRelayTechnicalMessages()) { return false; }
const int s = static_cast<int>(message.getSeverity());
return (s >= m_technicalLogLevel);
}
@@ -424,7 +424,7 @@ namespace BlackMisc
Q_UNUSED(i18n);
static const QString s("Enabled %1, text messages: %2, severity: %3");
QString severity;
if (this->isRelayedTechnicalMessages())
if (this->isRelayTechnicalMessages())
{
severity = QStringLiteral("No tech. msgs");
}
@@ -455,7 +455,7 @@ namespace BlackMisc
switch (i)
{
case IndexTechnicalLogSeverity: this->setTechnicalLogSeverity(static_cast<CStatusMessage::StatusSeverity>(variant.toInt())); break;
case IndexTextMessageRelay: this->setRelayedTextMessages(static_cast<CSimulatorMessagesSettings::TextMessageType>(variant.toInt())); break;
case IndexTextMessageRelay: this->setRelayTextMessages(static_cast<CSimulatorMessagesSettings::TextMessageType>(variant.toInt())); break;
case IndexGloballyEnabled: this->setGloballyEnabled(variant.toBool()); break;
default: CValueObject::setPropertyByIndex(index, variant); break;
}

26
src/blackmisc/simulation/settings/simulatorsettings.h
View File

@@ -152,10 +152,10 @@ namespace BlackMisc
CSimulatorSettings getSettings(const CSimulatorInfo &simulator) const;
//! Set settings per simulator
CStatusMessage setSettings(const Settings::CSimulatorSettings &settings, const CSimulatorInfo &simulator);
CStatusMessage setSettings(const CSimulatorSettings &settings, const CSimulatorInfo &simulator);
//! Set settings per simulator
CStatusMessage setAndSaveSettings(const Settings::CSimulatorSettings &settings, const CSimulatorInfo &simulator);
CStatusMessage setAndSaveSettings(const CSimulatorSettings &settings, const CSimulatorInfo &simulator);
//! Set settings per simulator
CStatusMessage saveSettings(const CSimulatorInfo &simulator);
@@ -231,7 +231,7 @@ namespace BlackMisc
CSimulatorMessagesSettings();
//! Log severity
void setTechnicalLogSeverity(BlackMisc::CStatusMessage::StatusSeverity severity);
void setTechnicalLogSeverity(CStatusMessage::StatusSeverity severity);
//! Globally enable / disable
void setGloballyEnabled(bool enabled) { m_globallyEnabled = enabled; }
@@ -243,34 +243,34 @@ namespace BlackMisc
void disableTechnicalMessages();
//! Relay (technical) error messages
bool isRelayedErrorsMessages() const;
bool isRelayErrorsMessages() const;
//! Relay (technical) warning messages
bool isRelayedWarningMessages() const;
bool isRelayWarningMessages() const;
//! Relay (technical) info messages
bool isRelayedInfoMessages() const;
bool isRelayInfoMessages() const;
//! Relay any message
bool isRelayedTechnicalMessages() const;
bool isRelayTechnicalMessages() const;
//! Relay the following message types
void setRelayedTextMessages(Settings::CSimulatorMessagesSettings::TextMessageType messageType);
void setRelayTextMessages(CSimulatorMessagesSettings::TextMessageType messageType);
//! Relay supervisor messages
bool isRelayedSupervisorTextMessages() const;
bool isRelaySupervisorTextMessages() const;
//! Relay private messages
bool isRelayedPrivateTextMessages() const;
bool isRelayPrivateTextMessages() const;
//! Relay UNICOM messages
bool isRelayedUnicomTextMessages() const;
bool isRelayUnicomTextMessages() const;
//! Relay COM1 text message
bool isRelayedCom1TextMessages() const;
bool isRelayCom1TextMessages() const;
//! Relay COM2 text message
bool isRelayedCom2TextMessages() const;
bool isRelayCom2TextMessages() const;
//! Relay given text message
bool relayThisTextMessage(const Network::CTextMessage &msg, const CSimulatedAircraft &aircraft) const;