diff --git a/Geo/Geo.cpp b/Geo/Geo.cpp index da739dc63a791b9842f414de76a5fbf9f88abe87..6202a71995ea8e2d23fa111269830946a85d21a2 100644 --- a/Geo/Geo.cpp +++ b/Geo/Geo.cpp @@ -1,4 +1,4 @@ -// $Id: Geo.cpp,v 1.67 2006-12-20 15:50:57 remacle Exp $ +// $Id: Geo.cpp,v 1.68 2006-12-24 13:37:20 remacle Exp $ // // Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle // @@ -3303,3 +3303,18 @@ void Projette(Vertex * v, double mat[3][3]) v->Pos.Y = Y; v->Pos.Z = Z; } + + +void Surface::print_info () +{ + Msg(INFO,"Surface %d of type %d",Num,Typ); + Msg(INFO,"Generatrices : "); + Curve *C; + for(int i = 0; i < List_Nbr(Generatrices); i++) { + List_Read(Generatrices, i, &C); + Msg(INFO,"%d of type %d begin %d end %d ",C->Num,C->Typ,C->beg->Num,C->end->Num); + Msg(INFO,"CircleParams : %g %g %g %g %g %g %g %g", + C->Circle.t1,C->Circle.t2,C->Circle.f1,C->Circle.f2,C->Circle.incl,C->Circle.n[0],C->Circle.n[1],C->Circle.n[2]); + } + +} diff --git a/Geo/Geo.h b/Geo/Geo.h index 9a59daef2026782ce826d717a7d4267d57d391d8..60a49f75340c003fdb2046d1cfac7e5d2602cc25 100644 --- a/Geo/Geo.h +++ b/Geo/Geo.h @@ -90,6 +90,7 @@ struct _Surf{ struct _Surf *Support; ExtrudeParams *Extrude; DrawingColor Color; + void print_info (); }; typedef struct _Surf Surface; diff --git a/Geo/GeoInterpolation.cpp b/Geo/GeoInterpolation.cpp index a356e9ee3ed3f464586712bad2d0f62e442787df..ef6b973314aa52e62d2d6024c4508ec3c26e3f52 100644 --- a/Geo/GeoInterpolation.cpp +++ b/Geo/GeoInterpolation.cpp @@ -1,4 +1,4 @@ -// $Id: GeoInterpolation.cpp,v 1.9 2006-12-21 09:35:46 remacle Exp $ +// $Id: GeoInterpolation.cpp,v 1.10 2006-12-24 13:37:20 remacle Exp $ // // Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle // @@ -495,13 +495,14 @@ Vertex InterpolateSurface(Surface * s, double u, double v, int i, issphere; double eps = 1.e-6; - if(s->Extrude && s->Extrude->geo.Mode == EXTRUDED_ENTITY && - s->Typ != MSH_SURF_PLAN) { - Curve *c = FindCurve(s->Extrude->geo.Source); - Vertex v1 = InterpolateCurve(c, u, 0); - s->Extrude->Extrude(v, v1.Pos.X, v1.Pos.Y, v1.Pos.Z); - return v1; - } +// if(s->Extrude && s->Extrude->geo.Mode == EXTRUDED_ENTITY && +// s->Typ != MSH_SURF_PLAN) { +// Curve *c = FindCurve(s->Extrude->geo.Source); +// Vertex v1 = InterpolateCurve(c, u, 0); +// s->Extrude->Extrude(v, v1.Pos.X, v1.Pos.Y, v1.Pos.Z); +// // Msg(INFO,"COUCOUCOUCOUC"); +// return v1; +// } if(derivee) { diff --git a/Geo/gmshFace.cpp b/Geo/gmshFace.cpp index 399de136554abd6b1f53c6f3ab9ce0b872c506ea..3ef716bbeb0954500e9bee864476bf76bb51692a 100644 --- a/Geo/gmshFace.cpp +++ b/Geo/gmshFace.cpp @@ -1,4 +1,4 @@ -// $Id: gmshFace.cpp,v 1.31 2006-12-16 01:25:58 geuzaine Exp $ +// $Id: gmshFace.cpp,v 1.32 2006-12-24 13:37:20 remacle Exp $ // // Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle // @@ -65,6 +65,7 @@ gmshFace::gmshFace(GModel *m, Surface *face) embedded_vertices.push_back(gv); } } + // face->print_info(); resetMeshAttributes(); }