From: rnv <rnv@opencascade.com>
Date: Wed, 4 Oct 2017 07:47:59 +0000 (+0300)
Subject: Merge branch 'imn/IMACS' of salome:modules/smesh into imn/IMACS
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=7b169c2b16711220eca0066e66f8ac774ea6e19d;p=modules%2Fsmesh.git

Merge branch 'imn/IMACS' of salome:modules/smesh into imn/IMACS
---

7b169c2b16711220eca0066e66f8ac774ea6e19d
diff --cc src/SMESH_SWIG_WITHIHM/libSMESH_Swig.i
index 68b0e1ec5,5f66f9f21..aecaf8e0a
--- a/src/SMESH_SWIG_WITHIHM/libSMESH_Swig.i
+++ b/src/SMESH_SWIG_WITHIHM/libSMESH_Swig.i
@@@ -101,12 -101,11 +101,16 @@@ class SMESH_Swi
  
    void CreateAndDisplayActor( const char* Mesh_Entry );
    void EraseActor( const char* Mesh_Entry, const bool allViewers = false );
 +  void UpdateActor( const char* Mesh_Entry );
 +
 +  void setSelectionMode( SelectionMode selectionMode);
 +  std::vector<int> getSelected( const char* Mesh_Entry );
 +  std::vector<std::pair<int,int> > getSelectedEdgeOfCell( const char* Mesh_Entry );
  
+   void setSelectionMode( SelectionMode selectionMode);
+   std::vector<int> getSelected( const char* Mesh_Entry );
+   std::vector<std::pair<int,int> > getSelectedEdgeOfCell( const char* Mesh_Entry );
+ 
    // --------------------- for the test purposes -----------------------
    SelectionMode  getSelectionMode();
    void select( const char *id, std::vector<int> ids, bool append = false );