berrux-dev
040bdd558f
Deletes the two stub-header trees (249 files) that shadowed the real
rtiddsgen-generated DDS headers, and removes every reference to them.
CMake (15 include-path entries):
root CMakeLists.txt include_directories(.../forward-declarations);
NGL_TARGET_INCLUDE_DIRECTORIES entries in 7 service CMakeLists
(ServiceManagement, SoundManagement, SituationMap, ScreenRecording,
SituationReplayManagement, SituationReplay, ServiceMonitor)
Source includes that resolved to the root-level stubs (only 2, repointed to the
module-prefixed generated headers the rest of the tree already uses):
Lts/Services/AreaEffectSimulation/object_charge_effect.h
<aes_dtc.h> -> <AreaEffectSimulation/aes_dtc.h>
Lts/Proxies/TrainingAreaBaseOC/websocket_handler.h
<taboc_dtc.h> -> <TrainingAreaBaseOC/taboc_dtc.h>
(generic_dtc_impl.h needs no change: its quote-include "generic_dtc.h"
resolves to the real Lts/DDS/DTC/generic_dtc.h in the same directory)
Tests:
tests/test_migration_stubs.cpp: remove the redundant root-level stub test
(AesDtcCompiles) - the module-prefixed AreaEffectSimulationDtcCompiles test
already exercises the same AreaEffectSimulation::Interface header.
tests/test_skl_dtc.cpp: delete (removed-module compile test, already filtered
out of the build) and remove its now-obsolete CMake list(FILTER) exclusion.
Validation: full rebuild (build4, make -j4 -k) with the removal - 0 new compile
errors vs the pre-existing base-state baseline (77 unique real-error signatures
identical to baseline; all 15 'No such file' headers pre-existing).
76 lines
2.0 KiB
C++
Executable File
76 lines
2.0 KiB
C++
Executable File
/**
|
|
* Object class for ChargeEffect
|
|
* $Id$
|
|
* $HeadURL$
|
|
* $Author$
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include <QObject>
|
|
|
|
#include "logger.h"
|
|
|
|
#include <DDS/Core/function_reply_object.h>
|
|
#include <aes_db.h>
|
|
#include <AreaEffectSimulation/aes_dtc.h>
|
|
#include <aes_ftc.h>
|
|
#include <AreaEffectSimulation/aes_enums.hpp>
|
|
|
|
class QTimer;
|
|
|
|
namespace AreaEffectSimulation
|
|
{
|
|
class MainHandler;
|
|
|
|
class ObjectChargeEffect : public QObject
|
|
{
|
|
Q_OBJECT
|
|
|
|
public:
|
|
ObjectChargeEffect(const Database::AesChargeEffect &data, MainHandler *mainHandler, QObject *parent); // creation from database
|
|
ObjectChargeEffect(MainHandler *mainHandler, QObject *parent);
|
|
|
|
Core::FunctionReplyObject create(const ChargeEffectModifyRequest &data); // creation from function topic
|
|
Core::FunctionReplyObject update(const ChargeEffectModifyRequest &data); // from function topic
|
|
void updatedProperties(const Database::AesChargeEffect &dbData);
|
|
bool remove();
|
|
|
|
// conversion methods
|
|
static Database::AesChargeEffect functionTopicToDatabase(const ChargeEffectModifyRequest &data);
|
|
ChargeEffect dataBaseToDataTopic(const Database::AesChargeEffect &data);
|
|
|
|
void publish();
|
|
|
|
void init();
|
|
QDateTime getEffectStart() const;
|
|
qint32 id() const;
|
|
bool isFinished() const;
|
|
|
|
static qint32 s_afterglowMsecs;
|
|
|
|
Q_SIGNALS:
|
|
void finished(qint32 chargeEffectId);
|
|
void chargeEffectStateChanged(const int id, const AesEffectState state);
|
|
|
|
private Q_SLOTS:
|
|
void onStateTimerTimeout();
|
|
|
|
private: // methods
|
|
void setNextState();
|
|
void calculateInitEffectState();
|
|
void startStateTimer();
|
|
bool hasChanges(const Database::AesChargeEffect newData) const;
|
|
|
|
private: // attributes
|
|
MainHandler *m_mainHandler;
|
|
Database::AesChargeEffect m_data;
|
|
int m_trajectoryId;
|
|
AesEffectState m_state;
|
|
bool m_stateChanged;
|
|
QTimer *m_stateTimer;
|
|
LOGGER_T &m_logger;
|
|
}; // class ObjectChargeEffect
|
|
|
|
} // namespace AreaEffectSimulation
|