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,62 @@
|
||||
import L, { LatLng } from "leaflet";
|
||||
|
||||
export default class Tracking
|
||||
{
|
||||
map: L.Map;
|
||||
popup = L.popup();
|
||||
msg: string;
|
||||
participant: L.Marker;
|
||||
popupLocation: L.LatLng;
|
||||
popupContent: HTMLElement;
|
||||
|
||||
constructor(input: L.Map, obj: string, marker: L.Marker){
|
||||
this.map = input;
|
||||
var viewPos = new L.LatLng(53.0528064472226, 8.89412999153137);
|
||||
this.msg = obj;
|
||||
this.participant = marker;
|
||||
var runIcon = new L.Icon({
|
||||
iconUrl: 'img/marker-run.png',
|
||||
shadowUrl: 'img/marker-shadow.png',
|
||||
iconSize: [25, 41],
|
||||
iconAnchor: [12, 41],
|
||||
popupAnchor: [1, 50],
|
||||
shadowSize: [0, 0]
|
||||
});
|
||||
var participant = new L.Marker(viewPos, {icon: runIcon}).on('click', this.onMarkerClick);
|
||||
this.popupLocation = new LatLng(0,0);
|
||||
this.popupContent = new HTMLElement();
|
||||
participant.addTo(this.map);
|
||||
}
|
||||
|
||||
onMarkerClick()
|
||||
{
|
||||
this.popup
|
||||
.setLatLng(this.popupLocation)
|
||||
.setContent(this.popupContent)
|
||||
.openOn(this.map);
|
||||
}
|
||||
|
||||
start()
|
||||
{
|
||||
console.log('<p class="message">Received: '+this.msg);
|
||||
|
||||
var newjobj = JSON.parse(this.msg);
|
||||
console.log(newjobj);
|
||||
if(newjobj.data.header.equipmentNumber == Number((<HTMLInputElement>document.getElementById("equipmentNumber")).value)){
|
||||
var jsonConv = '{"1": "NaN", "lat": ' + newjobj.data.geoPosition.lat/(Math.PI/180) + ', "lng": ' + newjobj.data.geoPosition.lon/(Math.PI/180) + '}';
|
||||
var convlatlng = JSON.parse(jsonConv);
|
||||
|
||||
this.participant.setLatLng( [convlatlng.lat, convlatlng.lng]);
|
||||
var markerlatlng = convlatlng
|
||||
markerlatlng.lat= convlatlng.lat+0.00002;
|
||||
this.popupLocation = markerlatlng;
|
||||
this.popupContent = document.createElement("<center>EquipmentNr: " + newjobj.data.header.equipmentNumber + "<br>"
|
||||
+ "BuildingID: " + newjobj.data.opsPosition.moutObjectId + "<br>"
|
||||
+ "RoomID: " + newjobj.data.opsPosition.moutRoomId + "</center>");
|
||||
this.popup
|
||||
.setLatLng(this.popupLocation)
|
||||
.setContent(this.popupContent)
|
||||
.openOn(this.map);
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user