In the middle of chasing down MDI not activating bug, renaming of Graphic to

[architektonas] / src / base / dimlinear.cpp

diff --git a/src/base/dimlinear.cpp b/src/base/dimlinear.cpp
index 16063aa1fd39fdccefb5b34804cbb6ea647105b9..239d186d47d9f7b5915dc46692d06eac8329992a 100644 (file)
--- 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)