lifemaps/qt-migration-legatus
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adds immediate migration results in progress

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/AudioSettings/audio_settings_avail_streams_model.cpp
+1 -1
View File
@@ -109,7 +109,7 @@ QVariant AvailStreamsModel::data(const QModelIndex &index, int role) const
{
NGLTreeItem *item = privateData(index);
StreamData data = item->data().value<StreamData>();
DEBUG_LOG() << data.name;
DEBUG_LOG(m_logger) << data.name;
return data.name;
}
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/AudioSettings/audio_settings_avail_streams_model.h
+2
View File
@@ -45,6 +45,8 @@ private slots:
void onTvcConfigChanged(const AudioVideoManagement::TvcConfig &data, DataModification modType);
private:
NGL::INGLLogger &m_logger;
template <typename T>
void insertUpdateData(const T &data, DataModification modType, NGLTreeItem *parent);
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/AudioSettings/audio_settings_dialog.cpp
+5 -5
View File
@@ -122,7 +122,7 @@ void AudioSettingsDialog::retranslate()
void AudioSettingsDialog::onOperatorChanged(const OperatorManagement::User &data, DataModification modType)
{
DEBUG_LOG() << "************** onOperatorChanged ";
DEBUG_LOG(m_logger) << "************** onOperatorChanged ";
switch (modType)
{
case DataModification::eRemoved:
@@ -245,7 +245,7 @@ void AudioSettingsDialog::onDownButtonClicked()
void AudioSettingsDialog::onSelectionChangedAllocation(const QItemSelection &selected, const QItemSelection &deselected)
{
DEBUG_LOG() << "onSelectionChangedAllocation selected.isEmpty()=" << selected.isEmpty();
DEBUG_LOG(m_logger) << "onSelectionChangedAllocation selected.isEmpty()=" << selected.isEmpty();
Q_UNUSED(deselected);
QModelIndex first = m_ui->treeViewAllocated->model()->index(0, 0);
int rowCnt = m_ui->treeViewAllocated->model()->rowCount();
@@ -281,7 +281,7 @@ bool AudioSettingsDialog::apply()
bool AudioSettingsDialog::applyRemove()
{
RemoveCnrTvcProfileRequest removeRequest;
DEBUG_LOG() << "AudioSettingsDialog::applyRemove";
DEBUG_LOG(m_logger) << "AudioSettingsDialog::applyRemove";
for (const auto &profile : std::as_const(m_cnrTvcProfileMap))
{
@@ -304,7 +304,7 @@ bool AudioSettingsDialog::applyRemove()
bool AudioSettingsDialog::applyModify()
{
ModifyCnrTvcProfileRequest modifyRequest;
DEBUG_LOG() << "AudioSettingsDialog::applyModify";
DEBUG_LOG(m_logger) << "AudioSettingsDialog::applyModify";
for (const auto &profile : std::as_const(m_cnrTvcProfileMap))
{
@@ -382,7 +382,7 @@ void AudioSettingsDialog::onSelectionOperatorChanged(const int index)
m_ui->pushButtonUp->setEnabled(false);
m_ui->pushButtonDown->setEnabled(false);
m_operatorId = m_ui->operatorComboBox->currentData().toInt();
DEBUG_LOG() << "onSelectionOperatorChanged" << " operatorStr=" << m_ui->operatorComboBox->currentText() << " m_operatorId= " << m_operatorId;
DEBUG_LOG(m_logger) << "onSelectionOperatorChanged" << " operatorStr=" << m_ui->operatorComboBox->currentText() << " m_operatorId= " << m_operatorId;
fillOperatorList();
m_modelAllocated->resetChangeState();
m_modelAvailable->resetChangeState();
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/AudioSettings/audio_settings_used_streams_model.cpp
+6 -6
View File
@@ -31,7 +31,7 @@ QVariant AllocatedStreamsModel::data(const QModelIndex &index, int role) const
{
NGLTreeItem *item = privateData(index);
StreamData data = item->data().value<StreamData>();
DEBUG_LOG() << data.name;
DEBUG_LOG(m_logger) << data.name;
return data.name;
}
@@ -92,14 +92,14 @@ bool AllocatedStreamsModel::dropMimeData(const QMimeData *data, Qt::DropAction a
qDeleteAll(droppedItems);
emit droppedStreamNames(streams);
m_changes = true;
DEBUG_LOG() << data->data(QStringLiteral("NGLTreeModel/dragDrop"));
DEBUG_LOG(m_logger) << data->data(QStringLiteral("NGLTreeModel/dragDrop"));
return NGLTreeModel::dropMimeData(data, action, row, 0, QModelIndex());
}
void AllocatedStreamsModel::setNewStreamData(const QVector<StreamData> &newData)
{
DEBUG_LOG() << "set new stream data, count: " << newData.size();
DEBUG_LOG(m_logger) << "set new stream data, count: " << newData.size();
resetModel();
for (const StreamData &sd : newData)
m_rootItem->appendChild(new NGLTreeItem(QVariant::fromValue(sd)));
@@ -116,15 +116,15 @@ QVector<StreamData> AllocatedStreamsModel::getStreamDataVector() const
const NGLTreeItem *item = m_rootItem->child(i);
const StreamData sd = item->data().value<StreamData>();
result.append(sd);
DEBUG_LOG() << "result.append(sd.name):" << sd.name;
DEBUG_LOG(m_logger) << "result.append(sd.name):" << sd.name;
}
DEBUG_LOG() << "getStreamDataVector() size: " << result.size();
DEBUG_LOG(m_logger) << "getStreamDataVector() size: " << result.size();
return result;
}
void AllocatedStreamsModel::changeOrder(const QModelIndex &idx, bool up)
{
DEBUG_LOG() << "changeOrder "
DEBUG_LOG(m_logger) << "changeOrder "
<< " index = " << idx.row()
<< " up = " << up
<< " m_rootItem->childCount()= " << m_rootItem->childCount();
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/AudioSettings/audio_settings_used_streams_model.h
+2
View File
@@ -40,6 +40,8 @@ signals:
void droppedStreamNames(const QVector<AudioVideoManagement::StreamData> &streamNamesDropped);
private:
NGL::INGLLogger &m_logger;
bool m_changes{false};
QVector<QPair<bool , int> > m_changedStreams;
};
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/TopicEditor/avm_sequence_model.h
+2
View File
@@ -58,6 +58,8 @@ public slots:
void setTimezoneHoursOffset(int timezoneHoursOffset);
private:
NGL::INGLLogger &m_logger;
QString dateTimeToStringx(const QDateTime &dt) const;
QString msecsSinceEpochToStringx(qint64 msecs) const;
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/TopicEditor/topic_editor.cpp
+2 -2
View File
@@ -379,7 +379,7 @@ void TopicEditor::onEditSequence()
if (!m_playbackMenu)
return;
DEBUG_LOG() << "slotEditSequence ";
DEBUG_LOG(m_logger) << "slotEditSequence ";
const auto selRows = m_ui->tvSequences->selectionModel()->selectedRows();
if (selRows.size() != 1)
@@ -392,7 +392,7 @@ void TopicEditor::onEditSequence()
m_model->setHighlightedRow(row);
const AvsSequence selectedSeq = m_model->getRowData(row);
DEBUG_LOG() << "selectedSeq.internalStreamName=" << selectedSeq.internalStreamName;
DEBUG_LOG(m_logger) << "selectedSeq.internalStreamName=" << selectedSeq.internalStreamName;
m_playbackMenu->setStreamName(selectedSeq.internalStreamName);
m_ui->dtStart->setMsecsSinceEpoch(std::chrono::milliseconds(selectedSeq.start.time_since_epoch()).count());
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/TopicEditor/topic_editor.h
+2
View File
@@ -28,6 +28,7 @@ public:
~TopicEditor();
private:
NGL::INGLLogger &m_logger;
void updateInternalData() override final;
void retranslate() override final;
@@ -53,6 +54,7 @@ private slots:
void onMarkerSelected(const QString &description);
private:
NGL::INGLLogger &m_logger;
const int s_durationLimit{86400000};
LtsSession::LtsSession *m_session{nullptr};
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_available_streams_model.cpp
+5 -5
View File
@@ -57,8 +57,8 @@ AvailableStreamsModel::AvailableStreamsModel(const std::shared_ptr<Interface::Dt
LtsSession::LtsSession *session,
StreamNameMapping *streamNameMapping,
QObject *parent,
bool isAudio)
: NGLTreeModel(parent, new NGLTreeItem(QVariant(), QIcon()), {tr("Available Streams")})
bool isAudio) : NGLTreeModel(parent, new NGLTreeItem(QVariant(), QIcon()),,
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {tr("Available Streams")})
, m_isAudio(isAudio)
, m_avmDtc(avmDtc)
, m_ismDtc(ismDtc)
@@ -164,7 +164,7 @@ QMimeData *AvailableStreamsModel::mimeData(const QModelIndexList &indexes) const
bool AvailableStreamsModel::dropMimeData(const QMimeData *data, Qt::DropAction action,
int row, int column, const QModelIndex &parent)
{
INFO_LOG() << "dropMimeData: action = " << action
INFO_LOG(m_logger) << "dropMimeData: action = " << action
<< ", row = " << row
<< ", parent: valid = " << parent.isValid();
@@ -184,7 +184,7 @@ bool AvailableStreamsModel::dropMimeData(const QMimeData *data, Qt::DropAction a
void AvailableStreamsModel::initModel()
{
beginResetModel();
INFO_LOG() << "initModel";
INFO_LOG(m_logger) << "initModel";
m_rootItem->removeAllChildren();
@@ -250,7 +250,7 @@ void AvailableStreamsModel::initModel()
{
if (videoTeam.exerciseId() != m_session->exerciseId())
continue;
DEBUG_LOG() << "add new videoteam" << videoTeam;
DEBUG_LOG(m_logger) << "add new videoteam" << videoTeam;
StreamModelData item;
item.name = QString::fromStdString(videoTeam.streamName().c_str());
item.mountingPointId = -1 * videoTeam.id();
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_available_streams_model.h
+2
View File
@@ -89,6 +89,8 @@ public:
Qt::DropActions supportedDragActions() const override { return Qt::CopyAction; }
private:
NGL::INGLLogger &m_logger;
void initModel();
const bool m_isAudio;
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_choose_menu.cpp
+2 -2
View File
@@ -85,11 +85,11 @@ void ChooseMenu::onMenuStructChanged(const MenuStruct &data, DataModification mo
bool ChooseMenu::apply()
{
int menuId = m_ui->cbAudio->currentData().toInt();
INFO_LOG() << "MenuId Audio: " << menuId;
INFO_LOG(m_logger) << "MenuId Audio: " << menuId;
m_avsMenus->setAnnouncementMenu(menuId);
menuId = m_ui->cbVideo->currentData().toInt();
INFO_LOG() << "MenuId Video: " << menuId;
INFO_LOG(m_logger) << "MenuId Video: " << menuId;
m_avsMenus->setVideoMenu(menuId);
return true;
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_choose_menu.h
+2
View File
@@ -42,6 +42,8 @@ private slots:
void onMenuStructChanged(const MenuStruct &data, DataModification modType);
private:
NGL::INGLLogger &m_logger;
void retranslate() override;
bool apply() override final;
void selectCurrent();
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_menu_edit.cpp
+5 -5
View File
@@ -46,11 +46,11 @@ bool MenuEdit::init(LtsSession::LtsSession *session,
StreamNameMapping *streamNameMapping,
const MenuStruct &ms)
{
DEBUG_LOG() << "MenuEdit::init()";
DEBUG_LOG(m_logger) << "MenuEdit::init()";
if (!ftc || !dtc)
{
ERROR_LOG() << "MenuEdit::init() Invalid shared_ptr!";
ERROR_LOG(m_logger) << "MenuEdit::init() Invalid shared_ptr!";
return false;
}
@@ -119,7 +119,7 @@ void MenuEdit::onRemove()
return;
slotChangesMade();
DEBUG_LOG() << "index row: " << index.row();
DEBUG_LOG(m_logger) << "index row: " << index.row();
m_usedStreamsModel->removeRow(index.row(), index.parent());
}
else
@@ -131,7 +131,7 @@ void MenuEdit::onRemove()
return;
slotChangesMade();
DEBUG_LOG() << "index row: " << index.row();
DEBUG_LOG(m_logger) << "index row: " << index.row();
m_usedStreamsModel->removeRow(index.row(), index.parent());
}
@@ -140,7 +140,7 @@ void MenuEdit::onRemove()
void MenuEdit::onModelDataChanged()
{
INFO_LOG() << "onModelDataChanged";
INFO_LOG(m_logger) << "onModelDataChanged";
m_ui->menuTreeView->expandAll();
}
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_menu_edit.h
+2
View File
@@ -59,6 +59,8 @@ public slots:
void onStreamSelected(const QModelIndex &idx);
private:
NGL::INGLLogger &m_logger;
void retranslate() override;
bool apply() override final;
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_menu_edit_view.cpp
+5 -5
View File
@@ -149,7 +149,7 @@ void MenuEditView::onEditMenuStruct()
AudioVideoManagement::MenuStruct ms = m_model->getRowData(row);
ms.isAudio(m_isAudio);
DEBUG_LOG() << "---onEditMenuStruct () "
DEBUG_LOG(m_logger) << "---onEditMenuStruct () "
<< " id: " << ms.id()
<< " name: " << ms.name();
@@ -204,15 +204,15 @@ void MenuEditView::onExportButtonClicked()
int fileId = m_flmGui->saveFileContent(this, FileManagement::FileType::Xml, m_session->exerciseId(), byteArray);
if (fileId > 0)
DEBUG_LOG() << "Saved file with id = " << fileId;
DEBUG_LOG(m_logger) << "Saved file with id = " << fileId;
else
ERROR_LOG() << "Could not save file in library ";
ERROR_LOG(m_logger) << "Could not save file in library ";
}
void MenuEditView::onImportButtonClicked()
{
DEBUG_LOG() << " onImportButtonClicked() ";
DEBUG_LOG(m_logger) << " onImportButtonClicked() ";
QByteArray content;
int fileId = m_flmGui->loadFileContent(this, content, {FileManagement::FileType::Xml}, m_session->exerciseId(), FileManagement::toString(FileManagement::XmlType::AVMMenuEditView));
@@ -239,7 +239,7 @@ void MenuEditView::onImportButtonClicked()
});
}
}
INFO_LOG() << "--- onImportButtonClicked() ";
INFO_LOG(m_logger) << "--- onImportButtonClicked() ";
}
}
}
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_menu_edit_view.h
+2
View File
@@ -48,6 +48,8 @@ public:
bool isAudio);
private:
NGL::INGLLogger &m_logger;
void retranslate() override;
void onSelectionChanged();
void onAddMenuStruct();
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_menu_view_model.cpp
+2 -2
View File
@@ -77,7 +77,7 @@ QByteArray MenuViewModel::modelToJson(int row) const
QJsonObject obj;
obj[QStringLiteral("XmlType")] = FileManagement::toString(FileManagement::XmlType::AVMMenuEditView);
DEBUG_LOG() << "row =" << ": " << row;
DEBUG_LOG(m_logger) << "row =" << ": " << row;
const AudioVideoManagement::MenuStruct &menuStruct = m_vecData.at(row);
obj[QStringLiteral("id")] = 0;
@@ -122,7 +122,7 @@ QVector<AudioVideoManagement::MenuStruct> MenuViewModel::jsonToMenuStructs(const
const QJsonArray arrEntry(obj.value(QStringLiteral("menuEntries")).toArray());
menuStruct.menuEntries().resize(arrEntry.size());
INFO_LOG() << "arrEntry.size()=" << arrEntry.size();
INFO_LOG(m_logger) << "arrEntry.size()=" << arrEntry.size();
for (int j = 0; j < arrEntry.size(); ++j)
{
const QJsonObject objEntry(arrEntry.at(j).toObject());
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_menu_view_model.h
+1
View File
@@ -25,6 +25,7 @@ public:
QByteArray modelToJson(int row) const;
QVector<AudioVideoManagement::MenuStruct> jsonToMenuStructs(const QByteArray &content) const;
protected:
NGL::INGLLogger &m_logger;
bool isFiltered(const MenuStruct &data, DataModification modType) const override final;
private:
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_new_menu_struct.h
+2
View File
@@ -29,6 +29,8 @@ Q_SIGNALS:
void newName(const QString &);
private:
NGL::INGLLogger &m_logger;
Ui::NewMenuStruct *m_ui;
};
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_playback_menu.cpp
+26 -27
View File
@@ -279,9 +279,8 @@ private:
QueryTimeline::QueryTimeline(const AvaStream &stream, const AvaTimePoint &start, const AvaTimePoint &end, AvaControl *control)
: QObject()
{
QueryTimeline::QueryTimeline(const AvaStream &stream, const AvaTimePoint &start, const AvaTimePoint &end, AvaControl *control) : QObject(),
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
connect(control, &AvaControl::queryTimelineResponse,
this, &QueryTimeline::signalTimelineComplete);
connect(control, &AvaControl::queryTimelineResponse,
@@ -387,12 +386,12 @@ bool AvmPlaybackMenu::init(LtsSession::LtsSession *session, AvaSession *avaSessi
m_presetStreamName = streamName;
if (m_presetStreamName)
DEBUG_LOG() << "init stream preset: " << m_presetStreamName.get();
DEBUG_LOG(m_logger) << "init stream preset: " << m_presetStreamName.get();
m_presetStartTime = startTime;
if (m_presetStartTime)
DEBUG_LOG() << "init time preset: " << std::chrono::milliseconds(m_presetStartTime.get().time_since_epoch()).count();
DEBUG_LOG(m_logger) << "init time preset: " << std::chrono::milliseconds(m_presetStartTime.get().time_since_epoch()).count();
m_session = session;
m_playbackApp = std::move(appHandle);
@@ -1006,37 +1005,37 @@ void AvmPlaybackMenu::preselectStream(const QString &fallbackInternalStreamName)
const QString currentStreamName(m_presetStreamName.is_initialized() ? *m_presetStreamName : QString());
const QString currentInternalName(currentStreamName.isEmpty() ? fallbackInternalStreamName : QString());
DEBUG_LOG() << "currentStreamName: " << currentStreamName;
DEBUG_LOG() << "currentInternalName: " << currentInternalName;
DEBUG_LOG(m_logger) << "currentStreamName: " << currentStreamName;
DEBUG_LOG(m_logger) << "currentInternalName: " << currentInternalName;
m_presetStreamName.reset();
if (!currentInternalName.isEmpty() || !currentStreamName.isEmpty())
{
DEBUG_LOG() << "stream preset set - searching for '" << currentStreamName << "'..";
DEBUG_LOG(m_logger) << "stream preset set - searching for '" << currentStreamName << "'..";
bool found = false;
for (int i = 0; i < m_ui->cbStreams->count(); i++)
{
const AvaStream &curStream = m_ui->cbStreams->itemData(i).value<AvaStream>();
DEBUG_LOG() << "stream " << i << ": " << curStream.displayName << " (" << curStream.internalName << ")";
DEBUG_LOG(m_logger) << "stream " << i << ": " << curStream.displayName << " (" << curStream.internalName << ")";
if ((!currentInternalName.isEmpty() && curStream.displayName == currentInternalName) ||
(!currentStreamName.isEmpty() && curStream.internalName == currentStreamName))
{
found = true;
DEBUG_LOG() << "stream preset set, found & selected";
DEBUG_LOG(m_logger) << "stream preset set, found & selected";
m_ui->cbStreams->setCurrentIndex(i);
break;
}
}
if (!found)
WARNING_LOG() << "new stream list does not contain old selected stream (" << currentInternalName << ") !";
WARNING_LOG(m_logger) << "new stream list does not contain old selected stream (" << currentInternalName << ") !";
}
else
DEBUG_LOG() << "no stream preset set";
DEBUG_LOG(m_logger) << "no stream preset set";
}
@@ -1097,7 +1096,7 @@ void AvmPlaybackMenu::setSavedPos(qint64 msecs)
void AvmPlaybackMenu::onTimelineComplete(const AvaTimeline &timeline)
{
DEBUG_LOG() << "onTimelineComplete";
DEBUG_LOG(m_logger) << "onTimelineComplete";
m_intervalModel.setData(timeline.parts());
m_ui->tavIntervals->resizeColumnsToContents();
@@ -1115,7 +1114,7 @@ void AvmPlaybackMenu::onTimelineComplete(const AvaTimeline &timeline)
m_savedPos.reset();
}
DEBUG_LOG() << "onTimelineComplete " << std::chrono::milliseconds(newPos.time_since_epoch()).count();
DEBUG_LOG(m_logger) << "onTimelineComplete " << std::chrono::milliseconds(newPos.time_since_epoch()).count();
m_avaCtrl->setAbsPosition(m_playbackApp.dialogId(), ALL_STREAMS(), newPos);
m_timelineIsComplete = true;
@@ -1142,7 +1141,7 @@ void AvmPlaybackMenu::onStreamPositionReceived(const QString &dialogId, const QS
return;
m_lastAvsPos = pos;
DEBUG_LOG() << "onStreamPositionReceived: last avs pos now: " << std::chrono::milliseconds((*m_lastAvsPos).time_since_epoch()).count() << " - direct apply? " << m_avaCtrl->isEmpty();
DEBUG_LOG(m_logger) << "onStreamPositionReceived: last avs pos now: " << std::chrono::milliseconds((*m_lastAvsPos).time_since_epoch()).count() << " - direct apply? " << m_avaCtrl->isEmpty();
if (m_avaCtrl->isEmpty())
applyAvsPos();
@@ -1198,13 +1197,13 @@ void AvmPlaybackMenu::onUiTimeChanged(AvaTimePoint t)
m_currentButtonState != ButtonStates::Stopped)
return;
DEBUG_LOG() << "onUiTimeChanged " << std::chrono::milliseconds(t.time_since_epoch()).count();
DEBUG_LOG(m_logger) << "onUiTimeChanged " << std::chrono::milliseconds(t.time_since_epoch()).count();
m_avaCtrl->setAbsPosition(m_playbackApp.dialogId(), ALL_STREAMS(), t);
}
void AvmPlaybackMenu::onStreamSelectionChanged(const QVector<AvaStream> &selectedStreams)
{
DEBUG_LOG() << "onStreamSelectionChanged count = " << selectedStreams.count();
DEBUG_LOG(m_logger) << "onStreamSelectionChanged count = " << selectedStreams.count();
Q_ASSERT(!selectedStreams.isEmpty());
@@ -1231,7 +1230,7 @@ void AvmPlaybackMenu::onStreamSelectionChanged(const QVector<AvaStream> &selecte
void AvmPlaybackMenu::onIntervalActivated(const QModelIndex &index)
{
AvaTimelinePart interval = m_intervalModel.getRowData(index.row());
DEBUG_LOG() << "start = " << std::chrono::milliseconds(interval.first.time_since_epoch()).count();
DEBUG_LOG(m_logger) << "start = " << std::chrono::milliseconds(interval.first.time_since_epoch()).count();
m_avaCtrl->setAbsPosition(m_playbackApp.dialogId(), ALL_STREAMS(), interval.first);
@@ -1302,7 +1301,7 @@ void AvmPlaybackMenu::selectMarker(const MarkerManagement::Marker &marker)
(void)blocker;
const auto &rowData = marker;
DEBUG_LOG() << "AvmPlaybackMenu::onMarkerClicked name = " << QString::fromStdString(rowData.name())
DEBUG_LOG(m_logger) << "AvmPlaybackMenu::onMarkerClicked name = " << QString::fromStdString(rowData.name())
<< " note = " << QString::fromStdString(rowData.note());
bool selectMarkerStream = false;
@@ -1319,7 +1318,7 @@ void AvmPlaybackMenu::selectMarker(const MarkerManagement::Marker &marker)
for (const MarkerManagement::MarkerDescription &desc : rowData.descriptions())
{
DEBUG_LOG() << " description = " << QString::fromStdString(desc.content())
DEBUG_LOG(m_logger) << " description = " << QString::fromStdString(desc.content())
<< " desc.markerType()=" << desc.markerType();
if ((desc.markerType() == MarkerManagement::MarkerType::Video && m_isAudio == false) ||
(desc.markerType() == MarkerManagement::MarkerType::Audio && m_isAudio == true))
@@ -1345,7 +1344,7 @@ void AvmPlaybackMenu::selectMarker(const MarkerManagement::Marker &marker)
avaStream.displayName = m_streamNameMapping->displayName(avaStream.internalName);
m_ui->cbMarkerStreams->addItem(avaStream.displayName, QVariant::fromValue(avaStream));
DEBUG_LOG() << "streams[" << avaStream.internalName << "]"
DEBUG_LOG(m_logger) << "streams[" << avaStream.internalName << "]"
<< " internaName=" << avaStream.internalName
<< " displayName=" << avaStream.displayName;
if (bIsSelected && selectedStream.internalName.isEmpty())
@@ -1363,7 +1362,7 @@ void AvmPlaybackMenu::selectMarker(const MarkerManagement::Marker &marker)
qint64 time = rowData.timeStamp() - rowData.timeStampOffset();
DEBUG_LOG() << "marker time: " << time << " (" << QDateTime::fromMSecsSinceEpoch(time).toString(QStringLiteral("dd.MM.yy HH:mm:ss.zzz")) << ")";
DEBUG_LOG(m_logger) << "marker time: " << time << " (" << QDateTime::fromMSecsSinceEpoch(time).toString(QStringLiteral("dd.MM.yy HH:mm:ss.zzz")) << ")";
std::chrono::milliseconds t(time);
AvaTimePoint p(std::chrono::duration_cast<AvaDuration>(t));
@@ -1403,7 +1402,7 @@ void AvmPlaybackMenu::onSetMarkerClicked()
if (!m_selectedStreams || m_selectedStreams.get().isEmpty())
{
new LtsWidgets::LtsMessageDialogNew(this, tr("No stream selected to create a marker from."));
WARNING_LOG() << "onSetMarkerClicked called, but no selected streams available";
WARNING_LOG(m_logger) << "onSetMarkerClicked called, but no selected streams available";
return;
}
@@ -1444,7 +1443,7 @@ void AvmPlaybackMenu::onStartClicked()
{
DEBUG_LOG() << "onStartClicked"
DEBUG_LOG(m_logger) << "onStartClicked"
<< " dialogId=" << m_playbackApp.dialogId()
<< " currentSpeed=" << currentSpeed()
@@ -1459,7 +1458,7 @@ void AvmPlaybackMenu::onStartClicked()
return;
}
WARNING_LOG() << "onStartClicked called, but no selected streams available";
WARNING_LOG(m_logger) << "onStartClicked called, but no selected streams available";
return;
}
@@ -1501,14 +1500,14 @@ void AvmPlaybackMenu::onAllStreams()
void AvmPlaybackMenu::onIntervalBackwardClicked()
{
const AvaTimelinePart &targetInterval = m_intervalModel.previousInterval();
DEBUG_LOG() << "onIntervalBackwardClicked " << std::chrono::milliseconds(targetInterval.first.time_since_epoch()).count();
DEBUG_LOG(m_logger) << "onIntervalBackwardClicked " << std::chrono::milliseconds(targetInterval.first.time_since_epoch()).count();
m_avaCtrl->setAbsPosition(m_playbackApp.dialogId(), ALL_STREAMS(), targetInterval.first);
}
void AvmPlaybackMenu::onIntervalForwardClicked()
{
const AvaTimelinePart &targetInterval = m_intervalModel.nextInterval();
DEBUG_LOG() << "onIntervalForwardClicked " << std::chrono::milliseconds(targetInterval.first.time_since_epoch()).count();
DEBUG_LOG(m_logger) << "onIntervalForwardClicked " << std::chrono::milliseconds(targetInterval.first.time_since_epoch()).count();
m_avaCtrl->setAbsPosition(m_playbackApp.dialogId(), ALL_STREAMS(), targetInterval.first);
}
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_playback_menu.h
+1
View File
@@ -42,6 +42,7 @@ class QueryTimeline : public QObject
{
Q_OBJECT
private:
NGL::INGLLogger &m_logger;
friend class AvmPlaybackMenu;
QueryTimeline(const AvaStream &stream, const AvaTimePoint &start, const AvaTimePoint &end, AvaControl *control);
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_playback_menu_dialog.h
+2
View File
@@ -29,6 +29,8 @@ public:
void retranslate() override;
private:
NGL::INGLLogger &m_logger;
bool m_isAudio;
Ui::AvmPlaybackMenuDialog *m_ui;
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_used_streams_model.cpp
+21 -21
View File
@@ -129,7 +129,7 @@ bool UsedStreamsModel::dropMimeData(const QMimeData *data, Qt::DropAction action
if (!checkDrop(data, index(row, column), parent, action))
return false;
INFO_LOG() << "dropMimeData: action = " << action
INFO_LOG(m_logger) << "dropMimeData: action = " << action
<< ", row = " << row
<< ", parent: valid = " << parent.isValid();
@@ -200,7 +200,7 @@ bool UsedStreamsModel::canDropMimeData(const QMimeData *data, Qt::DropAction act
stream >> idParent >> idItem >> group >> itemData >> mountId;
ms = itemData.value<StreamModelData>();
INFO_LOG() << "Insert:"
INFO_LOG(m_logger) << "Insert:"
<< "\n ms.name=" << ms.name
<< "\n ms.isGroup=" << ms.isGroup
<< "\n ms.parentId=" << ms.parentId
@@ -301,7 +301,7 @@ void UsedStreamsModel::insertChildren(NGLTreeItem *parent, int parentId, const s
if (me.isGroup())
{
DEBUG_LOG() << "insertChildren"
DEBUG_LOG(m_logger) << "insertChildren"
<< me.mountingPointId()
<< me.name();
insertChildren(treeItem, me.id(), entries);
@@ -335,7 +335,7 @@ bool UsedStreamsModel::checkSingleItem(NGLTreeItem *target, StreamModelData &toC
bool retValue = true;
if (!target)
{
ERROR_LOG() << "Nullptr exception";
ERROR_LOG(m_logger) << "Nullptr exception";
return false;
}
else
@@ -343,10 +343,10 @@ bool UsedStreamsModel::checkSingleItem(NGLTreeItem *target, StreamModelData &toC
StreamModelData msTarget = target->data().value<StreamModelData>();
if (msTarget.id == toCheck.parentId)
DEBUG_LOG() << "Drag&drag in same folder.";
DEBUG_LOG(m_logger) << "Drag&drag in same folder.";
else if (msTarget.isGroup && toCheck.isGroup)
{
DEBUG_LOG() << "Trying to drop folder into folder";
DEBUG_LOG(m_logger) << "Trying to drop folder into folder";
retValue = false;
}
else
@@ -428,18 +428,18 @@ bool UsedStreamsModel::checkDrop(const QMimeData *data, const QModelIndex &index
else if ((movedFolders.at(0) != item.parentId) && (movedFolders.contains(item.parentId)) && (action == Qt::MoveAction))
{
DEBUG_LOG() << "Ignoring items in sub folder while moving.";
DEBUG_LOG(m_logger) << "Ignoring items in sub folder while moving.";
continue;
}
else if (!movedFolders.contains(item.parentId) && (action == Qt::MoveAction))
{
DEBUG_LOG() << "Only allow items from same folder to be moved.";
DEBUG_LOG(m_logger) << "Only allow items from same folder to be moved.";
return false;
}
if (!checkSingleItem(itemToCheck, item))
{
DEBUG_LOG() << "Not able to add item with name: " << item.name;
DEBUG_LOG(m_logger) << "Not able to add item with name: " << item.name;
return false;
}
@@ -452,7 +452,7 @@ bool UsedStreamsModel::checkDrop(const QMimeData *data, const QModelIndex &index
}
else
{
DEBUG_LOG() << "More than one folder selected.";
DEBUG_LOG(m_logger) << "More than one folder selected.";
return false;
}
}
@@ -463,7 +463,7 @@ bool UsedStreamsModel::checkDrop(const QMimeData *data, const QModelIndex &index
if (countDropped + countAgainst > 12)
{
DEBUG_LOG() << "Trying to add to many items to folder";
DEBUG_LOG(m_logger) << "Trying to add to many items to folder";
return false;
}
return true;
@@ -551,7 +551,7 @@ void UsedStreamsModel::onDataChanged(const InfrastructureManagement::MainStructu
const DataModification modType)
{
beginResetModel();
INFO_LOG() << "onDataChanged m_rootItem->childCount()" << m_rootItem->childCount()
INFO_LOG(m_logger) << "onDataChanged m_rootItem->childCount()" << m_rootItem->childCount()
<< " data.elements().size()=" << data.elements().size();
switch (modType)
@@ -562,7 +562,7 @@ void UsedStreamsModel::onDataChanged(const InfrastructureManagement::MainStructu
case DataModification::eAdded:
for (const InfrastructureManagement::StructureElement &se : data.elements())
{
INFO_LOG() << "se.id()" << se.id()
INFO_LOG(m_logger) << "se.id()" << se.id()
<< " se.displayName()" << se.displayName()
<< " m_rootItem->childCount()" << m_rootItem->childCount();
const QString newName = QString::fromStdString(se.displayName());
@@ -577,7 +577,7 @@ void UsedStreamsModel::onDataChangedMvs(const VideoTeam &data, const DataModific
{
beginResetModel();
INFO_LOG() << "onDataChanged m_rootItem->childCount()" << m_rootItem->childCount();
INFO_LOG(m_logger) << "onDataChanged m_rootItem->childCount()" << m_rootItem->childCount();
switch (modType)
{
@@ -586,7 +586,7 @@ void UsedStreamsModel::onDataChangedMvs(const VideoTeam &data, const DataModific
case DataModification::eModified:
case DataModification::eAdded:
INFO_LOG() << "se.id()" << data.id()
INFO_LOG(m_logger) << "se.id()" << data.id()
<< " se.displayName()" << data.streamName()
<< " m_rootItem->childCount()" << m_rootItem->childCount();
const QString newName = QString::fromStdString(data.streamName());
@@ -602,8 +602,8 @@ void UsedStreamsModel::onStreamNameDataChanged(int32_t mountingPointId, const QS
Q_UNUSED(internalName)
beginResetModel();
INFO_LOG() << "onDataChanged m_rootItem->childCount()" << m_rootItem->childCount();
INFO_LOG() << "se.id()" << mountingPointId
INFO_LOG(m_logger) << "onDataChanged m_rootItem->childCount()" << m_rootItem->childCount();
INFO_LOG(m_logger) << "se.id()" << mountingPointId
<< " se.displayName()" << displayName
<< " m_rootItem->childCount()" << m_rootItem->childCount();
updateStreamNames(mountingPointId, displayName, m_rootItem);
@@ -614,7 +614,7 @@ void UsedStreamsModel::onStreamNameDataChanged(int32_t mountingPointId, const QS
void UsedStreamsModel::updateStreamNames(const int mountingPointId, const QString &newName, NGLTreeItem *item)
{
INFO_LOG() << "updateStreamNames mountingPointId=" << mountingPointId
INFO_LOG(m_logger) << "updateStreamNames mountingPointId=" << mountingPointId
<< " newName=" << newName;
int childCount = item->childCount();
@@ -623,17 +623,17 @@ void UsedStreamsModel::updateStreamNames(const int mountingPointId, const QStrin
NGLTreeItem *child = item->child(i);
if (!child->data().canConvert<StreamModelData>())
ERROR_LOG() << "Error convert item";
ERROR_LOG(m_logger) << "Error convert item";
StreamModelData usedStream = child->data().value<StreamModelData>();
INFO_LOG() << "i=" << i
INFO_LOG(m_logger) << "i=" << i
<< " usedStream.mountingPointId=" << usedStream.mountingPointId
<< " usedStream.name=" << usedStream.name
<< " mountingPointId=" << mountingPointId
<< " newName=" << newName;
if (mountingPointId == usedStream.mountingPointId)
{
INFO_LOG() << "Set new DisplayName id=" << usedStream.id
INFO_LOG(m_logger) << "Set new DisplayName id=" << usedStream.id
<< " mountingPointId=" << usedStream.mountingPointId
<< " name=" << usedStream.name
<< " new Name =" << newName;
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_used_streams_model.h
+2
View File
@@ -44,6 +44,8 @@ public:
bool initModel();
protected:
NGL::INGLLogger &m_logger;
NGLTreeItem *createItem(const QVariant &data, const QIcon &icon) const override;
private slots:
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/topic_replay.cpp
+31 -31
View File
@@ -51,13 +51,13 @@ TopicReplay::TopicReplay(DataInterface *dataIfc, bool isAudio)
: m_isAudio(isAudio)
, m_dataIfc(dataIfc)
{
DEBUG_LOG() << "TopicReplay::TopicReplay()";
DEBUG_LOG(m_logger) << "TopicReplay::TopicReplay()";
Q_ASSERT(dataIfc);
}
TopicReplay::~TopicReplay()
{
DEBUG_LOG() << "TopicReplay::~TopicReplay()";
DEBUG_LOG(m_logger) << "TopicReplay::~TopicReplay()";
if (m_isPlaying)
playbackStop();
@@ -65,7 +65,7 @@ TopicReplay::~TopicReplay()
QWidget *TopicReplay::createWidget()
{
DEBUG_LOG() << "TopicReplay::createWidget()";
DEBUG_LOG(m_logger) << "TopicReplay::createWidget()";
Q_ASSERT(!m_screenPlacementHelper);
if (m_isAudio)
@@ -80,19 +80,19 @@ QWidget *TopicReplay::createWidget()
void TopicReplay::slotSetScriptResponse(const AudioVideoManagement::AvaStreamInfo &streamInfo, AudioVideoManagement::AvaStreamState streamState)
{
if (streamState == AudioVideoManagement::AvaStreamState::NotPossible)
ERROR_LOG() << "Script could not be set";
ERROR_LOG(m_logger) << "Script could not be set";
else
ERROR_LOG() << "Script set!";
ERROR_LOG(m_logger) << "Script set!";
ERROR_LOG() << "streamInfo: start" << streamInfo.duration.count();
ERROR_LOG() << "streamState: " << static_cast<int>(streamState);
ERROR_LOG(m_logger) << "streamInfo: start" << streamInfo.duration.count();
ERROR_LOG(m_logger) << "streamState: " << static_cast<int>(streamState);
}
bool TopicReplay::playbackInit(const QJsonObject &attributes)
{
DEBUG_LOG() << "TopicReplay::playbackInit()";
DEBUG_LOG() << QJsonDocument(attributes).toJson();
DEBUG_LOG(m_logger) << "TopicReplay::playbackInit()";
DEBUG_LOG(m_logger) << QJsonDocument(attributes).toJson();
if (m_screenPlacementHelper && !m_isAudio)
m_screenPlacementHelper->show();
@@ -103,7 +103,7 @@ bool TopicReplay::playbackInit(const QJsonObject &attributes)
AvaControl *ctrl = getAvaControl();
if (ctrl == nullptr)
{
ERROR_LOG() << "no ava control!";
ERROR_LOG(m_logger) << "no ava control!";
return false;
}
@@ -111,7 +111,7 @@ bool TopicReplay::playbackInit(const QJsonObject &attributes)
if (!topicData.isValid)
{
ERROR_LOG() << "topicData is invalid";
ERROR_LOG(m_logger) << "topicData is invalid";
return false;
}
@@ -122,7 +122,7 @@ bool TopicReplay::playbackInit(const QJsonObject &attributes)
PlaybackApp *app = m_isAudio ? m_dataIfc->audioPresentationApp() : m_dataIfc->videoPresentationApp();
if (app == nullptr || app->inUse())
{
ERROR_LOG() << "app invalid or in use!";
ERROR_LOG(m_logger) << "app invalid or in use!";
return false;
}
@@ -142,7 +142,7 @@ bool TopicReplay::playbackInit(const QJsonObject &attributes)
if (!m_appHandle)
{
ERROR_LOG() << "appHandle: missing app after creating appHandle!";
ERROR_LOG(m_logger) << "appHandle: missing app after creating appHandle!";
return false;
}
@@ -150,7 +150,7 @@ bool TopicReplay::playbackInit(const QJsonObject &attributes)
NGL::Settings s({});
bool isLocal = s.isDatabaseConnectionLocal();
DEBUG_LOG() << "isLocal? " << isLocal;
DEBUG_LOG(m_logger) << "isLocal? " << isLocal;
AvaScriptSource source;
if (isLocal)
@@ -168,7 +168,7 @@ bool TopicReplay::playbackInit(const QJsonObject &attributes)
source = AvaScriptSource::ServerVideo;
}
DEBUG_LOG() << "source: " << static_cast<int>(source);
DEBUG_LOG(m_logger) << "source: " << static_cast<int>(source);
ctrl->setScript(m_appHandle.dialogId(), m_scriptName,
source, topicData.streamList(),
@@ -180,7 +180,7 @@ bool TopicReplay::playbackInit(const QJsonObject &attributes)
bool TopicReplay::playbackStart(int secondsOffset)
{
DEBUG_LOG() << "TopicReplay::playbackStart()";
DEBUG_LOG(m_logger) << "TopicReplay::playbackStart()";
if (m_screenPlacementHelper && !m_isAudio)
m_screenPlacementHelper->show();
@@ -188,7 +188,7 @@ bool TopicReplay::playbackStart(int secondsOffset)
AvaControl *ctrl = getAvaControl();
if (ctrl == nullptr)
{
ERROR_LOG() << "ctrl == nullptr";
ERROR_LOG(m_logger) << "ctrl == nullptr";
return false;
}
@@ -196,7 +196,7 @@ bool TopicReplay::playbackStart(int secondsOffset)
if (!m_appHandle)
{
ERROR_LOG() << "appHandle: missing app!";
ERROR_LOG(m_logger) << "appHandle: missing app!";
return false;
}
@@ -204,13 +204,13 @@ bool TopicReplay::playbackStart(int secondsOffset)
ctrl->startScript(m_appHandle.dialogId(), m_scriptName);
m_isPlaying = true;
DEBUG_LOG() << "m_isPlaying = true";
DEBUG_LOG(m_logger) << "m_isPlaying = true";
return true;
}
bool TopicReplay::playbackPause()
{
DEBUG_LOG() << "TopicReplay::playbackPause()";
DEBUG_LOG(m_logger) << "TopicReplay::playbackPause()";
if (m_screenPlacementHelper)
m_screenPlacementHelper->hide();
@@ -221,13 +221,13 @@ bool TopicReplay::playbackPause()
AvaControl *ctrl = getAvaControl();
if (ctrl == nullptr)
{
ERROR_LOG() << "no ctrl!";
ERROR_LOG(m_logger) << "no ctrl!";
return false;
}
if (!m_appHandle)
{
ERROR_LOG() << "appHandle: missing app!";
ERROR_LOG(m_logger) << "appHandle: missing app!";
return false;
}
@@ -237,7 +237,7 @@ bool TopicReplay::playbackPause()
bool TopicReplay::playbackStop()
{
DEBUG_LOG() << "TopicReplay::playbackStop()";
DEBUG_LOG(m_logger) << "TopicReplay::playbackStop()";
if (m_screenPlacementHelper)
m_screenPlacementHelper->hide();
@@ -248,13 +248,13 @@ bool TopicReplay::playbackStop()
AvaControl *ctrl = getAvaControl();
if (ctrl == nullptr)
{
ERROR_LOG() << "no ctrl!";
ERROR_LOG(m_logger) << "no ctrl!";
return false;
}
if (!m_appHandle)
{
ERROR_LOG() << "appHandle: missing app!";
ERROR_LOG(m_logger) << "appHandle: missing app!";
return false;
}
@@ -274,7 +274,7 @@ bool TopicReplay::exportTopic(const QJsonObject &attributes,
VdControl *ctrl = getVdControl();
if (ctrl == nullptr)
{
ERROR_LOG() << "ctrl missing!";
ERROR_LOG(m_logger) << "ctrl missing!";
exportNotifier->setExportFailed();
return false;
}
@@ -286,7 +286,7 @@ bool TopicReplay::exportTopic(const QJsonObject &attributes,
if (!topicData.isValid)
{
ERROR_LOG() << "topicData is invalid";
ERROR_LOG(m_logger) << "topicData is invalid";
exportNotifier->setExportFailed();
return false;
}
@@ -304,7 +304,7 @@ bool TopicReplay::exportTopic(const QJsonObject &attributes,
void TopicReplay::onWidgetPlaced(const QRect &geometry)
{
WARNING_LOG() << "TopicReplay::onWidgetPlaced() - geo: " << geometry.x() << "/" << geometry.y()
WARNING_LOG(m_logger) << "TopicReplay::onWidgetPlaced() - geo: " << geometry.x() << "/" << geometry.y()
<< " m_isAudio=" << m_isAudio;
m_dialogGeometry = geometry;
@@ -315,17 +315,17 @@ void TopicReplay::onWidgetPlaced(const QRect &geometry)
PlaybackApp *app = m_isAudio ? m_dataIfc->audioPresentationApp() : m_dataIfc->videoPresentationApp();
if (app == nullptr)
{
ERROR_LOG() << "app missing!";
ERROR_LOG(m_logger) << "app missing!";
return;
}
if (!app->inUse())
{
ERROR_LOG() << "app not in use - waiting for playbackInit to aquire it";
ERROR_LOG(m_logger) << "app not in use - waiting for playbackInit to aquire it";
return;
}
DEBUG_LOG() << "setGeometry";
DEBUG_LOG(m_logger) << "setGeometry";
app->setGeometry(*m_dialogGeometry);
}
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_combat_net_radio_dialog.cpp
+5 -5
View File
@@ -59,7 +59,7 @@ bool CombatNetRadioDialog::init(const std::shared_ptr<Interface::Dtc> &avmDtc,
avmFtc->enableModifyCnrConfig() &&
avmFtc->enableRemoveCnrConfig()))
{
ERROR_LOG() << "Could not enable topics";
ERROR_LOG(m_logger) << "Could not enable topics";
return false;
}
@@ -78,7 +78,7 @@ bool CombatNetRadioDialog::init(const std::shared_ptr<Interface::Dtc> &avmDtc,
{
m_filter.reset();
m_model.reset();
ERROR_LOG() << "Could not init model";
ERROR_LOG(m_logger) << "Could not init model";
return false;
}
@@ -191,14 +191,14 @@ void CombatNetRadioDialog::onExportButtonClicked()
int fileId = m_flmGui->saveFileContent(this, FileManagement::FileType::Xml, m_session->exerciseId(), byteArray);
if (fileId > 0)
DEBUG_LOG() << "Saved file with id = " << fileId;
DEBUG_LOG(m_logger) << "Saved file with id = " << fileId;
else
ERROR_LOG() << "Could not save file in library ";
ERROR_LOG(m_logger) << "Could not save file in library ";
}
void CombatNetRadioDialog::onImportButtonClicked()
{
DEBUG_LOG() << " onImportButtonClicked() ";
DEBUG_LOG(m_logger) << " onImportButtonClicked() ";
QByteArray content;
int fileId = m_flmGui->loadFileContent(this, content, {FileManagement::FileType::Xml}, m_session->exerciseId(), FileManagement::toString(FileManagement::XmlType::AVMCombatNetRadio));
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_combat_net_radio_dialog.h
+2
View File
@@ -79,6 +79,8 @@ private Q_SLOTS:
void onImportButtonClicked();
private:
NGL::INGLLogger &m_logger;
void retranslate() override;
void tableColumnOrganiserSetting() override;
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_combat_net_radio_dialog_model.cpp
+4 -4
View File
@@ -40,7 +40,7 @@ QVariant CombatNetRadioDialogModel::data(const QModelIndex &index, int role) con
switch (index.column())
{
case CHANNEL:
INFO_LOG()<<"CombatNetRadioDialogModel::data role =" << role
INFO_LOG(m_logger)<<"CombatNetRadioDialogModel::data role =" << role
<< " row = " << index.row();
return QString::fromStdString(m_cnrChannels.value(config.cnrChannelId()).name());
case RADIO_CIRCUIT:
@@ -61,14 +61,14 @@ QVariant CombatNetRadioDialogModel::data(const QModelIndex &index, int role) con
if (unit.id() != unitId)
return {};
INFO_LOG() << " config.unitId()=" << unitId
INFO_LOG(m_logger) << " config.unitId()=" << unitId
<< " Str=" << unit.name();
QString unitStr;
if (unit.designator().size() > 0)
unitStr = QString::fromStdString(unit.designator()) + QLatin1Char('/');
unitStr.append(QString::fromStdString(unit.tacticalIdentifier()));
INFO_LOG() << "unitStr = " << unitStr;
INFO_LOG(m_logger) << "unitStr = " << unitStr;
return unitStr;
}
@@ -98,7 +98,7 @@ bool CombatNetRadioDialogModel::init(const std::shared_ptr<Interface::Dtc> &avmD
if (!ppmDtc->visibleParties(m_parties, LtsSessionData::LtsSessionData::getInstance()->getVisibleParties(m_exerciseId)))
{
ERROR_LOG() << "Could not retrieve visible Parties!";
ERROR_LOG(m_logger) << "Could not retrieve visible Parties!";
return false;
}
m_units = ppmDtc->units();
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_combat_net_radio_dialog_model.h
+2
View File
@@ -41,6 +41,8 @@ public:
bool onlyGlobals();
private:
NGL::INGLLogger &m_logger;
std::shared_ptr<Interface::Dtc> m_avmDtc;
int32_t m_exerciseId;
QMap<int32_t, CnrChannel> m_cnrChannels;
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_edit_combat_net_radio_dialog.cpp
+8 -8
View File
@@ -173,7 +173,7 @@ bool EditCombatNetRadioDialog::apply()
if (m_ui->cbUnit->currentIndex() > 0)
{
request.unitId().set(m_ui->cbUnit->currentData().toInt());
INFO_LOG()<< "currentIndex="<<m_ui->cbUnit->currentIndex()
INFO_LOG(m_logger)<< "currentIndex="<<m_ui->cbUnit->currentIndex()
<< " unitId ="<<request.unitId().get();
}
@@ -189,7 +189,7 @@ void EditCombatNetRadioDialog::init(LtsSession::LtsSession *session)
QMap<qint32, ParticipantManagement::Party> parties;
if (!m_ppmDtc->visibleParties(parties, LtsSessionData::LtsSessionData::getInstance()->getVisibleParties(m_exerciseId)))
ERROR_LOG() << "Could not retrieve visible Parties!";
ERROR_LOG(m_logger) << "Could not retrieve visible Parties!";
for (const ParticipantManagement::Party &party : std::as_const(parties))
m_ui->cbParty->addItem(ParticipantManagement::trPartyName(party.name()), party.id());
@@ -489,10 +489,10 @@ void EditCombatNetRadioDialog::onPartyIndexChanged(int index)
if (unit.designator().size() > 0)
{
unitStr = QString::fromStdString(unit.designator()) + QLatin1Char('/');
INFO_LOG()<<"Designator != leer: unitStr = " << unitStr;
INFO_LOG(m_logger)<<"Designator != leer: unitStr = " << unitStr;
}
unitStr += QString::fromStdString(unit.tacticalIdentifier());
INFO_LOG() << "unitStr =" << unitStr
INFO_LOG(m_logger) << "unitStr =" << unitStr
<< " id =" << unit.id();
m_ui->cbUnit->addItem(unitStr, unit.id());
@@ -561,14 +561,14 @@ void EditCombatNetRadioDialog::onExportButtonClicked()
QByteArray byteArray = cnrConfigRequestToJson();
int fileId = m_flmGui->saveFileContent(this, FileManagement::FileType::Xml, m_exerciseId, byteArray);
if (fileId > 0)
DEBUG_LOG() << "Saved file with id = " << fileId;
DEBUG_LOG(m_logger) << "Saved file with id = " << fileId;
else
ERROR_LOG() << "Could not save file in library ";
ERROR_LOG(m_logger) << "Could not save file in library ";
}
void EditCombatNetRadioDialog::onImportButtonClicked()
{
DEBUG_LOG() << " onImportButtonClicked() ";
DEBUG_LOG(m_logger) << " onImportButtonClicked() ";
QByteArray content;
int fileId = m_flmGui->loadFileContent(this, content, {FileManagement::FileType::Xml}, m_exerciseId, FileManagement::toString(FileManagement::XmlType::AVMEditCombatNetRadio));
@@ -588,7 +588,7 @@ void EditCombatNetRadioDialog::onImportButtonClicked()
{
ModifyCnrConfigRequest req = jsonToModifyCnrConfig(content);
setUiValues(toConfig(req));
INFO_LOG() << "--- onImportButtonClicked() ";
INFO_LOG(m_logger) << "--- onImportButtonClicked() ";
}
}
}
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_edit_combat_net_radio_dialog.h
+2
View File
@@ -69,6 +69,8 @@ public:
void onModifyCnrConfigReply(const Core::FunctionReplyObject &replyObject) override final { m_requestHelper->requestReply(replyObject); }
protected:
NGL::INGLLogger &m_logger;
bool apply() override;
private:
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_load_combat_net_radio_dialog.h
+2
View File
@@ -57,6 +57,8 @@ private Q_SLOTS:
void onOk();
private:
NGL::INGLLogger &m_logger;
std::unique_ptr<Ui::LoadCombatNetRadioDialog> m_ui;
LoadCombatNetRadioDialogModel *m_model;
bool m_isApplied = false;
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_load_combat_net_radio_dialog_model.cpp
+8 -8
View File
@@ -35,7 +35,7 @@ LoadCombatNetRadioDialogModel::LoadCombatNetRadioDialogModel(const QByteArray &d
}, parent)
, m_exerciseId(session == nullptr ? 0 : session->exerciseId())
{
DEBUG_LOG() << "Own exercise id: " << m_exerciseId;
DEBUG_LOG(m_logger) << "Own exercise id: " << m_exerciseId;
if (session != nullptr)
{
@@ -44,28 +44,28 @@ LoadCombatNetRadioDialogModel::LoadCombatNetRadioDialogModel(const QByteArray &d
if (!session->getDtc<AudioVideoManagement::DataInterface>(avmDtc)
|| !avmDtc->enableCnrChannel()
|| !avmDtc->enableCnrConfig())
ERROR_LOG() << "Could not get AVM data";
ERROR_LOG(m_logger) << "Could not get AVM data";
else
{
m_cnrChannels = avmDtc->cnrChannels();
m_cnrConfigs = avmDtc->cnrConfigs();
}
DEBUG_LOG() << "cnrconfigs: " << m_cnrConfigs.size();
DEBUG_LOG() << "ownExerciseId: " << m_exerciseId;
DEBUG_LOG(m_logger) << "cnrconfigs: " << m_cnrConfigs.size();
DEBUG_LOG(m_logger) << "ownExerciseId: " << m_exerciseId;
std::shared_ptr<ExerciseManagement::Interface::Dtc> exmDtc;
if (!session->getDtc<ExerciseManagement::DataInterface>(exmDtc)
|| !exmDtc->enableExercise())
ERROR_LOG() << "Could not get EXM data";
ERROR_LOG(m_logger) << "Could not get EXM data";
else
m_exercises = exmDtc->exercises();
DEBUG_LOG() << "exercises: " << m_exercises.size();
DEBUG_LOG(m_logger) << "exercises: " << m_exercises.size();
}
else
ERROR_LOG() << "Got invalid session.";
ERROR_LOG(m_logger) << "Got invalid session.";
m_vecData = jsonToCnrConfigVector(data);
@@ -377,7 +377,7 @@ QVector<Core::RemoveElementRequest> LoadCombatNetRadioDialogModel::removeRequest
{
if (!m_conflictedCnrIds.contains(idxCounter))
{
WARNING_LOG() << "Tried to get remove request for row " << idxCounter << " but it is not present.";
WARNING_LOG(m_logger) << "Tried to get remove request for row " << idxCounter << " but it is not present.";
continue;
}
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_load_combat_net_radio_dialog_model.h
+2
View File
@@ -81,6 +81,8 @@ public Q_SLOTS:
private:
NGL::INGLLogger &m_logger;
LoadCombatNetRadioDialogModel::Conflicts getConflicts(int32_t row, const CnrConfig &config);
QString conflictsText(Conflicts conflicts) const;
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_edit_frequency_planning_dialog.cpp
+7 -7
View File
@@ -138,7 +138,7 @@ void EditFrequencyPlanningDialog::retranslate()
void EditFrequencyPlanningDialog::onRemoveFrequencyPlanningReply(const Core::FunctionReplyObject &reply)
{
if (reply.error())
ERROR_LOG() << reply.str();
ERROR_LOG(m_logger) << reply.str();
m_requestHelper->requestReply(reply);
}
@@ -185,7 +185,7 @@ void EditFrequencyPlanningDialog::onAddClicked()
if (cnrConfigId <= 0)
return;
DEBUG_LOG() << "---RessourceDialog aufrufen...."
DEBUG_LOG(m_logger) << "---RessourceDialog aufrufen...."
<< " cnrConfigId: " << cnrConfigId
<< " radioCircuit: " << cnrConfigRow.radioCircuit()
<< " FrequencySetId: " << m_frequencyDataModel->getFrequencySetId();
@@ -270,7 +270,7 @@ void EditFrequencyPlanningDialog::enableSelectedUnassignButton()
m_buttonBox->setText(LtsWidgets::DialogButton::Add, tr("Assign"));
}
DEBUG_LOG() << "---enableAssignUnassignButtons()...."
DEBUG_LOG(m_logger) << "---enableAssignUnassignButtons()...."
<< " cnrConfigId: " << cnrConfigId
<< " radioCircuitId: " << cnrConfigRow.radioCircuit();
@@ -282,7 +282,7 @@ void EditFrequencyPlanningDialog::enableSelectedUnassignButton()
void EditFrequencyPlanningDialog::onAssignRadioCircuit(const FrequencyPlanningData &fpd)
{
DEBUG_LOG() << "---onAssignRadioCircuit()...."
DEBUG_LOG(m_logger) << "---onAssignRadioCircuit()...."
<< "CnrConfigId: " << fpd.cnrConfigId();
m_frequencyDataModel->setFrequencyPlanningData(fpd);
@@ -370,14 +370,14 @@ void EditFrequencyPlanningDialog::onExportButtonClicked()
QByteArray byteArray = m_frequencyDataModel->uiToJson();
int fileId = m_flmGui->saveFileContent(this, FileManagement::FileType::Xml, m_session->exerciseId(), byteArray);
if (fileId > 0)
DEBUG_LOG() << "Saved file with id = " << fileId;
DEBUG_LOG(m_logger) << "Saved file with id = " << fileId;
else
ERROR_LOG() << "Could not save file in library ";
ERROR_LOG(m_logger) << "Could not save file in library ";
}
void EditFrequencyPlanningDialog::onImportButtonClicked()
{
DEBUG_LOG() << "--- onImportButtonClicked() ";
DEBUG_LOG(m_logger) << "--- onImportButtonClicked() ";
QByteArray content;
int fileId = m_flmGui->loadFileContent(this, content, {FileManagement::FileType::Xml}, m_session->exerciseId(), FileManagement::toString(FileManagement::XmlType::AVMEditFrequencyPlanning));
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_edit_frequency_planning_frequency_data_model.cpp
+9 -10
View File
@@ -153,7 +153,7 @@ EditFrequencyPlanningFrequencyDataModel::EditFrequencyPlanningFrequencyDataModel
{
Q_ASSERT(avmDtc);
Q_ASSERT(ppmDtc);
DEBUG_LOG() << "---EditFrequencyPlanningDataMod m_frequencyPlanningData[c.id()];el() ";
DEBUG_LOG(m_logger) << "---EditFrequencyPlanningDataMod m_frequencyPlanningData[c.id()];el() ";
int frequencySetId = initPlanning.frequencySetId();
std::vector<FrequencySetDataWithId> fsdVec = m_avmDtc->frequencySet(frequencySetId).data();
@@ -384,14 +384,14 @@ QVariant EditFrequencyPlanningFrequencyDataModel::data(const QModelIndex &index,
return QStringLiteral("-");
const auto unit = m_units[unitId];
INFO_LOG() << " config.unitId()=" << unitId
INFO_LOG(m_logger) << " config.unitId()=" << unitId
<< " Str=" << unit.name();
QString unitStr;
if (unit.designator().size() > 0)
unitStr = QString::fromStdString(unit.designator()) + QLatin1Char('/');
unitStr.append(QString::fromStdString(unit.tacticalIdentifier()));
INFO_LOG() << "unitStr = " << unitStr;
INFO_LOG(m_logger) << "unitStr = " << unitStr;
return unitStr;
}
@@ -606,7 +606,7 @@ void EditFrequencyPlanningFrequencyDataModel::setFrequencePlanningId(int id)
m_initPlan.id(id);
return;
}
WARNING_LOG() << "Trying to set a new frequency planning id but there is alreay an id set ("
WARNING_LOG(m_logger) << "Trying to set a new frequency planning id but there is alreay an id set ("
<< m_initPlan.id() << " - " << id << ")";
}
@@ -783,12 +783,12 @@ bool EditFrequencyPlanningFrequencyDataModel::checkResourceAssignments()
{
if (inner != outer)
{
DEBUG_LOG() << "---ist ungleich cnrConfigId(A): " << p.cnrConfigId()
DEBUG_LOG(m_logger) << "---ist ungleich cnrConfigId(A): " << p.cnrConfigId()
<< " (B): " << pI.cnrConfigId();
}
else
{
DEBUG_LOG() << "---ist gleich cnrConfigId(A): " << p.cnrConfigId()
DEBUG_LOG(m_logger) << "---ist gleich cnrConfigId(A): " << p.cnrConfigId()
<< " (B): " << pI.cnrConfigId();
if (!m_multipleAssignedCnrIds.contains(p.cnrConfigId()) )
m_multipleAssignedCnrIds.append(p.cnrConfigId());
@@ -808,7 +808,7 @@ bool EditFrequencyPlanningFrequencyDataModel::checkResourceAssignments()
qs.append(QString::number(id));
qs.append(QStringLiteral(", "));
}
DEBUG_LOG() << "---Number of multiple assigned frequency set data: " << m_multipleAssignedCnrIds.size()
DEBUG_LOG(m_logger) << "---Number of multiple assigned frequency set data: " << m_multipleAssignedCnrIds.size()
<< " cnrConfigIds: " << qs;
#endif
return bOk;
@@ -906,9 +906,8 @@ QSet<int> EditFrequencyPlanningFrequencyDataModel::getAllocatedFrequencyPlanning
FPFDelegate::FPFDelegate(QObject *parent)
: QStyledItemDelegate(parent)
{
FPFDelegate::FPFDelegate(QObject *parent) : QStyledItemDelegate(parent),
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
}
void FPFDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const
{
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_edit_frequency_planning_resource_data_model.cpp
+1 -1
View File
@@ -88,7 +88,7 @@ bool EditFrequencyPlanningResourceDataModel::isFiltered(const AudioVideoManageme
if (m_assignedFrequencySetDataIds.contains(data.id()))
{
DEBUG_LOG() << "---m_assignments.size(): " << m_assignedFrequencySetDataIds.size()
DEBUG_LOG(m_logger) << "---m_assignments.size(): " << m_assignedFrequencySetDataIds.size()
<< " frequencySetDataId: " << data.id() << " ist bereits enthalten";
return true;
}
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_frequency_planning_dialog.cpp
+8 -8
View File
@@ -41,7 +41,7 @@ FrequencyPlanningDialog::FrequencyPlanningDialog(LtsSession::LtsSession *session
{
m_ui->setupUi(this);
DEBUG_LOG() << "---FrequencyPlanningDialog() ";
DEBUG_LOG(m_logger) << "---FrequencyPlanningDialog() ";
m_ui->dataView->setSelectionMode(QAbstractItemView::SingleSelection);
m_ui->dataView->treeView()->setSelectionBehavior(QAbstractItemView::SelectRows);
@@ -91,7 +91,7 @@ bool FrequencyPlanningDialog::init(const std::shared_ptr<Interface::Dtc> &avmDtc
avmDtc->enableActiveFrequencyPlanning() &&
ismDtc->enableMainStructureElement()))
{
ERROR_LOG() << "Could not enable topics";
ERROR_LOG(m_logger) << "Could not enable topics";
return false;
}
@@ -108,7 +108,7 @@ bool FrequencyPlanningDialog::init(const std::shared_ptr<Interface::Dtc> &avmDtc
{
delete m_model;
m_model = nullptr;
ERROR_LOG() << "Could not init model";
ERROR_LOG(m_logger) << "Could not init model";
return false;
}
@@ -300,7 +300,7 @@ void FrequencyPlanningDialog::onEditClicked()
return;
const FrequencyPlanning &fp = m_model->data(currentIndex, Qt::UserRole).value<FrequencyPlanning>();
DEBUG_LOG() << "---onEditClicked() FrequencyPlanningId: " << fp.id() << " FrequencySetDataId: " << fp.frequencySetId();
DEBUG_LOG(m_logger) << "---onEditClicked() FrequencyPlanningId: " << fp.id() << " FrequencySetDataId: " << fp.frequencySetId();
m_copy = false;
showEditDialog(m_model->data(currentIndex, Qt::UserRole).value<FrequencyPlanning>());
@@ -440,14 +440,14 @@ void FrequencyPlanningDialog::onExportButtonClicked()
int fileId = m_flmGui->saveFileContent(this, FileManagement::FileType::Xml, m_session->exerciseId(), byteArray);
if (fileId > 0)
DEBUG_LOG() << "Saved file with id = " << fileId;
DEBUG_LOG(m_logger) << "Saved file with id = " << fileId;
else
ERROR_LOG() << "Could not save file in library ";
ERROR_LOG(m_logger) << "Could not save file in library ";
}
void FrequencyPlanningDialog::onImportButtonClicked()
{
DEBUG_LOG() << " onImportButtonClicked() ";
DEBUG_LOG(m_logger) << " onImportButtonClicked() ";
if (m_model->rowCount() > 0)
{
QHash<LtsWidgets::Button, QString> texts({{LtsWidgets::Button::Yes, tr("Ok")}});
@@ -484,7 +484,7 @@ void FrequencyPlanningDialog::onImportButtonClicked()
return m_avmFtc->modifyFrequencyPlanningRequest(request, this);
});
}
INFO_LOG() << "--- onImportButtonClicked() ";
INFO_LOG(m_logger) << "--- onImportButtonClicked() ";
}
}
}
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_frequency_planning_dialog.h
+2
View File
@@ -99,6 +99,8 @@ signals:
void aboutToCloseMe(int);
private:
NGL::INGLLogger &m_logger;
void retranslate() override;
void unsetActiveFrequencyPlanning();
void setActiveFrequencyPlanning(const ActiveFrequencyPlanning &activePlanning);
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_frequency_planning_dialog_model.cpp
+3 -3
View File
@@ -22,7 +22,7 @@ FrequencyPlanningDialogModel::FrequencyPlanningDialogModel(int32_t exerciseId, Q
}, parent)
, m_exerciseId(exerciseId)
{
DEBUG_LOG() << "---FrequencyPlanningDialogModel() ";
DEBUG_LOG(m_logger) << "---FrequencyPlanningDialogModel() ";
}
QVariant FrequencyPlanningDialogModel::data(const QModelIndex &index, int role) const
@@ -82,7 +82,7 @@ FrequencySet FrequencyPlanningDialogModel::frequencySetByIndex(const QModelIndex
void FrequencyPlanningDialogModel::onFrequencyPlanningChanged(const FrequencyPlanning &data, DataModification modType)
{
INFO_LOG() << "onFrequencyPlanningChanged "
INFO_LOG(m_logger) << "onFrequencyPlanningChanged "
<< " data.exerciseId()" << data.exerciseId()
<< " m_exerciseId=" << m_exerciseId;
if ((data.exerciseId().is_set() && data.exerciseId().get() != m_exerciseId)
@@ -100,7 +100,7 @@ QByteArray FrequencyPlanningDialogModel::modelToJson()
for (int row = 0; row < rowCount(); row++)
{
DEBUG_LOG() << "row =" << ": " << row;
DEBUG_LOG(m_logger) << "row =" << ": " << row;
QJsonObject inner;
const FrequencyPlanning &planning = m_vecData.at(row);
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_frequency_planning_dialog_model.h
+2
View File
@@ -46,6 +46,8 @@ private Q_SLOTS:
void onFrequencyPlanningChanged(const FrequencyPlanning &data, DataModification modType);
private:
NGL::INGLLogger &m_logger;
int32_t m_exerciseId;
boost::optional<int> m_activePlanningId;
std::shared_ptr<Interface::Dtc> m_avmDtc;
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_frequency_planning_widget.cpp
+3 -4
View File
@@ -17,12 +17,11 @@
namespace AudioVideoManagement
{
FrequencyPlanningWidget::FrequencyPlanningWidget(const std::shared_ptr<Interface::Dtc> &avmDtc, QSet<int> &allocatedDataSets, QWidget *parent)
: QWidget(parent)
FrequencyPlanningWidget::FrequencyPlanningWidget(const std::shared_ptr<Interface::Dtc> &avmDtc, QSet<int> &allocatedDataSets, QWidget *parent) : QWidget(parent)
, m_ui(new Ui::FrequencyPlanningWidget)
, m_assignedFrequencySetDataIds(allocatedDataSets)
, m_avmDtc(avmDtc)
{
, m_avmDtc(avmDtc),
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
m_ui->setupUi(this);
m_ui->cbFrequencyBand->addItem(toString(FrequencyBand_def::VHF), FrequencyBand_def::VHF);
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_init_frequency_planning_dialog.cpp
+1 -1
View File
@@ -16,7 +16,7 @@ InitFrequencyPlanningDialog::InitFrequencyPlanningDialog(LtsSession::LtsSession
, m_dateOfCreation(session->partitionTime())
, m_session(session)
{
DEBUG_LOG() << "---InitFrequencyPlanningDialog() ";
DEBUG_LOG(m_logger) << "---InitFrequencyPlanningDialog() ";
m_ui->setupUi(this);
QMap<int32_t, FrequencySet> frequencySets = avmDtc->frequencySets();
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_init_frequency_planning_dialog.h
+2
View File
@@ -34,6 +34,8 @@ signals:
void newInitFrequencyPlanning(const FrequencyPlanning &);
private:
NGL::INGLLogger &m_logger;
void retranslate() override;
bool apply() override;
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_load_frequency_planning_dialog.h
+2
View File
@@ -59,6 +59,8 @@ private Q_SLOTS:
void onOk();
private:
NGL::INGLLogger &m_logger;
std::unique_ptr<Ui::LoadFrequencyPlanningDialog> m_ui;
LoadFrequencyPlanningDialogModel *m_model;
bool m_isApplied = false;
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_load_frequency_planning_dialog_model.cpp
+6 -7
View File
@@ -142,7 +142,7 @@ LoadFrequencyPlanningDialogModel::LoadFrequencyPlanningDialogModel(const Frequen
, m_exerciseId(initPlan.exerciseId().is_set() ? initPlan.exerciseId().get() : 0)
{
Q_ASSERT(avmDtc);
DEBUG_LOG() << "---EditFrequencyPlanningDataMod m_frequencyPlanningData[c.id()];el() ";
DEBUG_LOG(m_logger) << "---EditFrequencyPlanningDataMod m_frequencyPlanningData[c.id()];el() ";
m_initPlan.data().clear();
@@ -167,7 +167,7 @@ void LoadFrequencyPlanningDialogModel::setData(const QByteArray &data)
if (m_initPlan.frequencySetId() != obj.value<int>("frequencySetId"))
{
ERROR_LOG() << "false frequency set!";
ERROR_LOG(m_logger) << "false frequency set!";
return;
}
@@ -619,7 +619,7 @@ void LoadFrequencyPlanningDialogModel::checkConflicts()
if (!item || !item->data().canConvert<ItemData>())
{
DEBUG_LOG() << "Could not get item for row " << row;
DEBUG_LOG(m_logger) << "Could not get item for row " << row;
continue;
}
@@ -873,7 +873,7 @@ QVector<FrequencyPlanningData> LoadFrequencyPlanningDialogModel::planningData()
if (!item || !item->data().canConvert<ItemData>())
{
DEBUG_LOG() << "Could not get item for row " << row;
DEBUG_LOG(m_logger) << "Could not get item for row " << row;
continue;
}
@@ -918,9 +918,8 @@ LoadFrequencyPlanningDialogModel::ConfigTreeItem* LoadFrequencyPlanningDialogMod
DrawDelegate::DrawDelegate(QObject *parent)
: QStyledItemDelegate(parent)
{
DrawDelegate::DrawDelegate(QObject *parent) : QStyledItemDelegate(parent),
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
}
void DrawDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const
{
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/Eloka/avm_eloka_dialog.cpp
+4 -4
View File
@@ -109,7 +109,7 @@ void ElokaDialog::setAvaSessionStatus(bool established)
void ElokaDialog::onAddClicked()
{
DEBUG_LOG() << "**** onAddClicked() ";
DEBUG_LOG(m_logger) << "**** onAddClicked() ";
ElokaEditDialog *dialog = new ElokaEditDialog(m_session, m_avaSession, m_avmDtc, m_streamNameMapping,
ElokaData(), this);
@@ -128,7 +128,7 @@ void ElokaDialog::onAddClicked()
void ElokaDialog::onEditClicked()
{
DEBUG_LOG() << "**** onEditClicked() ";
DEBUG_LOG(m_logger) << "**** onEditClicked() ";
const QModelIndex idx = m_ui->tvEloka->currentIndex();
@@ -154,7 +154,7 @@ void ElokaDialog::onEditClicked()
void ElokaDialog::onRemoveClicked()
{
DEBUG_LOG() << "**** onRemoveClicked() ";
DEBUG_LOG(m_logger) << "**** onRemoveClicked() ";
const QModelIndex idx = m_ui->tvEloka->currentIndex();
@@ -184,7 +184,7 @@ void ElokaDialog::onPrint()
void ElokaDialog::onQueryElokaResponse(const QVector<AvaEloka> &&eloka)
{
DEBUG_LOG() << "onQueryElokaResponse";
DEBUG_LOG(m_logger) << "onQueryElokaResponse";
m_elokaListCollector.start();
m_elokaModel->clear();
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/Eloka/avm_eloka_edit_dialog.cpp
+5 -5
View File
@@ -351,7 +351,7 @@ void ElokaEditDialog::getActiveCnrs()
void ElokaEditDialog::onCnrConfigChanged(const CnrConfig &data,
DataModification modType)
{
DEBUG_LOG() << "onCnrConfigChanged";
DEBUG_LOG(m_logger) << "onCnrConfigChanged";
switch (modType)
{
case DataModification::eAdded:
@@ -374,7 +374,7 @@ void ElokaEditDialog::onCnrConfigChanged(const CnrConfig &data,
void ElokaEditDialog::onTvcConfigChanged(const TvcConfig &data,
DataModification modType)
{
DEBUG_LOG() << "onTvcConfigChanged";
DEBUG_LOG(m_logger) << "onTvcConfigChanged";
switch (modType)
{
@@ -398,7 +398,7 @@ void ElokaEditDialog::onTvcConfigChanged(const TvcConfig &data,
void ElokaEditDialog::onStreamChanged(const Stream &data,
DataModification modType)
{
DEBUG_LOG() << "onStreamChanged";
DEBUG_LOG(m_logger) << "onStreamChanged";
if ((data.type() != StreamType_def::AudioOut) &&
(data.type() != StreamType_def::AudioInOut))
@@ -427,7 +427,7 @@ void ElokaEditDialog::onCnrTvcProfileChanged(const CnrTvcProfile &data,
DataModification modType)
{
Q_UNUSED(modType);
DEBUG_LOG() << "onCnrTvcProfileChanged";
DEBUG_LOG(m_logger) << "onCnrTvcProfileChanged";
if (data.exerciseId() != m_session->exerciseId() ||
data.operatorId() != LtsSessionData::LtsSessionData::getInstance()->getOperatorId())
@@ -535,7 +535,7 @@ void ElokaEditDialog::setCurrentCircuit(const ElokaData &data)
void ElokaEditDialog::onGetElokaListResponse(const QVector<QString> &actions)
{
DEBUG_LOG() << "onGetElokaListResponse";
DEBUG_LOG(m_logger) << "onGetElokaListResponse";
if (!m_elokaData.internalName.isEmpty())
setUnchangeable(true);
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/MobileVideoSystem/avm_mvs_dialog.cpp
+5 -5
View File
@@ -58,7 +58,7 @@ bool MvsDialog::init(const std::shared_ptr<AudioVideoManagement::Interface::Dtc>
{
delete m_model;
m_model = nullptr;
ERROR_LOG() << "Could not init model";
ERROR_LOG(m_logger) << "Could not init model";
return false;
}
@@ -178,14 +178,14 @@ void MvsDialog::onExportButtonClicked()
int fileId = m_flmGui->saveFileContent(this, FileManagement::FileType::Xml, m_session->exerciseId(), byteArray);
if (fileId > 0)
DEBUG_LOG() << "Saved file with id = " << fileId;
DEBUG_LOG(m_logger) << "Saved file with id = " << fileId;
else
ERROR_LOG() << "Could not save file in library ";
ERROR_LOG(m_logger) << "Could not save file in library ";
}
void MvsDialog::onImportButtonClicked()
{
DEBUG_LOG() << " onImportButtonClicked() ";
DEBUG_LOG(m_logger) << " onImportButtonClicked() ";
QByteArray content;
int fileId = m_flmGui->loadFileContent(this, content, {FileManagement::FileType::Xml}, m_session->exerciseId(), FileManagement::toString(FileManagement::XmlType::AVMMvsDialog));
@@ -211,7 +211,7 @@ void MvsDialog::onImportButtonClicked()
return m_avmFtc->videoTeamModifyRequest(request, this);
});
}
INFO_LOG() << "--- onImportButtonClicked() ";
INFO_LOG(m_logger) << "--- onImportButtonClicked() ";
}
}
}
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/MobileVideoSystem/avm_mvs_dialog.h
+2
View File
@@ -70,6 +70,8 @@ private Q_SLOTS:
void onImportButtonClicked();
private:
NGL::INGLLogger &m_logger;
void retranslate() override;
void tableColumnOrganiserSetting() override;
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/MobileVideoSystem/avm_mvs_edit_dialog.h
+2
View File
@@ -41,6 +41,8 @@ Q_SIGNALS:
void modifyRequest(const AudioVideoManagement::VideoTeamModifyRequest &request);
protected:
NGL::INGLLogger &m_logger;
bool apply() override;
private:
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/MobileVideoSystem/avm_mvs_model.cpp
+2 -2
View File
@@ -77,7 +77,7 @@ QByteArray MvsModel::modelToJson()
for (int row = 0; row < rowCount(); row++)
{
DEBUG_LOG() << "row =" << ": " << row;
DEBUG_LOG(m_logger) << "row =" << ": " << row;
QJsonObject inner;
const VideoTeam &config = m_vecData.at(row);
inner[QStringLiteral("id")] = config.id();
@@ -118,7 +118,7 @@ QVector<VideoTeamModifyRequest> MvsModel::jsonToVideoTeamVector(const QByteArray
config.exerciseId(m_exerciseId);
config.streamName(obj[QStringLiteral("streamName")].toString().toStdString());
INFO_LOG() << "insertRow: " << config.name()
INFO_LOG(m_logger) << "insertRow: " << config.name()
<< " VideoTeamId=" << config.id();
result.append(std::move(config));
}
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/MobileVideoSystem/avm_mvs_model.h
+1
View File
@@ -35,6 +35,7 @@ public:
QVector<VideoTeamModifyRequest> jsonToVideoTeamVector(const QByteArray &content);
bool isFiltered(const VideoTeam &data, DataModification modType) const override;
private:
NGL::INGLLogger &m_logger;
std::shared_ptr<AudioVideoManagement::Interface::Dtc> m_avmDtc;
int32_t m_exerciseId;
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/MobileVideoSystem/avm_mvs_video_team_dialog.cpp
+5 -5
View File
@@ -169,7 +169,7 @@ void MvsVideoTeamDialog::setData()
bool MvsVideoTeamDialog::apply()
{
VideoReceiverModifyActiveRequest req;
DEBUG_LOG() << "apply m_videoTeamButtonGroup.size=" << m_videoTeamButtonGroup.size();
DEBUG_LOG(m_logger) << "apply m_videoTeamButtonGroup.size=" << m_videoTeamButtonGroup.size();
QMap<int, QButtonGroup *> ::const_iterator itBg;
for (itBg = m_videoTeamButtonGroup.constBegin(); itBg != m_videoTeamButtonGroup.constEnd(); ++itBg)
{
@@ -177,9 +177,9 @@ bool MvsVideoTeamDialog::apply()
int mainStructureElementId = itBg.value()->checkedId();
int oldActiveId = m_dtc->getActiveVideoReceiver(teamId);
DEBUG_LOG() << "Team id = " << teamId;
DEBUG_LOG() << "Main structure element id = " << mainStructureElementId;
DEBUG_LOG() << "Old active video receiver = " << oldActiveId;
DEBUG_LOG(m_logger) << "Team id = " << teamId;
DEBUG_LOG(m_logger) << "Main structure element id = " << mainStructureElementId;
DEBUG_LOG(m_logger) << "Old active video receiver = " << oldActiveId;
if (itBg.value()->checkedId() == 0)
{
@@ -199,7 +199,7 @@ bool MvsVideoTeamDialog::apply()
req.isActive(true);
req.id(m_receiverIds.value(QPair<int, int>(mainStructureElementId, teamId)));
}
DEBUG_LOG() << "itBg.key=" << itBg.key()
DEBUG_LOG(m_logger) << "itBg.key=" << itBg.key()
<< " mainStructureElementId=" << mainStructureElementId
<< " teamId=" << teamId
<< " id=" << req.id()
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/MobileVideoSystem/avm_mvs_video_team_dialog.h
+2
View File
@@ -47,6 +47,8 @@ public:
void onVideoReceiverModifyActiveReply(const Core::FunctionReplyObject &reply) override final { m_requestHelper->requestReply(reply); }
private:
NGL::INGLLogger &m_logger;
ReceiverElement *createReceiverElement(const VideoReceiver &rec);
private slots:
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/TrainingVoiceCommunication/avm_edit_training_voice_communication_dialog.h
+2
View File
@@ -70,6 +70,8 @@ public:
void retranslate() override;
protected:
NGL::INGLLogger &m_logger;
bool apply() override;
void onModifyTvcConfigReply(const Core::FunctionReplyObject &reply) override;
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/TrainingVoiceCommunication/avm_training_voice_communication_dialog.cpp
+6 -6
View File
@@ -52,7 +52,7 @@ bool TrainingVoiceCommunicationDialog::init(const std::shared_ptr<Interface::Dtc
avmFtc->enableModifyTvcConfig() &&
avmFtc->enableRemoveTvcConfig()))
{
ERROR_LOG() << "Could not enable topics";
ERROR_LOG(m_logger) << "Could not enable topics";
return false;
}
@@ -68,7 +68,7 @@ bool TrainingVoiceCommunicationDialog::init(const std::shared_ptr<Interface::Dtc
{
m_filter.reset();
m_model.reset();
ERROR_LOG() << "Could not init model";
ERROR_LOG(m_logger) << "Could not init model";
return false;
}
@@ -167,14 +167,14 @@ void TrainingVoiceCommunicationDialog::onExportButtonClicked()
int fileId = m_flmGui->saveFileContent(this, FileManagement::FileType::Xml, m_session->exerciseId(), byteArray);
if (fileId > 0)
DEBUG_LOG() << "Saved file with id = " << fileId;
DEBUG_LOG(m_logger) << "Saved file with id = " << fileId;
else
ERROR_LOG() << "Could not save file in library ";
ERROR_LOG(m_logger) << "Could not save file in library ";
}
void TrainingVoiceCommunicationDialog::onImportButtonClicked()
{
DEBUG_LOG() << " onImportButtonClicked() ";
DEBUG_LOG(m_logger) << " onImportButtonClicked() ";
QByteArray content;
int fileId = m_flmGui->loadFileContent(this, content, {FileManagement::FileType::Xml}, m_session->exerciseId(), FileManagement::toString(FileManagement::XmlType::AVMTrainingVoiceCommunication));
@@ -201,7 +201,7 @@ void TrainingVoiceCommunicationDialog::onImportButtonClicked()
});
}
(void) m_requestHelper->startRequests();
INFO_LOG() << "--- onImportButtonClicked() ";
INFO_LOG(m_logger) << "--- onImportButtonClicked() ";
}
}
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/TrainingVoiceCommunication/avm_training_voice_communication_dialog.h
+2
View File
@@ -72,6 +72,8 @@ private Q_SLOTS:
void onImportButtonClicked();
private:
NGL::INGLLogger &m_logger;
void retranslate() override;
void tableColumnOrganiserSetting() override;
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/TrainingVoiceCommunication/avm_training_voice_communication_dialog_model.cpp
+1 -1
View File
@@ -113,7 +113,7 @@ QVector<ModifyTvcConfigRequest> TrainingVoiceCommunicationDialogModel::jsonToTvc
config.recording(obj[QLatin1String("recording")].toBool());
config.tetraChannelId(obj[QLatin1String("tetraChannelId")].toInt());
INFO_LOG() << "insertRow: " << config.radioCircuit()
INFO_LOG(m_logger) << "insertRow: " << config.radioCircuit()
<< " tvcChannelId=" << config.tetraChannelId();
result.push_back(std::move(config));
}
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/TrainingVoiceCommunication/avm_training_voice_communication_dialog_model.h
+2
View File
@@ -35,6 +35,8 @@ public:
QVector<ModifyTvcConfigRequest> jsonToTvcConfigVector(const QByteArray &content) const;
private:
NGL::INGLLogger &m_logger;
std::shared_ptr<AudioVideoManagement::Interface::Dtc> m_avmDtc;
int32_t m_exerciseId;