Merge from BR_DEBUG_3_2_0b1

[modules/smesh.git] / src / SMESH_I / SMESH_MeshEditor_i.hxx

diff --git a/src/SMESH_I/SMESH_MeshEditor_i.hxx b/src/SMESH_I/SMESH_MeshEditor_i.hxx
index b72bd738c16dc970fcd2bc26c7689614216e2f0c..6433d9162b2783c72026ebfe7f074376255f201d 100644 (file)
--- a/src/SMESH_I/SMESH_MeshEditor_i.hxx
+++ b/src/SMESH_I/SMESH_MeshEditor_i.hxx
@@ -17,7 +17,7 @@
 //  License along with this library; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
-//  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 //
 //
@@ -36,6 +36,8 @@
 
 #include "SMESH_Mesh.hxx"
 
+class SMESH_MeshEditor;
+
 class SMESH_I_EXPORT SMESH_MeshEditor_i: public POA_SMESH::SMESH_MeshEditor
 {
  public:
@@ -49,14 +51,18 @@ class SMESH_I_EXPORT SMESH_MeshEditor_i: public POA_SMESH::SMESH_MeshEditor
   CORBA::Boolean RemoveElements(const SMESH::long_array & IDsOfElements);
   CORBA::Boolean RemoveNodes(const SMESH::long_array & IDsOfNodes);
 
-  CORBA::Boolean AddNode(CORBA::Double x, CORBA::Double y, CORBA::Double z);
-  CORBA::Boolean AddEdge(const SMESH::long_array & IDsOfNodes);
-  CORBA::Boolean AddFace(const SMESH::long_array & IDsOfNodes);
-  CORBA::Boolean AddVolume(const SMESH::long_array & IDsOfNodes);
-
-  CORBA::Boolean AddPolyhedralVolume(const SMESH::long_array & IDsOfNodes,
-                                     const SMESH::long_array & Quantities);
-  CORBA::Boolean AddPolyhedralVolumeByFaces(const SMESH::long_array & IdsOfFaces);
+  /*!
+   * Methods for creation new elements.
+   * Returns ID of created element or 0 if element not created
+   */
+  CORBA::Long AddNode(CORBA::Double x, CORBA::Double y, CORBA::Double z);
+  CORBA::Long AddEdge(const SMESH::long_array & IDsOfNodes);
+  CORBA::Long AddFace(const SMESH::long_array & IDsOfNodes);
+  CORBA::Long AddPolygonalFace(const SMESH::long_array & IDsOfNodes);
+  CORBA::Long AddVolume(const SMESH::long_array & IDsOfNodes);
+  CORBA::Long AddPolyhedralVolume(const SMESH::long_array & IDsOfNodes,
+                                  const SMESH::long_array & Quantities);
+  CORBA::Long AddPolyhedralVolumeByFaces(const SMESH::long_array & IdsOfFaces);
 
   CORBA::Boolean MoveNode(CORBA::Long NodeID,
                           CORBA::Double x, CORBA::Double y, CORBA::Double z);
@@ -117,6 +123,10 @@ class SMESH_I_EXPORT SMESH_MeshEditor_i: public POA_SMESH::SMESH_MeshEditor
                              SMESH::SMESH_MeshEditor::Smooth_Method Method,
                               bool                                   IsParametric);
 
+
+  void ConvertToQuadratic(CORBA::Boolean Force3d);
+  CORBA::Boolean ConvertFromQuadratic();
+
   void RenumberNodes();
   void RenumberElements();
 
@@ -197,6 +207,7 @@ class SMESH_I_EXPORT SMESH_MeshEditor_i: public POA_SMESH::SMESH_MeshEditor
   void MergeNodes (const SMESH::array_of_long_array& GroupsOfNodes);
   void MergeEqualElements();
 
+
   SMESH::SMESH_MeshEditor::Sew_Error
     SewFreeBorders(CORBA::Long FirstNodeID1,
                    CORBA::Long SecondNodeID1,
@@ -228,9 +239,48 @@ class SMESH_I_EXPORT SMESH_MeshEditor_i: public POA_SMESH::SMESH_MeshEditor
                     CORBA::Long NodeID2OfSide1ToMerge,
                     CORBA::Long NodeID2OfSide2ToMerge);
 
+  /*!
+   * Set new nodes for given element.
+   * If number of nodes is not corresponded to type of
+   * element - returns false
+   */
+  CORBA::Boolean ChangeElemNodes(CORBA::Long ide, const SMESH::long_array& newIDs);
+  
+  /*!
+   * If during last operation of MeshEditor some nodes were
+   * created this method returns list of it's IDs, if new nodes
+   * not creared - returns empty list
+   */
+  SMESH::long_array* GetLastCreatedNodes();
+
+  /*!
+   * If during last operation of MeshEditor some elements were
+   * created this method returns list of it's IDs, if new elements
+   * not creared - returns empty list
+   */
+  SMESH::long_array* GetLastCreatedElems();
+
+  //
+  // Internal methods
+  //
+
+  /*!
+   * \brief Update myLastCreatedNodes and myLastCreatedElems
+    * \param anEditor - it contains edition results
+   */
+  void UpdateLastResult(::SMESH_MeshEditor& anEditor);
+
+  /*!
+   * \brief Return edited mesh ID
+    * \retval int - mesh ID
+   */
+  int GetMeshId() const { return _myMesh->GetId(); }
+
  private:
   SMESHDS_Mesh * GetMeshDS() { return _myMesh->GetMeshDS(); }
   SMESH_Mesh   *_myMesh;
+  SMESH::long_array* myLastCreatedElems;
+  SMESH::long_array* myLastCreatedNodes;
 };
 
 #endif