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

[architektonas] / src / base / dimradial.cpp

diff --git a/src/base/dimradial.cpp b/src/base/dimradial.cpp
index dd783622ebf0b9bf3483fe7225576bcebe77aacd..40e398536af1d46eb1ab24fc4e733a28c7a983aa 100644 (file)
--- a/src/base/dimradial.cpp
+++ b/src/base/dimradial.cpp
@@ -68,27 +68,22 @@ DimRadialData DimRadial::getEData() const
  */
 QString DimRadial::getMeasuredLabel()
 {
-    // Definitive dimension line:
-    double dist = data.definitionPoint.distanceTo(edata.definitionPoint);
+       // 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 DimRadial::getRefPoints() {
-       VectorSolutions ret(edata.definitionPoint,
-                                               data.definitionPoint, data.middleOfText);
-       return ret;
+VectorSolutions DimRadial::getRefPoints()
+{
+       return VectorSolutions(edata.definitionPoint,
+               data.definitionPoint, data.middleOfText);
 }
 
 /**