Skip to content
Snippets Groups Projects
Commit 649402f7 authored by Raphael Grimm's avatar Raphael Grimm
Browse files

Update CartesianWaypointControlGuiWidgetController to use...

Update CartesianWaypointControlGuiWidgetController to use VirtualRobot::json::posquatArray2eigen4fVector
parent 411aeea2
No related branches found
No related tags found
No related merge requests found
......@@ -29,14 +29,6 @@
#include "CartesianWaypointControlGuiWidgetController.h"
namespace Eigen
{
void from_json(const nlohmann::json& j, Eigen::Matrix4f& mx)
{
mx = VirtualRobot::json::posquat2eigen4f(j);
}
}
namespace armarx
{
CartesianWaypointControlGuiWidgetController::CartesianWaypointControlGuiWidgetController()
......@@ -99,7 +91,7 @@ namespace armarx
found = true;
}
}
if(found && _robot->hasRobotNode("FT R"))
if (found && _robot->hasRobotNode("FT R"))
{
_ui.lineEditFTName->setText("FT R");
}
......@@ -202,9 +194,8 @@ namespace armarx
//parse json
try
{
auto json = ::nlohmann::json::parse(_ui.textEditWPs->toPlainText().toStdString());
ARMARX_INFO << "parsed string as json";
_lastParsedWPs = json.get<std::vector<Eigen::Matrix4f>>();
_lastParsedWPs = VirtualRobot::json::posquatArray2eigen4fVector(
_ui.textEditWPs->toPlainText().toStdString());
}
catch (...)
{
......
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