Merge pull request #5 from basler/feature/fix_enum_name_handling

featurewalker: selector name stripping breaks if name contains "_"
basler · Aug 12, 2022 · 8eea420 · 8eea420
2 parents df8292c + d4463ba
commit 8eea420
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/ext/pylon/gstpylonfeaturewalker.cpp b/ext/pylon/gstpylonfeaturewalker.cpp
@@ -98,10 +98,15 @@ static std::vector<GParamSpec*> gst_pylon_camera_handle_node(
   /* Add selector enum values */
   std::vector<std::string> enum_values;
   GenApi::NodeList_t enum_entries;
+  /* calculate prefix length to strip */
+  const auto prefix_str = std::string("EnumEntry_") +
+                          enum_node->GetNode()->GetName().c_str() +
+                          std::string("_");
+  auto prefix_len = prefix_str.length();    
   enum_node->GetEntries(enum_entries);
   for (auto const& e : enum_entries) {
     auto enum_name = std::string(e->GetName());
-    enum_values.push_back(enum_name.substr(enum_name.find_last_of("_") + 1));
+    enum_values.push_back(enum_name.substr(prefix_len));
   }
 
   selector_node = selector->GetNode();