diff --git a/Common/Makefile b/Common/Makefile
index f5a576576b76ce0c4dfeac787eeef939edc533b0..068a73e6a830423b66f1464ef2bebbd59e8f936b 100644
--- a/Common/Makefile
+++ b/Common/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.132 2007-05-24 14:21:53 geuzaine Exp $
+# $Id: Makefile,v 1.133 2007-07-09 13:54:36 geuzaine Exp $
#
# Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
#
@@ -22,19 +22,16 @@
include ../variables
LIB = ../lib/libGmshCommon.a
-INCLUDE = -I../Common -I../DataStr -I../Geo -I../Graphics -I../Mesh\
+INCLUDE = -I../Common -I../DataStr -I../Geo -I../Mesh -I../Post -I../Graphics\
-I../Numeric -I../Parser -I../Plugin -I../Fltk\
-I../contrib/MathEval -I../contrib/ANN/include/
CFLAGS =${OPTIM} ${FLAGS} ${INCLUDE}
SRC = Context.cpp\
- AdaptiveViews.cpp\
- Views.cpp ViewsIO.cpp\
- Octree.cpp OctreeInternals.cpp OctreePost.cpp\
+ Octree.cpp OctreeInternals.cpp\
Options.cpp\
CommandLine.cpp\
OS.cpp\
- ColorTable.cpp\
Visibility.cpp\
Trackball.cpp\
VertexArray.cpp\
@@ -67,35 +64,17 @@ depend:
Context.o: Context.cpp Gmsh.h Message.h ../DataStr/Malloc.h \
../DataStr/List.h ../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Tools.h \
../DataStr/List.h ../DataStr/Tree.h ../Numeric/Numeric.h Context.h \
- DefaultOptions.h GmshDefines.h Options.h Views.h ColorTable.h \
- VertexArray.h SmoothData.h AdaptiveViews.h GmshMatrix.h Trackball.h
-AdaptiveViews.o: AdaptiveViews.cpp AdaptiveViews.h ../DataStr/List.h \
- GmshMatrix.h ../Plugin/Plugin.h ../Common/Options.h ../Common/Message.h \
- ../Common/Views.h ../Common/ColorTable.h ../Common/VertexArray.h \
- ../Common/SmoothData.h ../Numeric/Numeric.h ../Common/AdaptiveViews.h \
- ../Common/GmshMatrix.h OS.h
-Views.o: Views.cpp Gmsh.h Message.h ../DataStr/Malloc.h ../DataStr/List.h \
- ../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h \
- ../DataStr/Tree.h ../Numeric/Numeric.h Views.h ColorTable.h \
- VertexArray.h SmoothData.h AdaptiveViews.h GmshMatrix.h Context.h \
- Options.h ../Mesh/BackgroundMesh.h
-ViewsIO.o: ViewsIO.cpp Gmsh.h Message.h ../DataStr/Malloc.h \
- ../DataStr/List.h ../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Tools.h \
- ../DataStr/List.h ../DataStr/Tree.h ../Numeric/Numeric.h Views.h \
- ColorTable.h VertexArray.h SmoothData.h AdaptiveViews.h GmshMatrix.h \
- Context.h
+ DefaultOptions.h GmshDefines.h Options.h ../Post/Views.h \
+ ../Post/ColorTable.h ../Common/VertexArray.h ../Common/SmoothData.h \
+ ../Post/AdaptiveViews.h ../Common/GmshMatrix.h Trackball.h
Octree.o: Octree.cpp Octree.h OctreeInternals.h
OctreeInternals.o: OctreeInternals.cpp Message.h OctreeInternals.h
-OctreePost.o: OctreePost.cpp Octree.h OctreeInternals.h OctreePost.h \
- ../DataStr/List.h Views.h ColorTable.h VertexArray.h SmoothData.h \
- ../Numeric/Numeric.h AdaptiveViews.h GmshMatrix.h Message.h \
- ShapeFunctions.h
Options.o: Options.cpp Gmsh.h Message.h ../DataStr/Malloc.h \
../DataStr/List.h ../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Tools.h \
../DataStr/List.h ../DataStr/Tree.h GmshUI.h GmshDefines.h \
- ../Graphics/Draw.h ../Common/Views.h ../Common/ColorTable.h \
+ ../Graphics/Draw.h ../Post/Views.h ../Post/ColorTable.h \
../Common/VertexArray.h ../Common/SmoothData.h ../Numeric/Numeric.h \
- ../Common/AdaptiveViews.h ../Common/GmshMatrix.h ../Mesh/Generator.h \
+ ../Post/AdaptiveViews.h ../Common/GmshMatrix.h ../Mesh/Generator.h \
Context.h Options.h ../Mesh/BackgroundMesh.h ../Plugin/PluginManager.h \
../Plugin/Plugin.h ../Common/Options.h ../Common/Message.h \
../Fltk/Solvers.h ../Fltk/GUI.h ../Fltk/Opengl_Window.h \
@@ -108,26 +87,22 @@ CommandLine.o: CommandLine.cpp Gmsh.h Message.h ../DataStr/Malloc.h \
../Geo/Geo.h ../Common/GmshDefines.h ../Geo/gmshSurface.h ../Geo/Pair.h \
../Geo/Range.h ../Geo/SPoint2.h ../Geo/SPoint3.h ../Geo/SVector3.h \
../Geo/SPoint3.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h \
- ../Geo/SPoint2.h ../Geo/ExtrudeParams.h ../Common/SmoothData.h Views.h \
- ColorTable.h VertexArray.h SmoothData.h AdaptiveViews.h GmshMatrix.h \
- ../Parser/OpenFile.h ../Parser/CreateFile.h ../Parser/Parser.h \
- ../Geo/GModel.h ../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h \
- ../Geo/SPoint3.h ../Geo/SBoundingBox3d.h ../Geo/MVertex.h \
- ../Geo/SPoint3.h ../Geo/GPoint.h ../Geo/SPoint2.h ../Geo/GEdge.h \
- ../Geo/GEntity.h ../Geo/GVertex.h ../Geo/SVector3.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/ExtrudeParams.h ../Geo/GFace.h ../Geo/GPoint.h ../Geo/GEntity.h \
- ../Geo/GEdgeLoop.h ../Geo/GEdge.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 OS.h
+ ../Geo/SPoint2.h ../Geo/ExtrudeParams.h ../Common/SmoothData.h \
+ ../Post/Views.h ../Post/ColorTable.h ../Common/VertexArray.h \
+ ../Post/AdaptiveViews.h ../Common/GmshMatrix.h ../Parser/OpenFile.h \
+ ../Parser/CreateFile.h ../Parser/Parser.h ../Geo/GModel.h \
+ ../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
+ ../Geo/SBoundingBox3d.h ../Geo/MVertex.h ../Geo/SPoint3.h \
+ ../Geo/GPoint.h ../Geo/SPoint2.h ../Geo/GEdge.h ../Geo/GEntity.h \
+ ../Geo/GVertex.h ../Geo/SVector3.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/ExtrudeParams.h \
+ ../Geo/GFace.h ../Geo/GPoint.h ../Geo/GEntity.h ../Geo/GEdgeLoop.h \
+ ../Geo/GEdge.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 OS.h
OS.o: OS.cpp Message.h
-ColorTable.o: ColorTable.cpp Gmsh.h Message.h ../DataStr/Malloc.h \
- ../DataStr/List.h ../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Tools.h \
- ../DataStr/List.h ../DataStr/Tree.h ColorTable.h Context.h \
- ../Numeric/Numeric.h
Visibility.o: Visibility.cpp Visibility.h GmshDefines.h ../Geo/GVertex.h \
../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Common/GmshDefines.h \
diff --git a/DataStr/Makefile b/DataStr/Makefile
index f6de267fa9b1b709d2386e3b5e1da8a09215510e..d94a976e6ecc301f3bf899f31ed063d9cd83d261 100644
--- a/DataStr/Makefile
+++ b/DataStr/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.38 2006-11-27 22:22:08 geuzaine Exp $
+# $Id: Makefile,v 1.39 2007-07-09 13:54:36 geuzaine Exp $
#
# Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
#
diff --git a/Fltk/Makefile b/Fltk/Makefile
index 4fc557f82d153a08acfc292957f0b60c2ca5bb70..c3270018d726e01e64fc56bef1c25eca9f7ce7d6 100644
--- a/Fltk/Makefile
+++ b/Fltk/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.134 2007-05-24 14:21:53 geuzaine Exp $
+# $Id: Makefile,v 1.135 2007-07-09 13:54:36 geuzaine Exp $
#
# Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
#
@@ -22,7 +22,7 @@
include ../variables
LIB = ../lib/libGmshFltk.a
-INCLUDE = -I../Common -I../DataStr -I../Graphics -I../Geo -I../Mesh\
+INCLUDE = -I../Common -I../DataStr -I../Graphics -I../Geo -I../Mesh -I../Post\
-I../Numeric -I../Parser -I../Fltk -I../Plugin -I../utils/solvers\
-I../contrib/ANN/include
CFLAGS = ${OPTIM} ${FLAGS} ${INCLUDE}
@@ -64,7 +64,7 @@ depend:
# DO NOT DELETE THIS LINE
Main.o: Main.cpp GUI.h Opengl_Window.h Colorbar_Window.h \
- ../Common/GmshUI.h ../Common/ColorTable.h Popup_Button.h \
+ ../Common/GmshUI.h ../Post/ColorTable.h Popup_Button.h \
SpherePosition_Widget.h ../Common/Gmsh.h ../Common/Message.h \
../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
@@ -74,37 +74,36 @@ Main.o: Main.cpp GUI.h Opengl_Window.h Colorbar_Window.h \
../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Geo/SPoint2.h \
../Geo/ExtrudeParams.h ../Common/SmoothData.h ../Numeric/Numeric.h \
../Mesh/Generator.h ../Parser/CreateFile.h ../Graphics/Draw.h \
- ../Common/Views.h ../Common/ColorTable.h ../Common/VertexArray.h \
- ../Common/SmoothData.h ../Common/AdaptiveViews.h ../Common/GmshMatrix.h \
- ../Common/Context.h ../Common/Options.h ../Parser/Parser.h \
- ../Parser/OpenFile.h ../Common/CommandLine.h Solvers.h \
- ../Plugin/PluginManager.h ../Plugin/Plugin.h ../Geo/GModel.h \
- ../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
- ../Geo/SBoundingBox3d.h ../Geo/MVertex.h ../Geo/SPoint3.h \
- ../Geo/GPoint.h ../Geo/SPoint2.h ../Geo/GEdge.h ../Geo/GEntity.h \
- ../Geo/GVertex.h ../Geo/SVector3.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/ExtrudeParams.h ../Geo/GFace.h ../Geo/GPoint.h \
- ../Geo/GEntity.h ../Geo/GEdgeLoop.h ../Geo/GEdge.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 ../Mesh/Field.h \
- ../Common/OctreePost.h ../Common/Octree.h ../Common/OctreeInternals.h \
- ../Mesh/BackgroundMesh.h
+ ../Post/Views.h ../Post/ColorTable.h ../Common/VertexArray.h \
+ ../Post/AdaptiveViews.h ../Common/GmshMatrix.h ../Common/Context.h \
+ ../Common/Options.h ../Parser/Parser.h ../Parser/OpenFile.h \
+ ../Common/CommandLine.h Solvers.h ../Plugin/PluginManager.h \
+ ../Plugin/Plugin.h ../Geo/GModel.h ../Geo/GVertex.h ../Geo/GEntity.h \
+ ../Geo/Range.h ../Geo/SPoint3.h ../Geo/SBoundingBox3d.h \
+ ../Geo/MVertex.h ../Geo/SPoint3.h ../Geo/GPoint.h ../Geo/SPoint2.h \
+ ../Geo/GEdge.h ../Geo/GEntity.h ../Geo/GVertex.h ../Geo/SVector3.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/ExtrudeParams.h ../Geo/GFace.h ../Geo/GPoint.h ../Geo/GEntity.h \
+ ../Geo/GEdgeLoop.h ../Geo/GEdge.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 ../Mesh/Field.h ../Post/OctreePost.h \
+ ../Common/Octree.h ../Common/OctreeInternals.h ../Mesh/BackgroundMesh.h
Message.o: Message.cpp ../Common/Gmsh.h ../Common/Message.h \
../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
../Common/GmshUI.h ../Common/Context.h ../Common/Options.h GUI.h \
- Opengl_Window.h Colorbar_Window.h ../Common/ColorTable.h Popup_Button.h \
+ Opengl_Window.h Colorbar_Window.h ../Post/ColorTable.h Popup_Button.h \
SpherePosition_Widget.h GUI_Extras.h ../Common/OS.h
GUI.o: GUI.cpp ../Common/Gmsh.h ../Common/Message.h ../DataStr/Malloc.h \
../DataStr/List.h ../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Tools.h \
../DataStr/List.h ../DataStr/Tree.h ../Common/GmshUI.h \
../Common/GmshDefines.h ../Numeric/Numeric.h ../Common/Context.h \
- ../Common/Options.h ../Graphics/Draw.h ../Common/Views.h \
- ../Common/ColorTable.h ../Common/VertexArray.h ../Common/SmoothData.h \
- ../Common/AdaptiveViews.h ../Common/GmshMatrix.h GUI.h Opengl_Window.h \
+ ../Common/Options.h ../Graphics/Draw.h ../Post/Views.h \
+ ../Post/ColorTable.h ../Common/VertexArray.h ../Common/SmoothData.h \
+ ../Post/AdaptiveViews.h ../Common/GmshMatrix.h GUI.h Opengl_Window.h \
Colorbar_Window.h Popup_Button.h SpherePosition_Widget.h Callbacks.h \
Win32Icon.h ../Parser/OpenFile.h ../Common/CommandLine.h \
../Mesh/Generator.h Solvers.h ../Plugin/PluginManager.h \
@@ -113,10 +112,12 @@ GUI_Extras.o: GUI_Extras.cpp ../Common/Gmsh.h ../Common/Message.h \
../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
../Common/GmshUI.h ../Common/GmshDefines.h File_Picker.h \
- Shortcut_Window.h ../Parser/CreateFile.h ../Common/Options.h \
- ../Common/Context.h ../Graphics/Draw.h ../Common/Views.h \
- ../Common/ColorTable.h ../Common/VertexArray.h ../Common/SmoothData.h \
- ../Numeric/Numeric.h ../Common/AdaptiveViews.h ../Common/GmshMatrix.h
+ ../Parser/CreateFile.h ../Common/Options.h ../Common/Context.h \
+ ../Graphics/Draw.h ../Post/Views.h ../Post/ColorTable.h \
+ ../Common/VertexArray.h ../Common/SmoothData.h ../Numeric/Numeric.h \
+ ../Post/AdaptiveViews.h ../Common/GmshMatrix.h GUI.h Opengl_Window.h \
+ Colorbar_Window.h Popup_Button.h SpherePosition_Widget.h \
+ Shortcut_Window.h
GUI_Projection.o: GUI_Projection.cpp ../Common/Gmsh.h ../Common/Message.h \
../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
@@ -134,9 +135,10 @@ GUI_Projection.o: GUI_Projection.cpp ../Common/Gmsh.h ../Common/Message.h \
../Geo/Pair.h ../Geo/ExtrudeParams.h ../Geo/GRegion.h ../Geo/GEntity.h \
../Geo/MElement.h ../Geo/ExtrudeParams.h ../Geo/SBoundingBox3d.h \
../Geo/projectionFace.h ../Geo/GFace.h ../Graphics/Draw.h \
- ../Common/Views.h ../Common/ColorTable.h ../Common/VertexArray.h \
- ../Common/SmoothData.h ../Common/AdaptiveViews.h ../Common/GmshMatrix.h \
- ../Common/Options.h Shortcut_Window.h
+ ../Post/Views.h ../Post/ColorTable.h ../Common/VertexArray.h \
+ ../Post/AdaptiveViews.h ../Common/GmshMatrix.h ../Common/Options.h \
+ GUI.h Opengl_Window.h Colorbar_Window.h Popup_Button.h \
+ SpherePosition_Widget.h Shortcut_Window.h
Callbacks.o: Callbacks.cpp ../Common/Gmsh.h ../Common/Message.h \
../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
@@ -158,31 +160,29 @@ Callbacks.o: Callbacks.cpp ../Common/Gmsh.h ../Common/Message.h \
../Geo/GEdge.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 \
- ../Graphics/Draw.h ../Common/Views.h ../Common/ColorTable.h \
- ../Common/VertexArray.h ../Common/SmoothData.h \
- ../Common/AdaptiveViews.h ../Common/GmshMatrix.h \
+ ../Graphics/Draw.h ../Post/Views.h ../Post/ColorTable.h \
+ ../Common/VertexArray.h ../Post/AdaptiveViews.h ../Common/GmshMatrix.h \
../Graphics/SelectBuffer.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 ../Plugin/Plugin.h ../Plugin/PluginManager.h \
../Plugin/Plugin.h ../Common/Visibility.h ../Common/GmshDefines.h \
- Solvers.h ../Common/OS.h ../Mesh/Field.h ../Common/OctreePost.h \
+ Solvers.h ../Common/OS.h ../Mesh/Field.h ../Post/OctreePost.h \
../Common/Octree.h ../Common/OctreeInternals.h ../Mesh/BackgroundMesh.h
Opengl.o: Opengl.cpp ../Common/Gmsh.h ../Common/Message.h \
../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
../Common/GmshUI.h ../Numeric/Numeric.h ../Common/Context.h \
- ../Graphics/Draw.h ../Common/Views.h ../Common/ColorTable.h \
- ../Common/VertexArray.h ../Common/SmoothData.h \
- ../Common/AdaptiveViews.h ../Common/GmshMatrix.h \
- ../Graphics/SelectBuffer.h ../Geo/GVertex.h ../Geo/GEntity.h \
- ../Geo/Range.h ../Geo/SPoint3.h ../Geo/SBoundingBox3d.h \
- ../Geo/SPoint3.h ../Common/GmshDefines.h ../Geo/MVertex.h \
- ../Geo/SPoint3.h ../Geo/GPoint.h ../Geo/SPoint2.h ../Geo/GEdge.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 \
+ ../Graphics/Draw.h ../Post/Views.h ../Post/ColorTable.h \
+ ../Common/VertexArray.h ../Common/SmoothData.h ../Post/AdaptiveViews.h \
+ ../Common/GmshMatrix.h ../Graphics/SelectBuffer.h ../Geo/GVertex.h \
+ ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
+ ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Common/GmshDefines.h \
+ ../Geo/MVertex.h ../Geo/SPoint3.h ../Geo/GPoint.h ../Geo/SPoint2.h \
+ ../Geo/GEdge.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/ExtrudeParams.h ../Geo/GFace.h ../Geo/GPoint.h ../Geo/GEntity.h \
../Geo/GEdgeLoop.h ../Geo/GEdge.h ../Geo/MElement.h ../Geo/SPoint2.h \
../Geo/SVector3.h ../Geo/Pair.h ../Geo/ExtrudeParams.h ../Geo/GRegion.h \
@@ -197,9 +197,8 @@ Opengl_Window.o: Opengl_Window.cpp ../Common/Gmsh.h ../Common/Message.h \
../Geo/Range.h ../Geo/SPoint2.h ../Geo/SPoint3.h ../Geo/SVector3.h \
../Geo/SPoint3.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h \
../Geo/SPoint2.h ../Geo/ExtrudeParams.h ../Common/SmoothData.h \
- ../Graphics/Draw.h ../Common/Views.h ../Common/ColorTable.h \
- ../Common/VertexArray.h ../Common/SmoothData.h \
- ../Common/AdaptiveViews.h ../Common/GmshMatrix.h \
+ ../Graphics/Draw.h ../Post/Views.h ../Post/ColorTable.h \
+ ../Common/VertexArray.h ../Post/AdaptiveViews.h ../Common/GmshMatrix.h \
../Graphics/SelectBuffer.h ../Geo/GVertex.h ../Geo/GEntity.h \
../Geo/Range.h ../Geo/SPoint3.h ../Geo/SBoundingBox3d.h \
../Geo/MVertex.h ../Geo/SPoint3.h ../Geo/GPoint.h ../Geo/SPoint2.h \
@@ -217,14 +216,14 @@ Colorbar_Window.o: Colorbar_Window.cpp ../Common/Gmsh.h \
../Common/Message.h ../DataStr/Malloc.h ../DataStr/List.h \
../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h \
../DataStr/Tree.h ../Common/GmshUI.h GUI.h Opengl_Window.h \
- Colorbar_Window.h ../Common/ColorTable.h Popup_Button.h \
+ Colorbar_Window.h ../Post/ColorTable.h Popup_Button.h \
SpherePosition_Widget.h ../Common/Context.h
Solvers.o: Solvers.cpp ../Common/Gmsh.h ../Common/Message.h \
../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
Solvers.h GmshServer.h ../Parser/OpenFile.h ../Common/GmshUI.h GUI.h \
- Opengl_Window.h Colorbar_Window.h ../Common/ColorTable.h Popup_Button.h \
- SpherePosition_Widget.h ../Graphics/Draw.h ../Common/Views.h \
- ../Common/ColorTable.h ../Common/VertexArray.h ../Common/SmoothData.h \
- ../Numeric/Numeric.h ../Common/AdaptiveViews.h ../Common/GmshMatrix.h \
+ Opengl_Window.h Colorbar_Window.h ../Post/ColorTable.h Popup_Button.h \
+ SpherePosition_Widget.h ../Graphics/Draw.h ../Post/Views.h \
+ ../Post/ColorTable.h ../Common/VertexArray.h ../Common/SmoothData.h \
+ ../Numeric/Numeric.h ../Post/AdaptiveViews.h ../Common/GmshMatrix.h \
../Common/Context.h
diff --git a/Geo/GModel.h b/Geo/GModel.h
index 92d5cf1677c2f98f80bec0413dada1f5079e607e..bc5e504c2b52b291c8ac0ccedd9b70c292e97ea6 100644
--- a/Geo/GModel.h
+++ b/Geo/GModel.h
@@ -38,12 +38,11 @@ class F_Internals;
// A geometric model. The model is a "not yet" non-manifold B-Rep.
class GModel
{
- private:
+ protected:
void deleteOCCInternals();
OCC_Internals *occ_internals;
F_Internals *f_internals;
- protected:
std::string modelName;
std::set<GRegion*, GEntityLessThan> regions;
std::set<GFace*, GEntityLessThan> faces;
diff --git a/Geo/Makefile b/Geo/Makefile
index 1d0aa707889d7b59516ce2b2155c0fb295469915..6c85273c8d60bdb78424d68842e60506a1943e74 100644
--- a/Geo/Makefile
+++ b/Geo/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.148 2007-05-24 14:21:53 geuzaine Exp $
+# $Id: Makefile,v 1.149 2007-07-09 13:54:36 geuzaine Exp $
#
# Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
#
@@ -22,8 +22,9 @@
include ../variables
LIB = ../lib/libGmshGeo.a
-INCLUDE = -I../Common -I../DataStr -I../Geo -I../Mesh -I../Numeric\
- -I../Parser -I../Fltk -I../contrib/NR -I../contrib/FourierModel -I../contrib/ANN/include -I../contrib/MathEval
+INCLUDE = -I../Common -I../DataStr -I../Geo -I../Mesh -I../Post -I../Numeric\
+ -I../Parser -I../Fltk -I../contrib/NR -I../contrib/FourierModel\
+ -I../contrib/ANN/include -I../contrib/MathEval
CFLAGS = ${OPTIM} ${FLAGS} ${INCLUDE}
SRC = GEntity.cpp\
@@ -184,13 +185,13 @@ GModel.o: GModel.cpp GModel.h GVertex.h GEntity.h Range.h SPoint3.h \
GEdge.h SVector3.h MElement.h MEdge.h ../Common/Hash.h MFace.h \
../Numeric/Numeric.h ../Common/Context.h ../DataStr/List.h \
ExtrudeParams.h ../Common/SmoothData.h GFace.h GEdgeLoop.h Pair.h \
- GRegion.h gmshSurface.h ../Mesh/Field.h ../Common/Views.h \
- ../Common/ColorTable.h ../Common/VertexArray.h ../Common/SmoothData.h \
- ../Common/AdaptiveViews.h ../Common/GmshMatrix.h ../Geo/Geo.h \
- ../Geo/gmshSurface.h ../DataStr/Tree.h ../DataStr/avl.h \
- ../Geo/SPoint2.h ../Geo/ExtrudeParams.h ../Geo/GEdge.h \
- ../Common/OctreePost.h ../Common/Octree.h ../Common/OctreeInternals.h \
- MRep.h ../Common/Message.h ../Common/OS.h ../Mesh/BackgroundMesh.h
+ GRegion.h gmshSurface.h ../Mesh/Field.h ../Post/Views.h \
+ ../Post/ColorTable.h ../Common/VertexArray.h ../Post/AdaptiveViews.h \
+ ../Common/GmshMatrix.h ../Geo/Geo.h ../Geo/gmshSurface.h \
+ ../DataStr/Tree.h ../DataStr/avl.h ../Geo/SPoint2.h \
+ ../Geo/ExtrudeParams.h ../Geo/GEdge.h ../Post/OctreePost.h \
+ ../Common/Octree.h ../Common/OctreeInternals.h MRep.h \
+ ../Common/Message.h ../Common/OS.h ../Mesh/BackgroundMesh.h
GModelIO_Geo.o: GModelIO_Geo.cpp GModel.h GVertex.h GEntity.h Range.h \
SPoint3.h SBoundingBox3d.h ../Common/GmshDefines.h MVertex.h GPoint.h \
SPoint2.h GEdge.h SVector3.h MElement.h MEdge.h ../Common/Hash.h \
@@ -220,10 +221,9 @@ GModelIO_F.o: GModelIO_F.cpp GModel.h GVertex.h GEntity.h Range.h \
SPoint2.h GEdge.h SVector3.h MElement.h MEdge.h ../Common/Hash.h \
MFace.h ../Numeric/Numeric.h ../Common/Context.h ../DataStr/List.h \
ExtrudeParams.h ../Common/SmoothData.h GFace.h GEdgeLoop.h Pair.h \
- GRegion.h ../Common/Message.h ../Common/Views.h ../Common/ColorTable.h \
- ../Common/VertexArray.h ../Common/SmoothData.h \
- ../Common/AdaptiveViews.h ../Common/GmshMatrix.h FFace.h FEdge.h \
- FVertex.h ../Mesh/meshGFace.h GModelIO_F.h
+ GRegion.h ../Common/Message.h ../Post/Views.h ../Post/ColorTable.h \
+ ../Common/VertexArray.h ../Post/AdaptiveViews.h ../Common/GmshMatrix.h \
+ FFace.h FEdge.h FVertex.h ../Mesh/meshGFace.h GModelIO_F.h
GModelIO_CGNS.o: GModelIO_CGNS.cpp GModel.h GVertex.h GEntity.h Range.h \
SPoint3.h SBoundingBox3d.h ../Common/GmshDefines.h MVertex.h GPoint.h \
SPoint2.h GEdge.h SVector3.h MElement.h MEdge.h ../Common/Hash.h \
diff --git a/Graphics/Makefile b/Graphics/Makefile
index 5532133ccb5d165b08ef1b23e40726a8032b8edb..b65caf843cabe09055abf16229857d11828edf01 100644
--- a/Graphics/Makefile
+++ b/Graphics/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.117 2007-05-24 14:21:53 geuzaine Exp $
+# $Id: Makefile,v 1.118 2007-07-09 13:54:36 geuzaine Exp $
#
# Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
#
@@ -22,9 +22,8 @@
include ../variables
LIB = ../lib/libGmshGraphics.a
-INCLUDE = -I../Common -I../DataStr -I../Geo -I../Graphics\
- -I../Fltk -I../Mesh -I../Numeric -I../Parser -I../Plugin\
- -I../contrib/ANN/include
+INCLUDE = -I../Common -I../DataStr -I../Geo -I../Mesh -I../Post -I../Graphics\
+ -I../Fltk -I../Numeric -I../Parser -I../Plugin -I../contrib/ANN/include
CFLAGS = ${OPTIM} ${FLAGS} ${INCLUDE}
SRC = Draw.cpp \
@@ -71,9 +70,9 @@ depend:
Draw.o: Draw.cpp ../Common/Gmsh.h ../Common/Message.h ../DataStr/Malloc.h \
../DataStr/List.h ../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Tools.h \
../DataStr/List.h ../DataStr/Tree.h ../Common/GmshUI.h \
- ../Common/GmshDefines.h Draw.h ../Common/Views.h ../Common/ColorTable.h \
+ ../Common/GmshDefines.h Draw.h ../Post/Views.h ../Post/ColorTable.h \
../Common/VertexArray.h ../Common/SmoothData.h ../Numeric/Numeric.h \
- ../Common/AdaptiveViews.h ../Common/GmshMatrix.h ../Common/Context.h \
+ ../Post/AdaptiveViews.h ../Common/GmshMatrix.h ../Common/Context.h \
../Geo/GModel.h ../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h \
../Geo/SPoint3.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h \
../Geo/MVertex.h ../Geo/SPoint3.h ../Geo/GPoint.h ../Geo/SPoint2.h \
@@ -101,16 +100,16 @@ Mesh.o: Mesh.cpp ../Common/Gmsh.h ../Common/Message.h ../DataStr/Malloc.h \
../Geo/GEdgeLoop.h ../Geo/GEdge.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 Draw.h ../Common/Views.h ../Common/ColorTable.h \
- ../Common/VertexArray.h ../Common/SmoothData.h \
- ../Common/AdaptiveViews.h ../Common/GmshMatrix.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 gl2ps.h
+ ../Geo/SBoundingBox3d.h Draw.h ../Post/Views.h ../Post/ColorTable.h \
+ ../Common/VertexArray.h ../Post/AdaptiveViews.h ../Common/GmshMatrix.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 \
+ gl2ps.h
Geom.o: Geom.cpp ../Common/Gmsh.h ../Common/Message.h ../DataStr/Malloc.h \
../DataStr/List.h ../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Tools.h \
../DataStr/List.h ../DataStr/Tree.h ../Common/GmshUI.h Draw.h \
- ../Common/Views.h ../Common/ColorTable.h ../Common/VertexArray.h \
- ../Common/SmoothData.h ../Numeric/Numeric.h ../Common/AdaptiveViews.h \
+ ../Post/Views.h ../Post/ColorTable.h ../Common/VertexArray.h \
+ ../Common/SmoothData.h ../Numeric/Numeric.h ../Post/AdaptiveViews.h \
../Common/GmshMatrix.h ../Common/Context.h gl2ps.h ../Geo/GModel.h \
../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Common/GmshDefines.h \
@@ -127,23 +126,22 @@ Geom.o: Geom.cpp ../Common/Gmsh.h ../Common/Message.h ../DataStr/Malloc.h \
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 \
../DataStr/List.h ../DataStr/Tree.h ../Common/GmshUI.h \
- ../Numeric/Numeric.h Draw.h ../Common/Views.h ../Common/ColorTable.h \
- ../Common/VertexArray.h ../Common/SmoothData.h \
- ../Common/AdaptiveViews.h ../Common/GmshMatrix.h ../Common/Context.h \
- gl2ps.h
+ ../Numeric/Numeric.h Draw.h ../Post/Views.h ../Post/ColorTable.h \
+ ../Common/VertexArray.h ../Common/SmoothData.h ../Post/AdaptiveViews.h \
+ ../Common/GmshMatrix.h ../Common/Context.h gl2ps.h
PostElement.o: PostElement.cpp ../Common/Gmsh.h ../Common/Message.h \
../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
- ../Common/GmshUI.h Draw.h ../Common/Views.h ../Common/ColorTable.h \
+ ../Common/GmshUI.h Draw.h ../Post/Views.h ../Post/ColorTable.h \
../Common/VertexArray.h ../Common/SmoothData.h ../Numeric/Numeric.h \
- ../Common/AdaptiveViews.h ../Common/GmshMatrix.h Iso.h \
+ ../Post/AdaptiveViews.h ../Common/GmshMatrix.h Iso.h \
../Common/Context.h
SelectBuffer.o: SelectBuffer.cpp ../Common/Gmsh.h ../Common/Message.h \
../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
- ../Common/GmshUI.h ../Common/GmshDefines.h Draw.h ../Common/Views.h \
- ../Common/ColorTable.h ../Common/VertexArray.h ../Common/SmoothData.h \
- ../Numeric/Numeric.h ../Common/AdaptiveViews.h ../Common/GmshMatrix.h \
+ ../Common/GmshUI.h ../Common/GmshDefines.h Draw.h ../Post/Views.h \
+ ../Post/ColorTable.h ../Common/VertexArray.h ../Common/SmoothData.h \
+ ../Numeric/Numeric.h ../Post/AdaptiveViews.h ../Common/GmshMatrix.h \
../Common/Context.h SelectBuffer.h ../Geo/GVertex.h ../Geo/GEntity.h \
../Geo/Range.h ../Geo/SPoint3.h ../Geo/SBoundingBox3d.h \
../Geo/SPoint3.h ../Geo/MVertex.h ../Geo/SPoint3.h ../Geo/GPoint.h \
@@ -162,64 +160,64 @@ SelectBuffer.o: SelectBuffer.cpp ../Common/Gmsh.h ../Common/Message.h \
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 \
../DataStr/List.h ../DataStr/Tree.h ../Common/GmshUI.h Draw.h \
- ../Common/Views.h ../Common/ColorTable.h ../Common/VertexArray.h \
- ../Common/SmoothData.h ../Numeric/Numeric.h ../Common/AdaptiveViews.h \
+ ../Post/Views.h ../Post/ColorTable.h ../Common/VertexArray.h \
+ ../Common/SmoothData.h ../Numeric/Numeric.h ../Post/AdaptiveViews.h \
../Common/GmshMatrix.h ../Common/Context.h
Entity.o: Entity.cpp ../Common/Gmsh.h ../Common/Message.h \
../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
- ../Common/GmshUI.h ../Numeric/Numeric.h Draw.h ../Common/Views.h \
- ../Common/ColorTable.h ../Common/VertexArray.h ../Common/SmoothData.h \
- ../Common/AdaptiveViews.h ../Common/GmshMatrix.h ../Common/Context.h \
+ ../Common/GmshUI.h ../Numeric/Numeric.h Draw.h ../Post/Views.h \
+ ../Post/ColorTable.h ../Common/VertexArray.h ../Common/SmoothData.h \
+ ../Post/AdaptiveViews.h ../Common/GmshMatrix.h ../Common/Context.h \
gl2ps.h
ReadImg.o: ReadImg.cpp ReadImg.h ../Common/Gmsh.h ../Common/Message.h \
../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
- ../Common/GmshUI.h ../Common/Views.h ../Common/ColorTable.h \
+ ../Common/GmshUI.h ../Post/Views.h ../Post/ColorTable.h \
../Common/VertexArray.h ../Common/SmoothData.h ../Numeric/Numeric.h \
- ../Common/AdaptiveViews.h ../Common/GmshMatrix.h
+ ../Post/AdaptiveViews.h ../Common/GmshMatrix.h
Scale.o: Scale.cpp ../Common/Gmsh.h ../Common/Message.h \
../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
- ../Common/GmshUI.h ../Numeric/Numeric.h Draw.h ../Common/Views.h \
- ../Common/ColorTable.h ../Common/VertexArray.h ../Common/SmoothData.h \
- ../Common/AdaptiveViews.h ../Common/GmshMatrix.h ../Common/Context.h \
+ ../Common/GmshUI.h ../Numeric/Numeric.h Draw.h ../Post/Views.h \
+ ../Post/ColorTable.h ../Common/VertexArray.h ../Common/SmoothData.h \
+ ../Post/AdaptiveViews.h ../Common/GmshMatrix.h ../Common/Context.h \
gl2ps.h
Graph2D.o: Graph2D.cpp ../Common/Gmsh.h ../Common/Message.h \
../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
../Common/GmshUI.h ../Common/Context.h ../Numeric/Numeric.h Draw.h \
- ../Common/Views.h ../Common/ColorTable.h ../Common/VertexArray.h \
- ../Common/SmoothData.h ../Common/AdaptiveViews.h ../Common/GmshMatrix.h \
+ ../Post/Views.h ../Post/ColorTable.h ../Common/VertexArray.h \
+ ../Common/SmoothData.h ../Post/AdaptiveViews.h ../Common/GmshMatrix.h \
gl2ps.h
gl2ps.o: gl2ps.cpp gl2ps.h
gl2gif.o: gl2gif.cpp gl2gif.h PixelBuffer.h ../Common/Gmsh.h \
../Common/Message.h ../DataStr/Malloc.h ../DataStr/List.h \
../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h \
- ../DataStr/Tree.h ../Common/GmshUI.h Draw.h ../Common/Views.h \
- ../Common/ColorTable.h ../Common/VertexArray.h ../Common/SmoothData.h \
- ../Numeric/Numeric.h ../Common/AdaptiveViews.h ../Common/GmshMatrix.h
+ ../DataStr/Tree.h ../Common/GmshUI.h Draw.h ../Post/Views.h \
+ ../Post/ColorTable.h ../Common/VertexArray.h ../Common/SmoothData.h \
+ ../Numeric/Numeric.h ../Post/AdaptiveViews.h ../Common/GmshMatrix.h
gl2jpeg.o: gl2jpeg.cpp gl2jpeg.h PixelBuffer.h ../Common/Gmsh.h \
../Common/Message.h ../DataStr/Malloc.h ../DataStr/List.h \
../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h \
- ../DataStr/Tree.h ../Common/GmshUI.h Draw.h ../Common/Views.h \
- ../Common/ColorTable.h ../Common/VertexArray.h ../Common/SmoothData.h \
- ../Numeric/Numeric.h ../Common/AdaptiveViews.h ../Common/GmshMatrix.h
+ ../DataStr/Tree.h ../Common/GmshUI.h Draw.h ../Post/Views.h \
+ ../Post/ColorTable.h ../Common/VertexArray.h ../Common/SmoothData.h \
+ ../Numeric/Numeric.h ../Post/AdaptiveViews.h ../Common/GmshMatrix.h
gl2png.o: gl2png.cpp gl2png.h PixelBuffer.h ../Common/Gmsh.h \
../Common/Message.h ../DataStr/Malloc.h ../DataStr/List.h \
../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h \
- ../DataStr/Tree.h ../Common/GmshUI.h Draw.h ../Common/Views.h \
- ../Common/ColorTable.h ../Common/VertexArray.h ../Common/SmoothData.h \
- ../Numeric/Numeric.h ../Common/AdaptiveViews.h ../Common/GmshMatrix.h
+ ../DataStr/Tree.h ../Common/GmshUI.h Draw.h ../Post/Views.h \
+ ../Post/ColorTable.h ../Common/VertexArray.h ../Common/SmoothData.h \
+ ../Numeric/Numeric.h ../Post/AdaptiveViews.h ../Common/GmshMatrix.h
gl2ppm.o: gl2ppm.cpp gl2ppm.h PixelBuffer.h ../Common/Gmsh.h \
../Common/Message.h ../DataStr/Malloc.h ../DataStr/List.h \
../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h \
- ../DataStr/Tree.h ../Common/GmshUI.h Draw.h ../Common/Views.h \
- ../Common/ColorTable.h ../Common/VertexArray.h ../Common/SmoothData.h \
- ../Numeric/Numeric.h ../Common/AdaptiveViews.h ../Common/GmshMatrix.h
+ ../DataStr/Tree.h ../Common/GmshUI.h Draw.h ../Post/Views.h \
+ ../Post/ColorTable.h ../Common/VertexArray.h ../Common/SmoothData.h \
+ ../Numeric/Numeric.h ../Post/AdaptiveViews.h ../Common/GmshMatrix.h
gl2yuv.o: gl2yuv.cpp gl2yuv.h PixelBuffer.h ../Common/Gmsh.h \
../Common/Message.h ../DataStr/Malloc.h ../DataStr/List.h \
../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h \
- ../DataStr/Tree.h ../Common/GmshUI.h Draw.h ../Common/Views.h \
- ../Common/ColorTable.h ../Common/VertexArray.h ../Common/SmoothData.h \
- ../Numeric/Numeric.h ../Common/AdaptiveViews.h ../Common/GmshMatrix.h
+ ../DataStr/Tree.h ../Common/GmshUI.h Draw.h ../Post/Views.h \
+ ../Post/ColorTable.h ../Common/VertexArray.h ../Common/SmoothData.h \
+ ../Numeric/Numeric.h ../Post/AdaptiveViews.h ../Common/GmshMatrix.h
diff --git a/Makefile b/Makefile
index df99afee54920cdd98252d21a5ad12937ec83456..986922a7345c122304fe97cfe710046f1c6b4812 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.434 2007-05-03 09:30:57 geuzaine Exp $
+# $Id: Makefile,v 1.435 2007-07-09 13:54:35 geuzaine Exp $
#
# Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
#
diff --git a/Mesh/Makefile b/Mesh/Makefile
index 2b95d771d83ff312e065690669f5c414c3488b07..46a297901bf56d455f5c18000c573b55c80fd8e3 100644
--- a/Mesh/Makefile
+++ b/Mesh/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.173 2007-05-24 14:21:53 geuzaine Exp $
+# $Id: Makefile,v 1.174 2007-07-09 13:54:36 geuzaine Exp $
#
# Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
#
@@ -23,7 +23,7 @@ include ../variables
LIB = ../lib/libGmshMesh.a
INCLUDE = -I../Numeric -I../Common -I../DataStr -I../Geo -I../Mesh\
- -I../Graphics -I../Parser -I../Fltk\
+ -I../Post -I../Graphics -I../Parser -I../Fltk\
-I../contrib/NR -I../contrib/Triangle -I../contrib/Tetgen\
-I../contrib/Netgen -I../contrib/Netgen/libsrc/include\
-I../contrib/Netgen/libsrc/interface -I../contrib/ANN/include\
@@ -61,7 +61,7 @@ ${LIB}: ${OBJ}
# Don't optimize BDS: it crashes with some flavors of gcc 4.1 (e.g. on debian etch)
BDS.o:
- ${CXX} ${FLAGS} ${INCLUDE} -c $<
+ ${CXX} ${FLAGS} ${INCLUDE} -c BDS.cpp
clean:
rm -f *.o
@@ -78,9 +78,9 @@ depend:
Generator.o: Generator.cpp ../Common/Gmsh.h ../Common/Message.h \
../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
- ../Numeric/Numeric.h ../Common/Context.h ../Common/Views.h \
- ../Common/ColorTable.h ../Common/VertexArray.h ../Common/SmoothData.h \
- ../Common/AdaptiveViews.h ../Common/GmshMatrix.h ../Common/OS.h \
+ ../Numeric/Numeric.h ../Common/Context.h ../Post/Views.h \
+ ../Post/ColorTable.h ../Common/VertexArray.h ../Common/SmoothData.h \
+ ../Post/AdaptiveViews.h ../Common/GmshMatrix.h ../Common/OS.h \
../Geo/GModel.h ../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h \
../Geo/SPoint3.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h \
../Common/GmshDefines.h ../Geo/MVertex.h ../Geo/SPoint3.h \
@@ -106,16 +106,16 @@ Field.o: Field.cpp ../Mesh/BDS.h ../Geo/GFace.h ../Geo/GPoint.h \
../Geo/MVertex.h ../Geo/SVector3.h ../Numeric/Numeric.h \
../Common/Context.h ../DataStr/List.h ../Geo/ExtrudeParams.h \
../Common/SmoothData.h ../Geo/MElement.h ../Geo/SPoint2.h \
- ../Geo/SVector3.h ../Geo/Pair.h ../Geo/ExtrudeParams.h \
- ../Common/Views.h ../Common/ColorTable.h ../Common/VertexArray.h \
- ../Common/SmoothData.h ../Common/AdaptiveViews.h ../Common/GmshMatrix.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 Field.h ../Geo/Geo.h ../Geo/gmshSurface.h \
- ../Geo/Pair.h ../Geo/Range.h ../Geo/SPoint2.h ../Geo/SPoint3.h \
- ../Geo/SVector3.h ../Geo/SBoundingBox3d.h ../Geo/SPoint2.h \
- ../Geo/ExtrudeParams.h ../Common/OctreePost.h ../Common/Octree.h \
- ../Common/OctreeInternals.h ../Geo/GeoInterpolation.h ../Geo/Geo.h
+ ../Geo/SVector3.h ../Geo/Pair.h ../Geo/ExtrudeParams.h ../Post/Views.h \
+ ../Post/ColorTable.h ../Common/VertexArray.h ../Post/AdaptiveViews.h \
+ ../Common/GmshMatrix.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 Field.h \
+ ../Geo/Geo.h ../Geo/gmshSurface.h ../Geo/Pair.h ../Geo/Range.h \
+ ../Geo/SPoint2.h ../Geo/SPoint3.h ../Geo/SVector3.h \
+ ../Geo/SBoundingBox3d.h ../Geo/SPoint2.h ../Geo/ExtrudeParams.h \
+ ../Post/OctreePost.h ../Common/Octree.h ../Common/OctreeInternals.h \
+ ../Geo/GeoInterpolation.h ../Geo/Geo.h
meshGEdge.o: meshGEdge.cpp ../Common/Gmsh.h ../Common/Message.h \
../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
@@ -167,9 +167,8 @@ meshGFace.o: meshGFace.cpp meshGFace.h meshGFaceDelaunayInsertion.h \
../Geo/GFace.h ../Geo/GRegion.h ../Geo/GEntity.h ../Geo/MElement.h \
../Geo/ExtrudeParams.h ../Geo/MVertex.h ../Geo/MEdge.h \
../Geo/MElement.h ../Common/VertexArray.h ../Common/Message.h \
- ../Common/OS.h BDS.h ../Common/Views.h ../Common/ColorTable.h \
- ../Common/VertexArray.h ../Common/SmoothData.h \
- ../Common/AdaptiveViews.h ../Common/GmshMatrix.h
+ ../Common/OS.h BDS.h ../Post/Views.h ../Post/ColorTable.h \
+ ../Post/AdaptiveViews.h ../Common/GmshMatrix.h
meshGFaceTransfinite.o: meshGFaceTransfinite.cpp meshGFace.h \
../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Common/GmshDefines.h \
@@ -210,9 +209,9 @@ meshGFaceDelaunayInsertion.o: meshGFaceDelaunayInsertion.cpp BDS.h \
../Numeric/Numeric.h ../Common/Context.h ../DataStr/List.h \
../Geo/ExtrudeParams.h ../Common/SmoothData.h ../Geo/MElement.h \
../Geo/SPoint2.h ../Geo/SVector3.h ../Geo/Pair.h ../Geo/ExtrudeParams.h \
- ../Common/Views.h ../Common/ColorTable.h ../Common/VertexArray.h \
- ../Common/SmoothData.h ../Common/AdaptiveViews.h ../Common/GmshMatrix.h \
- BackgroundMesh.h meshGFaceDelaunayInsertion.h ../Common/Message.h
+ ../Post/Views.h ../Post/ColorTable.h ../Common/VertexArray.h \
+ ../Post/AdaptiveViews.h ../Common/GmshMatrix.h BackgroundMesh.h \
+ meshGFaceDelaunayInsertion.h ../Common/Message.h
meshGRegion.o: meshGRegion.cpp meshGRegion.h \
meshGRegionDelaunayInsertion.h ../Geo/MElement.h \
../Common/GmshDefines.h ../Geo/MVertex.h ../Geo/SPoint3.h \
@@ -235,9 +234,8 @@ meshGRegion.o: meshGRegion.cpp meshGRegion.h \
../Geo/ExtrudeParams.h ../Geo/GRegion.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 BDS.h ../Common/Views.h ../Common/ColorTable.h \
- ../Common/VertexArray.h ../Common/SmoothData.h \
- ../Common/AdaptiveViews.h ../Common/GmshMatrix.h
+ ../Common/OS.h BDS.h ../Post/Views.h ../Post/ColorTable.h \
+ ../Post/AdaptiveViews.h ../Common/GmshMatrix.h
meshGRegionDelaunayInsertion.o: meshGRegionDelaunayInsertion.cpp \
BackgroundMesh.h meshGRegionDelaunayInsertion.h ../Geo/MElement.h \
../Common/GmshDefines.h ../Geo/MVertex.h ../Geo/SPoint3.h \
@@ -290,10 +288,10 @@ DivideAndConquer.o: DivideAndConquer.cpp ../Common/Gmsh.h \
BackgroundMesh.o: BackgroundMesh.cpp ../Common/Gmsh.h ../Common/Message.h \
../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
- ../Common/Views.h ../Common/ColorTable.h ../Common/VertexArray.h \
- ../Common/SmoothData.h ../Numeric/Numeric.h ../Common/AdaptiveViews.h \
+ ../Post/Views.h ../Post/ColorTable.h ../Common/VertexArray.h \
+ ../Common/SmoothData.h ../Numeric/Numeric.h ../Post/AdaptiveViews.h \
../Common/GmshMatrix.h BackgroundMesh.h ../Common/Context.h \
- ../Common/OctreePost.h ../Common/Octree.h ../Common/OctreeInternals.h \
+ ../Post/OctreePost.h ../Common/Octree.h ../Common/OctreeInternals.h \
../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Common/GmshDefines.h \
../Geo/MVertex.h ../Geo/SPoint3.h ../Geo/GPoint.h ../Geo/SPoint2.h \
@@ -324,9 +322,9 @@ BoundaryLayer.o: BoundaryLayer.cpp BoundaryLayer.h ../Geo/GModel.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 \
- meshGEdge.h meshGFace.h ../Common/Message.h ../Common/Views.h \
- ../Common/ColorTable.h ../Common/VertexArray.h ../Common/SmoothData.h \
- ../Common/AdaptiveViews.h ../Common/GmshMatrix.h
+ meshGEdge.h meshGFace.h ../Common/Message.h ../Post/Views.h \
+ ../Post/ColorTable.h ../Common/VertexArray.h ../Post/AdaptiveViews.h \
+ ../Common/GmshMatrix.h
BDS.o: BDS.cpp ../Numeric/Numeric.h ../Common/GmshMatrix.h BDS.h \
../Geo/GFace.h ../Geo/GPoint.h ../Geo/GEntity.h ../Geo/Range.h \
../Geo/SPoint3.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h \
@@ -338,9 +336,8 @@ BDS.o: BDS.cpp ../Numeric/Numeric.h ../Common/GmshMatrix.h BDS.h \
../Common/Hash.h ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h \
../Common/Context.h ../DataStr/List.h ../Geo/ExtrudeParams.h \
../Common/SmoothData.h ../Geo/MElement.h ../Geo/SPoint2.h \
- ../Geo/SVector3.h ../Geo/Pair.h ../Geo/ExtrudeParams.h \
- ../Common/Views.h ../Common/ColorTable.h ../Common/VertexArray.h \
- ../Common/SmoothData.h ../Common/AdaptiveViews.h ../Common/GmshMatrix.h \
+ ../Geo/SVector3.h ../Geo/Pair.h ../Geo/ExtrudeParams.h ../Post/Views.h \
+ ../Post/ColorTable.h ../Common/VertexArray.h ../Post/AdaptiveViews.h \
../Common/Message.h
HighOrder.o: HighOrder.cpp HighOrder.h ../Geo/GModel.h ../Geo/GVertex.h \
../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
diff --git a/Numeric/Makefile b/Numeric/Makefile
index f35e32f3b611ce4f735ca98a890a882c306cffd6..11f879cc0d141991afcefe284d72fe85e102cbbe 100644
--- a/Numeric/Makefile
+++ b/Numeric/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.34 2007-01-24 15:17:09 geuzaine Exp $
+# $Id: Makefile,v 1.35 2007-07-09 13:54:36 geuzaine Exp $
#
# Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
#
diff --git a/Parallel/Makefile b/Parallel/Makefile
index 8bb72df3074c19ad432d713dbe9ecb2ad34ffe92..cb1f8b1e2c4841507654514b87bbf1512d930f42 100644
--- a/Parallel/Makefile
+++ b/Parallel/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.35 2006-11-27 22:22:17 geuzaine Exp $
+# $Id: Makefile,v 1.36 2007-07-09 13:54:37 geuzaine Exp $
#
# Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
#
diff --git a/Parser/Makefile b/Parser/Makefile
index 3ae4c1cb15edf06ee676eb4c8fafd9869da116c9..ef627661f285162329075bb69021696cc05f1943 100644
--- a/Parser/Makefile
+++ b/Parser/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.121 2007-05-24 14:21:53 geuzaine Exp $
+# $Id: Makefile,v 1.122 2007-07-09 13:54:37 geuzaine Exp $
#
# Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
#
@@ -22,8 +22,8 @@
include ../variables
LIB = ../lib/libGmshParser.a
-INCLUDE = -I../Common -I../DataStr -I../Geo -I../Graphics\
- -I../Mesh -I../Numeric -I../Fltk -I../Plugin -I../Parallel\
+INCLUDE = -I../Common -I../DataStr -I../Geo -I../Mesh -I../Post\
+ -I../Graphics -I../Numeric -I../Fltk -I../Plugin -I../Parallel\
-I../contrib/ANN/include
CFLAGS = ${OPTIM} ${FLAGS} ${INCLUDE}
@@ -47,7 +47,7 @@ ${LIB}: ${OBJ}
# Don't optimize Gmsh.tab.o: on many architectures, g++ -O2 generates
# assembly code too large to be addressed correctly
Gmsh.tab.o:
- ${CXX} ${FLAGS} ${INCLUDE} -c $<
+ ${CXX} ${FLAGS} ${INCLUDE} -c Gmsh.tab.cpp
# Don't do this: it would be triggered when we check out a new version via CVS
# Gmsh.tab.cpp: Gmsh.y
@@ -77,9 +77,9 @@ depend:
# DO NOT DELETE THIS LINE
Gmsh.tab.o: Gmsh.tab.cpp ../Plugin/PluginManager.h ../Plugin/Plugin.h \
- ../Common/Options.h ../Common/Message.h ../Common/Views.h \
- ../Common/ColorTable.h ../DataStr/List.h ../Common/VertexArray.h \
- ../Common/SmoothData.h ../Numeric/Numeric.h ../Common/AdaptiveViews.h \
+ ../Common/Options.h ../Common/Message.h ../Post/Views.h \
+ ../Post/ColorTable.h ../DataStr/List.h ../Common/VertexArray.h \
+ ../Common/SmoothData.h ../Numeric/Numeric.h ../Post/AdaptiveViews.h \
../Common/GmshMatrix.h ../Parallel/ParUtil.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 \
@@ -101,7 +101,7 @@ Gmsh.tab.o: Gmsh.tab.cpp ../Plugin/PluginManager.h ../Plugin/Plugin.h \
../Geo/GeoInterpolation.h ../Geo/Geo.h ../Mesh/Generator.h \
../Graphics/Draw.h ../Common/Colors.h ../Common/Options.h Parser.h \
OpenFile.h ../Common/CommandLine.h FunctionManager.h ../Common/OS.h \
- CreateFile.h ../Mesh/Field.h ../Common/OctreePost.h ../Common/Octree.h \
+ CreateFile.h ../Mesh/Field.h ../Post/OctreePost.h ../Common/Octree.h \
../Common/OctreeInternals.h ../Mesh/BackgroundMesh.h
Gmsh.yy.o: Gmsh.yy.cpp ../Common/Gmsh.h ../Common/Message.h \
../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
@@ -130,11 +130,11 @@ OpenFile.o: OpenFile.cpp ../Common/Gmsh.h ../Common/Message.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 Parser.h OpenFile.h ../Common/CommandLine.h \
- ../Common/Views.h ../Common/ColorTable.h ../Common/VertexArray.h \
- ../Common/SmoothData.h ../Common/AdaptiveViews.h ../Common/GmshMatrix.h \
- ../Graphics/ReadImg.h ../Common/OS.h ../Mesh/HighOrder.h \
- ../Common/GmshUI.h ../Graphics/Draw.h ../Graphics/SelectBuffer.h \
- ../Fltk/GUI.h ../Fltk/Opengl_Window.h ../Fltk/Colorbar_Window.h \
+ ../Post/Views.h ../Post/ColorTable.h ../Common/VertexArray.h \
+ ../Post/AdaptiveViews.h ../Common/GmshMatrix.h ../Graphics/ReadImg.h \
+ ../Common/OS.h ../Mesh/HighOrder.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
CreateFile.o: CreateFile.cpp ../Common/Gmsh.h ../Common/Message.h \
../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
@@ -157,9 +157,9 @@ CreateFile.o: CreateFile.cpp ../Common/Gmsh.h ../Common/Message.h \
../Geo/GEntity.h ../Geo/MElement.h ../Geo/ExtrudeParams.h \
../Geo/SBoundingBox3d.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/SmoothData.h ../Common/AdaptiveViews.h ../Common/GmshMatrix.h \
- ../Graphics/gl2jpeg.h ../Graphics/PixelBuffer.h ../Graphics/gl2png.h \
+ ../Post/Views.h ../Post/ColorTable.h ../Common/VertexArray.h \
+ ../Post/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
diff --git a/Plugin/Makefile b/Plugin/Makefile
index 6807d16b6c2fd4082c5d6c422ab04f41d6379271..12f410875bfb31764c3aa1b62d5d4e8b75d87b18 100644
--- a/Plugin/Makefile
+++ b/Plugin/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.126 2007-05-24 14:21:53 geuzaine Exp $
+# $Id: Makefile,v 1.127 2007-07-09 13:54:37 geuzaine Exp $
#
# Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
#
@@ -22,8 +22,8 @@
include ../variables
LIB = ../lib/libGmshPlugin.a
-INCLUDE = -I../Common -I../Graphics -I../DataStr -I../Geo -I../Fltk\
- -I../Mesh -I../Numeric -I../contrib/ANN/include\
+INCLUDE = -I../Common -I../Graphics -I../DataStr -I../Geo -I../Mesh\
+ -I../Post -I../Fltk -I../Numeric -I../contrib/ANN/include\
-I../contrib/Triangle -I../contrib/MathEval
CFLAGS = ${OPTIM} ${FLAGS} ${INCLUDE}
@@ -70,92 +70,92 @@ depend:
# DO NOT DELETE THIS LINE
Plugin.o: Plugin.cpp Plugin.h ../Common/Options.h ../Common/Message.h \
- ../Common/Views.h ../Common/ColorTable.h ../DataStr/List.h \
+ ../Post/Views.h ../Post/ColorTable.h ../DataStr/List.h \
../Common/VertexArray.h ../Common/SmoothData.h ../Numeric/Numeric.h \
- ../Common/AdaptiveViews.h ../Common/GmshMatrix.h PluginManager.h \
- CutMap.h Levelset.h CutGrid.h StreamLines.h CutPlane.h CutParametric.h \
+ ../Post/AdaptiveViews.h ../Common/GmshMatrix.h PluginManager.h CutMap.h \
+ Levelset.h CutGrid.h StreamLines.h CutPlane.h CutParametric.h \
CutSphere.h Skin.h ../DataStr/Tree.h ../DataStr/avl.h Extract.h \
ExtractElements.h ExtractEdges.h HarmonicToTime.h ModulusPhase.h \
Integrate.h Gradient.h Curl.h Divergence.h Annotate.h Remove.h \
MakeSimplex.h Smooth.h Transform.h Triangulate.h Warp.h \
SphericalRaise.h Eigenvectors.h Eigenvalues.h Lambda2.h Evaluate.h \
- ../Common/OctreePost.h ../Common/Octree.h ../Common/OctreeInternals.h \
+ ../Post/OctreePost.h ../Common/Octree.h ../Common/OctreeInternals.h \
Probe.h FieldView.h ../Common/Context.h
Levelset.o: Levelset.cpp Levelset.h Plugin.h ../Common/Options.h \
- ../Common/Message.h ../Common/Views.h ../Common/ColorTable.h \
+ ../Common/Message.h ../Post/Views.h ../Post/ColorTable.h \
../DataStr/List.h ../Common/VertexArray.h ../Common/SmoothData.h \
- ../Numeric/Numeric.h ../Common/AdaptiveViews.h ../Common/GmshMatrix.h \
+ ../Numeric/Numeric.h ../Post/AdaptiveViews.h ../Common/GmshMatrix.h \
MakeSimplex.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
../DataStr/avl.h ../Graphics/Iso.h ../Common/Context.h \
../DataStr/Malloc.h
CutPlane.o: CutPlane.cpp CutPlane.h Levelset.h Plugin.h \
- ../Common/Options.h ../Common/Message.h ../Common/Views.h \
- ../Common/ColorTable.h ../DataStr/List.h ../Common/VertexArray.h \
- ../Common/SmoothData.h ../Numeric/Numeric.h ../Common/AdaptiveViews.h \
+ ../Common/Options.h ../Common/Message.h ../Post/Views.h \
+ ../Post/ColorTable.h ../DataStr/List.h ../Common/VertexArray.h \
+ ../Common/SmoothData.h ../Numeric/Numeric.h ../Post/AdaptiveViews.h \
../Common/GmshMatrix.h ../Common/Context.h ../Common/GmshUI.h \
../Graphics/Draw.h
CutSphere.o: CutSphere.cpp CutSphere.h Levelset.h Plugin.h \
- ../Common/Options.h ../Common/Message.h ../Common/Views.h \
- ../Common/ColorTable.h ../DataStr/List.h ../Common/VertexArray.h \
- ../Common/SmoothData.h ../Numeric/Numeric.h ../Common/AdaptiveViews.h \
+ ../Common/Options.h ../Common/Message.h ../Post/Views.h \
+ ../Post/ColorTable.h ../DataStr/List.h ../Common/VertexArray.h \
+ ../Common/SmoothData.h ../Numeric/Numeric.h ../Post/AdaptiveViews.h \
../Common/GmshMatrix.h ../Common/Context.h ../Common/GmshUI.h \
../Graphics/Draw.h
CutMap.o: CutMap.cpp CutMap.h Levelset.h Plugin.h ../Common/Options.h \
- ../Common/Message.h ../Common/Views.h ../Common/ColorTable.h \
+ ../Common/Message.h ../Post/Views.h ../Post/ColorTable.h \
../DataStr/List.h ../Common/VertexArray.h ../Common/SmoothData.h \
- ../Numeric/Numeric.h ../Common/AdaptiveViews.h ../Common/GmshMatrix.h \
+ ../Numeric/Numeric.h ../Post/AdaptiveViews.h ../Common/GmshMatrix.h \
../Common/Context.h
Smooth.o: Smooth.cpp Plugin.h ../Common/Options.h ../Common/Message.h \
- ../Common/Views.h ../Common/ColorTable.h ../DataStr/List.h \
+ ../Post/Views.h ../Post/ColorTable.h ../DataStr/List.h \
../Common/VertexArray.h ../Common/SmoothData.h ../Numeric/Numeric.h \
- ../Common/AdaptiveViews.h ../Common/GmshMatrix.h Smooth.h \
+ ../Post/AdaptiveViews.h ../Common/GmshMatrix.h Smooth.h \
../Common/Context.h
-CutParametric.o: CutParametric.cpp ../Common/OctreePost.h \
+CutParametric.o: CutParametric.cpp ../Post/OctreePost.h \
../Common/Octree.h ../Common/OctreeInternals.h CutParametric.h Plugin.h \
- ../Common/Options.h ../Common/Message.h ../Common/Views.h \
- ../Common/ColorTable.h ../DataStr/List.h ../Common/VertexArray.h \
- ../Common/SmoothData.h ../Numeric/Numeric.h ../Common/AdaptiveViews.h \
+ ../Common/Options.h ../Common/Message.h ../Post/Views.h \
+ ../Post/ColorTable.h ../DataStr/List.h ../Common/VertexArray.h \
+ ../Common/SmoothData.h ../Numeric/Numeric.h ../Post/AdaptiveViews.h \
../Common/GmshMatrix.h ../Common/Context.h ../Common/GmshUI.h \
../Graphics/Draw.h
Lambda2.o: Lambda2.cpp Plugin.h ../Common/Options.h ../Common/Message.h \
- ../Common/Views.h ../Common/ColorTable.h ../DataStr/List.h \
+ ../Post/Views.h ../Post/ColorTable.h ../DataStr/List.h \
../Common/VertexArray.h ../Common/SmoothData.h ../Numeric/Numeric.h \
- ../Common/AdaptiveViews.h ../Common/GmshMatrix.h Lambda2.h \
+ ../Post/AdaptiveViews.h ../Common/GmshMatrix.h Lambda2.h \
../Common/Context.h ../Common/ShapeFunctions.h
Eigenvectors.o: Eigenvectors.cpp Plugin.h ../Common/Options.h \
- ../Common/Message.h ../Common/Views.h ../Common/ColorTable.h \
+ ../Common/Message.h ../Post/Views.h ../Post/ColorTable.h \
../DataStr/List.h ../Common/VertexArray.h ../Common/SmoothData.h \
- ../Numeric/Numeric.h ../Common/AdaptiveViews.h ../Common/GmshMatrix.h \
+ ../Numeric/Numeric.h ../Post/AdaptiveViews.h ../Common/GmshMatrix.h \
Eigenvectors.h ../Common/Context.h ../DataStr/Malloc.h \
../Numeric/EigSolve.h
Eigenvalues.o: Eigenvalues.cpp Plugin.h ../Common/Options.h \
- ../Common/Message.h ../Common/Views.h ../Common/ColorTable.h \
+ ../Common/Message.h ../Post/Views.h ../Post/ColorTable.h \
../DataStr/List.h ../Common/VertexArray.h ../Common/SmoothData.h \
- ../Numeric/Numeric.h ../Common/AdaptiveViews.h ../Common/GmshMatrix.h \
+ ../Numeric/Numeric.h ../Post/AdaptiveViews.h ../Common/GmshMatrix.h \
Eigenvalues.h ../Common/Context.h ../DataStr/Malloc.h
-StreamLines.o: StreamLines.cpp ../Common/OctreePost.h ../Common/Octree.h \
+StreamLines.o: StreamLines.cpp ../Post/OctreePost.h ../Common/Octree.h \
../Common/OctreeInternals.h StreamLines.h Plugin.h ../Common/Options.h \
- ../Common/Message.h ../Common/Views.h ../Common/ColorTable.h \
+ ../Common/Message.h ../Post/Views.h ../Post/ColorTable.h \
../DataStr/List.h ../Common/VertexArray.h ../Common/SmoothData.h \
- ../Numeric/Numeric.h ../Common/AdaptiveViews.h ../Common/GmshMatrix.h \
+ ../Numeric/Numeric.h ../Post/AdaptiveViews.h ../Common/GmshMatrix.h \
../Common/Context.h ../Common/GmshUI.h ../Graphics/Draw.h
-CutGrid.o: CutGrid.cpp ../Common/OctreePost.h ../Common/Octree.h \
+CutGrid.o: CutGrid.cpp ../Post/OctreePost.h ../Common/Octree.h \
../Common/OctreeInternals.h CutGrid.h Plugin.h ../Common/Options.h \
- ../Common/Message.h ../Common/Views.h ../Common/ColorTable.h \
+ ../Common/Message.h ../Post/Views.h ../Post/ColorTable.h \
../DataStr/List.h ../Common/VertexArray.h ../Common/SmoothData.h \
- ../Numeric/Numeric.h ../Common/AdaptiveViews.h ../Common/GmshMatrix.h \
+ ../Numeric/Numeric.h ../Post/AdaptiveViews.h ../Common/GmshMatrix.h \
../Common/Context.h ../Common/GmshUI.h ../Graphics/Draw.h
Transform.o: Transform.cpp Plugin.h ../Common/Options.h \
- ../Common/Message.h ../Common/Views.h ../Common/ColorTable.h \
+ ../Common/Message.h ../Post/Views.h ../Post/ColorTable.h \
../DataStr/List.h ../Common/VertexArray.h ../Common/SmoothData.h \
- ../Numeric/Numeric.h ../Common/AdaptiveViews.h ../Common/GmshMatrix.h \
+ ../Numeric/Numeric.h ../Post/AdaptiveViews.h ../Common/GmshMatrix.h \
Transform.h ../Common/Context.h
Triangulate.o: Triangulate.cpp ../Common/Gmsh.h ../Common/Message.h \
../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
- Plugin.h ../Common/Options.h ../Common/Views.h ../Common/ColorTable.h \
+ Plugin.h ../Common/Options.h ../Post/Views.h ../Post/ColorTable.h \
../Common/VertexArray.h ../Common/SmoothData.h ../Numeric/Numeric.h \
- ../Common/AdaptiveViews.h ../Common/GmshMatrix.h Triangulate.h \
+ ../Post/AdaptiveViews.h ../Common/GmshMatrix.h Triangulate.h \
../Common/Context.h ../Geo/MVertex.h ../Geo/SPoint3.h ../Geo/gmshFace.h \
../Geo/Geo.h ../Common/GmshDefines.h ../Geo/gmshSurface.h ../Geo/Pair.h \
../Geo/Range.h ../Geo/SPoint2.h ../Geo/SPoint3.h ../Geo/SVector3.h \
@@ -172,35 +172,34 @@ Triangulate.o: Triangulate.cpp ../Common/Gmsh.h ../Common/Message.h \
../Geo/ExtrudeParams.h ../Geo/gmshVertex.h ../Geo/Geo.h \
../Geo/GVertex.h ../Geo/Range.h
Warp.o: Warp.cpp Plugin.h ../Common/Options.h ../Common/Message.h \
- ../Common/Views.h ../Common/ColorTable.h ../DataStr/List.h \
+ ../Post/Views.h ../Post/ColorTable.h ../DataStr/List.h \
../Common/VertexArray.h ../Common/SmoothData.h ../Numeric/Numeric.h \
- ../Common/AdaptiveViews.h ../Common/GmshMatrix.h Warp.h \
+ ../Post/AdaptiveViews.h ../Common/GmshMatrix.h Warp.h \
../Common/Context.h
SphericalRaise.o: SphericalRaise.cpp Plugin.h ../Common/Options.h \
- ../Common/Message.h ../Common/Views.h ../Common/ColorTable.h \
+ ../Common/Message.h ../Post/Views.h ../Post/ColorTable.h \
../DataStr/List.h ../Common/VertexArray.h ../Common/SmoothData.h \
- ../Numeric/Numeric.h ../Common/AdaptiveViews.h ../Common/GmshMatrix.h \
+ ../Numeric/Numeric.h ../Post/AdaptiveViews.h ../Common/GmshMatrix.h \
SphericalRaise.h ../Common/Context.h
Skin.o: Skin.cpp Plugin.h ../Common/Options.h ../Common/Message.h \
- ../Common/Views.h ../Common/ColorTable.h ../DataStr/List.h \
+ ../Post/Views.h ../Post/ColorTable.h ../DataStr/List.h \
../Common/VertexArray.h ../Common/SmoothData.h ../Numeric/Numeric.h \
- ../Common/AdaptiveViews.h ../Common/GmshMatrix.h Skin.h \
- ../DataStr/Tree.h ../DataStr/avl.h ../Common/Context.h \
- ../DataStr/Malloc.h
+ ../Post/AdaptiveViews.h ../Common/GmshMatrix.h Skin.h ../DataStr/Tree.h \
+ ../DataStr/avl.h ../Common/Context.h ../DataStr/Malloc.h
Extract.o: Extract.cpp Plugin.h ../Common/Options.h ../Common/Message.h \
- ../Common/Views.h ../Common/ColorTable.h ../DataStr/List.h \
+ ../Post/Views.h ../Post/ColorTable.h ../DataStr/List.h \
../Common/VertexArray.h ../Common/SmoothData.h ../Numeric/Numeric.h \
- ../Common/AdaptiveViews.h ../Common/GmshMatrix.h Extract.h \
+ ../Post/AdaptiveViews.h ../Common/GmshMatrix.h Extract.h \
../Common/Context.h ../DataStr/Malloc.h
ExtractElements.o: ExtractElements.cpp Plugin.h ../Common/Options.h \
- ../Common/Message.h ../Common/Views.h ../Common/ColorTable.h \
+ ../Common/Message.h ../Post/Views.h ../Post/ColorTable.h \
../DataStr/List.h ../Common/VertexArray.h ../Common/SmoothData.h \
- ../Numeric/Numeric.h ../Common/AdaptiveViews.h ../Common/GmshMatrix.h \
+ ../Numeric/Numeric.h ../Post/AdaptiveViews.h ../Common/GmshMatrix.h \
ExtractElements.h ../Common/Context.h ../DataStr/Malloc.h
ExtractEdges.o: ExtractEdges.cpp Plugin.h ../Common/Options.h \
- ../Common/Message.h ../Common/Views.h ../Common/ColorTable.h \
+ ../Common/Message.h ../Post/Views.h ../Post/ColorTable.h \
../DataStr/List.h ../Common/VertexArray.h ../Common/SmoothData.h \
- ../Numeric/Numeric.h ../Common/AdaptiveViews.h ../Common/GmshMatrix.h \
+ ../Numeric/Numeric.h ../Post/AdaptiveViews.h ../Common/GmshMatrix.h \
ExtractEdges.h ../DataStr/Tree.h ../DataStr/avl.h ../Common/Context.h \
../DataStr/Malloc.h ../Mesh/BDS.h ../Geo/GFace.h ../Geo/GPoint.h \
../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
@@ -214,21 +213,21 @@ ExtractEdges.o: ExtractEdges.cpp Plugin.h ../Common/Options.h \
../Geo/MElement.h ../Geo/SPoint2.h ../Geo/SVector3.h ../Geo/Pair.h \
../Geo/ExtrudeParams.h
MakeSimplex.o: MakeSimplex.cpp Plugin.h ../Common/Options.h \
- ../Common/Message.h ../Common/Views.h ../Common/ColorTable.h \
+ ../Common/Message.h ../Post/Views.h ../Post/ColorTable.h \
../DataStr/List.h ../Common/VertexArray.h ../Common/SmoothData.h \
- ../Numeric/Numeric.h ../Common/AdaptiveViews.h ../Common/GmshMatrix.h \
+ ../Numeric/Numeric.h ../Post/AdaptiveViews.h ../Common/GmshMatrix.h \
MakeSimplex.h ../DataStr/Tree.h ../DataStr/avl.h ../Common/Context.h \
../DataStr/Malloc.h
Evaluate.o: Evaluate.cpp Plugin.h ../Common/Options.h ../Common/Message.h \
- ../Common/Views.h ../Common/ColorTable.h ../DataStr/List.h \
+ ../Post/Views.h ../Post/ColorTable.h ../DataStr/List.h \
../Common/VertexArray.h ../Common/SmoothData.h ../Numeric/Numeric.h \
- ../Common/AdaptiveViews.h ../Common/GmshMatrix.h Evaluate.h \
- ../Common/OctreePost.h ../Common/Octree.h ../Common/OctreeInternals.h \
+ ../Post/AdaptiveViews.h ../Common/GmshMatrix.h Evaluate.h \
+ ../Post/OctreePost.h ../Common/Octree.h ../Common/OctreeInternals.h \
../Common/Context.h
FieldView.o: FieldView.cpp Plugin.h ../Common/Options.h \
- ../Common/Message.h ../Common/Views.h ../Common/ColorTable.h \
+ ../Common/Message.h ../Post/Views.h ../Post/ColorTable.h \
../DataStr/List.h ../Common/VertexArray.h ../Common/SmoothData.h \
- ../Numeric/Numeric.h ../Common/AdaptiveViews.h ../Common/GmshMatrix.h \
+ ../Numeric/Numeric.h ../Post/AdaptiveViews.h ../Common/GmshMatrix.h \
../Mesh/Field.h ../Geo/Geo.h ../Common/GmshDefines.h \
../Geo/gmshSurface.h ../Geo/Pair.h ../Geo/Range.h ../Geo/SPoint2.h \
../Geo/SPoint3.h ../Geo/SVector3.h ../Geo/SPoint3.h \
@@ -240,55 +239,55 @@ FieldView.o: FieldView.cpp Plugin.h ../Common/Options.h \
../Geo/SVector3.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/ExtrudeParams.h ../Common/OctreePost.h \
+ ../Common/Context.h ../Geo/ExtrudeParams.h ../Post/OctreePost.h \
../Common/Octree.h ../Common/OctreeInternals.h FieldView.h \
../Common/ShapeFunctions.h
Integrate.o: Integrate.cpp Plugin.h ../Common/Options.h \
- ../Common/Message.h ../Common/Views.h ../Common/ColorTable.h \
+ ../Common/Message.h ../Post/Views.h ../Post/ColorTable.h \
../DataStr/List.h ../Common/VertexArray.h ../Common/SmoothData.h \
- ../Numeric/Numeric.h ../Common/AdaptiveViews.h ../Common/GmshMatrix.h \
+ ../Numeric/Numeric.h ../Post/AdaptiveViews.h ../Common/GmshMatrix.h \
Integrate.h ../Common/Context.h ../Common/ShapeFunctions.h
Gradient.o: Gradient.cpp Plugin.h ../Common/Options.h ../Common/Message.h \
- ../Common/Views.h ../Common/ColorTable.h ../DataStr/List.h \
+ ../Post/Views.h ../Post/ColorTable.h ../DataStr/List.h \
../Common/VertexArray.h ../Common/SmoothData.h ../Numeric/Numeric.h \
- ../Common/AdaptiveViews.h ../Common/GmshMatrix.h Gradient.h \
+ ../Post/AdaptiveViews.h ../Common/GmshMatrix.h Gradient.h \
../Common/Context.h ../Common/ShapeFunctions.h
Curl.o: Curl.cpp Plugin.h ../Common/Options.h ../Common/Message.h \
- ../Common/Views.h ../Common/ColorTable.h ../DataStr/List.h \
+ ../Post/Views.h ../Post/ColorTable.h ../DataStr/List.h \
../Common/VertexArray.h ../Common/SmoothData.h ../Numeric/Numeric.h \
- ../Common/AdaptiveViews.h ../Common/GmshMatrix.h Curl.h \
+ ../Post/AdaptiveViews.h ../Common/GmshMatrix.h Curl.h \
../Common/Context.h ../Common/ShapeFunctions.h
Divergence.o: Divergence.cpp Plugin.h ../Common/Options.h \
- ../Common/Message.h ../Common/Views.h ../Common/ColorTable.h \
+ ../Common/Message.h ../Post/Views.h ../Post/ColorTable.h \
../DataStr/List.h ../Common/VertexArray.h ../Common/SmoothData.h \
- ../Numeric/Numeric.h ../Common/AdaptiveViews.h ../Common/GmshMatrix.h \
+ ../Numeric/Numeric.h ../Post/AdaptiveViews.h ../Common/GmshMatrix.h \
Divergence.h ../Common/Context.h ../Common/ShapeFunctions.h
Annotate.o: Annotate.cpp Plugin.h ../Common/Options.h ../Common/Message.h \
- ../Common/Views.h ../Common/ColorTable.h ../DataStr/List.h \
+ ../Post/Views.h ../Post/ColorTable.h ../DataStr/List.h \
../Common/VertexArray.h ../Common/SmoothData.h ../Numeric/Numeric.h \
- ../Common/AdaptiveViews.h ../Common/GmshMatrix.h Annotate.h \
+ ../Post/AdaptiveViews.h ../Common/GmshMatrix.h Annotate.h \
../Common/Context.h ../Common/GmshUI.h ../Fltk/GUI.h \
../Fltk/Opengl_Window.h ../Fltk/Colorbar_Window.h \
../Fltk/Popup_Button.h ../Fltk/SpherePosition_Widget.h \
../Graphics/Draw.h
Remove.o: Remove.cpp Plugin.h ../Common/Options.h ../Common/Message.h \
- ../Common/Views.h ../Common/ColorTable.h ../DataStr/List.h \
+ ../Post/Views.h ../Post/ColorTable.h ../DataStr/List.h \
../Common/VertexArray.h ../Common/SmoothData.h ../Numeric/Numeric.h \
- ../Common/AdaptiveViews.h ../Common/GmshMatrix.h Remove.h \
+ ../Post/AdaptiveViews.h ../Common/GmshMatrix.h Remove.h \
../Common/Context.h
Probe.o: Probe.cpp Probe.h Plugin.h ../Common/Options.h \
- ../Common/Message.h ../Common/Views.h ../Common/ColorTable.h \
+ ../Common/Message.h ../Post/Views.h ../Post/ColorTable.h \
../DataStr/List.h ../Common/VertexArray.h ../Common/SmoothData.h \
- ../Numeric/Numeric.h ../Common/AdaptiveViews.h ../Common/GmshMatrix.h \
+ ../Numeric/Numeric.h ../Post/AdaptiveViews.h ../Common/GmshMatrix.h \
../Common/Context.h ../Common/GmshUI.h ../Graphics/Draw.h \
- ../Common/OctreePost.h ../Common/Octree.h ../Common/OctreeInternals.h
+ ../Post/OctreePost.h ../Common/Octree.h ../Common/OctreeInternals.h
HarmonicToTime.o: HarmonicToTime.cpp Plugin.h ../Common/Options.h \
- ../Common/Message.h ../Common/Views.h ../Common/ColorTable.h \
+ ../Common/Message.h ../Post/Views.h ../Post/ColorTable.h \
../DataStr/List.h ../Common/VertexArray.h ../Common/SmoothData.h \
- ../Numeric/Numeric.h ../Common/AdaptiveViews.h ../Common/GmshMatrix.h \
+ ../Numeric/Numeric.h ../Post/AdaptiveViews.h ../Common/GmshMatrix.h \
HarmonicToTime.h ../Common/Context.h
ModulusPhase.o: ModulusPhase.cpp Plugin.h ../Common/Options.h \
- ../Common/Message.h ../Common/Views.h ../Common/ColorTable.h \
+ ../Common/Message.h ../Post/Views.h ../Post/ColorTable.h \
../DataStr/List.h ../Common/VertexArray.h ../Common/SmoothData.h \
- ../Numeric/Numeric.h ../Common/AdaptiveViews.h ../Common/GmshMatrix.h \
+ ../Numeric/Numeric.h ../Post/AdaptiveViews.h ../Common/GmshMatrix.h \
ModulusPhase.h ../Common/Context.h
diff --git a/Plugin/Transform.cpp b/Plugin/Transform.cpp
index cbb70f5d95aaa8f37e8b274f41bd9f1312d37fa3..df3f1a387a90aff8094cc442b8ff82dd095d367d 100644
--- a/Plugin/Transform.cpp
+++ b/Plugin/Transform.cpp
@@ -1,4 +1,4 @@
-// $Id: Transform.cpp,v 1.34 2007-05-04 10:45:09 geuzaine Exp $
+// $Id: Transform.cpp,v 1.35 2007-07-09 13:54:37 geuzaine Exp $
//
// Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
//
@@ -122,7 +122,16 @@ static void transform_list(Post_View *view, List_T *list, int nbList,
double *z = (double *)List_Pointer_Fast(list, i + 2 * nbVert);
for(int j = 0; j < nbVert; j++) {
double v[3] = { x[j], y[j], z[j] };
+#if 1
transform(mat, v, &x[j], &y[j], &z[j]);
+#else
+ // for saku
+ double alpha = mat[0][0];
+ double d = sqrt(v[0] * v[0] + v[1] * v[1]);
+ x[j] = cos(2 * M_PI / alpha * atan2(v[1], v[0])) * alpha / (2 * M_PI) * d;
+ y[j] = sin(2 * M_PI / alpha * atan2(v[1], v[0])) * alpha / (2 * M_PI) * d;
+ z[j] = cos(asin(alpha / (2 * M_PI))) * d;
+#endif
if(x[j] < view->BBox[0]) view->BBox[0] = x[j];
if(x[j] > view->BBox[1]) view->BBox[1] = x[j];
if(y[j] < view->BBox[2]) view->BBox[2] = y[j];
diff --git a/Common/AdaptiveViews.cpp b/Post/AdaptiveViews.cpp
similarity index 100%
rename from Common/AdaptiveViews.cpp
rename to Post/AdaptiveViews.cpp
diff --git a/Common/AdaptiveViews.h b/Post/AdaptiveViews.h
similarity index 100%
rename from Common/AdaptiveViews.h
rename to Post/AdaptiveViews.h
diff --git a/Common/ColorTable.cpp b/Post/ColorTable.cpp
similarity index 99%
rename from Common/ColorTable.cpp
rename to Post/ColorTable.cpp
index a0f0f9862811f494b52e60c5a99c2b78ce908a64..b0b37f1cf3aa1c23b6a59fb8e2930ed8e90eed46 100644
--- a/Common/ColorTable.cpp
+++ b/Post/ColorTable.cpp
@@ -1,4 +1,4 @@
-// $Id: ColorTable.cpp,v 1.33 2006-11-27 22:22:07 geuzaine Exp $
+// $Id: ColorTable.cpp,v 1.1 2007-07-09 13:54:37 geuzaine Exp $
//
// Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
//
diff --git a/Common/ColorTable.h b/Post/ColorTable.h
similarity index 100%
rename from Common/ColorTable.h
rename to Post/ColorTable.h
diff --git a/Post/Makefile b/Post/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..3ae50dd1bbf90cf29d17c1eb47aa10b558688a0d
--- /dev/null
+++ b/Post/Makefile
@@ -0,0 +1,83 @@
+# $Id: Makefile,v 1.1 2007-07-09 13:54:37 geuzaine Exp $
+#
+# Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+# USA.
+#
+# Please report all bugs and problems to <gmsh@geuz.org>.
+
+include ../variables
+
+LIB = ../lib/libGmshPost.a
+INCLUDE = -I../Common -I../DataStr -I../Geo -I../Mesh -I../Post\
+ -I../Graphics -I../Numeric -I../Parser -I../Plugin -I../Fltk\
+ -I../contrib/MathEval -I../contrib/ANN/include/
+CFLAGS =${OPTIM} ${FLAGS} ${INCLUDE}
+
+SRC = Views.cpp ViewsIO.cpp\
+ AdaptiveViews.cpp\
+ OctreePost.cpp\
+ ColorTable.cpp
+
+OBJ = ${SRC:.cpp=.o}
+
+.SUFFIXES: .o .cpp
+
+${LIB}: ${OBJ}
+ ${AR} ${LIB} ${OBJ}
+ ${RANLIB} ${LIB}
+
+.cpp.o:
+ ${CXX} ${CFLAGS} -c $<
+
+clean:
+ rm -f *.o
+
+depend:
+ (sed '/^# DO NOT DELETE THIS LINE/q' Makefile && \
+ ${CXX} -MM -MG ${CFLAGS} ${SRC} \
+ ) >Makefile.new
+ cp Makefile Makefile.bak
+ cp Makefile.new Makefile
+ rm -f Makefile.new
+
+# DO NOT DELETE THIS LINE
+Views.o: Views.cpp ../Common/Gmsh.h ../Common/Message.h \
+ ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
+ ../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
+ ../Numeric/Numeric.h Views.h ColorTable.h ../Common/VertexArray.h \
+ ../Common/SmoothData.h AdaptiveViews.h ../Common/GmshMatrix.h \
+ ../Common/Context.h ../Common/Options.h ../Mesh/BackgroundMesh.h
+ViewsIO.o: ViewsIO.cpp ../Common/Gmsh.h ../Common/Message.h \
+ ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
+ ../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
+ ../Numeric/Numeric.h Views.h ColorTable.h ../Common/VertexArray.h \
+ ../Common/SmoothData.h AdaptiveViews.h ../Common/GmshMatrix.h \
+ ../Common/Context.h
+AdaptiveViews.o: AdaptiveViews.cpp AdaptiveViews.h ../DataStr/List.h \
+ ../Common/GmshMatrix.h ../Plugin/Plugin.h ../Common/Options.h \
+ ../Common/Message.h ../Post/Views.h ../Post/ColorTable.h \
+ ../Common/VertexArray.h ../Common/SmoothData.h ../Numeric/Numeric.h \
+ ../Post/AdaptiveViews.h ../Common/OS.h
+OctreePost.o: OctreePost.cpp ../Common/Octree.h \
+ ../Common/OctreeInternals.h OctreePost.h ../DataStr/List.h Views.h \
+ ColorTable.h ../Common/VertexArray.h ../Common/SmoothData.h \
+ ../Numeric/Numeric.h AdaptiveViews.h ../Common/GmshMatrix.h \
+ ../Common/Message.h ../Common/ShapeFunctions.h
+ColorTable.o: ColorTable.cpp ../Common/Gmsh.h ../Common/Message.h \
+ ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
+ ../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
+ ColorTable.h ../Common/Context.h ../Numeric/Numeric.h
diff --git a/Common/OctreePost.cpp b/Post/OctreePost.cpp
similarity index 99%
rename from Common/OctreePost.cpp
rename to Post/OctreePost.cpp
index c8f6b61e6ba1bf592317ed22590d924430245215..d0f6e6c36b769e4ef383bf59613aa6f81baba749 100644
--- a/Common/OctreePost.cpp
+++ b/Post/OctreePost.cpp
@@ -1,4 +1,4 @@
-// $Id: OctreePost.cpp,v 1.2 2006-11-27 22:22:07 geuzaine Exp $
+// $Id: OctreePost.cpp,v 1.1 2007-07-09 13:54:37 geuzaine Exp $
//
// Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
//
diff --git a/Common/OctreePost.h b/Post/OctreePost.h
similarity index 100%
rename from Common/OctreePost.h
rename to Post/OctreePost.h
diff --git a/Common/Views.cpp b/Post/Views.cpp
similarity index 99%
rename from Common/Views.cpp
rename to Post/Views.cpp
index 7e77b7f8f1bd1405e86ac78a12c839962b4975d9..2364bbcfdd8f0aa895fa890d9702b97868e4027e 100644
--- a/Common/Views.cpp
+++ b/Post/Views.cpp
@@ -1,4 +1,4 @@
-// $Id: Views.cpp,v 1.195 2007-04-21 19:39:59 geuzaine Exp $
+// $Id: Views.cpp,v 1.1 2007-07-09 13:54:37 geuzaine Exp $
//
// Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
//
diff --git a/Common/Views.h b/Post/Views.h
similarity index 100%
rename from Common/Views.h
rename to Post/Views.h
diff --git a/Common/ViewsIO.cpp b/Post/ViewsIO.cpp
similarity index 99%
rename from Common/ViewsIO.cpp
rename to Post/ViewsIO.cpp
index f8e62dbaeb1e980c43ae53540b89a4624360c0b4..ee59d3b99b9c1088fb11cfe2c9c767be607f6bb0 100644
--- a/Common/ViewsIO.cpp
+++ b/Post/ViewsIO.cpp
@@ -1,4 +1,4 @@
-// $Id: ViewsIO.cpp,v 1.10 2007-05-19 22:01:27 geuzaine Exp $
+// $Id: ViewsIO.cpp,v 1.1 2007-07-09 13:54:37 geuzaine Exp $
//
// Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
//
diff --git a/configure b/configure
index 1e2f1c1e0be4116c54faad1d051493d415f333ab..4011f1b1ad54fc476bfd153e6fef08fabdb5c048 100755
--- a/configure
+++ b/configure
@@ -3185,13 +3185,13 @@ esac
-GMSH_DIRS="Common DataStr Geo Mesh Numeric Parallel Parser Plugin"
+GMSH_DIRS="Common DataStr Geo Mesh Post Numeric Parallel Parser Plugin"
if test "x$enable_gui" != "xno"; then
GMSH_DIRS="${GMSH_DIRS} Graphics Fltk"
GMSH_LIBS="-Llib -lGmshFltk -lGmshParser -lGmshGraphics -lGmshMesh -lGmshGeo"
- GMSH_LIBS="${GMSH_LIBS} -lGmshPlugin -lGmshCommon -lGmshDataStr -lGmshNumeric"
+ GMSH_LIBS="${GMSH_LIBS} -lGmshPlugin -lGmshPost -lGmshCommon -lGmshDataStr -lGmshNumeric"
GMSH_LIBS="${GMSH_LIBS} -lGmshParallel"
FLAGS="-DHAVE_FLTK ${FLAGS}"
@@ -3622,8 +3622,9 @@ fi
else
GMSH_DIRS="${GMSH_DIRS} Box"
- GMSH_LIBS="-Llib Box/Main.o -lGmshBox -lGmshParser -lGmshMesh -lGmshGeo -lGmshPlugin"
- GMSH_LIBS="${GMSH_LIBS} -lGmshCommon -lGmshDataStr -lGmshNumeric -lGmshParallel"
+ GMSH_LIBS="-Llib Box/Main.o -lGmshBox -lGmshParser -lGmshMesh -lGmshGeo"
+ GMSH_LIBS="${GMSH_LIBS} -lGmshPlugin -lGmshPost -lGmshCommon -lGmshDataStr"
+ GMSH_LIBS="${GMSH_LIBS} -lGmshNumeric -lGmshParallel"
ZLIB=""
if test "x$enable_zlib" != "xno"; then
diff --git a/configure.in b/configure.in
index 41a7f16770c591fe2ddb0225cbcb2e05503d7fa4..79444291682de46db748631b673f5de8231c0a9d 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.126 2007-05-20 21:52:25 geuzaine Exp $
+dnl $Id: configure.in,v 1.127 2007-07-09 13:54:36 geuzaine Exp $
dnl
dnl Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
dnl
@@ -185,14 +185,14 @@ dnl See if we need a .exe extension on executables
AC_EXEEXT
dnl Set default subdirectories and libraries
-GMSH_DIRS="Common DataStr Geo Mesh Numeric Parallel Parser Plugin"
+GMSH_DIRS="Common DataStr Geo Mesh Post Numeric Parallel Parser Plugin"
dnl Choose blackbox or GUI version
if test "x$enable_gui" != "xno"; then
GMSH_DIRS="${GMSH_DIRS} Graphics Fltk"
GMSH_LIBS="-Llib -lGmshFltk -lGmshParser -lGmshGraphics -lGmshMesh -lGmshGeo"
- GMSH_LIBS="${GMSH_LIBS} -lGmshPlugin -lGmshCommon -lGmshDataStr -lGmshNumeric"
+ GMSH_LIBS="${GMSH_LIBS} -lGmshPlugin -lGmshPost -lGmshCommon -lGmshDataStr -lGmshNumeric"
GMSH_LIBS="${GMSH_LIBS} -lGmshParallel"
FLAGS="-DHAVE_FLTK ${FLAGS}"
@@ -300,8 +300,9 @@ if test "x$enable_gui" != "xno"; then
else
GMSH_DIRS="${GMSH_DIRS} Box"
- GMSH_LIBS="-Llib Box/Main.o -lGmshBox -lGmshParser -lGmshMesh -lGmshGeo -lGmshPlugin"
- GMSH_LIBS="${GMSH_LIBS} -lGmshCommon -lGmshDataStr -lGmshNumeric -lGmshParallel"
+ GMSH_LIBS="-Llib Box/Main.o -lGmshBox -lGmshParser -lGmshMesh -lGmshGeo"
+ GMSH_LIBS="${GMSH_LIBS} -lGmshPlugin -lGmshPost -lGmshCommon -lGmshDataStr"
+ GMSH_LIBS="${GMSH_LIBS} -lGmshNumeric -lGmshParallel"
dnl Check for libz
ZLIB=""
diff --git a/contrib/ANN/Makefile b/contrib/ANN/Makefile
index 79fa314f86129f4b4f6e0ee2439794a007baa705..a33d0edfb69588ff769080d9dbaa045698cf1650 100644
--- a/contrib/ANN/Makefile
+++ b/contrib/ANN/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.14 2006-11-27 22:22:33 geuzaine Exp $
+# $Id: Makefile,v 1.15 2007-07-09 13:54:37 geuzaine Exp $
#
# Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
#
diff --git a/contrib/MathEval/Makefile b/contrib/MathEval/Makefile
index 2e2382b8c95a23a9dfe9e503d81dcfdbff1f9359..412212dc523ea9bf2355376fc9558736abe75ce1 100644
--- a/contrib/MathEval/Makefile
+++ b/contrib/MathEval/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.13 2006-11-27 22:22:33 geuzaine Exp $
+# $Id: Makefile,v 1.14 2007-07-09 13:54:37 geuzaine Exp $
#
# Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
#
diff --git a/contrib/Tetgen/Makefile b/contrib/Tetgen/Makefile
index aa47d160517e5bcf8269a0c899efa74409576572..2c88b227f01e80f868eaa2edf3edf342b39f86bd 100644
--- a/contrib/Tetgen/Makefile
+++ b/contrib/Tetgen/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.3 2006-11-27 22:22:33 geuzaine Exp $
+# $Id: Makefile,v 1.4 2007-07-09 13:54:38 geuzaine Exp $
#
# Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
#
diff --git a/contrib/Triangle/Makefile b/contrib/Triangle/Makefile
index 6e5fe03e1aa12671cf5c6d9c915a615db9aa8ba2..157c61bf7f59416ab171c774cefa5e70b3938014 100644
--- a/contrib/Triangle/Makefile
+++ b/contrib/Triangle/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.4 2006-11-27 22:22:33 geuzaine Exp $
+# $Id: Makefile,v 1.5 2007-07-09 13:54:38 geuzaine Exp $
#
# Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
#
diff --git a/doc/VERSIONS b/doc/VERSIONS
index bbd8c1337b467faa830390f543f2c04a343c0b3a..1009cc78c5ae9e483a5537b7b3c4bc6f0d2bc175 100644
--- a/doc/VERSIONS
+++ b/doc/VERSIONS
@@ -1,29 +1,32 @@
-$Id: VERSIONS,v 1.385 2007-05-04 14:27:41 geuzaine Exp $
-
-new since 2.0: volumes can now be defined from external CAD surfaces;
-Delaunay/Tetgen algorithm is now used by default when available;
-re-added support for Plot3D structured mesh format; added ability to
-export external CAD models as GEO files (this only works for the
-limited set of geometrical primitives available in the GEO language,
-of course--so trying to convert e.g. a trimmed NURBS from a STEP file
-into a GEO file will fail); "lateral" entities are now added at the
-end of the list returned by extrusion commands; unused vertices are
-not saved in mesh files anymore; new plugin GUI; renamed
-DecomposeInSimplex into MakeSimplex; fixed various bugs.
-
-2.0 (February 5, 2007): new geometry and mesh databases, with support
-for STEP and IGES import via OpenCascade; complete rewrite of geometry
-and mesh drawing code; complete rewrite of mesh I/O layer (with new
-native binary MSH format and support for import/export of I-deas UNV,
-Nastran BDF, STL, Medit MESH and VRML 1.0 files); added support for
-incomplete second order elements; new 2D and 3D meshing algorithms;
-improved integration of Netgen and TetGen algorithms; removed
-anisotropic meshing algorithm (as well as attractors); removed
-explicit region number specification in extrusions; option changes in
-the graphical interface are now applied instantaneously; added support
-for offscreen rendering using OSMesa; added support for SVG output;
-added string labels for Physical entities; lots of other improvements
-all over the place.
+$Id: VERSIONS,v 1.386 2007-07-09 13:54:38 geuzaine Exp $
+
+2.1 (xxx yy, 2007): volumes can now be defined from external CAD
+surfaces; Delaunay/Tetgen algorithm is now used by default when
+available; re-added support for Plot3D structured mesh format; added
+ability to export external CAD models as GEO files (this only works
+for the limited set of geometrical primitives available in the GEO
+language, of course--so trying to convert e.g. a trimmed NURBS from a
+STEP file into a GEO file will fail); "lateral" entities are now added
+at the end of the list returned by extrusion commands; unused vertices
+are not saved in mesh files anymore; new plugin GUI; automatic GUI
+font size selection; renamed Plugin(DecomposeInSimplex) into
+Plugin(MakeSimplex); reintroduced enhanced Plugin(SphericalRaise);
+clarified meshing algo names; many small improvements and small bug
+fixes.
+
+2.0 (Feb 5, 2007): new geometry and mesh databases, with support for
+STEP and IGES import via OpenCascade; complete rewrite of geometry and
+mesh drawing code; complete rewrite of mesh I/O layer (with new native
+binary MSH format and support for import/export of I-deas UNV, Nastran
+BDF, STL, Medit MESH and VRML 1.0 files); added support for incomplete
+second order elements; new 2D and 3D meshing algorithms; improved
+integration of Netgen and TetGen algorithms; removed anisotropic
+meshing algorithm (as well as attractors); removed explicit region
+number specification in extrusions; option changes in the graphical
+interface are now applied instantaneously; added support for offscreen
+rendering using OSMesa; added support for SVG output; added string
+labels for Physical entities; lots of other improvements all over the
+place.
1.65 (May 15, 2006): new Plugin(ExtractEdges); fixed compilation
errors with gcc4.1; replaced Plugin(DisplacementRaise) and