summaryrefslogtreecommitdiffstats
path: root/src/ui/tools/node-tool.cpp
diff options
context:
space:
mode:
authorsu_v <suv-sf@users.sourceforge.net>2014-09-02 12:17:40 +0000
committer~suv <suv-sf@users.sourceforge.net>2014-09-02 12:17:40 +0000
commit78ff0bee3e358adf1051d4037c4043cc223d5afe (patch)
treea23ed22cc7a5272585141a60afce42e2654458e1 /src/ui/tools/node-tool.cpp
parentupdate to trunk (r13532) (diff)
parentconfigure.ac: Quell warnings about AM_PROG_AR when using automake 1.12 (diff)
downloadinkscape-78ff0bee3e358adf1051d4037c4043cc223d5afe.tar.gz
inkscape-78ff0bee3e358adf1051d4037c4043cc223d5afe.zip
update to trunk (r13540)
(bzr r13398.1.9)
Diffstat (limited to 'src/ui/tools/node-tool.cpp')
-rw-r--r--src/ui/tools/node-tool.cpp38
1 files changed, 17 insertions, 21 deletions
diff --git a/src/ui/tools/node-tool.cpp b/src/ui/tools/node-tool.cpp
index 0778e3f3f..4be547506 100644
--- a/src/ui/tools/node-tool.cpp
+++ b/src/ui/tools/node-tool.cpp
@@ -298,27 +298,23 @@ void NodeTool::update_helperpath () {
if (SP_IS_LPE_ITEM(selection->singleItem())) {
Inkscape::LivePathEffect::Effect *lpe = SP_LPE_ITEM(selection->singleItem())->getCurrentLPE();
if (lpe && lpe->isVisible()/* && lpe->showOrigPath()*/) {
- if (lpe) {
- SPCurve *c = new SPCurve();
- SPCurve *cc = new SPCurve();
- std::vector<Geom::PathVector> cs = lpe->getCanvasIndicators(SP_LPE_ITEM(selection->singleItem()));
- for (std::vector<Geom::PathVector>::iterator p = cs.begin(); p != cs.end(); ++p) {
- cc->set_pathvector(*p);
- c->append(cc, false);
- cc->reset();
- }
- if (!c->is_empty()) {
- c->transform(selection->singleItem()->i2dt_affine());
- SPCanvasItem *helperpath = sp_canvas_bpath_new(sp_desktop_tempgroup(this->desktop), c);
- sp_canvas_bpath_set_stroke(SP_CANVAS_BPATH(helperpath),
- 0x0000ff9A, 1.0,
- SP_STROKE_LINEJOIN_MITER, SP_STROKE_LINECAP_BUTT);
- sp_canvas_bpath_set_fill(SP_CANVAS_BPATH(helperpath), 0, SP_WIND_RULE_NONZERO);
- this->helperpath_tmpitem = this->desktop->add_temporary_canvasitem(helperpath,0);
- }
- c->unref();
- cc->unref();
- }
+ SPCurve *c = new SPCurve();
+ SPCurve *cc = new SPCurve();
+ std::vector<Geom::PathVector> cs = lpe->getCanvasIndicators(SP_LPE_ITEM(selection->singleItem()));
+ for (std::vector<Geom::PathVector>::iterator p = cs.begin(); p != cs.end(); ++p) {
+ cc->set_pathvector(*p);
+ c->append(cc, false);
+ cc->reset();
+ }
+ if (!c->is_empty()) {
+ SPCanvasItem *helperpath = sp_canvas_bpath_new(sp_desktop_tempgroup(this->desktop), c);
+ sp_canvas_bpath_set_stroke(SP_CANVAS_BPATH(helperpath), 0x0000ff9A, 1.0, SP_STROKE_LINEJOIN_MITER, SP_STROKE_LINECAP_BUTT);
+ sp_canvas_bpath_set_fill(SP_CANVAS_BPATH(helperpath), 0, SP_WIND_RULE_NONZERO);
+ sp_canvas_item_affine_absolute(helperpath, selection->singleItem()->i2dt_affine());
+ this->helperpath_tmpitem = this->desktop->add_temporary_canvasitem(helperpath, 0);
+ }
+ c->unref();
+ cc->unref();
}
}
}