Fixed Library Browser...

[architektonas] / src / base / rs_dimlinear.cpp

diff --git a/src/base/rs_dimlinear.cpp b/src/base/rs_dimlinear.cpp
index ad32e7df389a5a19457ce829437453f295c819c3..d64f50533e05105054f57999dc93ee75c519bbce 100644 (file)
--- 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 <jlhamm@acm.org>
 //
@@ -17,7 +19,7 @@
 #include "rs_constructionline.h"
 #include "rs_text.h"
 #include "rs_solid.h"
-#include "rs_graphic.h"
+#include "drawing.h"
 #include "rs_units.h"
 
 /**
@@ -91,18 +93,17 @@ QString RS_DimLinear::getMeasuredLabel()
        // Definitive dimension line:
        double dist = dimP1.distanceTo(dimP2);
 
-       RS_Graphic* graphic = getGraphic();
+       Drawing * graphic = getGraphic();
 
        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());
 
        return ret;
 }
@@ -134,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;