Merge branch 'allowApplyPropertyToTheProxyGroup' into 'master'

[fix] Allow applying a property to a proxy of the same group in LoadLidarState

See merge request !149

ApplicationComponents/SaveAndLoadLidarState/lqLoadLidarStateReaction.cxx

@@ -91,6 +91,14 @@ void lqLoadLidarStateReaction::onTriggered()
         std::string propertyName = currentProp.propertyName;
         vtkSMProxy* lidarProxy = SearchProxyByName(lidarCurrentProxy, proxyName);
 
+        // If the proxy is not found, search proxy from the same proxygroup
+        // ex : Apply a property from an other LidarPacketInterpreter to the current one
+        if (lidarProxy == nullptr)
+        {
+          std::string proxyGroupName = GetGroupName(lidarCurrentProxy, proxyName);
+          lidarProxy = SearchProxyByGroupName(lidarCurrentProxy, proxyGroupName);
+        }
+
         if (lidarProxy == nullptr)
         {
           std::string message = "No matching proxy found. Property " + propertyName + " of the proxy " + proxyName + " not applied";

ApplicationComponents/lqHelper.cxx

@@ -6,9 +6,13 @@
 
 #include "vtkLidarReader.h"
 #include "vtkLidarStream.h"
+#include <vtkSMSessionProxyManager.h>
 #include <vtkSMBooleanDomain.h>
 #include <vtkSMPropertyIterator.h>
 #include <vtkSMPropertyHelper.h>
+#include <vtkSMProxyDefinitionManager.h>
+#include <vtkSMSessionProxyManager.h>
+#include <vtkPVProxyDefinitionIterator.h>
 
 #include <pqApplicationCore.h>
 #include <pqPipelineSource.h>
@@ -206,3 +210,34 @@ void UpdateProperty(vtkSMProxy * proxy, const std::string &propNameToFind,
     }
   }
 }
+
+//-----------------------------------------------------------------------------
+std::string GetGroupName(vtkSMProxy * existingProxy, const std::string & proxyToFindName)
+{
+  vtkSMSessionProxyManager* pxm = existingProxy->GetSessionProxyManager();
+
+  if(!pxm)
+  {
+    std::cout << "Couldn't get the SM Session Proxy Manager" << std::endl;
+    return "";
+  }
+
+  vtkSMProxyDefinitionManager* pxdm = pxm->GetProxyDefinitionManager();
+
+  if(!pxdm)
+  {
+    std::cout << "Couldn't get the SM Proxy Definition Manager" << std::endl;
+    return "";
+  }
+
+  vtkPVProxyDefinitionIterator* iter = pxdm->NewIterator();
+  for (iter->InitTraversal(); !iter->IsDoneWithTraversal(); iter->GoToNextItem())
+  {
+     if(strcmp(iter->GetProxyName(), proxyToFindName.c_str()) == 0)
+     {
+       return iter->GetGroupName();
+     }
+  }
+  return "";
+}
+

ApplicationComponents/lqHelper.h

@@ -60,4 +60,12 @@ vtkSMProperty* GetPropertyFromProxy(vtkSMProxy * proxy, const std::string &propN
 void UpdateProperty(vtkSMProxy * proxy, const std::string & propNameToFind,
                     const std::vector<std::string> & values);
 
+/**
+ * @brief GetGroupName Get the name of the first group where appear a proxy
+ * @param existingProxy a proxy of the pipeline, use to get the ProxyDefinitionManager
+ * @param proxyToFindName name of the proxy to look for
+ * @return the name of the first group where a corresponding proxy is found
+ */
+std::string GetGroupName(vtkSMProxy * existingProxy, const std::string & proxyToFindName);
+
 #endif // LQHELPER_H