Qt6 Migration: Merge latest Qt5 devel content and apply migration fixes
- Merged 292 changed files from dlbo snapshot - Fixed IDL enum collisions (PortType, PdmEventType) - Fixed Grantlee template for C++11 scoped enums - Fixed CMake VERSION_GREATER syntax - Added missing directories (THP, LtsRestClient, etc.) Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
310 files changed
+2823
-740
No files matched your search
@@ -183,11 +183,17 @@ void ObjectEffector::onEffectorFired()
|
||||
if (m_firingStrategy == nullptr)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Not possible to fire. No firing strategy specified.";
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
m_firingStrategy->doFiring();
|
||||
const bool bDoFiringSuccess = m_firingStrategy->doFiring();
|
||||
if (!bDoFiringSuccess)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "doFiring failed"
|
||||
<< ", participantId=" << m_participantId
|
||||
<< ", aesItemId=" << m_aesItemId
|
||||
<< ", intendendTrajectory().size()=" << this->intendendTrajectory().size();
|
||||
}
|
||||
}
|
||||
|
||||
// Anhand der EX-L39 Streuungsdaten wird eine Trajektorie für diesen
|
||||
@@ -209,7 +215,8 @@ void ObjectEffector::setIndendedTrajectory(const std::vector<Core::RelativePosit
|
||||
|
||||
void ObjectEffector::setEffectorData(const EffectorData &effectorData)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "setEffectorData";
|
||||
DEBUG_LOG(m_logger) << "setEffectorData" << ", effectorData.properties() = '" << effectorData.properties() << "'";
|
||||
|
||||
m_effectorData = effectorData;
|
||||
setIndendedTrajectory(effectorData.trajectoryRelative());
|
||||
delete m_firingStrategy;
|
||||
|
||||
Reference in new issue
Block a user