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>
52 lines
2.6 KiB
C++
52 lines
2.6 KiB
C++
/**
|
|
* @RDE_HEADER@
|
|
* Solely purpose is to form strings to fit the Axis API Syntax
|
|
* $Id$
|
|
* $HeadURL$
|
|
* $Author$
|
|
* Created by Terrell Scharfenberg, SLSE, 2016-05-27
|
|
*/
|
|
#include "request.h"
|
|
|
|
using namespace VapixConfig;
|
|
|
|
QString Request::updateImageParams(const QMap<QString, QString> &imageMap, const QString &ipAddress)
|
|
{
|
|
QString updateString = QLatin1String("http://") + ipAddress + QLatin1String("/axis-cgi/admin/param.cgi?action=update&group=Image.I0.Appearance");
|
|
for (auto iterator = imageMap.begin(); iterator != imageMap.end(); ++iterator)
|
|
updateString.append(QLatin1Char('.') + iterator.key() + QLatin1Char('=') + iterator.value());
|
|
return updateString;
|
|
}
|
|
|
|
QString Request::addEventServer(const QMap<QString, QString> &serverMap, const QString &ipAddress)
|
|
{
|
|
QString updateString = QLatin1String("http://") + ipAddress + QLatin1String("/axis-cgi/admin/param.cgi?action=add&group=EventServers.TCP&template=tcp_config");
|
|
for (auto iterator = serverMap.begin(); iterator != serverMap.end(); ++iterator)
|
|
updateString.append(QLatin1String("&EventServers.TCP.T.") + iterator.key() + QLatin1Char('=') + iterator.value());
|
|
return updateString;
|
|
}
|
|
|
|
QString Request::addEvent(const QMap<QString, QString> &eventMap, const QString &ipAddress)
|
|
{
|
|
QString updateString = QLatin1String("http://") + ipAddress + QLatin1String("/axis-cgi/admin/param.cgi?action=add&group=Event&template=event");
|
|
for (auto iterator = eventMap.begin(); iterator != eventMap.end(); ++iterator)
|
|
updateString.append(QLatin1String("&Event.E.") + iterator.key() + QLatin1Char('=') + iterator.value());
|
|
return updateString;
|
|
}
|
|
|
|
QString Request::addActionToEvent(const QMap<QString, QString> &actionMap, int eventID, const QString &ipAddress)
|
|
{
|
|
QString updateString = QLatin1String("http://") + ipAddress + QLatin1String("/axis-cgi/admin/param.cgi?action=add&group=Event.E") + QString::number(eventID) + QLatin1String(".Actions&template=tcpaction");
|
|
for (auto iterator = actionMap.begin(); iterator != actionMap.end(); ++iterator)
|
|
updateString.append(QLatin1String("&Event.E") + QString::number(eventID) + QLatin1String(".Actions.A.") + iterator.key() + QLatin1Char('=') + iterator.value());
|
|
return updateString;
|
|
}
|
|
|
|
QString Request::addMotionWindow(const QMap<QString, QString> &windowMap, const QString &ipAddress)
|
|
{
|
|
QString updateString = QLatin1String("http://") + ipAddress + QLatin1String("/axis-cgi/admin/param.cgi?action=add&group=Motion&template=motion");
|
|
for (auto iterator = windowMap.begin(); iterator != windowMap.end(); ++iterator)
|
|
updateString.append(QLatin1String("&Motion.M.") + iterator.key() + QLatin1Char('=') + iterator.value());
|
|
return updateString;
|
|
}
|