henry/EntityLibrary
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ADD: added use of raw tracklist update

Browse Source
This commit is contained in:
Henry Winkel
2024-03-11 12:58:45 +01:00
parent 80f5c68466
commit ae7a65dff9
8 changed files with 75 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/Entities/SensorControl.hpp
View File

@@ -1,5 +1,6 @@
#pragma once
#include "SimCore/Identifier.hpp"
#include "SimCore/Messages/SensorTracklistItem.hpp"
#include "SimCore/SimCore.hpp"
#include <SimCore/Messages/SimTrack.hpp>
#include <kubecontrol/KubePod.hpp>
@@ -20,7 +21,8 @@ namespace Sensor
SensorControl(SimCore::Identifier ID, std::string Name, std::string IP, SimCore::SensorKinds sensorKind);
SimCore::SensorTracklistItem getSensorTracklistItem();
TrackList::TrackList TrackStore;

13
include/Entities/SensorManager.hpp
View File

@@ -4,6 +4,7 @@
#include "Entities/SensorControl.hpp"
#include "Entities/Tracklist/Trackfusion.hpp"
#include "SimCore/Identifier.hpp"
#include "SimCore/Messages/SensorTracklistUpdate.hpp"
#include "SimCore/Messages/SimTrack.hpp"
#include "SimCore/Messages/TracklistUpdate.hpp"
#include "SimCore/SimCore.hpp"
@@ -117,7 +118,17 @@ namespace Entities
*
* @return std::unique_ptr<SimCore::TracklistUpdate>
*/
std::unique_ptr<SimCore::TracklistUpdate> getTrackListUpdate();
std::unique_ptr<SimCore::TracklistUpdate> getTrackListUpdateFusioned();
/**
* @brief Get the Track List Update Raw
*
* in this list every sensor has its own tracks without a sensorfusion over all sensors
*
* @return std::unique_ptr<SimCore::SensorTracklistUpdate>
*/
std::unique_ptr<SimCore::SensorTracklistUpdate> getTrackListUpdateRaw();
/**
* @brief send the ownShipTrack to all connected Sensors

10
include/Entities/Tracklist/Tracklist.hpp
View File

@@ -3,6 +3,7 @@
#include "SimCore/Identifier.hpp"
#include "SimCore/IdentifierMaker.hpp"
#include "SimCore/Messages/SensorTrack.hpp"
#include "SimCore/Messages/SimTrack.hpp"
#include "nlohmann/json.hpp"
#include <atomic>
@@ -24,21 +25,22 @@ namespace TrackList
{
public:
TrackList();
void addTrack(std::shared_ptr<SimCore::SimTrack> Track);
std::shared_ptr<SimCore::SimTrack> getTrack(SimCore::Identifier);
void addTrack(std::shared_ptr<SimCore::SensorTrack> Track);
std::shared_ptr<SimCore::SensorTrack> getTrack(SimCore::Identifier);
void deleteTrack(std::string ID);
void deleteTrack(SimCore::Identifier);
std::shared_ptr<SimCore::SimTrack> getTrackBySringID(std::string ID);
std::shared_ptr<SimCore::SensorTrack> getTrackBySringID(std::string ID);
size_t getSize();
void getJsonTRackList(nlohmann::json &message);
std::map<std::string, std::shared_ptr<SimCore::SensorTrack>> getTrackStore();
private:
mutable std::mutex mx_;
std::map<std::string, std::shared_ptr<SimCore::SimTrack>> TrackStore_;
std::map<std::string, std::shared_ptr<SimCore::SensorTrack>> TrackStore_;
};