Adds immediate migration results in progress
This commit is contained in:
2102 files changed
+17482
-15071
No files matched your search
+14
-15
@@ -19,13 +19,12 @@ HandlerOverlays::HandlerOverlays(AvsInterface *avsIf,
|
||||
const std::shared_ptr<HandlerParticipantData> &handlerParticipantData,
|
||||
const std::shared_ptr<HandlerInfrastructureData> &handlerInfrastructureData,
|
||||
int exerciseId,
|
||||
QObject *parent)
|
||||
: QObject(parent)
|
||||
QObject *parent) : QObject(parent)
|
||||
, m_avsIf(avsIf)
|
||||
, m_handlerParticipantData(handlerParticipantData)
|
||||
, m_handlerInfrastructureData(handlerInfrastructureData)
|
||||
, m_exerciseId(exerciseId)
|
||||
{
|
||||
, m_exerciseId(exerciseId),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
|
||||
} // end of ctor()
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
@@ -36,7 +35,7 @@ HandlerOverlays::~HandlerOverlays()
|
||||
|
||||
bool HandlerOverlays::init()
|
||||
{
|
||||
INFO_LOG() << "Start VideoOverlay Handler.";
|
||||
INFO_LOG(m_logger) << "Start VideoOverlay Handler.";
|
||||
|
||||
// internal Signal/Slot connection (must be done before calling initParticipantsInRoomMap() !)
|
||||
connect(this, &HandlerOverlays::participantsInRoomMapChanged,
|
||||
@@ -48,7 +47,7 @@ bool HandlerOverlays::init()
|
||||
connect(m_handlerParticipantData.get(), &HandlerParticipantData::participantPositionChanged,
|
||||
this, &HandlerOverlays::onParticipantPositionChanged);
|
||||
|
||||
INFO_LOG() << "VOM Handler initialized. ";
|
||||
INFO_LOG(m_logger) << "VOM Handler initialized. ";
|
||||
|
||||
return true;
|
||||
} // end of init()
|
||||
@@ -56,7 +55,7 @@ bool HandlerOverlays::init()
|
||||
|
||||
void HandlerOverlays::onParticipantPositionChanged(int oldRoomId, int newRoomId, int participantId)
|
||||
{
|
||||
DEBUG_LOG() << "onParticipantPositionChanged() "
|
||||
DEBUG_LOG(m_logger) << "onParticipantPositionChanged() "
|
||||
<< " oldRoomId: " << oldRoomId
|
||||
<< " newRoomId: " << newRoomId
|
||||
<< " participantId: " << participantId
|
||||
@@ -72,7 +71,7 @@ void HandlerOverlays::onParticipantPositionChanged(int oldRoomId, int newRoomId,
|
||||
|
||||
void HandlerOverlays::onParticipantsInRoomMapChanged(int roomId, const QSet<int> &participants)
|
||||
{
|
||||
DEBUG_LOG() << "onParticipantsInRoomMapChanged() "
|
||||
DEBUG_LOG(m_logger) << "onParticipantsInRoomMapChanged() "
|
||||
<< " roomId: " << roomId
|
||||
<< " partId: " << getAllEquipmentNumbers(participants, false)
|
||||
<< " eqNo: " << getAllEquipmentNumbers(participants, true)
|
||||
@@ -81,7 +80,7 @@ void HandlerOverlays::onParticipantsInRoomMapChanged(int roomId, const QSet<int>
|
||||
|
||||
if (!m_handlerInfrastructureData->isCameraAvailable(roomId))
|
||||
{
|
||||
WARNING_LOG() << "onParticipantsInRoomMapChanged() Non camera available in roomId: " << roomId << " No data will be send to AVS.";
|
||||
WARNING_LOG(m_logger) << "onParticipantsInRoomMapChanged() Non camera available in roomId: " << roomId << " No data will be send to AVS.";
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -93,7 +92,7 @@ void HandlerOverlays::onParticipantsInRoomMapChanged(int roomId, const QSet<int>
|
||||
|
||||
if (streamName.isEmpty())
|
||||
{
|
||||
ERROR_LOG() << "onParticipantsInRoomMapChanged() No streamName found for roomId: " << roomId << " No data will be send to AVS.";
|
||||
ERROR_LOG(m_logger) << "onParticipantsInRoomMapChanged() No streamName found for roomId: " << roomId << " No data will be send to AVS.";
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -116,7 +115,7 @@ void HandlerOverlays::onParticipantsInRoomMapChanged(int roomId, const QSet<int>
|
||||
QByteArray qba = cmd.toLatin1();
|
||||
qba += "\r\n";
|
||||
|
||||
INFO_LOG() << "onParticipantsInRoomMapChanged() sendCommand: " << qba ;
|
||||
INFO_LOG(m_logger) << "onParticipantsInRoomMapChanged() sendCommand: " << qba ;
|
||||
m_avsIf->sendCommand(qba);
|
||||
|
||||
// room entry der keine participants enthaelt loeschen
|
||||
@@ -137,7 +136,7 @@ void HandlerOverlays::initParticipantsInRoomMap()
|
||||
|
||||
void HandlerOverlays::addPartIdToParticipantsInRoomMap(int roomId, int participantId)
|
||||
{
|
||||
DEBUG_LOG() << "addPartIdToParticipantsInRoomMap() "
|
||||
DEBUG_LOG(m_logger) << "addPartIdToParticipantsInRoomMap() "
|
||||
<< " roomId: " << roomId
|
||||
<< " participantId: " << participantId
|
||||
;
|
||||
@@ -154,7 +153,7 @@ void HandlerOverlays::addPartIdToParticipantsInRoomMap(int roomId, int participa
|
||||
m_participantsInRoomMap.insert(roomId, participants);
|
||||
|
||||
///
|
||||
DEBUG_LOG() << "emit participantsInRoomMapChanged()"
|
||||
DEBUG_LOG(m_logger) << "emit participantsInRoomMapChanged()"
|
||||
<< " roomId: " << roomId
|
||||
<< " partId: " << getAllEquipmentNumbers(participants, false)
|
||||
<< " eqNo: " << getAllEquipmentNumbers(participants, true)
|
||||
@@ -167,7 +166,7 @@ void HandlerOverlays::addPartIdToParticipantsInRoomMap(int roomId, int participa
|
||||
|
||||
void HandlerOverlays::removePartIdFromParticipantsInRoomMap(int roomId, int participantId)
|
||||
{
|
||||
DEBUG_LOG() << "removePartIdFromParticipantsInRoomMap() "
|
||||
DEBUG_LOG(m_logger) << "removePartIdFromParticipantsInRoomMap() "
|
||||
<< " roomId: " << roomId
|
||||
<< " participantId: " << participantId
|
||||
;
|
||||
@@ -181,7 +180,7 @@ void HandlerOverlays::removePartIdFromParticipantsInRoomMap(int roomId, int part
|
||||
participants.remove(participantId);
|
||||
m_participantsInRoomMap.insert(roomId, participants);
|
||||
|
||||
DEBUG_LOG() << "emit participantsInRoomMapChanged()"
|
||||
DEBUG_LOG(m_logger) << "emit participantsInRoomMapChanged()"
|
||||
<< " roomId: " << roomId
|
||||
<< " partId: " << getAllEquipmentNumbers(participants, false)
|
||||
<< " eqNo: " << getAllEquipmentNumbers(participants, true)
|
||||
|
||||
Reference in new issue
Block a user