Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Temporarily rolling back the last integration
[modules/smesh.git]
/
src
/
SMDS
/
SMDS_FaceOfNodes.cxx
diff --git
a/src/SMDS/SMDS_FaceOfNodes.cxx
b/src/SMDS/SMDS_FaceOfNodes.cxx
index abc9c9d60b853ce6a801740552b44561db678889..aa687082475c0633983a49b859093ecbd6b5bdca 100644
(file)
--- a/
src/SMDS/SMDS_FaceOfNodes.cxx
+++ b/
src/SMDS/SMDS_FaceOfNodes.cxx
@@
-19,11
+19,17
@@
//
// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
//
// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
+#ifdef _MSC_VER
+#pragma warning(disable:4786)
+#endif
+
#include "SMDS_FaceOfNodes.hxx"
#include "SMDS_IteratorOfElements.hxx"
#include "SMDS_MeshNode.hxx"
#include "utilities.h"
#include "SMDS_FaceOfNodes.hxx"
#include "SMDS_IteratorOfElements.hxx"
#include "SMDS_MeshNode.hxx"
#include "utilities.h"
+using namespace std;
+
//=======================================================================
//function : NbEdges
//purpose :
//=======================================================================
//function : NbEdges
//purpose :
@@
-41,8
+47,9
@@
int SMDS_FaceOfNodes::NbFaces() const
int SMDS_FaceOfNodes::NbNodes() const
{
int SMDS_FaceOfNodes::NbNodes() const
{
- return myN
odes.size()
;
+ return myN
bNodes
;
}
}
+
//=======================================================================
//function : Print
//purpose :
//=======================================================================
//function : Print
//purpose :
@@
-56,52
+63,62
@@
void SMDS_FaceOfNodes::Print(ostream & OS) const
OS << myNodes[i] << ") " << endl;
}
OS << myNodes[i] << ") " << endl;
}
+//=======================================================================
+//function : elementsIterator
+//purpose :
+//=======================================================================
+
class SMDS_FaceOfNodes_MyIterator:public SMDS_ElemIterator
{
class SMDS_FaceOfNodes_MyIterator:public SMDS_ElemIterator
{
- const vector<const SMDS_MeshNode*>& mySet;
+ const SMDS_MeshNode* const *mySet;
+ int myLength;
int index;
public:
int index;
public:
- SMDS_FaceOfNodes_MyIterator(const
vector<const SMDS_MeshNode*>& s
):
- mySet(s),index(0) {}
+ SMDS_FaceOfNodes_MyIterator(const
SMDS_MeshNode* const *s, int l
):
+ mySet(s),
myLength(l),
index(0) {}
bool more()
{
bool more()
{
- return index<my
Set.size()
;
+ return index<my
Length
;
}
const SMDS_MeshElement* next()
{
index++;
return mySet[index-1];
}
const SMDS_MeshElement* next()
{
index++;
return mySet[index-1];
- }
+ }
};
};
-SMDS_ElemIteratorPtr SMDS_FaceOfNodes::
- elementsIterator(SMDSAbs_ElementType type) const
+
+SMDS_ElemIteratorPtr SMDS_FaceOfNodes::elementsIterator
+ (SMDSAbs_ElementType type) const
{
switch(type)
{
case SMDSAbs_Face:
return SMDS_MeshElement::elementsIterator(SMDSAbs_Face);
case SMDSAbs_Node:
{
switch(type)
{
case SMDSAbs_Face:
return SMDS_MeshElement::elementsIterator(SMDSAbs_Face);
case SMDSAbs_Node:
- return SMDS_ElemIteratorPtr(new SMDS_FaceOfNodes_MyIterator(myNodes));
+ return SMDS_ElemIteratorPtr(new SMDS_FaceOfNodes_MyIterator(myNodes
,myNbNodes
));
case SMDSAbs_Edge:
MESSAGE("Error : edge iterator for SMDS_FaceOfNodes not implemented");
break;
default:
return SMDS_ElemIteratorPtr
(new SMDS_IteratorOfElements
case SMDSAbs_Edge:
MESSAGE("Error : edge iterator for SMDS_FaceOfNodes not implemented");
break;
default:
return SMDS_ElemIteratorPtr
(new SMDS_IteratorOfElements
- (this,type,SMDS_ElemIteratorPtr(new SMDS_FaceOfNodes_MyIterator(myNodes))));
+ (this,type,SMDS_ElemIteratorPtr
+ (new SMDS_FaceOfNodes_MyIterator(myNodes,myNbNodes))));
}
}
+ return SMDS_ElemIteratorPtr();
}
SMDS_FaceOfNodes::SMDS_FaceOfNodes(const SMDS_MeshNode* node1,
const SMDS_MeshNode* node2,
const SMDS_MeshNode* node3)
{
}
SMDS_FaceOfNodes::SMDS_FaceOfNodes(const SMDS_MeshNode* node1,
const SMDS_MeshNode* node2,
const SMDS_MeshNode* node3)
{
- myN
odes.resize(3)
;
+ myN
bNodes = 3
;
myNodes[0]=node1;
myNodes[1]=node2;
myNodes[2]=node3;
myNodes[0]=node1;
myNodes[1]=node2;
myNodes[2]=node3;
+ myNodes[3]=0;
}
SMDS_FaceOfNodes::SMDS_FaceOfNodes(const SMDS_MeshNode* node1,
}
SMDS_FaceOfNodes::SMDS_FaceOfNodes(const SMDS_MeshNode* node1,
@@
-109,12
+126,26
@@
SMDS_FaceOfNodes::SMDS_FaceOfNodes(const SMDS_MeshNode* node1,
const SMDS_MeshNode* node3,
const SMDS_MeshNode* node4)
{
const SMDS_MeshNode* node3,
const SMDS_MeshNode* node4)
{
- myN
odes.resize(4)
;
+ myN
bNodes = 4
;
myNodes[0]=node1;
myNodes[1]=node2;
myNodes[2]=node3;
myNodes[3]=node4;
}
myNodes[0]=node1;
myNodes[1]=node2;
myNodes[2]=node3;
myNodes[3]=node4;
}
+bool SMDS_FaceOfNodes::ChangeNodes(const SMDS_MeshNode* nodes[],
+ const int nbNodes)
+{
+ myNbNodes = nbNodes;
+ myNodes[0]=nodes[0];
+ myNodes[1]=nodes[1];
+ myNodes[2]=nodes[2];
+ if (nbNodes == 4)
+ myNodes[3]=nodes[3];
+ else if (nbNodes != 3)
+ return false;
+
+ return true;
+}
/*bool operator<(const SMDS_FaceOfNodes& f1, const SMDS_FaceOfNodes& f2)
{
/*bool operator<(const SMDS_FaceOfNodes& f1, const SMDS_FaceOfNodes& f2)
{