neat collection

Signed-off-by: Adam Dąbrowski <[email protected]>

Author: adamdbrw

Gems/ROS2/Code/Source/Sensor/PublisherConfiguration.cpp

@@ -19,6 +19,7 @@ namespace ROS2
     {
         if (auto serializeContext = azrtti_cast<AZ::SerializeContext*>(context))
         {
+            serializeContext->RegisterGenericType<AZStd::vector<PublisherConfiguration>>();
             serializeContext->Class<PublisherConfiguration>()
                 ->Version(1)
                 ->Field("Type", &PublisherConfiguration::m_type)
@@ -29,10 +30,9 @@ namespace ROS2
             if (AZ::EditContext* ec = serializeContext->GetEditContext())
             {
                 ec->Class<PublisherConfiguration>("ROS2 Publisher configuration", "Publisher configuration")
-                        ->DataElement(AZ::Edit::UIHandlers::Default, &PublisherConfiguration::m_type, "Type", "Type of topic")
-                            ->Attribute(AZ::Edit::Attributes::ReadOnly, true)
-                        ->DataElement(AZ::Edit::UIHandlers::Default, &PublisherConfiguration::m_topic, "Topic", "Topic with no namespace")
-                        ;
+                    ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
+                    ->DataElement(AZ::Edit::UIHandlers::Default, &PublisherConfiguration::m_topic, "Topic", "Topic with no namespace")
+                    ;
             }
         }
     };

Gems/ROS2/Code/Source/Sensor/PublisherConfiguration.h

@@ -24,6 +24,16 @@ namespace ROS2
         virtual ~PublisherConfiguration() = default;
         static void Reflect(AZ::ReflectContext* context);
 
+        bool operator==(const PublisherConfiguration& other) const
+        {
+            if (m_type != other.m_type)
+            {
+                return false;
+            }
+
+            return m_topic == other.m_topic;
+        }
+
         AZStd::string m_type = "std_msgs::msg::Empty";
         AZStd::string m_topic = "default_topic";
         rclcpp::QoS m_qos = 10;

Gems/ROS2/Code/Source/Sensor/SensorConfiguration.cpp

@@ -19,7 +19,6 @@ namespace ROS2
         PublisherConfiguration::Reflect(context);
         if (auto serializeContext = azrtti_cast<AZ::SerializeContext*>(context))
         {
-            serializeContext->RegisterGenericType<AZStd::vector<PublisherConfiguration>>();
             serializeContext->Class<SensorConfiguration>()
                 ->Version(1)
                 ->Field("Visualise", &SensorConfiguration::m_visualise)
@@ -31,15 +30,24 @@ namespace ROS2
             if (AZ::EditContext* ec = serializeContext->GetEditContext())
             {
                 ec->Class<SensorConfiguration>("ROS2 Sensor Component", "[Base component for sensors]")
+                    ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                     ->DataElement(AZ::Edit::UIHandlers::Default, &SensorConfiguration::m_visualise, "Visualise", "Visualise")
                     ->DataElement(AZ::Edit::UIHandlers::Default, &SensorConfiguration::m_publishingEnabled, "Publishing Enabled", "Toggle publishing for topic")
                     ->DataElement(AZ::Edit::UIHandlers::Default, &SensorConfiguration::m_frequency, "Frequency", "Frequency of publishing")
                         ->Attribute(AZ::Edit::Attributes::Min, 1)
                         ->Attribute(AZ::Edit::Attributes::Max, 100)
+                        ->Attribute(AZ::Edit::Attributes::Step, 1)
                     ->DataElement(AZ::Edit::UIHandlers::Default, &SensorConfiguration::m_publishersConfigurations, "Publishers", "Publishers")
                         ->Attribute(AZ::Edit::Attributes::ContainerCanBeModified, false)
+                        ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
+                        ->Attribute(AZ::Edit::Attributes::IndexedChildNameLabelOverride, &SensorConfiguration::GetPublisherLabel)
                     ;
             }
         }
     }
+
+    AZStd::string SensorConfiguration::GetPublisherLabel(int index) const
+    {
+        return m_publishersConfigurations[index].m_type;
+    }
 }  // namespace ROS2

Gems/ROS2/Code/Source/Sensor/SensorConfiguration.h

@@ -33,6 +33,9 @@ namespace ROS2
         float m_frequency = 10;
         bool m_publishingEnabled = true;
         bool m_visualise = true;
+
+    private:
+        AZStd::string GetPublisherLabel(int index) const;
     };
 }  // namespace ROS2