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,84 @@
|
||||
#include "tools.h"
|
||||
|
||||
#include <math.h>
|
||||
|
||||
|
||||
namespace LtsScriptTimeline
|
||||
{
|
||||
//int Tools::m_timelineLength = 5*60; // minimum len
|
||||
//float Tools::m_zoomFactor = 1;
|
||||
//int Tools::m_scrollPos = 0;
|
||||
//int Tools::m_paintWidth = 1; // rescue from possible 0-div
|
||||
|
||||
|
||||
int Tools::getLength(int startTime, int duration)
|
||||
{
|
||||
return /*std::abs*/ (getPos(startTime + duration) - getPos(startTime));
|
||||
}
|
||||
|
||||
|
||||
int Tools::getDuration(int duration) // px => time
|
||||
{
|
||||
double max = Tools::m_timelineLength;
|
||||
max /= Tools::m_zoomFactor;
|
||||
|
||||
int paintWidth = m_paintWidth; // => 350px
|
||||
|
||||
double x = duration; // => 466
|
||||
x /= paintWidth; // => 466 / 350px = 1,33
|
||||
x *= max; // => 1,33 * 300 = 400
|
||||
|
||||
return lrint(x);
|
||||
}
|
||||
|
||||
|
||||
int Tools::getTime(int pos, bool neutral) // px => time
|
||||
{
|
||||
double visibleMax = Tools::m_timelineLength;
|
||||
visibleMax /= Tools::m_zoomFactor;
|
||||
|
||||
if (!neutral)
|
||||
visibleMax += Tools::m_scrollPos;
|
||||
|
||||
int visibleMin = 0;
|
||||
|
||||
if (!neutral)
|
||||
visibleMin = Tools::m_scrollPos;
|
||||
|
||||
double diff = visibleMax - visibleMin; // => 500 - 200 = 300
|
||||
int paintWidth = m_paintWidth; // => 350px
|
||||
|
||||
double x = pos; // => 466
|
||||
x /= paintWidth; // => 466 / 350px = 1,33
|
||||
x *= diff; // => 1,33 * 300 = 400
|
||||
x += visibleMin; // => 400 + 0
|
||||
|
||||
return lrint(x);
|
||||
}
|
||||
|
||||
|
||||
int Tools::getPos(int time, bool neutral) // time => px
|
||||
{
|
||||
double visibleMax = Tools::m_timelineLength;
|
||||
visibleMax /= Tools::m_zoomFactor;
|
||||
|
||||
if (!neutral)
|
||||
visibleMax += Tools::m_scrollPos;
|
||||
|
||||
int visibleMin = 0;
|
||||
|
||||
if (!neutral)
|
||||
visibleMin = Tools::m_scrollPos;
|
||||
|
||||
double diff = visibleMax - visibleMin; // => 500 - 200 = 300
|
||||
int paintWidth = m_paintWidth; // => 350px
|
||||
|
||||
double x = time; // => 400
|
||||
x -= visibleMin; // => 400 - 0 = 400
|
||||
x /= diff; // => 400 / 300 = 1,333
|
||||
x *= paintWidth; // => 1,333 * 350px = 466,666
|
||||
|
||||
return lrint(x);
|
||||
}
|
||||
|
||||
} // namespace LtsScriptTimeline
|
||||
Reference in new issue
Block a user