diff --git a/MotionPlanning/examples/RrtGui/RrtGuiWindow.cpp b/MotionPlanning/examples/RrtGui/RrtGuiWindow.cpp index 5bffe90356b43fff240b157ccf1e992eccb99b61..d21feb619ee28c8c51ee7cfe34947d5206df5112 100644 --- a/MotionPlanning/examples/RrtGui/RrtGuiWindow.cpp +++ b/MotionPlanning/examples/RrtGui/RrtGuiWindow.cpp @@ -634,7 +634,7 @@ void RrtGuiWindow::plan() cdm->addCollisionModel(colModelEnv); } - cspace.reset(new Saba::CSpaceSampled(robot, cdm, rns)); + cspace.reset(new Saba::CSpaceSampled(robot, cdm, rns, 1000000)); float sampl = (float)UI.doubleSpinBoxCSpaceSampling->value(); float samplDCD = (float)UI.doubleSpinBoxColChecking->value(); cspace->setSamplingSize(sampl); diff --git a/VirtualRobot/XML/BaseIO.cpp b/VirtualRobot/XML/BaseIO.cpp index e6934b7fc8e6df82725b48d82216060d3ca9ad0d..29492631f9052294aa05131511f36016e2606c01 100644 --- a/VirtualRobot/XML/BaseIO.cpp +++ b/VirtualRobot/XML/BaseIO.cpp @@ -1459,10 +1459,20 @@ namespace VirtualRobot VR_ERROR << "No units attribute at <" << storeConfigName << ">" << endl; } - if (getUnitsAttribute(node, Units::eAngle).isDegree()) + /*if (getUnitsAttribute(node, Units::eAngle).isDegree()) { c.value = c.value / 180.0f * (float)M_PI; - } + }*/ + + Units u = getUnitsAttribute(node, Units::eIgnore); + if (u.isDegree()) + { + c.value = c.value / 180.0f * (float)M_PI; + } + else if (u.isMeter()) + { + c.value = c.value / 1000.0f; + } storeConfigDefinitions.push_back(c); }