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

diff --git a/src/base/dimension.cpp b/src/base/dimension.cpp
index 56f73bd..4718345 100644
--- a/src/base/dimension.cpp
+++ b/src/base/dimension.cpp
@@ -23,29 +23,29 @@
 /**
  * Constructor.
  */
-RS_Dimension::RS_Dimension(RS_EntityContainer * parent, const RS_DimensionData & d):
-	RS_EntityContainer(parent), data(d)
+Dimension::Dimension(EntityContainer * parent, const DimensionData & d):
+	EntityContainer(parent), data(d)
 {
 }
 
-/*virtual*/ RS_Dimension::~RS_Dimension()
+/*virtual*/ Dimension::~Dimension()
 {
 }
 
 /** @return Copy of data that defines the dimension. */
-RS_DimensionData RS_Dimension::getData() const
+DimensionData Dimension::getData() const
 {
 	return data;
 }
 
-Vector RS_Dimension::getNearestRef(const Vector & coord, double * dist)
+Vector Dimension::getNearestRef(const Vector & coord, double * dist)
 {
-	return RS_Entity::getNearestRef(coord, dist);
+	return Entity::getNearestRef(coord, dist);
 }
 
-Vector RS_Dimension::getNearestSelectedRef(const Vector & coord, double * dist)
+Vector Dimension::getNearestSelectedRef(const Vector & coord, double * dist)
 {
-	return RS_Entity::getNearestSelectedRef(coord, dist);
+	return Entity::getNearestSelectedRef(coord, dist);
 }
 
 /**
@@ -56,7 +56,7 @@ Vector RS_Dimension::getNearestSelectedRef(const Vector & coord, double * dist)
  *      label if appropriate.
  * @see getMeasuredLabel
  */
-QString RS_Dimension::getLabel(bool resolve)
+QString Dimension::getLabel(bool resolve)
 {
 	if (!resolve)
 		return data.text;
@@ -82,7 +82,7 @@ QString RS_Dimension::getLabel(bool resolve)
 /**
  * Sets a new text for the label.
  */
-void RS_Dimension::setLabel(const QString & l)
+void Dimension::setLabel(const QString & l)
 {
 	data.text = l;
 }
@@ -92,11 +92,11 @@ void RS_Dimension::setLabel(const QString & l)
  *
  * @param forceAutoText Automatically reposition the text label.
  */
-void RS_Dimension::updateCreateDimensionLine(const Vector & p1,
+void Dimension::updateCreateDimensionLine(const Vector & p1,
 	const Vector & p2, bool arrow1, bool arrow2, bool forceAutoText)
 {
 #if 0
-printf("RS_Dimension::updateCreateDimensionLine()...\n");
+printf("Dimension::updateCreateDimensionLine()...\n");
 #endif
 	// text height (DIMTXT)
 	double dimtxt = getTextHeight();
@@ -110,8 +110,8 @@ printf("RS_Dimension::updateCreateDimensionLine()...\n");
 	double arrowAngle1, arrowAngle2;
 
 	// Create dimension line:
-	RS_Line * dimensionLine = new RS_Line(this, RS_LineData(p1, p2));
-	dimensionLine->setPen(RS_Pen(RS2::FlagInvalid));
+	Line * dimensionLine = new Line(this, LineData(p1, p2));
+	dimensionLine->setPen(Pen(RS2::FlagInvalid));
 	dimensionLine->setLayer(NULL);
 	addEntity(dimensionLine);
 
@@ -133,15 +133,15 @@ printf("RS_Dimension::updateCreateDimensionLine()...\n");
 	}
 
 	// Arrows:
-	RS_SolidData sd;
-	RS_Solid * arrow;
+	SolidData sd;
+	Solid * arrow;
 
 	if (arrow1)
 	{
 		// arrow 1
-		arrow = new RS_Solid(this, sd);
+		arrow = new Solid(this, sd);
 		arrow->shapeArrow(p1, arrowAngle1, getArrowSize());
-		arrow->setPen(RS_Pen(RS2::FlagInvalid));
+		arrow->setPen(Pen(RS2::FlagInvalid));
 		arrow->setLayer(NULL);
 		addEntity(arrow);
 	}
@@ -149,21 +149,21 @@ printf("RS_Dimension::updateCreateDimensionLine()...\n");
 	if (arrow2)
 	{
 		// arrow 2:
-		arrow = new RS_Solid(this, sd);
+		arrow = new Solid(this, sd);
 		arrow->shapeArrow(p2, arrowAngle2, getArrowSize());
-		arrow->setPen(RS_Pen(RS2::FlagInvalid));
+		arrow->setPen(Pen(RS2::FlagInvalid));
 		arrow->setLayer(NULL);
 		addEntity(arrow);
 	}
 
 	// Text label:
-	RS_TextData textData;
+	TextData textData;
 	Vector textPos;
 
 	double dimAngle1 = dimensionLine->getAngle1();
 	double textAngle;
 	bool corrected = false;
-	textAngle = RS_Math::makeAngleReadable(dimAngle1, true, &corrected);
+	textAngle = Math::makeAngleReadable(dimAngle1, true, &corrected);
 
 	if (data.middleOfText.valid && !forceAutoText)
 	{
@@ -188,13 +188,13 @@ printf("RS_Dimension::updateCreateDimensionLine()...\n");
 		data.middleOfText = textPos;
 	}
 
-	textData = RS_TextData(textPos, dimtxt, 30.0, RS2::VAlignMiddle, RS2::HAlignCenter,
+	textData = TextData(textPos, dimtxt, 30.0, RS2::VAlignMiddle, RS2::HAlignCenter,
 		RS2::LeftToRight, RS2::Exact, 1.0, getLabel(), "standard", textAngle);
 #if 0
 printf("--> %s\n", getLabel().toAscii().data());
 #endif
 
-	RS_Text * text = new RS_Text(this, textData);
+	Text * text = new Text(this, textData);
 
 	// move text to the side:
 	Vector distH;
@@ -205,52 +205,52 @@ printf("--> %s\n", getLabel().toAscii().data());
 		text->move(distH);
 	}
 
-	text->setPen(RS_Pen(RS2::FlagInvalid));
+	text->setPen(Pen(RS2::FlagInvalid));
 	text->setLayer(NULL);
 	addEntity(text);
 }
 
-Vector RS_Dimension::getDefinitionPoint()
+Vector Dimension::getDefinitionPoint()
 {
 	return data.definitionPoint;
 }
 
-Vector RS_Dimension::getMiddleOfText()
+Vector Dimension::getMiddleOfText()
 {
 	return data.middleOfText;
 }
 
-RS2::VAlign RS_Dimension::getVAlign()
+RS2::VAlign Dimension::getVAlign()
 {
 	return data.valign;
 }
 
-RS2::HAlign RS_Dimension::getHAlign()
+RS2::HAlign Dimension::getHAlign()
 {
 	return data.halign;
 }
 
-RS2::TextLineSpacingStyle RS_Dimension::getLineSpacingStyle()
+RS2::TextLineSpacingStyle Dimension::getLineSpacingStyle()
 {
 	return data.lineSpacingStyle;
 }
 
-double RS_Dimension::getLineSpacingFactor()
+double Dimension::getLineSpacingFactor()
 {
 	return data.lineSpacingFactor;
 }
 
-QString RS_Dimension::getText()
+QString Dimension::getText()
 {
 	return data.text;
 }
 
-QString RS_Dimension::getStyle()
+QString Dimension::getStyle()
 {
 	return data.style;
 }
 
-double RS_Dimension::getAngle()
+double Dimension::getAngle()
 {
 	return data.angle;
 }
@@ -258,7 +258,7 @@ double RS_Dimension::getAngle()
 /**
  * @return arrow size in drawing units.
  */
-double RS_Dimension::getArrowSize()
+double Dimension::getArrowSize()
 {
 	return getGraphicVariable("$DIMASZ", 2.5, 40);
 }
@@ -266,7 +266,7 @@ double RS_Dimension::getArrowSize()
 /**
  * @return extension line overlength in drawing units.
  */
-double RS_Dimension::getExtensionLineExtension()
+double Dimension::getExtensionLineExtension()
 {
 	return getGraphicVariable("$DIMEXE", 1.25, 40);
 }
@@ -274,7 +274,7 @@ double RS_Dimension::getExtensionLineExtension()
 /**
  * @return extension line offset from entities in drawing units.
  */
-double RS_Dimension::getExtensionLineOffset()
+double Dimension::getExtensionLineOffset()
 {
 	return getGraphicVariable("$DIMEXO", 0.625, 40);
 }
@@ -282,7 +282,7 @@ double RS_Dimension::getExtensionLineOffset()
 /**
  * @return extension line gap to text in drawing units.
  */
-double RS_Dimension::getDimensionLineGap()
+double Dimension::getDimensionLineGap()
 {
 	return getGraphicVariable("$DIMGAP", 0.625, 40);
 }
@@ -290,7 +290,7 @@ double RS_Dimension::getDimensionLineGap()
 /**
  * @return Dimension lables text height.
  */
-double RS_Dimension::getTextHeight()
+double Dimension::getTextHeight()
 {
 	return getGraphicVariable("$DIMTXT", 2.5, 40);
 }
@@ -301,13 +301,13 @@ double RS_Dimension::getTextHeight()
  * If the variable is not found it is added with the given default
  * value converted to the local unit.
  */
-double RS_Dimension::getGraphicVariable(const QString & key, double defMM, int code)
+double Dimension::getGraphicVariable(const QString & key, double defMM, int code)
 {
 	double v = getGraphicVariableDouble(key, RS_MINDOUBLE);
 
 	if (v <= RS_MINDOUBLE)
 	{
-		addGraphicVariable(key, RS_Units::convert(defMM, RS2::Millimeter, getGraphicUnit()),
+		addGraphicVariable(key, Units::convert(defMM, RS2::Millimeter, getGraphicUnit()),
 			code);
 		v = getGraphicVariableDouble(key, 1.0);
 	}
@@ -315,31 +315,31 @@ double RS_Dimension::getGraphicVariable(const QString & key, double defMM, int c
 	return v;
 }
 
-/*virtual*/ double RS_Dimension::getLength()
+/*virtual*/ double Dimension::getLength()
 {
 	return -1.0;
 }
 
-void RS_Dimension::move(Vector offset)
+void Dimension::move(Vector offset)
 {
 	data.definitionPoint.move(offset);
 	data.middleOfText.move(offset);
 }
 
-void RS_Dimension::rotate(Vector center, double angle)
+void Dimension::rotate(Vector center, double angle)
 {
 	data.definitionPoint.rotate(center, angle);
 	data.middleOfText.rotate(center, angle);
-	data.angle = RS_Math::correctAngle(data.angle+angle);
+	data.angle = Math::correctAngle(data.angle+angle);
 }
 
-void RS_Dimension::scale(Vector center, Vector factor)
+void Dimension::scale(Vector center, Vector factor)
 {
 	data.definitionPoint.scale(center, factor);
 	data.middleOfText.scale(center, factor);
 }
 
-void RS_Dimension::mirror(Vector axisPoint1, Vector axisPoint2)
+void Dimension::mirror(Vector axisPoint1, Vector axisPoint2)
 {
 	data.definitionPoint.mirror(axisPoint1, axisPoint2);
 	data.middleOfText.mirror(axisPoint1, axisPoint2);