Complete Qt6/rtiddsgen migration of residual Lts service sources
This commit is contained in:
86 files changed
+1235
-1128
No files matched your search
+10
-8
@@ -3,6 +3,8 @@
|
||||
|
||||
#include "settings.h"
|
||||
|
||||
#include <NGLLogger/NGLLoggerBootstrap.h>
|
||||
|
||||
#include <QtCore/QPointF>
|
||||
#include <QtCore/QTimer>
|
||||
#include <QtCore/QJsonDocument>
|
||||
@@ -22,9 +24,9 @@ WebsocketHandler::WebsocketHandler(QObject *parent, int exerciseId,
|
||||
m_tryConnectionTimer->start(10 * 1000);
|
||||
connect(m_dtcTaboc.get(), &TrainingAreaBaseOC::Interface::Dtc::specificsEquipmentChanged,
|
||||
this, [this](){
|
||||
m_ownEquipmentId = m_dtcTaboc->specificsEquipment(1).equipmentNumber();
|
||||
m_ownEquipmentId = m_dtcTaboc->specificsEquipment(1).equipmentNumber;
|
||||
});
|
||||
m_ownEquipmentId = m_dtcTaboc->specificsEquipment(1).equipmentNumber();
|
||||
m_ownEquipmentId = m_dtcTaboc->specificsEquipment(1).equipmentNumber;
|
||||
|
||||
|
||||
m_fetchPositionTimer = new QTimer(this);
|
||||
@@ -142,23 +144,23 @@ void WebsocketHandler::onSendOwnPosition(const QString &message)
|
||||
const QJsonObject obj = doc.object().value(QStringLiteral("data")).toObject();
|
||||
|
||||
TrainingAreaBaseOC::OwnPosition outData;
|
||||
outData.id(1);
|
||||
outData.id = 1;
|
||||
|
||||
|
||||
|
||||
if (obj.contains(QStringLiteral("lon")) && obj.contains(QStringLiteral("lat")))
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "Got message with position";
|
||||
outData.position(Core::GeoPosition(obj.value(QStringLiteral("lon")).toDouble(),obj.value(QStringLiteral("lat")).toDouble(),obj.value(QStringLiteral("height")).toDouble()));
|
||||
outData.timeStamp(QDateTime::currentMSecsSinceEpoch());
|
||||
outData.position = Core::GeoPosition(obj.value(QStringLiteral("lon")).toDouble(),obj.value(QStringLiteral("lat")).toDouble(),obj.value(QStringLiteral("height")).toDouble());
|
||||
outData.timeStamp = QDateTime::currentMSecsSinceEpoch();
|
||||
if (obj.contains(QStringLiteral("buildingId")) && obj.contains(QStringLiteral("roomId")) )
|
||||
{
|
||||
outData.moutObjectId().set(obj.value(QStringLiteral("buildingId")).toInt());
|
||||
outData.moutRoomId().set(obj.value(QStringLiteral("roomId")).toInt());
|
||||
outData.moutObjectId = obj.value(QStringLiteral("buildingId")).toInt();
|
||||
outData.moutRoomId = obj.value(QStringLiteral("roomId")).toInt();
|
||||
}
|
||||
}
|
||||
else
|
||||
outData.position(Core::GeoPosition(nan(""), nan(""),0));
|
||||
outData.position = Core::GeoPosition(nan(""), nan(""),0);
|
||||
|
||||
m_dtsTaboc->publish(outData);
|
||||
|
||||
|
||||
Reference in new issue
Block a user