Merge story/release-validation-scope

Bring the validation-scope line (in-tree Jenkins CI copy, lcov coverage
wiring, step-by-step release-scope README, TetraIF unit tests, the
LogView runtime icon/resource fix, Dockerfile, rpmbuild and the
new_docker_build.sh driver with the DEB output path) on top of the
XmlPatterns branch pruned to the Release 2 scope.

Conflict policy:
- Out-of-scope targets/modules: keep the prune (deletion wins).
- In-scope files that validation had deleted: restored from
  story/release-2-cleanup (the Release 2 closure, with the
  pruned-module guards).
- In-scope sources carrying migration work: XmlPatterns versions
  (Qt XmlPatterns rework on QDomDocument, DDS member and logger
  fixes, first-build fixes).
- Scope-aware CMakeLists (top level, PluginInterfaces, LtsWidgets)
  and .envrc: story/release-2-cleanup / ours versions.
This commit is contained in:
berrux-dev committed 2026-11-16 18:49:14 +01:00
commit cfe15c72c4
521 files changed
+37159 -36635

No files matched your search

@@ -47,6 +47,10 @@ TARGET_INCLUDE_DIRECTORIES(RecordReplayPlugin PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}
TARGET_LINK_LIBRARIES(RecordReplayPlugin PUBLIC Qt6::Core)
# Topic Replay Interface
#
# Links TopicEditorBase, which was pruned from the tree (prune commit
# 7fc6f6664), so the target is only defined when the module is present.
IF(EXISTS "${CMAKE_SOURCE_DIR}/Lts/Common/TopicEditorBase")
ADD_LIBRARY(TopicReplayInterface SHARED
${CMAKE_CURRENT_SOURCE_DIR}/topic_replay_interface.h
${CMAKE_CURRENT_SOURCE_DIR}/topic_replay_interface.cpp
@@ -56,6 +60,7 @@ TARGET_INCLUDE_DIRECTORIES(TopicReplayInterface PUBLIC
${CMAKE_BINARY_DIR}/Lts/Common/TopicEditorBase # topiceditorbase_export.h
)
TARGET_LINK_LIBRARIES(TopicReplayInterface PUBLIC Qt6::Core TopicEditorBase)
ENDIF()
# These interface base classes (e.g. DataPluginBase::Plugin) are Q_OBJECT classes. The top-level
# CMAKE_CXX_VISIBILITY_PRESET hidden compiles their Q_OBJECT meta symbols (staticMetaObject/vtable/
@@ -70,8 +75,15 @@ set_target_properties(
ProjectPluginInterface
StylePluginInterface
RecordReplayPlugin
TopicReplayInterface
PROPERTIES
CXX_VISIBILITY_PRESET default
CXX_VISIBILITY_INLINES_HIDDEN OFF
)
# TopicReplayInterface (pruned dependency, see above)
IF(TARGET TopicReplayInterface)
set_target_properties(TopicReplayInterface
PROPERTIES
CXX_VISIBILITY_PRESET default
CXX_VISIBILITY_INLINES_HIDDEN OFF
)
ENDIF()
@@ -8,35 +8,35 @@
namespace NGL
{
class INGLLogger;
class INGLLogger;
}
namespace LtsSession
{
class LtsSessionDataDds;
class LtsSessionDataDds;
}
namespace DataPluginBase
{
class Interface
{
public:
class Interface
{
public:
virtual ~Interface() = default;
};
};
class Plugin : public QObject
{
Q_OBJECT
class Plugin : public QObject
{
Q_OBJECT
public:
Plugin() = default;
virtual ~Plugin() = default;
virtual QString pluginName() const = 0;
virtual std::shared_ptr<Interface> createDataInterface(LtsSession::LtsSessionDataDds* session) = 0;
virtual std::shared_ptr<Interface> createDataInterface(LtsSession::LtsSessionDataDds *session) = 0;
virtual bool availableInPartition(IDL::PartitionType partition) const = 0;
};
};
} // namespace DataPluginBase
@@ -1,4 +1,11 @@
/**
* @RDE_HEADER@
* Interface for HMI plugins
* $Id$
* $HeadURL$
* $Author$
* Created by Christian Ehrlicher, SLSE, 2016-02-29
*/
#pragma once
@@ -7,13 +7,13 @@
namespace ProjectPlugin
{
class Plugin
{
class Plugin
{
Q_GADGET
public:
public:
virtual ~Plugin() = default;
};
};
} // namespace ProjectPlugin
@@ -10,71 +10,72 @@
namespace DDSConnector
{
class DdsConnector;
class DdsConnector;
}
class NSqlQuery;
namespace RecordReplay
{
class RecordReplayPlugin
{
Q_GADGET
class RecordReplayPlugin
{
Q_GADGET
public:
virtual ~RecordReplayPlugin() = default;
virtual QString pluginName() const = 0;
virtual bool initDtc(const std::shared_ptr<DDSConnector::DdsConnector>& ddsConnector, int exerciseId) = 0;
virtual bool initDtc(const std::shared_ptr<DDSConnector::DdsConnector> &ddsConnector, int exerciseId) = 0;
virtual bool initDts(const std::shared_ptr<DDSConnector::DdsConnector>& ddsConnector, int exerciseId,
bool bCanHandleSchemas, NSqlQuery& query) = 0;
virtual bool initDts(const std::shared_ptr<DDSConnector::DdsConnector> &ddsConnector, int exerciseId, bool bCanHandleSchemas, NSqlQuery &query) = 0;
virtual bool initCopy(int exerciseId, bool bCanHandleSchemasRead, bool bCanHandleSchemasWrite) = 0;
virtual bool copyData(NSqlQuery& queryFrom, NSqlQuery& queryTo, qint64 fromTime, qint64 toTime) = 0;
virtual bool copyData(NSqlQuery &queryFrom, NSqlQuery &queryTo, qint64 fromTime, qint64 toTime) = 0;
virtual QString svcShortName() const = 0;
virtual bool ddsTopicsToDatabase(NSqlQuery& query, QHash<QString, qint64>& minRecordSampleTimes) = 0;
virtual bool ddsTopicsToDatabase(NSqlQuery &query, QHash<QString, qint64> &minRecordSampleTimes) = 0;
virtual bool setReplayStartTime(NSqlQuery& query, qint64 startTime) = 0;
virtual bool setReplayStartTime(NSqlQuery &query, qint64 startTime) = 0;
virtual bool ddsTopicsFromDatabase(NSqlQuery& query, qint64 fromTime, qint64 toTime) = 0;
virtual bool ddsTopicsFromDatabase(NSqlQuery &query, qint64 fromTime, qint64 toTime) = 0;
virtual bool publishData(qint64 desiredTime) = 0;
virtual bool waitForAsyncOperations(qint64 desiredTime)
{
Q_UNUSED(desiredTime);
return true;
Q_UNUSED(desiredTime);
return true;
}
virtual void clearData() = 0;
struct RecSnapshot
{
qint64 timeStamp = 0;
std::map<int64_t, int64_t> recIdArray;
RecSnapshot() = default;
qint64 timeStamp = 0;
std::map<int64_t, int64_t> recIdArray;
RecSnapshot() = default;
RecSnapshot(qint64 timeStamp_, const std::map<int64_t, int64_t>& recIdArray_)
: timeStamp(timeStamp_), recIdArray(recIdArray_)
{
}
RecSnapshot(qint64 timeStamp_, const std::map<int64_t, int64_t> &recIdArray_)
: timeStamp(timeStamp_)
, recIdArray(recIdArray_)
{
}
};
virtual std::map<QString, std::vector<RecSnapshot>>
getSnapshotTimes(NSqlQuery& query, qint64 toTime, qint64 interval,
const QHash<QString, qint64>& minRecordedSampleTimes) = 0;
virtual std::map<QString, std::vector<RecSnapshot>> getSnapshotTimes(NSqlQuery &query,
qint64 toTime,
qint64 interval,
const QHash<QString, qint64> &minRecordedSampleTimes) = 0;
virtual QVector<QString> getRecordTopicNames() const = 0;
virtual QVector<QString> getRecordTableNames() const = 0;
virtual qint64 getMinimumSampleTime(NSqlQuery& q, const QString& topicName, qint64 defaultValue) const = 0;
};
virtual qint64 getMinimumSampleTime(NSqlQuery &q, const QString &topicName, qint64 defaultValue) const = 0;
};
} // namespace RecordReplay
Q_DECLARE_INTERFACE(RecordReplay::RecordReplayPlugin, "special:3:recordreplay")
@@ -6,16 +6,16 @@
namespace StylePlugin
{
class Plugin
{
Q_GADGET
class Plugin
{
Q_GADGET
public:
virtual ~Plugin() = default;
virtual void loadStyle(bool highDpi) = 0;
virtual void unloadStyle() = 0;
};
};
} // namespace StylePlugin
@@ -10,122 +10,104 @@ class QWidget;
namespace TopicEditorBase
{
class ExportNotifier;
class ExportNotifier;
}
namespace TopicReplay
{
class Interface
{
class Interface
{
public:
static QJsonObject timeRange(qint64 start, qint64 end)
{
return {{QStringLiteral("start"), start}, {QStringLiteral("end"), end}};
}
static QJsonObject timeRange(qint64 start, qint64 end) { return {{QStringLiteral("start"), start}, {QStringLiteral("end"), end}}; }
struct SituationReplayTime
{
int id = 0;
int id = 0;
qint64 topicStart_s = -1;
qint64 topicEnd_s = -1;
qint64 topicStart_s = -1;
qint64 topicEnd_s = -1;
qint64 replayStart_ms = -1;
qint64 replayEnd_ms = -1;
double replaySpeedFactor = 1;
qint64 replayStart_ms = -1;
qint64 replayEnd_ms = -1;
double replaySpeedFactor = 1;
QJsonObject toReplayInformation() const
{
return {
{QStringLiteral("id"), id},
{QStringLiteral("timeInPresentation"), timeRange(topicStart_s * 1000, topicEnd_s * 1000)},
};
}
QJsonObject toReplayInformation() const
{
return {
{QStringLiteral("id"), id},
{QStringLiteral("timeInPresentation"), timeRange(topicStart_s * 1000, topicEnd_s * 1000)},
};
}
QJsonObject toPlaybackTime(double max) const
{
QJsonObject ret = timeRange(replayStart_ms, std::min(replayEnd_ms * replaySpeedFactor, max));
ret[QStringLiteral("replaySpeedFactor")] = replaySpeedFactor;
return ret;
}
QJsonObject toPlaybackTime(double max) const
{
QJsonObject ret = timeRange(replayStart_ms, std::min(replayEnd_ms * replaySpeedFactor, max));
ret[QStringLiteral("replaySpeedFactor")] = replaySpeedFactor;
return ret;
}
QJsonObject toJson(double maxReplayEndMs) const
{
return {
{QStringLiteral("playbackTime"), toPlaybackTime(maxReplayEndMs)},
{QStringLiteral("replayInformation"), toReplayInformation()},
};
}
QJsonObject toJson(double maxReplayEndMs) const
{
return {
{QStringLiteral("playbackTime"), toPlaybackTime(maxReplayEndMs)},
{QStringLiteral("replayInformation"), toReplayInformation()},
};
}
};
Interface() = default;
virtual ~Interface() = default;
virtual QWidget* createWidget()
{
return nullptr;
}
virtual QWidget *createWidget() { return nullptr; }
virtual bool playbackInit(const QJsonObject& attributes)
virtual bool playbackInit(const QJsonObject &attributes)
{
Q_UNUSED(attributes);
return true;
Q_UNUSED(attributes);
return true;
}
virtual bool playbackStart(int secondsOffset)
{
Q_UNUSED(secondsOffset);
return true;
Q_UNUSED(secondsOffset);
return true;
}
virtual bool playbackPause()
virtual bool playbackPause() { return true; }
virtual bool playbackStop() { return true; }
virtual void setExportPlaybackTimes(qint64 startTimeSec, qint64 durationSec, const QVector<SituationReplayTime> &sitReplayTimes)
{
return true;
Q_UNUSED(startTimeSec);
Q_UNUSED(durationSec);
Q_UNUSED(sitReplayTimes);
}
virtual bool playbackStop()
virtual bool exportTopic(const QJsonObject &attributes, const QString &strFolderPath, TopicEditorBase::ExportNotifier *pExportNotifier) = 0;
virtual QVector<TopicEditorBase::TopicData> additionalTrackEntries(const QJsonObject &attributes) const
{
return true;
Q_UNUSED(attributes);
return {};
}
virtual void setExportPlaybackTimes(qint64 startTimeSec, qint64 durationSec,
const QVector<SituationReplayTime>& sitReplayTimes)
virtual QVector<TopicEditorBase::TopicData> additionalTrackEntries(const QJsonObject &attributes, bool &keepOriginalTopic) const
{
Q_UNUSED(startTimeSec);
Q_UNUSED(durationSec);
Q_UNUSED(sitReplayTimes);
keepOriginalTopic = true;
return additionalTrackEntries(attributes);
}
virtual bool exportTopic(const QJsonObject& attributes, const QString& strFolderPath,
TopicEditorBase::ExportNotifier* pExportNotifier) = 0;
virtual void setBasePath(const QString &basePath) { Q_UNUSED(basePath); }
};
virtual QVector<TopicEditorBase::TopicData> additionalTrackEntries(const QJsonObject& attributes) const
{
Q_UNUSED(attributes);
return {};
}
virtual QVector<TopicEditorBase::TopicData> additionalTrackEntries(const QJsonObject& attributes,
bool& keepOriginalTopic) const
{
keepOriginalTopic = true;
return additionalTrackEntries(attributes);
}
virtual void setBasePath(const QString& basePath)
{
Q_UNUSED(basePath);
}
};
class Factory
{
class Factory
{
public:
virtual ~Factory() = default;
virtual Interface* createInterface(TopicEditorBase::TopicType topicType) = 0;
};
virtual Interface *createInterface(TopicEditorBase::TopicType topicType) = 0;
};
} // namespace TopicReplay