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>
107 lines
2.7 KiB
HTML
107 lines
2.7 KiB
HTML
<!DOCTYPE HTML>
|
|
<meta charset="utf-8" />
|
|
<meta name="viewport" content="initial-scale=1,maximum-scale=1,user-scalable=no">
|
|
|
|
<html>
|
|
|
|
<head>
|
|
|
|
<title>MapView</title>
|
|
<link rel="stylesheet" href="https://js.arcgis.com/4.7/esri/css/main.css">
|
|
<link rel="stylesheet" href="MapViewStyle.css">
|
|
<script src="https://js.arcgis.com/4.7/"></script>
|
|
<!--<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>-->
|
|
<script src="MapView2.0.js"></script>
|
|
<!-- 192.168.133.140: -->
|
|
|
|
</head>
|
|
|
|
<body>
|
|
|
|
<hr>
|
|
|
|
<div id="header">
|
|
|
|
<table>
|
|
<tr>
|
|
<td>
|
|
ISM:
|
|
</td>
|
|
<td>
|
|
<form>
|
|
<input type="text" value="" id="ipadresse" />
|
|
</form>
|
|
</td>
|
|
<td>
|
|
<form>
|
|
<input type="text" value="" id="port" />
|
|
</form>
|
|
</td>
|
|
<td></td>
|
|
<td></td>
|
|
<td>
|
|
<button onclick="reconnect()">Reconnect</button>
|
|
</td>
|
|
<td>
|
|
<div id="Serverconnect">
|
|
<font color="red">
|
|
Server: not connected
|
|
</font>
|
|
</div>
|
|
</td>
|
|
|
|
</tr>
|
|
<tr>
|
|
<td>
|
|
SendPos:
|
|
</td>
|
|
<td>
|
|
<form>
|
|
<input type="text" value="" id="ipadresseSendPos" />
|
|
</form>
|
|
</td>
|
|
|
|
<td>
|
|
<form>
|
|
<input type="text" value="" id="portSendPos" />
|
|
</form>
|
|
</td>
|
|
<td>
|
|
EquipNr.:
|
|
</td>
|
|
<td>
|
|
<form>
|
|
<input type="text" value="" id="equipmentNumber" placeholder="EqNr">
|
|
</form>
|
|
</td>
|
|
<td>
|
|
<button onclick="connectSendPos()">Connect</button>
|
|
</td>
|
|
<td>
|
|
<div id="SendPosServerconnect">
|
|
<font color="red">
|
|
Server: not connected
|
|
</font>
|
|
</div>
|
|
</td>
|
|
</tr>
|
|
</table>
|
|
|
|
</div>
|
|
|
|
<hr>
|
|
|
|
<div id="layersAndAssets">
|
|
<h1>Layers</h1>
|
|
<div id="layers">
|
|
</div>
|
|
<h1>Types of Assets</h1>
|
|
<div id="AssetTypesDiv">
|
|
Lädt..
|
|
</div>
|
|
</div>
|
|
|
|
<div id="mapDiv">
|
|
</div>
|
|
|
|
</body> |