X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fbase%2Fdimdiametric.cpp;h=934c1f2848e8bb324d5d3dac7500df8e29bdd88c;hb=e1d1cacbb43055988d0d9db632fdf05c0bea9543;hp=811115dd5d272eeeff8ca6d547df652b33a5c5c8;hpb=3239ef39dcee08fa6e8cd68cdf2727fc68cc7a8c;p=architektonas

diff --git a/src/base/dimdiametric.cpp b/src/base/dimdiametric.cpp
index 811115d..934c1f2 100644
--- a/src/base/dimdiametric.cpp
+++ b/src/base/dimdiametric.cpp
@@ -28,19 +28,19 @@
  * @para d Common dimension geometrical data.
  * @para ed Extended geometrical data for diametric dimension.
  */
-RS_DimDiametric::RS_DimDiametric(RS_EntityContainer * parent, const RS_DimensionData & d,
-	const RS_DimDiametricData & ed): RS_Dimension(parent, d), edata(ed)
+DimDiametric::DimDiametric(EntityContainer * parent, const DimensionData & d,
+	const DimDiametricData & ed): Dimension(parent, d), edata(ed)
 {
     calculateBorders();
 }
 
-/*virtual*/ RS_DimDiametric::~RS_DimDiametric()
+/*virtual*/ DimDiametric::~DimDiametric()
 {
 }
 
-/*virtual*/ RS_Entity * RS_DimDiametric::clone()
+/*virtual*/ Entity * DimDiametric::clone()
 {
-	RS_DimDiametric * d = new RS_DimDiametric(*this);
+	DimDiametric * d = new DimDiametric(*this);
 #warning "!!! Need to deal with setAutoDelete() Qt3->Qt4 !!!"
 //	d->entities.setAutoDelete(entities.autoDelete());
 	d->initId();
@@ -49,7 +49,7 @@ RS_DimDiametric::RS_DimDiametric(RS_EntityContainer * parent, const RS_Dimension
 }
 
 /**	@return RS2::EntityDimDiametric */
-/*virtual*/ RS2::EntityType RS_DimDiametric::rtti() const
+/*virtual*/ RS2::EntityType DimDiametric::rtti() const
 {
 	return RS2::EntityDimDiametric;
 }
@@ -58,7 +58,7 @@ RS_DimDiametric::RS_DimDiametric(RS_EntityContainer * parent, const RS_Dimension
  * @return Copy of data that defines the diametric dimension.
  * @see getData()
  */
-RS_DimDiametricData RS_DimDiametric::getEData() const
+DimDiametricData DimDiametric::getEData() const
 {
 	return edata;
 }
@@ -67,7 +67,7 @@ RS_DimDiametricData RS_DimDiametric::getEData() const
  * @return Automatically created label for the default
  * measurement of this dimension.
  */
-QString RS_DimDiametric::getMeasuredLabel()
+QString DimDiametric::getMeasuredLabel()
 {
     // Definitive dimension line:
     double dist = data.definitionPoint.distanceTo(edata.definitionPoint);
@@ -76,7 +76,7 @@ QString RS_DimDiametric::getMeasuredLabel()
 
     QString ret;
 	if (graphic!=NULL) {
-		ret = RS_Units::formatLinear(dist, graphic->getUnit(),
+		ret = Units::formatLinear(dist, graphic->getUnit(),
 			graphic->getLinearFormat(), graphic->getLinearPrecision());
 	}
 	else {
@@ -86,7 +86,7 @@ QString RS_DimDiametric::getMeasuredLabel()
     return ret;
 }
 
-VectorSolutions RS_DimDiametric::getRefPoints()
+VectorSolutions DimDiametric::getRefPoints()
 {
 	VectorSolutions ret(edata.definitionPoint, data.definitionPoint, data.middleOfText);
 	return ret;
@@ -98,9 +98,9 @@ VectorSolutions RS_DimDiametric::getRefPoints()
  *
  * @param autoText Automatically reposition the text label
  */
-void RS_DimDiametric::update(bool autoText)
+void DimDiametric::update(bool autoText)
 {
-	RS_DEBUG->print("RS_DimDiametric::update");
+	DEBUG->print("DimDiametric::update");
 	clear();
 
 	if (isUndone())
@@ -111,48 +111,48 @@ void RS_DimDiametric::update(bool autoText)
 	calculateBorders();
 }
 
-Vector RS_DimDiametric::getDefinitionPoint()
+Vector DimDiametric::getDefinitionPoint()
 {
 	return edata.definitionPoint;
 }
 
-double RS_DimDiametric::getLeader()
+double DimDiametric::getLeader()
 {
 	return edata.leader;
 }
 
-void RS_DimDiametric::move(Vector offset)
+void DimDiametric::move(Vector offset)
 {
-    RS_Dimension::move(offset);
+    Dimension::move(offset);
 
     edata.definitionPoint.move(offset);
     update();
 }
 
-void RS_DimDiametric::rotate(Vector center, double angle)
+void DimDiametric::rotate(Vector center, double angle)
 {
-    RS_Dimension::rotate(center, angle);
+    Dimension::rotate(center, angle);
 
     edata.definitionPoint.rotate(center, angle);
     update();
 }
 
-void RS_DimDiametric::scale(Vector center, Vector factor) {
-    RS_Dimension::scale(center, factor);
+void DimDiametric::scale(Vector center, Vector factor) {
+    Dimension::scale(center, factor);
 
     edata.definitionPoint.scale(center, factor);
 	edata.leader*=factor.x;
     update();
 }
 
-void RS_DimDiametric::mirror(Vector axisPoint1, Vector axisPoint2) {
-    RS_Dimension::mirror(axisPoint1, axisPoint2);
+void DimDiametric::mirror(Vector axisPoint1, Vector axisPoint2) {
+    Dimension::mirror(axisPoint1, axisPoint2);
 
     edata.definitionPoint.mirror(axisPoint1, axisPoint2);
     update();
 }
 
-void RS_DimDiametric::moveRef(const Vector& ref, const Vector& offset)
+void DimDiametric::moveRef(const Vector& ref, const Vector& offset)
 {
     if (ref.distanceTo(edata.definitionPoint)<1.0e-4) {
 		Vector c = (edata.definitionPoint + data.definitionPoint)/2.0;
@@ -185,7 +185,7 @@ void RS_DimDiametric::moveRef(const Vector& ref, const Vector& offset)
 /**
  * Dumps the point's data to stdout.
  */
-std::ostream & operator<<(std::ostream & os, const RS_DimDiametric & d)
+std::ostream & operator<<(std::ostream & os, const DimDiametric & d)
 {
     os << " DimDiametric: " << d.getData() << "\n" << d.getEData() << "\n";
     return os;