Adds immediate migration results in progress
This commit is contained in:
2102 files changed
+17482
-15071
No files matched your search
@@ -153,40 +153,38 @@ MESSAGE(STATUS "DEBUG: After NGL_ADD_BIG_RESOURCES")
|
||||
|
||||
NGL_ADD_BIG_RESOURCES(ltswidgets_SRCS resources/lts_resources.qrc)
|
||||
|
||||
MESSAGE(STATUS "DEBUG BEFORE IF: BUILD_RTI=${BUILD_RTI}, BUILD_WS=${BUILD_WS}")
|
||||
MESSAGE(STATUS "DEBUG: BUILD_RTI=${BUILD_RTI}, BUILD_WS=${BUILD_WS}, building LtsWidgets")
|
||||
NGL_ADD_LIBRARY2(WS TOOLSWS TOOLSSV LtsWidgets SHARED ${ltswidgets_SRCS})
|
||||
|
||||
NGL_TARGET_INCLUDE_DIRECTORIES(LtsWidgets
|
||||
PUBLIC
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/../
|
||||
${CMAKE_BINARY_DIR}/Lts/Common/LtsUtils/LtsUtilsCore
|
||||
${CMAKE_CURRENT_BINARY_DIR}
|
||||
)
|
||||
|
||||
NGL_TARGET_LINK_LIBRARIES(LtsWidgets
|
||||
PRIVATE
|
||||
Qt6::Network # for QHostInfo - for portability
|
||||
Qt6::Svg
|
||||
ngltools
|
||||
ngltranslator
|
||||
TabBarTabStyle
|
||||
LtsSessionData
|
||||
LtsUtilsSettings
|
||||
PUBLIC
|
||||
LtsUtilsCore
|
||||
Qt6::Core
|
||||
Qt6::Widgets
|
||||
Qt6::Gui
|
||||
)
|
||||
|
||||
NGL_INSTALL_TARGET(LtsWidgets)
|
||||
|
||||
#
|
||||
# Designer-Plugin (RTI-dependent)
|
||||
#
|
||||
IF(BUILD_RTI)
|
||||
MESSAGE(STATUS "DEBUG: BUILD_RTI=${BUILD_RTI}, BUILD_WS=${BUILD_WS}, building LtsWidgets")
|
||||
NGL_ADD_LIBRARY2(WS TOOLSWS TOOLSSV LtsWidgets SHARED ${ltswidgets_SRCS})
|
||||
|
||||
NGL_TARGET_INCLUDE_DIRECTORIES(LtsWidgets
|
||||
PUBLIC
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/../
|
||||
${CMAKE_BINARY_DIR}/Lts/Common/LtsUtils/LtsUtilsCore
|
||||
${CMAKE_CURRENT_BINARY_DIR}
|
||||
)
|
||||
|
||||
NGL_TARGET_LINK_LIBRARIES(LtsWidgets
|
||||
PRIVATE
|
||||
Qt6::Network # for QHostInfo - for portability
|
||||
Qt6::Svg
|
||||
ngltools
|
||||
ngltranslator
|
||||
TabBarTabStyle
|
||||
LtsSessionData
|
||||
LtsUtilsSettings
|
||||
PUBLIC
|
||||
LtsUtilsCore
|
||||
Qt6::Core
|
||||
Qt6::Widgets
|
||||
Qt6::Gui
|
||||
)
|
||||
|
||||
NGL_INSTALL_TARGET(LtsWidgets)
|
||||
|
||||
#
|
||||
# Designer-Plugin
|
||||
#
|
||||
SET(ltswidgetsplugin_SRCS ltswidgetsplugin.cpp ltswidgetsplugin.json)
|
||||
NGL_ADD_LIBRARY(WS ltswidgetsplugin MODULE ${ltswidgetsplugin_SRCS})
|
||||
NGL_TARGET_LINK_LIBRARIES(ltswidgetsplugin LtsWidgets ltsCoordWidget LtsDataView LtsFileDialog LtsReportDisplay svcFlmCommon)
|
||||
|
||||
@@ -486,13 +486,13 @@ void LtsDialog::showEvent(QShowEvent *event)
|
||||
|
||||
void LtsDialog::tryLockTopic()
|
||||
{
|
||||
TRACE_LOG() << Q_FUNC_INFO << " START";
|
||||
TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
|
||||
if (!m_topicInfo.isValid())
|
||||
return;
|
||||
|
||||
if (m_topicInfo.isLocked())
|
||||
{
|
||||
WARNING_LOG() << Q_FUNC_INFO << " tried to lock with an already locked topic info, return";
|
||||
WARNING_LOG(m_logger) << Q_FUNC_INFO << " tried to lock with an already locked topic info, return";
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -508,7 +508,7 @@ void LtsDialog::tryLockTopic()
|
||||
|
||||
bool bIsConnected = isSignalConnected(QMetaMethod::fromSignal(&LtsDialog::signalLockTopic));
|
||||
|
||||
DEBUG_LOG() << Q_FUNC_INFO
|
||||
DEBUG_LOG(m_logger) << Q_FUNC_INFO
|
||||
<< " signalLockTopic(): "
|
||||
<< ", TopicName =" << m_topicInfo.topicName()
|
||||
<< ", entity =" << m_topicInfo.entityId()
|
||||
@@ -520,7 +520,7 @@ void LtsDialog::tryLockTopic()
|
||||
|
||||
m_topicInfo.setLocked();
|
||||
}
|
||||
TRACE_LOG() << Q_FUNC_INFO << " END";
|
||||
TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
|
||||
}
|
||||
|
||||
void LtsDialog::initTopicLockHandler(const QString &topicName, int entityId)
|
||||
@@ -535,14 +535,14 @@ void LtsDialog::initTopicLockHandler(const QString &topicName, int entityId)
|
||||
|
||||
void LtsDialog::tryLockTopicNew()
|
||||
{
|
||||
TRACE_LOG() << Q_FUNC_INFO << " START";
|
||||
TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
|
||||
tryLockTopic();
|
||||
TRACE_LOG() << Q_FUNC_INFO << " END";
|
||||
TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
|
||||
}
|
||||
|
||||
void LtsDialog::tryLockTopicNew(const QString &topicName, int entityId)
|
||||
{
|
||||
TRACE_LOG() << Q_FUNC_INFO << " START"
|
||||
TRACE_LOG(m_logger) << Q_FUNC_INFO << " START"
|
||||
<< ", topicName='" << topicName << "'"
|
||||
<< ", entityId=" << entityId;
|
||||
|
||||
@@ -550,7 +550,7 @@ void LtsDialog::tryLockTopicNew(const QString &topicName, int entityId)
|
||||
|
||||
if (m_topicInfo.entityId() != entityId)
|
||||
{
|
||||
DEBUG_LOG() << Q_FUNC_INFO << " topicName='" << topicName << "'"
|
||||
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " topicName='" << topicName << "'"
|
||||
<< " change from " << m_topicInfo.entityId() << " to " << entityId;
|
||||
m_topicInfo.setLocked(false);
|
||||
}
|
||||
@@ -561,16 +561,16 @@ void LtsDialog::tryLockTopicNew(const QString &topicName, int entityId)
|
||||
m_topicInfo.setValid();
|
||||
|
||||
tryLockTopic();
|
||||
TRACE_LOG() << Q_FUNC_INFO << " END"
|
||||
TRACE_LOG(m_logger) << Q_FUNC_INFO << " END"
|
||||
<< ", topicName='" << topicName << "'"
|
||||
<< ", entityId=" << entityId;
|
||||
}
|
||||
|
||||
void LtsDialog::triggerTopicLock()
|
||||
{
|
||||
TRACE_LOG() << Q_FUNC_INFO << " START" << " !!trigger!!";
|
||||
TRACE_LOG(m_logger) << Q_FUNC_INFO << " START" << " !!trigger!!";
|
||||
tryLockTopic();
|
||||
TRACE_LOG() << Q_FUNC_INFO << " END";
|
||||
TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -43,6 +43,8 @@ public:
|
||||
void setValid() { m_valid = true; }
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
QString m_topicName;
|
||||
int m_entityId{0};
|
||||
bool m_locked{false};
|
||||
|
||||
Reference in new issue
Block a user