diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2016-02-06 00:45:54 +0000 |
|---|---|---|
| committer | jabiertxof <info@marker.es> | 2016-02-06 00:45:54 +0000 |
| commit | 91b80a234e552c57ad6029f54ee4014a7f79048d (patch) | |
| tree | 9ae755bcddfd1e695d48fbd215ee2136cfd70128 /src/ui/tools/measure-tool.cpp | |
| parent | Dutch translation update (diff) | |
| download | inkscape-91b80a234e552c57ad6029f54ee4014a7f79048d.tar.gz inkscape-91b80a234e552c57ad6029f54ee4014a7f79048d.zip | |
Fix for meassure bug #1541963
Fixed bugs:
- https://launchpad.net/bugs/1541963
(bzr r14632)
Diffstat (limited to 'src/ui/tools/measure-tool.cpp')
| -rw-r--r-- | src/ui/tools/measure-tool.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/ui/tools/measure-tool.cpp b/src/ui/tools/measure-tool.cpp index 07313874f..e36cc294a 100644 --- a/src/ui/tools/measure-tool.cpp +++ b/src/ui/tools/measure-tool.cpp @@ -71,8 +71,6 @@ namespace Inkscape { namespace UI { namespace Tools { -std::vector<Inkscape::Display::TemporaryItem*> measure_tmp_items; - const std::string& MeasureTool::getPrefsPath() { return MeasureTool::prefsPath; @@ -272,7 +270,7 @@ void setMeasureItem(Geom::PathVector pathv, bool is_curve, bool markers, guint32 * @param angle the angle of the arc segment to draw. * @param measure_rpr the container of the curve if converted to items. */ -void createAngleDisplayCurve(SPDesktop *desktop, Geom::Point const ¢er, Geom::Point const &end, Geom::Point const &anchor, double angle, Inkscape::XML::Node *measure_repr = NULL) +void createAngleDisplayCurve(SPDesktop *desktop, Geom::Point const ¢er, Geom::Point const &end, Geom::Point const &anchor, double angle, std::vector<Inkscape::Display::TemporaryItem*> &measure_tmp_items, Inkscape::XML::Node *measure_repr = NULL) { // Given that we have a point on the arc's edge and the angle of the arc, we need to get the two endpoints. @@ -1244,7 +1242,7 @@ void MeasureTool::showCanvasItems(bool to_guides, bool to_item, Inkscape::XML::N * Geom::Affine(Geom::Translate(start_p))); } setMeasureCanvasControlLine(start_p, anchorEnd, to_item, CTLINE_SECONDARY, measure_repr); - createAngleDisplayCurve(desktop, start_p, end_p, angleDisplayPt, angle, measure_repr); + createAngleDisplayCurve(desktop, start_p, end_p, angleDisplayPt, angle, measure_tmp_items, measure_repr); } if (intersections.size() > 2) { |
