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>
11 lines
1.1 KiB
Python
Executable File
11 lines
1.1 KiB
Python
Executable File
#!/usr/bin/python
|
|
# -*- coding: utf-8 -*-
|
|
|
|
# Participant Ids
|
|
# 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24
|
|
PPM1_participant_id = str(' 5, 6, 7, 8, 9, 12, 13, 14, 15, 16, 18, 19, 20, 21, 24, 25, 57, 58, 30, 31, 32, 52, 53, 54, 55, 90, 91, 92, 93, 95, 96, 97, 98').split(', ')
|
|
PPM1_type_id = str(' 55, 55, 55, 74, 74, 55, 55, 55, 55, 55, 78, 78, 57, 57, 27, 29, 54, 54, 77, 77, 78, 78, 78, 57, 57, 173, 173, 173, 173, 173, 173, 173, 173').split(', ')
|
|
PPM1_party_id = str(' 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 1, 3, 3, 3, 4, 4, 4, 4, 2, 2, 2, 2, 3, 3, 3, 3').split(', ')
|
|
PPM1_equip_no = str('1201, 1202, 1203, 1204, 1205, 1206, 1207, 1208, 1209, 1210, 3801, 3802, 4401, 4402, 3803, 4403, 2501, 2502, 2001, 2002, 2003, 2011, 2012, 2013, 2014, 0, 0, 0, 0, 0, 0, 0, 0').split(', ')
|
|
|