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
+32
@@ -0,0 +1,32 @@
|
||||
var formen = [{
|
||||
"type": "Feature",
|
||||
"properties": {
|
||||
"farbe": "red",
|
||||
"info": "BT 56"
|
||||
},
|
||||
"geometry": {
|
||||
"type": "Polygon",
|
||||
"coordinates": [[
|
||||
[ 8.896696195006372, 53.054442380171004], //Reihenfolge umgekehrt: LonLat
|
||||
[ 8.896603155881166, 53.05449229656882],
|
||||
[ 8.896517828106882, 53.054433855886636],
|
||||
[ 8.89661053195596 , 53.05438418124448]
|
||||
]]
|
||||
}
|
||||
}
|
||||
|
||||
];
|
||||
|
||||
L.geoJson(formen,{
|
||||
style: function(feature){
|
||||
return {weight: 1, color: feature.properties.farbe};
|
||||
},
|
||||
onEachFeature: onEachFeature
|
||||
}
|
||||
).addTo(map);
|
||||
|
||||
function onEachFeature(feature, layer) {
|
||||
if (feature.properties && feature.properties.info) {
|
||||
layer.bindPopup(feature.properties.info);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,50 @@
|
||||
var socket;
|
||||
var moutObjectId;
|
||||
var moutAreaId;
|
||||
|
||||
$(function() {
|
||||
|
||||
$("#connectWs").click(function() {
|
||||
connect();
|
||||
});
|
||||
|
||||
});
|
||||
|
||||
function connect(){
|
||||
var ipadresse=document.getElementById("ipadresse").value;
|
||||
console.log("ipadresse="+ipadresse);
|
||||
var host = "ws://"+ipadresse;
|
||||
console.log("connect "+ipadresse);
|
||||
try{
|
||||
socket = new WebSocket(host);
|
||||
console.log("connect state:" +socket.readyState);
|
||||
socket.onopen = function(){
|
||||
console.log("onopen: connect state:" +socket.readyState);
|
||||
document.getElementById("Serverconnect").innerHTML = "Server: connected";
|
||||
document.getElementById("Serverconnect").style.color = "green"
|
||||
}
|
||||
|
||||
socket.onmessage = function(msg){
|
||||
console.log('<p class="message">Received: '+msg.data);
|
||||
showPos(msg.data);
|
||||
}
|
||||
|
||||
socket.onclose = function(){
|
||||
console.log('<p class="event">Socket Status: '+socket.readyState+' (Closed)');
|
||||
document.getElementById("Serverconnect").innerHTML = "Server: not connected";
|
||||
document.getElementById("Serverconnect").style.color = "red"
|
||||
}
|
||||
|
||||
} catch(exception){
|
||||
console.log('<p>Error'+exception);
|
||||
}
|
||||
}
|
||||
|
||||
function showHideFunction() {
|
||||
var x = document.getElementById('inputmenu');
|
||||
if (x.style.display === 'none') {
|
||||
x.style.display = 'block';
|
||||
} else {
|
||||
x.style.display = 'none';
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,75 @@
|
||||
var map = L.map('map').setView([53.05445, 8.89671], 21);
|
||||
|
||||
|
||||
var greenIcon = new L.Icon({
|
||||
iconUrl: 'img/marker-green.png',
|
||||
shadowUrl: 'img/marker-shadow.png',
|
||||
iconSize: [25, 41],
|
||||
iconAnchor: [12, 41],
|
||||
popupAnchor: [1, -34],
|
||||
shadowSize: [41, 41]
|
||||
});
|
||||
|
||||
var runIcon = new L.Icon({
|
||||
iconUrl: 'img/marker-run.png',
|
||||
shadowUrl: 'img/marker-shadow.png',
|
||||
iconSize: [25, 41],
|
||||
iconAnchor: [12, 41],
|
||||
popupAnchor: [1, -34],
|
||||
shadowSize: [0, 0]
|
||||
});
|
||||
|
||||
var imageUrl = 'img/RDE2.jpg',
|
||||
imageBounds = [[53.0528064472226, 8.89412999153137], [53.056520842139, 8.90030980110168]];
|
||||
L.imageOverlay(imageUrl, imageBounds).addTo(map);
|
||||
|
||||
var imgUrl = 'img/BT56EtageUntengedreht.png',
|
||||
imgBounds = [[53.0543723254747, 8.89649673130739], [53.0545051794611, 8.89671656638611]];
|
||||
L.imageOverlay(imgUrl, imgBounds).addTo(map);
|
||||
|
||||
var lat;
|
||||
var lon;
|
||||
|
||||
var participants=[];
|
||||
|
||||
function showPos(msg) {
|
||||
var filter = $("#flip-1").prop("checked");
|
||||
var equipmentNumber = Number(document.getElementById("equipmentNumber").value);
|
||||
var pos = JSON.parse(msg);
|
||||
var show = false;
|
||||
if ((filter==true)&&(equipmentNumber==pos.data.equipmentNumber)){
|
||||
console.log("true");
|
||||
show = true;
|
||||
}
|
||||
if (filter==false){
|
||||
show = true;
|
||||
}
|
||||
console.log("show Pos:"+msg);
|
||||
|
||||
console.log(pos.type);
|
||||
if ((pos.type == "PositionReport") && show)
|
||||
{
|
||||
console.log(pos.data.equipmentNumber);
|
||||
console.log(pos.data.lat);
|
||||
console.log(pos.data.lon);
|
||||
lat=pos.data.lat*180/Math.PI;
|
||||
lon=pos.data.lon*180/Math.PI;
|
||||
if (!participants[pos.data.equipmentNumber])
|
||||
{
|
||||
participants[pos.data.equipmentNumber]=new L.marker([lat, lon],{icon: runIcon}).on('click', onMarkerClick2207);
|
||||
participants[pos.data.equipmentNumber].addTo(map).bindPopup("#"+pos.data.equipmentNumber).openPopup();
|
||||
console.log ("Neu:"+pos.data.equipmentNumber);
|
||||
}
|
||||
else
|
||||
{
|
||||
console.log ("Vorhanden:"+pos.data.equipmentNumber);
|
||||
participants[pos.data.equipmentNumber].setLatLng( [lat, lon]);
|
||||
console.log ("setlatlng="+lat+" equipmentNumber="+pos.data.equipmentNumber);
|
||||
}
|
||||
}
|
||||
}
|
||||
function onMarkerClick2207(e) {
|
||||
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user