Rn.h		Rn.h
	// MEFISTO : library to compute 2D triangulation from segmented boundarie s		// MEFISTO : library to compute 2D triangulation from segmented boundarie s
	//		//
	// Copyright (C) 2006 Laboratoire J.-L. Lions UPMC Paris		// Copyright (C) 2006-2015 CEA/DEN, EDF R&D, OPEN CASCADE
	//		//
	// This library is free software; you can redistribute it and/or		// This library is free software; you can redistribute it and/or
	// modify it under the terms of the GNU Lesser General Public		// modify it under the terms of the GNU Lesser General Public
	// License as published by the Free Software Foundation; either		// License as published by the Free Software Foundation; either
	// version 2.1 of the License.		// version 2.1 of the License, or (at your option) any later version.
	//		//
	// This library is distributed in the hope that it will be useful,		// This library is distributed in the hope that it will be useful,
	// but WITHOUT ANY WARRANTY; without even the implied warranty of		// but WITHOUT ANY WARRANTY; without even the implied warranty of
	// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	// Lesser General Public License for more details.		// Lesser General Public License for more details.
	//		//
	// You should have received a copy of the GNU Lesser General Public		// You should have received a copy of the GNU Lesser General Public
	// License along with this library; if not, write to the Free Software		// License along with this library; if not, write to the Free Software
	// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US		// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
	A
	//
	// See http://www.ann.jussieu.fr/~perronne or email Perronnet@ann.jussieu.
	fr
	// or email Hecht@ann.jussieu.fr
	//		//
			// See http://www.salome-platform.org/ or email : webmaster.salome@opencasc ade.com
	//		//
	// File : Rn.h		// File : Rn.h
	// Module : SMESH		// Module : SMESH
	// Authors: Frederic HECHT & Alain PERRONNET		// Authors: Frederic HECHT & Alain PERRONNET
	// Date : 13 novembre 2006		// Date : 13 novembre 2006
	#ifndef Rn__h		#ifndef Rn__h
	#define Rn__h		#define Rn__h
	#include <gp_Pnt.hxx> //Dans OpenCascade		#include <gp_Pnt.hxx> //Dans OpenCascade
	skipping to change at line 173		skipping to change at line 171
	R3 operator=(gp_Pnt P) {return R3(P.X(),P.Y(),P.Z());}		R3 operator=(gp_Pnt P) {return R3(P.X(),P.Y(),P.Z());}
	R3 operator=(gp_Dir P) {return R3(P.X(),P.Y(),P.Z());}		R3 operator=(gp_Dir P) {return R3(P.X(),P.Y(),P.Z());}
	friend gp_Pnt gp_pnt(R3 xyz) { return gp_Pnt(xyz.x,xyz.y,xyz.z); }		friend gp_Pnt gp_pnt(R3 xyz) { return gp_Pnt(xyz.x,xyz.y,xyz.z); }
	//friend gp_Pnt operator=() { return gp_Pnt(x,y,z); }		//friend gp_Pnt operator=() { return gp_Pnt(x,y,z); }
	friend gp_Dir gp_dir(R3 xyz) { return gp_Dir(xyz.x,xyz.y,xyz.z); }		friend gp_Dir gp_dir(R3 xyz) { return gp_Dir(xyz.x,xyz.y,xyz.z); }
	bool DansPave( R3 & xyzMin, R3 & xyzMax )		bool DansPave( R3 & xyzMin, R3 & xyzMax )
	{ return xyzMin.x<=x && x<=xyzMax.x &&		{ return xyzMin.x<=x && x<=xyzMax.x &&
	xyzMin.y<=y && y<=xyzMax.y &&		xyzMin.y<=y && y<=xyzMax.y &&
	xyzMin.z<=z && z<=xyzMax.z; }		xyzMin.z<=z && z<=xyzMax.z; }
	};		};
	//la classe R4		//la classe R4
	//============		//============
	class R4: public R3		class R4: public R3
	{		{
	friend std::ostream& operator <<(std::ostream& f, const R4 & P )		friend std::ostream& operator <<(std::ostream& f, const R4 & P )
	{ f << P.x << ' ' << P.y << ' ' << P.z << ' ' << P.omega; return f; }		{ f << P.x << ' ' << P.y << ' ' << P.z << ' ' << P.omega; return f; }
	friend istream& operator >>(istream& f, R4 & P)		friend istream& operator >>(istream& f, R4 & P)
	{ f >> P.x >> P.y >> P.z >> P.omega ; return f; }		{ f >> P.x >> P.y >> P.z >> P.omega ; return f; }
End of changes. 4 change blocks.
	21 lines changed or deleted		17 lines changed or added
This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/