summaryrefslogtreecommitdiffstats
path: root/src/ui
diff options
context:
space:
mode:
authorJabier Arraiza Cenoz <jabier.arraiza@marker.es>2015-10-06 17:33:01 +0000
committerjabiertxof <jabier.arraiza@marker.es>2015-10-06 17:33:01 +0000
commit8ffe79882b3a4e746088d75b76b51251c87aa4a9 (patch)
tree18f1a926c08d2ee2915d23f1c725161ae217cb5f /src/ui
parentfix a bug rendering the angle line in diferent units than pixels (diff)
downloadinkscape-8ffe79882b3a4e746088d75b76b51251c87aa4a9.tar.gz
inkscape-8ffe79882b3a4e746088d75b76b51251c87aa4a9.zip
Remove wrong code for angle helper path
(bzr r14393.1.12)
Diffstat (limited to 'src/ui')
-rw-r--r--src/ui/tools/measure-tool.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/ui/tools/measure-tool.cpp b/src/ui/tools/measure-tool.cpp
index 8a9340b07..894687919 100644
--- a/src/ui/tools/measure-tool.cpp
+++ b/src/ui/tools/measure-tool.cpp
@@ -190,14 +190,12 @@ Geom::Point calcAngleDisplayAnchor(SPDesktop *desktop, double angle, double base
* @param anchor the anchor point for displaying the text label.
* @param angle the angle of the arc segment to draw.
*/
-void createAngleDisplayCurve(SPDesktop *desktop, Geom::Point const &center, Geom::Point const &end, Geom::Point const &anchor, double angle, Glib::ustring unit_name)
+void createAngleDisplayCurve(SPDesktop *desktop, Geom::Point const &center, Geom::Point const &end, Geom::Point const &anchor, double angle)
{
// Given that we have a point on the arc's edge and the angle of the arc, we need to get the two endpoints.
double textLen = std::abs((anchor - center).length());
- textLen = Inkscape::Util::Quantity::convert(textLen, "px", unit_name);
double sideLen = std::abs((end - center).length());
- sideLen = Inkscape::Util::Quantity::convert(sideLen, "px", unit_name);
if (sideLen > 0.0) {
double factor = std::min(1.0, textLen / sideLen);
@@ -879,7 +877,7 @@ void MeasureTool::showCanvasItems(Geom::Point start_point, Geom::Point end_point
CTLINE_SECONDARY);
measure_tmp_items.push_back(desktop->add_temporary_canvasitem(control_line, 0));
- createAngleDisplayCurve(desktop, start_point, end_point, angleDisplayPt, angle, unit_name);
+ createAngleDisplayCurve(desktop, start_point, end_point, angleDisplayPt, angle);
}
}