Merge C++ part of kleontev/38044_auto_repair

[modules/geom.git] / src / GEOM_SWIG_WITHIHM / libGEOM_Swig.cxx

diff --git a/src/GEOM_SWIG_WITHIHM/libGEOM_Swig.cxx b/src/GEOM_SWIG_WITHIHM/libGEOM_Swig.cxx
index 3358d39e35fc8b42ad23e2c32db943359c11fb63..65571632c7b7885fd53ba9f4c7a36910fa4c5299 100644 (file)
--- a/src/GEOM_SWIG_WITHIHM/libGEOM_Swig.cxx
+++ b/src/GEOM_SWIG_WITHIHM/libGEOM_Swig.cxx
@@ -66,6 +66,14 @@ GEOM_Swig::GEOM_Swig( bool updateOB )
 */
 GEOM_Swig::~GEOM_Swig()
 {
+  // Delete selector because of sigsegv in TEventInitLocalSelection::Execute()
+  // when call GEOM_Swig.initLocalSelection() from Python, close the study, create a new one and
+  // call it again.
+  if (myOCCSelector)
+  {
+    delete myOCCSelector;
+    myOCCSelector = nullptr;
+  }
 }
 
 /*!
@@ -579,6 +587,33 @@ std::vector<int> GEOM_Swig::getLocalSelection()
   return result;
 }
 
+
+/*!libGEOM_Swig
+  \brief Set local subShapes selection on a given shape
+  \param ids sub-shapes ids
+ */
+void GEOM_Swig::setLocalSelection(const std::vector<int> ids)
+{
+  class TEventSetLocalSelection: public SALOME_Event
+  {
+  public:
+    typedef std::vector<int> TResult;
+    TResult myIds;
+    TResult myResult;
+
+    TEventSetLocalSelection(const std::vector<int> _ids) : myIds(_ids) {}
+
+    virtual void Execute()
+    {
+      MESSAGE("TEventSetLocalSelection myLocalSelector: " << myLocalSelector);
+      if (myLocalSelector)
+        myLocalSelector->setSelection(myIds);
+    }
+  };
+
+  ProcessEvent(new TEventSetLocalSelection(ids));
+}
+
 /*!
   \brief close local subShapes selection on a given shape
  */