Skip to content
Snippets Groups Projects
Commit 84cf8fe5 authored by Jean Patrick Mathes's avatar Jean Patrick Mathes
Browse files

Add separator to context menu

parent 7beb10f0
No related branches found
No related tags found
1 merge request!283Resolve "Add component to interactively change the object instances in the memory via ArViz interactive"
......@@ -9,9 +9,11 @@
namespace armarx
{
Editor::Editor(viz::Client& client,
std::string const& providerName,
std::function<void(objpose::ProvidedObjectPoseSeq &)> pushToMemory,
std::function<objpose::ObjectPoseSeq(void)> pullFromMemory)
: client(client)
: providerName(providerName)
, client(client)
, pushToMemory(std::move(pushToMemory))
, pullFromMemory(std::move(pullFromMemory))
, isCommitRequired(false)
......@@ -104,7 +106,7 @@ namespace armarx
}
objpose::ProvidedObjectPose& providing = providingPoses.emplace_back();
providing.providerName = current.providerName;
providing.providerName = providerName;
providing.objectType = objpose::KnownObject;
providing.objectID = current.objectID;
......@@ -307,6 +309,9 @@ namespace armarx
}
}
description.options.emplace_back("---------------------------");
currentIndex++;
description.options.emplace_back("Commit All Changes");
description.commitIndex = currentIndex++;
......
......@@ -15,6 +15,7 @@ namespace armarx
{
public:
explicit Editor(viz::Client& client,
std::string const& providerName,
std::function<void(objpose::ProvidedObjectPoseSeq&)> pushToMemory,
std::function<objpose::ObjectPoseSeq(void)> pullFromMemory);
void step();
......@@ -23,6 +24,8 @@ namespace armarx
static constexpr const char* memoryLayerName = "Memory";
static constexpr const char* metaLayerName = "Meta";
std::string const& providerName;
viz::Client& client;
const std::function<void(objpose::ProvidedObjectPoseSeq&)> pushToMemory;
const std::function<objpose::ObjectPoseSeq(void)> pullFromMemory;
......
......@@ -60,7 +60,7 @@ namespace armarx
objpose::ObjectPoseClient client = getClient();
Editor editor(arviz,
Editor editor(arviz, getName(),
[&](objpose::ProvidedObjectPoseSeq &poses)
{
objectPoseTopic->reportObjectPoses(getName(), objpose::toIce(poses));
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment