cleanups

Geo/GFace.h

@@ -39,18 +39,14 @@ class GRegion;
 class GFace : public GEntity
 {
  protected:
-  // edge loops will replace what follows (list of al the edges of the
-  // face + directions)
+  // edge loops might replace what follows (list of all the edges of
+  // the face + directions)
   std::list<GEdge *> l_edges;
   std::list<int> l_dirs;
   GRegion *r1, *r2;
   mean_plane meanPlane;
-  std::list<GEdge *> embedded_edges;
-  std::list<GVertex *> embedded_vertices;
-  // given a list of GEdges, the function builds a list of wires,
-  // i.e. closed edge loops.  the first wire is the one that is the
-  // outer contour of the face.
-  void resolveWires();
+  std::list<GEdge*> embedded_edges;
+  std::list<GVertex*> embedded_vertices;
 
  public: // this will become protected or private
   std::list<GEdgeLoop> edgeLoops;

Geo/OCCFace.h

@@ -21,7 +21,7 @@ class OCCFace : public GFace {
   Handle(Geom_Surface) occface;
   double umin, umax, vmin, vmax;
   bool _periodic[2];
-  bool buildSTLTriangulation ();
+  bool buildSTLTriangulation();
  public:
   OCCFace(GModel *m, TopoDS_Face s, int num, TopTools_IndexedMapOfShape &emap);
   virtual ~OCCFace(){}
@@ -31,10 +31,10 @@ class OCCFace : public GFace {
   virtual bool containsPoint(const SPoint3 &pt) const;  
   virtual SVector3 normal(const SPoint2 &param) const; 
   virtual Pair<SVector3,SVector3> firstDer(const SPoint2 &param) const;
-  virtual void secondDer(const SPoint2 &param, SVector3 *dudu, SVector3 *dvdv, SVector3 *dudv) const;
+  virtual void secondDer(const SPoint2 &, SVector3 *, SVector3 *, SVector3 *) const;
   virtual GEntity::GeomType geomType() const; 
   ModelType getNativeType() const { return OpenCascadeModel; }
-  void * getNativePtr() const { return (void*)&s; }
+  void *getNativePtr() const { return (void*)&s; }
   virtual SPoint2 parFromPoint(const SPoint3 &) const;
   virtual double curvatureMax(const SPoint2 &param) const;
   virtual double curvatures(const SPoint2 &param, SVector3 *dirMax, SVector3 *dirMin,

Geo/fourierFace.h

@@ -31,7 +31,7 @@ class fourierFace : public GFace {
   virtual Pair<SVector3,SVector3> firstDer(const SPoint2 &param) const;
   virtual void secondDer(const SPoint2 &, SVector3 *, SVector3 *, SVector3 *) const; 
   ModelType getNativeType() const { return FourierModel; }
-  void * getNativePtr() const { return face; } 
+  void *getNativePtr() const { return face; } 
 };
 
 #endif

Geo/gmshFace.h

@@ -19,17 +19,17 @@ class gmshFace : public GFace {
   gmshFace(GModel *m, Surface *face);
   virtual ~gmshFace(){}
   Range<double> parBounds(int i) const; 
-  void setModelEdges(std::list<GEdge*>&);
+  void setModelEdges(std::list<GEdge*> &);
   virtual GPoint point(double par1, double par2) const; 
-  virtual GPoint closestPoint(const SPoint3 & queryPoint, const double initialGuess[2]) const; 
+  virtual GPoint closestPoint(const SPoint3 &queryPoint, const double initialGuess[2]) const; 
   virtual bool containsPoint(const SPoint3 &pt) const;  
   virtual double getMetricEigenvalue(const SPoint2 &);  
   virtual SVector3 normal(const SPoint2 &param) const; 
   virtual Pair<SVector3,SVector3> firstDer(const SPoint2 &param) const; 
-  virtual void secondDer(const SPoint2 &param, SVector3 *dudu, SVector3 *dvdv, SVector3 *dudv) const;
+  virtual void secondDer(const SPoint2 &, SVector3 *, SVector3 *, SVector3 *) const;
   virtual GEntity::GeomType geomType() const; 
   ModelType getNativeType() const { return GmshModel; }
-  void * getNativePtr() const { return s; }
+  void *getNativePtr() const { return s; }
   virtual SPoint2 parFromPoint(const SPoint3 &) const;
   virtual void resetMeshAttributes();
 };

Graphics/drawScales.cpp

@@ -155,8 +155,14 @@ static void drawScaleValues(drawContext *ctx, PView *p, double xmin, double ymin
 static void drawScaleLabel(drawContext *ctx, PView *p, double xmin, double ymin, 
                            double width, double height, double tic, int horizontal)
 {
-  PViewData *data = p->getData();
   PViewOptions *opt = p->getOptions();
+  PViewData *data;
+  
+  // requested by Laurent: but is this really what we should be doing?
+  if(opt->externalViewIndex >= 0 && opt->externalViewIndex < PView::list.size())
+    data = PView::list[opt->externalViewIndex]->getData();
+  else
+    data = p->getData();
 
   gl_font(CTX::instance()->glFontEnum, CTX::instance()->glFontSize);
   double font_h = gl_height();

doc/texinfo/gmsh.texi

@@ -552,8 +552,8 @@ as a library.
 You can skip most of this reference manual if you only want to use Gmsh
 at the first level (i.e., interactively with the GUI). Just read the
 next chapter (@pxref{Running Gmsh on your system}) to learn how to
-launch Gmsh on your system, then go play with the GUI and run the
-tutorial files (@pxref{Tutorial}) bundled in the distribution.
+launch Gmsh on your system, then go experiment with the GUI and the
+tutorial files (@pxref{Tutorial}) provided in the distribution.
 Screencasts that show how to use the GUI are available here:
 @uref{http://www.geuz.org/gmsh/screencasts/}.