Qt6 Migration: Complete migration with DDS/RTI support and build validation
Major Changes:
- Merged latest Qt5 devel content from dlbo (292 files changed, 7 new dirs)
- Consolidated forward-declarations and include folders
- Removed unneeded modules per Niklas' repo check list
Build System Fixes:
- Fixed CMake VERSION_GREATER syntax in ParticipantManagement/CMakeLists.txt
- Added VLC packages (libvlc-dev, vlc-plugin-base) to docker_build.sh
- Added PostgreSQL dev packages (libpq-dev, postgresql-server-dev-all) to Dockerfile
- Fixed locale warnings (ANSI_X3.4-1968 → C.UTF-8)
- Fixed ArcGIS SDK path warnings when BUILD_ARCGIS=OFF
Code Generation Fixes:
- Fixed IDL enum collisions (PortType→CorePortType/DdsutPortType, PdmEventType)
- Fixed Grantlee template svc_translation.cpp.grantlee:
- Changed {{ idl_enum.name }}_def:: to {{ idl_enum.name }}::
- Fixed .underlying() calls for C++11 scoped enums (enum class)
- Removed generated files from repo (moc_*, *_dtc.h, *_ftc.h)
Validation:
- BUILD_RTI=ON: SUCCESS
- BUILD_RTI=OFF: SUCCESS
- C++17 standard maintained for RTI 7.7 compatibility
- Ubuntu 26.04 Docker environment verified
Remaining Warnings (expected):
- BgViewer, KDChart, KDReports, Poppler-Qt6 not found (optional features)
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
18662 files changed
+4115092
-5435
No files matched your search
@@ -0,0 +1,86 @@
|
||||
// **************************************************************************
|
||||
//
|
||||
// (C) Copyright 2009 Swiss SIMTEC AG
|
||||
//
|
||||
// **************************************************************************
|
||||
//
|
||||
// $HeadURL$
|
||||
// $LastChangedBy$
|
||||
// $LastChangedDate$
|
||||
// $LastChangedRevision$
|
||||
//
|
||||
// **************************************************************************
|
||||
|
||||
// manual class headers
|
||||
#include "LogViewDateTimeEdit.hpp"
|
||||
#include <time.h>
|
||||
#include "LogViewField.hpp"
|
||||
#include "LogViewTelegram.hpp"
|
||||
|
||||
namespace N_LogView
|
||||
{
|
||||
|
||||
// ---------------------------------------------------------------
|
||||
LogViewDateTimeEdit::LogViewDateTimeEdit(LogViewField* a_field, QWidget* a_parent, const bool a_readonly)
|
||||
: QDateTimeEdit(a_parent)
|
||||
, LogViewWidget(a_field, this, a_parent, a_readonly)
|
||||
{
|
||||
if (a_readonly)
|
||||
{
|
||||
setReadOnly(true);
|
||||
setAlignment(a_field->isRightAligned() ? Qt::AlignRight : Qt::AlignLeft);
|
||||
}
|
||||
|
||||
// date-time-field
|
||||
qint64 unixTime = 0;
|
||||
if (a_field->hasContent())
|
||||
{
|
||||
if (a_field->isMSecsField())
|
||||
unixTime = a_field->value(0, true).toLongLong();
|
||||
else
|
||||
unixTime = a_field->value(0, true).toInt() * 1000LL;
|
||||
}
|
||||
// take actual date and time if time is 0
|
||||
if (0 == unixTime && !a_readonly)
|
||||
unixTime = ::time(nullptr) * 1000LL;
|
||||
|
||||
//valueWidget = new QDateTimeEdit(dateTime);
|
||||
setDateTime(QDateTime::fromMSecsSinceEpoch(unixTime));
|
||||
setDisplayFormat(QLatin1String("dd MMM yyyy hh:mm:ss"));
|
||||
setCalendarPopup(true);
|
||||
updateToolTip(QString::number(unixTime));
|
||||
//setToolTip(a_field->getToolTipText());
|
||||
// checkAndOvertakeContent();
|
||||
|
||||
connect(this, &LogViewDateTimeEdit::editingFinished,
|
||||
this, &LogViewDateTimeEdit::checkAndOvertakeContent);
|
||||
}
|
||||
|
||||
|
||||
// ---------------------------------------------------------------
|
||||
void LogViewDateTimeEdit::checkAndOvertakeContent()
|
||||
{
|
||||
updateToolTip(QString::number(dateTime().toMSecsSinceEpoch() / 1000));
|
||||
}
|
||||
|
||||
|
||||
// ---------------------------------------------------------------
|
||||
// Writes the content into telegram.
|
||||
// Returns true if successful.
|
||||
// ---------------------------------------------------------------
|
||||
bool LogViewDateTimeEdit::saveContent(LogViewTelegram* a_telegram)
|
||||
{
|
||||
if (a_telegram->isJsonTelegram())
|
||||
{
|
||||
a_telegram->setJsonValue(m_Field->jsonPath(), dateTime().toMSecsSinceEpoch());
|
||||
}
|
||||
else
|
||||
{
|
||||
a_telegram->setNextFieldAsGpsTimeField(); // fixme: muss noch der feldname auf GPS Zeit geprüft werden?
|
||||
a_telegram->setUIntX(getSize(), dateTime().toMSecsSinceEpoch() / 1000);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
} // namespace N_LogView
|
||||
|
||||
Reference in new issue
Block a user