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

more occ work
parent 343eacee
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Common/Makefile
+ 93
− 1
View file @ 8a040240
# $Id: Makefile,v 1.114 2006-11-14 17:11:33 remacle Exp $ # $Id: Makefile,v 1.115 2006-11-14 22:47:11 geuzaine Exp $
# #
# Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle # Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle
# #
...@@ -64,3 +64,95 @@ depend: ...@@ -64,3 +64,95 @@ depend:
rm -f Makefile.new rm -f Makefile.new
# DO NOT DELETE THIS LINE # DO NOT DELETE THIS LINE
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 SmoothNormals.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/SmoothNormals.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 SmoothNormals.h AdaptiveViews.h GmshMatrix.h Context.h \
Options.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 SmoothNormals.h AdaptiveViews.h GmshMatrix.h \
Context.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 SmoothNormals.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 \
../Common/VertexArray.h ../Common/SmoothNormals.h ../Numeric/Numeric.h \
../Common/AdaptiveViews.h ../Common/GmshMatrix.h Context.h Options.h \
../Plugin/PluginManager.h ../Plugin/Plugin.h ../Common/Options.h \
../Common/Message.h ../Fltk/Solvers.h ../Fltk/GUI.h \
../Fltk/Opengl_Window.h ../Mesh/Mesh.h ../Common/GmshDefines.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 \
../Fltk/Colorbar_Window.h ../Common/GmshUI.h ../Fltk/Popup_Button.h \
../Fltk/SpherePosition_Widget.h
CommandLine.o: CommandLine.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 \
GmshVersion.h CommandLine.h ../Numeric/Numeric.h Context.h Options.h \
../Geo/Geo.h Views.h ColorTable.h VertexArray.h SmoothNormals.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/SPoint3.h ../Common/GmshDefines.h \
../Geo/MVertex.h ../Geo/SPoint3.h ../Geo/GPoint.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 ../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 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 \
../Geo/MVertex.h ../Geo/SPoint3.h ../Geo/GPoint.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 ../Numeric/Numeric.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
Trackball.o: Trackball.cpp Trackball.h
VertexArray.o: VertexArray.cpp VertexArray.h Context.h ../DataStr/List.h \
../Numeric/Numeric.h
SmoothNormals.o: SmoothNormals.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 \
SmoothNormals.h
License.o: License.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
Common/Visibility.cpp
+ 4
− 2
View file @ 8a040240
// $Id: Visibility.cpp,v 1.17 2006-08-18 02:22:40 geuzaine Exp $ // $Id: Visibility.cpp,v 1.18 2006-11-14 22:47:11 geuzaine Exp $
// //
// Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle // Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle
// //
...@@ -60,7 +60,9 @@ static void setLabels(void *a, void *b){ ...@@ -60,7 +60,9 @@ static void setLabels(void *a, void *b){
void VisibilityManager::update(int type) void VisibilityManager::update(int type)
{ {
_labels.clear(); _labels.clear();
Tree_Action(Symbol_T, setLabels); //Tree_Action(Symbol_T, setLabels);
//printf("updating vis man\n");
for(unsigned int i = 0; i < _entities.size(); i++) for(unsigned int i = 0; i < _entities.size(); i++)
delete _entities[i]; delete _entities[i];
......
Geo/GModelIOFourier.cpp
+ 1
− 1
View file @ 8a040240
...@@ -605,7 +605,7 @@ GPoint fourierFace::point(const SPoint2 &pt) const ...@@ -605,7 +605,7 @@ GPoint fourierFace::point(const SPoint2 &pt) const
return point(pt[0], pt[1]); return point(pt[0], pt[1]);
} }
GPoint fourierFace::closestPoint(const SPoint3 & queryPoint) GPoint fourierFace::closestPoint(const SPoint3 & queryPoint) const
{ {
throw; throw;
} }
......
Geo/Makefile
+ 17
− 4
View file @ 8a040240
# $Id: Makefile,v 1.105 2006-11-14 17:11:33 remacle Exp $ # $Id: Makefile,v 1.106 2006-11-14 22:47:11 geuzaine Exp $
# #
# Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle # Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle
# #
...@@ -19,12 +19,11 @@ ...@@ -19,12 +19,11 @@
# #
# Please report all bugs and problems to <gmsh@geuz.org>. # Please report all bugs and problems to <gmsh@geuz.org>.
include ../variables include ../variables
LIB = ../lib/libGmshGeo.a LIB = ../lib/libGmshGeo.a
INCLUDE = -I../Common -I../DataStr -I../Geo -I../Mesh -I../Numeric\ INCLUDE = -I../Common -I../DataStr -I../Geo -I../Mesh -I../Numeric\
-I../Parser -I../Fltk -I../contrib/NR -I../contrib/FourierModel -I/Users/JF/Desktop/OpenCASCADE_Linux/Linux/ros/inc/ -I../Parser -I../Fltk -I../contrib/NR -I../contrib/FourierModel
CFLAGS = ${OPTIM} ${FLAGS} ${INCLUDE} CFLAGS = ${OPTIM} ${FLAGS} ${INCLUDE}
SRC = CAD.cpp \ SRC = CAD.cpp \
...@@ -138,7 +137,13 @@ GFace.o: GFace.cpp GModel.h GVertex.h GEntity.h Range.h SPoint3.h \ ...@@ -138,7 +137,13 @@ GFace.o: GFace.cpp GModel.h GVertex.h GEntity.h Range.h SPoint3.h \
SVector3.h SPoint2.h MElement.h MEdge.h ../Common/Hash.h MFace.h \ SVector3.h SPoint2.h MElement.h MEdge.h ../Common/Hash.h MFace.h \
../Numeric/Numeric.h ../Common/Context.h ../DataStr/List.h \ ../Numeric/Numeric.h ../Common/Context.h ../DataStr/List.h \
ExtrudeParams.h GFace.h Pair.h GRegion.h ../Common/SmoothNormals.h \ ExtrudeParams.h GFace.h Pair.h GRegion.h ../Common/SmoothNormals.h \
../Common/Message.h ../Common/Message.h ../Mesh/Utils.h ../Mesh/Vertex.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
GRegion.o: GRegion.cpp GModel.h GVertex.h GEntity.h Range.h SPoint3.h \ 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 \ SBoundingBox3d.h ../Common/GmshDefines.h MVertex.h GPoint.h GEdge.h \
SVector3.h SPoint2.h MElement.h MEdge.h ../Common/Hash.h MFace.h \ SVector3.h SPoint2.h MElement.h MEdge.h ../Common/Hash.h MFace.h \
...@@ -228,6 +233,14 @@ gmshRegion.o: gmshRegion.cpp GModel.h GVertex.h GEntity.h Range.h \ ...@@ -228,6 +233,14 @@ gmshRegion.o: gmshRegion.cpp GModel.h GVertex.h GEntity.h Range.h \
../Mesh/Simplex.h ../Geo/ExtrudeParams.h ../Mesh/Metric.h \ ../Mesh/Simplex.h ../Geo/ExtrudeParams.h ../Mesh/Metric.h \
../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.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 gmshRegion.h Geo.h ../Mesh/Create.h ../Mesh/Vertex.h ../Mesh/Mesh.h
OCCEdge.o: OCCEdge.cpp
OCCFace.o: OCCFace.cpp
OCCModel.o: OCCModel.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 \
ExtrudeParams.h GFace.h Pair.h GRegion.h ../Common/SmoothNormals.h \
../Common/Message.h
SVector3.o: SVector3.cpp SVector3.h SPoint3.h SVector3.o: SVector3.cpp SVector3.h SPoint3.h
SBoundingBox3d.o: SBoundingBox3d.cpp SBoundingBox3d.h SPoint3.h SBoundingBox3d.o: SBoundingBox3d.cpp SBoundingBox3d.h SPoint3.h
projectionFace.o: projectionFace.cpp projectionFace.h GFace.h GPoint.h \ projectionFace.o: projectionFace.cpp projectionFace.h GFace.h GPoint.h \
......
Geo/fourierFace.h
+ 1
− 1
View file @ 8a040240
...@@ -65,7 +65,7 @@ class fourierFace : public GFace { ...@@ -65,7 +65,7 @@ class fourierFace : public GFace {
virtual GPoint point(double par1, double par2) const; virtual GPoint point(double par1, double par2) const;
virtual GPoint point(const SPoint2 &pt) const; virtual GPoint point(const SPoint2 &pt) const;
virtual GPoint closestPoint(const SPoint3 & queryPoint) ; virtual GPoint closestPoint(const SPoint3 & queryPoint) const ;
virtual int containsPoint(const SPoint3 &pt) const; virtual int containsPoint(const SPoint3 &pt) const;
virtual int containsParam(const SPoint2 &pt) const; virtual int containsParam(const SPoint2 &pt) const;
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment