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>
28 lines
936 B
Python
Executable File
28 lines
936 B
Python
Executable File
import reader
|
|
import cmdw
|
|
import gpxcon
|
|
import comment
|
|
|
|
# nutzer kann die daten eingeben
|
|
|
|
num = str(input(' 1 = result.txt\n 2 = event_result.txt\n --> '))
|
|
num_ = str(input(' 1 = neue Datei\n 2 = Datei erweitern\n --> '))
|
|
comment.statement(num)
|
|
|
|
# Entscheidet ob eine Datei erstellt oder erweitert wird
|
|
|
|
if num == '1':
|
|
cmdw.run_command('psql lts_ets_pro -f statement.spl > result.txt') #participant_id, sample_time, pos_lon*180/3.14159265359, pos_lat*180/3.14159265359, pos_z where participant_id = 16 order by sample_time
|
|
data = reader.sort('result.txt')
|
|
gpxcon.file_typ(data,num_,num)
|
|
print(data)
|
|
elif num == '2':
|
|
cmdw.run_command('psql lts_ets_pro -f statement.spl > result.txt') # id,event_type_id,participant_id,party_id,equipment_number,sample_time,position_x,position_y,position_z
|
|
data = reader.sort('result.txt')
|
|
gpxcon.file_typ(data,num_,num)
|
|
print(data)
|
|
else:
|
|
print('1 or 2!!!')
|
|
|
|
|