mirror of
https://git.salome-platform.org/gitpub/modules/smesh.git
synced 2025-01-18 08:40:36 +05:00
untabify
This commit is contained in:
parent
35c05cab65
commit
7e8c1c603d
@ -284,21 +284,21 @@ SMDS_MeshEdge* SMESHDS_Mesh::AddEdgeWithID(int n1, int n2, int ID)
|
||||
}
|
||||
|
||||
SMDS_MeshEdge* SMESHDS_Mesh::AddEdgeWithID(const SMDS_MeshNode * n1,
|
||||
const SMDS_MeshNode * n2,
|
||||
int ID)
|
||||
const SMDS_MeshNode * n2,
|
||||
int ID)
|
||||
{
|
||||
return AddEdgeWithID(n1->GetID(),
|
||||
n2->GetID(),
|
||||
ID);
|
||||
n2->GetID(),
|
||||
ID);
|
||||
}
|
||||
|
||||
SMDS_MeshEdge* SMESHDS_Mesh::AddEdge(const SMDS_MeshNode * n1,
|
||||
const SMDS_MeshNode * n2)
|
||||
const SMDS_MeshNode * n2)
|
||||
{
|
||||
SMDS_MeshEdge* anElem = SMDS_Mesh::AddEdge(n1,n2);
|
||||
if(anElem) myScript->AddEdge(anElem->GetID(),
|
||||
n1->GetID(),
|
||||
n2->GetID());
|
||||
n1->GetID(),
|
||||
n2->GetID());
|
||||
return anElem;
|
||||
}
|
||||
|
||||
@ -314,25 +314,25 @@ SMDS_MeshFace* SMESHDS_Mesh::AddFaceWithID(int n1, int n2, int n3, int ID)
|
||||
}
|
||||
|
||||
SMDS_MeshFace* SMESHDS_Mesh::AddFaceWithID(const SMDS_MeshNode * n1,
|
||||
const SMDS_MeshNode * n2,
|
||||
const SMDS_MeshNode * n3,
|
||||
int ID)
|
||||
const SMDS_MeshNode * n2,
|
||||
const SMDS_MeshNode * n3,
|
||||
int ID)
|
||||
{
|
||||
return AddFaceWithID(n1->GetID(),
|
||||
n2->GetID(),
|
||||
n3->GetID(),
|
||||
ID);
|
||||
n2->GetID(),
|
||||
n3->GetID(),
|
||||
ID);
|
||||
}
|
||||
|
||||
SMDS_MeshFace* SMESHDS_Mesh::AddFace( const SMDS_MeshNode * n1,
|
||||
const SMDS_MeshNode * n2,
|
||||
const SMDS_MeshNode * n3)
|
||||
const SMDS_MeshNode * n2,
|
||||
const SMDS_MeshNode * n3)
|
||||
{
|
||||
SMDS_MeshFace *anElem = SMDS_Mesh::AddFace(n1, n2, n3);
|
||||
if(anElem) myScript->AddFace(anElem->GetID(),
|
||||
n1->GetID(),
|
||||
n2->GetID(),
|
||||
n3->GetID());
|
||||
n1->GetID(),
|
||||
n2->GetID(),
|
||||
n3->GetID());
|
||||
return anElem;
|
||||
}
|
||||
|
||||
@ -348,29 +348,29 @@ SMDS_MeshFace* SMESHDS_Mesh::AddFaceWithID(int n1, int n2, int n3, int n4, int I
|
||||
}
|
||||
|
||||
SMDS_MeshFace* SMESHDS_Mesh::AddFaceWithID(const SMDS_MeshNode * n1,
|
||||
const SMDS_MeshNode * n2,
|
||||
const SMDS_MeshNode * n3,
|
||||
const SMDS_MeshNode * n4,
|
||||
int ID)
|
||||
const SMDS_MeshNode * n2,
|
||||
const SMDS_MeshNode * n3,
|
||||
const SMDS_MeshNode * n4,
|
||||
int ID)
|
||||
{
|
||||
return AddFaceWithID(n1->GetID(),
|
||||
n2->GetID(),
|
||||
n3->GetID(),
|
||||
n4->GetID(),
|
||||
ID);
|
||||
n2->GetID(),
|
||||
n3->GetID(),
|
||||
n4->GetID(),
|
||||
ID);
|
||||
}
|
||||
|
||||
SMDS_MeshFace* SMESHDS_Mesh::AddFace(const SMDS_MeshNode * n1,
|
||||
const SMDS_MeshNode * n2,
|
||||
const SMDS_MeshNode * n3,
|
||||
const SMDS_MeshNode * n4)
|
||||
const SMDS_MeshNode * n2,
|
||||
const SMDS_MeshNode * n3,
|
||||
const SMDS_MeshNode * n4)
|
||||
{
|
||||
SMDS_MeshFace *anElem = SMDS_Mesh::AddFace(n1, n2, n3, n4);
|
||||
if(anElem) myScript->AddFace(anElem->GetID(),
|
||||
n1->GetID(),
|
||||
n2->GetID(),
|
||||
n3->GetID(),
|
||||
n4->GetID());
|
||||
n1->GetID(),
|
||||
n2->GetID(),
|
||||
n3->GetID(),
|
||||
n4->GetID());
|
||||
return anElem;
|
||||
}
|
||||
|
||||
@ -386,29 +386,29 @@ SMDS_MeshVolume* SMESHDS_Mesh::AddVolumeWithID(int n1, int n2, int n3, int n4, i
|
||||
}
|
||||
|
||||
SMDS_MeshVolume* SMESHDS_Mesh::AddVolumeWithID(const SMDS_MeshNode * n1,
|
||||
const SMDS_MeshNode * n2,
|
||||
const SMDS_MeshNode * n3,
|
||||
const SMDS_MeshNode * n4,
|
||||
int ID)
|
||||
const SMDS_MeshNode * n2,
|
||||
const SMDS_MeshNode * n3,
|
||||
const SMDS_MeshNode * n4,
|
||||
int ID)
|
||||
{
|
||||
return AddVolumeWithID(n1->GetID(),
|
||||
n2->GetID(),
|
||||
n3->GetID(),
|
||||
n4->GetID(),
|
||||
ID);
|
||||
n2->GetID(),
|
||||
n3->GetID(),
|
||||
n4->GetID(),
|
||||
ID);
|
||||
}
|
||||
|
||||
SMDS_MeshVolume* SMESHDS_Mesh::AddVolume(const SMDS_MeshNode * n1,
|
||||
const SMDS_MeshNode * n2,
|
||||
const SMDS_MeshNode * n3,
|
||||
const SMDS_MeshNode * n4)
|
||||
const SMDS_MeshNode * n2,
|
||||
const SMDS_MeshNode * n3,
|
||||
const SMDS_MeshNode * n4)
|
||||
{
|
||||
SMDS_MeshVolume *anElem = SMDS_Mesh::AddVolume(n1, n2, n3, n4);
|
||||
if(anElem) myScript->AddVolume(anElem->GetID(),
|
||||
n1->GetID(),
|
||||
n2->GetID(),
|
||||
n3->GetID(),
|
||||
n4->GetID());
|
||||
n1->GetID(),
|
||||
n2->GetID(),
|
||||
n3->GetID(),
|
||||
n4->GetID());
|
||||
return anElem;
|
||||
}
|
||||
|
||||
@ -424,33 +424,33 @@ SMDS_MeshVolume* SMESHDS_Mesh::AddVolumeWithID(int n1, int n2, int n3, int n4, i
|
||||
}
|
||||
|
||||
SMDS_MeshVolume* SMESHDS_Mesh::AddVolumeWithID(const SMDS_MeshNode * n1,
|
||||
const SMDS_MeshNode * n2,
|
||||
const SMDS_MeshNode * n3,
|
||||
const SMDS_MeshNode * n4,
|
||||
const SMDS_MeshNode * n5,
|
||||
int ID)
|
||||
const SMDS_MeshNode * n2,
|
||||
const SMDS_MeshNode * n3,
|
||||
const SMDS_MeshNode * n4,
|
||||
const SMDS_MeshNode * n5,
|
||||
int ID)
|
||||
{
|
||||
return AddVolumeWithID(n1->GetID(),
|
||||
n2->GetID(),
|
||||
n3->GetID(),
|
||||
n4->GetID(),
|
||||
n5->GetID(),
|
||||
ID);
|
||||
n2->GetID(),
|
||||
n3->GetID(),
|
||||
n4->GetID(),
|
||||
n5->GetID(),
|
||||
ID);
|
||||
}
|
||||
|
||||
SMDS_MeshVolume* SMESHDS_Mesh::AddVolume(const SMDS_MeshNode * n1,
|
||||
const SMDS_MeshNode * n2,
|
||||
const SMDS_MeshNode * n3,
|
||||
const SMDS_MeshNode * n4,
|
||||
const SMDS_MeshNode * n5)
|
||||
const SMDS_MeshNode * n2,
|
||||
const SMDS_MeshNode * n3,
|
||||
const SMDS_MeshNode * n4,
|
||||
const SMDS_MeshNode * n5)
|
||||
{
|
||||
SMDS_MeshVolume *anElem = SMDS_Mesh::AddVolume(n1, n2, n3, n4, n5);
|
||||
if(anElem) myScript->AddVolume(anElem->GetID(),
|
||||
n1->GetID(),
|
||||
n2->GetID(),
|
||||
n3->GetID(),
|
||||
n4->GetID(),
|
||||
n5->GetID());
|
||||
n1->GetID(),
|
||||
n2->GetID(),
|
||||
n3->GetID(),
|
||||
n4->GetID(),
|
||||
n5->GetID());
|
||||
return anElem;
|
||||
}
|
||||
|
||||
@ -466,37 +466,37 @@ SMDS_MeshVolume* SMESHDS_Mesh::AddVolumeWithID(int n1, int n2, int n3, int n4, i
|
||||
}
|
||||
|
||||
SMDS_MeshVolume* SMESHDS_Mesh::AddVolumeWithID(const SMDS_MeshNode * n1,
|
||||
const SMDS_MeshNode * n2,
|
||||
const SMDS_MeshNode * n3,
|
||||
const SMDS_MeshNode * n4,
|
||||
const SMDS_MeshNode * n5,
|
||||
const SMDS_MeshNode * n6,
|
||||
int ID)
|
||||
const SMDS_MeshNode * n2,
|
||||
const SMDS_MeshNode * n3,
|
||||
const SMDS_MeshNode * n4,
|
||||
const SMDS_MeshNode * n5,
|
||||
const SMDS_MeshNode * n6,
|
||||
int ID)
|
||||
{
|
||||
return AddVolumeWithID(n1->GetID(),
|
||||
n2->GetID(),
|
||||
n3->GetID(),
|
||||
n4->GetID(),
|
||||
n5->GetID(),
|
||||
n6->GetID(),
|
||||
ID);
|
||||
n2->GetID(),
|
||||
n3->GetID(),
|
||||
n4->GetID(),
|
||||
n5->GetID(),
|
||||
n6->GetID(),
|
||||
ID);
|
||||
}
|
||||
|
||||
SMDS_MeshVolume* SMESHDS_Mesh::AddVolume(const SMDS_MeshNode * n1,
|
||||
const SMDS_MeshNode * n2,
|
||||
const SMDS_MeshNode * n3,
|
||||
const SMDS_MeshNode * n4,
|
||||
const SMDS_MeshNode * n5,
|
||||
const SMDS_MeshNode * n6)
|
||||
const SMDS_MeshNode * n2,
|
||||
const SMDS_MeshNode * n3,
|
||||
const SMDS_MeshNode * n4,
|
||||
const SMDS_MeshNode * n5,
|
||||
const SMDS_MeshNode * n6)
|
||||
{
|
||||
SMDS_MeshVolume *anElem = SMDS_Mesh::AddVolume(n1, n2, n3, n4, n5, n6);
|
||||
if(anElem) myScript->AddVolume(anElem->GetID(),
|
||||
n1->GetID(),
|
||||
n2->GetID(),
|
||||
n3->GetID(),
|
||||
n4->GetID(),
|
||||
n5->GetID(),
|
||||
n6->GetID());
|
||||
n1->GetID(),
|
||||
n2->GetID(),
|
||||
n3->GetID(),
|
||||
n4->GetID(),
|
||||
n5->GetID(),
|
||||
n6->GetID());
|
||||
return anElem;
|
||||
}
|
||||
|
||||
@ -512,45 +512,45 @@ SMDS_MeshVolume* SMESHDS_Mesh::AddVolumeWithID(int n1, int n2, int n3, int n4, i
|
||||
}
|
||||
|
||||
SMDS_MeshVolume* SMESHDS_Mesh::AddVolumeWithID(const SMDS_MeshNode * n1,
|
||||
const SMDS_MeshNode * n2,
|
||||
const SMDS_MeshNode * n3,
|
||||
const SMDS_MeshNode * n4,
|
||||
const SMDS_MeshNode * n5,
|
||||
const SMDS_MeshNode * n6,
|
||||
const SMDS_MeshNode * n7,
|
||||
const SMDS_MeshNode * n8,
|
||||
int ID)
|
||||
const SMDS_MeshNode * n2,
|
||||
const SMDS_MeshNode * n3,
|
||||
const SMDS_MeshNode * n4,
|
||||
const SMDS_MeshNode * n5,
|
||||
const SMDS_MeshNode * n6,
|
||||
const SMDS_MeshNode * n7,
|
||||
const SMDS_MeshNode * n8,
|
||||
int ID)
|
||||
{
|
||||
return AddVolumeWithID(n1->GetID(),
|
||||
n2->GetID(),
|
||||
n3->GetID(),
|
||||
n4->GetID(),
|
||||
n5->GetID(),
|
||||
n6->GetID(),
|
||||
n7->GetID(),
|
||||
n8->GetID(),
|
||||
ID);
|
||||
n2->GetID(),
|
||||
n3->GetID(),
|
||||
n4->GetID(),
|
||||
n5->GetID(),
|
||||
n6->GetID(),
|
||||
n7->GetID(),
|
||||
n8->GetID(),
|
||||
ID);
|
||||
}
|
||||
|
||||
SMDS_MeshVolume* SMESHDS_Mesh::AddVolume(const SMDS_MeshNode * n1,
|
||||
const SMDS_MeshNode * n2,
|
||||
const SMDS_MeshNode * n3,
|
||||
const SMDS_MeshNode * n4,
|
||||
const SMDS_MeshNode * n5,
|
||||
const SMDS_MeshNode * n6,
|
||||
const SMDS_MeshNode * n7,
|
||||
const SMDS_MeshNode * n8)
|
||||
const SMDS_MeshNode * n2,
|
||||
const SMDS_MeshNode * n3,
|
||||
const SMDS_MeshNode * n4,
|
||||
const SMDS_MeshNode * n5,
|
||||
const SMDS_MeshNode * n6,
|
||||
const SMDS_MeshNode * n7,
|
||||
const SMDS_MeshNode * n8)
|
||||
{
|
||||
SMDS_MeshVolume *anElem = SMDS_Mesh::AddVolume(n1, n2, n3, n4, n5, n6, n7, n8);
|
||||
if(anElem) myScript->AddVolume(anElem->GetID(),
|
||||
n1->GetID(),
|
||||
n2->GetID(),
|
||||
n3->GetID(),
|
||||
n4->GetID(),
|
||||
n5->GetID(),
|
||||
n6->GetID(),
|
||||
n7->GetID(),
|
||||
n8->GetID());
|
||||
n1->GetID(),
|
||||
n2->GetID(),
|
||||
n3->GetID(),
|
||||
n4->GetID(),
|
||||
n5->GetID(),
|
||||
n6->GetID(),
|
||||
n7->GetID(),
|
||||
n8->GetID());
|
||||
return anElem;
|
||||
}
|
||||
|
||||
@ -1059,7 +1059,7 @@ void SMESHDS_Mesh::UnSetMeshElementOnShape(const SMDS_MeshElement * elem,
|
||||
//=======================================================================
|
||||
TopoDS_Shape SMESHDS_Mesh::ShapeToMesh() const
|
||||
{
|
||||
return myShape;
|
||||
return myShape;
|
||||
}
|
||||
|
||||
//=======================================================================
|
||||
@ -1143,7 +1143,7 @@ SMESHDS_Mesh::GetHypothesis(const TopoDS_Shape & S) const
|
||||
//=======================================================================
|
||||
SMESHDS_Script* SMESHDS_Mesh::GetScript()
|
||||
{
|
||||
return myScript;
|
||||
return myScript;
|
||||
}
|
||||
|
||||
//=======================================================================
|
||||
@ -1152,7 +1152,7 @@ SMESHDS_Script* SMESHDS_Mesh::GetScript()
|
||||
//=======================================================================
|
||||
void SMESHDS_Mesh::ClearScript()
|
||||
{
|
||||
myScript->Clear();
|
||||
myScript->Clear();
|
||||
}
|
||||
|
||||
//=======================================================================
|
||||
@ -1161,9 +1161,9 @@ void SMESHDS_Mesh::ClearScript()
|
||||
//=======================================================================
|
||||
bool SMESHDS_Mesh::HasMeshElements(const TopoDS_Shape & S)
|
||||
{
|
||||
if (myShape.IsNull()) MESSAGE("myShape is NULL");
|
||||
int Index = myIndexToShape.FindIndex(S);
|
||||
return myShapeIndexToSubMesh.find(Index)!=myShapeIndexToSubMesh.end();
|
||||
if (myShape.IsNull()) MESSAGE("myShape is NULL");
|
||||
int Index = myIndexToShape.FindIndex(S);
|
||||
return myShapeIndexToSubMesh.find(Index)!=myShapeIndexToSubMesh.end();
|
||||
}
|
||||
|
||||
//=======================================================================
|
||||
@ -1235,7 +1235,7 @@ int SMESHDS_Mesh::AddCompoundSubmesh(const TopoDS_Shape& S,
|
||||
//=======================================================================
|
||||
const TopoDS_Shape& SMESHDS_Mesh::IndexToShape(int ShapeIndex) const
|
||||
{
|
||||
return myIndexToShape.FindKey(ShapeIndex);
|
||||
return myIndexToShape.FindKey(ShapeIndex);
|
||||
}
|
||||
|
||||
//=======================================================================
|
||||
@ -1351,8 +1351,8 @@ SMDS_MeshEdge* SMESHDS_Mesh::AddEdge(const SMDS_MeshNode* n1,
|
||||
{
|
||||
SMDS_MeshEdge* anElem = SMDS_Mesh::AddEdge(n1,n2,n12);
|
||||
if(anElem) myScript->AddEdge(anElem->GetID(),
|
||||
n1->GetID(),
|
||||
n2->GetID(),
|
||||
n1->GetID(),
|
||||
n2->GetID(),
|
||||
n12->GetID());
|
||||
return anElem;
|
||||
}
|
||||
@ -1367,9 +1367,9 @@ SMDS_MeshEdge* SMESHDS_Mesh::AddEdgeWithID(const SMDS_MeshNode * n1,
|
||||
int ID)
|
||||
{
|
||||
return AddEdgeWithID(n1->GetID(),
|
||||
n2->GetID(),
|
||||
n2->GetID(),
|
||||
n12->GetID(),
|
||||
ID);
|
||||
ID);
|
||||
}
|
||||
|
||||
|
||||
@ -1386,7 +1386,7 @@ SMDS_MeshFace* SMESHDS_Mesh::AddFace(const SMDS_MeshNode * n1,
|
||||
{
|
||||
SMDS_MeshFace *anElem = SMDS_Mesh::AddFace(n1,n2,n3,n12,n23,n31);
|
||||
if(anElem) myScript->AddFace(anElem->GetID(),
|
||||
n1->GetID(), n2->GetID(), n3->GetID(),
|
||||
n1->GetID(), n2->GetID(), n3->GetID(),
|
||||
n12->GetID(), n23->GetID(), n31->GetID());
|
||||
return anElem;
|
||||
}
|
||||
@ -1417,7 +1417,7 @@ SMDS_MeshFace* SMESHDS_Mesh::AddFaceWithID(const SMDS_MeshNode * n1,
|
||||
{
|
||||
return AddFaceWithID(n1->GetID(), n2->GetID(), n3->GetID(),
|
||||
n12->GetID(), n23->GetID(), n31->GetID(),
|
||||
ID);
|
||||
ID);
|
||||
}
|
||||
|
||||
|
||||
@ -1436,7 +1436,7 @@ SMDS_MeshFace* SMESHDS_Mesh::AddFace(const SMDS_MeshNode * n1,
|
||||
{
|
||||
SMDS_MeshFace *anElem = SMDS_Mesh::AddFace(n1,n2,n3,n4,n12,n23,n34,n41);
|
||||
if(anElem) myScript->AddFace(anElem->GetID(),
|
||||
n1->GetID(), n2->GetID(), n3->GetID(), n4->GetID(),
|
||||
n1->GetID(), n2->GetID(), n3->GetID(), n4->GetID(),
|
||||
n12->GetID(), n23->GetID(), n34->GetID(), n41->GetID());
|
||||
return anElem;
|
||||
}
|
||||
@ -1469,7 +1469,7 @@ SMDS_MeshFace* SMESHDS_Mesh::AddFaceWithID(const SMDS_MeshNode * n1,
|
||||
{
|
||||
return AddFaceWithID(n1->GetID(), n2->GetID(), n3->GetID(), n4->GetID(),
|
||||
n12->GetID(), n23->GetID(), n34->GetID(), n41->GetID(),
|
||||
ID);
|
||||
ID);
|
||||
}
|
||||
|
||||
|
||||
@ -1490,8 +1490,8 @@ SMDS_MeshVolume* SMESHDS_Mesh::AddVolume(const SMDS_MeshNode * n1,
|
||||
{
|
||||
SMDS_MeshVolume *anElem = SMDS_Mesh::AddVolume(n1,n2,n3,n4,n12,n23,n31,n14,n24,n34);
|
||||
if(anElem) myScript->AddVolume(anElem->GetID(),
|
||||
n1->GetID(), n2->GetID(), n3->GetID(), n4->GetID(),
|
||||
n12->GetID(), n23->GetID(), n31->GetID(),
|
||||
n1->GetID(), n2->GetID(), n3->GetID(), n4->GetID(),
|
||||
n12->GetID(), n23->GetID(), n31->GetID(),
|
||||
n14->GetID(), n24->GetID(), n34->GetID());
|
||||
return anElem;
|
||||
}
|
||||
@ -1509,7 +1509,7 @@ SMDS_MeshVolume* SMESHDS_Mesh::AddVolumeWithID(int n1, int n2, int n3, int n4,
|
||||
if(anElem) myScript->AddVolume(ID,n1,n2,n3,n4,n12,n23,n31,n14,n24,n34);
|
||||
return anElem;
|
||||
}
|
||||
|
||||
|
||||
//=======================================================================
|
||||
//function : AddVolumeWithID
|
||||
//purpose : 2d order tetrahedron of 10 nodes
|
||||
@ -1575,7 +1575,7 @@ SMDS_MeshVolume* SMESHDS_Mesh::AddVolumeWithID(int n1, int n2, int n3, int n4, i
|
||||
n15,n25,n35,n45);
|
||||
return anElem;
|
||||
}
|
||||
|
||||
|
||||
//=======================================================================
|
||||
//function : AddVolumeWithID
|
||||
//purpose : 2d order pyramid of 13 nodes
|
||||
@ -1652,7 +1652,7 @@ SMDS_MeshVolume* SMESHDS_Mesh::AddVolumeWithID(int n1, int n2, int n3,
|
||||
n45,n56,n64,n14,n25,n36);
|
||||
return anElem;
|
||||
}
|
||||
|
||||
|
||||
//=======================================================================
|
||||
//function : AddVolumeWithID
|
||||
//purpose : 2d order Pentahedron with 15 nodes
|
||||
@ -1740,7 +1740,7 @@ SMDS_MeshVolume* SMESHDS_Mesh::AddVolumeWithID(int n1, int n2, int n3, int n4,
|
||||
n56,n67,n78,n85,n15,n26,n37,n48);
|
||||
return anElem;
|
||||
}
|
||||
|
||||
|
||||
//=======================================================================
|
||||
//function : AddVolumeWithID
|
||||
//purpose : 2d order Hexahedrons with 20 nodes
|
||||
|
Loading…
Reference in New Issue
Block a user