Adds ktexttemplate as apt package to new_docker_build.sh and builds successfully
This commit is contained in:
39 files changed
+647
-208
No files matched your search
@@ -111,6 +111,13 @@ SET(SRCS_client
|
||||
CODEGEN_CLIENT_TOPICS_IMPL(SRCS_client ${xml_FILE})
|
||||
|
||||
NGL_ADD_LIBRARY2(AAR SV WS HLA svcCoreClient SHARED ${SRCS_client})
|
||||
|
||||
# Add compile definition for export macros
|
||||
TARGET_COMPILE_DEFINITIONS(svcCoreClient
|
||||
PRIVATE
|
||||
MAKE_SVCCORECLIENT_LIB
|
||||
)
|
||||
|
||||
NGL_TARGET_INCLUDE_DIRECTORIES(svcCoreClient
|
||||
PUBLIC
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/../../
|
||||
|
||||
@@ -19,7 +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 )
|
||||
{
|
||||
|
||||
@@ -8,6 +8,6 @@
|
||||
|
||||
namespace Core
|
||||
{
|
||||
using LOGGER_T = NGL::INGLLogger&;
|
||||
using LOGGER_T = ::NGL::INGLLogger&;
|
||||
CORE_COMMON_EXPORT LOGGER_T getLogger(const char *name);
|
||||
}
|
||||
@@ -15,7 +15,7 @@ namespace Core
|
||||
{
|
||||
Pacemaker::Pacemaker(DDSConnector::DdsConnector *ddsConnector)
|
||||
: QObject(nullptr)
|
||||
, m_logger(NGL::INGLLoggerBootstrap::getNGLLogger("Core.Pacemaker"))
|
||||
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("Core.Pacemaker"))
|
||||
{
|
||||
init(ddsConnector);
|
||||
}
|
||||
@@ -40,11 +40,11 @@ void Pacemaker::setNewState(Core::RunningState newState, const QString& errorStr
|
||||
|
||||
void Pacemaker::setNewStateInternal(Core::RunningState newState, const QString& errorString)
|
||||
{
|
||||
m_state.runningState(newState);
|
||||
m_state.runningState = newState;
|
||||
if (errorString.isEmpty())
|
||||
m_state.errorString().reset();
|
||||
m_state.errorString.reset();
|
||||
else
|
||||
m_state.errorString(errorString.toStdString());
|
||||
m_state.errorString = errorString.toStdString();
|
||||
publishState();
|
||||
}
|
||||
|
||||
@@ -59,9 +59,9 @@ void Pacemaker::addPort(unsigned short number, Core::CorePortType portType, cons
|
||||
|
||||
void Pacemaker::addPortInternal(unsigned short number, Core::CorePortType portType, const QString& properties)
|
||||
{
|
||||
if (!m_state.ports().is_set())
|
||||
m_state.ports() = std::vector<Core::PortInformation>();
|
||||
m_state.ports().get().push_back(Core::PortInformation(number, portType, properties.toStdString()));
|
||||
if (!m_state.ports.has_value())
|
||||
m_state.ports = std::vector<Core::PortInformation>();
|
||||
m_state.ports.value().push_back(Core::PortInformation(number, portType, properties.toStdString()));
|
||||
|
||||
publishState();
|
||||
}
|
||||
@@ -81,8 +81,8 @@ void Pacemaker::init(DDSConnector::DdsConnector* ddsConnector)
|
||||
WARNING_LOG(m_logger) << "Can not initialize DTS::CurrentRunningState!";
|
||||
return;
|
||||
}
|
||||
m_state.pid(QCoreApplication::applicationPid());
|
||||
m_state.runningState(Core::RunningState::Starting);
|
||||
m_state.pid = QCoreApplication::applicationPid();
|
||||
m_state.runningState = Core::RunningState::Starting;
|
||||
|
||||
m_paceThread = new QThread;
|
||||
this->moveToThread(m_paceThread);
|
||||
|
||||
@@ -40,7 +40,7 @@ public:
|
||||
|
||||
public Q_SLOTS:
|
||||
void setNewState(Core::RunningState newState, const QString &errorString = QString());
|
||||
void addPort(unsigned short number, Core::PortType portType, const QString &properties = QStringLiteral(""));
|
||||
void addPort(unsigned short number, Core::CorePortType portType, const QString &properties = QStringLiteral(""));
|
||||
|
||||
// only public for special purposes, not needed to call explicitly by default
|
||||
void publishState();
|
||||
@@ -48,7 +48,7 @@ public Q_SLOTS:
|
||||
private:
|
||||
void init(DDSConnector::DdsConnector *ddsConnector);
|
||||
void setNewStateInternal(Core::RunningState newState, const QString &errorString = QString());
|
||||
void addPortInternal(unsigned short number, Core::PortType portType, const QString &properties = QStringLiteral(""));
|
||||
void addPortInternal(unsigned short number, Core::CorePortType portType, const QString &properties = QStringLiteral(""));
|
||||
private:
|
||||
static constexpr const int m_publishTimerDelay = 3000;
|
||||
|
||||
|
||||
@@ -1,6 +1,9 @@
|
||||
#include "topic_lock_master.h"
|
||||
|
||||
#if BUILD_RTI
|
||||
|
||||
#include <DDS/DDSConnector/dds_connector.h>
|
||||
#include <functional>
|
||||
|
||||
namespace Core
|
||||
{
|
||||
@@ -27,14 +30,14 @@ bool TopicLockMaster::init(const std::shared_ptr<DDSConnector::DdsConnector> &dd
|
||||
return false;
|
||||
m_coreDtc->enableAll();
|
||||
|
||||
m_coreDtc->lockedEntitys([this] (const LockedEntity &data) {
|
||||
m_lockedEntitys << key(data.entityId(), data.exerciseId(), QString::fromStdString(data.entityTypeName()));
|
||||
m_coreDtc->lockedEntitys([this] (const ::Core::LockedEntity &data) {
|
||||
m_lockedEntitys << key(data.entityId, data.exerciseId, QString::fromStdString(data.entityTypeName));
|
||||
});
|
||||
|
||||
connect(m_coreDtc.get(), &Interface::Dtc::lockedEntityChanged, this,
|
||||
[this] (const LockedEntity &data, DataModification modType)
|
||||
connect(m_coreDtc.get(), &Core::Interface::Dtc::lockedEntityChanged, this,
|
||||
[this] (const ::Core::LockedEntity &data, DataModification modType)
|
||||
{
|
||||
key k(data.entityId(), data.exerciseId(), QString::fromStdString(data.entityTypeName()));
|
||||
key k(data.entityId, data.exerciseId, QString::fromStdString(data.entityTypeName));
|
||||
if (modType == DataModification::eAdded)
|
||||
m_lockedEntitys << k;
|
||||
else if (modType == DataModification::eRemoved)
|
||||
@@ -44,4 +47,6 @@ bool TopicLockMaster::init(const std::shared_ptr<DDSConnector::DdsConnector> &dd
|
||||
return true;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
#endif // BUILD_RTI
|
||||
@@ -7,10 +7,10 @@
|
||||
#include <Core/core_export.h>
|
||||
|
||||
#if BUILD_RTI
|
||||
#include <Core/core_dtc.h>
|
||||
#include <DDS/Core/core_dtc.h>
|
||||
#else
|
||||
// Forward declarations for moc compatibility when BUILD_RTI=OFF
|
||||
namespace DDS { namespace Core { namespace Interface { class Dtc; } } }
|
||||
namespace Core { namespace Interface { class Dtc; } }
|
||||
#endif
|
||||
|
||||
namespace DDSConnector
|
||||
@@ -73,7 +73,7 @@ public:
|
||||
private:
|
||||
QSet<key> m_lockedEntitys;
|
||||
#if BUILD_RTI
|
||||
std::shared_ptr<DDS::Core::Interface::Dtc> m_coreDtc;
|
||||
std::shared_ptr<Core::Interface::Dtc> m_coreDtc;
|
||||
#endif
|
||||
};
|
||||
|
||||
|
||||
Reference in new issue
Block a user