X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMESH_I%2FSMESH_MeshEditor_i.cxx;h=89088d3f63bdd50595764759809d1471a265c9eb;hp=22a03ed6f558dfeffe9b31b658763dbdcbc2cbc3;hb=888669652e8ebdff0161e485913c1d3b93e4b5dc;hpb=bef9beee88cac57394b8dc3bc914381c1a2fff83

diff --git a/src/SMESH_I/SMESH_MeshEditor_i.cxx b/src/SMESH_I/SMESH_MeshEditor_i.cxx
index 22a03ed6f..89088d3f6 100644
--- a/src/SMESH_I/SMESH_MeshEditor_i.cxx
+++ b/src/SMESH_I/SMESH_MeshEditor_i.cxx
@@ -1,18 +1,34 @@
-using namespace std;
-//  File      : SMESH_MeshEditor_i.cxx
-//  Created   : Wed Jun 19 18:43:26 2002
-//  Author    : Nicolas REJNERI
-
-//  Project   : SALOME
-//  Module    : SMESH
-//  Copyright : Open CASCADE 2002
+//  SMESH SMESH_I : idl implementation based on 'SMESH' unit's calsses
+//
+//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS 
+// 
+//  This library is free software; you can redistribute it and/or 
+//  modify it under the terms of the GNU Lesser General Public 
+//  License as published by the Free Software Foundation; either 
+//  version 2.1 of the License. 
+// 
+//  This library is distributed in the hope that it will be useful, 
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of 
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
+//  Lesser General Public License for more details. 
+// 
+//  You should have received a copy of the GNU Lesser General Public 
+//  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 
+//
+//
+//
+//  File   : SMESH_MeshEditor_i.cxx
+//  Author : Nicolas REJNERI
+//  Module : SMESH
 //  $Header$
 
+using namespace std;
 #include "SMESH_MeshEditor_i.hxx"
 
-#include "SMDS_MeshEdgesIterator.hxx"
-#include "SMDS_MeshFacesIterator.hxx"
-#include "SMDS_MeshVolumesIterator.hxx"
 #include "SMDS_MeshEdge.hxx"
 #include "SMDS_MeshFace.hxx"
 #include "SMDS_MeshVolume.hxx"
@@ -22,16 +38,15 @@ using namespace std;
 #include <TColStd_MapOfInteger.hxx>
 #include <TColStd_MapIteratorOfMapOfInteger.hxx>
 
-
-
 //=============================================================================
 /*!
  *  
  */
 //=============================================================================
 
-SMESH_MeshEditor_i::SMESH_MeshEditor_i(const Handle(SMESHDS_Mesh)& theMesh) {
-  _myMeshDS = theMesh;
+SMESH_MeshEditor_i::SMESH_MeshEditor_i(SMESHDS_Mesh* theMesh)
+{
+	_myMeshDS = theMesh;
 };
 
 //=============================================================================
@@ -40,13 +55,16 @@ SMESH_MeshEditor_i::SMESH_MeshEditor_i(const Handle(SMESHDS_Mesh)& theMesh) {
  */
 //=============================================================================
 
-CORBA::Boolean SMESH_MeshEditor_i::RemoveElements(const SMESH::long_array& IDsOfElements) {
-  for (int i = 0 ; i< IDsOfElements.length(); i++) {
-    CORBA::Long index = IDsOfElements[i];
-    _myMeshDS->RemoveElement(index);
-    MESSAGE ( "Element "<< index  << " was removed" )
-  }
- return true;
+CORBA::Boolean SMESH_MeshEditor_i::RemoveElements(const SMESH::
+	long_array & IDsOfElements)
+{
+	for (int i = 0; i < IDsOfElements.length(); i++)
+	{
+		CORBA::Long index = IDsOfElements[i];
+		_myMeshDS->RemoveElement(_myMeshDS->FindElement(index));
+		MESSAGE("Element " << index << " was removed")
+	}
+	return true;
 };
 
 //=============================================================================
@@ -55,66 +73,23 @@ CORBA::Boolean SMESH_MeshEditor_i::RemoveElements(const SMESH::long_array& IDsOf
  */
 //=============================================================================
 
-CORBA::Boolean SMESH_MeshEditor_i::RemoveNodes(const SMESH::long_array& IDsOfNodes) {
-
-  // Here we try to collect all 1D, 2D and 3D elements which contain at least one 
-  // of <IDsOfNodes> in order to remove such elements. 
-  // This seems correct since e.g a triangle without 1 vertex looks nonsense.
-  TColStd_MapOfInteger elemsToRemove;
-
-  for (int i = 0 ; i< IDsOfNodes.length(); i++) {
-
-    CORBA::Long ID = IDsOfNodes[i];
-
-    SMDS_MeshEdgesIterator edgeIt(_myMeshDS);
-    for (; edgeIt.More(); edgeIt.Next()) {
-      Handle(SMDS_MeshEdge) anEdge = Handle(SMDS_MeshEdge)::DownCast(edgeIt.Value());
-      for (Standard_Integer i = 0; i < anEdge->NbNodes(); i++) {
-	if (anEdge->GetConnection(i) == ID) {
-	  Standard_Integer elemID = anEdge->GetID();
-	  if (!elemsToRemove.Contains(elemID)) elemsToRemove.Add(elemID);
-	}
-      }
-    }
-
-    SMDS_MeshFacesIterator faceIt(_myMeshDS);
-    for (; faceIt.More(); faceIt.Next()) {
-      Handle(SMDS_MeshFace) aFace = Handle(SMDS_MeshFace)::DownCast(faceIt.Value());
-      for (Standard_Integer i = 0; i < aFace->NbNodes(); i++) {
-	if (aFace->GetConnection(i) == ID) {
-	  Standard_Integer elemID = aFace->GetID();
-	  if (!elemsToRemove.Contains(elemID)) elemsToRemove.Add(elemID);
-	}
-      }
-    }
-  
-    SMDS_MeshVolumesIterator volIt(_myMeshDS);
-    for (; volIt.More(); volIt.Next()) {
-      Handle(SMDS_MeshVolume) aVol = Handle(SMDS_MeshVolume)::DownCast(volIt.Value());
-      for (Standard_Integer i = 0; i < aVol->NbNodes(); i++) {
-	if (aVol->GetConnection(i) == ID) {
-	  Standard_Integer elemID = aVol->GetID();
-	  if (!elemsToRemove.Contains(elemID)) elemsToRemove.Add(elemID);
+CORBA::Boolean SMESH_MeshEditor_i::RemoveNodes(const SMESH::
+	long_array & IDsOfNodes)
+{
+	// It's nodes' turn to die
+	for (int i = 0; i < IDsOfNodes.length(); i++)
+	{
+		const SMDS_MeshNode * node=_myMeshDS->FindNode(IDsOfNodes[i]);
+		if(node==NULL)
+		{
+			MESSAGE("SMESH_MeshEditor_i::RemoveNodes: Node "<<IDsOfNodes[i]
+				<<" not found");
+			continue;
+		}
+		_myMeshDS->RemoveNode(node);
+		MESSAGE("Node " << IDsOfNodes[i] << " was removed")
 	}
-      }
-    }
-  }
-
-  // Now remove them!
-  TColStd_MapIteratorOfMapOfInteger it(elemsToRemove);
-  for (; it.More(); it.Next()) {
-    Standard_Integer elemID = it.Key();
-    _myMeshDS->RemoveElement(elemID);
-    MESSAGE("RemoveNodes(): element removed: " << elemID)
-  }
-  
-  // It's nodes' turn to die
-  for (int i = 0 ; i< IDsOfNodes.length(); i++) {
-    CORBA::Long index = IDsOfNodes[i];
-    _myMeshDS->RemoveNode(index);
-    MESSAGE ( "Node "<< index  << " was removed" )
-  }
- return true;
+	return true;
 };
 
 //=============================================================================
@@ -123,14 +98,16 @@ CORBA::Boolean SMESH_MeshEditor_i::RemoveNodes(const SMESH::long_array& IDsOfNod
  */
 //=============================================================================
 
-CORBA::Boolean SMESH_MeshEditor_i::AddEdge(const SMESH::long_array& IDsOfNodes) {
-  int NbNodes = IDsOfNodes.length();
-  if ( NbNodes == 2 ) {
-    CORBA::Long index1 = IDsOfNodes[0];
-    CORBA::Long index2 = IDsOfNodes[1];
-    int idTri = _myMeshDS->AddEdge(index1,index2);
-  }
-  return true;
+CORBA::Boolean SMESH_MeshEditor_i::AddEdge(const SMESH::long_array & IDsOfNodes)
+{
+	int NbNodes = IDsOfNodes.length();
+	if (NbNodes == 2)
+	{
+		CORBA::Long index1 = IDsOfNodes[0];
+		CORBA::Long index2 = IDsOfNodes[1];
+		_myMeshDS->AddEdge(_myMeshDS->FindNode(index1), _myMeshDS->FindNode(index2));
+	}
+	return true;
 }
 
 //=============================================================================
@@ -140,12 +117,11 @@ CORBA::Boolean SMESH_MeshEditor_i::AddEdge(const SMESH::long_array& IDsOfNodes)
 //=============================================================================
 
 CORBA::Boolean SMESH_MeshEditor_i::AddNode(CORBA::Double x,
-					   CORBA::Double y,
-					   CORBA::Double z) {
-  MESSAGE( " AddNode " << x << " , " << y << " , " << z )
-  int idNode = _myMeshDS->AddNode(x,y,z);
-  MESSAGE( " idNode " << idNode )
-  return true;
+	CORBA::Double y, CORBA::Double z)
+{
+	MESSAGE(" AddNode " << x << " , " << y << " , " << z)
+		int idNode = _myMeshDS->AddNode(x, y, z)->GetID();
+	MESSAGE(" idNode " << idNode) return true;
 }
 
 //=============================================================================
@@ -154,21 +130,20 @@ CORBA::Boolean SMESH_MeshEditor_i::AddNode(CORBA::Double x,
  */
 //=============================================================================
 
-CORBA::Boolean SMESH_MeshEditor_i::AddFace(const SMESH::long_array& IDsOfNodes) {
-  int NbNodes = IDsOfNodes.length();
-  if ( NbNodes == 3 ) {
-    CORBA::Long index1 = IDsOfNodes[0];
-    CORBA::Long index2 = IDsOfNodes[1];
-    CORBA::Long index3 = IDsOfNodes[2];
-    int idTri = _myMeshDS->AddFace(index1,index2,index3);
-  } else  if ( NbNodes == 4 ) {
-    CORBA::Long index1 = IDsOfNodes[0];
-    CORBA::Long index2 = IDsOfNodes[1];
-    CORBA::Long index3 = IDsOfNodes[2];
-    CORBA::Long index4 = IDsOfNodes[3];
-    int idTri = _myMeshDS->AddFace(index1,index2,index3,index4);
-  }
- return true;
+CORBA::Boolean SMESH_MeshEditor_i::AddFace(const SMESH::long_array & IDsOfNodes)
+{
+	int NbNodes = IDsOfNodes.length();
+	const SMDS_MeshNode* nodes[4];
+	for(int i=0;i<NbNodes;i++) nodes[i]=_myMeshDS->FindNode(IDsOfNodes[i]);
+	if (NbNodes == 3)
+	{
+		_myMeshDS->AddFace(nodes[0], nodes[1], nodes[2]);
+	}
+	else if (NbNodes == 4)
+	{
+		_myMeshDS->AddFace(nodes[0], nodes[1], nodes[2], nodes[3]);
+	}
+	return true;
 };
 
 //=============================================================================
@@ -177,39 +152,19 @@ CORBA::Boolean SMESH_MeshEditor_i::AddFace(const SMESH::long_array& IDsOfNodes)
  */
 //=============================================================================
 
-CORBA::Boolean SMESH_MeshEditor_i::AddVolume(const SMESH::long_array& IDsOfNodes) {
-  int NbNodes = IDsOfNodes.length();
-  if ( NbNodes == 4 ) {
-    CORBA::Long index1 = IDsOfNodes[0];
-    CORBA::Long index2 = IDsOfNodes[1];
-    CORBA::Long index3 = IDsOfNodes[2];
-    CORBA::Long index4 = IDsOfNodes[3];
-    int idTetra = _myMeshDS->AddVolume(index1,index2,index3,index4);
-  } else if ( NbNodes == 5 ) {
-    CORBA::Long index1 = IDsOfNodes[0];
-    CORBA::Long index2 = IDsOfNodes[1];
-    CORBA::Long index3 = IDsOfNodes[2];
-    CORBA::Long index4 = IDsOfNodes[3];
-    CORBA::Long index5 = IDsOfNodes[4];
-    int idPyramid = _myMeshDS->AddVolume(index1,index2,index3,index4,index5);
-  } else if ( NbNodes == 6 ) {
-    CORBA::Long index1 = IDsOfNodes[0];
-    CORBA::Long index2 = IDsOfNodes[1];
-    CORBA::Long index3 = IDsOfNodes[2];
-    CORBA::Long index4 = IDsOfNodes[3];
-    CORBA::Long index5 = IDsOfNodes[4];
-    CORBA::Long index6 = IDsOfNodes[5];
-    int idPrism = _myMeshDS->AddVolume(index1,index2,index3,index4,index5,index6);
-  } else if ( NbNodes == 8 ) {
-    CORBA::Long index1 = IDsOfNodes[0];
-    CORBA::Long index2 = IDsOfNodes[1];
-    CORBA::Long index3 = IDsOfNodes[2];
-    CORBA::Long index4 = IDsOfNodes[3];
-    CORBA::Long index5 = IDsOfNodes[4];
-    CORBA::Long index6 = IDsOfNodes[5];
-    CORBA::Long index7 = IDsOfNodes[6];
-    CORBA::Long index8 = IDsOfNodes[7];
-    int idHexa = _myMeshDS->AddVolume(index1,index2,index3,index4,index5,index6,index7,index8);
-  } 
-  return true;
+CORBA::Boolean SMESH_MeshEditor_i::AddVolume(const SMESH::
+	long_array & IDsOfNodes)
+{
+	int NbNodes = IDsOfNodes.length();
+	const SMDS_MeshNode* n[8];
+	for(int i=0;i<NbNodes;i++) n[i]=_myMeshDS->FindNode(IDsOfNodes[i]);
+
+	switch(NbNodes)
+	{
+	case 4:_myMeshDS->AddVolume(n[0],n[1],n[2],n[3]); break;
+	case 5:_myMeshDS->AddVolume(n[0],n[1],n[2],n[3],n[4]); break;
+	case 6:_myMeshDS->AddVolume(n[0],n[1],n[2],n[3],n[4],n[5]); break;
+	case 8:_myMeshDS->AddVolume(n[0],n[1],n[2],n[3],n[4],n[5],n[6],n[7]); break;
+	}
+	return true;
 };