Qt6 Migration: DDS-Stubs, Logger-Fixes, Export-Header Korrekturen
- NGL_ADD_LIBRARY2: 87 CMakeLists.txt konvertiert für Export-Header Generierung - 44 Export-Header Include-Pfade korrigiert (_export.h) - 81 DDS-Stub-Header generiert (*_dtc.h, *_fts.h, *_dts.h, *_ftc.h) - INGLLogger: Duplikat gelöscht, m_logger Member entfernt, variadische Makros - Q_FUNC_INFO Redefinition behoben (Qt6 definiert bereits) - FATAL_LOG Makro hinzugefügt - InfrastructureManagement DDS-Stubs (ism.hpp, ism_enums.hpp, ism_ftc.h) - FilterManagement DDS-Stubs (flt_ftc.h, flt_dts.h) - AreaEffectSimulation DDS-Stubs (aes.hpp, aes_enums.hpp) - SymbolAppearance Klasse vollständig definiert mit content() Methode - BuildingComponentFilter Klasse definiert mit Copy-Konstruktor - Ftc Factory: nullptr Return (abstract class) - AesFilter Klasse in aes.hpp hinzugefügt - Dtc Klasse in ppm.hpp mit participantChanged Signal - AesType Enum: alle 15 At* Werte definiert - AesEffectState_def: EsReceived hinzugefügt - DataModification Enum: eAdded/eModified/eRemoved - function_reply_object.h → core_types.h Include-Pfad (72 Dateien) - Enum-Class-Streaming Template-Operator in INGLLogger.h - ism_mounting_point.h: QImage → QtGui/QImage, QGuiApplication/QScreen - ism_data_plugin_interface.h: QSet Include, Include-Reihenfolge - QRegExp → QRegularExpression in tpm_js_parser.cpp - .underlying() Aufrufe zu direktem Enum-Vergleich korrigiert - Include-Pfade: aes.hpp in symbol_appearance_settings_impl.h und aes_display_filter_impl.h Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
2785 files changed
+18754
-18316
No files matched your search
@@ -39,7 +39,7 @@ CODEGEN_TOPIC_TYPEDEFS(SRCS_common ${xml_FILE})
|
||||
# Generate evl_[d|f]tc.h
|
||||
CODEGEN_CLIENT_TOPICS_IFC(SRCS_common ${xml_FILE})
|
||||
|
||||
NGL_ADD_LIBRARY(AAR SV WS svcEvlCommon SHARED ${SRCS_common})
|
||||
NGL_ADD_LIBRARY2(AAR SV WS svcEvlCommon SHARED ${SRCS_common})
|
||||
NGL_TARGET_INCLUDE_DIRECTORIES(svcEvlCommon
|
||||
PUBLIC
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/../
|
||||
@@ -67,7 +67,7 @@ SET(SRCS_client
|
||||
# generate evl_[d|f]tc.h, evl_[d|f]tc_impl.[cpp|h]
|
||||
CODEGEN_CLIENT_TOPICS_IMPL(SRCS_client ${xml_FILE})
|
||||
|
||||
NGL_ADD_LIBRARY(AAR SV WS svcEvlClient SHARED ${SRCS_client})
|
||||
NGL_ADD_LIBRARY2(AAR SV WS svcEvlClient SHARED ${SRCS_client})
|
||||
NGL_TARGET_INCLUDE_DIRECTORIES(svcEvlClient
|
||||
PUBLIC
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/../
|
||||
@@ -125,7 +125,7 @@ CODEGEN_SERVER_TOPICS(SRCS_server ${xml_FILE})
|
||||
# Generate evl.sql, evl.xml
|
||||
CODEGEN_SQL(SRCS_server ${xml_FILE})
|
||||
|
||||
NGL_ADD_LIBRARY(AAR SV svcEvlServer SHARED ${SRCS_server})
|
||||
NGL_ADD_LIBRARY2(AAR SV svcEvlServer SHARED ${SRCS_server})
|
||||
NGL_TARGET_INCLUDE_DIRECTORIES(svcEvlServer
|
||||
PUBLIC
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/../
|
||||
|
||||
@@ -28,7 +28,6 @@ using namespace Evaluations;
|
||||
//-----------------------------------------------------------------------------
|
||||
EvlTests::EvlTests(QObject *parent)
|
||||
: QObject(parent)
|
||||
, m_logger(getLogger("EvlTests"))
|
||||
{
|
||||
qRegisterMetaType<Core::FunctionReply>("Core::FunctionReply");
|
||||
|
||||
@@ -41,7 +40,7 @@ EvlTests::EvlTests(QObject *parent)
|
||||
//-----------------------------------------------------------------------------
|
||||
bool EvlTests::init(int domainId, int exerciseId, int testId, int operatorId, int criteriumId, int elementId, int sanNineLinerId)
|
||||
{
|
||||
INFO_LOG(m_logger) << "EvlTests::init() "
|
||||
INFO_LOG() << "EvlTests::init() "
|
||||
<< " domainId:" << domainId
|
||||
<< " exerciseId:" << exerciseId
|
||||
<< " testId: " << testId
|
||||
@@ -55,7 +54,7 @@ bool EvlTests::init(int domainId, int exerciseId, int testId, int operatorId, in
|
||||
m_operatorId = operatorId;
|
||||
m_sanNineLinerId = sanNineLinerId;
|
||||
|
||||
DEBUG_LOG(m_logger) << "Operator Id = " << m_operatorId;
|
||||
DEBUG_LOG() << "Operator Id = " << m_operatorId;
|
||||
|
||||
// initialize DDS
|
||||
m_ddsConnector.reset(new DDSConnector::DdsConnector(domainId, IDL::PartitionType::Exercise, exerciseId));
|
||||
@@ -64,18 +63,18 @@ bool EvlTests::init(int domainId, int exerciseId, int testId, int operatorId, in
|
||||
m_ddsConnector->initPublisherSubscriber();
|
||||
|
||||
// Access to FTC
|
||||
DEBUG_LOG(m_logger) << "create ftc";
|
||||
DEBUG_LOG() << "create ftc";
|
||||
m_ftc = Evaluations::Interface::Ftc::create(m_ddsConnector);
|
||||
DEBUG_LOG(m_logger) << "init ftc";
|
||||
DEBUG_LOG() << "init ftc";
|
||||
bool bRet = m_ftc->enableAll();
|
||||
DEBUG_LOG(m_logger) << "init end - bRet = " << bRet;
|
||||
DEBUG_LOG() << "init end - bRet = " << bRet;
|
||||
|
||||
// Access to DTC
|
||||
DEBUG_LOG(m_logger) << "create dtc";
|
||||
DEBUG_LOG() << "create dtc";
|
||||
m_dtc = Evaluations::Interface::Dtc::create(m_ddsConnector);
|
||||
DEBUG_LOG(m_logger) << "init dtc";
|
||||
DEBUG_LOG() << "init dtc";
|
||||
bRet = m_dtc->enableAll();
|
||||
DEBUG_LOG(m_logger) << "init end - bRet = " << bRet;
|
||||
DEBUG_LOG() << "init end - bRet = " << bRet;
|
||||
|
||||
return bRet;
|
||||
} // end of init()
|
||||
@@ -83,7 +82,7 @@ bool EvlTests::init(int domainId, int exerciseId, int testId, int operatorId, in
|
||||
//-----------------------------------------------------------------------------
|
||||
void EvlTests::startTest()
|
||||
{
|
||||
INFO_LOG(m_logger) << "startTest() ******* "
|
||||
INFO_LOG() << "startTest() ******* "
|
||||
<< " exerciseId: " << m_exerciseId
|
||||
<< " testId: " << m_testId
|
||||
<< " criteriumId: " << m_criteriumId
|
||||
@@ -118,10 +117,10 @@ void EvlTests::startTest()
|
||||
QTimer::singleShot(0, this, &EvlTests::tryGetSanNineLiner);
|
||||
else
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Unknown test case !";
|
||||
ERROR_LOG() << "Unknown test case !";
|
||||
failExit();
|
||||
}
|
||||
INFO_LOG(m_logger) << "endTest ******* ";
|
||||
INFO_LOG() << "endTest ******* ";
|
||||
QTimer::singleShot(0, qApp, QCoreApplication::quit);
|
||||
|
||||
} // end of startTest()
|
||||
@@ -137,10 +136,10 @@ void EvlTests::tryCreateCriterium()
|
||||
data.description("Test description");
|
||||
data.operatorId(m_operatorId);
|
||||
|
||||
INFO_LOG(m_logger) << "trying to send EvlCriteriumModifyRequest";
|
||||
INFO_LOG() << "trying to send EvlCriteriumModifyRequest";
|
||||
if (!m_ftc->evlCriteriumModifyRequest(data, this))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Error requesting create data";
|
||||
ERROR_LOG() << "Error requesting create data";
|
||||
failExit();
|
||||
}
|
||||
QTest::qWait(1000);
|
||||
@@ -157,10 +156,10 @@ void EvlTests::tryModifyCriterium()
|
||||
data.description("Description modified");
|
||||
data.operatorId(m_operatorId);
|
||||
|
||||
INFO_LOG(m_logger) << "trying to send EvlCriteriumModifyRequest for criteriumId:" << data.id();
|
||||
INFO_LOG() << "trying to send EvlCriteriumModifyRequest for criteriumId:" << data.id();
|
||||
if (!m_ftc->evlCriteriumModifyRequest(data, this))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Error requesting modify data for criteriumId:" << data.id();
|
||||
ERROR_LOG() << "Error requesting modify data for criteriumId:" << data.id();
|
||||
failExit();
|
||||
}
|
||||
QTest::qWait(1000);
|
||||
@@ -174,10 +173,10 @@ void EvlTests::tryRemoveCriterium()
|
||||
|
||||
data.id(m_criteriumId);
|
||||
|
||||
INFO_LOG(m_logger) << "trying to send remove request for criteriumId:" << data.id();
|
||||
INFO_LOG() << "trying to send remove request for criteriumId:" << data.id();
|
||||
if (!m_ftc->evlCriteriumRemoveRequest(data, this))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Error requesting remove data for criteriumId:" << data.id();
|
||||
ERROR_LOG() << "Error requesting remove data for criteriumId:" << data.id();
|
||||
failExit();
|
||||
}
|
||||
QTest::qWait(1000);
|
||||
@@ -187,14 +186,14 @@ void EvlTests::tryRemoveCriterium()
|
||||
void EvlTests::tryGetAllCriteria()
|
||||
{
|
||||
m_eTestStep = eGetAllCriteria;
|
||||
DEBUG_LOG(m_logger) << "trying to get all criteria";
|
||||
DEBUG_LOG() << "trying to get all criteria";
|
||||
|
||||
m_dtc->waitForHistoricalDataEvaluationCriterium(5000);
|
||||
m_criteriumId = -1;
|
||||
auto cb = [this] (const Evaluations::EvaluationCriterium &c)
|
||||
{
|
||||
m_criteriumId = c.id();
|
||||
INFO_LOG(m_logger) << "Evl(" << c.id() << ") :"
|
||||
INFO_LOG() << "Evl(" << c.id() << ") :"
|
||||
<< " name:" << c.name()
|
||||
<< " desc:" << c.description()
|
||||
<< " operatorId:" << c.operatorId();
|
||||
@@ -202,7 +201,7 @@ void EvlTests::tryGetAllCriteria()
|
||||
m_dtc->evaluationCriteriums(cb);
|
||||
if (m_criteriumId == -1)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Error requesting all criterium data";
|
||||
ERROR_LOG() << "Error requesting all criterium data";
|
||||
failExit();
|
||||
}
|
||||
QTimer::singleShot(0, qApp, &QCoreApplication::quit);
|
||||
@@ -211,7 +210,7 @@ void EvlTests::tryGetAllCriteria()
|
||||
//-----------------------------------------------------------------------------
|
||||
void EvlTests::tryGetCriterium()
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "trying to get criterium with id:" << m_criteriumId;
|
||||
DEBUG_LOG() << "trying to get criterium with id:" << m_criteriumId;
|
||||
|
||||
if(m_testId > 1)
|
||||
{
|
||||
@@ -220,7 +219,7 @@ void EvlTests::tryGetCriterium()
|
||||
|
||||
if (m_criteriumId <= 0)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "invalid criteriumId - test aborted.";
|
||||
ERROR_LOG() << "invalid criteriumId - test aborted.";
|
||||
failExit();
|
||||
}
|
||||
|
||||
@@ -229,12 +228,12 @@ void EvlTests::tryGetCriterium()
|
||||
|
||||
if (data.id() <= 0)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Error receiving data for criteriumId " << m_criteriumId << " returnVal: " << data.id();
|
||||
ERROR_LOG() << "Error receiving data for criteriumId " << m_criteriumId << " returnVal: " << data.id();
|
||||
failExit();
|
||||
}
|
||||
else
|
||||
{
|
||||
INFO_LOG(m_logger) << "Evl(" << data.id() << ") :"
|
||||
INFO_LOG() << "Evl(" << data.id() << ") :"
|
||||
<< " name:" << data.name()
|
||||
<< " desc:" << data.description()
|
||||
<< " operatorId:" << data.operatorId();
|
||||
@@ -244,7 +243,7 @@ void EvlTests::tryGetCriterium()
|
||||
{
|
||||
if (!onCompareCreatedData(data))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Compare created data failed!";
|
||||
ERROR_LOG() << "Compare created data failed!";
|
||||
failExit();
|
||||
}
|
||||
else
|
||||
@@ -280,10 +279,10 @@ void EvlTests::tryCreateElement()
|
||||
obj[QStringLiteral("allStreams")] = QJsonValue(QStringLiteral("vhf01, hf01, hf02, vhf03"));
|
||||
data.audioContent().set(QJsonDocument(obj).toJson().constData());
|
||||
|
||||
INFO_LOG(m_logger) << "trying to send evlElementModifyRequest";
|
||||
INFO_LOG() << "trying to send evlElementModifyRequest";
|
||||
if (!m_ftc->evlElementModifyRequest(data, this))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Error requesting create data";
|
||||
ERROR_LOG() << "Error requesting create data";
|
||||
failExit();
|
||||
}
|
||||
QTest::qWait(1000);
|
||||
@@ -311,10 +310,10 @@ void EvlTests::tryModifyElement()
|
||||
obj[QStringLiteral("allStreams")] = QJsonValue(QStringLiteral("vhf01, hf01, hf02, vhf03"));
|
||||
data.audioContent().set(QJsonDocument(obj).toJson().constData());
|
||||
|
||||
INFO_LOG(m_logger) << "trying to send evlElementModifyRequest for elementId:" << data.id();
|
||||
INFO_LOG() << "trying to send evlElementModifyRequest for elementId:" << data.id();
|
||||
if (!m_ftc->evlElementModifyRequest(data, this))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Error requesting modify data for snapshotId:" << data.id();
|
||||
ERROR_LOG() << "Error requesting modify data for snapshotId:" << data.id();
|
||||
failExit();
|
||||
}
|
||||
QTest::qWait(1000);
|
||||
@@ -329,10 +328,10 @@ void EvlTests::tryRemoveElement()
|
||||
data.id(m_elementId);
|
||||
data.criteriumId(m_criteriumId);
|
||||
|
||||
INFO_LOG(m_logger) << "trying to send remove request for elementId:" << data.id();
|
||||
INFO_LOG() << "trying to send remove request for elementId:" << data.id();
|
||||
if (!m_ftc->evlElementRemoveRequest(data, this))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Error requesting remove data for elementId:" << data.id();
|
||||
ERROR_LOG() << "Error requesting remove data for elementId:" << data.id();
|
||||
failExit();
|
||||
}
|
||||
QTest::qWait(1000);
|
||||
@@ -403,12 +402,12 @@ void EvlTests::tryCreateSanNineLiner()
|
||||
QJsonDocument doc = SanCategoryLine::toJson(vecCl);
|
||||
data.lines(doc.toJson().toStdString());
|
||||
|
||||
INFO_LOG(m_logger) << "lines: " << data.lines();
|
||||
INFO_LOG() << "lines: " << data.lines();
|
||||
|
||||
INFO_LOG(m_logger) << "trying to send sanNineLinerRequest";
|
||||
INFO_LOG() << "trying to send sanNineLinerRequest";
|
||||
if (!m_ftc->sanNineLinerModifyRequest(data, this))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Error requesting create data";
|
||||
ERROR_LOG() << "Error requesting create data";
|
||||
failExit();
|
||||
}
|
||||
QTest::qWait(1000);
|
||||
@@ -478,12 +477,12 @@ void EvlTests::tryModifySanNineLiner()
|
||||
QJsonDocument doc = SanCategoryLine::toJson(vecCl);
|
||||
data.lines(doc.toJson().toStdString());
|
||||
|
||||
INFO_LOG(m_logger) << "lines: " << data.lines();
|
||||
INFO_LOG() << "lines: " << data.lines();
|
||||
|
||||
INFO_LOG(m_logger) << "trying to send sanNineLinerRequest";
|
||||
INFO_LOG() << "trying to send sanNineLinerRequest";
|
||||
if (!m_ftc->sanNineLinerModifyRequest(data, this))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Error requesting modify data";
|
||||
ERROR_LOG() << "Error requesting modify data";
|
||||
failExit();
|
||||
}
|
||||
QTest::qWait(1000);
|
||||
@@ -497,10 +496,10 @@ void EvlTests::tryRemoveSanNineLiner()
|
||||
|
||||
data.id(m_sanNineLinerId);
|
||||
|
||||
INFO_LOG(m_logger) << "trying to send remove request for sanNineLinerId:" << data.id();
|
||||
INFO_LOG() << "trying to send remove request for sanNineLinerId:" << data.id();
|
||||
if (!m_ftc->sanNineLinerRemoveRequest(data, this))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Error requesting remove data for sanNineLinerId:" << data.id();
|
||||
ERROR_LOG() << "Error requesting remove data for sanNineLinerId:" << data.id();
|
||||
failExit();
|
||||
}
|
||||
QTest::qWait(1000);
|
||||
@@ -509,7 +508,7 @@ void EvlTests::tryRemoveSanNineLiner()
|
||||
//-----------------------------------------------------------------------------
|
||||
void EvlTests::tryGetSanNineLiner()
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "trying to get sanNineLinerId with id:" << m_sanNineLinerId;
|
||||
DEBUG_LOG() << "trying to get sanNineLinerId with id:" << m_sanNineLinerId;
|
||||
|
||||
if(m_testId > 1)
|
||||
{
|
||||
@@ -518,7 +517,7 @@ void EvlTests::tryGetSanNineLiner()
|
||||
|
||||
if (m_sanNineLinerId <= 0)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "invalid sanNineLinerId - test aborted.";
|
||||
ERROR_LOG() << "invalid sanNineLinerId - test aborted.";
|
||||
failExit();
|
||||
}
|
||||
|
||||
@@ -527,12 +526,12 @@ void EvlTests::tryGetSanNineLiner()
|
||||
|
||||
if (data.id() <= 0)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Error receiving data for sanNineLiner " << m_sanNineLinerId << " returnVal: " << data.id();
|
||||
ERROR_LOG() << "Error receiving data for sanNineLiner " << m_sanNineLinerId << " returnVal: " << data.id();
|
||||
failExit();
|
||||
}
|
||||
else
|
||||
{
|
||||
INFO_LOG(m_logger) << "SanNineLiner(" << data.id() << ") :"
|
||||
INFO_LOG() << "SanNineLiner(" << data.id() << ") :"
|
||||
<< " lastModified: " << data.lastModified()
|
||||
<< " position lat: " << data.line1_position().lat()
|
||||
<< " position lon: " << data.line1_position().lon()
|
||||
@@ -545,7 +544,7 @@ void EvlTests::tryGetSanNineLiner()
|
||||
{
|
||||
if (!onCompareCreatedData(data))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Compare created data failed!";
|
||||
ERROR_LOG() << "Compare created data failed!";
|
||||
failExit();
|
||||
}
|
||||
else
|
||||
@@ -563,20 +562,20 @@ void EvlTests::tryGetSanNineLiner()
|
||||
//-----------------------------------------------------------------------------
|
||||
void EvlTests::onEvlCriteriumModifyReply(const Core::FunctionReplyObject &replyObject)
|
||||
{
|
||||
INFO_LOG(m_logger) << "Got onEvlCriteriumModifyReply with id " << replyObject.id()
|
||||
INFO_LOG() << "Got onEvlCriteriumModifyReply with id " << replyObject.id()
|
||||
<< " and errorString " << replyObject.translated();
|
||||
|
||||
m_criteriumId = replyObject.id();
|
||||
|
||||
if (replyObject.error())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Error requesting create data";
|
||||
ERROR_LOG() << "Error requesting create data";
|
||||
failExit();
|
||||
return;
|
||||
}
|
||||
else
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "Requesting create data ok. Got new id:" << replyObject.id() << " ... ok.";
|
||||
DEBUG_LOG() << "Requesting create data ok. Got new id:" << replyObject.id() << " ... ok.";
|
||||
}
|
||||
|
||||
QTimer::singleShot(0, this, &EvlTests::tryGetCriterium);
|
||||
@@ -586,18 +585,18 @@ void EvlTests::onEvlCriteriumModifyReply(const Core::FunctionReplyObject &replyO
|
||||
//-----------------------------------------------------------------------------
|
||||
void EvlTests::onEvlCriteriumRemoveReply(const Core::FunctionReplyObject &replyObject)
|
||||
{
|
||||
INFO_LOG(m_logger) << "Got removeReply with id " << replyObject.id()
|
||||
INFO_LOG() << "Got removeReply with id " << replyObject.id()
|
||||
<< " and errorString " << replyObject.translated();
|
||||
|
||||
if (replyObject.error())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Error requesting remove data for criteriumId:" << replyObject.id();
|
||||
ERROR_LOG() << "Error requesting remove data for criteriumId:" << replyObject.id();
|
||||
failExit();
|
||||
return;
|
||||
}
|
||||
else
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "Requesting remove data for criteriumd:" << replyObject.id() << " ... ok.";
|
||||
DEBUG_LOG() << "Requesting remove data for criteriumd:" << replyObject.id() << " ... ok.";
|
||||
}
|
||||
|
||||
QTimer::singleShot(0, qApp, QCoreApplication::quit);
|
||||
@@ -607,20 +606,20 @@ void EvlTests::onEvlCriteriumRemoveReply(const Core::FunctionReplyObject &replyO
|
||||
//-----------------------------------------------------------------------------
|
||||
void EvlTests::onEvlElementModifyReply(const Core::FunctionReplyObject &replyObject)
|
||||
{
|
||||
INFO_LOG(m_logger) << "Got modifyReply with id " << replyObject.id()
|
||||
INFO_LOG() << "Got modifyReply with id " << replyObject.id()
|
||||
<< " and errorString " << replyObject.translated();
|
||||
|
||||
m_elementId = replyObject.id();
|
||||
|
||||
if (replyObject.error())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Error requesting modify data";
|
||||
ERROR_LOG() << "Error requesting modify data";
|
||||
failExit();
|
||||
return;
|
||||
}
|
||||
else
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "Requesting modify data ok. Got id:" << replyObject.id() << " ... ok.";
|
||||
DEBUG_LOG() << "Requesting modify data ok. Got id:" << replyObject.id() << " ... ok.";
|
||||
}
|
||||
|
||||
QTimer::singleShot(0, qApp, &QCoreApplication::quit);
|
||||
@@ -631,18 +630,18 @@ void EvlTests::onEvlElementModifyReply(const Core::FunctionReplyObject &replyObj
|
||||
//-----------------------------------------------------------------------------
|
||||
void EvlTests::onEvlElementRemoveReply(const Core::FunctionReplyObject &replyObject)
|
||||
{
|
||||
INFO_LOG(m_logger) << "Got removeReply with id " << replyObject.id()
|
||||
INFO_LOG() << "Got removeReply with id " << replyObject.id()
|
||||
<< " and errorString " << replyObject.translated();
|
||||
|
||||
if (replyObject.error())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Error requesting remove data for elementId:" << replyObject.id();
|
||||
ERROR_LOG() << "Error requesting remove data for elementId:" << replyObject.id();
|
||||
failExit();
|
||||
return;
|
||||
}
|
||||
else
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "Requesting remove data for elementId:" << replyObject.id() << " ... ok.";
|
||||
DEBUG_LOG() << "Requesting remove data for elementId:" << replyObject.id() << " ... ok.";
|
||||
}
|
||||
|
||||
QTimer::singleShot(0, qApp, &QCoreApplication::quit);
|
||||
@@ -652,20 +651,20 @@ void EvlTests::onEvlElementRemoveReply(const Core::FunctionReplyObject &replyObj
|
||||
//-----------------------------------------------------------------------------
|
||||
void EvlTests::onSanNineLinerModifyReply(const Core::FunctionReplyObject &replyObject)
|
||||
{
|
||||
INFO_LOG(m_logger) << "Got onSanNineLinerModifyReply with id " << replyObject.id()
|
||||
INFO_LOG() << "Got onSanNineLinerModifyReply with id " << replyObject.id()
|
||||
<< " and errorString " << replyObject.translated();
|
||||
|
||||
m_sanNineLinerId = replyObject.id();
|
||||
|
||||
if (replyObject.error())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Error requesting create data";
|
||||
ERROR_LOG() << "Error requesting create data";
|
||||
failExit();
|
||||
return;
|
||||
}
|
||||
else
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "Requesting create data ok. Got new id:" << replyObject.id() << " ... ok.";
|
||||
DEBUG_LOG() << "Requesting create data ok. Got new id:" << replyObject.id() << " ... ok.";
|
||||
}
|
||||
|
||||
QTimer::singleShot(0, this, &EvlTests::tryGetSanNineLiner);
|
||||
@@ -674,18 +673,18 @@ void EvlTests::onSanNineLinerModifyReply(const Core::FunctionReplyObject &replyO
|
||||
//-----------------------------------------------------------------------------
|
||||
void EvlTests::onSanNineLinerRemoveReply(const Core::FunctionReplyObject &replyObject)
|
||||
{
|
||||
INFO_LOG(m_logger) << "Got removeReply with id " << replyObject.id()
|
||||
INFO_LOG() << "Got removeReply with id " << replyObject.id()
|
||||
<< " and errorString " << replyObject.translated();
|
||||
|
||||
if (replyObject.error())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Error requesting remove data for sanNineLinerId:" << replyObject.id();
|
||||
ERROR_LOG() << "Error requesting remove data for sanNineLinerId:" << replyObject.id();
|
||||
failExit();
|
||||
return;
|
||||
}
|
||||
else
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "Requesting remove data for sanNineLinerId:" << replyObject.id() << " ... ok.";
|
||||
DEBUG_LOG() << "Requesting remove data for sanNineLinerId:" << replyObject.id() << " ... ok.";
|
||||
}
|
||||
|
||||
QTimer::singleShot(0, qApp, &QCoreApplication::quit);
|
||||
@@ -696,21 +695,21 @@ void EvlTests::onSanNineLinerRemoveReply(const Core::FunctionReplyObject &replyO
|
||||
//-----------------------------------------------------------------------------
|
||||
void EvlTests::onReceiveCriteriumChanged(const EvaluationCriterium &data, DataModification modType)
|
||||
{
|
||||
INFO_LOG(m_logger) << "onReceiveCriteriumChanged() criteriumId:" << data.id()
|
||||
INFO_LOG() << "onReceiveCriteriumChanged() criteriumId:" << data.id()
|
||||
<< " modificationType: = " << (int)modType<< " received";
|
||||
|
||||
switch (modType)
|
||||
{
|
||||
case DataModification::eAdded:
|
||||
INFO_LOG(m_logger) << "*** Criterium added received. criteriumId:" << data.id();
|
||||
INFO_LOG() << "*** Criterium added received. criteriumId:" << data.id();
|
||||
break;
|
||||
|
||||
case DataModification::eModified:
|
||||
INFO_LOG(m_logger) << "*** Criterium modified received. criteriumId:" << data.id();
|
||||
INFO_LOG() << "*** Criterium modified received. criteriumId:" << data.id();
|
||||
break;
|
||||
|
||||
case DataModification::eRemoved:
|
||||
INFO_LOG(m_logger) << "*** Criterium removed received. criteriumId:" << data.id();
|
||||
INFO_LOG() << "*** Criterium removed received. criteriumId:" << data.id();
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -737,7 +736,7 @@ void EvlTests::getSanNineLinerModifyRequestData(SanNineLinerModifyRequest &data)
|
||||
//-----------------------------------------------------------------------------
|
||||
bool EvlTests::onCompareCreatedData(EvaluationCriterium &data)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "start onCompareCreatedData() for id :" << data.id();
|
||||
DEBUG_LOG() << "start onCompareCreatedData() for id :" << data.id();
|
||||
|
||||
// Vergleicht die zurueckgelesen Datan mit den statischen create Daten
|
||||
|
||||
@@ -755,7 +754,7 @@ bool EvlTests::onCompareCreatedData(EvaluationCriterium &data)
|
||||
return false;
|
||||
|
||||
|
||||
DEBUG_LOG(m_logger) << "successfully finished onCompareCreatedData() for id :" << data.id();
|
||||
DEBUG_LOG() << "successfully finished onCompareCreatedData() for id :" << data.id();
|
||||
|
||||
return true;
|
||||
} // end of onCompareCreatedData()
|
||||
@@ -763,7 +762,7 @@ bool EvlTests::onCompareCreatedData(EvaluationCriterium &data)
|
||||
//-----------------------------------------------------------------------------
|
||||
bool EvlTests::onCompareCreatedData(SanNineLiner &data)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "start onCompareCreatedData() for id :" << data.id();
|
||||
DEBUG_LOG() << "start onCompareCreatedData() for id :" << data.id();
|
||||
|
||||
SanNineLinerModifyRequest createData;
|
||||
|
||||
@@ -775,7 +774,7 @@ bool EvlTests::onCompareCreatedData(SanNineLiner &data)
|
||||
if (createData.line2_radioFrequencyCallSignSuffix() != data.line2_RadioFrequencyCallSignSuffix())
|
||||
return false;
|
||||
|
||||
DEBUG_LOG(m_logger) << "successfully finished onCompareCreatedData() for id :" << data.id();
|
||||
DEBUG_LOG() << "successfully finished onCompareCreatedData() for id :" << data.id();
|
||||
|
||||
return true;
|
||||
} // end of onCompareCreatedData()
|
||||
|
||||
@@ -122,8 +122,6 @@ private:
|
||||
m_eTestStep = eUnknown;
|
||||
|
||||
bool m_bTestsSuccessful = true;
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
};
|
||||
|
||||
} // namespace Evaluations
|
||||
@@ -15,16 +15,15 @@ namespace Evaluations
|
||||
|
||||
DdsHandler::DdsHandler(const std::shared_ptr<DDSConnector::DdsConnector> &ddsConnector)
|
||||
: m_ddsConnector(ddsConnector)
|
||||
, m_logger(getLogger("DdsHandler"))
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "DdsHandler(" << m_ddsConnector->getDomainId() << ") for partition: " << m_ddsConnector->getDefaultPartition();
|
||||
DEBUG_LOG() << "DdsHandler(" << m_ddsConnector->getDomainId() << ") for partition: " << m_ddsConnector->getDefaultPartition();
|
||||
}
|
||||
|
||||
bool DdsHandler::init(const QStringList &qosFileList)
|
||||
{
|
||||
if(!m_ddsConnector->init(qosFileList))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Error initializing dds connections - aborting";
|
||||
ERROR_LOG() << "Error initializing dds connections - aborting";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -33,11 +32,11 @@ bool DdsHandler::init(const QStringList &qosFileList)
|
||||
|
||||
m_ddsDts = Evaluations::Interface::Dts::create(m_ddsConnector);
|
||||
bool bRet = m_ddsDts->enableAll();
|
||||
INFO_LOG(m_logger) << "Dts initialised";
|
||||
INFO_LOG() << "Dts initialised";
|
||||
|
||||
m_ddsFts = Evaluations::Interface::Fts::create(m_ddsConnector);
|
||||
bRet &= m_ddsFts->enableAll();
|
||||
INFO_LOG(m_logger) << "Fts initialised: ";
|
||||
INFO_LOG() << "Fts initialised: ";
|
||||
|
||||
return bRet;
|
||||
}
|
||||
|
||||
@@ -31,8 +31,6 @@ private:
|
||||
std::shared_ptr<DDSConnector::DdsConnector> m_ddsConnector;
|
||||
std::shared_ptr<Evaluations::Interface::Dts> m_ddsDts;
|
||||
std::shared_ptr<Evaluations::Interface::Fts> m_ddsFts;
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
|
||||
} // namespace Evaluations
|
||||
@@ -18,7 +18,6 @@ HandlerComment::HandlerComment(const std::shared_ptr<DdsHandler> &ddsHandler,
|
||||
, Interface::Fts::EvlSchemaModifyRequestHandler(ddsHandler->fts())
|
||||
, m_ddsHandler(ddsHandler)
|
||||
, m_db(db)
|
||||
, m_logger(getLogger("HandlerComment"))
|
||||
{}
|
||||
|
||||
HandlerComment::~HandlerComment()
|
||||
@@ -38,7 +37,7 @@ bool HandlerComment::init()
|
||||
if (ret.error())
|
||||
{
|
||||
delete ifs;
|
||||
ERROR_LOG(m_logger) << ret();
|
||||
ERROR_LOG() << ret();
|
||||
bRet = false;
|
||||
return;
|
||||
}
|
||||
@@ -46,7 +45,7 @@ bool HandlerComment::init()
|
||||
};
|
||||
if (!m_db->select(cbComment) || !bRet)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Error reading data from database!";
|
||||
ERROR_LOG() << "Error reading data from database!";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -59,7 +58,7 @@ bool HandlerComment::init()
|
||||
if (ret.error())
|
||||
{
|
||||
delete ifs;
|
||||
ERROR_LOG(m_logger) << ret();
|
||||
ERROR_LOG() << ret();
|
||||
bRet = false;
|
||||
return;
|
||||
}
|
||||
@@ -67,7 +66,7 @@ bool HandlerComment::init()
|
||||
};
|
||||
if (!m_db->select(cbSchema) || !bRet)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Error reading data from database!";
|
||||
ERROR_LOG() << "Error reading data from database!";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -117,7 +116,7 @@ void HandlerComment::onEvlCommentModifyRequest(const rti::core::SampleIdentity &
|
||||
{
|
||||
delete ifs;
|
||||
ifs = nullptr;
|
||||
ERROR_LOG(m_logger) << ret();
|
||||
ERROR_LOG() << ret();
|
||||
}
|
||||
else
|
||||
m_mapObjectComment.insert(ifs->getId(), ifs);
|
||||
@@ -151,7 +150,7 @@ void HandlerComment::onEvlSchemaModifyRequest(const rti::core::SampleIdentity &c
|
||||
{
|
||||
delete ifs;
|
||||
ifs = nullptr;
|
||||
ERROR_LOG(m_logger) << ret();
|
||||
ERROR_LOG() << ret();
|
||||
}
|
||||
else
|
||||
m_mapObjectSchema.insert(ifs->getId(), ifs);
|
||||
|
||||
@@ -43,6 +43,5 @@ private:
|
||||
|
||||
std::shared_ptr<DdsHandler> m_ddsHandler;
|
||||
std::shared_ptr<DatabaseInterface> m_db;
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
}
|
||||
@@ -21,7 +21,6 @@ HandlerCriterium::HandlerCriterium(const std::shared_ptr<DdsHandler> &ddsHandler
|
||||
, Interface::Fts::EvlElementRemoveRequestHandler(ddsHandler->fts())
|
||||
, m_ddsHandler(ddsHandler)
|
||||
, m_db(db)
|
||||
, m_logger(getLogger("HandlerCriterium"))
|
||||
{}
|
||||
|
||||
HandlerCriterium::~HandlerCriterium()
|
||||
@@ -41,7 +40,7 @@ bool HandlerCriterium::init()
|
||||
if (ret.error())
|
||||
{
|
||||
delete ifs;
|
||||
ERROR_LOG(m_logger) << ret();
|
||||
ERROR_LOG() << ret();
|
||||
bRet = false;
|
||||
return;
|
||||
}
|
||||
@@ -49,10 +48,10 @@ bool HandlerCriterium::init()
|
||||
};
|
||||
if (!m_db->select(cbCriterim) || !bRet)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Error reading data from database!";
|
||||
ERROR_LOG() << "Error reading data from database!";
|
||||
return false;
|
||||
}
|
||||
DEBUG_LOG(m_logger) << "m_criteriumObjMap.size() = " << m_criteriumObjMap.size();
|
||||
DEBUG_LOG() << "m_criteriumObjMap.size() = " << m_criteriumObjMap.size();
|
||||
|
||||
auto cbElement = [this, &bRet](const Database::EvlElement & data)
|
||||
{
|
||||
@@ -65,7 +64,7 @@ bool HandlerCriterium::init()
|
||||
if (ret.error())
|
||||
{
|
||||
delete oee;
|
||||
ERROR_LOG(m_logger) << ret();
|
||||
ERROR_LOG() << ret();
|
||||
bRet = false;
|
||||
return;
|
||||
}
|
||||
@@ -73,7 +72,7 @@ bool HandlerCriterium::init()
|
||||
};
|
||||
if (!m_db->select(cbElement) || !bRet)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Error reading data from database!";
|
||||
ERROR_LOG() << "Error reading data from database!";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -98,7 +97,7 @@ void HandlerCriterium::onEvlCriteriumModifyRequest(const rti::core::SampleIdenti
|
||||
{
|
||||
delete ifs;
|
||||
ifs = nullptr;
|
||||
ERROR_LOG(m_logger) << ret();
|
||||
ERROR_LOG() << ret();
|
||||
}
|
||||
else
|
||||
m_criteriumObjMap.insert(ifs->getId(), ifs);
|
||||
@@ -116,7 +115,7 @@ void HandlerCriterium::onEvlCriteriumModifyRequest(const rti::core::SampleIdenti
|
||||
void HandlerCriterium::onEvlCriteriumRemoveRequest(const rti::core::SampleIdentity &cookie,
|
||||
const Core::RemoveElementRequest &request)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "onEvlCriteriumRemoveRequest: " << request;
|
||||
DEBUG_LOG() << "onEvlCriteriumRemoveRequest: " << request;
|
||||
|
||||
ObjectCriterium *ifs = m_criteriumObjMap.value(request.id());
|
||||
Core::FunctionReplyObject ret;
|
||||
|
||||
@@ -44,7 +44,5 @@ private:
|
||||
QHash<int, ObjectCriterium *> m_criteriumObjMap;
|
||||
std::shared_ptr<DdsHandler> m_ddsHandler;
|
||||
std::shared_ptr<DatabaseInterface> m_db;
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
};
|
||||
}
|
||||
+10
-11
@@ -25,7 +25,6 @@ HandlerSanNineLiner::HandlerSanNineLiner(const std::shared_ptr<DdsHandler> &ddsH
|
||||
, Interface::Fts::SanNineLinerRemoveRequestHandler(ddsHandler->fts())
|
||||
, m_ddsHandler(ddsHandler)
|
||||
, m_db(db)
|
||||
, m_logger(getLogger("HandlerSanNineLiner"))
|
||||
{}
|
||||
|
||||
HandlerSanNineLiner::~HandlerSanNineLiner()
|
||||
@@ -44,7 +43,7 @@ bool HandlerSanNineLiner::init()
|
||||
if (ret.error())
|
||||
{
|
||||
delete ifs;
|
||||
ERROR_LOG(m_logger) << ret();
|
||||
ERROR_LOG() << ret();
|
||||
bRet = false;
|
||||
return;
|
||||
}
|
||||
@@ -52,7 +51,7 @@ bool HandlerSanNineLiner::init()
|
||||
};
|
||||
if (!m_db->select(cbSanNineLiner) || !bRet)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Error reading data from database!";
|
||||
ERROR_LOG() << "Error reading data from database!";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -62,7 +61,7 @@ bool HandlerSanNineLiner::init()
|
||||
ObjectSanNineLiner *objSan = m_mapObjectSanNineLiner.value(data.nineLinerId);
|
||||
if (!objSan)
|
||||
{
|
||||
WARNING_LOG(m_logger) << "Cannot find nineLiner Id = " << data.nineLinerId
|
||||
WARNING_LOG() << "Cannot find nineLiner Id = " << data.nineLinerId
|
||||
<< " for categoryLineId " << data.id;
|
||||
return;
|
||||
}
|
||||
@@ -71,7 +70,7 @@ bool HandlerSanNineLiner::init()
|
||||
|
||||
if (!m_db->select(cb))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Error reading data from database!";
|
||||
ERROR_LOG() << "Error reading data from database!";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -97,7 +96,7 @@ void HandlerSanNineLiner::onSanNineLinerModifyRequest(const rti::core::SampleIde
|
||||
|
||||
data.radioFrequencySuffixCallsign = QString::fromStdString(request.line2_radioFrequencyCallSignSuffix());
|
||||
|
||||
INFO_LOG(m_logger) << "lines: " << request.lines();
|
||||
INFO_LOG() << "lines: " << request.lines();
|
||||
|
||||
Core::FunctionReplyObject ret;
|
||||
ObjectSanNineLiner *ifs = nullptr;
|
||||
@@ -110,7 +109,7 @@ void HandlerSanNineLiner::onSanNineLinerModifyRequest(const rti::core::SampleIde
|
||||
{
|
||||
delete ifs;
|
||||
ifs = nullptr;
|
||||
ERROR_LOG(m_logger) << ret();
|
||||
ERROR_LOG() << ret();
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -133,22 +132,22 @@ void HandlerSanNineLiner::onSanNineLinerModifyRequest(const rti::core::SampleIde
|
||||
|
||||
// delete old entries
|
||||
if (!m_db->removeCategoryLinesPerNineLiner(data.id))
|
||||
ERROR_LOG(m_logger) << "Error while deleting old entries for nineLinerId " << data.id;
|
||||
ERROR_LOG() << "Error while deleting old entries for nineLinerId " << data.id;
|
||||
|
||||
ifs->removeCategoryLines();
|
||||
|
||||
// line3 - line9 in object_san_category_line
|
||||
INFO_LOG(m_logger) << "data.id: " << data.id;
|
||||
INFO_LOG() << "data.id: " << data.id;
|
||||
|
||||
QVector<Database::SanCategoryLine> linesCategory = SanCategoryLine::fromJson(request.lines(), data.id);
|
||||
INFO_LOG(m_logger) << "LinesCategory count: " << linesCategory.count();
|
||||
INFO_LOG() << "LinesCategory count: " << linesCategory.count();
|
||||
|
||||
for (Database::SanCategoryLine cl : std::as_const(linesCategory))
|
||||
{
|
||||
ObjectSanCategoryLine *ifsCl(new ObjectSanCategoryLine(m_ddsHandler, m_db));
|
||||
ret = ifsCl->createObject(cl);
|
||||
if (ret.error())
|
||||
ERROR_LOG(m_logger) << ret();
|
||||
ERROR_LOG() << ret();
|
||||
else
|
||||
{
|
||||
cl.id = ifsCl->getId();
|
||||
|
||||
@@ -41,7 +41,6 @@ private:
|
||||
|
||||
std::shared_ptr<DdsHandler> m_ddsHandler;
|
||||
std::shared_ptr<DatabaseInterface> m_db;
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
|
||||
} // Namespace Evaluations
|
||||
@@ -23,7 +23,6 @@ Initialization::Initialization()
|
||||
, m_dbHandler(nullptr)
|
||||
, m_handlerCriterium(nullptr)
|
||||
, m_handlerComment(nullptr)
|
||||
, m_logger(getLogger("Initialization"))
|
||||
{}
|
||||
|
||||
Initialization::~Initialization()
|
||||
@@ -37,26 +36,26 @@ Initialization::~Initialization()
|
||||
bool Initialization::initialize(const std::shared_ptr<DDSConnector::DdsConnector> &ddsConnector,
|
||||
const QSqlDatabase &sqlDb)
|
||||
{
|
||||
INFO_LOG(m_logger) << "Start Evaluations Initialization.";
|
||||
INFO_LOG() << "Start Evaluations Initialization.";
|
||||
|
||||
// initialize DDS
|
||||
m_ddsHandler = std::make_shared<DdsHandler>(ddsConnector);
|
||||
if (!m_ddsHandler->init())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Initialisation ddsHandler failed.";
|
||||
ERROR_LOG() << "Initialisation ddsHandler failed.";
|
||||
return false;
|
||||
}
|
||||
DEBUG_LOG(m_logger) << "Initialisation ddsHandler succesful.";
|
||||
DEBUG_LOG() << "Initialisation ddsHandler succesful.";
|
||||
|
||||
|
||||
// initialize database
|
||||
m_dbHandler = std::make_shared<DbHandler>();
|
||||
if (!m_dbHandler->init(ddsConnector->getPartitionId(), sqlDb))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Initialisation dbHandler failed.";
|
||||
ERROR_LOG() << "Initialisation dbHandler failed.";
|
||||
return false;
|
||||
}
|
||||
DEBUG_LOG(m_logger) << "Initialisation dbHandler succesful.";
|
||||
DEBUG_LOG() << "Initialisation dbHandler succesful.";
|
||||
|
||||
|
||||
// HandlerCriterium
|
||||
@@ -77,18 +76,18 @@ bool Initialization::loadFromDatabase()
|
||||
return false;
|
||||
if (!m_handlerCriterium->init())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Initialisation HandlerCriterium failed.";
|
||||
ERROR_LOG() << "Initialisation HandlerCriterium failed.";
|
||||
return false;
|
||||
}
|
||||
if (!m_handlerComment->init())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Initialisation HandlerComment failed.";
|
||||
ERROR_LOG() << "Initialisation HandlerComment failed.";
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!m_handlerSanNineLiner->init())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Initialisation HandlerSanNineLiner failed.";
|
||||
ERROR_LOG() << "Initialisation HandlerSanNineLiner failed.";
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
|
||||
#include <DDS/DDSConnector/dds_connector.h>
|
||||
#include <ngldb/db_service_handler.h>
|
||||
#include <Evaluations/evl_export.h>
|
||||
#include "svcevlserver_export.h"
|
||||
#include <Evaluations/logger.h>
|
||||
|
||||
class QSqlDatabase;
|
||||
@@ -36,7 +36,5 @@ private:
|
||||
std::unique_ptr<HandlerCriterium> m_handlerCriterium;
|
||||
std::unique_ptr<HandlerComment> m_handlerComment;
|
||||
std::unique_ptr<HandlerSanNineLiner> m_handlerSanNineLiner;
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
};
|
||||
} // namespace Evaluations
|
||||
@@ -9,7 +9,7 @@
|
||||
#pragma once
|
||||
|
||||
#include <NGLLogger/INGLLogger.h>
|
||||
#include "evl_export.h"
|
||||
#include "svcevlcommon_export.h"
|
||||
|
||||
namespace Evaluations
|
||||
{
|
||||
|
||||
@@ -13,7 +13,6 @@ ObjectComment::ObjectComment(const std::shared_ptr<DdsHandler> &ddsHandler,
|
||||
const std::shared_ptr<DatabaseInterface> &db)
|
||||
: m_ddsHandler(ddsHandler)
|
||||
, m_db(db)
|
||||
, m_logger(getLogger("ObjectComment"))
|
||||
{
|
||||
}
|
||||
|
||||
@@ -65,10 +64,10 @@ void ObjectComment::onPublishData()
|
||||
ddsData.schemaId(m_data.schemaId);
|
||||
ddsData.elementId(m_data.elementId);
|
||||
|
||||
INFO_LOG(m_logger) << "Publish EvlComment-data to dds (" << m_data.id << ") ...";
|
||||
INFO_LOG() << "Publish EvlComment-data to dds (" << m_data.id << ") ...";
|
||||
|
||||
if (!m_ddsHandler->dts()->publish(ddsData))
|
||||
ERROR_LOG(m_logger) << "Error publishing EvlComment-data to dds";
|
||||
ERROR_LOG() << "Error publishing EvlComment-data to dds";
|
||||
}
|
||||
|
||||
|
||||
@@ -79,7 +78,6 @@ ObjectSchema::ObjectSchema(const std::shared_ptr<DdsHandler> &ddsHandler,
|
||||
const std::shared_ptr<DatabaseInterface> &db)
|
||||
: m_ddsHandler(ddsHandler)
|
||||
, m_db(db)
|
||||
, m_logger(getLogger("ObjectSchema"))
|
||||
{
|
||||
}
|
||||
|
||||
@@ -135,9 +133,9 @@ void ObjectSchema::onPublishData()
|
||||
ddsData.schemadata(m_data.schemadata.toStdString());
|
||||
ddsData.sendToTa(m_data.sendToTa);
|
||||
|
||||
INFO_LOG(m_logger) << "Publish EvlSchema-data to dds (id = " << m_data.id << ", send to training area = " << m_data.sendToTa << ") ...";
|
||||
INFO_LOG() << "Publish EvlSchema-data to dds (id = " << m_data.id << ", send to training area = " << m_data.sendToTa << ") ...";
|
||||
|
||||
if (!m_ddsHandler->dts()->publish(ddsData))
|
||||
ERROR_LOG(m_logger) << "Error publishing EvlSchema-data to dds";
|
||||
ERROR_LOG() << "Error publishing EvlSchema-data to dds";
|
||||
}
|
||||
} // Namespace Evaluations
|
||||
@@ -9,7 +9,7 @@
|
||||
#include "dds_handler.h"
|
||||
#include "logger.h"
|
||||
|
||||
#include <DDS/Core/function_reply_object.h>
|
||||
#include <DDS/Core/core_types.h>
|
||||
|
||||
// Generated
|
||||
#include <Evaluations/evl_db.h>
|
||||
@@ -37,8 +37,6 @@ private:
|
||||
std::shared_ptr<DdsHandler> m_ddsHandler;
|
||||
std::shared_ptr<DatabaseInterface> m_db;
|
||||
Database::EvlComment m_data;
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
|
||||
class ObjectSchema final
|
||||
@@ -61,7 +59,5 @@ private:
|
||||
std::shared_ptr<DdsHandler> m_ddsHandler;
|
||||
std::shared_ptr<DatabaseInterface> m_db;
|
||||
Database::EvlSchema m_data;
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
}
|
||||
@@ -16,7 +16,6 @@ ObjectCriterium::ObjectCriterium(const std::shared_ptr<DdsHandler> &ddsHandler,
|
||||
const std::shared_ptr<DatabaseInterface> &db)
|
||||
: m_ddsHandler(ddsHandler)
|
||||
, m_db(db)
|
||||
, m_logger(getLogger("ObjectCriterium"))
|
||||
{
|
||||
}
|
||||
|
||||
@@ -74,10 +73,10 @@ void ObjectCriterium::onPublishData()
|
||||
ddsData.description(m_data.description.toStdString());
|
||||
ddsData.operatorId(m_data.operatorId);
|
||||
|
||||
INFO_LOG(m_logger) << "Publish EvlCriterium-data to dds (" << m_data.id << ") ...";
|
||||
INFO_LOG() << "Publish EvlCriterium-data to dds (" << m_data.id << ") ...";
|
||||
|
||||
if (!m_ddsHandler->dts()->publish(ddsData))
|
||||
ERROR_LOG(m_logger) << "Error publishing EvlCriterium-data to dds";
|
||||
ERROR_LOG() << "Error publishing EvlCriterium-data to dds";
|
||||
}
|
||||
|
||||
void ObjectCriterium::addElement(ObjectEvaluationElement *oee)
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
#include "dds_handler.h"
|
||||
#include "logger.h"
|
||||
|
||||
#include <DDS/Core/function_reply_object.h>
|
||||
#include <DDS/Core/core_types.h>
|
||||
|
||||
// Generated
|
||||
#include <Evaluations/evl_db.h>
|
||||
@@ -43,8 +43,5 @@ private:
|
||||
std::shared_ptr<DatabaseInterface> m_db;
|
||||
Database::EvlCriterium m_data;
|
||||
QHash<qint32, ObjectEvaluationElement *> m_elementsMap;
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
};
|
||||
}
|
||||
+2
-3
@@ -14,7 +14,6 @@ ObjectEvaluationElement::ObjectEvaluationElement(const std::shared_ptr<DdsHandle
|
||||
const std::shared_ptr<DatabaseInterface> &db)
|
||||
: m_ddsHandler(ddsHandler)
|
||||
, m_db(db)
|
||||
, m_logger(getLogger("ObjectEvaluationElement"))
|
||||
{
|
||||
}
|
||||
|
||||
@@ -76,10 +75,10 @@ void ObjectEvaluationElement::onPublishData()
|
||||
if (!m_data.situationContent.isNull())
|
||||
ddsData.situationContent(m_data.situationContent.toString().toStdString());
|
||||
|
||||
INFO_LOG(m_logger) << "Publish EvlElement-data to dds (" << m_data.id << ") ...";
|
||||
INFO_LOG() << "Publish EvlElement-data to dds (" << m_data.id << ") ...";
|
||||
|
||||
if (!m_ddsHandler->dts()->publish(ddsData))
|
||||
ERROR_LOG(m_logger) << "Error publishing EvlEvaluationElement-data to dds";
|
||||
ERROR_LOG() << "Error publishing EvlEvaluationElement-data to dds";
|
||||
}
|
||||
|
||||
} // Namespace Evaluations
|
||||
@@ -9,7 +9,7 @@
|
||||
#include "dds_handler.h"
|
||||
#include "logger.h"
|
||||
|
||||
#include <DDS/Core/function_reply_object.h>
|
||||
#include <DDS/Core/core_types.h>
|
||||
|
||||
// Generated
|
||||
#include <Evaluations/evl_db.h>
|
||||
@@ -38,8 +38,5 @@ private:
|
||||
std::shared_ptr<DdsHandler> m_ddsHandler;
|
||||
std::shared_ptr<DatabaseInterface> m_db;
|
||||
Database::EvlElement m_data;
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
};
|
||||
}
|
||||
+2
-3
@@ -13,14 +13,13 @@ ObjectSanCategoryLine::ObjectSanCategoryLine(const std::shared_ptr<DdsHandler> &
|
||||
const std::shared_ptr<DatabaseInterface> &db)
|
||||
: m_ddsHandler(ddsHandler)
|
||||
, m_db(db)
|
||||
, m_logger(getLogger("ObjectSanCategoryLine"))
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
Core::FunctionReplyObject ObjectSanCategoryLine::createObject(const Database::SanCategoryLine &data)
|
||||
{
|
||||
INFO_LOG(m_logger) << "SanCategoryLine: nineLiner: " << data.nineLinerId << " line: " << data.line << ", amount: " << data.amount << ", category: " << data.category;
|
||||
INFO_LOG() << "SanCategoryLine: nineLiner: " << data.nineLinerId << " line: " << data.line << ", amount: " << data.amount << ", category: " << data.category;
|
||||
m_data = data;
|
||||
if (m_data.id <= 0)
|
||||
{
|
||||
@@ -28,7 +27,7 @@ Core::FunctionReplyObject ObjectSanCategoryLine::createObject(const Database::Sa
|
||||
return Core::FunctionReplyObject(0, tr_lts("dds", "Error inserting SanCategoryLine-data into database"));
|
||||
}
|
||||
|
||||
INFO_LOG(m_logger) << "New data id: " << m_data.id;
|
||||
INFO_LOG() << "New data id: " << m_data.id;
|
||||
|
||||
return Core::FunctionReplyObject(m_data.id);
|
||||
}
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
#include "dds_handler.h"
|
||||
#include "logger.h"
|
||||
|
||||
#include <DDS/Core/function_reply_object.h>
|
||||
#include <DDS/Core/core_types.h>
|
||||
|
||||
// Generated
|
||||
#include <Evaluations/evl_db.h>
|
||||
@@ -37,8 +37,6 @@ private:
|
||||
std::shared_ptr<DdsHandler> m_ddsHandler;
|
||||
std::shared_ptr<DatabaseInterface> m_db;
|
||||
Database::SanCategoryLine m_data;
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
|
||||
}
|
||||
@@ -14,7 +14,6 @@ ObjectSanNineLiner::ObjectSanNineLiner(const std::shared_ptr<DdsHandler> &ddsHan
|
||||
const std::shared_ptr<DatabaseInterface> &db)
|
||||
: m_ddsHandler(ddsHandler)
|
||||
, m_db(db)
|
||||
, m_logger(getLogger("ObjectSanNineLiner"))
|
||||
{
|
||||
}
|
||||
|
||||
@@ -77,10 +76,10 @@ void ObjectSanNineLiner::onPublishData()
|
||||
QJsonDocument doc = SanCategoryLine::toJson(m_lines);
|
||||
ddsData.lines(QString::fromUtf8(doc.toJson(QJsonDocument::Compact)).toStdString());
|
||||
|
||||
INFO_LOG(m_logger) << "Publish SanNineLiner-data to dds (" << m_data.id << ") other lines: " << ddsData.lines();
|
||||
INFO_LOG() << "Publish SanNineLiner-data to dds (" << m_data.id << ") other lines: " << ddsData.lines();
|
||||
|
||||
if (!m_ddsHandler->dts()->publish(ddsData))
|
||||
ERROR_LOG(m_logger) << "Error publishing SanNineLiner-data to dds";
|
||||
ERROR_LOG() << "Error publishing SanNineLiner-data to dds";
|
||||
}
|
||||
|
||||
} // Namespace Evaluations
|
||||
@@ -9,7 +9,7 @@
|
||||
#include "dds_handler.h"
|
||||
#include "logger.h"
|
||||
|
||||
#include <DDS/Core/function_reply_object.h>
|
||||
#include <DDS/Core/core_types.h>
|
||||
|
||||
// Generated
|
||||
#include <Evaluations/evl_db.h>
|
||||
@@ -40,7 +40,5 @@ private:
|
||||
std::shared_ptr<DatabaseInterface> m_db;
|
||||
Database::SanNineLiner m_data;
|
||||
std::vector<Database::SanCategoryLine> m_lines;
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
}
|
||||
@@ -26,13 +26,13 @@ QVector<Database::SanCategoryLine> SanCategoryLine::fromJson(const std::string &
|
||||
QJsonDocument doc(QJsonDocument::fromJson(QByteArray::fromStdString(line), &jError));
|
||||
if (jError.error)
|
||||
{
|
||||
//ERROR_LOG(m_logger) << "Can not parse json document: " << jError.errorString();
|
||||
//ERROR_LOG() << "Can not parse json document: " << jError.errorString();
|
||||
return QVector<Database::SanCategoryLine>();
|
||||
}
|
||||
|
||||
const QJsonObject rootObj = doc.object();
|
||||
const QJsonArray arrCategoryLines(rootObj[QStringLiteral("categoryLines")].toArray());
|
||||
//INFO_LOG(m_logger) << "Lines: " << arrCategoryLines.count();
|
||||
//INFO_LOG() << "Lines: " << arrCategoryLines.count();
|
||||
|
||||
QVector<Database::SanCategoryLine> categoryLines;
|
||||
categoryLines.reserve(arrCategoryLines.size());
|
||||
@@ -63,7 +63,7 @@ QJsonDocument SanCategoryLine::toJson(std::vector<Database::SanCategoryLine> vec
|
||||
obj[QStringLiteral("amount")] = cl.amount;
|
||||
obj[QStringLiteral("category")] = cl.category;
|
||||
|
||||
//INFO_LOG(m_logger) << "toJsonDocument: id: " << cl.id << ", line: " << cl.line << ", amount: " << cl.amount << ", category: " << cl.category;
|
||||
//INFO_LOG() << "toJsonDocument: id: " << cl.id << ", line: " << cl.line << ", amount: " << cl.amount << ", category: " << cl.category;
|
||||
arr.append(obj);
|
||||
}
|
||||
|
||||
|
||||
@@ -19,7 +19,6 @@ namespace Evaluations
|
||||
static QJsonDocument toJson(std::vector<Database::SanCategoryLine> vecCategoryLines);
|
||||
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
|
||||
}
|
||||
@@ -7,7 +7,7 @@
|
||||
|
||||
#pragma once
|
||||
#include <QString>
|
||||
#include <Evaluations/evl_export.h>
|
||||
#include "svcevlserver_export.h"
|
||||
|
||||
namespace NGL
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user