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

diff --git a/src/base/point.cpp b/src/base/point.cpp
index 6a680db..e0308ef 100644
--- a/src/base/point.cpp
+++ b/src/base/point.cpp
@@ -22,21 +22,21 @@
 /**
  * Default constructor.
  */
-RS_Point::RS_Point(RS_EntityContainer * parent, const RS_PointData & d):
-	RS_AtomicEntity(parent), data(d)
+Point::Point(EntityContainer * parent, const PointData & d):
+	AtomicEntity(parent), data(d)
 {
 	calculateBorders();
 }
 
-/*virtual*/ RS_Entity * RS_Point::clone()
+/*virtual*/ Entity * Point::clone()
 {
-	RS_Point * p = new RS_Point(*this);
+	Point * p = new Point(*this);
 	p->initId();
 	return p;
 }
 
 /**	@return RS_ENTITY_POINT */
-/*virtual*/ RS2::EntityType RS_Point::rtti() const
+/*virtual*/ RS2::EntityType Point::rtti() const
 {
 	return RS2::EntityPoint;
 }
@@ -44,7 +44,7 @@ RS_Point::RS_Point(RS_EntityContainer * parent, const RS_PointData & d):
 /**
  * @return Start point of the entity.
  */
-/*virtual*/ Vector RS_Point::getStartpoint() const
+/*virtual*/ Vector Point::getStartpoint() const
 {
 	return data.pos;
 }
@@ -52,41 +52,41 @@ RS_Point::RS_Point(RS_EntityContainer * parent, const RS_PointData & d):
 /**
  * @return End point of the entity.
  */
-/*virtual*/ Vector RS_Point::getEndpoint() const
+/*virtual*/ Vector Point::getEndpoint() const
 {
 	return data.pos;
 }
 
 /** @return Copy of data that defines the point. */
-RS_PointData RS_Point::getData() const
+PointData Point::getData() const
 {
 	return data;
 }
 
 /** @return Position of the point */
-Vector RS_Point::getPos()
+Vector Point::getPos()
 {
 	return data.pos;
 }
 
 /** Sets a new position for this point. */
-void RS_Point::setPos(const Vector & pos)
+void Point::setPos(const Vector & pos)
 {
 	data.pos = pos;
 }
 
-void RS_Point::calculateBorders()
+void Point::calculateBorders()
 {
 	minV = maxV = data.pos;
 }
 
-VectorSolutions RS_Point::getRefPoints()
+VectorSolutions Point::getRefPoints()
 {
 	VectorSolutions ret(data.pos);
 	return ret;
 }
 
-Vector RS_Point::getNearestEndpoint(const Vector & coord, double * dist)
+Vector Point::getNearestEndpoint(const Vector & coord, double * dist)
 {
 	if (dist != NULL)
 		*dist = data.pos.distanceTo(coord);
@@ -94,8 +94,8 @@ Vector RS_Point::getNearestEndpoint(const Vector & coord, double * dist)
 	return data.pos;
 }
 
-Vector RS_Point::getNearestPointOnEntity(const Vector & coord,
-	bool /*onEntity*/, double * dist, RS_Entity ** entity)
+Vector Point::getNearestPointOnEntity(const Vector & coord,
+	bool /*onEntity*/, double * dist, Entity ** entity)
 {
 	if (dist != NULL)
 		*dist = data.pos.distanceTo(coord);
@@ -106,7 +106,7 @@ Vector RS_Point::getNearestPointOnEntity(const Vector & coord,
 	return data.pos;
 }
 
-Vector RS_Point::getNearestCenter(const Vector & coord, double * dist)
+Vector Point::getNearestCenter(const Vector & coord, double * dist)
 {
 	if (dist != NULL)
 		*dist = data.pos.distanceTo(coord);
@@ -114,7 +114,7 @@ Vector RS_Point::getNearestCenter(const Vector & coord, double * dist)
 	return data.pos;
 }
 
-Vector RS_Point::getNearestMiddle(const Vector & coord, double * dist)
+Vector Point::getNearestMiddle(const Vector & coord, double * dist)
 {
 	if (dist != NULL)
 		*dist = data.pos.distanceTo(coord);
@@ -122,7 +122,7 @@ Vector RS_Point::getNearestMiddle(const Vector & coord, double * dist)
 	return data.pos;
 }
 
-Vector RS_Point::getNearestDist(double /*distance*/, const Vector & /*coord*/, double * dist)
+Vector Point::getNearestDist(double /*distance*/, const Vector & /*coord*/, double * dist)
 {
 	if (dist != NULL)
 		*dist = RS_MAXDOUBLE;
@@ -130,7 +130,7 @@ Vector RS_Point::getNearestDist(double /*distance*/, const Vector & /*coord*/, d
 	return Vector(false);
 }
 
-double RS_Point::getDistanceToPoint(const Vector & coord, RS_Entity ** entity,
+double Point::getDistanceToPoint(const Vector & coord, Entity ** entity,
 	RS2::ResolveLevel /*level*/, double /*solidDist*/)
 {
 	if (entity != NULL)
@@ -139,37 +139,37 @@ double RS_Point::getDistanceToPoint(const Vector & coord, RS_Entity ** entity,
 	return data.pos.distanceTo(coord);
 }
 
-void RS_Point::moveStartpoint(const Vector & pos)
+void Point::moveStartpoint(const Vector & pos)
 {
 	data.pos = pos;
 	calculateBorders();
 }
 
-void RS_Point::move(Vector offset)
+void Point::move(Vector offset)
 {
 	data.pos.move(offset);
 	calculateBorders();
 }
 
-void RS_Point::rotate(Vector center, double angle)
+void Point::rotate(Vector center, double angle)
 {
 	data.pos.rotate(center, angle);
 	calculateBorders();
 }
 
-void RS_Point::scale(Vector center, Vector factor)
+void Point::scale(Vector center, Vector factor)
 {
 	data.pos.scale(center, factor);
 	calculateBorders();
 }
 
-void RS_Point::mirror(Vector axisPoint1, Vector axisPoint2)
+void Point::mirror(Vector axisPoint1, Vector axisPoint2)
 {
 	data.pos.mirror(axisPoint1, axisPoint2);
 	calculateBorders();
 }
 
-void RS_Point::draw(PaintInterface * painter, GraphicView * view, double /*patternOffset*/)
+void Point::draw(PaintInterface * painter, GraphicView * view, double /*patternOffset*/)
 {
 	if (painter == NULL || view == NULL)
 		return;
@@ -180,7 +180,7 @@ void RS_Point::draw(PaintInterface * painter, GraphicView * view, double /*patte
 /**
  * Dumps the point's data to stdout.
  */
-std::ostream & operator<<(std::ostream & os, const RS_Point & p)
+std::ostream & operator<<(std::ostream & os, const Point & p)
 {
     os << " Point: " << p.getData() << "\n";
     return os;