Adds immediate migration results in progress

This commit is contained in:
torsten committed 2026-08-19 11:18:24 +02:00
1 parent 8453e104c5
commit 3bb6e89496
2102 files changed
+17482 -15071

No files matched your search

@@ -21,21 +21,21 @@ HandlerShootbackTarget::HandlerShootbackTarget(MainHandler *mainHandler)
, m_mainHandler(mainHandler)
, m_dtsTgt(m_mainHandler->dds()->dtsTgt())
{
TRACE_LOG() << Q_FUNC_INFO << " START";
TRACE_LOG() << Q_FUNC_INFO << " END";
TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
}
//--------------------------------------------------------------------------
HandlerShootbackTarget::~HandlerShootbackTarget()
{
TRACE_LOG() << Q_FUNC_INFO << " START";
TRACE_LOG() << Q_FUNC_INFO << " END";
TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
}
//--------------------------------------------------------------------------
bool HandlerShootbackTarget::init()
{
TRACE_LOG() << Q_FUNC_INFO << " START";
TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
// connect(m_dtcTab.get(), &TrainingAreaBase::Interface::Dtc::targetDataChanged,
// this, &HandlerShootbackTarget::onTargetDataChanged);
@@ -44,13 +44,13 @@ bool HandlerShootbackTarget::init()
// create objects
auto cb = [this, &bRet](const Database::TgtShootbackTarget & data)
{
DEBUG_LOG() << "Reading from DB ShootbackTarget with id = " << data.id;
DEBUG_LOG(m_logger) << "Reading from DB ShootbackTarget with id = " << data.id;
ObjectShootbackTarget *ifs(new ObjectShootbackTarget(m_mainHandler));
Core::FunctionReplyObject ret = ifs->createObject(ObjectShootbackTarget::toDdsData(data));
if (ret.error())
{
delete ifs;
ERROR_LOG() << ret();
ERROR_LOG(m_logger) << ret();
bRet = false;
return;
}
@@ -58,10 +58,10 @@ bool HandlerShootbackTarget::init()
};
if (!m_mainHandler->db()->select(cb) || !bRet)
{
ERROR_LOG() << "Error reading data from database!";
ERROR_LOG(m_logger) << "Error reading data from database!";
return false;
}
DEBUG_LOG() << "m_objectMap.size() = " << m_objectMap.size();
DEBUG_LOG(m_logger) << "m_objectMap.size() = " << m_objectMap.size();
return true;
}
@@ -93,7 +93,7 @@ void HandlerShootbackTarget::onShootbackTargetModifyRequest(const rti::core::Sam
{
const auto ret = shootbackTargetModifyRequest(request);
if (ret.error())
WARNING_LOG() << ret();
WARNING_LOG(m_logger) << ret();
else
emit objectChanged(ret.id(), false); // For ShootbackController
@@ -103,7 +103,7 @@ void HandlerShootbackTarget::onShootbackTargetModifyRequest(const rti::core::Sam
//--------------------------------------------------------------------------
Core::FunctionReplyObject HandlerShootbackTarget::shootbackTargetModifyRequest(const ShootbackTarget &request)
{
TRACE_LOG() << Q_FUNC_INFO << " START";
TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
// modify
if (request.id() > 0)
{
@@ -127,7 +127,7 @@ Core::FunctionReplyObject HandlerShootbackTarget::shootbackTargetModifyRequest(c
}
else
m_objectMap.insert(ifs->getId(), ifs);
TRACE_LOG() << Q_FUNC_INFO << " END";
TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
return ret;
}
@@ -135,7 +135,7 @@ Core::FunctionReplyObject HandlerShootbackTarget::shootbackTargetModifyRequest(c
void HandlerShootbackTarget::onShootbackTargetRemoveRequest(const rti::core::SampleIdentity &cookie,
const Core::RemoveElementRequest &request)
{
TRACE_LOG() << Q_FUNC_INFO << " request=" << request;
TRACE_LOG(m_logger) << Q_FUNC_INFO << " request=" << request;
Core::FunctionReplyObject ret;
ObjectShootbackTarget *ifs = m_objectMap.value(request.id());
@@ -166,7 +166,7 @@ void HandlerShootbackTarget::onShootbackTargetRemoveRequest(const rti::core::Sam
ret = ifs->removeObject();
if (ret.error())
ERROR_LOG() << ret();
ERROR_LOG(m_logger) << ret();
else
{
// delete Object