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

FIX: modified to fit to the new base message

Browse Source
This commit is contained in:
Henry Winkel
2023-08-11 11:03:48 +02:00
parent 5fb2c390b3
commit b546628663
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/SimCore/Messages/SimTrack.hpp
View File

@@ -77,13 +77,14 @@ namespace SimCore
Data<double> Course; Data<double> Course;
Data<double> Pitch; Data<double> Pitch;
Data<double> RCS; Data<double> RCS;
Data<WHISPER::SourceType> SourceType;
Data<SimCore::EntityKind> EntityKind; Data<SimCore::EntityKind> EntityKind;
private: private:
const SimCore::Identifier ID_; const SimCore::Identifier ID_;
WHISPER::SourceType SourceType_; // WHISPER::SourceType SourceType_;
Position position_; Position position_;

10
src/SimCore/Messages/SimTrack.cpp
View File

@@ -8,7 +8,7 @@
namespace SimCore namespace SimCore
{ {
SimTrack::SimTrack() SimTrack::SimTrack()
:ID_(SimCore::Identifier()),SourceType_(WHISPER::SourceType::SIMCOMTROLER) :ID_(SimCore::Identifier())
{ {
EntityKind.setValue(SimCore::EntityKind::UNKNOWN); EntityKind.setValue(SimCore::EntityKind::UNKNOWN);
@@ -26,7 +26,7 @@ namespace SimCore
SimTrack::SimTrack(WHISPER::SourceType sourcetype,SimCore::EntityKind entityKind) SimTrack::SimTrack(WHISPER::SourceType sourcetype,SimCore::EntityKind entityKind)
:ID_(SimCore::Identifier()),SourceType_(sourcetype) :ID_(SimCore::Identifier())
{ {
EntityKind.setValue(entityKind); EntityKind.setValue(entityKind);
@@ -44,7 +44,7 @@ namespace SimCore
SimTrack::SimTrack(SimCore::Identifier id ,WHISPER::SourceType sourcetype,SimCore::EntityKind entityKind ) SimTrack::SimTrack(SimCore::Identifier id ,WHISPER::SourceType sourcetype,SimCore::EntityKind entityKind )
:ID_(id),SourceType_(sourcetype) :ID_(id),SourceType(sourcetype)
{ {
EntityKind.setValue(entityKind); EntityKind.setValue(entityKind);
@@ -85,7 +85,7 @@ namespace SimCore
WHISPER::Message SimTrack::buildMessage() WHISPER::Message SimTrack::buildMessage()
{ {
WHISPER::Message msg(ID_.getUUID(),WHISPER::MsgTopics::TRACK , WHISPER::MsgType::SIM_TRACK, this->SourceType_); WHISPER::Message msg(ID_.getUUID(),WHISPER::MsgTopics::TRACK , WHISPER::MsgType::SIM_TRACK);
messages::SimTrack::SimTrack SimTrack; messages::SimTrack::SimTrack SimTrack;
@@ -152,7 +152,7 @@ namespace SimCore
if (trackMsg.has_contactsourcetype()) if (trackMsg.has_contactsourcetype())
{ {
track.SourceType_ = (WHISPER::SourceType)trackMsg.contactsourcetype(); track.SourceType.setValue((WHISPER::SourceType)trackMsg.contactsourcetype());
} }
if (trackMsg.has_geocentricposition()) if (trackMsg.has_geocentricposition())