added changes to have parent and child links for joints drop down menus

ros-industrial-attic · Apr 1, 2016 · f916110 · f916110
1 parent 61e7f40
commit f916110
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/urdf_editor/src/joint_property.cpp b/urdf_editor/src/joint_property.cpp
@@ -574,12 +574,13 @@ namespace urdf_editor
     type_item_ = manager_->addProperty(QtVariantPropertyManager::enumTypeId(), tr("Type"));
     type_item_->setAttribute(Common::attributeStr(EnumNames), QStringList() << tr("Unknown") << tr("Revolute") << tr("Continuous") << tr("Prismatic") <<  tr("Floating") << tr("Planar") << tr("Fixed"));
 
-    parent_item_ = manager_->addProperty(QVariant::String, tr("Parent"));
-    parent_item_->setAttribute(Common::attributeStr(ReadOnly), true);
+    parent_item_ = manager_->addProperty(QtVariantPropertyManager::enumTypeId(), tr("Parent"));
+    parent_item_->setAttribute(Common::attributeStr(EnumNames), link_names_);
 
     child_item_ = manager_->addProperty(QtVariantPropertyManager::enumTypeId(), tr("Child"));
     child_item_->setAttribute(Common::attributeStr(EnumNames), link_names_);
 
+
     origin = joint_->parent_to_joint_origin_transform;
     p_norm = origin.position.x * origin.position.x;
     p_norm += origin.position.y * origin.position.y;
@@ -665,10 +666,14 @@ namespace urdf_editor
     loading_ = true;
     name_item_->setValue(QString::fromStdString(joint_->name));
     type_item_->setValue(joint_->type);
-    parent_item_->setValue(QString::fromStdString(joint_->parent_link_name));
+
+    parent_item_->setAttribute(Common::attributeStr(EnumNames), link_names_);
+    parent_item_->setValue(link_names_.indexOf(QString::fromStdString(joint_->parent_link_name)));
+
     child_item_->setAttribute(Common::attributeStr(EnumNames), link_names_);
     child_item_->setValue(link_names_.indexOf(QString::fromStdString(joint_->child_link_name)));
 
+
     if (origin_property_)
       origin_property_->loadData();
 
@@ -788,7 +793,7 @@ namespace urdf_editor
     }
     else if (name == "Parent")
     {
-      joint_->parent_link_name = val.toString().toStdString();
+      joint_->parent_link_name = link_names_[val.toInt()].toStdString();
     }
     else if (name == "Child")
     {