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,105 @@
|
||||
|
||||
|
||||
<!--
|
||||
var exampleSocket;
|
||||
var firstMsg = true;
|
||||
var textBoxArr = [];
|
||||
var SelBranchVal = "";
|
||||
var connectedToServer = false;
|
||||
|
||||
function WebSocketTest()
|
||||
{
|
||||
if ("WebSocket" in window)
|
||||
{
|
||||
if(!connectedToServer)
|
||||
{
|
||||
var ipadresse=document.getElementById("ipadresse").value;
|
||||
console.log("ipadresse="+ipadresse);
|
||||
exampleSocket = new WebSocket(ipadresse);
|
||||
}
|
||||
exampleSocket.onopen = function()
|
||||
{
|
||||
document.getElementById("Serverconnect").innerHTML = "Server: connected";
|
||||
document.getElementById("Serverconnect").style.color = "green"
|
||||
connectedToServer = true;
|
||||
};
|
||||
|
||||
exampleSocket.onmessage = function (event)
|
||||
{
|
||||
var msg = JSON.parse(event.data);
|
||||
console.log("onmessage:"+msg.type);
|
||||
document.getElementById("JsomMessages").innerHTML = "onmessage ="+msg.type;
|
||||
switch(msg.type) {
|
||||
case "BsmTriggerFlashlight":
|
||||
console.log("BsmTriggerFlashlight");
|
||||
//document.getElementById("WlsStateReport").innerHTML = JSON.stringify(msg);
|
||||
|
||||
handleBsmTriggerFlashlight(msg);
|
||||
|
||||
break;
|
||||
case "SetDamageState":
|
||||
break;
|
||||
|
||||
case "SetFortifyFactor":
|
||||
break;
|
||||
|
||||
default:
|
||||
document.getElementById("JsomMessages").innerHTML = "unknown Json Message = "+msg.type;
|
||||
break;
|
||||
}
|
||||
|
||||
};
|
||||
|
||||
exampleSocket.onclose = function()
|
||||
{
|
||||
// websocket is closed.
|
||||
document.getElementById("Serverconnect").innerHTML = "Server: not connected";
|
||||
document.getElementById("Serverconnect").style.color = "red";
|
||||
|
||||
};
|
||||
}
|
||||
|
||||
else
|
||||
{
|
||||
// The browser doesn't support WebSocket
|
||||
alert("WebSocket is NOT supported by your Browser!");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
function sendSensorId(id)
|
||||
{
|
||||
console.log ("sendSensorId");
|
||||
console.log ("sensorId="+sensorId.value);
|
||||
var sensorIdNr = Number(sensorId.value);
|
||||
var msg = JSON.stringify({
|
||||
type: "BsmTriggerFlashlight"
|
||||
});
|
||||
console.log (msg);
|
||||
exampleSocket.send(JSON.stringify({
|
||||
type: "BsmTriggerFlashlight",
|
||||
data:{
|
||||
sensorId: sensorIdNr
|
||||
}
|
||||
}));
|
||||
|
||||
}
|
||||
|
||||
function handleBsmTriggerFlashlight(msg)
|
||||
{
|
||||
var table = "";
|
||||
table += "<tr><th>BsmTriggerFlashlight</th>";
|
||||
table += "<th>sensorId</th></tr>";
|
||||
|
||||
/*for (var row = 0; row < msg.wlsStates.length; row++) {
|
||||
table += "<tr>";
|
||||
table += "<td>"+msg.wlsStates[row].equipmentNumber+"</td>";
|
||||
table += "<td>"+msg.wlsStates[row].tagId+"</td>";
|
||||
table += "<td>"+msg.wlsStates[row].inBlockedArea+"</td>";
|
||||
table += "<td>"+msg.wlsStates[row].relativePosition.gpsOn+"</td>";
|
||||
table += "<td>"+msg.wlsStates[row].wlsZone+"</td>";
|
||||
table += "<td>"+msg.wlsStates[row].tacticalState+"</td>";
|
||||
table +="</tr>";
|
||||
}
|
||||
document.querySelector('#WlsStateTable').innerHTML =table;*/
|
||||
}
|
||||
Reference in new issue
Block a user