X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fbase%2Fdimlinear.cpp;fp=src%2Fbase%2Fdimlinear.cpp;h=239d186d47d9f7b5915dc46692d06eac8329992a;hb=a18a12fc3bcb18e5c7ca5494d7f97fb8b93f90a2;hp=16063aa1fd39fdccefb5b34804cbb6ea647105b9;hpb=5adb444f3e523d3fd028617ced72d1ea6661db21;p=architektonas diff --git a/src/base/dimlinear.cpp b/src/base/dimlinear.cpp index 16063aa..239d186 100644 --- a/src/base/dimlinear.cpp +++ b/src/base/dimlinear.cpp @@ -93,19 +93,13 @@ QString DimLinear::getMeasuredLabel() // Definitive dimension line: double dist = dimP1.distanceTo(dimP2); - Drawing * graphic = getGraphic(); + Drawing * drawing = GetDrawing(); - QString ret; + if (drawing) + return Units::formatLinear(dist, drawing->getUnit(), + drawing->getLinearFormat(), drawing->getLinearPrecision()); - if (graphic) - ret = Units::formatLinear(dist, graphic->getUnit(), - graphic->getLinearFormat(), graphic->getLinearPrecision()); - else - ret = QString("%1").arg(dist); -//It's properly creating the label... -//printf("DimLinear::getMeasuredLabel: label=\"%s\"\n", ret.toAscii().data()); - - return ret; + return QString("%1").arg(dist); } bool DimLinear::hasEndpointsWithinWindow(Vector v1, Vector v2)