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>
113 lines
2.2 KiB
C++
113 lines
2.2 KiB
C++
/**
|
|
* @RDE_HEADER@
|
|
* FillStyle
|
|
* $Id$
|
|
* $HeadURL$
|
|
* $Author$
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
// Own
|
|
#include "situation_map_types.h"
|
|
#include <situation_map_export.h>
|
|
|
|
|
|
// Qt
|
|
#include <QColor>
|
|
|
|
|
|
//----------------------------------------------------------------------------
|
|
namespace SituationMap
|
|
{
|
|
|
|
|
|
|
|
|
|
//----------------------------------------------------------------------------
|
|
/**
|
|
* @brief The FillStyle class contains parameter to fill an area with color and pattern.
|
|
*/
|
|
class SITUATIONMAP_EXPORT FillStyle final
|
|
{
|
|
public:
|
|
|
|
/*! \name Construction, Destruction */
|
|
//@{
|
|
/**
|
|
* @brief Constructor
|
|
*/
|
|
FillStyle() = default;
|
|
|
|
/**
|
|
* @brief Constructor
|
|
*/
|
|
FillStyle(const QColor &fillColor, FillPattern fillPattern);
|
|
|
|
/**
|
|
* @brief Constructor
|
|
*/
|
|
explicit FillStyle(FillPattern fillPattern);
|
|
|
|
/**
|
|
* @brief Destructor
|
|
*/
|
|
~FillStyle() = default;
|
|
//@}
|
|
|
|
|
|
/** \name FillColor
|
|
* Set and get methods.
|
|
*/
|
|
//@{
|
|
QColor fillColor() const;
|
|
void setFillColor(const QColor &fillColor);
|
|
//@}
|
|
|
|
/** \name FillPattern
|
|
* Set and get methods.
|
|
*/
|
|
FillPattern fillPattern() const;
|
|
void setFillPattern(const FillPattern &fillPattern);
|
|
//@}
|
|
|
|
|
|
/**
|
|
* @brief operator== Compare two objects
|
|
* @param other to be compared with
|
|
* @return true if identical, otherwise false.
|
|
*/
|
|
bool operator==(const FillStyle &other) const
|
|
{
|
|
return ((this->m_fillColor == other.m_fillColor) &&
|
|
(this->m_fillPattern == other.m_fillPattern)
|
|
);
|
|
}
|
|
|
|
/**
|
|
* @brief operator!= Compare two objects
|
|
* @param other to be compared with
|
|
* @return true if NOT identical, otherwise false.
|
|
*/
|
|
bool operator!=(const FillStyle &other) const
|
|
{
|
|
return !(*this == other);
|
|
}
|
|
|
|
private:
|
|
QColor m_fillColor = QColor(125, 125, 125, 125); // gray
|
|
FillPattern m_fillPattern = FillPattern::Solid;
|
|
};
|
|
|
|
|
|
|
|
//-----------------------------------------------------------------------------
|
|
// output operator:
|
|
//-----------------------------------------------------------------------------
|
|
SITUATIONMAP_EXPORT std::ostream &operator<< (std::ostream &stream,
|
|
const FillStyle &value);
|
|
|
|
|
|
} // namespace SituationMap
|
|
|