Merge imn/IMACS branch into imn/IMACS_8_3_0

diff --cc src/OBJECT/SMESH_Actor.cxx
Simple merge

diff --cc src/OBJECT/SMESH_ActorDef.h
Simple merge

diff --cc src/SMESHUtils/SMESH_MeshAlgos.cxx
Simple merge

diff --cc src/SMESH_SWIG_WITHIHM/libSMESH_Swig.cxx
Simple merge

diff --cc src/SMESH_SWIG_WITHIHM/libSMESH_Swig.h
index 86682ff5b79baa3465050fe6d74d9862fefae85e,654c3e699c200ba8e0fdec51d6d9d1c0f6dafa8b..931614c1ef0082a5216bb505475e78dfafc3e329
--- 1/src/SMESH_SWIG_WITHIHM/libSMESH_Swig.h
--- 2/src/SMESH_SWIG_WITHIHM/libSMESH_Swig.h
+++ b/src/SMESH_SWIG_WITHIHM/libSMESH_Swig.h
@@@ -56,39 -58,8 +58,39 @@@ typedef enu
      Actor      = ActorSelection,
      Elem0D     = Elem0DSelection,
      Ball       = BallSelection
-   };
+   } SelectionMode;
  
 +typedef struct
 +{
 +  double r, g, b;
 +  int delta;
 +} surfaceColorStruct;
 +
 +typedef struct
 +{
 +  double r, g, b;
 +  int delta;
 +} volumeColorStruct;
 +
 +typedef struct
 +{
 +  double r, g, b;
 +} edgeColorStruct;
 +
 +typedef struct
 +{
 +  double r, g, b;
 +} nodeColorStruct;
 +
 +struct actorAspect
 +{
 +  surfaceColorStruct surfaceColor;
 +  volumeColorStruct volumeColor;
 +  edgeColorStruct edgeColor;
 +  nodeColorStruct nodeColor;
 +  double opacity;
 +};
 +
  class SMESH_SWIG_EXPORT SMESH_Swig
  {
  public:
@@@ -125,13 -98,15 +129,18 @@@
     */
    void                       SetMeshIcon( const char*, const bool, const bool );
  
 +  actorAspect                GetActorAspect(const char* Mesh_Entry, int viewId = 0 );
 +  void                       SetActorAspect( const actorAspect& actorPres, const char* Mesh_Entry, int viewId = 0  );
 +
+   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 -----------------------
-   int  getSelectionMode();
+   SelectionMode getSelectionMode();
    void select( const char *id, std::vector<int> ids, bool append = false );
    void select( const char *id, int id1, bool append = false );
+   void select( const char *id, std::vector<std::pair<int,int> >, bool apend = false );
  
  private:
    SALOMEDS::Study_var        myStudy;

diff --cc src/SMESH_SWIG_WITHIHM/libSMESH_Swig.i
index ac732d4672e8f64d8626a71b65cd20528cbd8f98,68b0e1ec5618d51a0aac5c44b623d2d879d02917..d00fff057496da611c9107bf70ab65b27461a133
--- 1/src/SMESH_SWIG_WITHIHM/libSMESH_Swig.i
--- 2/src/SMESH_SWIG_WITHIHM/libSMESH_Swig.i
+++ b/src/SMESH_SWIG_WITHIHM/libSMESH_Swig.i
@@@ -127,13 -101,16 +132,19 @@@ 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 );
  
 +  actorAspect GetActorAspect(const char* Mesh_Entry, int viewId = 0 );
 +  void SetActorAspect( const actorAspect& actorPres, const char* Mesh_Entry, int viewId = 0 );
 +
    // --------------------- for the test purposes -----------------------
-   int  getSelectionMode();
+   SelectionMode  getSelectionMode();
    void select( const char *id, std::vector<int> ids, bool append = false );
    void select( const char *id, int id1, bool append = false );
+   void select( const char *id, std::vector<std::pair<int,int> >, bool apend = false );
  
  };