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>
90 lines
2.5 KiB
C++
90 lines
2.5 KiB
C++
/**
|
|
* @RDE_HEADER@
|
|
* Test ob sich ein Rechteck mit Wirkfeldformen überschneidet
|
|
* $Id$
|
|
* $HeadURL$
|
|
* $Author$
|
|
*/
|
|
|
|
#include "intersections.h"
|
|
#include "polygons.h"
|
|
|
|
#include <QtGui/QPolygonF>
|
|
#include <QtGui/QPainterPath>
|
|
|
|
namespace AreaEffectSimulation
|
|
{
|
|
namespace Intersections
|
|
{
|
|
|
|
static inline bool intersects(const QPolygonF &p1, const QPolygonF &p2)
|
|
{
|
|
QPainterPath pp1;
|
|
pp1.addPolygon(p1);
|
|
QPainterPath pp2;
|
|
pp2.addPolygon(p2);
|
|
return pp1.intersects(pp2);
|
|
}
|
|
|
|
bool nContamination(const Database::AesNContamination &awf,
|
|
const QPolygonF &poly)
|
|
{
|
|
return (intersects(Polygons::nContamination(awf), poly));
|
|
}
|
|
|
|
bool bcContamination(const Database::AesBCContamination &cwf,
|
|
ProjectDataManagement::VolatilityType volatilityType,
|
|
double expansionFactor,
|
|
const QDateTime ¤tTime,
|
|
const QPolygonF &poly)
|
|
{
|
|
return (intersects(Polygons::bcContamination(cwf, volatilityType, expansionFactor, currentTime), poly));
|
|
}
|
|
|
|
bool explosionSingle(const Database::AesExplosionSingle &es,
|
|
double chargeRadius,
|
|
const QPolygonF &poly)
|
|
{
|
|
return (intersects(Polygons::explosionSingle(es, chargeRadius), poly));
|
|
}
|
|
|
|
bool explosionArea(const Database::AesExplosionArea &ea,
|
|
const QPolygonF &poly)
|
|
{
|
|
return (intersects(Polygons::explosionArea(ea), poly));
|
|
}
|
|
|
|
bool mineArea(const QVector<Database::AesMineAreaSegment> &segments,
|
|
double width,
|
|
double density,
|
|
bool bIsCenterLine,
|
|
const QPolygonF &poly)
|
|
{
|
|
// if(!area.boundingRect.isEmpty() && !area.boundingRect.intersects(rect))
|
|
// return false;
|
|
|
|
return (intersects(Polygons::mineArea(segments, width, density, bIsCenterLine), poly));
|
|
}
|
|
|
|
QVector<int> mineIdsInCorridor(const Database::AesMineArea &area,
|
|
const QVector<Database::AesMineAreaSegment> &segments,
|
|
const QVector<QPolygonF> &corridorSegments)
|
|
{
|
|
QVector<int> minesIds;
|
|
const QVector<QPointF> singleMines = Polygons::minePositions(area, segments);
|
|
|
|
// Other possibility: Create total polygon by uniting corridor segments. But that may be less efficient.
|
|
for (const QPolygonF &corridorSegment : corridorSegments)
|
|
{
|
|
for (int i = 0; i < singleMines.size(); ++i)
|
|
{
|
|
if (corridorSegment.contains(singleMines[i]))
|
|
minesIds << i;
|
|
}
|
|
}
|
|
return minesIds;
|
|
}
|
|
|
|
} // Namespace
|
|
}
|