X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fbase%2Frs_dimlinear.cpp;h=d64f50533e05105054f57999dc93ee75c519bbce;hb=20cce16e98fc9b052c5862efa6394a285971e846;hp=9797e36549db66e3e679f50b3a4b9589aa786677;hpb=89e127aa3dbd74d3158e6dbe0ca1703420c04395;p=architektonas diff --git a/src/base/rs_dimlinear.cpp b/src/base/rs_dimlinear.cpp index 9797e36..d64f505 100644 --- a/src/base/rs_dimlinear.cpp +++ b/src/base/rs_dimlinear.cpp @@ -3,7 +3,9 @@ // Part of the Architektonas Project // Originally part of QCad Community Edition by Andrew Mustun // Extensively rewritten and refactored by James L. Hammons -// (C) 2010 Underground Software +// Portions copyright (C) 2001-2003 RibbonSoft +// Copyright (C) 2010 Underground Software +// See the README and GPLv2 files for licensing and warranty information // // JLH = James L. Hammons // @@ -95,15 +97,11 @@ QString RS_DimLinear::getMeasuredLabel() QString ret; - if (graphic != NULL) - { + if (graphic) ret = RS_Units::formatLinear(dist, graphic->getUnit(), graphic->getLinearFormat(), graphic->getLinearPrecision()); - } else - { ret = QString("%1").arg(dist); - } //It's properly creating the label... //printf("RS_DimLinear::getMeasuredLabel: label=\"%s\"\n", ret.toAscii().data()); @@ -137,7 +135,7 @@ void RS_DimLinear::update(bool autoText) double dimexe = getExtensionLineExtension(); RS_LineData ld; - double extAngle = edata.angle + (M_PI/2.0); + double extAngle = edata.angle + (M_PI / 2.0); // direction of dimension line Vector dirDim;