Formats minimally release source files based on former clang-format

This commit is contained in:
torsten committed 2026-10-14 13:28:01 +00:00
1 parent b662e4daf9
commit 5644914fe3
332 files changed
+3577 -4328

No files matched your search

@@ -1,11 +1,13 @@
// Stub GTest smoke test for coordTrans
#include <gtest/gtest.h>
TEST(CoordTransSmokeTest, StubTest) {
TEST(CoordTransSmokeTest, StubTest)
{
EXPECT_TRUE(true);
}
int main(int argc, char **argv) {
int main(int argc, char **argv)
{
::testing::InitGoogleTest(&argc, argv);
return RUN_ALL_TESTS();
}
@@ -6,9 +6,7 @@ class CoordTransSmokeTest : public QObject
Q_OBJECT
private slots:
void stubTest() {
QVERIFY(true);
}
void stubTest() { QVERIFY(true); }
};
QTEST_APPLESS_MAIN(CoordTransSmokeTest)
@@ -8,9 +8,11 @@
#include <QtCore/QPointF>
// Minimal stub to satisfy linker requirements
namespace LtsCoordTrans {
namespace LtsCoordTrans
{
// Placeholder types
struct UtmCoordinate {
struct UtmCoordinate
{
static UtmCoordinate fromMgrs(const QString &) { return UtmCoordinate(); }
QPointF geographic() const { return QPointF(); }
};
@@ -28,8 +28,7 @@ int main(int argc, char* argv[])
if (!f.open(QFile::ReadOnly))
{
printf("LtsAppDescriptorChecker: cannot open apps.json at %s: %s\n", appsJsonFilePath.toStdString().c_str(),
f.errorString().toStdString().c_str());
printf("LtsAppDescriptorChecker: cannot open apps.json at %s: %s\n", appsJsonFilePath.toStdString().c_str(), f.errorString().toStdString().c_str());
return -2;
}
@@ -38,12 +37,12 @@ int main(int argc, char* argv[])
QStringList lastErrors;
QStringList dummy1;
QString dummy2;
LtsAppDescriptor::AppDescriptionVector adv =
LtsAppDescriptor::LtsAppDescriptor::getAppDescriptionVector(f.readAll(), lastErrors, dummy1, dummy2);
LtsAppDescriptor::AppDescriptionVector adv = LtsAppDescriptor::LtsAppDescriptor::getAppDescriptionVector(f.readAll(), lastErrors, dummy1, dummy2);
if (!lastErrors.isEmpty())
{
printf("LtsAppDescriptorChecker: apps.json at %s invalid:\n%s\n", appsJsonFilePath.toStdString().c_str(),
printf("LtsAppDescriptorChecker: apps.json at %s invalid:\n%s\n",
appsJsonFilePath.toStdString().c_str(),
lastErrors.join(QStringLiteral("\r\n\r\n")).toStdString().c_str());
return 1;
}
@@ -107,8 +106,7 @@ int main(int argc, char* argv[])
{
if (!guiPluginIIDs.contains(pi.iid))
{
printf("LtsAppDescriptorChecker: apps.json at '%s' uses unknown IID '%s'\n",
appsJsonFilePath.toStdString().c_str(), pi.iid.toStdString().c_str());
printf("LtsAppDescriptorChecker: apps.json at '%s' uses unknown IID '%s'\n", appsJsonFilePath.toStdString().c_str(), pi.iid.toStdString().c_str());
ok = false;
}
}
@@ -34,9 +34,13 @@ static void addOptionToPlugin(QVector<PluginInfo>& pluginInfos, const PluginInfo
pluginInfos.append(pi);
}
static bool addOptionsToPlugin(AppDescription& appDesc, const QString& optionIdentifier,
const QStringList& ignoredPlugins, const QJsonObject& optionsObject,
const PluginInfo::Flag flag, QStringList& lastErrors, bool atLeastOnePluginNeeded)
static bool addOptionsToPlugin(AppDescription &appDesc,
const QString &optionIdentifier,
const QStringList &ignoredPlugins,
const QJsonObject &optionsObject,
const PluginInfo::Flag flag,
QStringList &lastErrors,
bool atLeastOnePluginNeeded)
{
bool hasPlugins = false;
auto optionsObjectIt = optionsObject.constFind(optionIdentifier);
@@ -57,8 +61,7 @@ static bool addOptionsToPlugin(AppDescription& appDesc, const QString& optionIde
if (atLeastOnePluginNeeded && !hasPlugins)
{
lastErrors.append(QCoreApplication::tr("No plugins specified for '%1' option for app '%2'")
.arg(optionIdentifier, appDesc.appName));
lastErrors.append(QCoreApplication::tr("No plugins specified for '%1' option for app '%2'").arg(optionIdentifier, appDesc.appName));
return false;
}
@@ -96,7 +99,8 @@ App LtsAppDescriptor::appFromInteger(int i)
return App::Login;
}
AppDescriptionVector LtsAppDescriptor::getAppDescriptionVector(const QByteArray& jsonDocument, QStringList& lastErrors,
AppDescriptionVector LtsAppDescriptor::getAppDescriptionVector(const QByteArray &jsonDocument,
QStringList &lastErrors,
const QStringList &ignoredPlugins,
QString &loginPluginIid)
{
@@ -129,10 +133,7 @@ AppDescriptionVector LtsAppDescriptor::getAppDescriptionVector(const QByteArray&
}
}
lastErrors.append(QCoreApplication::tr("JSON: %1<br>Row: %2, Column: %3")
.arg(parseError.errorString())
.arg(row + 1)
.arg(column + 1));
lastErrors.append(QCoreApplication::tr("JSON: %1<br>Row: %2, Column: %3").arg(parseError.errorString()).arg(row + 1).arg(column + 1));
return appDescriptions;
}
@@ -166,9 +167,7 @@ AppDescriptionVector LtsAppDescriptor::getAppDescriptionVector(const QByteArray&
{
if (valueActive.type() != QJsonValue::Type::Bool)
{
lastErrors.append(QCoreApplication::tr("App '%1': value App.Active is not a bool (%2)")
.arg(appDesc.appName)
.arg((int)valueActive.type()));
lastErrors.append(QCoreApplication::tr("App '%1': value App.Active is not a bool (%2)").arg(appDesc.appName).arg((int)valueActive.type()));
return appDescriptions;
}
}
@@ -177,9 +176,7 @@ AppDescriptionVector LtsAppDescriptor::getAppDescriptionVector(const QByteArray&
const QJsonValue valueVisible = appObject.value(QStringLiteral("Visible"));
if (!valueVisible.isUndefined() && valueVisible.type() != QJsonValue::Type::Bool)
{
lastErrors.append(QCoreApplication::tr("App '%1': value App.Visible is not a bool (%2)")
.arg(appDesc.appName)
.arg((int)valueVisible.type()));
lastErrors.append(QCoreApplication::tr("App '%1': value App.Visible is not a bool (%2)").arg(appDesc.appName).arg((int)valueVisible.type()));
return appDescriptions;
}
appDesc.visible = valueVisible.toBool(true);
@@ -190,12 +187,9 @@ AppDescriptionVector LtsAppDescriptor::getAppDescriptionVector(const QByteArray&
const QJsonObject optionsObject(appObject.value(QStringLiteral("Options")).toObject());
addOptionsToPlugin(appDesc, QStringLiteral("Payloads"), ignoredPlugins, optionsObject,
PluginInfo::Flag::PAYLOAD, lastErrors, false);
addOptionsToPlugin(appDesc, QStringLiteral("Actions"), ignoredPlugins, optionsObject, PluginInfo::Flag::ACTIONS,
lastErrors, true);
addOptionsToPlugin(appDesc, QStringLiteral("Main"), ignoredPlugins, optionsObject, PluginInfo::Flag::MAIN,
lastErrors, false);
addOptionsToPlugin(appDesc, QStringLiteral("Payloads"), ignoredPlugins, optionsObject, PluginInfo::Flag::PAYLOAD, lastErrors, false);
addOptionsToPlugin(appDesc, QStringLiteral("Actions"), ignoredPlugins, optionsObject, PluginInfo::Flag::ACTIONS, lastErrors, true);
addOptionsToPlugin(appDesc, QStringLiteral("Main"), ignoredPlugins, optionsObject, PluginInfo::Flag::MAIN, lastErrors, false);
appDescriptions.append(appDesc);
}
@@ -97,8 +97,10 @@ typedef QVector<AppDescription> AppDescriptionVector;
namespace LtsAppDescriptor // TODO: make qobject class singleton - for tr
{
LTSAPPDESCRIPTOR_EXPORT App appFromInteger(int i);
LTSAPPDESCRIPTOR_EXPORT AppDescriptionVector getAppDescriptionVector(const QByteArray &jsonDocument, QStringList &lastErrors,
const QStringList &ignoredPlugins, QString &loginPluginIid);
LTSAPPDESCRIPTOR_EXPORT AppDescriptionVector getAppDescriptionVector(const QByteArray &jsonDocument,
QStringList &lastErrors,
const QStringList &ignoredPlugins,
QString &loginPluginIid);
}
} // namespace LtsAppDescriptor
@@ -13,7 +13,9 @@
#include <QtWidgets/QLineEdit>
#include <QtWidgets/QPushButton>
LtsAppDescriptorEditor::LtsAppDescriptorEditor(QWidget* parent) : QWidget(parent), m_ui(new Ui_LtsAppDescriptionEditor)
LtsAppDescriptorEditor::LtsAppDescriptorEditor(QWidget *parent)
: QWidget(parent)
, m_ui(new Ui_LtsAppDescriptionEditor)
{
m_ui->setupUi(this);
m_vector = LtsAppDescriptor::AppDescriptionVector();
@@ -53,9 +55,8 @@ LtsAppDescriptorEditor::~LtsAppDescriptorEditor()
void LtsAppDescriptorEditor::getAppDescriptionVector()
{
m_fileName = QFileDialog::getOpenFileName(
this, tr("Open JSON"), QLatin1Literal("/shd/CTC/TOOLS/TDS/TDS-source/Lts/Projects/Legatus/resources/"),
tr("JSON File (*.json)"));
m_fileName =
QFileDialog::getOpenFileName(this, tr("Open JSON"), QLatin1Literal("/shd/CTC/TOOLS/TDS/TDS-source/Lts/Projects/Legatus/resources/"), tr("JSON File (*.json)"));
if (m_fileName.isEmpty())
return;
@@ -111,8 +112,7 @@ void LtsAppDescriptorEditor::onAppsClicked(const QModelIndex& index)
if (optionalFlag)
strFlags.append(QLatin1String("optional "));
pluginList << QString(type + QLatin1String(": ") + reqPlugin.iid + QLatin1String(" [ ") + strFlags +
QLatin1String("]"));
pluginList << QString(type + QLatin1String(": ") + reqPlugin.iid + QLatin1String(" [ ") + strFlags + QLatin1String("]"));
}
}
updatePluginModel(pluginList);
@@ -189,8 +189,7 @@ void LtsAppDescriptorEditor::pluginTypeChanged()
}
else
{
QMessageBox msgBox(QMessageBox::Information, tr("Error"),
tr("Plugin Type must either be \"gui\" or \"data\"."));
QMessageBox msgBox(QMessageBox::Information, tr("Error"), tr("Plugin Type must either be \"gui\" or \"data\"."));
msgBox.exec();
m_ui->lePluginType->setText(QString());
}
@@ -215,8 +214,7 @@ void LtsAppDescriptorEditor::onAppAddClicked()
if (appList.contains(m_ui->leAppName->text(), Qt::CaseInsensitive))
{
QMessageBox msgBox(QMessageBox::Critical, tr("Error"),
tr("There already exists an app named \"%1\".").arg(m_ui->leAppName->text()));
QMessageBox msgBox(QMessageBox::Critical, tr("Error"), tr("There already exists an app named \"%1\".").arg(m_ui->leAppName->text()));
msgBox.exec();
return;
}
@@ -254,8 +252,7 @@ void LtsAppDescriptorEditor::onPluginAddClicked()
if (pluginList.contains(m_ui->lePluginName->text(), Qt::CaseInsensitive))
{
QMessageBox msgBox(QMessageBox::Critical, tr("Error"),
tr("There already exists an plugin named \"%1\".").arg(m_ui->lePluginName->text()));
QMessageBox msgBox(QMessageBox::Critical, tr("Error"), tr("There already exists an plugin named \"%1\".").arg(m_ui->lePluginName->text()));
msgBox.exec();
return;
}
@@ -293,8 +290,10 @@ void LtsAppDescriptorEditor::onAppDeleteClicked()
QMessageBox msgBox(tr("Warning"),
tr("The App \n\"%1\" \nwill be removed. Continue?").arg(m_appIndex.data().toString()),
QMessageBox::Warning, QMessageBox::Yes | QMessageBox::Default,
QMessageBox::No | QMessageBox::Escape, QMessageBox::NoButton);
QMessageBox::Warning,
QMessageBox::Yes | QMessageBox::Default,
QMessageBox::No | QMessageBox::Escape,
QMessageBox::NoButton);
if (msgBox.exec() == QMessageBox::No)
return;
@@ -313,8 +312,10 @@ void LtsAppDescriptorEditor::onPluginDeletedClicked()
QMessageBox msgBox(tr("Warning"),
tr("The Plugin \n\"%1\" \nwill be removed. Continue?").arg(m_pluginIndex.data().toString()),
QMessageBox::Warning, QMessageBox::Yes | QMessageBox::Default,
QMessageBox::No | QMessageBox::Escape, QMessageBox::NoButton);
QMessageBox::Warning,
QMessageBox::Yes | QMessageBox::Default,
QMessageBox::No | QMessageBox::Escape,
QMessageBox::NoButton);
if (msgBox.exec() == QMessageBox::No)
return;
@@ -354,27 +355,20 @@ void LtsAppDescriptorEditor::onUpdateClicked()
m_vector[m_appIndex.row()].requiredPlugins[m_pluginIndex.row()].iid = m_ui->lePluginName->text();
if (m_ui->lePluginType->text() == QLatin1String("gui"))
m_vector[m_appIndex.row()].requiredPlugins[m_pluginIndex.row()].type =
LtsAppDescriptor::PluginInfo::PluginType::GUI;
m_vector[m_appIndex.row()].requiredPlugins[m_pluginIndex.row()].type = LtsAppDescriptor::PluginInfo::PluginType::GUI;
else if (m_ui->lePluginType->text() == QLatin1String("data"))
m_vector[m_appIndex.row()].requiredPlugins[m_pluginIndex.row()].type =
LtsAppDescriptor::PluginInfo::PluginType::DATA;
m_vector[m_appIndex.row()].requiredPlugins[m_pluginIndex.row()].type = LtsAppDescriptor::PluginInfo::PluginType::DATA;
else
m_vector[m_appIndex.row()].requiredPlugins[m_pluginIndex.row()].type =
LtsAppDescriptor::PluginInfo::PluginType::UNKNOWN;
m_vector[m_appIndex.row()].requiredPlugins[m_pluginIndex.row()].type = LtsAppDescriptor::PluginInfo::PluginType::UNKNOWN;
m_vector[m_appIndex.row()].requiredPlugins[m_pluginIndex.row()].flags =
QFlags<LtsAppDescriptor::PluginInfo::Flag>();
m_vector[m_appIndex.row()].requiredPlugins[m_pluginIndex.row()].flags = QFlags<LtsAppDescriptor::PluginInfo::Flag>();
if (m_ui->chbActions->isChecked())
m_vector[m_appIndex.row()].requiredPlugins[m_pluginIndex.row()].flags |=
LtsAppDescriptor::PluginInfo::Flag::ACTIONS;
m_vector[m_appIndex.row()].requiredPlugins[m_pluginIndex.row()].flags |= LtsAppDescriptor::PluginInfo::Flag::ACTIONS;
if (m_ui->chbMain->isChecked())
m_vector[m_appIndex.row()].requiredPlugins[m_pluginIndex.row()].flags |=
LtsAppDescriptor::PluginInfo::Flag::MAIN;
m_vector[m_appIndex.row()].requiredPlugins[m_pluginIndex.row()].flags |= LtsAppDescriptor::PluginInfo::Flag::MAIN;
if (m_ui->chbPayload->isChecked())
m_vector[m_appIndex.row()].requiredPlugins[m_pluginIndex.row()].flags |=
LtsAppDescriptor::PluginInfo::Flag::PAYLOAD;
m_vector[m_appIndex.row()].requiredPlugins[m_pluginIndex.row()].flags |= LtsAppDescriptor::PluginInfo::Flag::PAYLOAD;
onAppsClicked(m_appIndex);
onNewpluginClicked();
@@ -454,9 +448,12 @@ void LtsAppDescriptorEditor::checkSave()
{
if (m_changed)
{
QMessageBox msgBox(tr("Warning"), tr("The Data has been modified.\nDo you want to save your changes?"),
QMessageBox::Warning, QMessageBox::Yes | QMessageBox::Default,
QMessageBox::No | QMessageBox::Escape, QMessageBox::NoButton);
QMessageBox msgBox(tr("Warning"),
tr("The Data has been modified.\nDo you want to save your changes?"),
QMessageBox::Warning,
QMessageBox::Yes | QMessageBox::Default,
QMessageBox::No | QMessageBox::Escape,
QMessageBox::NoButton);
if (msgBox.exec() == QMessageBox::Yes)
onSaveAsClicked();
@@ -465,9 +462,8 @@ void LtsAppDescriptorEditor::checkSave()
void LtsAppDescriptorEditor::onSaveAsClicked()
{
QString fileName = QFileDialog::getSaveFileName(
this, tr("Save JSON"), QLatin1Literal("/shd/CTC/TOOLS/TDS/TDS-source/Lts/Projects/Legatus/resources/"),
tr("JSON File (*.json)"));
QString fileName =
QFileDialog::getSaveFileName(this, tr("Save JSON"), QLatin1Literal("/shd/CTC/TOOLS/TDS/TDS-source/Lts/Projects/Legatus/resources/"), tr("JSON File (*.json)"));
if (fileName.isEmpty())
return;
@@ -13,7 +13,8 @@ namespace LtsCommandLineParser
static constexpr int s_maxDomainId = 232;
LtsCommandLineParser::LtsCommandLineParser(ProvideCommandLineParameterOptions opts)
: QCommandLineParser(), m_enabledOptions(opts)
: QCommandLineParser()
, m_enabledOptions(opts)
{
if (NGL::isAppInBuildBasePath() || m_enabledOptions.testFlag(CreateDomainIdFromIp))
{
@@ -45,18 +46,12 @@ LtsCommandLineParser::LtsCommandLineParser(ProvideCommandLineParameterOptions op
if (m_enabledOptions.testFlag(CustomConfigFile))
{
const QString cf(NGL::findProjectConfigFile());
addOption({{QStringLiteral("i"), QStringLiteral("ini")},
QStringLiteral("Default: ") + cf,
QStringLiteral("filename"),
cf});
addOption({{QStringLiteral("i"), QStringLiteral("ini")}, QStringLiteral("Default: ") + cf, QStringLiteral("filename"), cf});
}
if (m_enabledOptions.testFlag(TcpConnectionUrl))
{
const QString defaultTcpUrl(QStringLiteral("EXCTDS01:7400"));
addOption({{QStringLiteral("t"), QStringLiteral("tcpurl")},
QStringLiteral("Default: ") + defaultTcpUrl,
QStringLiteral("hostname:port"),
defaultTcpUrl});
addOption({{QStringLiteral("t"), QStringLiteral("tcpurl")}, QStringLiteral("Default: ") + defaultTcpUrl, QStringLiteral("hostname:port"), defaultTcpUrl});
}
addHelpOption();
@@ -13,7 +13,8 @@ namespace LtsCommandLineParser
class LTSCOMMANDLINEPARSER_EXPORT LtsCommandLineParser : public QCommandLineParser
{
public:
enum ProvideCommandLineParameterOptions {
enum ProvideCommandLineParameterOptions
{
None = 0x0000,
CreateDomainIdFromIp = 0x0001,
DomainId = 0x0002,
@@ -23,21 +24,15 @@ class LTSCOMMANDLINEPARSER_EXPORT LtsCommandLineParser : public QCommandLinePars
NoVersion = 0x0020
};
explicit LtsCommandLineParser(ProvideCommandLineParameterOptions opts = ProvideCommandLineParameterOptions(
CreateDomainIdFromIp | DomainId | ExerciseId | CustomConfigFile));
explicit LtsCommandLineParser(ProvideCommandLineParameterOptions opts = ProvideCommandLineParameterOptions(CreateDomainIdFromIp | DomainId | ExerciseId |
CustomConfigFile));
virtual ~LtsCommandLineParser() = default;
int domainId() const;
void setDomainId(int id);
int exerciseId() const
{
return m_exerciseId;
}
int exerciseId() const { return m_exerciseId; }
QString iniFile() const
{
return m_iniFile;
}
QString iniFile() const { return m_iniFile; }
bool iniFileSet() const;
bool useTcpConnection() const;
@@ -48,10 +43,7 @@ class LTSCOMMANDLINEPARSER_EXPORT LtsCommandLineParser : public QCommandLinePars
bool domainIdProvided() const;
bool exerciseIdProvided() const;
void setUnitModuleTestMode(bool onOff)
{
m_unitModuleTestMode = onOff;
}
void setUnitModuleTestMode(bool onOff) { m_unitModuleTestMode = onOff; }
protected:
QString m_additionalHelpStr;
@@ -58,7 +58,17 @@ int main(int argc, char** argv)
part3 = mgrs.substr(5, prec);
part4 = mgrs.substr(5 + prec, prec);
}
fprintf(stdout, "%13.10f, %13.10f = %s %s %s %s (UTM: %d %.2f, %.2f %c)\n", lon, lat, part1.c_str(), part2.c_str(),
part3.c_str(), part4.c_str(), zone, x, y, northp ? 'N' : 'S');
fprintf(stdout,
"%13.10f, %13.10f = %s %s %s %s (UTM: %d %.2f, %.2f %c)\n",
lon,
lat,
part1.c_str(),
part2.c_str(),
part3.c_str(),
part4.c_str(),
zone,
x,
y,
northp ? 'N' : 'S');
return 0;
}
@@ -72,8 +72,7 @@ QString UtmCoordinate::mgrs(int prec, bool withSpaces) const
ret = QString::fromLatin1(ptr, 3) + QLatin1Char(' ') + QString::fromLatin1(ptr + 3, 2);
if (prec > 0)
{
ret += QLatin1Char(' ') + QString::fromLatin1(ptr + 5, prec) + QLatin1Char(' ') +
QString::fromLatin1(ptr + 5 + prec, prec);
ret += QLatin1Char(' ') + QString::fromLatin1(ptr + 5, prec) + QLatin1Char(' ') + QString::fromLatin1(ptr + 5 + prec, prec);
}
}
else
@@ -96,8 +95,7 @@ QPointF UtmCoordinate::geographic(double offsetX, double offsetY) const
}
catch (const std::exception &e)
{
fprintf(stderr, "Error while calculating geographic from utm %d, %9.6f, %9.6f: %s\n", zone, x + offsetX,
y + offsetY, e.what());
fprintf(stderr, "Error while calculating geographic from utm %d, %9.6f, %9.6f: %s\n", zone, x + offsetX, y + offsetY, e.what());
ret = QPointF();
}
return ret * deg2rad();
@@ -217,8 +215,7 @@ QRectF addMarginToArea(const QRectF& rect_LatLon_radiant, const QSize& marginMet
return res;
}
QVector<UtmCoordinate> getMgrsSquares(const QRectF& rect, bool setAsDefaultSquares, bool setAsPreferedSquare,
bool setAsSquareWithMargin)
QVector<UtmCoordinate> getMgrsSquares(const QRectF &rect, bool setAsDefaultSquares, bool setAsPreferedSquare, bool setAsSquareWithMargin)
{
QVector<UtmCoordinate> ret = getMgrsSquaresInternal(rect);
@@ -393,25 +390,18 @@ double squareDistance(const QPointF& p1, const QPointF& p2)
std::ostream &operator<<(std::ostream &stream, const UtmCoordinate &coord)
{
stream << "UtmCoordinate(" << std::setprecision(8) << coord.x << "#" << std::setprecision(8) << coord.y
<< " zone=" << coord.zone << ")";
stream << "UtmCoordinate(" << std::setprecision(8) << coord.x << "#" << std::setprecision(8) << coord.y << " zone=" << coord.zone << ")";
return stream;
}
void dumpConversionCounter()
{
fprintf(stderr, "LtsCoordTrans: s_conversion_counter_MGRS_Forward : - mgrs : %ld\n",
s_conversion_counter_MGRS_Forward);
fprintf(stderr, "LtsCoordTrans: s_conversion_counter_MGRS_Reverse - fromMgrs : %ld\n",
s_conversion_counter_MGRS_Reverse);
fprintf(stderr, "LtsCoordTrans: s_conversion_counter_WGS84_Forward - lonLatAltToGeocentric : %ld\n",
s_conversion_counter_WGS84_Forward);
fprintf(stderr, "LtsCoordTrans: s_conversion_counter_WGS84_Reverse - geocentric2LonLatAlt : %ld\n",
s_conversion_counter_WGS84_Reverse);
fprintf(stderr, "LtsCoordTrans: s_conversion_counter_UTMUPS_Forward - fromGeographic : %ld\n",
s_conversion_counter_UTMUPS_Forward);
fprintf(stderr, "LtsCoordTrans: s_conversion_counter_UTMUPS_Reverse - geographic : %ld\n",
s_conversion_counter_UTMUPS_Reverse);
fprintf(stderr, "LtsCoordTrans: s_conversion_counter_MGRS_Forward : - mgrs : %ld\n", s_conversion_counter_MGRS_Forward);
fprintf(stderr, "LtsCoordTrans: s_conversion_counter_MGRS_Reverse - fromMgrs : %ld\n", s_conversion_counter_MGRS_Reverse);
fprintf(stderr, "LtsCoordTrans: s_conversion_counter_WGS84_Forward - lonLatAltToGeocentric : %ld\n", s_conversion_counter_WGS84_Forward);
fprintf(stderr, "LtsCoordTrans: s_conversion_counter_WGS84_Reverse - geocentric2LonLatAlt : %ld\n", s_conversion_counter_WGS84_Reverse);
fprintf(stderr, "LtsCoordTrans: s_conversion_counter_UTMUPS_Forward - fromGeographic : %ld\n", s_conversion_counter_UTMUPS_Forward);
fprintf(stderr, "LtsCoordTrans: s_conversion_counter_UTMUPS_Reverse - geographic : %ld\n", s_conversion_counter_UTMUPS_Reverse);
}
long getConversionCounter_MGRS_Forward()
@@ -38,13 +38,16 @@ struct LTSCOORDTRANS_EXPORT UtmCoordinate
UtmCoordinate() = default;
UtmCoordinate(int zone_, double x_, double y_, bool northp_ = true) : zone(zone_), northp(northp_), x(x_), y(y_) {}
bool isValid() const
UtmCoordinate(int zone_, double x_, double y_, bool northp_ = true)
: zone(zone_)
, northp(northp_)
, x(x_)
, y(y_)
{
return zone > 0 && zone <= 60;
}
bool isValid() const { return zone > 0 && zone <= 60; }
QString mgrs(int prec = 5, bool withSpaces = true) const;
QPointF toPoint() const;
@@ -68,9 +71,7 @@ LTSCOORDTRANS_EXPORT QPointF geographicFromMgrs(const QString& mgrs);
LTSCOORDTRANS_EXPORT QRectF addMarginToArea(const QRectF &rect_LatLon_radiant, const QSize &marginMeter);
LTSCOORDTRANS_EXPORT QVector<UtmCoordinate> getMgrsSquares(const QRectF& rect, bool setAsDefaultSquares,
bool setAsPreferedSquare,
bool setAsSquareWithMargin = false);
LTSCOORDTRANS_EXPORT QVector<UtmCoordinate> getMgrsSquares(const QRectF &rect, bool setAsDefaultSquares, bool setAsPreferedSquare, bool setAsSquareWithMargin = false);
QVector<UtmCoordinate> getMgrsSquaresInternal(const QRectF &rect);
@@ -84,11 +85,9 @@ LTSCOORDTRANS_EXPORT QVector<UtmCoordinate> defaultMgrsSquares();
LTSCOORDTRANS_EXPORT UtmCoordinate preferedMgrsSquare();
LTSCOORDTRANS_EXPORT bool lonLatAltToGeocentric(double lon, double lat, double altitude, double& xOut, double& yOut,
double& zOut);
LTSCOORDTRANS_EXPORT bool lonLatAltToGeocentric(double lon, double lat, double altitude, double &xOut, double &yOut, double &zOut);
LTSCOORDTRANS_EXPORT bool geocentric2LonLatAlt(double x, double y, double z, double& lon, double& lat,
double& altitude);
LTSCOORDTRANS_EXPORT bool geocentric2LonLatAlt(double x, double y, double z, double &lon, double &lat, double &altitude);
inline double squareDistance(const UtmCoordinate &p1, const UtmCoordinate &p2)
{
@@ -153,12 +152,10 @@ class LTSCOORDTRANS_EXPORT UtmCoordinate3D : public LtsCoordTrans::UtmCoordinate
using BaseClass = LtsCoordTrans::UtmCoordinate;
public:
UtmCoordinate3D()
{
reset();
}
UtmCoordinate3D() { reset(); }
explicit UtmCoordinate3D(const LtsCoordTrans::UtmCoordinate& utm2d, double _zValue = std::nan("")) : BaseClass()
explicit UtmCoordinate3D(const LtsCoordTrans::UtmCoordinate &utm2d, double _zValue = std::nan(""))
: BaseClass()
{
zone = utm2d.zone;
northp = utm2d.northp;
@@ -177,10 +174,7 @@ class LTSCOORDTRANS_EXPORT UtmCoordinate3D : public LtsCoordTrans::UtmCoordinate
zValue = std::nan("");
}
double z() const
{
return zValue;
}
double z() const { return zValue; }
protected:
double zValue{std::nan("")};
@@ -77,8 +77,7 @@ void coordtrans_test::testRelativeMetricalOffet()
QFETCH(QPoint, offset);
QFETCH(QString, correctMgrs);
const LtsCoordTrans::UtmCoordinate& utmRef =
LtsCoordTrans::UtmCoordinate::fromMgrs(QStringLiteral("32U PD 99990 99990"));
const LtsCoordTrans::UtmCoordinate &utmRef = LtsCoordTrans::UtmCoordinate::fromMgrs(QStringLiteral("32U PD 99990 99990"));
qDebug() << "utmRef = " << utmRef.mgrs();
{
@@ -103,8 +102,7 @@ QRectF createArea(const QString& base, int xCenter, int yCenter, int width, int
{
QRectF areaRect = QRectF(xCenter - width / 2, yCenter - height / 2, width, height);
LtsCoordTrans::UtmCoordinate utmBase(
LtsCoordTrans::UtmCoordinate::fromGeographic(LtsCoordTrans::geographicFromMgrs(base)));
LtsCoordTrans::UtmCoordinate utmBase(LtsCoordTrans::UtmCoordinate::fromGeographic(LtsCoordTrans::geographicFromMgrs(base)));
const QPointF topLeft(utmBase.geographic(areaRect.left(), areaRect.top()));
const QPointF bottomRight(utmBase.geographic(areaRect.right(), areaRect.bottom()));
@@ -120,13 +118,10 @@ void coordtrans_test::testAddMarginToArea()
QRectF area = createArea(QStringLiteral("32U PD 0000000000"), 50000, 10000, 30000, 30000);
QRectF area1Increased = LtsCoordTrans::addMarginToArea(area, QSize(5000, 20000));
qDebug() << "topLeft : " << qSetRealNumberPrecision(15) << area.topLeft()
<< " - degree:" << area.topLeft() * LtsCoordTrans::rad2deg();
qDebug() << "topLeftInc : " << qSetRealNumberPrecision(15) << area1Increased.topLeft()
<< " - degree:" << area1Increased.topLeft() * LtsCoordTrans::rad2deg();
qDebug() << "topLeft : " << qSetRealNumberPrecision(15) << area.topLeft() << " - degree:" << area.topLeft() * LtsCoordTrans::rad2deg();
qDebug() << "topLeftInc : " << qSetRealNumberPrecision(15) << area1Increased.topLeft() << " - degree:" << area1Increased.topLeft() * LtsCoordTrans::rad2deg();
qDebug() << "bottomRight : " << qSetRealNumberPrecision(15) << area.bottomRight()
<< " - degree:" << area.bottomRight() * LtsCoordTrans::rad2deg();
qDebug() << "bottomRight : " << qSetRealNumberPrecision(15) << area.bottomRight() << " - degree:" << area.bottomRight() * LtsCoordTrans::rad2deg();
qDebug() << "bottomRightInc : " << qSetRealNumberPrecision(15) << area1Increased.bottomRight()
<< " - degree:" << area1Increased.bottomRight() * LtsCoordTrans::rad2deg();
@@ -142,13 +137,10 @@ void coordtrans_test::testAddMarginToArea()
QRectF area = createArea(QStringLiteral("32U LA 0000000000"), 100, 100, 5000, 5000);
QRectF area1Increased = LtsCoordTrans::addMarginToArea(area, QSize(50000, 20000));
qDebug() << "topLeft : " << qSetRealNumberPrecision(15) << area.topLeft()
<< " - degree:" << area.topLeft() * LtsCoordTrans::rad2deg();
qDebug() << "topLeftInc : " << qSetRealNumberPrecision(15) << area1Increased.topLeft()
<< " - degree:" << area1Increased.topLeft() * LtsCoordTrans::rad2deg();
qDebug() << "topLeft : " << qSetRealNumberPrecision(15) << area.topLeft() << " - degree:" << area.topLeft() * LtsCoordTrans::rad2deg();
qDebug() << "topLeftInc : " << qSetRealNumberPrecision(15) << area1Increased.topLeft() << " - degree:" << area1Increased.topLeft() * LtsCoordTrans::rad2deg();
qDebug() << "bottomRight : " << qSetRealNumberPrecision(15) << area.bottomRight()
<< " - degree:" << area.bottomRight() * LtsCoordTrans::rad2deg();
qDebug() << "bottomRight : " << qSetRealNumberPrecision(15) << area.bottomRight() << " - degree:" << area.bottomRight() * LtsCoordTrans::rad2deg();
qDebug() << "bottomRightInc : " << qSetRealNumberPrecision(15) << area1Increased.bottomRight()
<< " - degree:" << area1Increased.bottomRight() * LtsCoordTrans::rad2deg();
@@ -167,8 +159,7 @@ void coordtrans_test::testIncreaseRect()
QString mgrs = LtsCoordTrans::mgrsFromGeographic(lonlat.x(), lonlat.y(), 9);
QCOMPARE(mgrs, QStringLiteral("32U MD 745000000 840000000"));
const LtsCoordTrans::UtmCoordinate centerPoint =
LtsCoordTrans::UtmCoordinate::fromGeographic(lonlat.x(), lonlat.y());
const LtsCoordTrans::UtmCoordinate centerPoint = LtsCoordTrans::UtmCoordinate::fromGeographic(lonlat.x(), lonlat.y());
LtsCoordTrans::UtmCoordinate topLeftUtm;
LtsCoordTrans::UtmCoordinate topLeftUtm2;
@@ -178,11 +169,9 @@ void coordtrans_test::testIncreaseRect()
QPointF bottomRightGeo = centerPoint.geographic(3000, -4000);
topLeftUtm = LtsCoordTrans::UtmCoordinate::fromGeographic(topLeftGeo);
const LtsCoordTrans::UtmCoordinate bottomRightUtm =
LtsCoordTrans::UtmCoordinate::fromGeographic(bottomRightGeo);
const LtsCoordTrans::UtmCoordinate bottomRightUtm = LtsCoordTrans::UtmCoordinate::fromGeographic(bottomRightGeo);
qDebug() << "topLeftUtm: " << topLeftUtm.x << " - " << qSetRealNumberPrecision(15) << topLeftUtm.y;
qDebug() << "bottomRightUtm: " << bottomRightUtm.x << " - " << qSetRealNumberPrecision(15)
<< bottomRightUtm.y;
qDebug() << "bottomRightUtm: " << bottomRightUtm.x << " - " << qSetRealNumberPrecision(15) << bottomRightUtm.y;
}
{
@@ -194,8 +183,7 @@ void coordtrans_test::testIncreaseRect()
bottomRightUtm2.y = centerPoint.y - 4000;
qDebug() << "topLeftUtm2: " << topLeftUtm2.x << " - " << qSetRealNumberPrecision(15) << topLeftUtm2.y;
qDebug() << "bottomRightUtm2: " << bottomRightUtm2.x << " - " << qSetRealNumberPrecision(15)
<< bottomRightUtm2.y;
qDebug() << "bottomRightUtm2: " << bottomRightUtm2.x << " - " << qSetRealNumberPrecision(15) << bottomRightUtm2.y;
}
QVERIFY2(qFuzzyCompare(topLeftUtm.x, topLeftUtm2.x), "testIncreaseRect x failed");
@@ -213,8 +201,7 @@ void coordtrans_test::testIncreaseRect2()
QRectF myRectIncreased;
{
const LtsCoordTrans::UtmCoordinate centerPoint =
LtsCoordTrans::UtmCoordinate::fromGeographic(lonlat.x(), lonlat.y());
const LtsCoordTrans::UtmCoordinate centerPoint = LtsCoordTrans::UtmCoordinate::fromGeographic(lonlat.x(), lonlat.y());
QPointF topLeftGeo = centerPoint.geographic(-3000, 2000);
QPointF bottomRightGeo = centerPoint.geographic(3000, -2000);
@@ -239,10 +226,8 @@ void coordtrans_test::testIncreaseRect2()
qDebug() << "myRectIncreased height: " << myRectIncreased.height();
}
QVERIFY2((int)(myRectIncreased.center().x() * 10000) == (int)(myRect.center().x() * 10000),
"testIncreaseRect2 centerX failed");
QVERIFY2((int)(myRectIncreased.center().y() * 10000) == (int)(myRect.center().y() * 10000),
"testIncreaseRect2 centerY failed");
QVERIFY2((int)(myRectIncreased.center().x() * 10000) == (int)(myRect.center().x() * 10000), "testIncreaseRect2 centerX failed");
QVERIFY2((int)(myRectIncreased.center().y() * 10000) == (int)(myRect.center().y() * 10000), "testIncreaseRect2 centerY failed");
QVERIFY2(myRectIncreased.width() > myRect.width(), "testIncreaseRect2 width failed");
QVERIFY2(myRectIncreased.height() > myRect.height(), "testIncreaseRect2 height failed");
@@ -260,50 +245,84 @@ void coordtrans_test::testGeographicFromMgrs()
void coordtrans_test::testMgrsSquares()
{
checkArea(QStringLiteral("32U PD 0000000000"), 50000, 10000, 30000, 30000,
{QStringLiteral("32U PC"), QStringLiteral("32U PD")});
checkArea(QStringLiteral("32U MD 0000000000"), 50000, 10000, 30000, 30000,
{QStringLiteral("32U MC"), QStringLiteral("32U MD")});
checkArea(QStringLiteral("32U MD 0000000000"), 89999, 89999, 21000, 21000,
checkArea(QStringLiteral("32U PD 0000000000"), 50000, 10000, 30000, 30000, {QStringLiteral("32U PC"), QStringLiteral("32U PD")});
checkArea(QStringLiteral("32U MD 0000000000"), 50000, 10000, 30000, 30000, {QStringLiteral("32U MC"), QStringLiteral("32U MD")});
checkArea(QStringLiteral("32U MD 0000000000"),
89999,
89999,
21000,
21000,
{QStringLiteral("32U MD"), QStringLiteral("32U ME"), QStringLiteral("32U ND"), QStringLiteral("32U NE")});
checkArea(QStringLiteral("39Q XG 0000000000"), 40000, 35000, 60000, 70000,
{QStringLiteral("39Q XG"), QStringLiteral("39R XG")});
checkArea(QStringLiteral("39Q XG 0000000000"), 40000, 35000, 60000, 70000, {QStringLiteral("39Q XG"), QStringLiteral("39R XG")});
checkArea(QStringLiteral("40R CP 0000000000"), 94000, 9000, 7000, 16000, {QStringLiteral("40R CP")});
checkArea(QStringLiteral("40R DN 0000000000"), 500, 95500, 12000, 7000,
{QStringLiteral("40R CN"), QStringLiteral("40R DN")});
checkArea(QStringLiteral("40R DN 0000000000"), 500, 96760, 30000, 30000,
checkArea(QStringLiteral("40R DN 0000000000"), 500, 95500, 12000, 7000, {QStringLiteral("40R CN"), QStringLiteral("40R DN")});
checkArea(QStringLiteral("40R DN 0000000000"),
500,
96760,
30000,
30000,
{QStringLiteral("40R CN"), QStringLiteral("40R CP"), QStringLiteral("40R DN"), QStringLiteral("40R DP")});
checkArea(QStringLiteral("40R BM 0000000000"), 59000, 59500, 46000, 40000,
{QStringLiteral("40Q BM"), QStringLiteral("40R BM")});
checkArea(QStringLiteral("40R BM 0000000000"), 59000, 59500, 46000, 40000, {QStringLiteral("40Q BM"), QStringLiteral("40R BM")});
checkArea(QStringLiteral("32U LA 0000000000"), 10000, 10000, 5000, 5000,
checkArea(QStringLiteral("32U LA 0000000000"),
10000,
10000,
5000,
5000,
{
QStringLiteral("32U LA"),
});
checkArea(QStringLiteral("32U LA 0000000000"), 100, 100, 60000, 60000,
{QStringLiteral("31U GQ"), QStringLiteral("31U GR"), QStringLiteral("32U KA"), QStringLiteral("32U KV"),
QStringLiteral("32U LA"), QStringLiteral("32U LV")});
checkArea(QStringLiteral("32U LA 0000000000"),
100,
100,
60000,
60000,
{QStringLiteral("31U GQ"), QStringLiteral("31U GR"), QStringLiteral("32U KA"), QStringLiteral("32U KV"), QStringLiteral("32U LA"), QStringLiteral("32U LV")});
checkArea(QStringLiteral("32U LA 0000000000"), 100, 100, 150000, 150000,
{QStringLiteral("31U FQ"), QStringLiteral("31U FR"), QStringLiteral("31U GQ"), QStringLiteral("31U GR"),
QStringLiteral("32U KA"), QStringLiteral("32U KV"), QStringLiteral("32U LA"), QStringLiteral("32U LV")});
checkArea(QStringLiteral("32U LA 0000000000"),
100,
100,
150000,
150000,
{QStringLiteral("31U FQ"),
QStringLiteral("31U FR"),
QStringLiteral("31U GQ"),
QStringLiteral("31U GR"),
QStringLiteral("32U KA"),
QStringLiteral("32U KV"),
QStringLiteral("32U LA"),
QStringLiteral("32U LV")});
checkArea(QStringLiteral("32U LA 0000000000"), 100, 100, 200000, 200000,
{QStringLiteral("31U FP"), QStringLiteral("31U FQ"), QStringLiteral("31U FR"), QStringLiteral("31U GP"),
QStringLiteral("31U GQ"), QStringLiteral("31U GR"), QStringLiteral("31U GS"), QStringLiteral("32U KA"),
QStringLiteral("32U KB"), QStringLiteral("32U KV"), QStringLiteral("32U LA"), QStringLiteral("32U LB"),
QStringLiteral("32U LV"), QStringLiteral("32U MA"), QStringLiteral("32U MB"), QStringLiteral("32U MV")});
checkArea(QStringLiteral("32U LA 0000000000"),
100,
100,
200000,
200000,
{QStringLiteral("31U FP"),
QStringLiteral("31U FQ"),
QStringLiteral("31U FR"),
QStringLiteral("31U GP"),
QStringLiteral("31U GQ"),
QStringLiteral("31U GR"),
QStringLiteral("31U GS"),
QStringLiteral("32U KA"),
QStringLiteral("32U KB"),
QStringLiteral("32U KV"),
QStringLiteral("32U LA"),
QStringLiteral("32U LB"),
QStringLiteral("32U LV"),
QStringLiteral("32U MA"),
QStringLiteral("32U MB"),
QStringLiteral("32U MV")});
}
QVector<LtsCoordTrans::UtmCoordinate> checkAreaGetMgrsSquares(const QString& base, int xCenter, int yCenter, int width,
int height)
QVector<LtsCoordTrans::UtmCoordinate> checkAreaGetMgrsSquares(const QString &base, int xCenter, int yCenter, int width, int height)
{
QRectF areaRect = QRectF(xCenter - width / 2, yCenter - height / 2, width, height);
LtsCoordTrans::UtmCoordinate utmBase(
LtsCoordTrans::UtmCoordinate::fromGeographic(LtsCoordTrans::geographicFromMgrs(base)));
LtsCoordTrans::UtmCoordinate utmBase(LtsCoordTrans::UtmCoordinate::fromGeographic(LtsCoordTrans::geographicFromMgrs(base)));
const QPointF topLeft(utmBase.geographic(areaRect.left(), areaRect.top()));
const QPointF bottomRight(utmBase.geographic(areaRect.right(), areaRect.bottom()));
@@ -323,20 +342,17 @@ void coordtrans_test::testMgrsSquaresWithSurrounding()
int initialSize = 5000;
QVector<LtsCoordTrans::UtmCoordinate> squares1 =
checkAreaGetMgrsSquares(QStringLiteral("32U NC 0000000000"), 50000, 50000, initialSize, initialSize);
QVector<LtsCoordTrans::UtmCoordinate> squares1 = checkAreaGetMgrsSquares(QStringLiteral("32U NC 0000000000"), 50000, 50000, initialSize, initialSize);
QVERIFY2(squares1.size() == 1, "checkAreaGetMgrsSquares failed");
int biggerSize = initialSize + (1 * 110000);
QVector<LtsCoordTrans::UtmCoordinate> squares9 =
checkAreaGetMgrsSquares(QStringLiteral("32U NC 0000000000"), 50000, 50000, biggerSize, biggerSize);
QVector<LtsCoordTrans::UtmCoordinate> squares9 = checkAreaGetMgrsSquares(QStringLiteral("32U NC 0000000000"), 50000, 50000, biggerSize, biggerSize);
QVERIFY2(squares9.size() == 9, "checkAreaGetMgrsSquares biggerSize failed");
int muchBiggerSize = initialSize + (3 * 110000);
QVector<LtsCoordTrans::UtmCoordinate> square33 =
checkAreaGetMgrsSquares(QStringLiteral("32U NC 0000000000"), 50000, 50000, muchBiggerSize, muchBiggerSize);
QVector<LtsCoordTrans::UtmCoordinate> square33 = checkAreaGetMgrsSquares(QStringLiteral("32U NC 0000000000"), 50000, 50000, muchBiggerSize, muchBiggerSize);
QVERIFY2(square33.size() == 33, "checkAreaGetMgrsSquares muchBiggerSize failed");
@@ -376,13 +392,11 @@ void coordtrans_test::testMgrsSquaresWithSurrounding()
}
}
void coordtrans_test::checkArea(const QString& base, int xCenter, int yCenter, int width, int height,
const QStringList& coords)
void coordtrans_test::checkArea(const QString &base, int xCenter, int yCenter, int width, int height, const QStringList &coords)
{
qDebug() << "checkArea : base: " << base;
QRectF areaRect = QRectF(xCenter - width / 2, yCenter - height / 2, width, height);
LtsCoordTrans::UtmCoordinate utmBase(
LtsCoordTrans::UtmCoordinate::fromGeographic(LtsCoordTrans::geographicFromMgrs(base)));
LtsCoordTrans::UtmCoordinate utmBase(LtsCoordTrans::UtmCoordinate::fromGeographic(LtsCoordTrans::geographicFromMgrs(base)));
const QPointF topLeft(utmBase.geographic(areaRect.left(), areaRect.top()));
const QPointF bottomRight(utmBase.geographic(areaRect.right(), areaRect.bottom()));
qDebug() << "TopLeft: " << topLeft * LtsCoordTrans::rad2deg();
@@ -10,7 +10,9 @@
namespace LtsCoordWidget
{
LtsCoordWidget::LtsCoordWidget(DisplayType dt, QWidget* parent) : QWidget(parent), m_displayType(dt)
LtsCoordWidget::LtsCoordWidget(DisplayType dt, QWidget *parent)
: QWidget(parent)
, m_displayType(dt)
{
setFocusPolicy(Qt::StrongFocus);
rebuildUi();
@@ -149,12 +151,9 @@ void LtsCoordWidget::rebuildUi()
m_inputWidgetHandler->setSquaresEditable(m_bMgrsSquareEditable);
m_inputWidgetHandler->resetButton()->setVisible(m_bWithResetButton);
connect(m_inputWidgetHandler->resetButton(), &QToolButton::clicked, this,
&LtsCoordWidget::onResetToDefaultCoordinate);
connect(m_inputWidgetHandler, &LtsCoordInputWidgetHandler::coordinateChanged, this,
&LtsCoordWidget::coordinateChanged);
connect(m_inputWidgetHandler, &LtsCoordInputWidgetHandler::invalidCoordinate, this,
&LtsCoordWidget::invalidCoordinate);
connect(m_inputWidgetHandler->resetButton(), &QToolButton::clicked, this, &LtsCoordWidget::onResetToDefaultCoordinate);
connect(m_inputWidgetHandler, &LtsCoordInputWidgetHandler::coordinateChanged, this, &LtsCoordWidget::coordinateChanged);
connect(m_inputWidgetHandler, &LtsCoordInputWidgetHandler::invalidCoordinate, this, &LtsCoordWidget::invalidCoordinate);
if (!m_defaultCoordinate.isNull())
m_inputWidgetHandler->setCoordinate(m_defaultCoordinate);
}
@@ -16,14 +16,24 @@ class LTSCOORDWIDGET_EXPORT LtsCoordWidget : public QWidget
{
Q_OBJECT
public:
enum class DisplayType { MGRS5, MGRS7, UTM, WGS84, MGRS = DisplayType::MGRS5 };
enum class DisplayType
{
MGRS5,
MGRS7,
UTM,
WGS84,
MGRS = DisplayType::MGRS5
};
Q_ENUM(DisplayType)
Q_PROPERTY(DisplayType displayType READ displayType WRITE setDisplayType)
Q_PROPERTY(bool withResetButton READ withResetButton WRITE setWithResetButton)
Q_PROPERTY(bool showToolTip READ showToolTip WRITE setShowToolTip)
Q_PROPERTY(bool mgrsSquareEditable READ mgrsSquareEditable WRITE setMgrsSquareEditable)
explicit LtsCoordWidget(QWidget* parent = nullptr) : LtsCoordWidget(LtsCoordWidget::DisplayType::MGRS, parent) {}
explicit LtsCoordWidget(QWidget *parent = nullptr)
: LtsCoordWidget(LtsCoordWidget::DisplayType::MGRS, parent)
{
}
explicit LtsCoordWidget(DisplayType dt, QWidget *parent = nullptr);
@@ -19,7 +19,9 @@ void LtsCoordInputWidgetHandler::onCoordinateDataChanged()
}
MgrsEdit::MgrsEdit(int precision, QWidget *widget)
: LtsCoordInputWidgetHandler(widget), m_precision(precision), m_ui(new Ui::Mgrs)
: LtsCoordInputWidgetHandler(widget)
, m_precision(precision)
, m_ui(new Ui::Mgrs)
{
m_ui->setupUi(widget);
@@ -32,8 +34,7 @@ MgrsEdit::MgrsEdit(int precision, QWidget* widget)
m_ui->leNorth->setValidator(new QIntValidator(0, upperLimit, m_ui->leNorth));
setDefaultMgrsSquares();
connect(m_ui->cbxZone, QOverload<int>::of(&QComboBox::currentIndexChanged), this,
&MgrsEdit::onCoordinateDataChanged);
connect(m_ui->cbxZone, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &MgrsEdit::onCoordinateDataChanged);
connect(m_ui->leEast, &QLineEdit::editingFinished, this, &MgrsEdit::onCoordinateDataChanged);
connect(m_ui->leNorth, &QLineEdit::editingFinished, this, &MgrsEdit::onCoordinateDataChanged);
}
@@ -206,7 +207,9 @@ void MgrsEdit::setMgrsSquares(const QVector<LtsCoordTrans::UtmCoordinate>& geoCo
m_ui->cbxZone->addItems(sl);
}
Wgs84Edit::Wgs84Edit(QWidget* widget) : LtsCoordInputWidgetHandler(widget), m_ui(new Ui::Wgs84)
Wgs84Edit::Wgs84Edit(QWidget *widget)
: LtsCoordInputWidgetHandler(widget)
, m_ui(new Ui::Wgs84)
{
m_ui->setupUi(widget);
@@ -17,7 +17,10 @@ class LtsCoordInputWidgetHandler : public QObject
{
Q_OBJECT
public:
explicit LtsCoordInputWidgetHandler(QObject* parent) : QObject(parent) {}
explicit LtsCoordInputWidgetHandler(QObject *parent)
: QObject(parent)
{
}
virtual bool isValid() = 0;
virtual void setCoordinate(const QPointF &geoCoord) = 0;
@@ -77,20 +80,11 @@ class Wgs84Edit final : public LtsCoordInputWidgetHandler
void cleanup() override;
void clear() override;
void setSquaresEditable(bool bEditable) override
{
Q_UNUSED(bEditable);
}
void setSquaresEditable(bool bEditable) override { Q_UNUSED(bEditable); }
void setWithSurroundingSquare(bool bEnabled) override
{
Q_UNUSED(bEnabled);
}
void setWithSurroundingSquare(bool bEnabled) override { Q_UNUSED(bEnabled); }
void setMgrsSquares(const QVector<LtsCoordTrans::UtmCoordinate>& geoCoords) override
{
Q_UNUSED(geoCoords);
}
void setMgrsSquares(const QVector<LtsCoordTrans::UtmCoordinate> &geoCoords) override { Q_UNUSED(geoCoords); }
private:
Ui::Wgs84 *m_ui;
@@ -12,10 +12,8 @@
static void updateLabel(const QPointF &coord, QLabel *lbl, int prec)
{
QString mgrs = LtsCoordTrans::mgrsFromGeographic(coord.x(), coord.y(), prec);
QString str = QStringLiteral("mgrs: %1, lon: %2, lat: %3")
.arg(mgrs)
.arg(coord.x() * LtsCoordTrans::rad2deg(), 0, 'f', 10)
.arg(coord.y() * LtsCoordTrans::rad2deg(), 0, 'f', 10);
QString str =
QStringLiteral("mgrs: %1, lon: %2, lat: %3").arg(mgrs).arg(coord.x() * LtsCoordTrans::rad2deg(), 0, 'f', 10).arg(coord.y() * LtsCoordTrans::rad2deg(), 0, 'f', 10);
lbl->setText(str);
}
@@ -33,50 +31,46 @@ int main(int argc, char** argv)
const QPointF defCoord(QPointF(53.0, 8.0) * LtsCoordTrans::deg2rad());
LtsCoordWidget::LtsCoordWidget* wMgrs5(
new LtsCoordWidget::LtsCoordWidget(LtsCoordWidget::LtsCoordWidget::DisplayType::MGRS, dialog));
LtsCoordWidget::LtsCoordWidget *wMgrs5(new LtsCoordWidget::LtsCoordWidget(LtsCoordWidget::LtsCoordWidget::DisplayType::MGRS, dialog));
wMgrs5->setWithResetButton(true);
wMgrs5->setCoordinate(defCoord, true);
lay->addWidget(wMgrs5);
QLabel *lbl5(new QLabel(dialog));
lay->addWidget(lbl5);
QObject::connect(wMgrs5, &LtsCoordWidget::LtsCoordWidget::coordinateChanged, lbl5,
[lbl5](const QPointF& coord) { updateLabel(coord, lbl5, 5); });
QObject::connect(wMgrs5, &LtsCoordWidget::LtsCoordWidget::coordinateChanged, lbl5, [lbl5](const QPointF &coord) { updateLabel(coord, lbl5, 5); });
LtsCoordWidget::LtsCoordWidget* wMgrs7(
new LtsCoordWidget::LtsCoordWidget(LtsCoordWidget::LtsCoordWidget::DisplayType::MGRS7, dialog));
LtsCoordWidget::LtsCoordWidget *wMgrs7(new LtsCoordWidget::LtsCoordWidget(LtsCoordWidget::LtsCoordWidget::DisplayType::MGRS7, dialog));
wMgrs7->setWithResetButton(true);
wMgrs7->setCoordinate(defCoord, true);
lay->addWidget(wMgrs7);
QLabel *lbl7(new QLabel(dialog));
lay->addWidget(lbl7);
QObject::connect(wMgrs7, &LtsCoordWidget::LtsCoordWidget::coordinateChanged, wMgrs7,
[lbl7](const QPointF& coord) { updateLabel(coord, lbl7, 7); });
QObject::connect(wMgrs7, &LtsCoordWidget::LtsCoordWidget::coordinateChanged, wMgrs7, [lbl7](const QPointF &coord) { updateLabel(coord, lbl7, 7); });
LtsCoordWidget::LtsCoordWidget* w84(
new LtsCoordWidget::LtsCoordWidget(LtsCoordWidget::LtsCoordWidget::DisplayType::WGS84, dialog));
LtsCoordWidget::LtsCoordWidget *w84(new LtsCoordWidget::LtsCoordWidget(LtsCoordWidget::LtsCoordWidget::DisplayType::WGS84, dialog));
w84->setWithResetButton(true);
w84->setCoordinate(defCoord, true);
lay->addWidget(w84);
QLabel *lbl84(new QLabel(dialog));
lay->addWidget(lbl84);
QObject::connect(w84, &LtsCoordWidget::LtsCoordWidget::coordinateChanged, w84,
[lbl84](const QPointF& coord) { updateLabel(coord, lbl84, 11); });
QObject::connect(w84, &LtsCoordWidget::LtsCoordWidget::coordinateChanged, w84, [lbl84](const QPointF &coord) { updateLabel(coord, lbl84, 11); });
QHBoxLayout *hLay = new QHBoxLayout;
lay->addLayout(hLay);
LtsCoordWidget::LtsCoordWidget* wChange(
new LtsCoordWidget::LtsCoordWidget(LtsCoordWidget::LtsCoordWidget::DisplayType::WGS84, dialog));
LtsCoordWidget::LtsCoordWidget *wChange(new LtsCoordWidget::LtsCoordWidget(LtsCoordWidget::LtsCoordWidget::DisplayType::WGS84, dialog));
wChange->setWithResetButton(true);
wChange->setCoordinate(defCoord, true);
hLay->addWidget(wChange);
QPushButton *pbReset(new QPushButton(QStringLiteral("With Reset"), dialog));
hLay->addWidget(pbReset);
QObject::connect(pbReset, &QPushButton::clicked, wChange,
[wChange]() { wChange->setWithResetButton(!wChange->withResetButton()); });
QObject::connect(pbReset, &QPushButton::clicked, wChange, [wChange]() { wChange->setWithResetButton(!wChange->withResetButton()); });
QPushButton *pbNext(new QPushButton(QStringLiteral("Next Type"), dialog));
hLay->addWidget(pbNext);
QObject::connect(pbNext, &QPushButton::clicked, wChange, [wChange]() {
QObject::connect(pbNext,
&QPushButton::clicked,
wChange,
[wChange]()
{
LtsCoordWidget::LtsCoordWidget::DisplayType dt = wChange->displayType();
switch (dt)
{
@@ -38,7 +38,15 @@ int main(int argc, char** argv)
part2 = mgrs.substr(3, 2);
part3 = mgrs.substr(5, prec);
part4 = mgrs.substr(5 + prec, prec);
fprintf(stdout, "%s %s %s %s = %13.10f, %13.10f ( %13.10f, %13.10f )\n", part1.c_str(), part2.c_str(),
part3.c_str(), part4.c_str(), lonDeg, latDeg, lonDeg / 180. * M_PI, latDeg / 180. * M_PI);
fprintf(stdout,
"%s %s %s %s = %13.10f, %13.10f ( %13.10f, %13.10f )\n",
part1.c_str(),
part2.c_str(),
part3.c_str(),
part4.c_str(),
lonDeg,
latDeg,
lonDeg / 180. * M_PI,
latDeg / 180. * M_PI);
return 0;
}
@@ -13,8 +13,8 @@ namespace LtsLicence
struct AesCryptPrivate
{
AesCryptPrivate()
: passPhrase(QLatin1String("LTS " LTS_VERSION_MAJOR "." LTS_VERSION_MINOR)),
logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("LtsLicenceLib.AesCrypt"))
: passPhrase(QLatin1String("LTS " LTS_VERSION_MAJOR "." LTS_VERSION_MINOR))
, logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("LtsLicenceLib.AesCrypt"))
{
#if OPENSSL_VERSION_NUMBER < 0x1010000fL
ERR_load_crypto_strings();
@@ -12,9 +12,7 @@ namespace LtsLicence
LTSLICENCE_EXPORT void setPassPhrase(const QString &passPhrase);
LTSLICENCE_EXPORT QString passPhrase();
LTSLICENCE_EXPORT QByteArray decryptData(const QByteArray& dataToDecrypt, const QString& pw = passPhrase(),
bool* bOk = nullptr);
LTSLICENCE_EXPORT QByteArray decryptData(const QByteArray &dataToDecrypt, const QString &pw = passPhrase(), bool *bOk = nullptr);
LTSLICENCE_EXPORT QByteArray encryptData(const QByteArray& dataToEncrypt, const QString& pw = passPhrase(),
bool* bOk = nullptr);
LTSLICENCE_EXPORT QByteArray encryptData(const QByteArray &dataToEncrypt, const QString &pw = passPhrase(), bool *bOk = nullptr);
} // namespace LtsLicence
@@ -51,8 +51,7 @@ QByteArray writeUnencryptedLicences(const QVector<Licence>& licences)
{
QDomDocument xmlDoc;
QDomProcessingInstruction instr = xmlDoc.createProcessingInstruction(
QLatin1String("xml"), QLatin1String("version='1.0' encoding='UTF-8' standalone='yes'"));
QDomProcessingInstruction instr = xmlDoc.createProcessingInstruction(QLatin1String("xml"), QLatin1String("version='1.0' encoding='UTF-8' standalone='yes'"));
xmlDoc.appendChild(instr);
QDomElement root = xmlDoc.createElement(QLatin1String("licences"));
@@ -126,10 +125,9 @@ bool extractLicence(const QDomElement& licenceElement, QVector<Licence>& licence
licence.expiration = qdt;
INFO_LOG(getLogger()) << "Read licence for:'" << licence.name << "'"
<< " IgnoreMaxCount: " << licence.ignoreMaxCount
<< " IgnoreExpiration: " << licence.ignoreExpiration << " MaxCount: " << licence.maxCount
<< " Expiration: " << licence.expiration.date().toString() << " "
<< licence.expiration.time().toString() << " RefCount: " << licence.licenceRefCount;
<< " IgnoreMaxCount: " << licence.ignoreMaxCount << " IgnoreExpiration: " << licence.ignoreExpiration << " MaxCount: " << licence.maxCount
<< " Expiration: " << licence.expiration.date().toString() << " " << licence.expiration.time().toString()
<< " RefCount: " << licence.licenceRefCount;
licenceVec.append(licence);
return true;
@@ -9,7 +9,9 @@
namespace LtsNotification
{
LtsNotification::LtsNotification(LtsNotificationController* ctl) : QObject(), m_controller(ctl)
LtsNotification::LtsNotification(LtsNotificationController *ctl)
: QObject()
, m_controller(ctl)
{
connect(ctl, &LtsNotificationController::destroyed, this, &LtsNotification::slotCtlDestroyed);
}
@@ -14,7 +14,9 @@ namespace LtsNotification
{
LtsNotificationController::LtsNotificationController(const QString &identifier)
: QObject(), m_count(0), m_identifier(QStringLiteral("LtsNotification%1").arg(identifier))
: QObject()
, m_count(0)
, m_identifier(QStringLiteral("LtsNotification%1").arg(identifier))
{
}
@@ -48,9 +50,8 @@ void LtsNotificationController::setBackground(const int r, const int g, const in
if (r == -1 && g == -1 && b == -1)
stylesheet = QStringLiteral("");
else
stylesheet = QStringLiteral("QToolButton {background-color: rgb(") + QString::number(r) +
QStringLiteral(",") + QString::number(g) + QStringLiteral(",") + QString::number(b) +
QStringLiteral(");}");
stylesheet = QStringLiteral("QToolButton {background-color: rgb(") + QString::number(r) + QStringLiteral(",") + QString::number(g) + QStringLiteral(",") +
QString::number(b) + QStringLiteral(");}");
tb->setStyleSheet(stylesheet);
}
@@ -133,7 +134,11 @@ QToolButton* LtsNotificationController::createWidget()
b->setMaximumSize(SIZE, SIZE);
connect(b, &QToolButton::destroyed, this, &LtsNotificationController::slotNotiWidgetDestroyed);
connect(b, &QToolButton::clicked, this, [this]() {
connect(b,
&QToolButton::clicked,
this,
[this]()
{
if (m_action)
m_action();
});
@@ -37,15 +37,9 @@ class LTSNOTIFICATION_EXPORT LtsNotificationController : public QObject
void setCount(const int count);
void setBackground(const int r, const int g, const int b);
const QString& identifier() const
{
return m_identifier;
}
const QString &identifier() const { return m_identifier; }
const QString& tooltip() const
{
return m_toolTip;
}
const QString &tooltip() const { return m_toolTip; }
void setEnabled(bool enable);
@@ -41,7 +41,10 @@ void LtsRestClient::ping(PingSuccessCallback onSuccess, ErrorCallback onError, i
timeoutTimer->setSingleShot(true);
// 2. Connect the timeout signal to abort the request
connect(timeoutTimer, &QTimer::timeout, this, [reply]()
connect(timeoutTimer,
&QTimer::timeout,
this,
[reply]()
{
if (reply && reply->isRunning())
reply->abort(); // Triggers finished() with OperationCanceledError
@@ -15,9 +15,12 @@ class LTSSERIALPORTQUERRY_EXPORT LtsSerialPortQuerry : public QObject
public:
explicit LtsSerialPortQuerry(QObject *parent = nullptr);
void setSerialPortSettings(const QSerialPort::BaudRate& baudRate, const QSerialPort::OpenModeFlag& openModeFlag,
const QSerialPort::DataBits& dataBits, const QSerialPort::FlowControl& flowControll,
const QSerialPort::Parity& parity, const QSerialPort::StopBits& stopBits);
void setSerialPortSettings(const QSerialPort::BaudRate &baudRate,
const QSerialPort::OpenModeFlag &openModeFlag,
const QSerialPort::DataBits &dataBits,
const QSerialPort::FlowControl &flowControll,
const QSerialPort::Parity &parity,
const QSerialPort::StopBits &stopBits);
void continueQuerry();
void restartQuerry();
QSerialPort *currentSerialPort();
@@ -6,10 +6,16 @@ namespace LtsSerialPortQuerry
{
LtsSerialPortQuerry::LtsSerialPortQuerry(QObject *parent)
: QObject(parent), m_logger(getLogger("LtsSerialPortQuerry")), m_currentQuerry(0),
m_baudRate(QSerialPort::Baud115200), m_openModeFlag(QSerialPort::ReadWrite), m_dataBits(QSerialPort::Data8),
m_flowControll(QSerialPort::NoFlowControl), m_parity(QSerialPort::NoParity), m_stopBits(QSerialPort::OneStop),
m_currentSerialPort(nullptr)
: QObject(parent)
, m_logger(getLogger("LtsSerialPortQuerry"))
, m_currentQuerry(0)
, m_baudRate(QSerialPort::Baud115200)
, m_openModeFlag(QSerialPort::ReadWrite)
, m_dataBits(QSerialPort::Data8)
, m_flowControll(QSerialPort::NoFlowControl)
, m_parity(QSerialPort::NoParity)
, m_stopBits(QSerialPort::OneStop)
, m_currentSerialPort(nullptr)
{
}
@@ -66,8 +72,7 @@ void LtsSerialPortQuerry::querrySerialPort(const QSerialPortInfo& info)
m_currentSerialPort->setStopBits(m_stopBits);
m_currentSerialPort->setFlowControl(m_flowControll);
DEBUG_LOG(m_logger) << "Try opening Comport:" << m_currentSerialPort->portName()
<< " index is: " << m_currentQuerry;
DEBUG_LOG(m_logger) << "Try opening Comport:" << m_currentSerialPort->portName() << " index is: " << m_currentQuerry;
if (!m_currentSerialPort->open(QSerialPort::ReadWrite))
{
@@ -78,8 +83,7 @@ void LtsSerialPortQuerry::querrySerialPort(const QSerialPortInfo& info)
}
else
{
connect(m_currentSerialPort, &QSerialPort::errorOccurred, this, &LtsSerialPortQuerry::onSerialPortError,
Qt::UniqueConnection);
connect(m_currentSerialPort, &QSerialPort::errorOccurred, this, &LtsSerialPortQuerry::onSerialPortError, Qt::UniqueConnection);
DEBUG_LOG(m_logger) << "Oppened comport" << m_currentSerialPort->portName();
emit connectionEstablished();
}
@@ -105,13 +109,13 @@ void LtsSerialPortQuerry::onSerialPortError(QSerialPort::SerialPortError serialP
return;
DEBUG_LOG(m_logger) << "Spontaneous error " << serialPortError << " doesn't have to be an error ...";
const QString errStr(QStringLiteral("QSerialPort::SerialPortError ") + QString::number(serialPortError) +
QStringLiteral(" from serial port ") + m_currentSerialPort->portName() +
QStringLiteral(" error: ") + m_currentSerialPort->errorString());
const QString errStr(QStringLiteral("QSerialPort::SerialPortError ") + QString::number(serialPortError) + QStringLiteral(" from serial port ") +
m_currentSerialPort->portName() + QStringLiteral(" error: ") + m_currentSerialPort->errorString());
switch (serialPortError)
{
case QSerialPort::SerialPortError::NoError: {
case QSerialPort::SerialPortError::NoError:
{
break;
}
@@ -119,17 +123,20 @@ void LtsSerialPortQuerry::onSerialPortError(QSerialPort::SerialPortError serialP
case QSerialPort::SerialPortError::PermissionError:
case QSerialPort::SerialPortError::OpenError:
case QSerialPort::SerialPortError::NotOpenError:
case QSerialPort::SerialPortError::UnknownError: {
case QSerialPort::SerialPortError::UnknownError:
{
ERROR_LOG(m_logger) << "Closing port and try to reopen it. " << m_currentSerialPort->portName();
continueQuerry();
Q_FALLTHROUGH();
}
case QSerialPort::SerialPortError::UnsupportedOperationError: {
case QSerialPort::SerialPortError::UnsupportedOperationError:
{
ERROR_LOG(m_logger) << errStr;
break;
}
default: {
default:
{
ERROR_LOG(m_logger) << "Got an Error> " << errStr << "restarting";
continueQuerry();
@@ -15,9 +15,12 @@ class LTSSERIALPORTQUERRY_EXPORT LtsSerialPortQuerry : public QObject
public:
explicit LtsSerialPortQuerry(QObject *parent = nullptr);
void setSerialPortSettings(const QSerialPort::BaudRate& baudRate, const QSerialPort::OpenModeFlag& openModeFlag,
const QSerialPort::DataBits& dataBits, const QSerialPort::FlowControl& flowControll,
const QSerialPort::Parity& parity, const QSerialPort::StopBits& stopBits);
void setSerialPortSettings(const QSerialPort::BaudRate &baudRate,
const QSerialPort::OpenModeFlag &openModeFlag,
const QSerialPort::DataBits &dataBits,
const QSerialPort::FlowControl &flowControll,
const QSerialPort::Parity &parity,
const QSerialPort::StopBits &stopBits);
void restartQuerry();
QSerialPort *currentSerialPort();
@@ -43,11 +43,9 @@ template <> char* toString(const QVector<int>& vec)
return qstrdup(sl.join(QLatin1Char(',')).toLatin1().constData());
}
#if QT_VERSION < QT_VERSION_CHECK(5, 10, 0)
template <typename T1, typename T2>
inline bool qCompare(const T1& t1, const T2& t2, const char* actual, const char* expected, const char* file, int line)
template <typename T1, typename T2> inline bool qCompare(const T1 &t1, const T2 &t2, const char *actual, const char *expected, const char *file, int line)
{
return compare_helper(t1 == t2, "Compared values are not the same", toString(t1), toString(t2), actual, expected,
file, line);
return compare_helper(t1 == t2, "Compared values are not the same", toString(t1), toString(t2), actual, expected, file, line);
}
#endif
} // namespace QTest
@@ -65,7 +63,9 @@ void LtsUtilsTest::test_promise()
results.append(1);
LtsUtils::Promise p([&results](LtsUtils::ResultFunction resolve, LtsUtils::ResultFunction) {
LtsUtils::Promise p(
[&results](LtsUtils::ResultFunction resolve, LtsUtils::ResultFunction)
{
results.append(4);
qDebug() << "LtsUtils Promise: Promise executed! Resolving now";
@@ -75,13 +75,17 @@ void LtsUtilsTest::test_promise()
results.append(2);
bool resolved = false;
p.resolved([&resolved, &results](const QVariant& value) {
p.resolved(
[&resolved, &results](const QVariant &value)
{
results.append(5);
qDebug() << "LtsUtils Promise: Promise was resolved with value" << value;
resolved = true;
});
p.rejected([](const QVariant& val) {
p.rejected(
[](const QVariant &val)
{
qCritical() << "rejected with val" << val;
QFAIL("Promise unexpectedly rejected");
});
@@ -260,8 +264,7 @@ void LtsUtilsTest::test_fromIntArray2D()
{
qDebug("LtsUtils: test_fromIntArray2D");
QString str = LtsUtils::IntArray2D({{0, 2}, {1, 3}, {2, 999999999}, {3, -2147483647}, {4, 2147483647}, {5, 123456}})
.toPgString();
QString str = LtsUtils::IntArray2D({{0, 2}, {1, 3}, {2, 999999999}, {3, -2147483647}, {4, 2147483647}, {5, 123456}}).toPgString();
qDebug() << "LtsUtils: Result " << str;
QCOMPARE(str, QLatin1String("{{0,2},{1,3},{2,999999999},{3,-2147483647},{4,2147483647},{5,123456}}"));
@@ -295,9 +298,7 @@ void LtsUtilsTest::test_fromBigintArray2D()
{
qDebug("LtsUtils: test_fromBigintArray2D");
QString str =
LtsUtils::BigintArray2D({{0, -123456789}, {1, -2147483647}, {2, 999999999999}, {3, 123456789}, {4, 2147483647}})
.toPgString();
QString str = LtsUtils::BigintArray2D({{0, -123456789}, {1, -2147483647}, {2, 999999999999}, {3, 123456789}, {4, 2147483647}}).toPgString();
qDebug() << "LtsUtils: Result " << str;
QCOMPARE(str, QLatin1String("{{0,-123456789},{1,-2147483647},{2,999999999999},{3,123456789},{4,2147483647}}"));
@@ -336,14 +337,10 @@ void LtsUtilsTest::test_bitArray()
qDebug("LtsUtils: test_bitArray");
{
QVERIFY2(LtsUtils::BitArray::convert<std::vector<uint8_t>>(QBitArray(8)).size() == 1,
" wrong size of underlying data");
QVERIFY2(LtsUtils::BitArray::convert<std::vector<uint8_t>>(QBitArray(9)).size() == 2,
" wrong size of underlying data");
QVERIFY2(LtsUtils::BitArray::convert<std::vector<uint8_t>>(QBitArray(16)).size() == 2,
" wrong size of underlying data");
QVERIFY2(LtsUtils::BitArray::convert<std::vector<uint8_t>>(QBitArray(17)).size() == 3,
" wrong size of underlying data");
QVERIFY2(LtsUtils::BitArray::convert<std::vector<uint8_t>>(QBitArray(8)).size() == 1, " wrong size of underlying data");
QVERIFY2(LtsUtils::BitArray::convert<std::vector<uint8_t>>(QBitArray(9)).size() == 2, " wrong size of underlying data");
QVERIFY2(LtsUtils::BitArray::convert<std::vector<uint8_t>>(QBitArray(16)).size() == 2, " wrong size of underlying data");
QVERIFY2(LtsUtils::BitArray::convert<std::vector<uint8_t>>(QBitArray(17)).size() == 3, " wrong size of underlying data");
}
{
@@ -513,10 +510,7 @@ class Spy : public QObject
public slots:
void slot1()
{
++m_slot1Count;
}
void slot1() { ++m_slot1Count; }
public:
int m_slot1Count{0};
@@ -526,8 +520,7 @@ void LtsUtilsTest::test_connection()
{
Emitter emitter;
Spy spy;
std::unique_ptr<LtsUtils::IConnection> conn(
LtsUtils::createConnection(&emitter, &Emitter::signal1, &spy, &Spy::slot1));
std::unique_ptr<LtsUtils::IConnection> conn(LtsUtils::createConnection(&emitter, &Emitter::signal1, &spy, &Spy::slot1));
emit emitter.signal1();
QCOMPARE(spy.m_slot1Count, 0);
@@ -544,8 +537,7 @@ void LtsUtilsTest::test_queuedConnection()
{
Emitter emitter;
Spy spy;
std::unique_ptr<LtsUtils::IConnection> conn(
LtsUtils::createConnection(&emitter, &Emitter::signal2, &spy, &Spy::slot1));
std::unique_ptr<LtsUtils::IConnection> conn(LtsUtils::createConnection(&emitter, &Emitter::signal2, &spy, &Spy::slot1));
emit emitter.signal2(42);
QCOMPARE(spy.m_slot1Count, 0);
@@ -560,10 +552,8 @@ void LtsUtilsTest::test_signalSignalConnection()
{
Emitter emitter;
Spy spy;
std::unique_ptr<LtsUtils::IConnection> signalSignalConn(
LtsUtils::createConnection(&emitter, &Emitter::signal2, &emitter, &Emitter::signal1));
std::unique_ptr<LtsUtils::IConnection> signalSlotConn(
LtsUtils::createConnection(&emitter, &Emitter::signal1, &spy, &Spy::slot1));
std::unique_ptr<LtsUtils::IConnection> signalSignalConn(LtsUtils::createConnection(&emitter, &Emitter::signal2, &emitter, &Emitter::signal1));
std::unique_ptr<LtsUtils::IConnection> signalSlotConn(LtsUtils::createConnection(&emitter, &Emitter::signal1, &spy, &Spy::slot1));
signalSignalConn->connect();
signalSlotConn->connect();
@@ -963,10 +953,8 @@ void LtsUtilsTest::test_byteStreamFromSfmMessage()
const quint8 payloadArray[] = {0x11, 0x02, 0x03, 0x04, 0x50};
msg.setPayload(QByteArray(reinterpret_cast<const char *>(payloadArray), sizeof(payloadArray)));
const quint8 expectedResultArray[] = {0x02, 0x80, 0x00, 0x10, 0x05, 0x80, 0x91, 0x80,
0x82, 0x80, 0x83, 0x04, 0x50, 0x00, 0x03};
QByteArray expectedResult =
QByteArray(reinterpret_cast<const char*>(expectedResultArray), sizeof(expectedResultArray));
const quint8 expectedResultArray[] = {0x02, 0x80, 0x00, 0x10, 0x05, 0x80, 0x91, 0x80, 0x82, 0x80, 0x83, 0x04, 0x50, 0x00, 0x03};
QByteArray expectedResult = QByteArray(reinterpret_cast<const char *>(expectedResultArray), sizeof(expectedResultArray));
QByteArray byteMessage = byteStreamFromSfmMessage(msg);
@@ -990,8 +978,7 @@ void LtsUtilsTest::test_byteStreamToSfmMessage()
const quint8 payloadArray[] = {0x11, 0x02, 0x03, 0x04, 0x50, 0x00};
msgComplete.setPayload(QByteArray(reinterpret_cast<const char *>(payloadArray), sizeof(payloadArray)));
const quint8 dataArray[] = {0x02, 0x80, 0x00, 0x10, 0x06, 0x80, 0x91, 0x80,
0x82, 0x80, 0x83, 0x04, 0x50, 0x00, 0xFF, 0x03};
const quint8 dataArray[] = {0x02, 0x80, 0x00, 0x10, 0x06, 0x80, 0x91, 0x80, 0x82, 0x80, 0x83, 0x04, 0x50, 0x00, 0xFF, 0x03};
QByteArray dataComplete = QByteArray(reinterpret_cast<const char *>(dataArray), sizeof(dataArray));
SfmMessage result;
@@ -7,9 +7,7 @@
namespace LtsUtils
{
template <typename Func>
void addConnect(QEventLoop& x, bool& success, const typename QtPrivate::FunctionPointer<Func>::Object* sender,
Func signal, bool isSuccess)
template <typename Func> void addConnect(QEventLoop &x, bool &success, const typename QtPrivate::FunctionPointer<Func>::Object *sender, Func signal, bool isSuccess)
{
if (isSuccess)
{
@@ -20,8 +18,7 @@ void addConnect(QEventLoop& x, bool& success, const typename QtPrivate::Function
}
template <typename Func, typename... Connect>
void addConnect(QEventLoop& x, bool& success, const typename QtPrivate::FunctionPointer<Func>::Object* sender,
Func signal, bool isSuccess, Connect... connects)
void addConnect(QEventLoop &x, bool &success, const typename QtPrivate::FunctionPointer<Func>::Object *sender, Func signal, bool isSuccess, Connect... connects)
{
addConnect(x, success, sender, signal, isSuccess);
addConnect(x, success, connects...);
@@ -52,7 +49,11 @@ template <typename... Connect> void awaitTimeout(const int timeoutMs, Connect...
{
t->setInterval(timeoutMs);
t->setSingleShot(true);
QObject::connect(t.get(), &QTimer::timeout, t.get(), [&timeout]() {
QObject::connect(t.get(),
&QTimer::timeout,
t.get(),
[&timeout]()
{
fprintf(stderr, "awaitTimeout: timed out!\n");
timeout = true;
});
@@ -69,8 +70,10 @@ template <typename... Connect> void awaitTimeout(const int timeoutMs, Connect...
}
template <typename Func1, typename Func2>
void awaitWithCancelationSignal(const typename QtPrivate::FunctionPointer<Func1>::Object* sender1, Func1 signal1,
const typename QtPrivate::FunctionPointer<Func2>::Object* sender2, Func2 signal2,
void awaitWithCancelationSignal(const typename QtPrivate::FunctionPointer<Func1>::Object *sender1,
Func1 signal1,
const typename QtPrivate::FunctionPointer<Func2>::Object *sender2,
Func2 signal2,
const int timeoutMs = 0) noexcept(false)
{
if (timeoutMs > 0)
@@ -52,7 +52,10 @@ template <class Signal, class Slot> class Connection : public IConnection
public:
Connection(Emitter *emitter, Signal signal, Target *target, Slot slot)
: m_emitter(emitter), m_signal(signal), m_target(target), m_slot(slot)
: m_emitter(emitter)
, m_signal(signal)
, m_target(target)
, m_slot(slot)
{
Q_ASSERT(emitter);
Q_ASSERT(signal);
@@ -93,8 +96,10 @@ template <class Signal, class Slot> class Connection : public IConnection
};
template <class Signal, class Slot>
Connection<Signal, Slot>* createConnection(typename detail::ExtractClass<Signal>::type* emitter, Signal signal,
typename detail::ExtractClass<Slot>::type* target, Slot slot)
Connection<Signal, Slot> *createConnection(typename detail::ExtractClass<Signal>::type *emitter,
Signal signal,
typename detail::ExtractClass<Slot>::type *target,
Slot slot)
{
return new Connection<Signal, Slot>(emitter, signal, target, slot);
}
@@ -4,7 +4,12 @@
#include <ostream>
enum class DataModification { eAdded, eModified, eRemoved };
enum class DataModification
{
eAdded,
eModified,
eRemoved
};
inline std::ostream &operator<<(std::ostream &str, DataModification mod)
{
@@ -25,8 +25,7 @@ class JsonParseError : public std::runtime_error
{
public:
JsonParseError(const QJsonParseError &err)
: std::runtime_error("json parse error: " + err.errorString().toStdString() + " - at offset " +
std::to_string(err.offset))
: std::runtime_error("json parse error: " + err.errorString().toStdString() + " - at offset " + std::to_string(err.offset))
{
}
};
@@ -62,50 +61,37 @@ class JsonObject
JsonObject() = default;
explicit JsonObject(const QJsonObject& json) : m_json(json), m_jsonIsSet(true) {}
explicit JsonObject(const QJsonObject &json)
: m_json(json)
, m_jsonIsSet(true)
{
}
explicit JsonObject(QJsonObject&& json) : m_json(std::move(json)), m_jsonIsSet(true) {}
explicit JsonObject(QJsonObject &&json)
: m_json(std::move(json))
, m_jsonIsSet(true)
{
}
static inline JsonObject fromJson(const char *json, int len = -1);
static inline JsonObject fromJson(const QByteArray& json)
{
return fromJson(json.data(), json.size());
}
static inline JsonObject fromJson(const QByteArray &json) { return fromJson(json.data(), json.size()); }
static inline JsonObject fromJson(const std::string& json)
{
return fromJson(json.c_str(), json.size());
}
static inline JsonObject fromJson(const std::string &json) { return fromJson(json.c_str(), json.size()); }
static inline JsonObject fromJsonSafe(const char *json, int len = -1) noexcept(false);
static inline JsonObject fromJsonSafe(const QByteArray& json) noexcept(false)
{
return fromJsonSafe(json.data(), json.size());
}
static inline JsonObject fromJsonSafe(const QByteArray &json) noexcept(false) { return fromJsonSafe(json.data(), json.size()); }
static inline JsonObject fromJsonSafe(const std::string& json) noexcept(false)
{
return fromJsonSafe(json.c_str(), json.size());
}
static inline JsonObject fromJsonSafe(const std::string &json) noexcept(false) { return fromJsonSafe(json.c_str(), json.size()); }
template <class T> [[nodiscard]] bool contains(const Key &key) const;
[[nodiscard]] bool isNull(const Key& key) const
{
return contains<void>(key);
}
[[nodiscard]] bool isNull(const Key &key) const { return contains<void>(key); }
[[nodiscard]] bool isEmpty() const
{
return m_json.isEmpty();
}
[[nodiscard]] bool isEmpty() const { return m_json.isEmpty(); }
[[nodiscard]] bool isValid() const
{
return m_jsonIsSet;
}
[[nodiscard]] bool isValid() const { return m_jsonIsSet; }
template <class T> T value(const Key &key) const noexcept(false);
@@ -117,49 +103,40 @@ class JsonObject
template <class T> std::map<std::string, T> toStdMap() const;
bool operator==(const JsonObject& other) const
{
return m_json == other.m_json;
}
bool operator==(const JsonObject &other) const { return m_json == other.m_json; }
bool operator!=(const JsonObject& other) const
{
return !(*this == other);
}
bool operator!=(const JsonObject &other) const { return !(*this == other); }
class Key
{
public:
Key(QString s) : m_s(std::move(s)) {}
Key(const std::string& s) : m_s(QString::fromStdString(s)) {}
Key(const char* s) : m_s(QString::fromUtf8(s)) {}
operator const QString&() const
Key(QString s)
: m_s(std::move(s))
{
return m_s;
}
Key(const std::string &s)
: m_s(QString::fromStdString(s))
{
}
Key(const char *s)
: m_s(QString::fromUtf8(s))
{
}
operator const QString &() const { return m_s; }
private:
const QString m_s;
};
operator const QJsonObject&() const
{
return m_json;
}
operator const QJsonObject &() const { return m_json; }
[[nodiscard]] const QJsonObject& object() const
{
return m_json;
}
[[nodiscard]] const QJsonObject &object() const { return m_json; }
private:
[[nodiscard]] bool containsAny(const QString& key) const
{
return m_json.contains(key);
}
[[nodiscard]] bool containsAny(const QString &key) const { return m_json.contains(key); }
QJsonObject m_json;
bool m_jsonIsSet = false;
@@ -200,55 +177,39 @@ class JsonArray
public:
JsonArray() = default;
explicit JsonArray(const QJsonArray& json) : m_json(json), m_jsonIsSet(true) {}
explicit JsonArray(const QJsonArray &json)
: m_json(json)
, m_jsonIsSet(true)
{
}
explicit JsonArray(QJsonArray&& json) : m_json(std::move(json)), m_jsonIsSet(true) {}
explicit JsonArray(QJsonArray &&json)
: m_json(std::move(json))
, m_jsonIsSet(true)
{
}
static inline JsonArray fromJson(const char *json, int len = -1);
static inline JsonArray fromJson(const QByteArray& json)
{
return fromJson(json.data(), json.size());
}
static inline JsonArray fromJson(const QByteArray &json) { return fromJson(json.data(), json.size()); }
static inline JsonArray fromJson(const std::string& json)
{
return fromJson(json.c_str(), json.size());
}
static inline JsonArray fromJson(const std::string &json) { return fromJson(json.c_str(), json.size()); }
static inline JsonArray fromJsonSafe(const char *json, int len = -1) noexcept(false);
static inline JsonArray fromJsonSafe(const QByteArray& json) noexcept(false)
{
return fromJson(json.data(), json.size());
}
static inline JsonArray fromJsonSafe(const QByteArray &json) noexcept(false) { return fromJson(json.data(), json.size()); }
static inline JsonArray fromJsonSafe(const std::string& json) noexcept(false)
{
return fromJson(json.c_str(), json.size());
}
static inline JsonArray fromJsonSafe(const std::string &json) noexcept(false) { return fromJson(json.c_str(), json.size()); }
[[nodiscard]] int size() const
{
return m_json.size();
}
[[nodiscard]] int size() const { return m_json.size(); }
[[nodiscard]] bool isEmpty() const
{
return m_json.isEmpty();
}
[[nodiscard]] bool isEmpty() const { return m_json.isEmpty(); }
[[nodiscard]] bool isValid() const
{
return m_jsonIsSet;
}
[[nodiscard]] bool isValid() const { return m_jsonIsSet; }
template <class T> [[nodiscard]] bool contains(int index) const noexcept(false);
[[nodiscard]] bool isNull(int index) const noexcept(false)
{
return contains<void>(index);
}
[[nodiscard]] bool isNull(int index) const noexcept(false) { return contains<void>(index); }
template <class T> T at(int index) const noexcept(false);
@@ -258,20 +219,11 @@ class JsonArray
template <class T> std::vector<T> toStdVector() const;
bool operator==(const JsonArray& other) const
{
return m_json == other.m_json;
}
bool operator==(const JsonArray &other) const { return m_json == other.m_json; }
bool operator!=(const JsonArray& other) const
{
return !(*this == other);
}
bool operator!=(const JsonArray &other) const { return !(*this == other); }
const QJsonArray& operator()() const
{
return m_json;
}
const QJsonArray &operator()() const { return m_json; }
private:
QJsonArray m_json;
@@ -312,41 +264,23 @@ template <class T> struct JsonValue;
template <class Int> struct JsonLimits
{
static constexpr Int lowest()
{
return std::numeric_limits<Int>::lowest();
}
static constexpr Int lowest() { return std::numeric_limits<Int>::lowest(); }
static constexpr Int max()
{
return std::numeric_limits<Int>::max();
}
static constexpr Int max() { return std::numeric_limits<Int>::max(); }
};
template <> struct JsonLimits<int64_t>
{
static constexpr int64_t lowest()
{
return -(static_cast<int64_t>(1) << 53) + 1;
}
static constexpr int64_t lowest() { return -(static_cast<int64_t>(1) << 53) + 1; }
static constexpr int64_t max()
{
return (static_cast<int64_t>(1) << 53) - 1;
}
static constexpr int64_t max() { return (static_cast<int64_t>(1) << 53) - 1; }
};
template <> struct JsonLimits<uint64_t>
{
static constexpr uint64_t lowest()
{
return 0;
}
static constexpr uint64_t lowest() { return 0; }
static constexpr uint64_t max()
{
return JsonLimits<int64_t>::max();
}
static constexpr uint64_t max() { return JsonLimits<int64_t>::max(); }
};
template <class Int> struct JsonIntValue
@@ -400,10 +334,7 @@ template <> struct JsonValue<uint64_t> : JsonIntValue<uint64_t>
template <> struct JsonValue<double>
{
static bool matchesType(const QJsonValue& value)
{
return value.isDouble();
}
static bool matchesType(const QJsonValue &value) { return value.isDouble(); }
static double value(const QJsonValue &value) noexcept(false)
{
@@ -415,10 +346,7 @@ template <> struct JsonValue<double>
template <> struct JsonValue<bool>
{
static bool matchesType(const QJsonValue& value)
{
return value.isBool();
}
static bool matchesType(const QJsonValue &value) { return value.isBool(); }
static bool value(const QJsonValue &value) noexcept(false)
{
@@ -430,10 +358,7 @@ template <> struct JsonValue<bool>
template <> struct JsonValue<QString>
{
static bool matchesType(const QJsonValue& value)
{
return value.isString();
}
static bool matchesType(const QJsonValue &value) { return value.isString(); }
static QString value(const QJsonValue &value) noexcept(false)
{
@@ -445,23 +370,14 @@ template <> struct JsonValue<QString>
template <> struct JsonValue<std::string>
{
static bool matchesType(const QJsonValue& value)
{
return value.isString();
}
static bool matchesType(const QJsonValue &value) { return value.isString(); }
static std::string value(const QJsonValue& value)
{
return JsonValue<QString>::value(value).toStdString();
}
static std::string value(const QJsonValue &value) { return JsonValue<QString>::value(value).toStdString(); }
};
template <> struct JsonValue<QJsonObject>
{
static bool matchesType(const QJsonValue& value)
{
return value.isObject();
}
static bool matchesType(const QJsonValue &value) { return value.isObject(); }
static QJsonObject value(const QJsonValue &value) noexcept(false)
{
@@ -473,31 +389,19 @@ template <> struct JsonValue<QJsonObject>
template <> struct JsonValue<JsonObject>
{
static bool matchesType(const QJsonValue& value)
{
return value.isObject();
}
static bool matchesType(const QJsonValue &value) { return value.isObject(); }
static JsonObject value(const QJsonValue& value)
{
return JsonObject(JsonValue<QJsonObject>::value(value));
}
static JsonObject value(const QJsonValue &value) { return JsonObject(JsonValue<QJsonObject>::value(value)); }
};
template <> struct JsonValue<void>
{
static bool matchesType(const QJsonValue& value)
{
return value.isNull();
}
static bool matchesType(const QJsonValue &value) { return value.isNull(); }
};
template <> struct JsonValue<QJsonArray>
{
static bool matchesType(const QJsonValue& value)
{
return value.isArray();
}
static bool matchesType(const QJsonValue &value) { return value.isArray(); }
static QJsonArray value(const QJsonValue &value) noexcept(false)
{
@@ -509,15 +413,9 @@ template <> struct JsonValue<QJsonArray>
template <> struct JsonValue<JsonArray>
{
static bool matchesType(const QJsonValue& value)
{
return value.isArray();
}
static bool matchesType(const QJsonValue &value) { return value.isArray(); }
static JsonArray value(const QJsonValue& value)
{
return JsonArray(JsonValue<QJsonArray>::value(value));
}
static JsonArray value(const QJsonValue &value) { return JsonArray(JsonValue<QJsonArray>::value(value)); }
};
template <class T> struct JsonValue<QVector<T>>
@@ -540,10 +438,7 @@ template <class T> struct JsonValue<QVector<T>>
template <class T> struct JsonValue<std::vector<T>>
{
static bool matchesType(const QJsonValue& value)
{
return JsonValue<QVector<T>>::matchesType(value);
}
static bool matchesType(const QJsonValue &value) { return JsonValue<QVector<T>>::matchesType(value); }
static std::vector<T> value(const QJsonValue &value)
{
@@ -572,10 +467,7 @@ template <class T> struct JsonValue<QMap<QString, T>>
template <class T> struct JsonValue<std::map<std::string, T>>
{
static bool matchesType(const QJsonValue& value)
{
return JsonValue<QMap<QString, T>>::matchesType(value);
}
static bool matchesType(const QJsonValue &value) { return JsonValue<QMap<QString, T>>::matchesType(value); }
static std::map<std::string, T> value(const QJsonValue &value)
{
@@ -601,8 +493,7 @@ template <class T> T JsonObject::value(const Key& key) const noexcept(false)
}
catch (const JsonTypeError &typeError)
{
throw JsonTypeError(std::string(typeError.what()) +
" - key: " + static_cast<const QString&>(key).toStdString());
throw JsonTypeError(std::string(typeError.what()) + " - key: " + static_cast<const QString &>(key).toStdString());
}
}
@@ -6,10 +6,10 @@
namespace LtsUtils
{
LtsTranslatableIdentifier::LtsTranslatableIdentifier(const QString& identifier, const QObject* context,
const char* translatableText)
: m_identifier(identifier), m_translationContext(context->metaObject()->className()),
m_translatableText(translatableText)
LtsTranslatableIdentifier::LtsTranslatableIdentifier(const QString &identifier, const QObject *context, const char *translatableText)
: m_identifier(identifier)
, m_translationContext(context->metaObject()->className())
, m_translatableText(translatableText)
{
}
@@ -10,21 +10,19 @@ namespace LtsUtils
class LTSUTILSCORE_EXPORT LtsTranslatableIdentifier
{
public:
LtsTranslatableIdentifier() : m_translationContext(nullptr), m_translatableText("") {}
LtsTranslatableIdentifier()
: m_translationContext(nullptr)
, m_translatableText("")
{
}
LtsTranslatableIdentifier(const QString &identifier, const QObject *context, const char *translatableText);
const QString& identifier() const
{
return m_identifier;
}
const QString &identifier() const { return m_identifier; }
const QString translatedText(const char *disambiguation = nullptr, int n = -1) const;
const QString _context() const
{
return QString::fromUtf8(m_translationContext);
}
const QString _context() const { return QString::fromUtf8(m_translationContext); }
private:
QString m_identifier;
@@ -33,9 +33,7 @@ template <> LTSUTILSCORE_EXPORT QString BigintArray::toPgString() const
return convertToPgString(m_data);
}
template <typename T>
static inline T convertFromPgString(const QString& str,
const std::function<typename T::Type(QStringView val, bool* bOk)>& convertFunc)
template <typename T> static inline T convertFromPgString(const QString &str, const std::function<typename T::Type(QStringView val, bool *bOk)> &convertFunc)
{
typename T::ContainerType result;
@@ -71,8 +69,7 @@ template <> LTSUTILSCORE_EXPORT IntArray IntArray::fromPgString(const QString& s
template <> LTSUTILSCORE_EXPORT BigintArray BigintArray::fromPgString(const QString &str)
{
return convertFromPgString<BigintArray>(str,
[](QStringView val, bool* bOk) { return val.toString().toLongLong(bOk); });
return convertFromPgString<BigintArray>(str, [](QStringView val, bool *bOk) { return val.toString().toLongLong(bOk); });
}
template <typename T> static inline QString convertToPgString(const std::map<T, T> &data)
@@ -82,8 +79,7 @@ template <typename T> static inline QString convertToPgString(const std::map<T,
QString ret(QLatin1Char('{'));
for (const auto &it : data)
{
ret += QLatin1Char('{') + QString::number(it.first) + QLatin1Char(',') + QString::number(it.second) +
QLatin1String("},");
ret += QLatin1Char('{') + QString::number(it.first) + QLatin1Char(',') + QString::number(it.second) + QLatin1String("},");
}
ret.chop(1);
ret += QLatin1Char('}');
@@ -100,9 +96,7 @@ template <> LTSUTILSCORE_EXPORT QString BigintArray2D::toPgString() const
return convertToPgString<BigintArray2D::Type>(m_data);
}
template <typename T>
static inline T convertFromPgString2D(const QString& str,
const std::function<typename T::Type(QStringView val)>& convertFunc)
template <typename T> static inline T convertFromPgString2D(const QString &str, const std::function<typename T::Type(QStringView val)> &convertFunc)
{
typename T::ContainerType ret;
int idxStart = str.indexOf(QLatin1Char('{'));
@@ -17,13 +17,13 @@ template <typename T, typename C> class PgArray
PgArray() = default;
Q_DECL_CONSTEXPR explicit PgArray(const C& data) : m_data(data) {}
Q_DECL_CONSTEXPR C operator()() const
Q_DECL_CONSTEXPR explicit PgArray(const C &data)
: m_data(data)
{
return m_data;
}
Q_DECL_CONSTEXPR C operator()() const { return m_data; }
[[nodiscard]] QString toPgString() const;
static PgArray fromPgString(const QString &str);
@@ -8,7 +8,11 @@ namespace LtsUtils
{
Promise::Promise(const std::function<void(ResultFunction resolve, ResultFunction reject)> &function, QObject *parent)
: QObject(parent), m_functionAlreadySet(false), m_timeout(new QTimer(this)), m_resultSet(false), m_timeoutSet(false)
: QObject(parent)
, m_functionAlreadySet(false)
, m_timeout(new QTimer(this))
, m_resultSet(false)
, m_timeoutSet(false)
{
m_timeout->setSingleShot(true);
connect(m_timeout, &QTimer::timeout, this, &Promise::slotTimeout);
@@ -25,9 +29,7 @@ void Promise::setFunction(const std::function<void(ResultFunction resolve, Resul
if (m_timeoutSet)
m_timeout->start();
QTimer::singleShot(0, this, [this, function]() {
function([this](const QVariant& value) { resolve(value); }, [this](const QVariant& value) { reject(value); });
});
QTimer::singleShot(0, this, [this, function]() { function([this](const QVariant &value) { resolve(value); }, [this](const QVariant &value) { reject(value); }); });
}
void Promise::setTimeout(int interval)
@@ -18,8 +18,7 @@ class LTSUTILSCORE_EXPORT Promise : public QObject
Q_OBJECT
public:
Promise(const std::function<void(ResultFunction resolve, ResultFunction reject)>& function,
QObject* parent = nullptr);
Promise(const std::function<void(ResultFunction resolve, ResultFunction reject)> &function, QObject *parent = nullptr);
void setFunction(const std::function<void(ResultFunction resolve, ResultFunction reject)> &function);
@@ -19,13 +19,20 @@ void PromiseExample1_Class::doSomethingAsync2()
QTimer::singleShot(450, this, [this]() { emit signalDone2(true, 1234); });
}
PromiseExample1::PromiseExample1(QObject* parent) : QObject(parent), m_success(false)
PromiseExample1::PromiseExample1(QObject *parent)
: QObject(parent)
, m_success(false)
{
auto func = [this](ResultFunction resolve, ResultFunction reject) {
auto func = [this](ResultFunction resolve, ResultFunction reject)
{
PromiseExample1_Class *c = new PromiseExample1_Class(this);
connect(c, &PromiseExample1_Class::signalDone1, this, [this, c, resolve, reject](bool didThisWork) {
connect(c,
&PromiseExample1_Class::signalDone1,
this,
[this, c, resolve, reject](bool didThisWork)
{
if (!didThisWork)
{
@@ -35,8 +42,11 @@ PromiseExample1::PromiseExample1(QObject* parent) : QObject(parent), m_success(f
else
{
connect(c, &PromiseExample1_Class::signalDone2, this,
[resolve, reject](bool didThisWork, int someNumberThatReturns) {
connect(c,
&PromiseExample1_Class::signalDone2,
this,
[resolve, reject](bool didThisWork, int someNumberThatReturns)
{
if (didThisWork)
resolve(someNumberThatReturns);
else
@@ -51,14 +61,19 @@ PromiseExample1::PromiseExample1(QObject* parent) : QObject(parent), m_success(f
};
Promise *p = new Promise(func, this);
p->resolved([this](const QVariant& value) {
p->resolved(
[this](const QVariant &value)
{
qDebug() << "example1 promise succeeded! 'someNumberThatReturns' was" << value;
m_success = true;
}).rejected([](const QVariant& value) { qDebug() << "example1 promise failed.." << value; });
})
.rejected([](const QVariant &value) { qDebug() << "example1 promise failed.." << value; });
}
PromiseExample2::PromiseExample2(QObject* parent) : QObject(parent), m_success(false)
PromiseExample2::PromiseExample2(QObject *parent)
: QObject(parent)
, m_success(false)
{
Promise* p = new Promise(
@@ -71,14 +86,19 @@ PromiseExample2::PromiseExample2(QObject* parent) : QObject(parent), m_success(f
p->resolved([](const QVariant &) { QFAIL("This test case's promise should never resolve"); });
p->rejected([this](const QVariant& val) {
p->rejected(
[this](const QVariant &val)
{
QVERIFY2(val == QStringLiteral("timeout"), "Promise didn't reject with string \"timeout\"");
qDebug() << "Promise rejected as expected";
m_success = true;
});
}
PromiseExample3::PromiseExample3(QObject* parent) : QObject(parent), m_success(true), m_alreadyRejected(false)
PromiseExample3::PromiseExample3(QObject *parent)
: QObject(parent)
, m_success(true)
, m_alreadyRejected(false)
{
Promise *p = new Promise([](ResultFunction, ResultFunction reject) { reject(QString()); }, this);
@@ -87,7 +107,9 @@ PromiseExample3::PromiseExample3(QObject* parent) : QObject(parent), m_success(t
p->resolved([](const QVariant &) { QFAIL("This test case's promise should never resolve"); });
p->rejected([this](const QVariant& val) {
p->rejected(
[this](const QVariant &val)
{
qDebug() << "rejected with val" << val;
QVERIFY2(val == QString(), "Promise didn't reject with an expected empty string.");
QVERIFY2(!m_alreadyRejected, "Promise rejected more than once");
@@ -25,10 +25,7 @@ class PromiseExample1 : public QObject
public:
explicit PromiseExample1(QObject *parent = nullptr);
[[nodiscard]] bool isSuccess() const
{
return m_success;
}
[[nodiscard]] bool isSuccess() const { return m_success; }
private:
bool m_success;
@@ -40,10 +37,7 @@ class PromiseExample2 : public QObject
public:
explicit PromiseExample2(QObject *parent = nullptr);
[[nodiscard]] bool isSuccess() const
{
return m_success;
}
[[nodiscard]] bool isSuccess() const { return m_success; }
private:
bool m_success;
@@ -55,10 +49,7 @@ class PromiseExample3 : public QObject
public:
explicit PromiseExample3(QObject *parent = nullptr);
[[nodiscard]] bool isSuccess() const
{
return m_success;
}
[[nodiscard]] bool isSuccess() const { return m_success; }
private:
bool m_success;
@@ -23,7 +23,8 @@ template <typename T> void inline set8Byte(const T in, QByteArray& out)
template <> void inline set8Byte(const double in, QByteArray &out)
{
union hack {
union hack
{
double d;
int64_t i;
} h;
@@ -64,7 +65,8 @@ template <> bool inline get8Byte(const QByteArray& baData, size_t& pos, double&
{
out = 0.;
union hack {
union hack
{
double d;
int64_t i;
} h;
@@ -6,7 +6,9 @@ namespace LtsUtils
{
QPlane3D::QPlane3D(const QPoint3D &pos, const QPoint3D &vec1, const QPoint3D &vec2)
: m_pos(pos), m_vec1(vec1), m_vec2(vec2)
: m_pos(pos)
, m_vec1(vec1)
, m_vec2(vec2)
{
m_normal = QPoint3D::crossProduct(m_vec1, m_vec2);
m_planeC = QPoint3D::dotProduct(m_pos, m_normal);
@@ -44,7 +46,8 @@ double QPlane3D::distanceTo(const QPoint3D& point) const
}
QPolygon3D::QPolygon3D(const QVector<QPoint3D> &vertices)
: QPlane3D(vertices[0], vertices[1], vertices[2]), m_vertices(vertices)
: QPlane3D(vertices[0], vertices[1], vertices[2])
, m_vertices(vertices)
{
}
@@ -23,30 +23,15 @@ class LTSUTILSCORE_EXPORT QPlane3D
bool inPlane(const QPoint3D &point) const;
double distanceTo(const QPoint3D &point) const;
const QPoint3D& pos() const
{
return m_pos;
}
const QPoint3D &pos() const { return m_pos; }
const QPoint3D& vec1() const
{
return m_vec1;
}
const QPoint3D &vec1() const { return m_vec1; }
const QPoint3D& vec2() const
{
return m_vec2;
}
const QPoint3D &vec2() const { return m_vec2; }
const QPoint3D& normal() const
{
return m_normal;
}
const QPoint3D &normal() const { return m_normal; }
double planeC() const
{
return m_planeC;
}
double planeC() const { return m_planeC; }
protected:
QPoint3D m_pos;
@@ -62,10 +47,7 @@ class LTSUTILSCORE_EXPORT QPolygon3D : public QPlane3D
public:
QPolygon3D(const QVector<QPoint3D> &vertices);
bool contains(const QPoint3D& point) const
{
return m_vertices.contains(point);
}
bool contains(const QPoint3D &point) const { return m_vertices.contains(point); }
bool containsPoint(const QPoint3D &point) const;
@@ -16,12 +16,21 @@ namespace LtsUtils
class QPoint3D
{
public:
enum class Axis { X, Y, Z };
enum class Axis
{
X,
Y,
Z
};
constexpr QPoint3D() = default;
constexpr QPoint3D(double xpos, double ypos, double zpos);
template <typename T> explicit QPoint3D(const T& data) : xp(data.offsetX()), yp(data.offsetY()), zp(data.offsetZ())
template <typename T>
explicit QPoint3D(const T &data)
: xp(data.offsetX())
, yp(data.offsetY())
, zp(data.offsetZ())
{
}
@@ -40,20 +49,11 @@ class QPoint3D
constexpr inline QPointF toPointF() const;
static QPoint3D fromQPointF(const QPointF& p)
{
return QPoint3D(p.x(), p.y(), .0);
}
static QPoint3D fromQPointF(const QPointF &p) { return QPoint3D(p.x(), p.y(), .0); }
inline double lengthSquared() const
{
return (xp * xp) + (yp * yp) + (zp * zp);
}
inline double lengthSquared() const { return (xp * xp) + (yp * yp) + (zp * zp); }
inline double length() const
{
return std::sqrt(lengthSquared());
}
inline double length() const { return std::sqrt(lengthSquared()); }
inline void normalize()
{
@@ -85,21 +85,24 @@ class QPoint3D
const double cos = std::cos(phi);
switch (axis)
{
case Axis::X: {
case Axis::X:
{
const double _yp = (cos * yp) - (sin * zp);
const double _zp = (sin * yp) + (cos * zp);
yp = _yp;
zp = _zp;
break;
}
case Axis::Y: {
case Axis::Y:
{
const double _xp = (cos * xp) + (sin * zp);
const double _zp = (-sin * xp) + (cos * zp);
xp = _xp;
zp = _zp;
break;
}
case Axis::Z: {
case Axis::Z:
{
const double _xp = (cos * xp) - (sin * yp);
const double _yp = (sin * xp) + (cos * yp);
xp = _xp;
@@ -123,47 +126,26 @@ class QPoint3D
QPoint3D p = point + dotProduct(*this - point, direction) * direction;
return (*this - p).length();
}
inline double distanceToPlane(const QPoint3D& plane, const QPoint3D& normal) const
{
return dotProduct(*this - plane, normal);
}
inline double distanceToPlane(const QPoint3D &plane, const QPoint3D &normal) const { return dotProduct(*this - plane, normal); }
inline double distanceToPlane(const QPoint3D &plane1, const QPoint3D &plane2, const QPoint3D &plane3) const
{
QPoint3D n = normal(plane2 - plane1, plane3 - plane1);
return dotProduct(*this - plane1, n);
}
inline double distanceToPoint(const QPoint3D& point) const
{
return (*this - point).length();
}
inline double distanceToPoint(const QPoint3D &point) const { return (*this - point).length(); }
friend constexpr inline bool operator==(const QPoint3D &p1, const QPoint3D &p2);
friend constexpr inline bool operator!=(const QPoint3D &p1, const QPoint3D &p2);
friend constexpr inline QPoint3D operator+(const QPoint3D& p1, const QPoint3D& p2)
{
return QPoint3D(p1.xp + p2.xp, p1.yp + p2.yp, p1.zp + p2.zp);
}
friend constexpr inline QPoint3D operator+(const QPoint3D &p1, const QPoint3D &p2) { return QPoint3D(p1.xp + p2.xp, p1.yp + p2.yp, p1.zp + p2.zp); }
friend constexpr inline QPoint3D operator-(const QPoint3D& p1, const QPoint3D& p2)
{
return QPoint3D(p1.xp - p2.xp, p1.yp - p2.yp, p1.zp - p2.zp);
}
friend constexpr inline QPoint3D operator-(const QPoint3D &p1, const QPoint3D &p2) { return QPoint3D(p1.xp - p2.xp, p1.yp - p2.yp, p1.zp - p2.zp); }
friend constexpr inline QPoint3D operator*(const QPoint3D& p1, double factor)
{
return QPoint3D(p1.xp * factor, p1.yp * factor, p1.zp * factor);
}
friend constexpr inline QPoint3D operator*(const QPoint3D &p1, double factor) { return QPoint3D(p1.xp * factor, p1.yp * factor, p1.zp * factor); }
friend constexpr inline QPoint3D operator*(double factor, const QPoint3D& p1)
{
return QPoint3D(p1.xp * factor, p1.yp * factor, p1.zp * factor);
}
friend constexpr inline QPoint3D operator*(double factor, const QPoint3D &p1) { return QPoint3D(p1.xp * factor, p1.yp * factor, p1.zp * factor); }
friend constexpr inline QPoint3D operator/(const QPoint3D& p1, double factor)
{
return QPoint3D(p1.xp / factor, p1.yp / factor, p1.zp / factor);
}
friend constexpr inline QPoint3D operator/(const QPoint3D &p1, double factor) { return QPoint3D(p1.xp / factor, p1.yp / factor, p1.zp / factor); }
constexpr inline QPoint3D &operator+=(const QPoint3D &o)
{
@@ -197,25 +179,16 @@ class QPoint3D
return *this;
}
constexpr static inline double dotProduct(const QPoint3D& v1, const QPoint3D& v2)
{
return v1.xp * v2.xp + v1.yp * v2.yp + v1.zp * v2.zp;
}
constexpr static inline double dotProduct(const QPoint3D &v1, const QPoint3D &v2) { return v1.xp * v2.xp + v1.yp * v2.yp + v1.zp * v2.zp; }
constexpr static inline QPoint3D crossProduct(const QPoint3D &v1, const QPoint3D &v2)
{
return QPoint3D(v1.yp * v2.zp - v1.zp * v2.yp, v1.zp * v2.xp - v1.xp * v2.zp, v1.xp * v2.yp - v1.yp * v2.xp);
}
static inline QPoint3D normal(const QPoint3D& v1, const QPoint3D& v2)
{
return crossProduct(v1, v2).normalized();
}
static inline QPoint3D normal(const QPoint3D &v1, const QPoint3D &v2) { return crossProduct(v1, v2).normalized(); }
static inline QPoint3D normal(const QPoint3D& v1, const QPoint3D& v2, const QPoint3D& v3)
{
return crossProduct((v2 - v1), (v3 - v1)).normalized();
}
static inline QPoint3D normal(const QPoint3D &v1, const QPoint3D &v2, const QPoint3D &v3) { return crossProduct((v2 - v1), (v3 - v1)).normalized(); }
friend inline bool qFuzzyCompare(const QPoint3D &v1, const QPoint3D &v2)
{
@@ -231,7 +204,12 @@ class QPoint3D
// QDataStream& operator<<(QDataStream& s, const QPoint3D& p);
// QDataStream& operator>>(QDataStream& s, QPoint3D& p);
constexpr inline QPoint3D::QPoint3D(double xpos, double ypos, double zpos) : xp(xpos), yp(ypos), zp(zpos) {}
constexpr inline QPoint3D::QPoint3D(double xpos, double ypos, double zpos)
: xp(xpos)
, yp(ypos)
, zp(zpos)
{
}
inline bool QPoint3D::isNull() const
{
@@ -7,7 +7,8 @@
namespace LtsUtils
{
ScopedConnection::ScopedConnection(IConnection* connection, Qt::ConnectionType connType) : m_conn(connection)
ScopedConnection::ScopedConnection(IConnection *connection, Qt::ConnectionType connType)
: m_conn(connection)
{
Q_ASSERT(connection);
m_conn->connect(connType);
@@ -12,40 +12,19 @@ namespace LtsUtils
class LTSUTILSCORE_EXPORT SfmMessage
{
public:
unsigned int id() const
{
return m_id;
}
unsigned int id() const { return m_id; }
void setId(unsigned int id)
{
m_id = id;
}
void setId(unsigned int id) { m_id = id; }
bool rtr() const
{
return m_rtr;
}
bool rtr() const { return m_rtr; }
void setRtr(bool rtr)
{
m_rtr = rtr;
}
void setRtr(bool rtr) { m_rtr = rtr; }
QByteArray payload() const
{
return m_payload;
}
QByteArray payload() const { return m_payload; }
void setPayload(const QByteArray& payload)
{
m_payload = payload;
}
void setPayload(const QByteArray &payload) { m_payload = payload; }
bool operator==(const SfmMessage& msg) const
{
return (m_id == msg.id() && m_rtr == msg.rtr() && m_payload == msg.payload());
}
bool operator==(const SfmMessage &msg) const { return (m_id == msg.id() && m_rtr == msg.rtr() && m_payload == msg.payload()); }
protected:
unsigned int m_id = 0;
@@ -12,8 +12,7 @@ int ConnectingDialog::s_waitForHistoricalDataWaitTime = 10000;
void ConnectingDialog::reset()
{
m_ui->label->setText(QStringLiteral("<font color='orange'>%1</font>")
.arg(tr("Connecting to %1 on %2 ...").arg(m_serviceName, m_exerciseName)));
m_ui->label->setText(QStringLiteral("<font color='orange'>%1</font>").arg(tr("Connecting to %1 on %2 ...").arg(m_serviceName, m_exerciseName)));
}
void ConnectingDialog::setup()
@@ -22,7 +21,11 @@ void ConnectingDialog::setup()
m_ui->setupUi(this);
reset();
setMinimumSize(sizeHint());
connect(m_ui->pbRetry, &QPushButton::clicked, this, [this]() {
connect(m_ui->pbRetry,
&QPushButton::clicked,
this,
[this]()
{
m_ui->pbRetry->setEnabled(false);
m_ui->pbIgnore->setEnabled(false);
@@ -30,7 +33,11 @@ void ConnectingDialog::setup()
emit signalStopLoop();
});
connect(m_ui->pbIgnore, &QPushButton::clicked, this, [this]() {
connect(m_ui->pbIgnore,
&QPushButton::clicked,
this,
[this]()
{
m_ui->pbIgnore->setEnabled(false);
m_ui->pbRetry->setEnabled(false);
m_ui->pbIgnore->setText(tr("continuing.."));
@@ -47,8 +54,7 @@ ConnectingDialog::~ConnectingDialog()
void ConnectingDialog::failed()
{
m_ui->label->setText(QStringLiteral("<font color='red'>%1</font>")
.arg(tr("Could not connect to %1 on %2 !").arg(m_serviceName, m_exerciseName)));
m_ui->label->setText(QStringLiteral("<font color='red'>%1</font>").arg(tr("Could not connect to %1 on %2 !").arg(m_serviceName, m_exerciseName)));
m_ui->pbRetry->setEnabled(true);
m_ui->pbIgnore->setEnabled(true);
@@ -25,10 +25,15 @@ class LTSUTILSGUICONNECTDIALOG_EXPORT ConnectingDialog : public LtsWidgets::LtsF
static int s_waitForHistoricalDataWaitTime;
template <typename DtcType, typename WaitForHistoricalDataFunction>
explicit ConnectingDialog(DtcType dtc, WaitForHistoricalDataFunction waitForHistoricalDataFunction,
const QString& serviceName, const QString& exerciseName, QWidget* parent = nullptr)
: LtsWidgets::LtsFramelessDialog(parent, LtsWidgets::Behaviour::Modal), m_serviceName(serviceName),
m_exerciseName(exerciseName), m_ui(nullptr)
explicit ConnectingDialog(DtcType dtc,
WaitForHistoricalDataFunction waitForHistoricalDataFunction,
const QString &serviceName,
const QString &exerciseName,
QWidget *parent = nullptr)
: LtsWidgets::LtsFramelessDialog(parent, LtsWidgets::Behaviour::Modal)
, m_serviceName(serviceName)
, m_exerciseName(exerciseName)
, m_ui(nullptr)
{
setWindowTitle(tr("Connecting .."));
setup();
@@ -12,16 +12,23 @@
namespace LtsUtils
{
ConnectingDialogNT::ConnectingDialogNT(const std::function<bool(int)>& checkFn, const QString& serviceName,
const QString& exerciseName, QWidget* parent)
: LtsWidgets::LtsFramelessDialog(parent, LtsWidgets::Behaviour::Modal), m_serviceName(serviceName),
m_exerciseName(exerciseName), m_checkFn(checkFn), m_go(false), m_autoRetryTimer(new QTimer(this)),
m_ui(new Ui::ConnectingDialog)
ConnectingDialogNT::ConnectingDialogNT(const std::function<bool(int)> &checkFn, const QString &serviceName, const QString &exerciseName, QWidget *parent)
: LtsWidgets::LtsFramelessDialog(parent, LtsWidgets::Behaviour::Modal)
, m_serviceName(serviceName)
, m_exerciseName(exerciseName)
, m_checkFn(checkFn)
, m_go(false)
, m_autoRetryTimer(new QTimer(this))
, m_ui(new Ui::ConnectingDialog)
{
m_ui->setupUi(this);
m_autoRetryTimer->setInterval(1000);
connect(m_autoRetryTimer, &QTimer::timeout, this, [this]() {
connect(m_autoRetryTimer,
&QTimer::timeout,
this,
[this]()
{
if (m_autoRetryTick < 1)
{
slotRetry();
@@ -36,7 +43,11 @@ ConnectingDialogNT::ConnectingDialogNT(const std::function<bool(int)>& checkFn,
setMinimumSize(sizeHint());
connect(m_ui->pbRetry, &QPushButton::clicked, this, &ConnectingDialogNT::slotRetry);
connect(m_ui->pbIgnore, &QPushButton::clicked, this, [this]() {
connect(m_ui->pbIgnore,
&QPushButton::clicked,
this,
[this]()
{
m_ui->pbIgnore->setEnabled(false);
m_ui->pbRetry->setEnabled(false);
m_ui->pbIgnore->setText(tr("continuing.."));
@@ -103,8 +114,7 @@ void ConnectingDialogNT::slotGo()
void ConnectingDialogNT::reset()
{
m_ui->label->setText(QStringLiteral("<font color='orange'>%1</font>")
.arg(tr("Connecting to %1 on %2 ...").arg(m_serviceName, m_exerciseName)));
m_ui->label->setText(QStringLiteral("<font color='orange'>%1</font>").arg(tr("Connecting to %1 on %2 ...").arg(m_serviceName, m_exerciseName)));
}
ConnectingDialogNT::~ConnectingDialogNT()
@@ -114,8 +124,7 @@ ConnectingDialogNT::~ConnectingDialogNT()
void ConnectingDialogNT::failed()
{
m_ui->label->setText(QStringLiteral("<font color='red'>%1</font>")
.arg(tr("Could not connect to %1 on %2 !").arg(m_serviceName, m_exerciseName)));
m_ui->label->setText(QStringLiteral("<font color='red'>%1</font>").arg(tr("Could not connect to %1 on %2 !").arg(m_serviceName, m_exerciseName)));
m_ui->pbRetry->setEnabled(true);
m_ui->pbIgnore->setEnabled(true);
@@ -22,8 +22,7 @@ class LTSUTILSGUICONNECTDIALOG_EXPORT ConnectingDialogNT : public LtsWidgets::Lt
Q_OBJECT
public:
explicit ConnectingDialogNT(const std::function<bool(int)>& checkFn, const QString& serviceName,
const QString& exerciseName, QWidget* parent);
explicit ConnectingDialogNT(const std::function<bool(int)> &checkFn, const QString &serviceName, const QString &exerciseName, QWidget *parent);
~ConnectingDialogNT();
void failed();
@@ -20,11 +20,18 @@ namespace LtsUtils
{
bool RequestHelper::s_debug = false;
RequestHelper::RequestHelper(QObject* parent, bool quiet,
RequestHelper::RequestHelper(QObject *parent,
bool quiet,
const std::function<void(void)>& success, const std::function<void(void)>& failure)
: QObject(parent), m_failed(false), m_repliedId(-1), m_quiet(quiet), m_blockingCall(true), m_successFn(success),
m_failureFn(failure)
const std::function<void(void)> &success,
const std::function<void(void)> &failure)
: QObject(parent)
, m_failed(false)
, m_repliedId(-1)
, m_quiet(quiet)
, m_blockingCall(true)
, m_successFn(success)
, m_failureFn(failure)
{
connect(this, &RequestHelper::signalSuccess, this, m_successFn, Qt::QueuedConnection);
connect(this, &RequestHelper::signalFailed, this, m_failureFn, Qt::QueuedConnection);
@@ -45,8 +52,7 @@ RequestHelper::RequestHelper(QObject* parent, bool quiet,
}
}
void RequestHelper::addRequest(const std::function<int64_t()>& requestFunction,
const std::function<void(const Core::FunctionReply& baseReply)>& baseReplyHandler)
void RequestHelper::addRequest(const std::function<int64_t()> &requestFunction, const std::function<void(const Core::FunctionReply &baseReply)> &baseReplyHandler)
{
m_requestFunctions.append(RequestFunctionContainer(requestFunction, baseReplyHandler));
}
@@ -75,13 +81,11 @@ bool RequestHelper::_requestReply(const Core::FunctionReplyObject& fro, const Co
{
if (m_blockingCall)
{
LtsWidgets::LtsMessageDialog::showMessage(qobject_cast<QWidget*>(parent()), m_errorString,
tr("Request failed"));
LtsWidgets::LtsMessageDialog::showMessage(qobject_cast<QWidget *>(parent()), m_errorString, tr("Request failed"));
}
else
{
new LtsWidgets::LtsMessageDialogNew(qobject_cast<QWidget*>(parent()), m_errorString,
tr("Request failed"));
new LtsWidgets::LtsMessageDialogNew(qobject_cast<QWidget *>(parent()), m_errorString, tr("Request failed"));
}
}
}
@@ -94,8 +98,7 @@ bool RequestHelper::_requestReply(const Core::FunctionReplyObject& fro, const Co
if (baseReply)
m_singleRequestCustomFunctionReply(*baseReply);
else
m_singleRequestCustomFunctionReply(
Core::FunctionReply(fro.id(), fro.str(), fro.args(), fro.additionalInfo()));
m_singleRequestCustomFunctionReply(Core::FunctionReply(fro.id(), fro.str(), fro.args(), fro.additionalInfo()));
}
if (fro.error())
@@ -108,8 +111,7 @@ bool RequestHelper::_requestReply(const Core::FunctionReplyObject& fro, const Co
return true;
}
bool RequestHelper::startSingleRequest(
const std::function<int64_t()>& requestFunction,
bool RequestHelper::startSingleRequest(const std::function<int64_t()> &requestFunction,
const std::function<void(const Core::FunctionReply &baseReply)> &baseReplyHandler)
{
addRequest(requestFunction, baseReplyHandler);
@@ -171,7 +173,9 @@ void RequestHelper::slotNextRequest()
else
{
connect(new LtsWidgets::LtsMessageDialogNew(qobject_cast<QWidget *>(parent()), tr("Request failed")),
&LtsWidgets::LtsMessageDialogNew::destroyed, this, [this]() { failure(); });
&LtsWidgets::LtsMessageDialogNew::destroyed,
this,
[this]() { failure(); });
return;
}
@@ -181,8 +185,7 @@ void RequestHelper::slotNextRequest()
}
}
void RequestHelper::startSingleBackgroundRequest(
const std::function<int64_t()>& requestFunction,
void RequestHelper::startSingleBackgroundRequest(const std::function<int64_t()> &requestFunction,
const std::function<void(const Core::FunctionReply &)> &baseReplyHandler)
{
m_blockingCall = false;
@@ -27,14 +27,12 @@
namespace LtsUtils
{
template<typename T>
dds::core::optional<T> toOptional(T inVal)
template <typename T> dds::core::optional<T> toOptional(T inVal)
{
return inVal != T() ? dds::core::optional<T>(inVal) : dds::core::optional<T>();
}
template<typename T>
dds::core::optional<T> optional()
template <typename T> dds::core::optional<T> optional()
{
return dds::core::optional<T>();
}
@@ -47,7 +45,9 @@ class LTSUTILSGUIDDS_INTERNAL_EXPORT RequestHelper : public QObject // TODO: DOC
public:
static bool s_debug;
explicit RequestHelper(QObject *parent = nullptr, bool quiet = false,
explicit RequestHelper(
QObject *parent = nullptr,
bool quiet = false,
// for non-blocking
const std::function<void(void)> &success = []() {},
const std::function<void(void)> &failure = []() {});
@@ -55,13 +55,13 @@ public:
bool quiet() const { return m_quiet; }
void setQuiet(bool quiet) { m_quiet = quiet; }
void addRequest(const std::function<int64_t()> &requestFunction,
const std::function<void(const Core::FunctionReply &baseReply)> &baseReplyHandler = nullptr);
void addRequest(const std::function<int64_t()> &requestFunction, const std::function<void(const Core::FunctionReply &baseReply)> &baseReplyHandler = nullptr);
bool startRequests(); // blocks!
// do not throw a message if this method fails, as this method does this already // blocks!
bool startSingleRequest(const std::function<int64_t(void)> &requestFunction,
const std::function<void(const Core::FunctionReply &baseReply)> &baseReplyHandler = nullptr // for replies that return a custom FunctionReply, which has to be handled >>after successful execution<<
const std::function<void(const Core::FunctionReply &baseReply)> &baseReplyHandler =
nullptr // for replies that return a custom FunctionReply, which has to be handled >>after successful execution<<
);
// non-blocking !
@@ -134,7 +134,6 @@ signals:
private slots:
void slotNextRequest();
};
} // namespace LtsUtils
@@ -31,8 +31,7 @@ bool StyleManager::loadStyle(const QString& stylePluginName, bool highDpi)
if (sp == nullptr)
{
qWarning() << "StyleManager::loadStyle: could not unload style plugin - wrong type ("
<< pluginInstance->metaObject()->className() << ") - new style not loaded";
qWarning() << "StyleManager::loadStyle: could not unload style plugin - wrong type (" << pluginInstance->metaObject()->className() << ") - new style not loaded";
return false;
}
@@ -46,8 +45,8 @@ bool StyleManager::loadStyle(const QString& stylePluginName, bool highDpi)
QPluginLoader *stylePluginLoader = nullptr;
int pluginsLoaded = 0;
std::function<bool(const LtsPluginManager::PluginInstance& pi)> loadPluginFn =
[&stylePluginLoader, &pluginsLoaded](const LtsPluginManager::PluginInstance& pi) {
std::function<bool(const LtsPluginManager::PluginInstance &pi)> loadPluginFn = [&stylePluginLoader, &pluginsLoaded](const LtsPluginManager::PluginInstance &pi)
{
stylePluginLoader = pi.pluginLoader;
pluginsLoaded++;
return true;
@@ -61,15 +60,13 @@ bool StyleManager::loadStyle(const QString& stylePluginName, bool highDpi)
if (pluginsLoaded == 0)
{
qWarning() << "StyleManager::loadStyle: Could not find Style Plugin" << stylePluginName
<< "- using default Qt style";
qWarning() << "StyleManager::loadStyle: Could not find Style Plugin" << stylePluginName << "- using default Qt style";
return false;
}
if (pluginsLoaded > 1)
{
qWarning() << "StyleManager::loadStyle: Style Plugin" << stylePluginName
<< " is ambiguous - using default Qt style";
qWarning() << "StyleManager::loadStyle: Style Plugin" << stylePluginName << " is ambiguous - using default Qt style";
return false;
}
@@ -83,8 +80,8 @@ bool StyleManager::loadStyle(const QString& stylePluginName, bool highDpi)
if (sp == nullptr)
{
qWarning() << "StyleManager::loadStyle: could not load style plugin - wrong type ("
<< stylePluginLoader->instance()->metaObject()->className() << ") - new style not loaded";
qWarning() << "StyleManager::loadStyle: could not load style plugin - wrong type (" << stylePluginLoader->instance()->metaObject()->className()
<< ") - new style not loaded";
return false;
}
@@ -21,10 +21,7 @@ class LTSUTILSGUISTYLEMANAGER_EXPORT StyleManager : public QObject
bool loadStyle(const QString &stylePluginName, bool highDpi = false);
const QString& currentStyleName() const
{
return m_stylePluginName;
}
const QString &currentStyleName() const { return m_stylePluginName; }
private:
friend struct StyleManagerHandler;
@@ -16,7 +16,8 @@
namespace LtsUtils
{
enum class SettingType {
enum class SettingType
{
String = 1,
StringList = 2,
Json = 3,
@@ -133,7 +134,8 @@ bool ProjectSettings::initFromFile(const QString& filename)
case SettingType::Json:
val = QJsonDocument(jVal.toObject()).toJson();
break;
case SettingType::StringList: {
case SettingType::StringList:
{
const QJsonArray arr(jVal.toArray());
QStringList sl;
sl.reserve(arr.size());
@@ -161,8 +163,7 @@ bool ProjectSettings::initFromFile(const QString& filename)
bool ProjectSettings::isFunctionEnabled(const QString &group, const QString &function)
{
const QStringList functionNames =
getInstance()->value(QStringLiteral("Functionalities"), QStringLiteral("IdentifierList")).toStringList();
const QStringList functionNames = getInstance()->value(QStringLiteral("Functionalities"), QStringLiteral("IdentifierList")).toStringList();
return functionNames.contains(group + QLatin1Char(':') + function);
}
@@ -11,7 +11,9 @@ namespace LtsWebSocket
{
ClientConnection::ClientConnection(QWebSocket *socket, QObject *parent)
: QThread(parent), m_logger(getLogger("LtsWebSocket.ClientConnection")), m_socket(socket ? socket : new QWebSocket)
: QThread(parent)
, m_logger(getLogger("LtsWebSocket.ClientConnection"))
, m_socket(socket ? socket : new QWebSocket)
{
}
@@ -32,8 +34,7 @@ bool ClientConnection::init()
}
DEBUG_LOG(m_logger) << "Started new thread" << this;
connect(m_socket, &QWebSocket::textMessageReceived, this, &ClientConnection::onNewTextMessageFromSocket,
Qt::DirectConnection);
connect(m_socket, &QWebSocket::textMessageReceived, this, &ClientConnection::onNewTextMessageFromSocket, Qt::DirectConnection);
connect(m_socket, &QWebSocket::connected, this, &ClientConnection::sendMessagesFromQueue);
connect(m_socket, &QWebSocket::disconnected, this, &ClientConnection::onSocketDisconnect);
@@ -79,8 +80,7 @@ void ClientConnection::sendMessagesFromQueue()
void ClientConnection::onSocketDisconnect()
{
DEBUG_LOG(m_logger) << "Client disconnected ip: " << m_socket->peerAddress().toString() << ":"
<< m_socket->peerPort();
DEBUG_LOG(m_logger) << "Client disconnected ip: " << m_socket->peerAddress().toString() << ":" << m_socket->peerPort();
exit(0);
emit disconnected(this);
}
@@ -12,7 +12,10 @@
#ifdef QT6_WEBSOCKETS_AVAILABLE
class QWebSocket;
#else
namespace LtsWebSocket { class QWebSocketStub; }
namespace LtsWebSocket
{
class QWebSocketStub;
}
using QWebSocket = LtsWebSocket::QWebSocketStub;
namespace LtsWebSocket
{
@@ -32,7 +35,9 @@ class QWebSocketStub
namespace LtsWebSocket
{
class LTSWEBSOCKETSERVER_EXPORT ClientConnection : public QThread, public ReplyHandler
class LTSWEBSOCKETSERVER_EXPORT ClientConnection
: public QThread
, public ReplyHandler
{
Q_OBJECT
public:
@@ -45,10 +50,7 @@ class LTSWEBSOCKETSERVER_EXPORT ClientConnection : public QThread, public ReplyH
void addReply(ReplyMessage *message) override;
QWebSocket* webSocket()
{
return m_socket;
}
QWebSocket *webSocket() { return m_socket; }
#else
bool init() { return false; }
void addReply(ReplyMessage * /*message*/) override {}
@@ -10,7 +10,8 @@ namespace LtsWebSocket
{
InvalidMessage::InvalidMessage(ReplyHandler *client, const QString &uuid, const QString &errorText)
: AbstractClientMessage(client, QString(), 1, uuid), m_errorText(errorText)
: AbstractClientMessage(client, QString(), 1, uuid)
, m_errorText(errorText)
{
}
@@ -14,9 +14,12 @@ namespace LtsWebSocket
class LTSWEBSOCKETCOMMON_EXPORT AbstractClientMessage
{
public:
AbstractClientMessage(ReplyHandler* client, const QString& type, const int typeId, const QString& uuid,
const QJsonValue& data = QJsonValue())
: m_type(type), m_typeId(typeId), m_uuid(uuid), m_data(data), m_client(client)
AbstractClientMessage(ReplyHandler *client, const QString &type, const int typeId, const QString &uuid, const QJsonValue &data = QJsonValue())
: m_type(type)
, m_typeId(typeId)
, m_uuid(uuid)
, m_data(data)
, m_client(client)
{
}
@@ -26,10 +29,7 @@ class LTSWEBSOCKETCOMMON_EXPORT AbstractClientMessage
virtual bool hasValidData() const = 0;
void reply(ReplyMessage* reply)
{
m_client->addReply(reply);
}
void reply(ReplyMessage *reply) { m_client->addReply(reply); }
protected:
const QString m_type;
@@ -41,8 +41,7 @@ AbstractClientMessage* AbstractClientMessageFactory::checkAttributes(ReplyHandle
return new LtsWebSocket::InvalidMessage(client, m_uuid, QStringLiteral("Message has no type"));
}
AbstractClientMessage* AbstractClientMessageFactory::checkResult(ReplyHandler* client, const QString& message,
AbstractClientMessage* result) const
AbstractClientMessage *AbstractClientMessageFactory::checkResult(ReplyHandler *client, const QString &message, AbstractClientMessage *result) const
{
if (result == nullptr)
{
@@ -20,7 +20,10 @@ namespace LtsWebSocket
class LTSWEBSOCKETCOMMON_EXPORT AbstractClientMessageFactory
{
public:
explicit AbstractClientMessageFactory(NGL::INGLLogger& logger) : m_logger(logger) {}
explicit AbstractClientMessageFactory(NGL::INGLLogger &logger)
: m_logger(logger)
{
}
virtual ~AbstractClientMessageFactory() {}
@@ -30,8 +33,7 @@ class LTSWEBSOCKETCOMMON_EXPORT AbstractClientMessageFactory
protected:
AbstractClientMessage *checkAttributes(ReplyHandler *client, const QString &message) const;
AbstractClientMessage* checkResult(ReplyHandler* client, const QString& message,
AbstractClientMessage* result) const;
AbstractClientMessage *checkResult(ReplyHandler *client, const QString &message, AbstractClientMessage *result) const;
protected:
NGL::INGLLogger &m_logger;
@@ -44,22 +46,17 @@ class LTSWEBSOCKETCOMMON_EXPORT AbstractClientMessageFactory
class PongMessage final : public ReplyMessage
{
public:
static QString strPong()
static QString strPong() { return QStringLiteral("pong"); }
static int idPong() { return 2; }
explicit PongMessage(const QString &payload)
: ReplyMessage(strPong(), idPong(), QString())
, m_payload(payload)
{
return QStringLiteral("pong");
}
static int idPong()
{
return 2;
}
explicit PongMessage(const QString& payload) : ReplyMessage(strPong(), idPong(), QString()), m_payload(payload) {}
QString toJsonString() const override
{
return m_payload.isEmpty() ? strPong() : QStringLiteral("%1 %2").arg(strPong(), m_payload);
}
QString toJsonString() const override { return m_payload.isEmpty() ? strPong() : QStringLiteral("%1 %2").arg(strPong(), m_payload); }
private:
QString m_payload;
@@ -13,7 +13,9 @@
using namespace LtsWebSocket;
ConnectionHandler::ConnectionHandler(QObject *parent)
: QObject(parent), m_logger(getLogger("LtsWebSocket.ConnectionHandler")), m_server(nullptr)
: QObject(parent)
, m_logger(getLogger("LtsWebSocket.ConnectionHandler"))
, m_server(nullptr)
{
}
@@ -70,8 +72,7 @@ void ConnectionHandler::onNewConnection()
QWebSocket *socket = m_server->nextPendingConnection();
ClientConnection *newConnection = new ClientConnection(socket, this);
connect(newConnection, &ClientConnection::destroyed, this,
[this](QObject* o) { m_connections.remove(static_cast<ClientConnection*>(o)); });
connect(newConnection, &ClientConnection::destroyed, this, [this](QObject *o) { m_connections.remove(static_cast<ClientConnection *>(o)); });
if (!newConnection->init())
{
@@ -88,8 +89,7 @@ void ConnectionHandler::onNewConnection()
m_connections.insert(newConnection);
emit clientConnected(newConnection);
INFO_LOG(m_logger) << "New client connected ip: " << socket->localAddress().toString() << ":"
<< socket->localPort();
INFO_LOG(m_logger) << "New client connected ip: " << socket->localAddress().toString() << ":" << socket->localPort();
}
}
#endif
@@ -11,9 +11,18 @@
#include <QtWebSockets/QWebSocketServer>
#include <QtWebSockets/qwebsocketprotocol.h>
#else
namespace LtsWebSocket { class QWebSocketServerStub; }
namespace LtsWebSocket
{
class QWebSocketServerStub;
}
using QWebSocketServer = LtsWebSocket::QWebSocketServerStub;
namespace QWebSocketProtocol { enum class CloseCode { NormalClosure = 1000 }; }
namespace QWebSocketProtocol
{
enum class CloseCode
{
NormalClosure = 1000
};
}
#endif
namespace LtsWebSocket
@@ -34,10 +43,7 @@ class ConnectionHandler : public QObject
void sendToAllClients(ReplyMessage *message);
unsigned short webSocketPort()
{
return m_server->serverPort();
}
unsigned short webSocketPort() { return m_server->serverPort(); }
#else
bool init(const QString & /*serviceName*/, unsigned short /*port*/) { return false; }
void sendToAllClients(ReplyMessage * /*message*/) {}
@@ -13,7 +13,8 @@ template <typename T> class DataManagerBaseDl
{
protected:
explicit DataManagerBaseDl(const std::shared_ptr<T> &dbInterface, NGL::INGLLogger &logger)
: m_logger(logger), m_dbInterface(dbInterface)
: m_logger(logger)
, m_dbInterface(dbInterface)
{
}
@@ -14,8 +14,7 @@ class WebSocketHelper : public QObject
{
Q_OBJECT
public:
WebSocketHelper(AbstractClientMessageFactory* messageFactory, LtsWebSocketClient* webSocketClient,
NGL::INGLLogger& logger);
WebSocketHelper(AbstractClientMessageFactory *messageFactory, LtsWebSocketClient *webSocketClient, NGL::INGLLogger &logger);
~WebSocketHelper();
public Q_SLOTS:
@@ -40,10 +39,12 @@ class WebSocketHelper : public QObject
NGL::INGLLogger &m_logger;
};
WebSocketHelper::WebSocketHelper(AbstractClientMessageFactory* messageFactory, LtsWebSocketClient* webSocketClient,
NGL::INGLLogger& logger)
: QObject(), m_messageFactory(messageFactory), m_webSocketClient(webSocketClient),
m_socket(new QWebSocket(QString(), QWebSocketProtocol::VersionLatest, this)), m_logger(logger)
WebSocketHelper::WebSocketHelper(AbstractClientMessageFactory *messageFactory, LtsWebSocketClient *webSocketClient, NGL::INGLLogger &logger)
: QObject()
, m_messageFactory(messageFactory)
, m_webSocketClient(webSocketClient)
, m_socket(new QWebSocket(QString(), QWebSocketProtocol::VersionLatest, this))
, m_logger(logger)
{
connect(m_socket, &QWebSocket::textMessageReceived, this, &WebSocketHelper::parseMessage);
connect(m_socket, &QWebSocket::textFrameReceived, this, &WebSocketHelper::dataReceived);
@@ -96,8 +97,7 @@ void WebSocketHelper::doSendTextMessage(const QString& msg)
void WebSocketHelper::onConnected()
{
INFO_LOG(m_logger) << "Connected to server url: " << m_socket->requestUrl().toDisplayString()
<< " using local port: " << m_socket->localPort();
INFO_LOG(m_logger) << "Connected to server url: " << m_socket->requestUrl().toDisplayString() << " using local port: " << m_socket->localPort();
emit connected();
}
@@ -128,19 +128,18 @@ void WebSocketHelper::parseMessage(const QString& message)
clientMessage = m_messageFactory->createMessage(m_webSocketClient, message);
else
{
WARNING_LOG(m_logger) << "Could not parse incoming message: '" << message
<< "', error: " << result.errorString();
clientMessage =
new InvalidMessage(m_webSocketClient, QString(),
QStringLiteral("Got message which is not JSON conform (%1)").arg(result.errorString()));
WARNING_LOG(m_logger) << "Could not parse incoming message: '" << message << "', error: " << result.errorString();
clientMessage = new InvalidMessage(m_webSocketClient, QString(), QStringLiteral("Got message which is not JSON conform (%1)").arg(result.errorString()));
}
if (clientMessage)
emit messageParsed(clientMessage);
}
LtsWebSocketClient::LtsWebSocketClient(AbstractClientMessageFactory *messageFactory, QObject *parent)
: QObject(parent), m_logger(getLogger("LtsWebSocketClient")), m_messageFactory(messageFactory),
m_webSocketHelperThread(new QThread(this))
: QObject(parent)
, m_logger(getLogger("LtsWebSocketClient"))
, m_messageFactory(messageFactory)
, m_webSocketHelperThread(new QThread(this))
{
m_webSocketHelper = new WebSocketHelper(m_messageFactory, this, m_logger);
m_webSocketHelper->moveToThread(m_webSocketHelperThread);
@@ -15,7 +15,9 @@ namespace LtsWebSocket
{
class WebSocketHelper;
class LTSWEBSOCKETCLIENT_EXPORT LtsWebSocketClient : public QObject, public ReplyHandler
class LTSWEBSOCKETCLIENT_EXPORT LtsWebSocketClient
: public QObject
, public ReplyHandler
{
Q_OBJECT
public:
@@ -12,8 +12,11 @@ namespace LtsWebSocket
{
LtsWebSocketServer::LtsWebSocketServer(AbstractClientMessageFactory *messageFactory, QObject *parent)
: QObject(parent), m_queueTimer(new QTimer(this)), m_messageFactory(messageFactory), m_connectionHandler(nullptr),
m_logger(getLogger("LtsWebSocket.Server"))
: QObject(parent)
, m_queueTimer(new QTimer(this))
, m_messageFactory(messageFactory)
, m_connectionHandler(nullptr)
, m_logger(getLogger("LtsWebSocket.Server"))
{
connect(m_queueTimer, &QTimer::timeout, this, &LtsWebSocketServer::onQueueTimerTimeout);
@@ -29,16 +32,13 @@ bool LtsWebSocketServer::init(const QString& serviceName, const unsigned short p
if (!m_connectionHandler->init(serviceName, port))
{
ERROR_LOG(m_logger) << "Could not init m_connectionHandler with servicename: " << serviceName
<< ((port == 0) ? QStringLiteral(" random port")
: QStringLiteral(" port: ") + QString::number(port));
<< ((port == 0) ? QStringLiteral(" random port") : QStringLiteral(" port: ") + QString::number(port));
m_connectionHandler.reset();
return false;
}
connect(m_connectionHandler.get(), &ConnectionHandler::newTextMessageFromClient, this,
&LtsWebSocketServer::onNewTextMessage);
connect(m_connectionHandler.get(), &ConnectionHandler::clientDisconnected, this,
&LtsWebSocketServer::clientDisconnected);
connect(m_connectionHandler.get(), &ConnectionHandler::newTextMessageFromClient, this, &LtsWebSocketServer::onNewTextMessage);
connect(m_connectionHandler.get(), &ConnectionHandler::clientDisconnected, this, &LtsWebSocketServer::clientDisconnected);
connect(m_connectionHandler.get(), &ConnectionHandler::clientConnected, this, &LtsWebSocketServer::clientConnected);
m_queueTimer->start(m_messageDelay);
@@ -105,11 +105,9 @@ void LtsWebSocketServer::onQueueTimerTimeout()
clientMessage = m_messageFactory->createMessage(credentials.client, credentials.message);
else
{
WARNING_LOG(m_logger) << "Could not parse incoming message: '" << credentials.message
<< "', error: " << result.errorString();
WARNING_LOG(m_logger) << "Could not parse incoming message: '" << credentials.message << "', error: " << result.errorString();
clientMessage =
new InvalidMessage(credentials.client, QString(), QStringLiteral("Got message which is not JSON conform"));
clientMessage = new InvalidMessage(credentials.client, QString(), QStringLiteral("Got message which is not JSON conform"));
}
if (clientMessage)
@@ -127,7 +125,9 @@ namespace LtsWebSocket
{
LtsWebSocketServer::LtsWebSocketServer(AbstractClientMessageFactory * /*messageFactory*/, QObject *parent)
: QObject(parent), m_queueTimer(new QTimer(this)), m_logger(getLogger("LtsWebSocket.Server"))
: QObject(parent)
, m_queueTimer(new QTimer(this))
, m_logger(getLogger("LtsWebSocket.Server"))
{
}
@@ -52,7 +52,11 @@ class LTSWEBSOCKETSERVER_EXPORT LtsWebSocketServer : public QObject
ReplyHandler *client{nullptr};
QString message;
MessageCredentials(ReplyHandler* client, const QString& message) : client(client), message(message) {}
MessageCredentials(ReplyHandler *client, const QString &message)
: client(client)
, message(message)
{
}
};
QQueue<MessageCredentials> m_messageQueue;
@@ -26,9 +26,9 @@ ReplyMessage::ReplyMessage(const QString& type, const int typeId, const QString&
ErrorMessage::ErrorMessage(const ErrorMessage::ErrorData &data)
: ReplyMessage(JsonKeys::ERROR_(), -1, QUuid::createUuid().toString())
{
m_jsonRepresentation.insert(JsonKeys::DATA(), QJsonObject({{JsonKeys::UUID_(), data.uuid},
{JsonKeys::ERROR_CLASS(), data.errorClass},
{JsonKeys::ERROR_MESSAGE(), data.errorMessage}}));
m_jsonRepresentation.insert(JsonKeys::DATA(),
QJsonObject(
{{JsonKeys::UUID_(), data.uuid}, {JsonKeys::ERROR_CLASS(), data.errorClass}, {JsonKeys::ERROR_MESSAGE(), data.errorMessage}}));
}
} // namespace LtsWebSocket
@@ -18,10 +18,7 @@ class LTSWEBSOCKETCOMMON_EXPORT ReplyMessage
virtual QString toJsonString() const;
QJsonObject json() const
{
return m_jsonRepresentation;
}
QJsonObject json() const { return m_jsonRepresentation; }
protected:
ReplyMessage() = default;
@@ -47,58 +47,34 @@ class Interface
{
public:
Interface(LtsSession::LtsSession *session, NGL::INGLLogger &logger)
: m_hasInit(true), m_session(session), m_appId(LtsAppDescriptor::App::Login), m_logger(logger)
: m_hasInit(true)
, m_session(session)
, m_appId(LtsAppDescriptor::App::Login)
, m_logger(logger)
{
}
virtual ~Interface() = default;
void setFlags(const QFlags<LtsAppDescriptor::PluginInfo::Flag>& flags)
{
m_flags = flags;
}
void setFlags(const QFlags<LtsAppDescriptor::PluginInfo::Flag> &flags) { m_flags = flags; }
const QFlags<LtsAppDescriptor::PluginInfo::Flag>& getFlags() const
{
return m_flags;
}
const QFlags<LtsAppDescriptor::PluginInfo::Flag> &getFlags() const { return m_flags; }
void setOptions(const QStringList& options)
{
m_options = options;
}
void setOptions(const QStringList &options) { m_options = options; }
const QStringList& getOptions() const
{
return m_options;
}
const QStringList &getOptions() const { return m_options; }
void setAppId(LtsAppDescriptor::App appId)
{
m_appId = appId;
}
void setAppId(LtsAppDescriptor::App appId) { m_appId = appId; }
LtsAppDescriptor::App appId() const
{
return m_appId;
}
LtsAppDescriptor::App appId() const { return m_appId; }
virtual QVector<LtsWidgets::PluginData> getActions()
{
return QVector<LtsWidgets::PluginData>();
}
virtual QVector<LtsWidgets::PluginData> getActions() { return QVector<LtsWidgets::PluginData>(); }
virtual bool fetchInterfaces()
{
return true;
}
virtual bool fetchInterfaces() { return true; }
virtual void clearInterfaces() {}
virtual QString menuGroup() const
{
return {};
}
virtual QString menuGroup() const { return {}; }
virtual LtsUtils::LtsTranslatableIdentifier menuGroupIdentifier() const
{
@@ -112,20 +88,11 @@ class Interface
return true;
}
virtual void init()
{
m_hasInit = false;
}
virtual void init() { m_hasInit = false; }
virtual void executePayload(LtsWidgets::LtsBackgroundWidget* mainBackground)
{
(void)mainBackground;
}
virtual void executePayload(LtsWidgets::LtsBackgroundWidget *mainBackground) { (void)mainBackground; }
virtual int executionPriority() const
{
return -1;
}
virtual int executionPriority() const { return -1; }
bool m_hasInit;
mutable bool m_hasMenuGroupIdentifier = true;
@@ -28,8 +28,7 @@ class RecordReplayPlugin
virtual bool initDtc(const std::shared_ptr<DDSConnector::DdsConnector> &ddsConnector, int exerciseId) = 0;
virtual bool initDts(const std::shared_ptr<DDSConnector::DdsConnector>& ddsConnector, int exerciseId,
bool bCanHandleSchemas, NSqlQuery& query) = 0;
virtual bool initDts(const std::shared_ptr<DDSConnector::DdsConnector> &ddsConnector, int exerciseId, bool bCanHandleSchemas, NSqlQuery &query) = 0;
virtual bool initCopy(int exerciseId, bool bCanHandleSchemasRead, bool bCanHandleSchemasWrite) = 0;
@@ -60,13 +59,15 @@ class RecordReplayPlugin
RecSnapshot() = default;
RecSnapshot(qint64 timeStamp_, const std::map<int64_t, int64_t> &recIdArray_)
: timeStamp(timeStamp_), recIdArray(recIdArray_)
: timeStamp(timeStamp_)
, recIdArray(recIdArray_)
{
}
};
virtual std::map<QString, std::vector<RecSnapshot>>
getSnapshotTimes(NSqlQuery& query, qint64 toTime, qint64 interval,
virtual std::map<QString, std::vector<RecSnapshot>> getSnapshotTimes(NSqlQuery &query,
qint64 toTime,
qint64 interval,
const QHash<QString, qint64> &minRecordedSampleTimes) = 0;
virtual QVector<QString> getRecordTopicNames() const = 0;
@@ -20,10 +20,7 @@ class Interface
{
public:
static QJsonObject timeRange(qint64 start, qint64 end)
{
return {{QStringLiteral("start"), start}, {QStringLiteral("end"), end}};
}
static QJsonObject timeRange(qint64 start, qint64 end) { return {{QStringLiteral("start"), start}, {QStringLiteral("end"), end}}; }
struct SituationReplayTime
{
@@ -63,10 +60,7 @@ class Interface
Interface() = default;
virtual ~Interface() = default;
virtual QWidget* createWidget()
{
return nullptr;
}
virtual QWidget *createWidget() { return nullptr; }
virtual bool playbackInit(const QJsonObject &attributes)
{
@@ -80,26 +74,18 @@ class Interface
return true;
}
virtual bool playbackPause()
{
return true;
}
virtual bool playbackPause() { return true; }
virtual bool playbackStop()
{
return true;
}
virtual bool playbackStop() { return true; }
virtual void setExportPlaybackTimes(qint64 startTimeSec, qint64 durationSec,
const QVector<SituationReplayTime>& sitReplayTimes)
virtual void setExportPlaybackTimes(qint64 startTimeSec, qint64 durationSec, const QVector<SituationReplayTime> &sitReplayTimes)
{
Q_UNUSED(startTimeSec);
Q_UNUSED(durationSec);
Q_UNUSED(sitReplayTimes);
}
virtual bool exportTopic(const QJsonObject& attributes, const QString& strFolderPath,
TopicEditorBase::ExportNotifier* pExportNotifier) = 0;
virtual bool exportTopic(const QJsonObject &attributes, const QString &strFolderPath, TopicEditorBase::ExportNotifier *pExportNotifier) = 0;
virtual QVector<TopicEditorBase::TopicData> additionalTrackEntries(const QJsonObject &attributes) const
{
@@ -107,17 +93,13 @@ class Interface
return {};
}
virtual QVector<TopicEditorBase::TopicData> additionalTrackEntries(const QJsonObject& attributes,
bool& keepOriginalTopic) const
virtual QVector<TopicEditorBase::TopicData> additionalTrackEntries(const QJsonObject &attributes, bool &keepOriginalTopic) const
{
keepOriginalTopic = true;
return additionalTrackEntries(attributes);
}
virtual void setBasePath(const QString& basePath)
{
Q_UNUSED(basePath);
}
virtual void setBasePath(const QString &basePath) { Q_UNUSED(basePath); }
};
class Factory
@@ -10,7 +10,8 @@
namespace IDL
{
enum class PartitionType {
enum class PartitionType
{
Any,
Global,
Exercise,
@@ -10,7 +10,10 @@
namespace httq
{
AbstractServer::AbstractServer(QObject *parent)
: QObject(parent), mSvr(new QTcpServer(this)), mLoggerFactory(nullptr), mLogger(nullptr)
: QObject(parent)
, mSvr(new QTcpServer(this))
, mLoggerFactory(nullptr)
, mLogger(nullptr)
{
}
@@ -42,7 +45,11 @@ void AbstractServer::slotNewConnection()
HttpRequest *req = new HttpRequest(cli, this);
connect(req, &HttpRequest::signalUpgrade, this, [this, req](QTcpSocket* sock) {
connect(req,
&HttpRequest::signalUpgrade,
this,
[this, req](QTcpSocket *sock)
{
mLogger->debug(QStringLiteral("signalUpgrade"));
#ifdef QT6_WEBSOCKETS_AVAILABLE
@@ -66,7 +73,11 @@ void AbstractServer::slotNewConnection()
emit sock->readyRead();
});
connect(req, &HttpRequest::signalReady, this, [this, req]() {
connect(req,
&HttpRequest::signalReady,
this,
[this, req]()
{
mLogger->debug(QStringLiteral("signalReady"));
newHttpConnection(req);
});
@@ -13,10 +13,20 @@
namespace httq
{
DataStream::DataStream(QIODevice* from, QIODevice* to, const QByteArray& bodyPartial, qint64 fileLength,
size_t bufferSize, LoggerFactory* loggerFactory, QObject* parent)
: QObject(parent), mBodyPartial(bodyPartial), mFrom(from), mTo(to), mBufferSize(bufferSize),
mFileLength(fileLength), mLogger(loggerFactory->createLogger(this))
DataStream::DataStream(QIODevice *from,
QIODevice *to,
const QByteArray &bodyPartial,
qint64 fileLength,
size_t bufferSize,
LoggerFactory *loggerFactory,
QObject *parent)
: QObject(parent)
, mBodyPartial(bodyPartial)
, mFrom(from)
, mTo(to)
, mBufferSize(bufferSize)
, mFileLength(fileLength)
, mLogger(loggerFactory->createLogger(this))
{
#ifdef SAVE_PARTIAL_BODY
@@ -32,7 +42,10 @@ DataStream::DataStream(QIODevice* from, QIODevice* to, const QByteArray& bodyPar
if (mFileLength == 0)
{
mLogger->warning(QStringLiteral("file size = 0 - done"));
QTimer::singleShot(1, this, [this]() {
QTimer::singleShot(1,
this,
[this]()
{
emit signalDone();
deleteLater();
});
@@ -45,19 +58,26 @@ DataStream::DataStream(QIODevice* from, QIODevice* to, const QByteArray& bodyPar
mFromSupportsSignals = (qobject_cast<QFileDevice *>(mFrom) == nullptr);
mToSupportsSignals = (qobject_cast<QFileDevice *>(mTo) == nullptr);
mLogger->debug(
QStringLiteral("signal support - from: %1 - to: %2").arg(mFromSupportsSignals).arg(mToSupportsSignals));
mLogger->debug(QStringLiteral("signal support - from: %1 - to: %2").arg(mFromSupportsSignals).arg(mToSupportsSignals));
auto sock = qobject_cast<QTcpSocket *>(mFrom);
qWarning() << "######################### SOCK" << sock;
connect(sock, &QTcpSocket::readyRead, this, [this]() {
connect(sock,
&QTcpSocket::readyRead,
this,
[this]()
{
mLogger->debug(QStringLiteral(">> DataStream readyRead"));
QTimer::singleShot(1, this, [this]() { readNext(); });
});
if (mToSupportsSignals)
connect(mTo, &QIODevice::bytesWritten, this, [this]() {
connect(mTo,
&QIODevice::bytesWritten,
this,
[this]()
{
mLogger->debug(QStringLiteral(">> DataStream write"));
mReadyWrite = true;
@@ -147,8 +167,7 @@ void DataStream::writeNext()
if (!mTo->isOpen() || !mTo->isWritable())
{
mLogger->debug(
QStringLiteral("write: file error: open? %1 - writable? %2").arg(mTo->isOpen()).arg(mTo->isWritable()));
mLogger->debug(QStringLiteral("write: file error: open? %1 - writable? %2").arg(mTo->isOpen()).arg(mTo->isWritable()));
deleteLater();
return;
}
@@ -166,10 +185,7 @@ void DataStream::writeNext()
const qint64 size = mTo->write(mBuffer);
mLogger->debug(QStringLiteral("write: wrote to buffer %1 bytes").arg(size));
mLogger->debug(QStringLiteral("write: %1 / %2 bytes done (%3 bytes left until DataStream done)")
.arg(alreadyRead)
.arg(mFileLength)
.arg(mFileLength - alreadyRead));
mLogger->debug(QStringLiteral("write: %1 / %2 bytes done (%3 bytes left until DataStream done)").arg(alreadyRead).arg(mFileLength).arg(mFileLength - alreadyRead));
if (size < mBuffer.size())
{
@@ -14,7 +14,9 @@
namespace httq
{
HttpRequest::HttpRequest(QTcpSocket *cli, AbstractServer *parent)
: QObject(parent), mCli(cli), mLogger(parent->getLoggerFactory()->createLogger(this))
: QObject(parent)
, mCli(cli)
, mLogger(parent->getLoggerFactory()->createLogger(this))
{
mLogger->debug(QStringLiteral("HttpRequest c_tor"));
@@ -83,8 +85,7 @@ int HttpRequest::on_url(http_parser* parser, const char* at, size_t length)
if (parserUrl.field_set & (1 << UF_PORT))
{
bool k = false;
QString portString(
QString::fromUtf8(at + parserUrl.field_data[UF_PORT].off, parserUrl.field_data[UF_PORT].len));
QString portString(QString::fromUtf8(at + parserUrl.field_data[UF_PORT].off, parserUrl.field_data[UF_PORT].len));
qint16 port = portString.toShort(&k);
if (!k)
@@ -109,8 +110,7 @@ int HttpRequest::on_url(http_parser* parser, const char* at, size_t length)
}
if (isUrlFieldSet(UF_USERINFO))
url.setUserInfo(
QString::fromUtf8(at + parserUrl.field_data[UF_USERINFO].off, parserUrl.field_data[UF_USERINFO].len));
url.setUserInfo(QString::fromUtf8(at + parserUrl.field_data[UF_USERINFO].off, parserUrl.field_data[UF_USERINFO].len));
#undef isUrlFieldSet
dataLogger(parser)->debug(QStringLiteral("final url = %1").arg(url.toString()));
@@ -192,8 +192,7 @@ qint64 HttpRequest::availableBytes() const
return (mContentLength - alreadyRead);
}
DataStream* HttpRequest::createDataStreamToClient(int status, const QString& contentType, QIODevice* from,
qint64 fileSize, qint64 bufferSize)
DataStream *HttpRequest::createDataStreamToClient(int status, const QString &contentType, QIODevice *from, qint64 fileSize, qint64 bufferSize)
{
mLogger->debug(QStringLiteral("createDataStreamToClient"));
@@ -227,10 +226,7 @@ void HttpRequest::write(int status, const QJsonValue& jsonValue)
void HttpRequest::write(int status, const QByteArray &data, const QString &contentType)
{
mLogger->debug(QStringLiteral("write to client: status = %1, data (size) = %2, contentType = %3")
.arg(status)
.arg(data.size())
.arg(contentType));
mLogger->debug(QStringLiteral("write to client: status = %1, data (size) = %2, contentType = %3").arg(status).arg(data.size()).arg(contentType));
writeStatusHeader(status);
addHeader(QStringLiteral("Content-Type"), contentType);
@@ -293,8 +289,7 @@ void HttpRequest::slotReadyRead()
if (size < static_cast<size_t>(dataSize))
{
mLogger->error(QStringLiteral("http parser error: %1")
.arg(QString::fromUtf8(http_errno_name(HTTP_PARSER_ERRNO(&mParser)))));
mLogger->error(QStringLiteral("http parser error: %1").arg(QString::fromUtf8(http_errno_name(HTTP_PARSER_ERRNO(&mParser)))));
mCli->commitTransaction();
deleteLater();
return;
@@ -343,8 +338,7 @@ void HttpRequest::slotReadyRead()
alreadyRead = mData.mBodyPartial.size();
mLogger->debug(
QStringLiteral("slotReadyRead: already read %1 / %2 bytes").arg(alreadyRead).arg(contentLength()));
mLogger->debug(QStringLiteral("slotReadyRead: already read %1 / %2 bytes").arg(alreadyRead).arg(contentLength()));
mCli->commitTransaction();
emit signalReady();
@@ -10,7 +10,9 @@ Logger* LoggerFactory::createLogger(QObject* parent)
return new Logger(this, parent);
}
Logger::Logger(LoggerFactory* loggerFactory, QObject* parent) : QObject(parent), mLoggerFactory(loggerFactory)
Logger::Logger(LoggerFactory *loggerFactory, QObject *parent)
: QObject(parent)
, mLoggerFactory(loggerFactory)
{
if (parent == nullptr)
{
@@ -31,7 +31,8 @@ typedef unsigned __int64 uint64_t;
#endif
#ifdef __cplusplus
extern "C" {
extern "C"
{
#endif
/* Forward declarations */
@@ -105,7 +106,8 @@ typedef int (*http_cb)(http_parser*);
XX(510, NOT_EXTENDED, Not Extended) \
XX(511, NETWORK_AUTHENTICATION_REQUIRED, Network Authentication Required)
enum http_status {
enum http_status
{
#define XX(num, name, string) HTTP_STATUS_##name = num,
HTTP_STATUS_MAP(XX)
@@ -156,16 +158,23 @@ enum http_status {
\
XX(33, SOURCE, SOURCE)
enum http_method {
enum http_method
{
#define XX(num, name, string) HTTP_##name = num,
HTTP_METHOD_MAP(XX)
#undef XX
};
enum http_parser_type { HTTP_REQUEST, HTTP_RESPONSE, HTTP_BOTH };
enum http_parser_type
{
HTTP_REQUEST,
HTTP_RESPONSE,
HTTP_BOTH
};
enum flags {
enum flags
{
F_CHUNKED = 1 << 0,
F_CONNECTION_KEEP_ALIVE = 1 << 1,
F_CONNECTION_CLOSE = 1 << 2,
@@ -218,7 +227,10 @@ enum flags {
#define HTTP_ERRNO_GEN(n, s) HPE_##n,
enum http_errno { HTTP_ERRNO_MAP(HTTP_ERRNO_GEN) };
enum http_errno
{
HTTP_ERRNO_MAP(HTTP_ERRNO_GEN)
};
#undef HTTP_ERRNO_GEN
@@ -264,7 +276,8 @@ struct http_parser_settings
http_cb on_chunk_complete;
};
enum http_parser_url_fields {
enum http_parser_url_fields
{
UF_SCHEMA = 0,
UF_HOST = 1,
UF_PORT = 2,
@@ -25,10 +25,7 @@ class HTTQ_EXPORT AbstractServer : public QObject
virtual bool newHttpConnection(HttpRequest *request) = 0;
#ifdef QT6_WEBSOCKETS_AVAILABLE
virtual QWebSocketServer* webSocketServer() const
{
return nullptr;
}
virtual QWebSocketServer *webSocketServer() const { return nullptr; }
#endif
virtual LoggerFactory *createLoggerFactory();
@@ -17,8 +17,13 @@ class HTTQ_EXPORT DataStream : public QObject
Q_OBJECT
private:
explicit DataStream(QIODevice* from, QIODevice* to, const QByteArray& bodyPartial, qint64 fileLength,
size_t bufferSize, LoggerFactory* loggerFactory, QObject* parent = nullptr);
explicit DataStream(QIODevice *from,
QIODevice *to,
const QByteArray &bodyPartial,
qint64 fileLength,
size_t bufferSize,
LoggerFactory *loggerFactory,
QObject *parent = nullptr);
public:
~DataStream();
@@ -44,40 +44,19 @@ class HTTQ_EXPORT HttpRequest : public QObject
qint64 availableBytes() const;
http_method method() const
{
return (enum http_method)mParser.method;
}
http_method method() const { return (enum http_method)mParser.method; }
QString methodString() const
{
return QString::fromUtf8(http_method_str(method()));
}
QString methodString() const { return QString::fromUtf8(http_method_str(method())); }
const QUrl& url() const
{
return mData.mUrl;
}
const QUrl &url() const { return mData.mUrl; }
const QUrlQuery& query() const
{
return mData.mQuery;
}
const QUrlQuery &query() const { return mData.mQuery; }
qint64 contentLength() const
{
return mContentLength;
}
qint64 contentLength() const { return mContentLength; }
const QMap<QString, QString>& requestHeaders() const
{
return mData.mHeaders;
}
const QMap<QString, QString> &requestHeaders() const { return mData.mHeaders; }
Logger* logger()
{
return mLogger;
}
Logger *logger() { return mLogger; }
QString toString() const;
@@ -85,8 +64,7 @@ class HTTQ_EXPORT HttpRequest : public QObject
void write(int status, const QByteArray &data, const QString &contentType);
void write(int status, const QJsonValue &jsonValue);
DataStream *createDataStreamFromClient(QIODevice *to, qint64 fileSize, qint64 bufferSize = 1024 * 1024);
DataStream* createDataStreamToClient(int status, const QString& contentType, QIODevice* from, qint64 fileSize,
qint64 bufferSize = 1024 * 1024);
DataStream *createDataStreamToClient(int status, const QString &contentType, QIODevice *from, qint64 fileSize, qint64 bufferSize = 1024 * 1024);
friend class DataStream;
@@ -107,15 +85,9 @@ class HTTQ_EXPORT HttpRequest : public QObject
static int on_chunk_header(http_parser *parser);
static int on_chunk_complete(http_parser *parser);
static HttpRequestData* data(http_parser* parser)
{
return static_cast<HttpRequestData*>(parser->data);
}
static HttpRequestData *data(http_parser *parser) { return static_cast<HttpRequestData *>(parser->data); }
static Logger* dataLogger(http_parser* parser)
{
return static_cast<HttpRequestData*>(parser->data)->mHttpRquest->logger();
}
static Logger *dataLogger(http_parser *parser) { return static_cast<HttpRequestData *>(parser->data)->mHttpRquest->logger(); }
QTcpSocket *mCli;
http_parser mParser;
@@ -15,7 +15,10 @@ class HTTQ_EXPORT LoggerFactory : public QObject
Q_OBJECT
public:
LoggerFactory(QObject* parent) : QObject(parent) {}
LoggerFactory(QObject *parent)
: QObject(parent)
{
}
virtual Logger *createLogger(QObject *parent);
};
@@ -11,10 +11,12 @@
namespace TetraRadio
{
ConvertFromJson::ConvertFromJson(const std::shared_ptr<TrainingAreaBase::RecvFromTab> &rxHandler,
const char *loggerName) : m_rxHandler(rxHandler)
ConvertFromJson::ConvertFromJson(const std::shared_ptr<TrainingAreaBase::RecvFromTab> &rxHandler, const char *loggerName)
: m_rxHandler(rxHandler)
, m_bWarnedOnce(false)
, m_logger(N_LogView::getLogger(loggerName)) {}
, m_logger(N_LogView::getLogger(loggerName))
{
}
bool ConvertFromJson::handleTelegram(const QByteArray &baJson, int &recvCounter)
{
@@ -162,8 +164,7 @@ bool ConvertFromJson::handleTelegram(const QByteArray &baJson, int &recvCounter)
break;
default:
WARNING_LOG(m_logger) << "Handler for telegram Id " << typeId.toInt()
<< " not yet implemented (" << baJson << ")";
WARNING_LOG(m_logger) << "Handler for telegram Id " << typeId.toInt() << " not yet implemented (" << baJson << ")";
return false;
}
}
@@ -175,8 +176,7 @@ bool ConvertFromJson::handleTelegram(const QByteArray &baJson, int &recvCounter)
return true;
}
template<typename T>
void ConvertFromJson::rxData(const T &data)
template <typename T> void ConvertFromJson::rxData(const T &data)
{
if (!m_rxHandler)
{
@@ -19,14 +19,14 @@ protected:
bool handleTelegram(const QByteArray &baJson, int &recvCounter);
virtual void handleAcknowledge(qint64 timeStamp, int counter) = 0;
virtual void handleTetraConnectionChanged(bool bConnected) = 0;
private:
template<typename T>
void rxData(const T &data);
private:
template <typename T> void rxData(const T &data);
private:
static TrainingAreaBase::TetraIcd::BiteError convertBiteError(const QJsonObject &obj);
std::shared_ptr<TrainingAreaBase::RecvFromTab> m_rxHandler;
protected:
NGL::INGLLogger &m_logger;
bool m_bWarnedOnce;
@@ -18,8 +18,7 @@ ConvertToJson::ConvertToJson(const char *loggerName)
resetSendCounter();
}
ConvertToJson::~ConvertToJson()
{}
ConvertToJson::~ConvertToJson() {}
TrainingAreaBase::SendToTab::HandleState ConvertToJson::canHandleTelegram(int equipmentNumber, int telegramId) const
{
@@ -27,8 +26,7 @@ TrainingAreaBase::SendToTab::HandleState ConvertToJson::canHandleTelegram(int eq
return HandleState::No;
using namespace TrainingAreaBase::TetraIcd;
if (telegramId == Constraints<ExerciseEquipmentAssignmentComplete>::id() ||
telegramId == Constraints<ExerciseStateData>::id())
if (telegramId == Constraints<ExerciseEquipmentAssignmentComplete>::id() || telegramId == Constraints<ExerciseStateData>::id())
return HandleState::YesShare;
Q_UNUSED(equipmentNumber)
@@ -9,7 +9,9 @@
namespace TetraRadio
{
class ConvertToJson final : public QObject, public TrainingAreaBase::SendToTab
class ConvertToJson final
: public QObject
, public TrainingAreaBase::SendToTab
{
Q_OBJECT
public:
@@ -22,6 +24,7 @@ public:
bool sendTele(const QByteArray &ba);
void setConnected(bool bConnected) { m_bConnected = bConnected; }
public:
bool txData(const TrainingAreaBase::TetraIcd::Acknowledge &data) override;
bool txData(const TrainingAreaBase::TetraIcd::DemandBite &data) override;
@@ -71,6 +74,7 @@ public:
bool sendToTx(const TrainingAreaBase::TetraIcd::TrainingAreaTelegram *data);
Q_SIGNALS:
void outgoingMessage(const QByteArray &msg);
protected:
protected:
NGL::INGLLogger &m_logger;
@@ -21,8 +21,6 @@ namespace TetraRadio
{
std::shared_ptr<TrainingAreaBase::Plugin::Interface> TetraJsonPlugin::createInterface(TrainingAreaBase::Plugin::DataProvider *pdp,
const std::shared_ptr<TrainingAreaBase::RecvFromTab> &recvFromTabCb,
const std::shared_ptr<TrainingAreaBase::TxMixin> &,
@@ -45,8 +43,7 @@ TetraJsonInterfaceImpl::TetraJsonInterfaceImpl(TrainingAreaBase::Plugin::DataPro
Q_UNUSED(settings);
N_CoPrtCnv::CoPrtCnvTelegramConverter::setUse2BytesForSingleFireDiameter(
settings->settings()->value(QLatin1String("AES/use2BytesForSingleFireDiameter"), true).toBool());
N_CoPrtCnv::CoPrtCnvTelegramConverter::setUsePvSan(
settings->settings()->value(QLatin1String("TrainingAreaBase/UsePvSan"), false).toBool());
N_CoPrtCnv::CoPrtCnvTelegramConverter::setUsePvSan(settings->settings()->value(QLatin1String("TrainingAreaBase/UsePvSan"), false).toBool());
ERROR_LOG(m_logger) << "hello i got this!";
}
@@ -72,9 +69,7 @@ void TetraJsonInterfaceImpl::exerciseChanged()
NOTICE_LOG(m_logger) << "TetraJsonInterfaceImpl::exerciseChanged";
if (m_pdp->exerciseRadioGroup().id() != m_radioGrpId)
if (!updatePrtCnv())
ERROR_LOG(m_logger) << "Error changing PrtCnv state from radio grp id: "
<< m_radioGrpId
<< " to " << m_pdp->exerciseRadioGroup().id();
ERROR_LOG(m_logger) << "Error changing PrtCnv state from radio grp id: " << m_radioGrpId << " to " << m_pdp->exerciseRadioGroup().id();
}
bool TetraJsonInterfaceImpl::updatePrtCnv()
@@ -161,23 +156,16 @@ bool TetraJsonInterfaceImpl::startPrtCnv()
cleanupProcess();
m_prtCnvApp = new PrtCnv::PrtCnvApplication;
const QSqlDatabase db = m_pdp->databaseConnection();
m_prtCnvApp->setDatabaseConnectionParams(db.driverName(),
db.hostName(),
db.databaseName(),
m_pdp->databaseSchemaName(),
db.userName(),
db.password());
m_prtCnvApp->setDatabaseConnectionParams(db.driverName(), db.hostName(), db.databaseName(), m_pdp->databaseSchemaName(), db.userName(), db.password());
m_prtCnvApp->setExerciseId(m_pdp->exerciseId());
m_prtCnvApp->setConfigFile(iniFileOut());
m_prtCnvApp->startApp();
m_socketDispatcher->init(m_prtCnvApp);
onTetraConnectionChanged(false);
connect(m_socketDispatcher.get(), &SocketDispatcher::tetraConnectionChanged,
this, &TetraJsonInterfaceImpl::onTetraConnectionChanged);
connect(m_socketDispatcher.get(), &SocketDispatcher::tetraConnectionChanged, this, &TetraJsonInterfaceImpl::onTetraConnectionChanged);
connect(m_socketDispatcher.get(), &SocketDispatcher::warehouseMessage,
this, &TetraJsonInterfaceImpl::directMessage);
connect(m_socketDispatcher.get(), &SocketDispatcher::warehouseMessage, this, &TetraJsonInterfaceImpl::directMessage);
return true;
}
@@ -11,7 +11,9 @@
namespace TetraRadio
{
class TetraJsonPlugin : public QObject, public TrainingAreaBase::Plugin::Plugin
class TetraJsonPlugin
: public QObject
, public TrainingAreaBase::Plugin::Plugin
{
Q_OBJECT
Q_PLUGIN_METADATA(IID "special:3:tab.jsonsocket")
@@ -31,22 +33,18 @@ class TetraJsonInterfaceImpl final : public TrainingAreaBase::Plugin::Interface
{
Q_OBJECT
public:
TetraJsonInterfaceImpl(TrainingAreaBase::Plugin::DataProvider *pdp,
const std::shared_ptr<TrainingAreaBase::RecvFromTab> &recvFromTabCb,
NGL::Settings *settings);
TetraJsonInterfaceImpl(TrainingAreaBase::Plugin::DataProvider *pdp, const std::shared_ptr<TrainingAreaBase::RecvFromTab> &recvFromTabCb, NGL::Settings *settings);
~TetraJsonInterfaceImpl();
bool init() override;
std::shared_ptr<TrainingAreaBase::SendToTab> sendToTab() override;
bool isDebugInterface() const override
{
return false;
}
bool isDebugInterface() const override { return false; }
bool canSendData() const override;
void exerciseChanged() override;
const char *name() const override { return "TETRA"; }
private Q_SLOTS:
void onTetraConnectionChanged(bool bConnected);
private:
NGL::INGLLogger &m_logger;
void cleanupProcess();
@@ -10,10 +10,7 @@ namespace TetraRadio
{
SocketDispatcher::SocketDispatcher(TrainingAreaBase::Plugin::DataProvider *pdp,
const std::shared_ptr<TrainingAreaBase::RecvFromTab> &recvFromTabCb)
SocketDispatcher::SocketDispatcher(TrainingAreaBase::Plugin::DataProvider *pdp, const std::shared_ptr<TrainingAreaBase::RecvFromTab> &recvFromTabCb)
: QObject()
, ConvertFromJson(recvFromTabCb, "TAB.Plugin.SocketDispatcher")
, m_txHandler(std::make_shared<ConvertToJson>("TxSocketHandler"))
@@ -25,8 +22,7 @@ SocketDispatcher::SocketDispatcher(TrainingAreaBase::Plugin::DataProvider *pdp,
{
m_ackTimer->setInterval(1000);
m_ackTimer->setSingleShot(false);
connect(m_ackTimer, &QTimer::timeout,
this, &SocketDispatcher::onAckTimeout);
connect(m_ackTimer, &QTimer::timeout, this, &SocketDispatcher::onAckTimeout);
}
SocketDispatcher::~SocketDispatcher()
@@ -43,12 +39,9 @@ bool SocketDispatcher::init(PrtCnv::PrtCnvApplication *prtCnvApp)
m_prtCnvApp = prtCnvApp;
if (m_prtCnvApp)
{
connect(m_txHandler.get(), &ConvertToJson::outgoingMessage,
m_prtCnvApp, &PrtCnv::PrtCnvApplication::textMessageFromCentralToPrtCnv);
connect(m_prtCnvApp, &PrtCnv::PrtCnvApplication::textMessageFromPrtCnvToCentral,
this, &SocketDispatcher::onTextMessageReceived);
connect(m_prtCnvApp, &PrtCnv::PrtCnvApplication::warehouseMessageFromPtrCnv,
this, &SocketDispatcher::warehouseMessage);
connect(m_txHandler.get(), &ConvertToJson::outgoingMessage, m_prtCnvApp, &PrtCnv::PrtCnvApplication::textMessageFromCentralToPrtCnv);
connect(m_prtCnvApp, &PrtCnv::PrtCnvApplication::textMessageFromPrtCnvToCentral, this, &SocketDispatcher::onTextMessageReceived);
connect(m_prtCnvApp, &PrtCnv::PrtCnvApplication::warehouseMessageFromPtrCnv, this, &SocketDispatcher::warehouseMessage);
m_ackTimer->start();
m_bInitialAck = true;
@@ -93,16 +86,13 @@ void SocketDispatcher::handleTetraConnectionChanged(bool bConnected)
void SocketDispatcher::handleAcknowledge(qint64 timeStamp, int counter)
{
TRACE_LOG(m_logger) << "Ack from Socket for time " << timeStamp
<< " with counter " << counter
<< ", initial: " << m_bInitialAck;
TRACE_LOG(m_logger) << "Ack from Socket for time " << timeStamp << " with counter " << counter << ", initial: " << m_bInitialAck;
if (m_bInitialAck)
{
m_txHandler->setConnected(true);
m_bInitialAck = false;
onSendInitialData();
}
}
void SocketDispatcher::onAckTimeout()
@@ -130,7 +120,6 @@ void SocketDispatcher::onSendInitialData()
const auto &aesTeles = m_dataProvider->aesTelegrams();
for (TrainingAreaBase::TetraIcd::TrainingAreaTelegram *aesTele : aesTeles)
m_txHandler->sendToTx(aesTele);
}
}
@@ -14,12 +14,13 @@
namespace TetraRadio
{
class SocketDispatcher final : public QObject, protected ConvertFromJson
class SocketDispatcher final
: public QObject
, protected ConvertFromJson
{
Q_OBJECT
public:
explicit SocketDispatcher(TrainingAreaBase::Plugin::DataProvider *pdp,
const std::shared_ptr<TrainingAreaBase::RecvFromTab> &recvFromTabCb);
explicit SocketDispatcher(TrainingAreaBase::Plugin::DataProvider *pdp, const std::shared_ptr<TrainingAreaBase::RecvFromTab> &recvFromTabCb);
~SocketDispatcher();
bool init(PrtCnv::PrtCnvApplication *prtCnvApp);
@@ -33,10 +34,12 @@ private Q_SLOTS:
void onTextMessageReceived(const QByteArray &message);
void onAckTimeout();
void onSendInitialData();
private:
void disconnectSocket(QWebSocket *s);
void handleTetraConnectionChanged(bool bConnected) override;
void handleAcknowledge(qint64 timeStamp, int counter) override;
private:
std::shared_ptr<ConvertToJson> m_txHandler;
TrainingAreaBase::Plugin::DataProvider *m_dataProvider;
+1 -2
View File
@@ -19,8 +19,7 @@ LOGGER_T getLogger(const char *name)
try
{
return NGL::NGLLoggerBootstrap::getNGLRootLogger().
getNGLLogger(loggerName);
return NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger(loggerName);
}
catch (const std::exception &ex)
{
View File
File mode changed.
File mode changed.
+1 -1
View File
@@ -11,6 +11,7 @@ class SendToTab
protected:
SendToTab() = default;
virtual ~SendToTab() = default;
public:
virtual const char *name() const = 0;
enum class HandleState
@@ -70,6 +71,5 @@ public:
virtual bool txData(const TetraIcd::UAVPerformMission &data) = 0;
virtual bool txData(const TetraIcd::UAVChangeState &data) = 0;
};
}
@@ -6,11 +6,14 @@
#include "tab_enums_stub.hpp"
namespace tab {
namespace db {
namespace tab
{
namespace db
{
// Stub class to replace RTI IDL-generated database types
class TrainingDatabase {
class TrainingDatabase
{
public:
virtual ~TrainingDatabase() = default;
};
@@ -4,16 +4,19 @@
#ifndef TAB_ENUMS_STUB_HPP
#define TAB_ENUMS_STUB_HPP
namespace tab {
namespace tab
{
// Stub enums to replace RTI IDL-generated enums
enum class TrainingAreaType {
enum class TrainingAreaType
{
Unknown = 0,
Standard = 1,
Advanced = 2
};
enum class TrainingStatus {
enum class TrainingStatus
{
Inactive = 0,
Active = 1,
Completed = 2
@@ -7,10 +7,12 @@
#include "tab_enums_stub.hpp"
#include <string>
namespace tab {
namespace tab
{
// Stub class to replace RTI IDL-generated TrainingArea type
class TrainingArea {
class TrainingArea
{
public:
TrainingArea() = default;
virtual ~TrainingArea() = default;
@@ -27,7 +29,8 @@ private:
};
// Stub class to replace RTI IDL-generated TrainingSession type
class TrainingSession {
class TrainingSession
{
public:
TrainingSession() = default;
virtual ~TrainingSession() = default;
Loaded 100 of 332 files, more files were not shown because too many files have changed in this diff. Show more