X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fforms%2Fcoordinatewidget.cpp;h=0769812c633acf74a45d72c5379f59fd249c5a58;hb=f62cebc26c7c3af447f0e4e4c43331f8589dce22;hp=8cbf7bbe93f19c4fb38d4e5e2a9f3362a92f6b20;hpb=3239ef39dcee08fa6e8cd68cdf2727fc68cc7a8c;p=architektonas

diff --git a/src/forms/coordinatewidget.cpp b/src/forms/coordinatewidget.cpp
index 8cbf7bb..0769812 100644
--- a/src/forms/coordinatewidget.cpp
+++ b/src/forms/coordinatewidget.cpp
@@ -21,7 +21,7 @@
 #include "units.h"
 
 CoordinateWidget::CoordinateWidget(QWidget * parent/*= 0*/, Qt::WindowFlags flags/*= 0*/):
-	QWidget(parent, flags)//, actionHandler(NULL), cadToolBar(NULL)
+	QWidget(parent, flags)
 {
 	ui.setupUi(this);
 
@@ -76,7 +76,7 @@ void CoordinateWidget::setAbsCoordinates(const Vector& v) {
 	str.sprintf("%.4f / %.4f", v.x, v.y);
 	lCoord1->setText(str);
 
-	double ang = RS_Math::rad2deg(v.angle());
+	double ang = Math::rad2deg(v.angle());
 	double rad = v.magnitude();
 	str.sprintf("%.4f < %.4f", rad, ang);
 	lCoord1b->setText(str);
@@ -96,7 +96,7 @@ void CoordinateWidget::setRelCoordinates(const Vector& v) {
 	str.sprintf("@%.4f / %.4f", v.x, v.y);
 	lCoord2->setText(str);
 
-	double ang = RS_Math::rad2deg(v.angle());
+	double ang = Math::rad2deg(v.angle());
 	double rad = v.magnitude();
 	str.sprintf("@%.4f < %.4f", rad, ang);
 	lCoord2b->setText(str);
@@ -142,26 +142,26 @@ void CoordinateWidget::setCoordinates(double x, double y, double rx, double ry,
 	}
 
 	// abs / rel coordinates:
-	QString absX = RS_Units::formatLinear(x, graphic->getUnit(), format, prec);
-	QString absY = RS_Units::formatLinear(y, graphic->getUnit(), format, prec);
-	QString relX = RS_Units::formatLinear(rx, graphic->getUnit(), format, prec);
-	QString relY = RS_Units::formatLinear(ry, graphic->getUnit(), format, prec);
+	QString absX = Units::formatLinear(x, graphic->getUnit(), format, prec);
+	QString absY = Units::formatLinear(y, graphic->getUnit(), format, prec);
+	QString relX = Units::formatLinear(rx, graphic->getUnit(), format, prec);
+	QString relY = Units::formatLinear(ry, graphic->getUnit(), format, prec);
 
 	ui.lCoord1->setText(absX + ", " + absY);
 	ui.lCoord2->setText(relX + ", " + relY);
 
 	// polar coordinates:
 	Vector v = Vector(x, y);
-	QString rStr = RS_Units::formatLinear(v.magnitude(), graphic->getUnit(), format, prec);
-	QString aStr = RS_Units::formatAngle(v.angle(), aformat, aprec);
+	QString rStr = Units::formatLinear(v.magnitude(), graphic->getUnit(), format, prec);
+	QString aStr = Units::formatAngle(v.angle(), aformat, aprec);
 
 	// U+2221 = Measured angle
 	QString str = rStr + " " + QChar(0x2221) + aStr;
 	ui.lCoord1b->setText(str);
 
 	v = Vector(rx, ry);
-	rStr = RS_Units::formatLinear(v.magnitude(), graphic->getUnit(), format, prec);
-	aStr = RS_Units::formatAngle(v.angle(), aformat, aprec);
+	rStr = Units::formatLinear(v.magnitude(), graphic->getUnit(), format, prec);
+	aStr = Units::formatAngle(v.angle(), aformat, aprec);
 	str = rStr + " " + QChar(0x2221) + aStr;
 	ui.lCoord2b->setText(str);
 }