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

[architektonas] / src / base / dimdiametric.cpp

diff --git a/src/base/dimdiametric.cpp b/src/base/dimdiametric.cpp
index 934c1f2848e8bb324d5d3dac7500df8e29bdd88c..3ba48eb9f72ab5de5014a1f8f9d508a905d910f5 100644 (file)
--- a/src/base/dimdiametric.cpp
+++ b/src/base/dimdiametric.cpp
@@ -71,19 +71,13 @@ QString DimDiametric::getMeasuredLabel()
 {
     // Definitive dimension line:
     double dist = data.definitionPoint.distanceTo(edata.definitionPoint);
+       Drawing * drawing = GetDrawing();
 
-       Drawing* graphic = getGraphic();
+       if (drawing)
+               return Units::formatLinear(dist, drawing->getUnit(),
+                       drawing->getLinearFormat(), drawing->getLinearPrecision());
 
-    QString ret;
-       if (graphic!=NULL) {
-               ret = Units::formatLinear(dist, graphic->getUnit(),
-                       graphic->getLinearFormat(), graphic->getLinearPrecision());
-       }
-       else {
-       ret = QString("%1").arg(dist);
-       }
-
-    return ret;
+    return QString("%1").arg(dist);
 }
 
 VectorSolutions DimDiametric::getRefPoints()