Skip to content
Snippets Groups Projects
Commit 944b22e3 authored by Christophe Geuzaine's avatar Christophe Geuzaine
Browse files

*** empty log message ***

parent f1e7cef9
No related branches found
No related tags found
No related merge requests found
// $Id: OCCEdge.cpp,v 1.19 2007-01-31 12:27:18 remacle Exp $ // $Id: OCCEdge.cpp,v 1.20 2007-02-03 00:02:16 geuzaine Exp $
// //
// Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle // Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
// //
...@@ -45,7 +45,7 @@ OCCEdge::OCCEdge(GModel *model, TopoDS_Edge edge, int num, GVertex *v1, GVertex ...@@ -45,7 +45,7 @@ OCCEdge::OCCEdge(GModel *model, TopoDS_Edge edge, int num, GVertex *v1, GVertex
Range<double> OCCEdge::parBounds(int i) const Range<double> OCCEdge::parBounds(int i) const
{ {
return(Range<double>(s0,s1)); return Range<double>(s0, s1);
} }
void OCCEdge::setTrimmed (OCCFace *f) void OCCEdge::setTrimmed (OCCFace *f)
...@@ -64,12 +64,10 @@ SPoint2 OCCEdge::reparamOnFace(GFace *face, double epar,int dir) const ...@@ -64,12 +64,10 @@ SPoint2 OCCEdge::reparamOnFace(GFace *face, double epar,int dir) const
double t0,t1; double t0,t1;
Handle(Geom2d_Curve) c2d; Handle(Geom2d_Curve) c2d;
if(dir == 1) if(dir == 1){
{
c2d = BRep_Tool::CurveOnSurface(c, *s, t0, t1); c2d = BRep_Tool::CurveOnSurface(c, *s, t0, t1);
} }
else else{
{
c2d = BRep_Tool::CurveOnSurface(c_rev, *s, t0, t1); c2d = BRep_Tool::CurveOnSurface(c_rev, *s, t0, t1);
} }
...@@ -90,9 +88,12 @@ SPoint2 OCCEdge::reparamOnFace(GFace *face, double epar,int dir) const ...@@ -90,9 +88,12 @@ SPoint2 OCCEdge::reparamOnFace(GFace *face, double epar,int dir) const
const double dz = p1.z()-p2.z(); const double dz = p1.z()-p2.z();
if(sqrt(dx*dx+dy*dy+dz*dz) > 1.e-7 * CTX.lc){ if(sqrt(dx*dx+dy*dy+dz*dz) > 1.e-7 * CTX.lc){
// return reparamOnFace(face, epar,-1); // return reparamOnFace(face, epar,-1);
Msg(WARNING,"Reparam on face partially failed for curve %d surface %d at point %g",tag(),face->tag(),epar); Msg(WARNING, "Reparam on face partially failed for curve %d surface %d at point %g",
Msg(WARNING,"On the face %d local (%g %g) global (%g %g %g)",face->tag(),u,v,p2.x(),p2.y(),p2.z()); tag(), face->tag(), epar);
Msg(WARNING,"On the edge %d local (%g) global (%g %g %g)",tag(),epar,p1.x(),p1.y(),p1.z()); Msg(WARNING, "On the face %d local (%g %g) global (%g %g %g)",
face->tag(), u, v, p2.x(), p2.y(), p2.z());
Msg(WARNING, "On the edge %d local (%g) global (%g %g %g)",
tag(), epar, p1.x(), p1.y(), p1.z());
GPoint ppp = face->closestPoint(SPoint3(p1.x(), p1.y(), p1.z())); GPoint ppp = face->closestPoint(SPoint3(p1.x(), p1.y(), p1.z()));
return SPoint2(ppp.u(), ppp.v()); return SPoint2(ppp.u(), ppp.v());
} }
......
// $Id: gmshEdge.cpp,v 1.27 2007-02-02 17:16:46 remacle Exp $ // $Id: gmshEdge.cpp,v 1.28 2007-02-03 00:02:16 geuzaine Exp $
// //
// Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle // Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
// //
...@@ -145,15 +145,15 @@ SPoint2 gmshEdge::reparamOnFace(GFace *face, double epar,int dir) const ...@@ -145,15 +145,15 @@ SPoint2 gmshEdge::reparamOnFace(GFace *face, double epar,int dir) const
{ {
Surface *s = (Surface*) face->getNativePtr(); Surface *s = (Surface*) face->getNativePtr();
if (s->geometry) if(s->geometry){
{
switch (c->Typ) { switch (c->Typ) {
case MSH_SEGM_LINE: case MSH_SEGM_LINE:
{ {
Vertex *v[3]; Vertex *v[3];
List_Read(c->Control_Points, 0, &v[1]); List_Read(c->Control_Points, 0, &v[1]);
List_Read(c->Control_Points, 1, &v[2]); List_Read(c->Control_Points, 1, &v[2]);
SPoint2 p = v[1] -> pntOnGeometry + (v[2] -> pntOnGeometry - v[1] -> pntOnGeometry) * epar; SPoint2 p = v[1]->pntOnGeometry +
(v[2]->pntOnGeometry - v[1]->pntOnGeometry) * epar;
return p; return p;
} }
break; break;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment