X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fbase%2Fellipse.h;fp=src%2Fbase%2Fellipse.h;h=f0bff36105f23d5d13392648b21d5ed1b5e14e77;hb=16354e0421b316a62c6b9f7b0b4f3b8cf6f06284;hp=2ed0f989f461c52e88f556f8ac3be78b3d395509;hpb=3239ef39dcee08fa6e8cd68cdf2727fc68cc7a8c;p=architektonas

diff --git a/src/base/ellipse.h b/src/base/ellipse.h
index 2ed0f98..f0bff36 100644
--- a/src/base/ellipse.h
+++ b/src/base/ellipse.h
@@ -6,10 +6,10 @@
 /**
  * Holds the data that defines an ellipse.
  */
-class RS_EllipseData
+class EllipseData
 {
 	public:
-		RS_EllipseData(const Vector & center, const Vector & majorP, double ratio, double angle1, double angle2, bool reversed)
+		EllipseData(const Vector & center, const Vector & majorP, double ratio, double angle1, double angle2, bool reversed)
 		{
 			this->center = center;
 			this->majorP = majorP;
@@ -19,9 +19,9 @@ class RS_EllipseData
 			this->reversed = reversed;
 		}
 
-		friend class RS_Ellipse;
+		friend class Ellipse;
 
-		friend std::ostream & operator<<(std::ostream & os, const RS_EllipseData & ed)
+		friend std::ostream & operator<<(std::ostream & os, const EllipseData & ed)
 		{
 			os << "(" << ed.center
 			<< "/" << ed.majorP
@@ -52,13 +52,13 @@ class RS_EllipseData
  *
  * @author Andrew Mustun
  */
-class RS_Ellipse: public RS_AtomicEntity
+class Ellipse: public AtomicEntity
 {
 	public:
-		RS_Ellipse(RS_EntityContainer * parent, const RS_EllipseData & d);
-		virtual ~RS_Ellipse();
+		Ellipse(EntityContainer * parent, const EllipseData & d);
+		virtual ~Ellipse();
 
-		virtual RS_Entity * clone();
+		virtual Entity * clone();
 		virtual RS2::EntityType rtti() const;
 		virtual Vector getStartpoint() const;
 		virtual Vector getEndpoint() const;
@@ -66,7 +66,7 @@ class RS_Ellipse: public RS_AtomicEntity
 		virtual void moveEndpoint(const Vector & pos);
 		virtual RS2::Ending getTrimPoint(const Vector & coord, const Vector & trimPoint);
 		double getEllipseAngle(const Vector & pos);
-		RS_EllipseData getData();
+		EllipseData getData();
 		virtual VectorSolutions getRefPoints();
 		bool isReversed() const;
 		void setReversed(bool r);
@@ -86,11 +86,11 @@ class RS_Ellipse: public RS_AtomicEntity
 		double getMinorRadius() const;
 
 		virtual Vector getNearestEndpoint(const Vector & coord, double * dist = NULL);
-		virtual Vector getNearestPointOnEntity(const Vector & coord, bool onEntity = true, double * dist = NULL, RS_Entity ** entity = NULL);
+		virtual Vector getNearestPointOnEntity(const Vector & coord, bool onEntity = true, double * dist = NULL, Entity ** entity = NULL);
 		virtual Vector getNearestCenter(const Vector & coord, double * dist = NULL);
 		virtual Vector getNearestMiddle(const Vector & coord, double * dist = NULL);
 		virtual Vector getNearestDist(double distance, const Vector & coord, double * dist = NULL);
-		virtual double getDistanceToPoint(const Vector & coord, RS_Entity ** entity = NULL, RS2::ResolveLevel level = RS2::ResolveNone, double solidDist = RS_MAXDOUBLE);
+		virtual double getDistanceToPoint(const Vector & coord, Entity ** entity = NULL, RS2::ResolveLevel level = RS2::ResolveNone, double solidDist = RS_MAXDOUBLE);
 		virtual bool isPointOnEntity(const Vector & coord, double tolerance = RS_TOLERANCE);
 
 		virtual void move(Vector offset);
@@ -101,13 +101,13 @@ class RS_Ellipse: public RS_AtomicEntity
 
 		virtual void draw(PaintInterface * painter, GraphicView * view, double patternOffset = 0.0);
 
-		friend std::ostream & operator<<(std::ostream & os, const RS_Ellipse & a);
+		friend std::ostream & operator<<(std::ostream & os, const Ellipse & a);
 
 		//virtual void calculateEndpoints();
 		virtual void calculateBorders();
 
 	protected:
-		RS_EllipseData data;
+		EllipseData data;
 };
 
 #endif