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

FIX: fixed bugs in MoveOrder

Browse Source
This commit is contained in:
hwinkel
2023-07-07 09:30:37 +02:00
parent 31f21485e0
commit 401af8cb61
1 changed files with 20 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/Orders/MoveOrder.cpp
View File

@@ -42,10 +42,10 @@ namespace Orders
} }
SimCore::Position MoveOrder::getPosition()
SimCore::Position MoveOrder::getPosition(){return pos_;} {
return pos_;
}
WHISPER::Message MoveOrder::buildMessage() WHISPER::Message MoveOrder::buildMessage()
@@ -61,19 +61,23 @@ namespace Orders
MoveOrder.mutable_geocentricposition()->set_z(pos_.getGeocentricPos().z()); MoveOrder.mutable_geocentricposition()->set_z(pos_.getGeocentricPos().z());
} }
if (Speed.getValidity() == true) { if (Speed.isValid() == true) {
MoveOrder.set_speed(Speed.getValue()); MoveOrder.set_speed(Speed.getValue());
} }
if (Course.getValidity() == true) { if (Course.isValid() == true) {
MoveOrder.set_course(Course.getValue());
}
if (Speed.isValid() == true) {
MoveOrder.set_speed(Speed.getValue());
}
if (Course.isValid() == true) {
MoveOrder.set_course(Course.getValue()); MoveOrder.set_course(Course.getValue());
} }
if (StartTime.getValidity() == true) { if (StartTime.isValid() == true) {
MoveOrder.mutable_startingtime()->set_seconds(StartTime.getValue()); MoveOrder.mutable_startingtime()->set_seconds(StartTime.getValue());
} }
LOG_S(INFO)<<"ordered speed:" << MoveOrder.speed();
auto anyOrder = google::protobuf::Any(); auto anyOrder = google::protobuf::Any();
anyOrder.PackFrom(MoveOrder); anyOrder.PackFrom(MoveOrder);
@@ -114,20 +118,15 @@ namespace Orders
auto MoveOrderObj = std::make_unique<MoveOrder>(OrderID,(WHISPER::SourceType)msg.sourceType_); auto MoveOrderObj = std::make_unique<MoveOrder>(OrderID,(WHISPER::SourceType)msg.sourceType_);
if (moveOrder.has_geocentricposition()) MoveOrderObj->setPosition(SimCore::Position(moveOrder.geocentricposition().x(),moveOrder.geocentricposition().y(),moveOrder.geocentricposition().z())); if (moveOrder.has_geocentricposition()) MoveOrderObj->setPosition(SimCore::Position(moveOrder.geocentricposition().x(),moveOrder.geocentricposition().y(),moveOrder.geocentricposition().z()));
if (moveOrder.has_speed()) MoveOrderObj->Speed.setValue(moveOrder.speed()); if (moveOrder.has_speed()) MoveOrderObj->Speed.setValue(moveOrder.speed());
if (moveOrder.has_course()) MoveOrderObj->Course.setValue(moveOrder.course()); if (moveOrder.has_course()) MoveOrderObj->Course.setValue(moveOrder.course());
if (moveOrder.has_startingtime()) MoveOrderObj->Course.setValue(moveOrder.mutable_startingtime()->seconds()); if (moveOrder.has_startingtime()) MoveOrderObj->Course.setValue(moveOrder.mutable_startingtime()->seconds());
return MoveOrderObj;
return std::move(MoveOrderObj);
} }
} }
} }
return nullptr; return nullptr;
} }
@@ -137,11 +136,10 @@ namespace Orders
if (std::empty(msg) == false && msg != "NULL") if (std::empty(msg) == false && msg != "NULL")
{ {
WHISPER::Message whisperMessage(msg); WHISPER::Message whisperMessage(msg);
return std::move(unpack(whisperMessage)); return unpack(whisperMessage);
} }
return nullptr; return nullptr;
} }
} }