torstenandCopilot
7173785915
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>
33 lines
1.8 KiB
SQL
33 lines
1.8 KiB
SQL
-- # $Id$
|
|
-- # $HeadURL$
|
|
-- # $Author$
|
|
|
|
-- Training areas
|
|
-- 32U PC 60000 93000 = 0.1980012521, 0.9121803169
|
|
INSERT INTO asm.asm_training_area(id, name, bottom_left_x, bottom_left_y, height, width) VALUES (2, 'Altmark', 0.1980012521, 0.9121803169, 40000, 30000);
|
|
|
|
-- 32U MD 8800000 7500000 = 8.8210891905, 53.0244018451 ( 0.1539570500, 0.9254503961 )
|
|
INSERT INTO asm.asm_training_area(id, name, bottom_left_x, bottom_left_y, height, width) VALUES (6, 'Bremen', 0.1539570500, 0.9254503961, 12800, 12800);
|
|
|
|
ALTER SEQUENCE asm.asm_training_area_id_seq RESTART WITH 7;
|
|
|
|
-- Locations
|
|
INSERT INTO asm.asm_location(id, name, description) VALUES (1, 'Auswertung', 'Raum Auswertung');
|
|
INSERT INTO asm.asm_location(id, name, description) VALUES (2, 'Leitung', 'Raum Leitung');
|
|
INSERT INTO asm.asm_location(id, name, description) VALUES (3, 'Überwachung', 'Raum Überwachung/Auswertung');
|
|
INSERT INTO asm.asm_location(id, name, description) VALUES (4, 'DV Steuerung', 'Raum DV Steuerung');
|
|
INSERT INTO asm.asm_location(id, name, description) VALUES (5, 'Regie', 'Regiefahrzeuge / Regieräume');
|
|
INSERT INTO asm.asm_location(id, name, description) VALUES (6, 'Wache', 'Wache Eingang');
|
|
INSERT INTO asm.asm_location(id, name, description) VALUES (7, 'Ausbilder', 'Ausbilder');
|
|
|
|
ALTER SEQUENCE asm.asm_location_id_seq RESTART WITH 8;
|
|
|
|
-- Workstations: TODO
|
|
INSERT INTO asm.asm_asset(id, name, asset_type_id, location_id) VALUES (1, 'EXCOWS01', 1, 1);
|
|
INSERT INTO asm.asm_asset(id, name, asset_type_id, location_id) VALUES (2, 'EXCOWS02', 1, 1);
|
|
INSERT INTO asm.asm_asset(id, name, asset_type_id, location_id) VALUES (3, 'EXCOWS03', 1, 1);
|
|
INSERT INTO asm.asm_asset(id, name, asset_type_id, location_id) VALUES (4, 'EXCOWS04', 1, 1);
|
|
INSERT INTO asm.asm_asset(id, name, asset_type_id, location_id) VALUES (5, 'EXCOWS05', 1, 1);
|
|
|
|
ALTER SEQUENCE asm.asm_asset_id_seq RESTART WITH 100;
|