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>
223 lines
5.7 KiB
HTML
223 lines
5.7 KiB
HTML
<!DOCTYPE html>
|
|
<html ng-app="main">
|
|
|
|
<head>
|
|
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
|
<meta charset="utf-8" />
|
|
<link rel="stylesheet" href="leaflet.css" />
|
|
<link rel="stylesheet" href="style.css" />
|
|
<script src="architect://architect.js"></script>
|
|
</head>
|
|
|
|
<body ng-controller="ctrl">
|
|
<div id="main" ng-hide="html.disableInput || ar.enabled">
|
|
<div id="mapContainer">
|
|
<div id="map"></div>
|
|
</div>
|
|
<div id="menu">
|
|
<!-- <div>
|
|
<input type="button" value="Connect Footprint manually" id="connectFootprintbtn">
|
|
</div>
|
|
<hr>-->
|
|
<h1>Positioning (Justus-Tool)</h1>
|
|
<table id="positioning-form">
|
|
<tr>
|
|
<td>
|
|
Equipment Number:
|
|
</td>
|
|
<td>
|
|
<input id="eqNoInput" type="number" ng-model="tracking.equipmentNumber" ng-disabled="tracking.isTracking"/>
|
|
</td>
|
|
<td rowspan="2">
|
|
<span ng-show="tracking.lat">{{ tracking.lat }}</span>
|
|
<br />
|
|
<span ng-show="tracking.lon">{{ tracking.lon }}</span>
|
|
<br />
|
|
<span ng-show="tracking.alt">{{ tracking.alt }}</span>
|
|
</td>
|
|
</tr>
|
|
<tr>
|
|
<td>
|
|
<button id="trackingBtn" ng-click="tracking.startTracking()" ng-disabled="!tracking.equipmentNumber" ng-hide="tracking.isTracking">Track</button>
|
|
<button ng-click="tracking.stopTracking()" ng-show="tracking.isTracking">Stop</button>
|
|
</td>
|
|
<td>
|
|
<div ng-hide="tracking.msg">
|
|
<a href ng-show="tracking.isTracking && tracking.tracked"
|
|
ng-click="tracking.showCurrentPos()">Show current position</a>
|
|
<span ng-show="tracking.isTracking && !tracking.tracked">Waiting for first position
|
|
update...</span>
|
|
</div>
|
|
<div ng-show="tracking.msg">
|
|
{{ tracking.msg }}
|
|
</div>
|
|
</td>
|
|
</tr>
|
|
</table>
|
|
<hr />
|
|
<div>
|
|
<div id="layers">
|
|
<h1>
|
|
Layers
|
|
</h1>
|
|
<table>
|
|
<tr ng-repeat="layer in objects.layers">
|
|
<td>
|
|
<input type="checkbox" ng-model="layer.Visible" ng-change="functions.updateView()"
|
|
id="{{ layer.Name }}" />
|
|
<label for="{{ layer.Name }}">
|
|
{{ layer.Name }}
|
|
</label>
|
|
</td>
|
|
</tr>
|
|
</table>
|
|
</div>
|
|
<div id="locations">
|
|
<h1>
|
|
Locations
|
|
</h1>
|
|
<table>
|
|
<tr ng-repeat="location in objects.locations">
|
|
<td>
|
|
<a href ng-click="functions.goToLocation(location.getBounds())">
|
|
{{ location.Name }}
|
|
</a>
|
|
</td>
|
|
</tr>
|
|
</table>
|
|
</div>
|
|
</div>
|
|
<hr />
|
|
<h1>
|
|
Asset type
|
|
</h1>
|
|
<select ng-options="asset as asset.Name for asset in objects.assets.available"
|
|
ng-model="objects.assets.selected" ng-change="functions.updateView()"></select>
|
|
<hr />
|
|
<h1>
|
|
Selected mounting points:
|
|
{{
|
|
(
|
|
objects.mountingPoints
|
|
| filter: functions.search(mountingPoint)
|
|
).length
|
|
}}
|
|
</h1>
|
|
<span ng-hide="
|
|
(objects.mountingPoints
|
|
| filter: functions.search(mountingPoint)
|
|
).length == 0 && !html.mpQuery
|
|
">
|
|
<input type="text" ng-model="html.mpQuery" placeholder="Search... (case sensitive)" />
|
|
<button ng-click="html.mpQuery = ''">
|
|
Clear
|
|
</button>
|
|
</span>
|
|
<br /><br />
|
|
<div id="mountingPointTable" ng-hide="
|
|
(objects.mountingPoints
|
|
| filter: functions.search(mountingPoint)
|
|
).length == 0
|
|
">
|
|
<table>
|
|
<tr>
|
|
<th>
|
|
Name
|
|
</th>
|
|
<th>
|
|
ID
|
|
</th>
|
|
<th>
|
|
Position
|
|
</th>
|
|
</tr>
|
|
<tr ng-repeat="mountingPoint in objects.mountingPoints | filter: functions.search(mountingPoint)">
|
|
<td>
|
|
<span ng-class="{ mounted: mountingPoint.MountedAsset != -1 }">
|
|
{{ mountingPoint.Name }}
|
|
</span>
|
|
</td>
|
|
<td>
|
|
{{ mountingPoint.Id }}
|
|
</td>
|
|
<td>
|
|
<button ng-click="functions.openPopup(mountingPoint)">
|
|
Show
|
|
</button>
|
|
</td>
|
|
</tr>
|
|
</table>
|
|
</div>
|
|
<hr />
|
|
<!-- <h1>Equipment Tracking</h1>
|
|
<div id="trackingMenu">
|
|
<div>
|
|
<div class ="ui-block-b">
|
|
<input type="text" placeholder="IP-Address:Port" id="ipaddresse" value="exctds01:12346"/>
|
|
</div>
|
|
<div>
|
|
<input type="number" placeholder="Equipmentnumber" id="equipmentNumber" name="equipmentNumber"/>
|
|
</div>
|
|
<div>
|
|
<label for="trackAll">Track All: </label>
|
|
<input type="checkbox" id="trackAll">
|
|
</div>
|
|
</div>
|
|
<div>
|
|
<div id="Serverconnect">
|
|
<font color="red">
|
|
Server: not connected
|
|
</font>
|
|
</div>
|
|
<div>
|
|
<input type="button" value="Connect" id="connectWls" />
|
|
<input type="button" value="Disconnect" id="disconnectWls"/>
|
|
</div>
|
|
</div>
|
|
</div> -->
|
|
<!-- <hr />
|
|
<h1>Custom Input</h1>
|
|
<div>
|
|
<label>Inputdata:</label>
|
|
<select id="datatype">
|
|
<option>UTM</option>
|
|
<option>MGRS</option>
|
|
<option selected>LongLat</option>
|
|
</select>
|
|
</div>
|
|
<br>
|
|
|
|
<div>
|
|
<input type="text" name="easting" id="field1" placeholder="Longitude">
|
|
</div>
|
|
<div>
|
|
<input type="text" name="northing" id="field2" placeholder="Latitude">
|
|
</div>
|
|
<div>
|
|
<input type="text" name="zoneNum" id="field3" style="display: none;">
|
|
</div>
|
|
<div>
|
|
<input type="text" name="zoneLetter" id="field4" style="display: none;">
|
|
</div>
|
|
<div>
|
|
<input type="button" value="Track Input" id="trackCI">
|
|
</div>
|
|
</div> -->
|
|
</div>
|
|
</div>
|
|
</div>
|
|
<div id="arMenu" ng-show="ar.enabled">
|
|
{{ ar.current }}
|
|
<br />
|
|
<button onclick="window.Functions.EndAr()">
|
|
Back
|
|
</button>
|
|
</div>
|
|
<div id="loadingContainer" ng-show="html.disableInput">
|
|
<progress id="loadingBar"></progress>
|
|
</div>
|
|
<script type="text/javascript" src="main.js"></script>
|
|
</body>
|
|
|
|
</html>
|