X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Factions%2Factiondimlinear.cpp;h=3191f1c1c3768951bb59c0e55ac88c62cf97c977;hb=e1d1cacbb43055988d0d9db632fdf05c0bea9543;hp=cc22e46c8a6760e34b3f99dd9e97562ee18e6f08;hpb=3239ef39dcee08fa6e8cd68cdf2727fc68cc7a8c;p=architektonas

diff --git a/src/actions/actiondimlinear.cpp b/src/actions/actiondimlinear.cpp
index cc22e46..3191f1c 100644
--- a/src/actions/actiondimlinear.cpp
+++ b/src/actions/actiondimlinear.cpp
@@ -30,7 +30,7 @@
  * @param fixedAngle true: The user can't change the angle.
  *                   false: The user can change the angle in a option widget.
  */
-ActionDimLinear::ActionDimLinear(RS_EntityContainer & container,
+ActionDimLinear::ActionDimLinear(EntityContainer & container,
 	GraphicView & graphicView, double angle, bool fixedAngle):
 	ActionDimension("Draw linear dimensions", container, graphicView)
 {
@@ -54,17 +54,17 @@ ActionDimLinear::~ActionDimLinear()
 void ActionDimLinear::reset()
 {
 	ActionDimension::reset();
-	edata = RS_DimLinearData(Vector(false), Vector(false), (fixedAngle ? edata.angle : 0.0), 0.0);
+	edata = DimLinearData(Vector(false), Vector(false), (fixedAngle ? edata.angle : 0.0), 0.0);
 
-	if (RS_DIALOGFACTORY)
-		RS_DIALOGFACTORY->requestOptions(this, true, true);
+	if (DIALOGFACTORY)
+		DIALOGFACTORY->requestOptions(this, true, true);
 }
 
 void ActionDimLinear::trigger()
 {
 	ActionDimension::trigger();
 	preparePreview();
-	RS_DimLinear * dim = new RS_DimLinear(container, data, edata);
+	DimLinear * dim = new DimLinear(container, data, edata);
 	dim->setLayerToActive();
 	dim->setPenToActive();
 	dim->update();
@@ -87,7 +87,7 @@ void ActionDimLinear::trigger()
 	graphicView->snapper.SetVisible(false);
 	graphicView->redraw();
 
-	RS_DEBUG->print("ActionDimLinear::trigger(): dim added: %d", dim->getId());
+	DEBUG->print("ActionDimLinear::trigger(): dim added: %d", dim->getId());
 }
 
 void ActionDimLinear::preparePreview()
@@ -95,7 +95,7 @@ void ActionDimLinear::preparePreview()
 	Vector dirV;
 	dirV.setPolar(100.0, edata.angle + M_PI / 2.0);
 
-	RS_ConstructionLine cl(NULL, RS_ConstructionLineData(edata.extensionPoint2,
+	ConstructionLine cl(NULL, ConstructionLineData(edata.extensionPoint2,
 		edata.extensionPoint2 + dirV));
 
 	data.definitionPoint = cl.getNearestPointOnEntity(data.definitionPoint);
@@ -103,7 +103,7 @@ void ActionDimLinear::preparePreview()
 
 void ActionDimLinear::mouseMoveEvent(QMouseEvent * e)
 {
-	RS_DEBUG->print("ActionDimLinear::mouseMoveEvent begin");
+	DEBUG->print("ActionDimLinear::mouseMoveEvent begin");
 
 	Vector mouse = snapPoint(e);
 
@@ -120,12 +120,12 @@ void ActionDimLinear::mouseMoveEvent(QMouseEvent * e)
 		{
 //			deletePreview();
 //			clearPreview();
-//			preview->addEntity(new RS_Line(preview,
-//				RS_LineData(edata.extensionPoint1, mouse)));
+//			preview->addEntity(new Line(preview,
+//				LineData(edata.extensionPoint1, mouse)));
 //			drawPreview();
 			graphicView->preview.clear();
-			graphicView->preview.addEntity(new RS_Line(&(graphicView->preview),
-				RS_LineData(edata.extensionPoint1, mouse)));
+			graphicView->preview.addEntity(new Line(&(graphicView->preview),
+				LineData(edata.extensionPoint1, mouse)));
 			graphicView->preview.SetVisible();
 			graphicView->redraw();
 		}
@@ -140,13 +140,13 @@ void ActionDimLinear::mouseMoveEvent(QMouseEvent * e)
 //			clearPreview();
 			data.definitionPoint = mouse;
 //			preparePreview();
-//			RS_DimLinear * dim = new RS_DimLinear(preview, data, edata);
+//			DimLinear * dim = new DimLinear(preview, data, edata);
 //			dim->update();
 //			preview->addEntity(dim);
 //			drawPreview();
 			graphicView->preview.clear();
 			preparePreview();
-			RS_DimLinear * dim = new RS_DimLinear(&(graphicView->preview), data, edata);
+			DimLinear * dim = new DimLinear(&(graphicView->preview), data, edata);
 			dim->update();
 			graphicView->preview.addEntity(dim);
 			graphicView->preview.SetVisible();
@@ -156,7 +156,7 @@ void ActionDimLinear::mouseMoveEvent(QMouseEvent * e)
 		break;
 	}
 
-	RS_DEBUG->print("ActionDimLinear::mouseMoveEvent end");
+	DEBUG->print("ActionDimLinear::mouseMoveEvent end");
 }
 
 void ActionDimLinear::mouseReleaseEvent(QMouseEvent * e)
@@ -214,14 +214,14 @@ void ActionDimLinear::coordinateEvent(Vector * e)
 	}
 }
 
-void ActionDimLinear::commandEvent(RS_CommandEvent * e)
+void ActionDimLinear::commandEvent(CommandEvent * e)
 {
 	QString c = e->getCommand().toLower();
 
 	if (checkCommand("help", c))
 	{
-		if (RS_DIALOGFACTORY)
-			RS_DIALOGFACTORY->commandMessage(msgAvailableCommands()
+		if (DIALOGFACTORY)
+			DIALOGFACTORY->commandMessage(msgAvailableCommands()
 				+ getAvailableCommands().join(", "));
 		return;
 	}
@@ -231,8 +231,8 @@ void ActionDimLinear::commandEvent(RS_CommandEvent * e)
 	case SetText:
 		setText(c);
 
-		if (RS_DIALOGFACTORY)
-			RS_DIALOGFACTORY->requestOptions(this, true, true);
+		if (DIALOGFACTORY)
+			DIALOGFACTORY->requestOptions(this, true, true);
 
 		graphicView->enableCoordinateInput();
 		setStatus(lastStatus);
@@ -241,15 +241,15 @@ void ActionDimLinear::commandEvent(RS_CommandEvent * e)
 	case SetAngle:
 	{
 		bool ok;
-		double a = RS_Math::eval(c, &ok);
+		double a = Math::eval(c, &ok);
 
 		if (ok)
-			setAngle(RS_Math::deg2rad(a));
-		else if (RS_DIALOGFACTORY)
-			RS_DIALOGFACTORY->commandMessage(tr("Not a valid expression"));
+			setAngle(Math::deg2rad(a));
+		else if (DIALOGFACTORY)
+			DIALOGFACTORY->commandMessage(tr("Not a valid expression"));
 
-		if (RS_DIALOGFACTORY)
-			RS_DIALOGFACTORY->requestOptions(this, true, true);
+		if (DIALOGFACTORY)
+			DIALOGFACTORY->requestOptions(this, true, true);
 
 		setStatus(lastStatus);
 	}
@@ -299,35 +299,35 @@ QStringList ActionDimLinear::getAvailableCommands()
 
 void ActionDimLinear::updateMouseButtonHints()
 {
-	if (RS_DIALOGFACTORY)
+	if (DIALOGFACTORY)
 	{
 		switch (getStatus())
 		{
 		case SetExtPoint1:
-			RS_DIALOGFACTORY->updateMouseWidget(
+			DIALOGFACTORY->updateMouseWidget(
 				tr("Specify first extension line origin"), tr("Cancel"));
 			break;
 
 		case SetExtPoint2:
-			RS_DIALOGFACTORY->updateMouseWidget(
+			DIALOGFACTORY->updateMouseWidget(
 				tr("Specify second extension line origin"), tr("Back"));
 			break;
 
 		case SetDefPoint:
-			RS_DIALOGFACTORY->updateMouseWidget(
+			DIALOGFACTORY->updateMouseWidget(
 				tr("Specify dimension line location"), tr("Back"));
 			break;
 
 		case SetText:
-			RS_DIALOGFACTORY->updateMouseWidget(tr("Enter dimension text:"), "");
+			DIALOGFACTORY->updateMouseWidget(tr("Enter dimension text:"), "");
 			break;
 
 		case SetAngle:
-			RS_DIALOGFACTORY->updateMouseWidget(tr("Enter dimension line angle:"), "");
+			DIALOGFACTORY->updateMouseWidget(tr("Enter dimension line angle:"), "");
 			break;
 
 		default:
-			RS_DIALOGFACTORY->updateMouseWidget("", "");
+			DIALOGFACTORY->updateMouseWidget("", "");
 			break;
 		}
 	}
@@ -337,16 +337,16 @@ void ActionDimLinear::showOptions()
 {
 	ActionInterface::showOptions();
 
-	if (RS_DIALOGFACTORY)
-		RS_DIALOGFACTORY->requestOptions(this, true, true);
+	if (DIALOGFACTORY)
+		DIALOGFACTORY->requestOptions(this, true, true);
 }
 
 void ActionDimLinear::hideOptions()
 {
 	ActionInterface::hideOptions();
 
-	if (RS_DIALOGFACTORY)
-		RS_DIALOGFACTORY->requestOptions(this, false);
+	if (DIALOGFACTORY)
+		DIALOGFACTORY->requestOptions(this, false);
 }
 
 double ActionDimLinear::getAngle()