X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fbase%2Fdimradial.cpp;h=dd783622ebf0b9bf3483fe7225576bcebe77aacd;hb=5adb444f3e523d3fd028617ced72d1ea6661db21;hp=d2d48dc76ca80b29a0860953f646876faaac78bd;hpb=3239ef39dcee08fa6e8cd68cdf2727fc68cc7a8c;p=architektonas diff --git a/src/base/dimradial.cpp b/src/base/dimradial.cpp index d2d48dc..dd78362 100644 --- a/src/base/dimradial.cpp +++ b/src/base/dimradial.cpp @@ -28,18 +28,18 @@ * @para d Common dimension geometrical data. * @para ed Extended geometrical data for radial dimension. */ -RS_DimRadial::RS_DimRadial(RS_EntityContainer * parent, const RS_DimensionData & d, - const RS_DimRadialData & ed): RS_Dimension(parent, d), edata(ed) +DimRadial::DimRadial(EntityContainer * parent, const DimensionData & d, + const DimRadialData & ed): Dimension(parent, d), edata(ed) { } -/*virtual*/ RS_DimRadial::~RS_DimRadial() +/*virtual*/ DimRadial::~DimRadial() { } -/*virtual*/ RS_Entity * RS_DimRadial::clone() +/*virtual*/ Entity * DimRadial::clone() { - RS_DimRadial * d = new RS_DimRadial(*this); + DimRadial * d = new DimRadial(*this); #warning "!!! Need to deal with setAutoDelete() Qt3->Qt4 !!!" // d->entities.setAutoDelete(entities.autoDelete()); d->initId(); @@ -48,7 +48,7 @@ RS_DimRadial::RS_DimRadial(RS_EntityContainer * parent, const RS_DimensionData & } /** @return RS2::EntityDimRadial */ -/*virtual*/ RS2::EntityType RS_DimRadial::rtti() const +/*virtual*/ RS2::EntityType DimRadial::rtti() const { return RS2::EntityDimRadial; } @@ -57,7 +57,7 @@ RS_DimRadial::RS_DimRadial(RS_EntityContainer * parent, const RS_DimensionData & * @return Copy of data that defines the radial dimension. * @see getData() */ -RS_DimRadialData RS_DimRadial::getEData() const +DimRadialData DimRadial::getEData() const { return edata; } @@ -66,7 +66,7 @@ RS_DimRadialData RS_DimRadial::getEData() const * @return Automatically created label for the default * measurement of this dimension. */ -QString RS_DimRadial::getMeasuredLabel() +QString DimRadial::getMeasuredLabel() { // Definitive dimension line: double dist = data.definitionPoint.distanceTo(edata.definitionPoint); @@ -75,7 +75,7 @@ QString RS_DimRadial::getMeasuredLabel() QString ret; if (graphic!=NULL) { - ret = RS_Units::formatLinear(dist, graphic->getUnit(), + ret = Units::formatLinear(dist, graphic->getUnit(), graphic->getLinearFormat(), graphic->getLinearPrecision()); } else { ret = QString("%1").arg(dist); @@ -85,7 +85,7 @@ QString RS_DimRadial::getMeasuredLabel() } -VectorSolutions RS_DimRadial::getRefPoints() { +VectorSolutions DimRadial::getRefPoints() { VectorSolutions ret(edata.definitionPoint, data.definitionPoint, data.middleOfText); return ret; @@ -97,9 +97,9 @@ VectorSolutions RS_DimRadial::getRefPoints() { * * @param autoText Automatically reposition the text label */ -void RS_DimRadial::update(bool autoText) +void DimRadial::update(bool autoText) { - RS_DEBUG->print("RS_DimRadial::update"); + DEBUG->print("DimRadial::update"); clear(); @@ -123,9 +123,9 @@ void RS_DimRadial::update(bool autoText) // length of dimension line: double length = p1.distanceTo(p2); - RS_TextData textData; + TextData textData; - textData = RS_TextData(Vector(0.0,0.0), + textData = TextData(Vector(0.0,0.0), dimtxt, 30.0, RS2::VAlignMiddle, RS2::HAlignCenter, @@ -136,7 +136,7 @@ void RS_DimRadial::update(bool autoText) "standard", 0.0); - RS_Text* text = new RS_Text(this, textData); + Text* text = new Text(this, textData); double textWidth = text->getSize().x; // do we have to put the arrow / text outside of the arc? @@ -151,14 +151,14 @@ void RS_DimRadial::update(bool autoText) } // create arrow: - RS_SolidData sd; - RS_Solid* arrow; + SolidData sd; + Solid* arrow; - arrow = new RS_Solid(this, sd); + arrow = new Solid(this, sd); arrow->shapeArrow(p2, arrowAngle, getArrowSize()); - arrow->setPen(RS_Pen(RS2::FlagInvalid)); + arrow->setPen(Pen(RS2::FlagInvalid)); arrow->setLayer(NULL); addEntity(arrow); @@ -167,8 +167,8 @@ void RS_DimRadial::update(bool autoText) p3 += p1; // Create dimension line: - RS_Line* dimensionLine = new RS_Line(this, RS_LineData(p1, p3)); - dimensionLine->setPen(RS_Pen(RS2::FlagInvalid)); + Line* dimensionLine = new Line(this, LineData(p1, p3)); + dimensionLine->setPen(Pen(RS2::FlagInvalid)); dimensionLine->setLayer(NULL); addEntity(dimensionLine); @@ -209,34 +209,34 @@ void RS_DimRadial::update(bool autoText) text->rotate(Vector(0.0,0.0), textAngle); text->move(textPos); - text->setPen(RS_Pen(RS2::FlagInvalid)); + text->setPen(Pen(RS2::FlagInvalid)); text->setLayer(NULL); addEntity(text); calculateBorders(); } -Vector RS_DimRadial::getDefinitionPoint() +Vector DimRadial::getDefinitionPoint() { return edata.definitionPoint; } -double RS_DimRadial::getLeader() +double DimRadial::getLeader() { return edata.leader; } -void RS_DimRadial::move(Vector offset) +void DimRadial::move(Vector offset) { - RS_Dimension::move(offset); + Dimension::move(offset); edata.definitionPoint.move(offset); update(); } -void RS_DimRadial::rotate(Vector center, double angle) +void DimRadial::rotate(Vector center, double angle) { - RS_Dimension::rotate(center, angle); + Dimension::rotate(center, angle); edata.definitionPoint.rotate(center, angle); update(); @@ -244,8 +244,8 @@ void RS_DimRadial::rotate(Vector center, double angle) -void RS_DimRadial::scale(Vector center, Vector factor) { - RS_Dimension::scale(center, factor); +void DimRadial::scale(Vector center, Vector factor) { + Dimension::scale(center, factor); edata.definitionPoint.scale(center, factor); edata.leader*=factor.x; @@ -254,15 +254,15 @@ void RS_DimRadial::scale(Vector center, Vector factor) { -void RS_DimRadial::mirror(Vector axisPoint1, Vector axisPoint2) { - RS_Dimension::mirror(axisPoint1, axisPoint2); +void DimRadial::mirror(Vector axisPoint1, Vector axisPoint2) { + Dimension::mirror(axisPoint1, axisPoint2); edata.definitionPoint.mirror(axisPoint1, axisPoint2); update(); } -void RS_DimRadial::moveRef(const Vector& ref, const Vector& offset) { +void DimRadial::moveRef(const Vector& ref, const Vector& offset) { if (ref.distanceTo(edata.definitionPoint)<1.0e-4) { double d = data.definitionPoint.distanceTo(edata.definitionPoint); @@ -282,7 +282,7 @@ void RS_DimRadial::moveRef(const Vector& ref, const Vector& offset) { /** * Dumps the point's data to stdout. */ -std::ostream& operator << (std::ostream& os, const RS_DimRadial& d) { +std::ostream& operator << (std::ostream& os, const DimRadial& d) { os << " DimRadial: " << d.getData() << "\n" << d.getEData() << "\n"; return os; }