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>
68 lines
1.2 KiB
C++
68 lines
1.2 KiB
C++
/**
|
|
* @RDE_HEADER@
|
|
* FillStyle
|
|
* $Id$
|
|
* $HeadURL$
|
|
* $Author$
|
|
*/
|
|
|
|
// Own
|
|
#include "fill_style.h"
|
|
|
|
|
|
// ESRI
|
|
|
|
|
|
namespace SituationMap
|
|
{
|
|
|
|
|
|
FillStyle::FillStyle(const QColor &fillColor, FillPattern fillPattern)
|
|
: m_fillColor(fillColor)
|
|
, m_fillPattern(fillPattern)
|
|
{
|
|
}
|
|
|
|
FillStyle::FillStyle(FillPattern fillPattern)
|
|
: m_fillPattern(fillPattern)
|
|
{
|
|
}
|
|
|
|
QColor FillStyle::fillColor() const
|
|
{
|
|
return m_fillColor;
|
|
}
|
|
|
|
void FillStyle::setFillColor(const QColor &fillColor)
|
|
{
|
|
m_fillColor = fillColor;
|
|
}
|
|
SituationMap::FillPattern FillStyle::fillPattern() const
|
|
{
|
|
return m_fillPattern;
|
|
}
|
|
|
|
void FillStyle::setFillPattern(const SituationMap::FillPattern &fillPattern)
|
|
{
|
|
m_fillPattern = fillPattern;
|
|
}
|
|
|
|
|
|
|
|
//-----------------------------------------------------------------------------
|
|
// output operator:
|
|
//-----------------------------------------------------------------------------
|
|
std::ostream &operator<< (std::ostream &stream,
|
|
const FillStyle &value)
|
|
{
|
|
QString str;
|
|
str.append(QStringLiteral(" fillPattern='%1'").arg(static_cast<int>(value.fillPattern())));
|
|
str.append(QStringLiteral(" fillColor='%1'").arg(value.fillColor().name(QColor::HexArgb)));
|
|
|
|
stream << str.toStdString();
|
|
return stream;
|
|
}
|
|
|
|
|
|
} // namespace SituationMap
|