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

CHG: sensor info are not longer needed when adding a track to a tracklist

Browse Source
This commit is contained in:
hwinkel
2023-06-07 23:21:36 +02:00
parent f02dd84f4e
commit bbbd5b96df
6 changed files with 86 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/Entities/Entity.hpp
View File

@@ -32,7 +32,7 @@ namespace Entities {
std::string SensorName;
bool isActive;
SimCore::Identifier SensorID;
std::shared_ptr<WHISPER::InternalUDPSender> SensorSender;
// std::shared_ptr<WHISPER::InternalUDPSender> SensorSender;
};
struct EffectorClientData

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

@@ -28,6 +28,8 @@ namespace TrackList
SimCore::Identifier getTrackID(SimCore::ObjectSource source);
void addTrack(std::shared_ptr<SimCore::Track> track);
void addTrack(std::shared_ptr<SimCore::Track> track,SensorData sensorData);
std::shared_ptr<TracklistItem> getTrack(SimCore::Identifier TrackID);
@@ -45,7 +47,8 @@ namespace TrackList
void tracklistSanitizer();
void addNewTrack(std::shared_ptr<SimCore::Track> track,SensorData sensorData);
void addNewTrack(std::shared_ptr<SimCore::Track> track);
std::map<std::string, std::shared_ptr<TracklistItem>> TrackList_;
mutable std::mutex mutex_;

5
include/Entities/Tracklist/TracklistItem.hpp
View File

@@ -32,6 +32,7 @@ namespace TrackList {
{
public:
TracklistItem(std::shared_ptr<SimCore::Track> track,SensorData sensorData);
TracklistItem(std::shared_ptr<SimCore::Track> track);
SimCore::Identifier getID();
@@ -56,10 +57,13 @@ namespace TrackList {
void updateTrack(std::shared_ptr<SimCore::Track> track,SensorData sensorData);
void updateTrack(std::shared_ptr<SimCore::Track> track);
bool checkIfSensorIDIsIn(SimCore::Identifier SensorTrackID);
bool isSensorIDKnown(SimCore::Identifier);
void addSensorDataToSensorList(SensorData sensorData);
private:
@@ -90,7 +94,6 @@ namespace TrackList {
bool isSensorinSensorlist(SensorData sensorData);
void addSensorDataToSensorList(SensorData sensorData);