diff --git a/command_language/src/models/composite_instruction_standard_item.cpp b/command_language/src/models/composite_instruction_standard_item.cpp index ae777234..04090017 100644 --- a/command_language/src/models/composite_instruction_standard_item.cpp +++ b/command_language/src/models/composite_instruction_standard_item.cpp @@ -34,6 +34,8 @@ #include #include +#include + namespace tesseract_gui { CompositeInstructionStandardItem::CompositeInstructionStandardItem(const tesseract_planning::CompositeInstruction& ci) @@ -82,6 +84,8 @@ void CompositeInstructionStandardItem::ctor(const tesseract_planning::CompositeI appendRow(createStandardItemString("description", ci.getDescription())); appendRow(createStandardItemString("order", toString(ci.getOrder()))); appendRow(createStandardItemString("profile", ci.getProfile())); + appendRow(createStandardItemString("uuid", boost::uuids::to_string(ci.getUUID()))); + appendRow(createStandardItemString("parent uuid", boost::uuids::to_string(ci.getParentUUID()))); appendRow(new ManipulatorInfoStandardItem("manip info", ci.getManipulatorInfo())); appendRow(new VectorInstructionStandardItem("instructions", ci.getInstructions())); } diff --git a/command_language/src/models/move_instruction_standard_item.cpp b/command_language/src/models/move_instruction_standard_item.cpp index a993310d..d2958a40 100644 --- a/command_language/src/models/move_instruction_standard_item.cpp +++ b/command_language/src/models/move_instruction_standard_item.cpp @@ -35,6 +35,8 @@ #include #include +#include + namespace tesseract_gui { MoveInstructionStandardItem::MoveInstructionStandardItem(const tesseract_planning::MoveInstructionPoly& mi) @@ -81,6 +83,8 @@ void MoveInstructionStandardItem::ctor(const tesseract_planning::MoveInstruction appendRow(createStandardItemString("profile", mi.getProfile())); appendRow(createStandardItemString("path_profile", mi.getPathProfile())); appendRow(createStandardItemString("type", toString(mi.getMoveType()))); + appendRow(createStandardItemString("uuid", boost::uuids::to_string(mi.getUUID()))); + appendRow(createStandardItemString("parent uuid", boost::uuids::to_string(mi.getParentUUID()))); appendRow(new ManipulatorInfoStandardItem(mi.getManipulatorInfo())); // NOLINT if (mi.getWaypoint().isCartesianWaypoint()) diff --git a/command_language/src/models/set_analog_instruction_standard_item.cpp b/command_language/src/models/set_analog_instruction_standard_item.cpp index 8dfcbb12..f0b015f0 100644 --- a/command_language/src/models/set_analog_instruction_standard_item.cpp +++ b/command_language/src/models/set_analog_instruction_standard_item.cpp @@ -27,6 +27,8 @@ #include +#include + namespace tesseract_gui { SetAnalogInstructionStandardItem::SetAnalogInstructionStandardItem(const tesseract_planning::SetAnalogInstruction& sai) @@ -58,6 +60,8 @@ int SetAnalogInstructionStandardItem::type() const void SetAnalogInstructionStandardItem::ctor(const tesseract_planning::SetAnalogInstruction& sai) { appendRow(createStandardItemString("description", sai.getDescription())); + appendRow(createStandardItemString("uuid", boost::uuids::to_string(sai.getUUID()))); + appendRow(createStandardItemString("parent uuid", boost::uuids::to_string(sai.getParentUUID()))); appendRow(createStandardItemString("key", sai.getKey())); appendRow(createStandardItemInt("index", sai.getIndex())); appendRow(createStandardItemFloat("value", sai.getValue())); diff --git a/command_language/src/models/set_tool_instruction_standard_item.cpp b/command_language/src/models/set_tool_instruction_standard_item.cpp index 291edb39..34b3a434 100644 --- a/command_language/src/models/set_tool_instruction_standard_item.cpp +++ b/command_language/src/models/set_tool_instruction_standard_item.cpp @@ -27,6 +27,8 @@ #include +#include + namespace tesseract_gui { SetToolInstructionStandardItem::SetToolInstructionStandardItem(const tesseract_planning::SetToolInstruction& sti) @@ -55,6 +57,8 @@ int SetToolInstructionStandardItem::type() const { return static_cast(Stand void SetToolInstructionStandardItem::ctor(const tesseract_planning::SetToolInstruction& sti) { appendRow(createStandardItemString("description", sti.getDescription())); + appendRow(createStandardItemString("uuid", boost::uuids::to_string(sti.getUUID()))); + appendRow(createStandardItemString("parent uuid", boost::uuids::to_string(sti.getParentUUID()))); appendRow(createStandardItemInt("tool", sti.getTool())); } } // namespace tesseract_gui diff --git a/command_language/src/models/timer_instruction_standard_item.cpp b/command_language/src/models/timer_instruction_standard_item.cpp index 83dbaa78..eb30cfb4 100644 --- a/command_language/src/models/timer_instruction_standard_item.cpp +++ b/command_language/src/models/timer_instruction_standard_item.cpp @@ -27,6 +27,8 @@ #include +#include + namespace tesseract_gui { TimerInstructionStandardItem::TimerInstructionStandardItem(const tesseract_planning::TimerInstruction& ti) @@ -68,6 +70,8 @@ std::string toString(tesseract_planning::TimerInstructionType t_type) void TimerInstructionStandardItem::ctor(const tesseract_planning::TimerInstruction& ti) { appendRow(createStandardItemString("description", ti.getDescription())); + appendRow(createStandardItemString("uuid", boost::uuids::to_string(ti.getUUID()))); + appendRow(createStandardItemString("parent uuid", boost::uuids::to_string(ti.getParentUUID()))); appendRow(createStandardItemString("type", toString(ti.getTimerType()))); appendRow(createStandardItemFloat("time (sec)", ti.getTimerTime())); appendRow(createStandardItemInt("I/O", ti.getTimerIO())); diff --git a/command_language/src/models/wait_instruction_standard_item.cpp b/command_language/src/models/wait_instruction_standard_item.cpp index 50598fb9..16fc0449 100644 --- a/command_language/src/models/wait_instruction_standard_item.cpp +++ b/command_language/src/models/wait_instruction_standard_item.cpp @@ -27,6 +27,8 @@ #include +#include + namespace tesseract_gui { WaitInstructionStandardItem::WaitInstructionStandardItem(const tesseract_planning::WaitInstruction& wi) @@ -74,6 +76,8 @@ std::string toString(tesseract_planning::WaitInstructionType w_type) void WaitInstructionStandardItem::ctor(const tesseract_planning::WaitInstruction& wi) { appendRow(createStandardItemString("description", wi.getDescription())); + appendRow(createStandardItemString("uuid", boost::uuids::to_string(wi.getUUID()))); + appendRow(createStandardItemString("parent uuid", boost::uuids::to_string(wi.getParentUUID()))); appendRow(createStandardItemString("type", toString(wi.getWaitType()))); appendRow(createStandardItemFloat("time (sec)", wi.getWaitTime())); appendRow(createStandardItemInt("I/O", wi.getWaitIO()));