diff --git a/Geo/OCCEdge.h b/Geo/OCCEdge.h
index 9a31a9c7b166066881dc40e5911a9a34ec79dddd..bc3de167008f57269974da4154cdbf556df0dd50 100644
--- a/Geo/OCCEdge.h
+++ b/Geo/OCCEdge.h
@@ -49,7 +49,7 @@ class OCCEdge : public GEdge {
virtual double curvature (double par) const;
virtual SPoint2 reparamOnFace(GFace * face, double epar, int dir) const ;
ModelType getNativeType() const { return OpenCascadeModel; }
- void * getNativePtr() const { return (void*) &c; }
+ void * getNativePtr() const { return (void*)&c; }
virtual double parFromPoint(const SPoint3 &pt) const;
virtual int minimumMeshSegments () const;
virtual int minimumDrawSegments () const;
diff --git a/Geo/OCCFace.cpp b/Geo/OCCFace.cpp
index 668c24a34c6b4f9fbe47cee9870c589add9e93a0..347abe9fdb629852da68a44480072fb67aa2c2b0 100644
--- a/Geo/OCCFace.cpp
+++ b/Geo/OCCFace.cpp
@@ -1,4 +1,4 @@
-// $Id: OCCFace.cpp,v 1.27 2008-01-30 15:27:41 remacle Exp $
+// $Id: OCCFace.cpp,v 1.28 2008-02-03 08:54:28 geuzaine Exp $
//
// Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
//
@@ -119,7 +119,7 @@ Pair<SVector3,SVector3> OCCFace::firstDer(const SPoint2 ¶m) const
{
gp_Pnt pnt;
gp_Vec du, dv;
- occface->D1(param.x(), param.y(),pnt,du,dv);
+ occface->D1(param.x(), param.y(), pnt, du, dv);
return Pair<SVector3,SVector3>(SVector3(du.X(), du.Y(), du.Z()),
SVector3(dv.X(), dv.Y(), dv.Z()));
@@ -143,11 +143,11 @@ GPoint OCCFace::closestPoint(const SPoint3 & qp) const
}
double pp[2];
- proj.LowerDistanceParameters (pp[0], pp[1]);
+ proj.LowerDistanceParameters(pp[0], pp[1]);
Msg(INFO,"projection lower distance parameters %g %g",pp[0],pp[1]);
- if((pp[0]<umin || umax<pp[0]) || (pp[1]<vmin || vmax<pp[1])){
+ if((pp[0] < umin || umax < pp[0]) || (pp[1]<vmin || vmax<pp[1])){
Msg(GERROR,"Point projection is out of face bounds");
return GPoint(0, 0);
}
@@ -175,8 +175,8 @@ SPoint2 OCCFace::parFromPoint(const SPoint3 &qp) const
Msg(GERROR,"OCC Project Point on Surface FAIL");
return GFace::parFromPoint(qp);
}
- double U,V;
- proj.LowerDistanceParameters (U, V);
+ double U, V;
+ proj.LowerDistanceParameters(U, V);
return SPoint2(U, V);
}
diff --git a/Geo/OCCRegion.h b/Geo/OCCRegion.h
index e6216057f787e3459e4a2d99e15d42743ba68bce..e69f156357fe194852803c1bc3566f14acf7a3d4 100644
--- a/Geo/OCCRegion.h
+++ b/Geo/OCCRegion.h
@@ -28,7 +28,7 @@ class OCCRegion : public GRegion {
protected:
TopoDS_Solid s;
public:
- OCCRegion(GModel *m, TopoDS_Solid s , int num, TopTools_IndexedMapOfShape &fmap);
+ OCCRegion(GModel *m, TopoDS_Solid s, int num, TopTools_IndexedMapOfShape &fmap);
virtual ~OCCRegion() {}
virtual GeomType geomType() const;
ModelType getNativeType() const { return OpenCascadeModel; }
diff --git a/Geo/OCCVertex.cpp b/Geo/OCCVertex.cpp
index df6c165223e56d8b6b3bbd8200cb44a2e419cb79..73ac586e20e44294daf21db4a660a4dfab5d044e 100644
--- a/Geo/OCCVertex.cpp
+++ b/Geo/OCCVertex.cpp
@@ -1,4 +1,4 @@
-// $Id: OCCVertex.cpp,v 1.12 2008-01-20 10:10:41 geuzaine Exp $
+// $Id: OCCVertex.cpp,v 1.13 2008-02-03 08:54:28 geuzaine Exp $
//
// Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
//
@@ -30,12 +30,12 @@ double max_surf_curvature(const GVertex *gv, double x, double y, double z,
const GEdge *_myGEdge)
{
std::list<GFace *> faces = _myGEdge->faces();
- std::list<GFace *>::iterator it = faces.begin();
+ std::list<GFace *>::iterator it = faces.begin();
double curv = 1.e-22;
while(it != faces.end()){
- SPoint2 par = gv->reparamOnFace((*it),1);
+ SPoint2 par = gv->reparamOnFace((*it), 1);
double cc = (*it)->curvature(par);
- if(cc > 0) curv = std::max(curv, cc);
+ if(cc > 0) curv = std::max(curv, cc);
++it;
}
return curv;
@@ -45,7 +45,7 @@ double OCCVertex::max_curvature_of_surfaces() const
{
if(max_curvature < 0){
for(std::list<GEdge*>::const_iterator it = l_edges.begin();
- it != l_edges.end(); ++it ){
+ it != l_edges.end(); ++it){
max_curvature = std::max(max_surf_curvature(this, x(), y(), z(), *it),
max_curvature);
}
@@ -67,9 +67,9 @@ SPoint2 OCCVertex::reparamOnFace(GFace *gf, int dir) const
double s1,s0;
Handle(Geom2d_Curve) curve2d = BRep_Tool::CurveOnSurface(*c, *s, s0, s1);
if((*it)->getBeginVertex() == this)
- return (*it)->reparamOnFace(gf,s0,dir);
+ return (*it)->reparamOnFace(gf, s0, dir);
else if((*it)->getEndVertex() == this)
- return (*it)->reparamOnFace(gf,s1,dir);
+ return (*it)->reparamOnFace(gf, s1, dir);
}
}
++it;
@@ -83,9 +83,9 @@ SPoint2 OCCVertex::reparamOnFace(GFace *gf, int dir) const
double s1,s0;
Handle(Geom2d_Curve) curve2d = BRep_Tool::CurveOnSurface(*c, *s, s0, s1);
if((*it)->getBeginVertex() == this)
- return (*it)->reparamOnFace(gf,s0,dir);
+ return (*it)->reparamOnFace(gf, s0, dir);
else if((*it)->getEndVertex() == this)
- return (*it)->reparamOnFace(gf,s1,dir);
+ return (*it)->reparamOnFace(gf, s1, dir);
}
++it;
}
diff --git a/Geo/OCCVertex.h b/Geo/OCCVertex.h
index 83f23cf3eece259c11bc216f716bb9e0084eb997..2bc3abacb4f6e22a73e5ccad607cb3462080991b 100644
--- a/Geo/OCCVertex.h
+++ b/Geo/OCCVertex.h
@@ -30,37 +30,26 @@
class OCCVertex : public GVertex {
protected:
TopoDS_Vertex v;
- double _x,_y,_z;
+ double _x, _y, _z;
mutable double max_curvature;
double max_curvature_of_surfaces() const;
public:
OCCVertex(GModel *m, int num, TopoDS_Vertex _v) : GVertex(m, num), v(_v)
{
max_curvature = -1;
- gp_Pnt pnt = BRep_Tool::Pnt (v);
+ gp_Pnt pnt = BRep_Tool::Pnt(v);
_x = pnt.X();
_y = pnt.Y();
_z = pnt.Z();
mesh_vertices.push_back(new MVertex(x(), y(), z(), this));
}
virtual ~OCCVertex() {}
- virtual GPoint point() const
+ virtual GPoint point() const { return GPoint(x(), y(), z()); }
+ virtual double x() const { return _x; }
+ virtual double y() const { return _y; }
+ virtual double z() const { return _z; }
+ virtual void setPosition(GPoint &p)
{
- return GPoint(x(),y(),z());
- }
- virtual double x() const
- {
- return _x;
- }
- virtual double y() const
- {
- return _y;
- }
- virtual double z() const
- {
- return _z;
- }
- virtual void setPosition(GPoint &p){
_x = p.x();
_y = p.y();
_z = p.z();
@@ -68,9 +57,8 @@ class OCCVertex : public GVertex {
mesh_vertices.clear();
mesh_vertices.push_back(new MVertex(x(), y(), z(), this));
}
-
ModelType getNativeType() const { return OpenCascadeModel; }
- void * getNativePtr() const { return (void*) &v; }
+ void * getNativePtr() const { return (void*)&v; }
virtual SPoint2 reparamOnFace ( GFace *gf , int) const;
};