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
Merge from V5_1_main 14/05/2010
[modules/smesh.git]
/
src
/
StdMeshers
/
StdMeshers_FaceSide.hxx
diff --git
a/src/StdMeshers/StdMeshers_FaceSide.hxx
b/src/StdMeshers/StdMeshers_FaceSide.hxx
index be410cf4ff6e12994a0395993ade1ca6b3cfec7a..69d3f87a89e35ac57e015a3810194839fe099d66 100644
(file)
--- a/
src/StdMeshers/StdMeshers_FaceSide.hxx
+++ b/
src/StdMeshers/StdMeshers_FaceSide.hxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
08
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-20
10
CEA/DEN, EDF R&D, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-19,6
+19,7
@@
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
+
// SMESH SMESH : implementaion of SMESH idl descriptions
// File : StdMeshers_FaceSide.hxx
// Created : Wed Jan 31 18:41:25 2007
// SMESH SMESH : implementaion of SMESH idl descriptions
// File : StdMeshers_FaceSide.hxx
// Created : Wed Jan 31 18:41:25 2007
@@
-28,14
+29,13
@@
#ifndef StdMeshers_FaceSide_HeaderFile
#define StdMeshers_FaceSide_HeaderFile
#ifndef StdMeshers_FaceSide_HeaderFile
#define StdMeshers_FaceSide_HeaderFile
-#include <gp_Pnt2d.hxx>
+#include <Geom2d_Curve.hxx>
+#include <GeomAdaptor_Curve.hxx>
#include <TopoDS_Edge.hxx>
#include <TopoDS_Vertex.hxx>
#include <TopoDS_Edge.hxx>
#include <TopoDS_Vertex.hxx>
-#include <Geom2d_Curve.hxx>
-#include <TopExp.hxx>
+#include <gp_Pnt2d.hxx>
#include "SMESH_StdMeshers.hxx"
#include "SMESH_StdMeshers.hxx"
-#include "SMESH_Algo.hxx"
#include <vector>
#include <list>
#include <vector>
#include <list>
@@
-47,7
+47,7
@@
class Adaptor2d_Curve2d;
class Adaptor3d_Curve;
class BRepAdaptor_CompCurve;
class TopoDS_Face;
class Adaptor3d_Curve;
class BRepAdaptor_CompCurve;
class TopoDS_Face;
-
class
SMESH_ComputeError;
+
struct
SMESH_ComputeError;
typedef struct uvPtStruct
{
typedef struct uvPtStruct
{
@@
-198,11
+198,16
@@
public:
protected:
protected:
+
+ // DON't FORGET tO update Reverse() when adding one more vector!
std::vector<uvPtStruct> myPoints, myFalsePoints;
std::vector<TopoDS_Edge> myEdge;
std::vector<Handle(Geom2d_Curve)> myC2d;
std::vector<uvPtStruct> myPoints, myFalsePoints;
std::vector<TopoDS_Edge> myEdge;
std::vector<Handle(Geom2d_Curve)> myC2d;
+ std::vector<GeomAdaptor_Curve> myC3dAdaptor;
std::vector<double> myFirst, myLast;
std::vector<double> myNormPar;
std::vector<double> myFirst, myLast;
std::vector<double> myNormPar;
+ std::vector<double> myEdgeLength;
+ std::vector<double> myIsUniform;
double myLength;
int myNbPonits, myNbSegments;
SMESH_Mesh* myMesh;
double myLength;
int myNbPonits, myNbSegments;
SMESH_Mesh* myMesh;