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>
120 lines
2.4 KiB
C++
120 lines
2.4 KiB
C++
/**
|
|
* @RDE_HEADER@
|
|
* Firing Timer, a helperclass for ExplosionCluster
|
|
* $Id$
|
|
* $HeadURL$
|
|
* $Author$
|
|
* Created by Norbert Thoden, ESVG, 2024-09-03
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include "aes_export.h"
|
|
#include "../logger.h"
|
|
|
|
#include <QObject>
|
|
#include <QString>
|
|
|
|
#include <iosfwd>
|
|
|
|
#define SUPPORT_STATE_CHANGE_DELAYED
|
|
|
|
|
|
namespace AreaEffectSimulation
|
|
{
|
|
|
|
class AES_COMMON_EXPORT FiringTimer : public QObject
|
|
{
|
|
Q_OBJECT
|
|
|
|
using BaseClass = QObject;
|
|
|
|
public:
|
|
|
|
enum class CMD
|
|
{
|
|
CMD_UNDEFINED,
|
|
CMD_START,
|
|
CMD_RESUME,
|
|
CMD_PAUSE,
|
|
CMD_EXPIRED,
|
|
CMD_EXPIRED_PLUS,
|
|
};
|
|
Q_ENUM(CMD);
|
|
|
|
|
|
enum class FiringMode
|
|
{
|
|
FM_Undefined = 0, //
|
|
FM_Prepared = 1, //
|
|
FM_Active = 2, //
|
|
FM_Paused = 3, //
|
|
FM_Expired = 4, //
|
|
FM_ExpiredPlus = 6 //
|
|
};
|
|
|
|
// ctor/dtor
|
|
explicit FiringTimer(const QString &debugInfo = QStringLiteral("FiringTimer"));
|
|
~FiringTimer();
|
|
|
|
void setDebugInfo(const QString &debugInfo);
|
|
|
|
// initialisation
|
|
bool init(long effectDurationMsec, int ammoCount, long ammoFlightDurationMsec);
|
|
void reset();
|
|
|
|
//
|
|
bool startFiring();
|
|
bool pauseFiring();
|
|
bool resumeFiring();
|
|
|
|
|
|
FiringMode currentFiringMode() const;
|
|
long ammoFlightDurationMsec() const;
|
|
int firedAmmoCount() const;
|
|
int nextAmmoToFire() const;
|
|
int remainingAmmoCount() const;
|
|
long intervallMsec() const;
|
|
|
|
|
|
QStringList getLogHistorie() const;
|
|
|
|
static QString toString(const CMD cmd);
|
|
|
|
public Q_SLOTS:
|
|
bool startFiringDelay(qint64 delayMsec);
|
|
|
|
Q_SIGNALS:
|
|
void firing(int currentFiringNumber, int totalAmmoCount);
|
|
void impact(int currentImpactNumber, int totalAmmoCount);
|
|
|
|
void firingFinished();
|
|
void firingFinishedPlus();
|
|
|
|
#ifdef SUPPORT_STATE_CHANGE_DELAYED
|
|
// Q_SIGNALS:
|
|
// void stateChangeDelayed(AreaEffectSimulation::FiringTimer::CMD cmd); // problems: Q_DECLARE_METATYPE and/or qRegisterMetatType... - grrrr
|
|
void stateChangeDelayedAsInt(int cmdAsInt, int firedAmmoCount);
|
|
public Q_SLOTS:
|
|
void emitStateChangeDelayed(FiringTimer::CMD cmd, int firedAmmoCount);
|
|
#endif // SUPPORT_STATE_CHANGE_DELAYED
|
|
|
|
protected Q_SLOTS:
|
|
void onFiringTimout();
|
|
void onFiringTimoutExpiredPlus();
|
|
|
|
|
|
private:
|
|
class Private;
|
|
|
|
Private *d;
|
|
LOGGER_T m_logger; ///< Interface of the Logging-Facility
|
|
};
|
|
|
|
AES_COMMON_EXPORT std::ostream &operator<< (std::ostream &stream, const FiringTimer::CMD value);
|
|
|
|
} // namespace AreaEffectSimulation
|
|
|
|
// at global scope
|
|
Q_DECLARE_METATYPE(AreaEffectSimulation::FiringTimer::CMD);
|