From 4649418e206545ed60c649e2675d47e132163213 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Sat, 4 Nov 2006 00:17:09 +0000
Subject: [PATCH] more mesh edit work
---
Common/Makefile | 23 +++++----
Fltk/Callbacks.cpp | 30 +++++------
Fltk/Makefile | 60 ++++++++++++----------
Fltk/Opengl_Window.cpp | 15 ++++--
Geo/MElement.cpp | 9 +++-
Geo/MElement.h | 3 ++
Geo/Makefile | 105 ++++++++++++++++++++------------------
Graphics/Makefile | 43 +++++++++-------
Graphics/SelectBuffer.cpp | 52 ++++++++-----------
Graphics/SelectBuffer.h | 8 ++-
Mesh/Makefile | 77 +++++++++++++++-------------
Parser/Makefile | 43 ++++++++--------
Plugin/Makefile | 4 +-
doc/TODO | 7 ++-
14 files changed, 253 insertions(+), 226 deletions(-)
diff --git a/Common/Makefile b/Common/Makefile
index 8734bbd992..402ca18e34 100644
--- a/Common/Makefile
+++ b/Common/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.111 2006-10-10 00:44:41 geuzaine Exp $
+# $Id: Makefile,v 1.112 2006-11-04 00:17:07 geuzaine Exp $
#
# Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle
#
@@ -129,9 +129,10 @@ CommandLine.o: CommandLine.cpp Gmsh.h Message.h ../DataStr/Malloc.h \
../Geo/SPoint3.h ../Geo/SPoint2.h ../Geo/MElement.h ../Geo/MVertex.h \
../Geo/MEdge.h ../Geo/MVertex.h ../Geo/SVector3.h ../Common/Hash.h \
../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h ../Common/Context.h \
- ../Geo/GFace.h ../Geo/GPoint.h ../Geo/GEntity.h ../Geo/MElement.h \
- ../Geo/SPoint2.h ../Geo/SVector3.h ../Geo/Pair.h ../Geo/GRegion.h \
- ../Geo/GEntity.h ../Geo/MElement.h ../Geo/SBoundingBox3d.h \
+ ../Geo/ExtrudeParams.h ../Geo/GFace.h ../Geo/GPoint.h ../Geo/GEntity.h \
+ ../Geo/MElement.h ../Geo/SPoint2.h ../Geo/SVector3.h ../Geo/Pair.h \
+ ../Geo/ExtrudeParams.h ../Geo/GRegion.h ../Geo/GEntity.h \
+ ../Geo/MElement.h ../Geo/ExtrudeParams.h ../Geo/SBoundingBox3d.h \
../Common/SmoothNormals.h OS.h
# 1 "/Users/geuzaine/.gmsh/Common//"
OS.o: OS.cpp Message.h
@@ -149,12 +150,14 @@ Visibility.o: Visibility.cpp Visibility.h GmshDefines.h ../Geo/GVertex.h \
../Geo/SPoint3.h ../Geo/SPoint2.h ../Geo/MElement.h ../Geo/MVertex.h \
../Geo/MEdge.h ../Geo/MVertex.h ../Geo/SVector3.h ../Common/Hash.h \
../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h ../Numeric/Numeric.h \
- ../Common/Context.h ../DataStr/List.h ../Geo/GFace.h ../Geo/GPoint.h \
- ../Geo/GEntity.h ../Geo/MElement.h ../Geo/SPoint2.h ../Geo/SVector3.h \
- ../Geo/Pair.h ../Geo/GRegion.h ../Geo/GEntity.h ../Geo/MElement.h \
- ../Geo/GModel.h ../Geo/GVertex.h ../Geo/GEdge.h ../Geo/GFace.h \
- ../Geo/GRegion.h ../Geo/SBoundingBox3d.h ../Common/SmoothNormals.h \
- ../Parser/Parser.h ../DataStr/Tree.h ../DataStr/avl.h
+ ../Common/Context.h ../DataStr/List.h ../Geo/ExtrudeParams.h \
+ ../Geo/GFace.h ../Geo/GPoint.h ../Geo/GEntity.h ../Geo/MElement.h \
+ ../Geo/SPoint2.h ../Geo/SVector3.h ../Geo/Pair.h ../Geo/ExtrudeParams.h \
+ ../Geo/GRegion.h ../Geo/GEntity.h ../Geo/MElement.h \
+ ../Geo/ExtrudeParams.h ../Geo/GModel.h ../Geo/GVertex.h ../Geo/GEdge.h \
+ ../Geo/GFace.h ../Geo/GRegion.h ../Geo/SBoundingBox3d.h \
+ ../Common/SmoothNormals.h ../Parser/Parser.h ../DataStr/Tree.h \
+ ../DataStr/avl.h
# 1 "/Users/geuzaine/.gmsh/Common//"
Trackball.o: Trackball.cpp Trackball.h
# 1 "/Users/geuzaine/.gmsh/Common//"
diff --git a/Fltk/Callbacks.cpp b/Fltk/Callbacks.cpp
index 42215a9832..93aa0dc773 100644
--- a/Fltk/Callbacks.cpp
+++ b/Fltk/Callbacks.cpp
@@ -1,4 +1,4 @@
-// $Id: Callbacks.cpp,v 1.467 2006-11-02 17:24:53 geuzaine Exp $
+// $Id: Callbacks.cpp,v 1.468 2006-11-04 00:17:07 geuzaine Exp $
//
// Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle
//
@@ -80,14 +80,14 @@ int SelectContour(int type, int num, List_T * List)
k = allEdgesLinked(num, List);
for(int i = 0; i < List_Nbr(List); i++) {
List_Read(List, i, &ip);
- HighlightEntityNum(0, abs(ip), 0, 0, true);
+ HighlightEntityNum(0, abs(ip), 0, 0);
}
break;
case ENT_SURFACE:
k = allFacesLinked(num, List);
for(int i = 0; i < List_Nbr(List); i++) {
List_Read(List, i, &ip);
- HighlightEntityNum(0, 0, abs(ip), 0, true);
+ HighlightEntityNum(0, 0, abs(ip), 0);
}
break;
}
@@ -2544,7 +2544,7 @@ static void _new_multiline(int type)
char ib = SelectEntity(ENT_POINT, vertices, edges, faces, regions, elements);
if(ib == 'l') {
for(unsigned int i = 0; i < vertices.size(); i++){
- HighlightEntity(vertices[i], true);
+ HighlightEntity(vertices[i]);
p[n++] = vertices[i]->tag();
}
Draw();
@@ -2619,7 +2619,7 @@ void geometry_elementary_add_new_line_cb(CALLBACK_ARGS)
"[Press 'u' to undo last selection or 'q' to abort]");
char ib = SelectEntity(ENT_POINT, vertices, edges, faces, regions, elements);
if(ib == 'l') {
- HighlightEntity(vertices[0], true);
+ HighlightEntity(vertices[0]);
Draw();
p[n++] = vertices[0]->tag();
}
@@ -2686,7 +2686,7 @@ void geometry_elementary_add_new_circle_cb(CALLBACK_ARGS)
"[Press 'u' to undo last selection or 'q' to abort]");
char ib = SelectEntity(ENT_POINT, vertices, edges, faces, regions, elements);
if(ib == 'l') {
- HighlightEntity(vertices[0], true);
+ HighlightEntity(vertices[0]);
Draw();
p[n++] = vertices[0]->tag();
}
@@ -2746,7 +2746,7 @@ void geometry_elementary_add_new_ellipse_cb(CALLBACK_ARGS)
"[Press 'u' to undo last selection or 'q' to abort]");
char ib = SelectEntity(ENT_POINT, vertices, edges, faces, regions, elements);
if(ib == 'l') {
- HighlightEntity(vertices[0], true);
+ HighlightEntity(vertices[0]);
Draw();
p[n++] = vertices[0]->tag();
}
@@ -2997,7 +2997,7 @@ static void _action_point_line_surface_volume(int action, int mode, char *what)
switch (type) {
case ENT_POINT:
for(unsigned int i = 0; i < vertices.size(); i++){
- HighlightEntity(vertices[i], true);
+ HighlightEntity(vertices[i]);
tag = vertices[i]->tag();
if(List_ISearchSeq(List1, &tag, fcmp_int) < 0)
List_Add(List1, &tag);
@@ -3005,7 +3005,7 @@ static void _action_point_line_surface_volume(int action, int mode, char *what)
break;
case ENT_LINE:
for(unsigned int i = 0; i < edges.size(); i++){
- HighlightEntity(edges[i], true);
+ HighlightEntity(edges[i]);
tag = edges[i]->tag();
if(List_ISearchSeq(List1, &tag, fcmp_int) < 0)
List_Add(List1, &tag);
@@ -3013,7 +3013,7 @@ static void _action_point_line_surface_volume(int action, int mode, char *what)
break;
case ENT_SURFACE:
for(unsigned int i = 0; i < faces.size(); i++){
- HighlightEntity(faces[i], true);
+ HighlightEntity(faces[i]);
tag = faces[i]->tag();
if(List_ISearchSeq(List1, &tag, fcmp_int) < 0)
List_Add(List1, &tag);
@@ -3021,7 +3021,7 @@ static void _action_point_line_surface_volume(int action, int mode, char *what)
break;
case ENT_VOLUME:
for(unsigned int i = 0; i < regions.size(); i++){
- HighlightEntity(regions[i], true);
+ HighlightEntity(regions[i]);
tag = regions[i]->tag();
if(List_ISearchSeq(List1, &tag, fcmp_int) < 0)
List_Add(List1, &tag);
@@ -3742,19 +3742,19 @@ static void _add_transfinite_elliptic(int type, int dim)
if(ib == 'l') {
switch (dim) {
case 1:
- HighlightEntity(edges[0], true);
+ HighlightEntity(edges[0]);
Draw();
p[n++] = edges[0]->tag();
break;
case 2:
case 3:
if(dim == 2){
- HighlightEntity(faces[0], true);
+ HighlightEntity(faces[0]);
Draw();
p[n++] = faces[0]->tag();
}
else{
- HighlightEntity(regions[0], true);
+ HighlightEntity(regions[0]);
Draw();
p[n++] = regions[0]->tag();
}
@@ -3767,7 +3767,7 @@ static void _add_transfinite_elliptic(int type, int dim)
"[Press 'e' to end selection, 'u' to undo last selection or 'q' to abort]");
ib = SelectEntity(ENT_POINT, vertices, edges, faces, regions, elements);
if(ib == 'l') {
- HighlightEntity(vertices[0], true);
+ HighlightEntity(vertices[0]);
Draw();
p[n++] = vertices[0]->tag();
}
diff --git a/Fltk/Makefile b/Fltk/Makefile
index 4a633fae58..8a491d4659 100644
--- a/Fltk/Makefile
+++ b/Fltk/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.108 2006-10-10 00:44:41 geuzaine Exp $
+# $Id: Makefile,v 1.109 2006-11-04 00:17:08 geuzaine Exp $
#
# Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle
#
@@ -87,10 +87,11 @@ Main.o: Main.cpp GUI.h Opengl_Window.h ../Mesh/Mesh.h \
../Geo/GVertex.h ../Geo/SVector3.h ../Geo/SPoint3.h ../Geo/SPoint3.h \
../Geo/SPoint2.h ../Geo/MElement.h ../Geo/MVertex.h ../Geo/MEdge.h \
../Geo/MVertex.h ../Geo/SVector3.h ../Common/Hash.h ../Geo/MFace.h \
- ../Geo/MVertex.h ../Geo/SVector3.h ../Geo/GFace.h ../Geo/GPoint.h \
- ../Geo/GEntity.h ../Geo/MElement.h ../Geo/SPoint2.h ../Geo/SVector3.h \
- ../Geo/Pair.h ../Geo/GRegion.h ../Geo/GEntity.h ../Geo/MElement.h \
- ../Geo/SBoundingBox3d.h
+ ../Geo/MVertex.h ../Geo/SVector3.h ../Geo/ExtrudeParams.h \
+ ../Geo/GFace.h ../Geo/GPoint.h ../Geo/GEntity.h ../Geo/MElement.h \
+ ../Geo/SPoint2.h ../Geo/SVector3.h ../Geo/Pair.h ../Geo/ExtrudeParams.h \
+ ../Geo/GRegion.h ../Geo/GEntity.h ../Geo/MElement.h \
+ ../Geo/ExtrudeParams.h ../Geo/SBoundingBox3d.h
# 1 "/Users/geuzaine/.gmsh/Fltk//"
Message.o: Message.cpp ../Common/Gmsh.h ../Common/Message.h \
../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
@@ -157,9 +158,10 @@ Callbacks.o: Callbacks.cpp ../Common/Gmsh.h ../Common/Message.h \
../Geo/SPoint3.h ../Geo/SPoint3.h ../Geo/SPoint2.h ../Geo/MElement.h \
../Geo/MVertex.h ../Geo/MEdge.h ../Geo/MVertex.h ../Geo/SVector3.h \
../Common/Hash.h ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h \
- ../Common/Context.h ../Geo/GFace.h ../Geo/GPoint.h ../Geo/GEntity.h \
- ../Geo/MElement.h ../Geo/SPoint2.h ../Geo/SVector3.h ../Geo/Pair.h \
- ../Geo/GRegion.h ../Geo/GEntity.h ../Geo/MElement.h \
+ ../Common/Context.h ../Geo/ExtrudeParams.h ../Geo/GFace.h \
+ ../Geo/GPoint.h ../Geo/GEntity.h ../Geo/MElement.h ../Geo/SPoint2.h \
+ ../Geo/SVector3.h ../Geo/Pair.h ../Geo/ExtrudeParams.h ../Geo/GRegion.h \
+ ../Geo/GEntity.h ../Geo/MElement.h ../Geo/ExtrudeParams.h \
../Parser/CreateFile.h ../Parser/OpenFile.h ../Common/CommandLine.h \
../Common/Options.h GUI.h Opengl_Window.h Colorbar_Window.h \
Popup_Button.h SpherePosition_Widget.h GUI_Extras.h Callbacks.h \
@@ -182,16 +184,17 @@ Opengl.o: Opengl.cpp ../Common/Gmsh.h ../Common/Message.h \
../Geo/GEntity.h ../Geo/GVertex.h ../Geo/SVector3.h ../Geo/SPoint3.h \
../Geo/SPoint3.h ../Geo/SPoint2.h ../Geo/MElement.h ../Geo/MVertex.h \
../Geo/MEdge.h ../Geo/MVertex.h ../Geo/SVector3.h ../Common/Hash.h \
- ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h ../Geo/GFace.h \
- ../Geo/GPoint.h ../Geo/GEntity.h ../Geo/MElement.h ../Geo/SPoint2.h \
- ../Geo/SVector3.h ../Geo/Pair.h ../Geo/GRegion.h ../Geo/GEntity.h \
- ../Geo/MElement.h GUI.h Opengl_Window.h ../Mesh/Mesh.h ../Mesh/Vertex.h \
- ../Mesh/Element.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Vertex.h \
- ../Mesh/Element.h ../Mesh/Face.h ../Mesh/Vertex.h ../Mesh/Element.h \
- ../Mesh/Edge.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
- ../Geo/ExtrudeParams.h ../Mesh/Metric.h ../Mesh/Vertex.h \
- ../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h Colorbar_Window.h \
- Popup_Button.h SpherePosition_Widget.h ../Graphics/gl2ps.h
+ ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h \
+ ../Geo/ExtrudeParams.h ../Geo/GFace.h ../Geo/GPoint.h ../Geo/GEntity.h \
+ ../Geo/MElement.h ../Geo/SPoint2.h ../Geo/SVector3.h ../Geo/Pair.h \
+ ../Geo/ExtrudeParams.h ../Geo/GRegion.h ../Geo/GEntity.h \
+ ../Geo/MElement.h ../Geo/ExtrudeParams.h GUI.h Opengl_Window.h \
+ ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Vertex.h \
+ ../Mesh/Simplex.h ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Face.h \
+ ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Edge.h ../Mesh/Vertex.h \
+ ../Mesh/Simplex.h ../Mesh/Metric.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
+ ../Mesh/Mesh.h ../Mesh/Matrix.h Colorbar_Window.h Popup_Button.h \
+ SpherePosition_Widget.h ../Graphics/gl2ps.h
# 1 "/Users/geuzaine/.gmsh/Fltk//"
Opengl_Window.o: Opengl_Window.cpp ../Common/Gmsh.h ../Common/Message.h \
../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
@@ -207,16 +210,17 @@ Opengl_Window.o: Opengl_Window.cpp ../Common/Gmsh.h ../Common/Message.h \
../Geo/GEntity.h ../Geo/GVertex.h ../Geo/SVector3.h ../Geo/SPoint3.h \
../Geo/SPoint3.h ../Geo/SPoint2.h ../Geo/MElement.h ../Geo/MVertex.h \
../Geo/MEdge.h ../Geo/MVertex.h ../Geo/SVector3.h ../Common/Hash.h \
- ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h ../Geo/GFace.h \
- ../Geo/GPoint.h ../Geo/GEntity.h ../Geo/MElement.h ../Geo/SPoint2.h \
- ../Geo/SVector3.h ../Geo/Pair.h ../Geo/GRegion.h ../Geo/GEntity.h \
- ../Geo/MElement.h GUI.h Opengl_Window.h ../Mesh/Mesh.h ../Mesh/Vertex.h \
- ../Mesh/Element.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Vertex.h \
- ../Mesh/Element.h ../Mesh/Face.h ../Mesh/Vertex.h ../Mesh/Element.h \
- ../Mesh/Edge.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
- ../Geo/ExtrudeParams.h ../Mesh/Metric.h ../Mesh/Vertex.h \
- ../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h Colorbar_Window.h \
- Popup_Button.h SpherePosition_Widget.h
+ ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h \
+ ../Geo/ExtrudeParams.h ../Geo/GFace.h ../Geo/GPoint.h ../Geo/GEntity.h \
+ ../Geo/MElement.h ../Geo/SPoint2.h ../Geo/SVector3.h ../Geo/Pair.h \
+ ../Geo/ExtrudeParams.h ../Geo/GRegion.h ../Geo/GEntity.h \
+ ../Geo/MElement.h ../Geo/ExtrudeParams.h GUI.h Opengl_Window.h \
+ ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Vertex.h \
+ ../Mesh/Simplex.h ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Face.h \
+ ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Edge.h ../Mesh/Vertex.h \
+ ../Mesh/Simplex.h ../Mesh/Metric.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
+ ../Mesh/Mesh.h ../Mesh/Matrix.h Colorbar_Window.h Popup_Button.h \
+ SpherePosition_Widget.h
# 1 "/Users/geuzaine/.gmsh/Fltk//"
Colorbar_Window.o: Colorbar_Window.cpp ../Common/Gmsh.h \
../Common/Message.h ../DataStr/Malloc.h ../DataStr/List.h \
diff --git a/Fltk/Opengl_Window.cpp b/Fltk/Opengl_Window.cpp
index 8758caac57..1ae4bd1edd 100644
--- a/Fltk/Opengl_Window.cpp
+++ b/Fltk/Opengl_Window.cpp
@@ -1,4 +1,4 @@
-// $Id: Opengl_Window.cpp,v 1.74 2006-11-01 22:19:26 geuzaine Exp $
+// $Id: Opengl_Window.cpp,v 1.75 2006-11-04 00:17:08 geuzaine Exp $
//
// Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle
//
@@ -392,10 +392,15 @@ int Opengl_Window::handle(int event)
WID->g_window->cursor(FL_CURSOR_CROSS, FL_BLACK, FL_WHITE);
else
WID->g_window->cursor(FL_CURSOR_DEFAULT, FL_BLACK, FL_WHITE);
- HighlightEntity(vertices.empty() ? 0 : vertices[0],
- edges.empty() ? 0 : edges[0],
- faces.empty() ? 0 : faces[0],
- regions.empty() ? 0 : regions[0]);
+ GEntity *ge = 0;
+ if(vertices.size()) ge = vertices[0];
+ else if(edges.size()) ge = edges[0];
+ else if(faces.size()) ge = faces[0];
+ else if(regions.size()) ge = regions[0];
+ MElement *me = elements.size() ? elements[0] : 0;
+ Msg(STATUS2N, "%s %s",
+ ge ? ge->getInfoString().c_str() : "",
+ me ? me->getInfoString().c_str() : "");
}
}
prev.set();
diff --git a/Geo/MElement.cpp b/Geo/MElement.cpp
index 5eeb4cb1cf..435c77e655 100644
--- a/Geo/MElement.cpp
+++ b/Geo/MElement.cpp
@@ -1,4 +1,4 @@
-// $Id: MElement.cpp,v 1.21 2006-09-26 01:05:44 geuzaine Exp $
+// $Id: MElement.cpp,v 1.22 2006-11-04 00:17:08 geuzaine Exp $
//
// Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle
//
@@ -99,6 +99,13 @@ SPoint3 MElement::barycenter()
return p;
}
+std::string MElement::getInfoString()
+{
+ char tmp[256];
+ sprintf(tmp, "Element %d", getNum());
+ return std::string(tmp);
+}
+
void MElement::writeMSH(FILE *fp, double version, bool binary, int num,
int elementary, int physical)
{
diff --git a/Geo/MElement.h b/Geo/MElement.h
index e095e177fd..65f73ec3a1 100644
--- a/Geo/MElement.h
+++ b/Geo/MElement.h
@@ -138,6 +138,9 @@ class MElement
virtual int getVolumeSign(){ return 1; }
virtual void setVolumePositive(){ if(getVolumeSign() < 0) revert(); }
+ // Returns an information string for the element
+ virtual std::string getInfoString();
+
// IO routines
virtual void writeMSH(FILE *fp, double version=1.0, bool binary=false,
int num=0, int elementary=1, int physical=1);
diff --git a/Geo/Makefile b/Geo/Makefile
index 9f278a5aca..67a0aec8be 100644
--- a/Geo/Makefile
+++ b/Geo/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.101 2006-10-10 00:44:41 geuzaine Exp $
+# $Id: Makefile,v 1.102 2006-11-04 00:17:08 geuzaine Exp $
#
# Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle
#
@@ -124,9 +124,9 @@ GeoUtils.o: GeoUtils.cpp ../Common/Gmsh.h ../Common/Message.h \
GEntity.o: GEntity.cpp GEntity.h Range.h SPoint3.h SBoundingBox3d.h \
../Common/GmshDefines.h MRep.h GEdge.h GVertex.h MVertex.h GPoint.h \
SVector3.h SPoint2.h MElement.h MEdge.h ../Common/Hash.h MFace.h \
- ../Numeric/Numeric.h ../Common/Context.h ../DataStr/List.h GFace.h \
- Pair.h GRegion.h ../Common/VertexArray.h ../Common/Message.h \
- ../Common/OS.h
+ ../Numeric/Numeric.h ../Common/Context.h ../DataStr/List.h \
+ ExtrudeParams.h GFace.h Pair.h GRegion.h ../Common/VertexArray.h \
+ ../Common/Message.h ../Common/OS.h
# 1 "/Users/geuzaine/.gmsh/Geo//"
GVertex.o: GVertex.cpp GVertex.h GEntity.h Range.h SPoint3.h \
SBoundingBox3d.h ../Common/GmshDefines.h MVertex.h GPoint.h
@@ -134,26 +134,27 @@ GVertex.o: GVertex.cpp GVertex.h GEntity.h Range.h SPoint3.h \
GEdge.o: GEdge.cpp GModel.h GVertex.h GEntity.h Range.h SPoint3.h \
SBoundingBox3d.h ../Common/GmshDefines.h MVertex.h GPoint.h GEdge.h \
SVector3.h SPoint2.h MElement.h MEdge.h ../Common/Hash.h MFace.h \
- ../Numeric/Numeric.h ../Common/Context.h ../DataStr/List.h GFace.h \
- Pair.h GRegion.h ../Common/SmoothNormals.h
+ ../Numeric/Numeric.h ../Common/Context.h ../DataStr/List.h \
+ ExtrudeParams.h GFace.h Pair.h GRegion.h ../Common/SmoothNormals.h
# 1 "/Users/geuzaine/.gmsh/Geo//"
GFace.o: GFace.cpp GModel.h GVertex.h GEntity.h Range.h SPoint3.h \
SBoundingBox3d.h ../Common/GmshDefines.h MVertex.h GPoint.h GEdge.h \
SVector3.h SPoint2.h MElement.h MEdge.h ../Common/Hash.h MFace.h \
- ../Numeric/Numeric.h ../Common/Context.h ../DataStr/List.h GFace.h \
- Pair.h GRegion.h ../Common/SmoothNormals.h ../Common/Message.h
+ ../Numeric/Numeric.h ../Common/Context.h ../DataStr/List.h \
+ ExtrudeParams.h GFace.h Pair.h GRegion.h ../Common/SmoothNormals.h \
+ ../Common/Message.h
# 1 "/Users/geuzaine/.gmsh/Geo//"
GRegion.o: GRegion.cpp GModel.h GVertex.h GEntity.h Range.h SPoint3.h \
SBoundingBox3d.h ../Common/GmshDefines.h MVertex.h GPoint.h GEdge.h \
SVector3.h SPoint2.h MElement.h MEdge.h ../Common/Hash.h MFace.h \
- ../Numeric/Numeric.h ../Common/Context.h ../DataStr/List.h GFace.h \
- Pair.h GRegion.h ../Common/SmoothNormals.h
+ ../Numeric/Numeric.h ../Common/Context.h ../DataStr/List.h \
+ ExtrudeParams.h GFace.h Pair.h GRegion.h ../Common/SmoothNormals.h
# 1 "/Users/geuzaine/.gmsh/Geo//"
GModel.o: GModel.cpp GModel.h GVertex.h GEntity.h Range.h SPoint3.h \
SBoundingBox3d.h ../Common/GmshDefines.h MVertex.h GPoint.h GEdge.h \
SVector3.h SPoint2.h MElement.h MEdge.h ../Common/Hash.h MFace.h \
- ../Numeric/Numeric.h ../Common/Context.h ../DataStr/List.h GFace.h \
- Pair.h GRegion.h ../Common/SmoothNormals.h
+ ../Numeric/Numeric.h ../Common/Context.h ../DataStr/List.h \
+ ExtrudeParams.h GFace.h Pair.h GRegion.h ../Common/SmoothNormals.h
# 1 "/Users/geuzaine/.gmsh/Geo//"
GModelIO.o: GModelIO.cpp ../Common/Message.h ../Common/GmshDefines.h \
gmshRegion.h ../Mesh/Mesh.h ../DataStr/List.h ../DataStr/Tree.h \
@@ -165,8 +166,8 @@ GModelIO.o: GModelIO.cpp ../Common/Message.h ../Common/GmshDefines.h \
gmshModel.h GModel.h GVertex.h GEntity.h Range.h SPoint3.h \
SBoundingBox3d.h MVertex.h GPoint.h GEdge.h SVector3.h SPoint2.h \
MElement.h MEdge.h ../Common/Hash.h MFace.h ../Numeric/Numeric.h \
- ../Common/Context.h GFace.h Pair.h GRegion.h ../Common/SmoothNormals.h \
- gmshFace.h gmshVertex.h gmshEdge.h
+ ../Common/Context.h ExtrudeParams.h GFace.h Pair.h GRegion.h \
+ ../Common/SmoothNormals.h gmshFace.h gmshVertex.h gmshEdge.h
# 1 "/Users/geuzaine/.gmsh/Geo//"
MVertex.o: MVertex.cpp MVertex.h SPoint3.h
# 1 "/Users/geuzaine/.gmsh/Geo//"
@@ -179,66 +180,68 @@ gmshModel.o: gmshModel.cpp gmshModel.h GModel.h GVertex.h GEntity.h \
Range.h SPoint3.h SBoundingBox3d.h ../Common/GmshDefines.h MVertex.h \
GPoint.h GEdge.h SVector3.h SPoint2.h MElement.h MEdge.h \
../Common/Hash.h MFace.h ../Numeric/Numeric.h ../Common/Context.h \
- ../DataStr/List.h GFace.h Pair.h GRegion.h ../Common/SmoothNormals.h \
- ../Mesh/Mesh.h ../DataStr/Tree.h ../DataStr/avl.h ../Mesh/Vertex.h \
- ../Mesh/Element.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Vertex.h \
- ../Mesh/Element.h ../Mesh/Face.h ../Mesh/Vertex.h ../Mesh/Element.h \
- ../Mesh/Edge.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
- ../Geo/ExtrudeParams.h ../Mesh/Metric.h ../Mesh/Vertex.h \
- ../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h Geo.h \
- ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
+ ../DataStr/List.h ExtrudeParams.h GFace.h Pair.h GRegion.h \
+ ../Common/SmoothNormals.h ../Mesh/Mesh.h ../DataStr/Tree.h \
+ ../DataStr/avl.h ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Vertex.h \
+ ../Mesh/Simplex.h ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Face.h \
+ ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Edge.h ../Mesh/Vertex.h \
+ ../Mesh/Simplex.h ../Geo/ExtrudeParams.h ../Mesh/Metric.h \
+ ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h \
+ Geo.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
../Common/Message.h gmshVertex.h gmshFace.h gmshEdge.h gmshRegion.h
# 1 "/Users/geuzaine/.gmsh/Geo//"
gmshEdge.o: gmshEdge.cpp gmshModel.h GModel.h GVertex.h GEntity.h Range.h \
SPoint3.h SBoundingBox3d.h ../Common/GmshDefines.h MVertex.h GPoint.h \
GEdge.h SVector3.h SPoint2.h MElement.h MEdge.h ../Common/Hash.h \
MFace.h ../Numeric/Numeric.h ../Common/Context.h ../DataStr/List.h \
- GFace.h Pair.h GRegion.h ../Common/SmoothNormals.h gmshEdge.h \
- gmshVertex.h ../Mesh/Mesh.h ../DataStr/Tree.h ../DataStr/avl.h \
- ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
- ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Face.h ../Mesh/Vertex.h \
- ../Mesh/Element.h ../Mesh/Edge.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
- ../Geo/ExtrudeParams.h ../Mesh/Metric.h ../Mesh/Vertex.h \
- ../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h \
- ../Mesh/Interpolation.h ../Mesh/Vertex.h ../Mesh/Mesh.h CAD.h \
- ExtrudeParams.h Geo.h ../Mesh/Create.h ../Mesh/Vertex.h ../Mesh/Mesh.h
+ ExtrudeParams.h GFace.h Pair.h GRegion.h ../Common/SmoothNormals.h \
+ gmshEdge.h gmshVertex.h ../Mesh/Mesh.h ../DataStr/Tree.h \
+ ../DataStr/avl.h ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Vertex.h \
+ ../Mesh/Simplex.h ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Face.h \
+ ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Edge.h ../Mesh/Vertex.h \
+ ../Mesh/Simplex.h ../Geo/ExtrudeParams.h ../Mesh/Metric.h \
+ ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h \
+ ../Mesh/Interpolation.h ../Mesh/Vertex.h ../Mesh/Mesh.h CAD.h Geo.h \
+ ../Mesh/Create.h ../Mesh/Vertex.h ../Mesh/Mesh.h
# 1 "/Users/geuzaine/.gmsh/Geo//"
gmshFace.o: gmshFace.cpp gmshModel.h GModel.h GVertex.h GEntity.h Range.h \
SPoint3.h SBoundingBox3d.h ../Common/GmshDefines.h MVertex.h GPoint.h \
GEdge.h SVector3.h SPoint2.h MElement.h MEdge.h ../Common/Hash.h \
MFace.h ../Numeric/Numeric.h ../Common/Context.h ../DataStr/List.h \
- GFace.h Pair.h GRegion.h ../Common/SmoothNormals.h gmshVertex.h \
- ../Mesh/Mesh.h ../DataStr/Tree.h ../DataStr/avl.h ../Mesh/Vertex.h \
- ../Mesh/Element.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Vertex.h \
- ../Mesh/Element.h ../Mesh/Face.h ../Mesh/Vertex.h ../Mesh/Element.h \
- ../Mesh/Edge.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
+ ExtrudeParams.h GFace.h Pair.h GRegion.h ../Common/SmoothNormals.h \
+ gmshVertex.h ../Mesh/Mesh.h ../DataStr/Tree.h ../DataStr/avl.h \
+ ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
+ ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Face.h ../Mesh/Vertex.h \
+ ../Mesh/Element.h ../Mesh/Edge.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
../Geo/ExtrudeParams.h ../Mesh/Metric.h ../Mesh/Vertex.h \
../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h gmshEdge.h gmshFace.h \
- ../Mesh/Interpolation.h ../Mesh/Vertex.h ../Mesh/Mesh.h CAD.h \
- ExtrudeParams.h Geo.h ../Mesh/Create.h ../Mesh/Vertex.h ../Mesh/Mesh.h \
- ../Mesh/Utils.h ../Mesh/Vertex.h ../Mesh/Mesh.h ../Common/Message.h
+ ../Mesh/Interpolation.h ../Mesh/Vertex.h ../Mesh/Mesh.h CAD.h Geo.h \
+ ../Mesh/Create.h ../Mesh/Vertex.h ../Mesh/Mesh.h ../Mesh/Utils.h \
+ ../Mesh/Vertex.h ../Mesh/Mesh.h ../Common/Message.h
# 1 "/Users/geuzaine/.gmsh/Geo//"
gmshRegion.o: gmshRegion.cpp gmshModel.h GModel.h GVertex.h GEntity.h \
Range.h SPoint3.h SBoundingBox3d.h ../Common/GmshDefines.h MVertex.h \
GPoint.h GEdge.h SVector3.h SPoint2.h MElement.h MEdge.h \
../Common/Hash.h MFace.h ../Numeric/Numeric.h ../Common/Context.h \
- ../DataStr/List.h GFace.h Pair.h GRegion.h ../Common/SmoothNormals.h \
- gmshFace.h gmshVertex.h ../Mesh/Mesh.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Vertex.h \
- ../Mesh/Simplex.h ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Face.h \
- ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Edge.h ../Mesh/Vertex.h \
- ../Mesh/Simplex.h ../Geo/ExtrudeParams.h ../Mesh/Metric.h \
- ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h \
- gmshRegion.h Geo.h ../Mesh/Create.h ../Mesh/Vertex.h ../Mesh/Mesh.h
+ ../DataStr/List.h ExtrudeParams.h GFace.h Pair.h GRegion.h \
+ ../Common/SmoothNormals.h gmshFace.h gmshVertex.h ../Mesh/Mesh.h \
+ ../DataStr/Tree.h ../DataStr/avl.h ../Mesh/Vertex.h ../Mesh/Element.h \
+ ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Vertex.h ../Mesh/Element.h \
+ ../Mesh/Face.h ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Edge.h \
+ ../Mesh/Vertex.h ../Mesh/Simplex.h ../Geo/ExtrudeParams.h \
+ ../Mesh/Metric.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Mesh.h \
+ ../Mesh/Matrix.h gmshRegion.h Geo.h ../Mesh/Create.h ../Mesh/Vertex.h \
+ ../Mesh/Mesh.h
# 1 "/Users/geuzaine/.gmsh/Geo//"
fourierModel.o: fourierModel.cpp fourierModel.h GModel.h GVertex.h \
GEntity.h Range.h SPoint3.h SBoundingBox3d.h ../Common/GmshDefines.h \
MVertex.h GPoint.h GEdge.h SVector3.h SPoint2.h MElement.h MEdge.h \
../Common/Hash.h MFace.h ../Numeric/Numeric.h ../Common/Context.h \
- ../DataStr/List.h GFace.h Pair.h GRegion.h ../Common/SmoothNormals.h \
- ../Common/Message.h ../Common/Views.h ../Common/ColorTable.h \
- ../Common/VertexArray.h ../Common/SmoothNormals.h \
- ../Common/AdaptiveViews.h ../Common/GmshMatrix.h
+ ../DataStr/List.h ExtrudeParams.h GFace.h Pair.h GRegion.h \
+ ../Common/SmoothNormals.h ../Common/Message.h ../Common/Views.h \
+ ../Common/ColorTable.h ../Common/VertexArray.h \
+ ../Common/SmoothNormals.h ../Common/AdaptiveViews.h \
+ ../Common/GmshMatrix.h
# 1 "/Users/geuzaine/.gmsh/Geo//"
SVector3.o: SVector3.cpp SVector3.h SPoint3.h
# 1 "/Users/geuzaine/.gmsh/Geo//"
diff --git a/Graphics/Makefile b/Graphics/Makefile
index 63b9a8cfe1..6c89a68c07 100644
--- a/Graphics/Makefile
+++ b/Graphics/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.103 2006-10-10 00:44:42 geuzaine Exp $
+# $Id: Makefile,v 1.104 2006-11-04 00:17:08 geuzaine Exp $
#
# Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle
#
@@ -88,10 +88,11 @@ Draw.o: Draw.cpp ../Common/Gmsh.h ../Common/Message.h ../DataStr/Malloc.h \
../Geo/GEntity.h ../Geo/GVertex.h ../Geo/SVector3.h ../Geo/SPoint3.h \
../Geo/SPoint3.h ../Geo/SPoint2.h ../Geo/MElement.h ../Geo/MVertex.h \
../Geo/MEdge.h ../Geo/MVertex.h ../Geo/SVector3.h ../Common/Hash.h \
- ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h ../Geo/GFace.h \
- ../Geo/GPoint.h ../Geo/GEntity.h ../Geo/MElement.h ../Geo/SPoint2.h \
- ../Geo/SVector3.h ../Geo/Pair.h ../Geo/GRegion.h ../Geo/GEntity.h \
- ../Geo/MElement.h ../Geo/SBoundingBox3d.h
+ ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h \
+ ../Geo/ExtrudeParams.h ../Geo/GFace.h ../Geo/GPoint.h ../Geo/GEntity.h \
+ ../Geo/MElement.h ../Geo/SPoint2.h ../Geo/SVector3.h ../Geo/Pair.h \
+ ../Geo/ExtrudeParams.h ../Geo/GRegion.h ../Geo/GEntity.h \
+ ../Geo/MElement.h ../Geo/ExtrudeParams.h ../Geo/SBoundingBox3d.h
# 1 "/Users/geuzaine/.gmsh/Graphics//"
Mesh.o: Mesh.cpp ../Common/Gmsh.h ../Common/Message.h ../DataStr/Malloc.h \
../DataStr/List.h ../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Tools.h \
@@ -103,9 +104,10 @@ Mesh.o: Mesh.cpp ../Common/Gmsh.h ../Common/Message.h ../DataStr/Malloc.h \
../Geo/SPoint3.h ../Geo/SPoint2.h ../Geo/MElement.h ../Geo/MVertex.h \
../Geo/MEdge.h ../Geo/MVertex.h ../Geo/SVector3.h ../Common/Hash.h \
../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h ../Numeric/Numeric.h \
- ../Common/Context.h ../Geo/GFace.h ../Geo/GPoint.h ../Geo/GEntity.h \
- ../Geo/MElement.h ../Geo/SPoint2.h ../Geo/SVector3.h ../Geo/Pair.h \
- ../Geo/GRegion.h ../Geo/GEntity.h ../Geo/MElement.h \
+ ../Common/Context.h ../Geo/ExtrudeParams.h ../Geo/GFace.h \
+ ../Geo/GPoint.h ../Geo/GEntity.h ../Geo/MElement.h ../Geo/SPoint2.h \
+ ../Geo/SVector3.h ../Geo/Pair.h ../Geo/ExtrudeParams.h ../Geo/GRegion.h \
+ ../Geo/GEntity.h ../Geo/MElement.h ../Geo/ExtrudeParams.h \
../Geo/SBoundingBox3d.h ../Common/SmoothNormals.h Draw.h \
../Common/Views.h ../Common/ColorTable.h ../Common/VertexArray.h \
../Common/SmoothNormals.h ../Common/AdaptiveViews.h \
@@ -126,10 +128,11 @@ Geom.o: Geom.cpp ../Common/Gmsh.h ../Common/Message.h ../DataStr/Malloc.h \
../Geo/GVertex.h ../Geo/SVector3.h ../Geo/SPoint3.h ../Geo/SPoint3.h \
../Geo/SPoint2.h ../Geo/MElement.h ../Geo/MVertex.h ../Geo/MEdge.h \
../Geo/MVertex.h ../Geo/SVector3.h ../Common/Hash.h ../Geo/MFace.h \
- ../Geo/MVertex.h ../Geo/SVector3.h ../Geo/GFace.h ../Geo/GPoint.h \
- ../Geo/GEntity.h ../Geo/MElement.h ../Geo/SPoint2.h ../Geo/SVector3.h \
- ../Geo/Pair.h ../Geo/GRegion.h ../Geo/GEntity.h ../Geo/MElement.h \
- ../Geo/SBoundingBox3d.h
+ ../Geo/MVertex.h ../Geo/SVector3.h ../Geo/ExtrudeParams.h \
+ ../Geo/GFace.h ../Geo/GPoint.h ../Geo/GEntity.h ../Geo/MElement.h \
+ ../Geo/SPoint2.h ../Geo/SVector3.h ../Geo/Pair.h ../Geo/ExtrudeParams.h \
+ ../Geo/GRegion.h ../Geo/GEntity.h ../Geo/MElement.h \
+ ../Geo/ExtrudeParams.h ../Geo/SBoundingBox3d.h
# 1 "/Users/geuzaine/.gmsh/Graphics//"
Post.o: Post.cpp ../Common/Gmsh.h ../Common/Message.h ../DataStr/Malloc.h \
../DataStr/List.h ../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Tools.h \
@@ -160,13 +163,15 @@ SelectBuffer.o: SelectBuffer.cpp ../Common/Gmsh.h ../Common/Message.h \
../Geo/GEntity.h ../Geo/GVertex.h ../Geo/SVector3.h ../Geo/SPoint3.h \
../Geo/SPoint3.h ../Geo/SPoint2.h ../Geo/MElement.h ../Geo/MVertex.h \
../Geo/MEdge.h ../Geo/MVertex.h ../Geo/SVector3.h ../Common/Hash.h \
- ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h ../Geo/GFace.h \
- ../Geo/GPoint.h ../Geo/GEntity.h ../Geo/MElement.h ../Geo/SPoint2.h \
- ../Geo/SVector3.h ../Geo/Pair.h ../Geo/GRegion.h ../Geo/GEntity.h \
- ../Geo/MElement.h ../Geo/GModel.h ../Geo/GVertex.h ../Geo/GEdge.h \
- ../Geo/GFace.h ../Geo/GRegion.h ../Geo/SBoundingBox3d.h ../Geo/MRep.h \
- ../Geo/GEdge.h ../Geo/GFace.h ../Geo/GRegion.h ../Geo/MVertex.h \
- ../Geo/MEdge.h ../Geo/MElement.h ../Common/OS.h
+ ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h \
+ ../Geo/ExtrudeParams.h ../Geo/GFace.h ../Geo/GPoint.h ../Geo/GEntity.h \
+ ../Geo/MElement.h ../Geo/SPoint2.h ../Geo/SVector3.h ../Geo/Pair.h \
+ ../Geo/ExtrudeParams.h ../Geo/GRegion.h ../Geo/GEntity.h \
+ ../Geo/MElement.h ../Geo/ExtrudeParams.h ../Geo/GModel.h \
+ ../Geo/GVertex.h ../Geo/GEdge.h ../Geo/GFace.h ../Geo/GRegion.h \
+ ../Geo/SBoundingBox3d.h ../Geo/MRep.h ../Geo/GEdge.h ../Geo/GFace.h \
+ ../Geo/GRegion.h ../Geo/MVertex.h ../Geo/MEdge.h ../Geo/MElement.h \
+ ../Common/OS.h
# 1 "/Users/geuzaine/.gmsh/Graphics//"
Iso.o: Iso.cpp ../Common/Gmsh.h ../Common/Message.h ../DataStr/Malloc.h \
../DataStr/List.h ../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Tools.h \
diff --git a/Graphics/SelectBuffer.cpp b/Graphics/SelectBuffer.cpp
index c39f74c267..e0055c8d53 100644
--- a/Graphics/SelectBuffer.cpp
+++ b/Graphics/SelectBuffer.cpp
@@ -1,4 +1,4 @@
-// $Id: SelectBuffer.cpp,v 1.7 2006-11-02 17:24:54 geuzaine Exp $
+// $Id: SelectBuffer.cpp,v 1.8 2006-11-04 00:17:08 geuzaine Exp $
//
// Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle
//
@@ -213,40 +213,28 @@ bool ProcessSelectionBuffer(int entityType,
return true;
}
-void HighlightEntity(GEntity *e, bool permanent)
+void HighlightEntity(GEntity *e)
{
- if(permanent)
- e->setSelection(1);
- else
- Msg(STATUS2N, "%s", e->getInfoString().c_str());
+ e->setSelection(1);
}
-void HighlightEntity(GVertex *v, GEdge *c, GFace *s, GRegion *r, bool permanent)
-{
- if(v) HighlightEntity(v, permanent);
- else if(c) HighlightEntity(c, permanent);
- else if(s) HighlightEntity(s, permanent);
- else if(r) HighlightEntity(r, permanent);
- else if(!permanent) Msg(STATUS2N, " ");
-}
-
-void HighlightEntityNum(int v, int c, int s, int r, bool permanent)
+void HighlightEntityNum(int v, int c, int s, int r)
{
if(v) {
GVertex *pv = GMODEL->vertexByTag(v);
- if(pv) HighlightEntity(pv, permanent);
+ if(pv) HighlightEntity(pv);
}
if(c) {
GEdge *pc = GMODEL->edgeByTag(c);
- if(pc) HighlightEntity(pc, permanent);
+ if(pc) HighlightEntity(pc);
}
if(s) {
GFace *ps = GMODEL->faceByTag(s);
- if(ps) HighlightEntity(ps, permanent);
+ if(ps) HighlightEntity(ps);
}
if(r) {
GRegion *pr = GMODEL->regionByTag(r);
- if(pr) HighlightEntity(pr, permanent);
+ if(pr) HighlightEntity(pr);
}
}
@@ -263,18 +251,6 @@ void ZeroHighlightEntity(GVertex *v, GEdge *c, GFace *s, GRegion *r)
if(r) ZeroHighlightEntity(r);
}
-void ZeroHighlight()
-{
- for(GModel::viter it = GMODEL->firstVertex(); it != GMODEL->lastVertex(); it++)
- ZeroHighlightEntity(*it);
- for(GModel::eiter it = GMODEL->firstEdge(); it != GMODEL->lastEdge(); it++)
- ZeroHighlightEntity(*it);
- for(GModel::fiter it = GMODEL->firstFace(); it != GMODEL->lastFace(); it++)
- ZeroHighlightEntity(*it);
- for(GModel::riter it = GMODEL->firstRegion(); it != GMODEL->lastRegion(); it++)
- ZeroHighlightEntity(*it);
-}
-
void ZeroHighlightEntityNum(int v, int c, int s, int r)
{
if(v) {
@@ -294,3 +270,15 @@ void ZeroHighlightEntityNum(int v, int c, int s, int r)
if(pr) ZeroHighlightEntity(pr);
}
}
+
+void ZeroHighlight()
+{
+ for(GModel::viter it = GMODEL->firstVertex(); it != GMODEL->lastVertex(); it++)
+ ZeroHighlightEntity(*it);
+ for(GModel::eiter it = GMODEL->firstEdge(); it != GMODEL->lastEdge(); it++)
+ ZeroHighlightEntity(*it);
+ for(GModel::fiter it = GMODEL->firstFace(); it != GMODEL->lastFace(); it++)
+ ZeroHighlightEntity(*it);
+ for(GModel::riter it = GMODEL->firstRegion(); it != GMODEL->lastRegion(); it++)
+ ZeroHighlightEntity(*it);
+}
diff --git a/Graphics/SelectBuffer.h b/Graphics/SelectBuffer.h
index c2bbebd555..1772e1171d 100644
--- a/Graphics/SelectBuffer.h
+++ b/Graphics/SelectBuffer.h
@@ -49,11 +49,9 @@ char SelectEntity(int entityType,
std::vector<GFace*> &faces,
std::vector<GRegion*> ®ions,
std::vector<MElement*> &elements);
-
-void HighlightEntity(GEntity *e, bool permanent=false);
-void HighlightEntity(GVertex *v, GEdge *e, GFace *f, GRegion *r, bool permanent=false);
-void HighlightEntityNum(int v, int c, int s, int r, bool permanant=false);
-void ZeroHighlightEntity(GVertex *v, GEdge *c, GFace *s, GRegion *r);
+void HighlightEntity(GEntity *e);
+void HighlightEntityNum(int v, int c, int s, int r);
+void ZeroHighlightEntity(GEntity *e);
void ZeroHighlightEntityNum(int v, int c, int s, int r);
void ZeroHighlight();
diff --git a/Mesh/Makefile b/Mesh/Makefile
index 9ef12e274c..21ff5b5268 100644
--- a/Mesh/Makefile
+++ b/Mesh/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.134 2006-10-10 00:44:42 geuzaine Exp $
+# $Id: Makefile,v 1.135 2006-11-04 00:17:08 geuzaine Exp $
#
# Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle
#
@@ -331,8 +331,8 @@ BDS.o: BDS.cpp ../Numeric/Numeric.h ../Common/GmshMatrix.h BDS.h \
../Geo/SPoint3.h ../Geo/MEdge.h ../Geo/MVertex.h ../Geo/SVector3.h \
../Geo/SPoint3.h ../Common/Hash.h ../Geo/MFace.h ../Geo/MVertex.h \
../Geo/SVector3.h ../Common/Context.h ../DataStr/List.h \
- ../Geo/SPoint2.h ../Geo/SVector3.h ../Geo/Pair.h ../Common/Views.h \
- ../Common/ColorTable.h ../Common/VertexArray.h \
+ ../Geo/SPoint2.h ../Geo/SVector3.h ../Geo/Pair.h ../Geo/ExtrudeParams.h \
+ ../Common/Views.h ../Common/ColorTable.h ../Common/VertexArray.h \
../Common/SmoothNormals.h ../Common/AdaptiveViews.h \
../Common/GmshMatrix.h ../Common/Message.h
# 1 "/Users/geuzaine/.gmsh/Mesh//"
@@ -358,16 +358,16 @@ Generator.o: Generator.cpp ../Common/Gmsh.h ../Common/Message.h \
../Geo/MElement.h ../Geo/MVertex.h ../Geo/SPoint3.h ../Geo/MEdge.h \
../Geo/MVertex.h ../Geo/SVector3.h ../Geo/SPoint3.h ../Common/Hash.h \
../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h ../Common/Context.h \
- ../Geo/SPoint2.h ../Geo/SVector3.h ../Geo/Pair.h ../Common/Views.h \
- ../Common/ColorTable.h ../Common/VertexArray.h \
+ ../Geo/SPoint2.h ../Geo/SVector3.h ../Geo/Pair.h ../Geo/ExtrudeParams.h \
+ ../Common/Views.h ../Common/ColorTable.h ../Common/VertexArray.h \
../Common/SmoothNormals.h ../Common/AdaptiveViews.h \
../Common/GmshMatrix.h Create.h ../Parser/OpenFile.h PartitionMesh.h \
../Common/OS.h meshGEdge.h meshGFace.h meshGRegion.h ../Geo/GModel.h \
../Geo/GVertex.h ../Geo/GEntity.h ../Geo/MVertex.h ../Geo/GPoint.h \
../Geo/GEdge.h ../Geo/GEntity.h ../Geo/GVertex.h ../Geo/SVector3.h \
- ../Geo/SPoint3.h ../Geo/SPoint2.h ../Geo/MElement.h ../Geo/GFace.h \
- ../Geo/GRegion.h ../Geo/GEntity.h ../Geo/MElement.h \
- ../Geo/SBoundingBox3d.h
+ ../Geo/SPoint3.h ../Geo/SPoint2.h ../Geo/MElement.h \
+ ../Geo/ExtrudeParams.h ../Geo/GFace.h ../Geo/GRegion.h ../Geo/GEntity.h \
+ ../Geo/MElement.h ../Geo/ExtrudeParams.h ../Geo/SBoundingBox3d.h
# 1 "/Users/geuzaine/.gmsh/Mesh//"
DiscreteSurface.o: DiscreteSurface.cpp Mesh.h ../Common/GmshDefines.h \
../DataStr/List.h ../DataStr/Tree.h ../DataStr/avl.h Vertex.h Element.h \
@@ -412,12 +412,13 @@ meshGEdge.o: meshGEdge.cpp meshGEdge.h ../Geo/GEdge.h ../Geo/GEntity.h \
../Geo/MElement.h ../Geo/MVertex.h ../Geo/MEdge.h ../Geo/MVertex.h \
../Geo/SVector3.h ../Common/Hash.h ../Geo/MFace.h ../Geo/MVertex.h \
../Geo/SVector3.h ../Numeric/Numeric.h ../Common/Context.h \
- ../DataStr/List.h ../Geo/GFace.h ../Geo/GPoint.h ../Geo/GEntity.h \
- ../Geo/MElement.h ../Geo/SPoint2.h ../Geo/SVector3.h ../Geo/Pair.h \
- ../Common/Gmsh.h ../Common/Message.h ../DataStr/Malloc.h \
- ../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h \
- ../DataStr/Tree.h Utils.h Vertex.h Mesh.h Element.h Simplex.h Face.h \
- Edge.h ../Geo/ExtrudeParams.h Metric.h Matrix.h
+ ../DataStr/List.h ../Geo/ExtrudeParams.h ../Geo/GFace.h ../Geo/GPoint.h \
+ ../Geo/GEntity.h ../Geo/MElement.h ../Geo/SPoint2.h ../Geo/SVector3.h \
+ ../Geo/Pair.h ../Geo/ExtrudeParams.h ../Common/Gmsh.h \
+ ../Common/Message.h ../DataStr/Malloc.h ../DataStr/Tree.h \
+ ../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
+ Utils.h Vertex.h Mesh.h Element.h Simplex.h Face.h Edge.h Metric.h \
+ Matrix.h
# 1 "/Users/geuzaine/.gmsh/Mesh//"
meshGFace.o: meshGFace.cpp meshGFace.h ../Geo/GVertex.h ../Geo/GEntity.h \
../Geo/Range.h ../Geo/SPoint3.h ../Geo/SBoundingBox3d.h \
@@ -429,12 +430,12 @@ meshGFace.o: meshGFace.cpp meshGFace.h ../Geo/GVertex.h ../Geo/GEntity.h \
../Geo/SPoint3.h ../Geo/SPoint2.h ../Geo/MElement.h ../Geo/MVertex.h \
../Geo/MEdge.h ../Geo/MVertex.h ../Geo/SVector3.h ../Common/Hash.h \
../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h ../Numeric/Numeric.h \
- ../Common/Context.h ../Geo/GFace.h ../Geo/GPoint.h ../Geo/GEntity.h \
- ../Geo/MElement.h ../Geo/SPoint2.h ../Geo/SVector3.h ../Geo/Pair.h \
- Utils.h ../Common/Message.h BDS.h ../Common/Views.h \
- ../Common/ColorTable.h ../Common/VertexArray.h \
- ../Common/SmoothNormals.h ../Common/AdaptiveViews.h \
- ../Common/GmshMatrix.h
+ ../Common/Context.h ../Geo/ExtrudeParams.h ../Geo/GFace.h \
+ ../Geo/GPoint.h ../Geo/GEntity.h ../Geo/MElement.h ../Geo/SPoint2.h \
+ ../Geo/SVector3.h ../Geo/Pair.h ../Geo/ExtrudeParams.h Utils.h \
+ ../Common/Message.h BDS.h ../Common/Views.h ../Common/ColorTable.h \
+ ../Common/VertexArray.h ../Common/SmoothNormals.h \
+ ../Common/AdaptiveViews.h ../Common/GmshMatrix.h
# 1 "/Users/geuzaine/.gmsh/Mesh//"
meshGFaceTransfinite.o: meshGFaceTransfinite.cpp meshGFace.h \
../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
@@ -444,9 +445,10 @@ meshGFaceTransfinite.o: meshGFaceTransfinite.cpp meshGFace.h \
../Geo/SPoint3.h ../Geo/SPoint2.h ../Geo/MElement.h ../Geo/MVertex.h \
../Geo/MEdge.h ../Geo/MVertex.h ../Geo/SVector3.h ../Common/Hash.h \
../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h ../Numeric/Numeric.h \
- ../Common/Context.h ../DataStr/List.h ../Geo/GFace.h ../Geo/GPoint.h \
- ../Geo/GEntity.h ../Geo/MElement.h ../Geo/SPoint2.h ../Geo/SVector3.h \
- ../Geo/Pair.h ../Common/Message.h
+ ../Common/Context.h ../DataStr/List.h ../Geo/ExtrudeParams.h \
+ ../Geo/GFace.h ../Geo/GPoint.h ../Geo/GEntity.h ../Geo/MElement.h \
+ ../Geo/SPoint2.h ../Geo/SVector3.h ../Geo/Pair.h ../Geo/ExtrudeParams.h \
+ ../Common/Message.h
# 1 "/Users/geuzaine/.gmsh/Mesh//"
meshGRegionDelaunayInsertion.o: meshGRegionDelaunayInsertion.cpp \
meshGRegionDelaunayInsertion.h ../Geo/MElement.h \
@@ -456,7 +458,7 @@ meshGRegionDelaunayInsertion.o: meshGRegionDelaunayInsertion.cpp \
../Numeric/Numeric.h ../Common/Context.h ../DataStr/List.h \
../Geo/GRegion.h ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Geo/MElement.h \
- ../Common/Message.h
+ ../Geo/ExtrudeParams.h ../Common/Message.h
# 1 "/Users/geuzaine/.gmsh/Mesh//"
meshGRegion.o: meshGRegion.cpp meshGRegion.h ../Geo/GModel.h \
../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
@@ -466,11 +468,13 @@ meshGRegion.o: meshGRegion.cpp meshGRegion.h ../Geo/GModel.h \
../Geo/SPoint3.h ../Geo/SPoint2.h ../Geo/MElement.h ../Geo/MVertex.h \
../Geo/MEdge.h ../Geo/MVertex.h ../Geo/SVector3.h ../Common/Hash.h \
../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h ../Numeric/Numeric.h \
- ../Common/Context.h ../DataStr/List.h ../Geo/GFace.h ../Geo/GPoint.h \
- ../Geo/GEntity.h ../Geo/MElement.h ../Geo/SPoint2.h ../Geo/SVector3.h \
- ../Geo/Pair.h ../Geo/GRegion.h ../Geo/GEntity.h ../Geo/MElement.h \
- ../Geo/SBoundingBox3d.h ../Common/SmoothNormals.h BDS.h \
- ../Common/Views.h ../Common/ColorTable.h ../Common/VertexArray.h \
+ ../Common/Context.h ../DataStr/List.h ../Geo/ExtrudeParams.h \
+ ../Geo/GFace.h ../Geo/GPoint.h ../Geo/GEntity.h ../Geo/MElement.h \
+ ../Geo/SPoint2.h ../Geo/SVector3.h ../Geo/Pair.h ../Geo/ExtrudeParams.h \
+ ../Geo/GRegion.h ../Geo/GEntity.h ../Geo/MElement.h \
+ ../Geo/ExtrudeParams.h ../Geo/SBoundingBox3d.h \
+ ../Common/SmoothNormals.h BDS.h ../Common/Views.h \
+ ../Common/ColorTable.h ../Common/VertexArray.h \
../Common/SmoothNormals.h ../Common/AdaptiveViews.h \
../Common/GmshMatrix.h ../Common/Message.h
# 1 "/Users/geuzaine/.gmsh/Mesh//"
@@ -498,13 +502,14 @@ SecondOrder.o: SecondOrder.cpp ../Geo/GModel.h ../Geo/GVertex.h \
../Geo/SPoint3.h ../Geo/SPoint2.h ../Geo/MElement.h ../Geo/MVertex.h \
../Geo/MEdge.h ../Geo/MVertex.h ../Geo/SVector3.h ../Common/Hash.h \
../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h ../Numeric/Numeric.h \
- ../Common/Context.h ../DataStr/List.h ../Geo/GFace.h ../Geo/GPoint.h \
- ../Geo/GEntity.h ../Geo/MElement.h ../Geo/SPoint2.h ../Geo/SVector3.h \
- ../Geo/Pair.h ../Geo/GRegion.h ../Geo/GEntity.h ../Geo/MElement.h \
- ../Geo/SBoundingBox3d.h ../Common/SmoothNormals.h ../Geo/MRep.h \
- ../Geo/GEdge.h ../Geo/GFace.h ../Geo/GRegion.h ../Geo/MVertex.h \
- ../Geo/MEdge.h ../Geo/MElement.h ../Common/VertexArray.h \
- ../Common/Message.h ../Common/OS.h
+ ../Common/Context.h ../DataStr/List.h ../Geo/ExtrudeParams.h \
+ ../Geo/GFace.h ../Geo/GPoint.h ../Geo/GEntity.h ../Geo/MElement.h \
+ ../Geo/SPoint2.h ../Geo/SVector3.h ../Geo/Pair.h ../Geo/ExtrudeParams.h \
+ ../Geo/GRegion.h ../Geo/GEntity.h ../Geo/MElement.h \
+ ../Geo/ExtrudeParams.h ../Geo/SBoundingBox3d.h \
+ ../Common/SmoothNormals.h ../Geo/MRep.h ../Geo/GEdge.h ../Geo/GFace.h \
+ ../Geo/GRegion.h ../Geo/MVertex.h ../Geo/MEdge.h ../Geo/MElement.h \
+ ../Common/VertexArray.h ../Common/Message.h ../Common/OS.h
# 1 "/Users/geuzaine/.gmsh/Mesh//"
PartitionMesh.o: PartitionMesh.cpp Mesh.h ../Common/GmshDefines.h \
../DataStr/List.h ../DataStr/Tree.h ../DataStr/avl.h Vertex.h Element.h \
diff --git a/Parser/Makefile b/Parser/Makefile
index db7009b1a5..c141024d31 100644
--- a/Parser/Makefile
+++ b/Parser/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.103 2006-10-10 00:44:42 geuzaine Exp $
+# $Id: Makefile,v 1.104 2006-11-04 00:17:08 geuzaine Exp $
#
# Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle
#
@@ -118,9 +118,10 @@ OpenFile.o: OpenFile.cpp ../Common/Gmsh.h ../Common/Message.h \
../Geo/SPoint2.h ../Geo/MElement.h ../Geo/MVertex.h ../Geo/MEdge.h \
../Geo/MVertex.h ../Geo/SVector3.h ../Common/Hash.h ../Geo/MFace.h \
../Geo/MVertex.h ../Geo/SVector3.h ../Numeric/Numeric.h \
- ../Common/Context.h ../Geo/GFace.h ../Geo/GPoint.h ../Geo/GEntity.h \
- ../Geo/MElement.h ../Geo/SPoint2.h ../Geo/SVector3.h ../Geo/Pair.h \
- ../Geo/GRegion.h ../Geo/GEntity.h ../Geo/MElement.h \
+ ../Common/Context.h ../Geo/ExtrudeParams.h ../Geo/GFace.h \
+ ../Geo/GPoint.h ../Geo/GEntity.h ../Geo/MElement.h ../Geo/SPoint2.h \
+ ../Geo/SVector3.h ../Geo/Pair.h ../Geo/ExtrudeParams.h ../Geo/GRegion.h \
+ ../Geo/GEntity.h ../Geo/MElement.h ../Geo/ExtrudeParams.h \
../Geo/SBoundingBox3d.h ../Common/SmoothNormals.h ../Geo/fourierModel.h \
../Geo/GModel.h Parser.h OpenFile.h ../Common/CommandLine.h \
../Common/Views.h ../Common/ColorTable.h ../Common/VertexArray.h \
@@ -128,13 +129,12 @@ OpenFile.o: OpenFile.cpp ../Common/Gmsh.h ../Common/Message.h \
../Common/GmshMatrix.h ../Mesh/Mesh.h ../Mesh/Vertex.h \
../Mesh/Element.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Vertex.h \
../Mesh/Element.h ../Mesh/Face.h ../Mesh/Vertex.h ../Mesh/Element.h \
- ../Mesh/Edge.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
- ../Geo/ExtrudeParams.h ../Mesh/Metric.h ../Mesh/Vertex.h \
- ../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h ../Graphics/ReadImg.h \
- ../Common/OS.h ../Common/GmshUI.h ../Graphics/Draw.h \
- ../Graphics/SelectBuffer.h ../Fltk/GUI.h ../Fltk/Opengl_Window.h \
- ../Fltk/Colorbar_Window.h ../Fltk/Popup_Button.h \
- ../Fltk/SpherePosition_Widget.h
+ ../Mesh/Edge.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Metric.h \
+ ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h \
+ ../Graphics/ReadImg.h ../Common/OS.h ../Common/GmshUI.h \
+ ../Graphics/Draw.h ../Graphics/SelectBuffer.h ../Fltk/GUI.h \
+ ../Fltk/Opengl_Window.h ../Fltk/Colorbar_Window.h \
+ ../Fltk/Popup_Button.h ../Fltk/SpherePosition_Widget.h
# 1 "/Users/geuzaine/.gmsh/Parser//"
CreateFile.o: CreateFile.cpp ../Common/Gmsh.h ../Common/Message.h \
../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
@@ -147,16 +147,17 @@ CreateFile.o: CreateFile.cpp ../Common/Gmsh.h ../Common/Message.h \
../Geo/SVector3.h ../Geo/SPoint3.h ../Geo/SPoint3.h ../Geo/SPoint2.h \
../Geo/MElement.h ../Geo/MVertex.h ../Geo/MEdge.h ../Geo/MVertex.h \
../Geo/SVector3.h ../Common/Hash.h ../Geo/MFace.h ../Geo/MVertex.h \
- ../Geo/SVector3.h ../Numeric/Numeric.h ../Geo/GFace.h ../Geo/GPoint.h \
- ../Geo/GEntity.h ../Geo/MElement.h ../Geo/SPoint2.h ../Geo/SVector3.h \
- ../Geo/Pair.h ../Geo/GRegion.h ../Geo/GEntity.h ../Geo/MElement.h \
- ../Geo/SBoundingBox3d.h ../Common/SmoothNormals.h ../Common/GmshUI.h \
- ../Graphics/gl2ps.h ../Graphics/gl2gif.h ../Graphics/PixelBuffer.h \
- ../Graphics/Draw.h ../Common/Views.h ../Common/ColorTable.h \
- ../Common/VertexArray.h ../Common/SmoothNormals.h \
- ../Common/AdaptiveViews.h ../Common/GmshMatrix.h ../Graphics/gl2jpeg.h \
- ../Graphics/PixelBuffer.h ../Graphics/gl2png.h \
- ../Graphics/PixelBuffer.h ../Graphics/gl2ppm.h \
+ ../Geo/SVector3.h ../Numeric/Numeric.h ../Geo/ExtrudeParams.h \
+ ../Geo/GFace.h ../Geo/GPoint.h ../Geo/GEntity.h ../Geo/MElement.h \
+ ../Geo/SPoint2.h ../Geo/SVector3.h ../Geo/Pair.h ../Geo/ExtrudeParams.h \
+ ../Geo/GRegion.h ../Geo/GEntity.h ../Geo/MElement.h \
+ ../Geo/ExtrudeParams.h ../Geo/SBoundingBox3d.h \
+ ../Common/SmoothNormals.h ../Common/GmshUI.h ../Graphics/gl2ps.h \
+ ../Graphics/gl2gif.h ../Graphics/PixelBuffer.h ../Graphics/Draw.h \
+ ../Common/Views.h ../Common/ColorTable.h ../Common/VertexArray.h \
+ ../Common/SmoothNormals.h ../Common/AdaptiveViews.h \
+ ../Common/GmshMatrix.h ../Graphics/gl2jpeg.h ../Graphics/PixelBuffer.h \
+ ../Graphics/gl2png.h ../Graphics/PixelBuffer.h ../Graphics/gl2ppm.h \
../Graphics/PixelBuffer.h ../Graphics/gl2yuv.h \
../Graphics/PixelBuffer.h
# 1 "/Users/geuzaine/.gmsh/Parser//"
diff --git a/Plugin/Makefile b/Plugin/Makefile
index 152c2fe1b4..37c8c5fca6 100644
--- a/Plugin/Makefile
+++ b/Plugin/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.110 2006-10-10 00:44:42 geuzaine Exp $
+# $Id: Makefile,v 1.111 2006-11-04 00:17:08 geuzaine Exp $
#
# Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle
#
@@ -215,7 +215,7 @@ ExtractEdges.o: ExtractEdges.cpp Plugin.h ../Common/Options.h \
../Geo/MElement.h ../Geo/MVertex.h ../Geo/SPoint3.h ../Geo/MEdge.h \
../Geo/MVertex.h ../Geo/SVector3.h ../Geo/SPoint3.h ../Common/Hash.h \
../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h ../Geo/SPoint2.h \
- ../Geo/SVector3.h ../Geo/Pair.h
+ ../Geo/SVector3.h ../Geo/Pair.h ../Geo/ExtrudeParams.h
# 1 "/Users/geuzaine/.gmsh/Plugin//"
DecomposeInSimplex.o: DecomposeInSimplex.cpp Plugin.h ../Common/Options.h \
../Common/Message.h ../Common/Views.h ../Common/ColorTable.h \
diff --git a/doc/TODO b/doc/TODO
index 2e079d1bb1..e469671bbe 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -1,4 +1,9 @@
-$Id: TODO,v 1.21 2006-11-03 00:41:15 geuzaine Exp $
+$Id: TODO,v 1.22 2006-11-04 00:17:09 geuzaine Exp $
+
+********************************************************************
+
+add "lateral" curves (for Extrude Line) and surfaces (for Extrude
+Surface) in the return list for extrusions
********************************************************************
--
GitLab