From 21ac64d68b5feadb60c25ff108679174d85dcd8a Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Date: Sat, 7 Dec 2019 01:48:58 +0100 Subject: [PATCH 1/3] Try to fix issue Inkscape560 --- src/ui/tools/measure-tool.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/ui/tools/measure-tool.cpp b/src/ui/tools/measure-tool.cpp index 9b370f2b9c..191542fd68 100644 --- a/src/ui/tools/measure-tool.cpp +++ b/src/ui/tools/measure-tool.cpp @@ -827,8 +827,10 @@ void MeasureTool::toMarkDimension() start_p *= Geom::Scale(1, -1); ray.setPoints(start_p, end_p); } - double textangle = ray.angle(); - + double textangle = Geom::rad_from_deg(180) - ray.angle(); + if (desktop->is_yaxisdown()) { + textangle = ray.angle() - Geom::rad_from_deg(180); + } setLabelText(totallength_str, middle, fontsize, textangle, color); g_free(totallength_str); doc->ensureUpToDate(); -- GitLab From dadbb6898cffb07c95c2aa83f4ea6afdc6f0d3b0 Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Date: Sat, 7 Dec 2019 02:04:29 +0100 Subject: [PATCH 2/3] revet meassure tool changes from df8a29ad --- src/ui/tools/measure-tool.cpp | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/ui/tools/measure-tool.cpp b/src/ui/tools/measure-tool.cpp index 191542fd68..861b27a894 100644 --- a/src/ui/tools/measure-tool.cpp +++ b/src/ui/tools/measure-tool.cpp @@ -822,11 +822,6 @@ void MeasureTool::toMarkDimension() totallengthval = Inkscape::Util::Quantity::convert(totallengthval, "px", unit_name); double scale = prefs->getDouble("/tools/measure/scale", 100.0) / 100.0; gchar *totallength_str = g_strdup_printf(precision_str.str().c_str(), totallengthval * scale, unit_name.c_str()); - if (desktop->is_yaxisdown()) { - end_p *= Geom::Scale(1, -1); - start_p *= Geom::Scale(1, -1); - ray.setPoints(start_p, end_p); - } double textangle = Geom::rad_from_deg(180) - ray.angle(); if (desktop->is_yaxisdown()) { textangle = ray.angle() - Geom::rad_from_deg(180); @@ -855,6 +850,8 @@ void MeasureTool::setGuide(Geom::Point origin, double angle, const char *label) // stores inverted y-axis coordinates if (desktop->is_yaxisdown()) { origin[Geom::Y] = doc->getHeight().value("px") - origin[Geom::Y]; + angle *= -1.0; + } origin *= affine; @@ -1269,10 +1266,7 @@ void MeasureTool::showCanvasItems(bool to_guides, bool to_item, bool to_phantom, p.start(start_p_doc); p.appendNew(end_p_doc); lineseg.push_back(p); - if (desktop->is_yaxisdown()) { - end_p *= Geom::Scale(1, -1); - start_p *= Geom::Scale(1, -1); - } + double angle = atan2(end_p - start_p); double baseAngle = 0; -- GitLab From 70e8e7e349daa1adc8e324086953226691e20fea Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Date: Sat, 7 Dec 2019 08:16:36 +0000 Subject: [PATCH 3/3] Fix wrong empty line --- src/ui/tools/measure-tool.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/ui/tools/measure-tool.cpp b/src/ui/tools/measure-tool.cpp index 861b27a894..4222910ee1 100644 --- a/src/ui/tools/measure-tool.cpp +++ b/src/ui/tools/measure-tool.cpp @@ -851,7 +851,6 @@ void MeasureTool::setGuide(Geom::Point origin, double angle, const char *label) if (desktop->is_yaxisdown()) { origin[Geom::Y] = doc->getHeight().value("px") - origin[Geom::Y]; angle *= -1.0; - } origin *= affine; -- GitLab