mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-05-05 09:45:44 +08:00
Ref T338, style
This commit is contained in:
@@ -161,7 +161,7 @@ namespace BlackGui
|
|||||||
sApp->processEventsFor(50);
|
sApp->processEventsFor(50);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
const QMessageBox::StandardButton reply = QMessageBox::question(this, QStringLiteral("Confirm override"), withQUestionMark(msg), QMessageBox::Yes | QMessageBox::No);
|
const QMessageBox::StandardButton reply = QMessageBox::question(this, QStringLiteral("Confirm override"), withQuestionMark(msg), QMessageBox::Yes | QMessageBox::No);
|
||||||
return reply == QMessageBox::Yes;
|
return reply == QMessageBox::Yes;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -318,7 +318,7 @@ namespace BlackGui
|
|||||||
|
|
||||||
QWidget *CTextMessageComponent::findTextMessageTabByCallsign(const CCallsign &callsign, bool callsignResolution) const
|
QWidget *CTextMessageComponent::findTextMessageTabByCallsign(const CCallsign &callsign, bool callsignResolution) const
|
||||||
{
|
{
|
||||||
QWidget *w = findTextMessageTabByName(callsign.asString());
|
QWidget *w = this->findTextMessageTabByName(callsign.asString());
|
||||||
if (w) { return w; }
|
if (w) { return w; }
|
||||||
if (!callsignResolution) { return nullptr; }
|
if (!callsignResolution) { return nullptr; }
|
||||||
|
|
||||||
|
|||||||
@@ -70,18 +70,18 @@ namespace BlackMisc
|
|||||||
void CComSystem::setActiveUnicom()
|
void CComSystem::setActiveUnicom()
|
||||||
{
|
{
|
||||||
this->toggleActiveStandby();
|
this->toggleActiveStandby();
|
||||||
this->setFrequencyActive(BlackMisc::PhysicalQuantities::CPhysicalQuantitiesConstants::FrequencyUnicom());
|
this->setFrequencyActive(PhysicalQuantities::CPhysicalQuantitiesConstants::FrequencyUnicom());
|
||||||
}
|
}
|
||||||
|
|
||||||
void CComSystem::setActiveInternationalAirDistress()
|
void CComSystem::setActiveInternationalAirDistress()
|
||||||
{
|
{
|
||||||
this->toggleActiveStandby();
|
this->toggleActiveStandby();
|
||||||
this->setFrequencyActive(BlackMisc::PhysicalQuantities::CPhysicalQuantitiesConstants::FrequencyInternationalAirDistress());
|
this->setFrequencyActive(PhysicalQuantities::CPhysicalQuantitiesConstants::FrequencyInternationalAirDistress());
|
||||||
}
|
}
|
||||||
|
|
||||||
CComSystem CComSystem::getCom1System(double activeFrequencyMHz, double standbyFrequencyMHz)
|
CComSystem CComSystem::getCom1System(double activeFrequencyMHz, double standbyFrequencyMHz)
|
||||||
{
|
{
|
||||||
return CComSystem(CModulator::NameCom1(), BlackMisc::PhysicalQuantities::CFrequency(activeFrequencyMHz, BlackMisc::PhysicalQuantities::CFrequencyUnit::MHz()), BlackMisc::PhysicalQuantities::CFrequency(standbyFrequencyMHz < 0 ? activeFrequencyMHz : standbyFrequencyMHz, BlackMisc::PhysicalQuantities::CFrequencyUnit::MHz()));
|
return CComSystem(CModulator::NameCom1(), PhysicalQuantities::CFrequency(activeFrequencyMHz, PhysicalQuantities::CFrequencyUnit::MHz()), PhysicalQuantities::CFrequency(standbyFrequencyMHz < 0 ? activeFrequencyMHz : standbyFrequencyMHz, PhysicalQuantities::CFrequencyUnit::MHz()));
|
||||||
}
|
}
|
||||||
|
|
||||||
CComSystem CComSystem::getCom1System(const CFrequency &activeFrequency, const CFrequency &standbyFrequency)
|
CComSystem CComSystem::getCom1System(const CFrequency &activeFrequency, const CFrequency &standbyFrequency)
|
||||||
@@ -91,7 +91,7 @@ namespace BlackMisc
|
|||||||
|
|
||||||
CComSystem CComSystem::getCom2System(double activeFrequencyMHz, double standbyFrequencyMHz)
|
CComSystem CComSystem::getCom2System(double activeFrequencyMHz, double standbyFrequencyMHz)
|
||||||
{
|
{
|
||||||
return CComSystem(CModulator::NameCom2(), BlackMisc::PhysicalQuantities::CFrequency(activeFrequencyMHz, BlackMisc::PhysicalQuantities::CFrequencyUnit::MHz()), BlackMisc::PhysicalQuantities::CFrequency(standbyFrequencyMHz < 0 ? activeFrequencyMHz : standbyFrequencyMHz, BlackMisc::PhysicalQuantities::CFrequencyUnit::MHz()));
|
return CComSystem(CModulator::NameCom2(), PhysicalQuantities::CFrequency(activeFrequencyMHz, PhysicalQuantities::CFrequencyUnit::MHz()), PhysicalQuantities::CFrequency(standbyFrequencyMHz < 0 ? activeFrequencyMHz : standbyFrequencyMHz, PhysicalQuantities::CFrequencyUnit::MHz()));
|
||||||
}
|
}
|
||||||
|
|
||||||
CComSystem CComSystem::getCom2System(const CFrequency &activeFrequency, const CFrequency &standbyFrequency)
|
CComSystem CComSystem::getCom2System(const CFrequency &activeFrequency, const CFrequency &standbyFrequency)
|
||||||
|
|||||||
@@ -19,7 +19,6 @@ namespace BlackMisc
|
|||||||
{
|
{
|
||||||
namespace PhysicalQuantities
|
namespace PhysicalQuantities
|
||||||
{
|
{
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
* Physical unit frequency
|
* Physical unit frequency
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ namespace BlackMisc
|
|||||||
bool CMeasurementUnit::operator ==(const CMeasurementUnit &other) const
|
bool CMeasurementUnit::operator ==(const CMeasurementUnit &other) const
|
||||||
{
|
{
|
||||||
if (this == &other) return true;
|
if (this == &other) return true;
|
||||||
return this->m_data->m_name == other.m_data->m_name;
|
return m_data->m_name == other.m_data->m_name;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool CMeasurementUnit::operator !=(const CMeasurementUnit &other) const
|
bool CMeasurementUnit::operator !=(const CMeasurementUnit &other) const
|
||||||
@@ -31,8 +31,8 @@ namespace BlackMisc
|
|||||||
double CMeasurementUnit::convertFrom(double value, const CMeasurementUnit &unit) const
|
double CMeasurementUnit::convertFrom(double value, const CMeasurementUnit &unit) const
|
||||||
{
|
{
|
||||||
if (this->isNull() || unit.isNull()) return 0;
|
if (this->isNull() || unit.isNull()) return 0;
|
||||||
if (this->m_data->m_toDefault == unit.m_data->m_toDefault && this->m_data->m_fromDefault == unit.m_data->m_fromDefault) return value;
|
if (m_data->m_toDefault == unit.m_data->m_toDefault && m_data->m_fromDefault == unit.m_data->m_fromDefault) return value;
|
||||||
return this->m_data->m_fromDefault(unit.m_data->m_toDefault(value));
|
return m_data->m_fromDefault(unit.m_data->m_toDefault(value));
|
||||||
}
|
}
|
||||||
|
|
||||||
QString CMeasurementUnit::makeRoundedQStringWithUnit(double value, int digits, bool i18n) const
|
QString CMeasurementUnit::makeRoundedQStringWithUnit(double value, int digits, bool i18n) const
|
||||||
@@ -42,7 +42,7 @@ namespace BlackMisc
|
|||||||
|
|
||||||
double CMeasurementUnit::roundValue(double value, int digits) const
|
double CMeasurementUnit::roundValue(double value, int digits) const
|
||||||
{
|
{
|
||||||
if (digits < 0) { digits = this->m_data->m_displayDigits; }
|
if (digits < 0) { digits = m_data->m_displayDigits; }
|
||||||
return CMathUtils::round(value, digits);
|
return CMathUtils::round(value, digits);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -55,7 +55,7 @@ namespace BlackMisc
|
|||||||
QString CMeasurementUnit::makeRoundedQString(double value, int digits, bool i18n) const
|
QString CMeasurementUnit::makeRoundedQString(double value, int digits, bool i18n) const
|
||||||
{
|
{
|
||||||
Q_UNUSED(i18n);
|
Q_UNUSED(i18n);
|
||||||
if (digits < 0) digits = this->m_data->m_displayDigits;
|
if (digits < 0) digits = m_data->m_displayDigits;
|
||||||
const double v = CMathUtils::round(value, digits);
|
const double v = CMathUtils::round(value, digits);
|
||||||
const QString s = QLocale::system().toString(v, 'f', digits);
|
const QString s = QLocale::system().toString(v, 'f', digits);
|
||||||
return s;
|
return s;
|
||||||
|
|||||||
@@ -255,7 +255,7 @@ namespace BlackMisc
|
|||||||
//! \copydoc BlackMisc::Mixin::DBusByMetaClass::marshallToDbus
|
//! \copydoc BlackMisc::Mixin::DBusByMetaClass::marshallToDbus
|
||||||
void marshallToDbus(QDBusArgument &argument) const
|
void marshallToDbus(QDBusArgument &argument) const
|
||||||
{
|
{
|
||||||
argument << this->m_data->m_symbol;
|
argument << m_data->m_symbol;
|
||||||
}
|
}
|
||||||
|
|
||||||
//! \copydoc BlackMisc::Mixin::DBusByMetaClass::unmarshallFromDbus
|
//! \copydoc BlackMisc::Mixin::DBusByMetaClass::unmarshallFromDbus
|
||||||
@@ -281,13 +281,13 @@ namespace BlackMisc
|
|||||||
//! Name such as "meter"
|
//! Name such as "meter"
|
||||||
QString getName(bool i18n = false) const
|
QString getName(bool i18n = false) const
|
||||||
{
|
{
|
||||||
return i18n ? QCoreApplication::translate("CMeasurementUnit", this->m_data->m_name.latin1()) : this->m_data->m_name;
|
return i18n ? QCoreApplication::translate("CMeasurementUnit", m_data->m_name.latin1()) : m_data->m_name;
|
||||||
}
|
}
|
||||||
|
|
||||||
//! Unit name such as "m"
|
//! Unit name such as "m"
|
||||||
QString getSymbol(bool i18n = false) const
|
QString getSymbol(bool i18n = false) const
|
||||||
{
|
{
|
||||||
return i18n ? QCoreApplication::translate("CMeasurementUnit", this->m_data->m_symbol.latin1()) : this->m_data->m_symbol;
|
return i18n ? QCoreApplication::translate("CMeasurementUnit", m_data->m_symbol.latin1()) : m_data->m_symbol;
|
||||||
}
|
}
|
||||||
|
|
||||||
//! Does a string end with name or symbol? E.g. 3meter, 3m, 3deg
|
//! Does a string end with name or symbol? E.g. 3meter, 3m, 3deg
|
||||||
@@ -317,13 +317,13 @@ namespace BlackMisc
|
|||||||
//! Threshold for comparions
|
//! Threshold for comparions
|
||||||
double getEpsilon() const
|
double getEpsilon() const
|
||||||
{
|
{
|
||||||
return this->m_data->m_epsilon;
|
return m_data->m_epsilon;
|
||||||
}
|
}
|
||||||
|
|
||||||
//! Display digits
|
//! Display digits
|
||||||
int getDisplayDigits() const
|
int getDisplayDigits() const
|
||||||
{
|
{
|
||||||
return this->m_data->m_displayDigits;
|
return m_data->m_displayDigits;
|
||||||
}
|
}
|
||||||
|
|
||||||
//! Convert from other unit to this unit.
|
//! Convert from other unit to this unit.
|
||||||
@@ -334,13 +334,13 @@ namespace BlackMisc
|
|||||||
{
|
{
|
||||||
if (this->isNull()) return false;
|
if (this->isNull()) return false;
|
||||||
if (qFuzzyIsNull(value)) return true;
|
if (qFuzzyIsNull(value)) return true;
|
||||||
return std::abs(value) <= this->m_data->m_epsilon;
|
return std::abs(value) <= m_data->m_epsilon;
|
||||||
}
|
}
|
||||||
|
|
||||||
//! Is unit null?
|
//! Is unit null?
|
||||||
bool isNull() const
|
bool isNull() const
|
||||||
{
|
{
|
||||||
return this->m_data->m_toDefault == nullptr;
|
return m_data->m_toDefault == nullptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
// --------------------------------------------------------------------
|
// --------------------------------------------------------------------
|
||||||
|
|||||||
@@ -7,15 +7,10 @@
|
|||||||
* contained in the LICENSE file.
|
* contained in the LICENSE file.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "blackmisc/comparefunctions.h"
|
|
||||||
#include "blackmisc/dictionary.h"
|
|
||||||
#include "blackmisc/pq/measurementunit.h"
|
#include "blackmisc/pq/measurementunit.h"
|
||||||
#include "blackmisc/pq/physicalquantity.h"
|
#include "blackmisc/pq/physicalquantity.h"
|
||||||
#include "blackmisc/pq/pqstring.h"
|
#include "blackmisc/pq/pqstring.h"
|
||||||
#include "blackmisc/propertyindex.h"
|
#include "blackmisc/propertyindex.h"
|
||||||
#include "blackmisc/propertyindexvariantmap.h"
|
|
||||||
#include "blackmisc/variant.h"
|
|
||||||
#include "blackmisc/verify.h"
|
|
||||||
#include "blackmisc/pq/length.h"
|
#include "blackmisc/pq/length.h"
|
||||||
#include "blackmisc/pq/pressure.h"
|
#include "blackmisc/pq/pressure.h"
|
||||||
#include "blackmisc/pq/frequency.h"
|
#include "blackmisc/pq/frequency.h"
|
||||||
@@ -25,6 +20,11 @@
|
|||||||
#include "blackmisc/pq/angle.h"
|
#include "blackmisc/pq/angle.h"
|
||||||
#include "blackmisc/pq/time.h"
|
#include "blackmisc/pq/time.h"
|
||||||
#include "blackmisc/pq/acceleration.h"
|
#include "blackmisc/pq/acceleration.h"
|
||||||
|
#include "blackmisc/propertyindexvariantmap.h"
|
||||||
|
#include "blackmisc/comparefunctions.h"
|
||||||
|
#include "blackmisc/dictionary.h"
|
||||||
|
#include "blackmisc/variant.h"
|
||||||
|
#include "blackmisc/verify.h"
|
||||||
|
|
||||||
#include <QCoreApplication>
|
#include <QCoreApplication>
|
||||||
#include <QDBusArgument>
|
#include <QDBusArgument>
|
||||||
|
|||||||
@@ -390,7 +390,7 @@ namespace BlackMisc
|
|||||||
return QStringLiteral("\"") % in % QStringLiteral("\"");
|
return QStringLiteral("\"") % in % QStringLiteral("\"");
|
||||||
}
|
}
|
||||||
|
|
||||||
QString withQUestionMark(const QString &question)
|
QString withQuestionMark(const QString &question)
|
||||||
{
|
{
|
||||||
if (question.endsWith("?")) { return question; }
|
if (question.endsWith("?")) { return question; }
|
||||||
return question % QStringLiteral("?");
|
return question % QStringLiteral("?");
|
||||||
|
|||||||
@@ -193,7 +193,7 @@ namespace BlackMisc
|
|||||||
BLACKMISC_EXPORT QString simplifyNameForSearch(const QString &name);
|
BLACKMISC_EXPORT QString simplifyNameForSearch(const QString &name);
|
||||||
|
|
||||||
//! Add a question mark at the end if not existing
|
//! Add a question mark at the end if not existing
|
||||||
BLACKMISC_EXPORT QString withQUestionMark(const QString &question);
|
BLACKMISC_EXPORT QString withQuestionMark(const QString &question);
|
||||||
|
|
||||||
//! Same as QDateTime::fromString but QDateTime will be set to UTC
|
//! Same as QDateTime::fromString but QDateTime will be set to UTC
|
||||||
//! \remark potentially slow, so only to be used when format is unknown
|
//! \remark potentially slow, so only to be used when format is unknown
|
||||||
|
|||||||
Reference in New Issue
Block a user