]> Shamusworld >> Repos - architektonas/blobdiff - src/base/rs_dimlinear.cpp
Added missing readme and GPL license file.
[architektonas] / src / base / rs_dimlinear.cpp
index ad32e7df389a5a19457ce829437453f295c819c3..6d587ef7f8f69ae9fbf35fd8916c5c18d1f89f7f 100644 (file)
@@ -17,7 +17,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 +91,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 +133,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;