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
+ void SetParameters(double aUparam, double aVparam);
[modules/smesh.git]
/
src
/
SMDS
/
SMDS_VtkFace.cxx
diff --git
a/src/SMDS/SMDS_VtkFace.cxx
b/src/SMDS/SMDS_VtkFace.cxx
index 80644c7e2ab6b2f9869d7755b043da4876fb52fc..56787bda0c232b07520ca874f95269b23a248763 100644
(file)
--- a/
src/SMDS/SMDS_VtkFace.cxx
+++ b/
src/SMDS/SMDS_VtkFace.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2010-201
2
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2010-201
3
CEA/DEN, EDF R&D, OPEN CASCADE
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
@@
-64,6
+64,9
@@
void SMDS_VtkFace::init(const std::vector<vtkIdType>& nodeIds, SMDS_Mesh* mesh)
case 9:
aType = VTK_BIQUADRATIC_QUAD;
break;
case 9:
aType = VTK_BIQUADRATIC_QUAD;
break;
+ case 7:
+ aType = VTK_BIQUADRATIC_TRIANGLE;
+ break;
default:
aType = VTK_POLYGON;
break;
default:
aType = VTK_POLYGON;
break;
@@
-116,6
+119,7
@@
int SMDS_VtkFace::NbEdges() const
{
case VTK_TRIANGLE:
case VTK_QUADRATIC_TRIANGLE:
{
case VTK_TRIANGLE:
case VTK_QUADRATIC_TRIANGLE:
+ case VTK_BIQUADRATIC_TRIANGLE:
nbEdges = 3;
break;
case VTK_QUAD:
nbEdges = 3;
break;
case VTK_QUAD:
@@
-167,6
+171,7
@@
bool SMDS_VtkFace::IsQuadratic() const
case VTK_QUADRATIC_TRIANGLE:
case VTK_QUADRATIC_QUAD:
case VTK_BIQUADRATIC_QUAD:
case VTK_QUADRATIC_TRIANGLE:
case VTK_QUADRATIC_QUAD:
case VTK_BIQUADRATIC_QUAD:
+ case VTK_BIQUADRATIC_TRIANGLE:
return true;
break;
default:
return true;
break;
default:
@@
-189,6
+194,7
@@
bool SMDS_VtkFace::IsMediumNode(const SMDS_MeshNode* node) const
switch (aVtkType)
{
case VTK_QUADRATIC_TRIANGLE:
switch (aVtkType)
{
case VTK_QUADRATIC_TRIANGLE:
+ case VTK_BIQUADRATIC_TRIANGLE:
rankFirstMedium = 3; // medium nodes are of rank 3,4,5
break;
case VTK_QUADRATIC_QUAD:
rankFirstMedium = 3; // medium nodes are of rank 3,4,5
break;
case VTK_QUADRATIC_QUAD:
@@
-245,13
+251,13
@@
SMDSAbs_GeometryType SMDS_VtkFace::GetGeomType() const
switch ( aVtkType ) {
case VTK_TRIANGLE:
case VTK_QUADRATIC_TRIANGLE:
switch ( aVtkType ) {
case VTK_TRIANGLE:
case VTK_QUADRATIC_TRIANGLE:
- return SMDSGeom_TRIANGLE;
+ case VTK_BIQUADRATIC_TRIANGLE: return SMDSGeom_TRIANGLE;
+
case VTK_QUAD:
case VTK_QUADRATIC_QUAD:
case VTK_QUAD:
case VTK_QUADRATIC_QUAD:
- case VTK_BIQUADRATIC_QUAD:
- return SMDSGeom_QUADRANGLE;
- case VTK_POLYGON:
- return SMDSGeom_POLYGON;
+ case VTK_BIQUADRATIC_QUAD: return SMDSGeom_QUADRANGLE;
+
+ case VTK_POLYGON: return SMDSGeom_POLYGON;
default:;
}
return SMDSGeom_NONE;
default:;
}
return SMDSGeom_NONE;
@@
-277,14
+283,14
@@
SMDS_ElemIteratorPtr SMDS_VtkFace::elementsIterator(SMDSAbs_ElementType type) co
}
}
}
}
-SMDS_
Elem
IteratorPtr SMDS_VtkFace::nodesIteratorToUNV() const
+SMDS_
Node
IteratorPtr SMDS_VtkFace::nodesIteratorToUNV() const
{
{
- return SMDS_
Elem
IteratorPtr(new SMDS_VtkCellIteratorToUNV(SMDS_Mesh::_meshList[myMeshId], myVtkID, GetEntityType()));
+ return SMDS_
Node
IteratorPtr(new SMDS_VtkCellIteratorToUNV(SMDS_Mesh::_meshList[myMeshId], myVtkID, GetEntityType()));
}
}
-SMDS_
ElemIteratorPtr SMDS_VtkFace::interlacedNodesElem
Iterator() const
+SMDS_
NodeIteratorPtr SMDS_VtkFace::interlacedNodes
Iterator() const
{
{
- return
SMDS_ElemIteratorPtr(new SMDS_VtkCellIteratorToUNV(SMDS_Mesh::_meshList[myMeshId], myVtkID, GetEntityType())
);
+ return
nodesIteratorToUNV(
);
}
//! change only the first node, used for temporary triangles in quadrangle to triangle adaptor
}
//! change only the first node, used for temporary triangles in quadrangle to triangle adaptor