Complete Qt6 migration: full clean build green across groups G1-G12 incl. runtime plugin set
new_docker_build.sh gains Group 12 (212 GUI/Data plugins); fixes LtsUtilsGuiDds visibility (LTO-stripped exports), LtsProjectionWorkstation unity name shadow, 6 unity-off dirs (dup file-scope statics, ddsftc INTERFACE sources) and reconfigures BUILD_FILTERMANAGEMENT/BUILD_PLUGINS_SERVICEMONITOR=ON
This commit is contained in:
1718 files changed
+126739
-18495
No files matched your search
+4
-2
@@ -2,6 +2,7 @@
|
||||
|
||||
|
||||
#include "topic_editor.h"
|
||||
#include <NGLLogger/NGLLoggerBootstrap.h>
|
||||
#include "ui_topic_editor.h"
|
||||
#include "../replay_control_widget.h"
|
||||
|
||||
@@ -45,6 +46,7 @@ SituationReplayEditor::SituationReplayEditor(
|
||||
, m_markerModel(markerModel)
|
||||
, m_applyFilter(applyFilter)
|
||||
, m_ui(new Ui::SituationReplayEditor)
|
||||
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
m_ui->lblDuration->setText(QStringLiteral(" - "));
|
||||
@@ -461,7 +463,7 @@ void SituationReplayEditor::onMarkerSelected(const QModelIndex &idx)
|
||||
{
|
||||
const MarkerManagement::Marker marker = m_markerModel->getRowData(idx.row());
|
||||
|
||||
if (marker.id() <= 0)
|
||||
if (marker.id <= 0)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "marker has id 0";
|
||||
return;
|
||||
@@ -471,7 +473,7 @@ void SituationReplayEditor::onMarkerSelected(const QModelIndex &idx)
|
||||
|
||||
|
||||
onChangesMade();
|
||||
setFilterAndSettings(QByteArray(marker.filter().c_str(), marker.filter().size()), QByteArray(marker.mapSettings().c_str(), marker.mapSettings().size()));
|
||||
setFilterAndSettings(QByteArray(marker.filter.c_str(), marker.filter.size()), QByteArray(marker.mapSettings.c_str(), marker.mapSettings.size()));
|
||||
slotChangesMade();
|
||||
}
|
||||
|
||||
|
||||
+2
-2
@@ -2,8 +2,8 @@
|
||||
|
||||
|
||||
#pragma once
|
||||
#include <MarkerManagement/Common/mrk_dialog_model.h>
|
||||
#include <MarkerManagement/Common/mrk_apply_filter.h>
|
||||
#include <Plugins/MarkerManagement/Gui/Common/mrk_dialog_model.h>
|
||||
#include <Plugins/MarkerManagement/Gui/Common/mrk_apply_filter.h>
|
||||
#include <MarkerManagement/mrk.hpp>
|
||||
#include <TopicEditorBase/topic_preview_widget.h>
|
||||
#include <TopicEditorBase/topic_previewer.h>
|
||||
|
||||
Reference in new issue
Block a user