Browse Source

Added frame info and publisher config title

Signed-off-by: Paulina Kubera <[email protected]>
Paulina Kubera 1 year ago
parent
commit
cdd9e96c8f

+ 1 - 0
Gems/ROS2/Code/Include/ROS2/Frame/ROS2FrameConfiguration.h

@@ -34,6 +34,7 @@ namespace ROS2
 
     private:
         AZStd::string m_effectiveNamespace = "";
+        AZStd::string m_fullName = m_frameName;
     };
 
 } // namespace ROS2

+ 7 - 2
Gems/ROS2/Code/Source/Frame/ROS2FrameConfiguration.cpp

@@ -44,8 +44,12 @@ namespace ROS2
                         &ROS2FrameConfiguration::m_publishTransform,
                         "Publish Transform",
                         "Publish Transform")
-                    ->UIElement(AZ::Edit::UIHandlers::Label, "Effective namespace", "")
-                    ->Attribute(AZ::Edit::Attributes::ValueText, &ROS2FrameConfiguration::m_effectiveNamespace);
+                    ->ClassElement(AZ::Edit::ClassElements::Group, "Info")
+                    ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
+                                ->UIElement(AZ::Edit::UIHandlers::Label, "Effective namespace", "")
+                                ->Attribute(AZ::Edit::Attributes::ValueText, &ROS2FrameConfiguration::m_effectiveNamespace)
+                                ->UIElement(AZ::Edit::UIHandlers::Label, "Full name", "")
+                                ->Attribute(AZ::Edit::Attributes::ValueText, &ROS2FrameConfiguration::m_fullName);
             }
         }
     }
@@ -53,6 +57,7 @@ namespace ROS2
     void ROS2FrameConfiguration::SetEffectiveNamespace(const AZStd::string& effectiveNamespace)
     {
         m_effectiveNamespace = effectiveNamespace;
+        m_fullName = effectiveNamespace + '/' + m_frameName;
     }
 
 } // namespace ROS2

+ 1 - 0
Gems/ROS2/Code/Source/Lidar/LidarRaycaster.h

@@ -16,6 +16,7 @@
 
 namespace ROS2
 {
+    //! A class for executing lidar raycast.
     class LidarRaycaster : protected LidarRaycasterRequestBus::Handler
     {
     public:

+ 2 - 1
Gems/ROS2/Code/Source/Sensor/SensorConfiguration.cpp

@@ -43,7 +43,8 @@ namespace ROS2
                     ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                     ->Attribute(AZ::Edit::Attributes::Visibility, AZ::Edit::PropertyVisibility::ShowChildrenOnly)
                     ->Attribute(AZ::Edit::Attributes::ContainerCanBeModified, false)
-                    ->ElementAttribute(AZ::Edit::Attributes::AutoExpand, true);
+                    ->ElementAttribute(AZ::Edit::Attributes::AutoExpand, true)
+                    ->ElementAttribute(AZ::Edit::Attributes::NameLabelOverride, "Publisher configuration");
             }
         }
     }