diff options
| author | root <root@jtx.marker.es> | 2013-04-14 21:08:45 +0000 |
|---|---|---|
| committer | root <root@jtx.marker.es> | 2013-04-14 21:08:45 +0000 |
| commit | 224bac8cddd8960f65cf08202c4f40e74c8fc1ae (patch) | |
| tree | 3c841d0754517a3de6829702b581bd90f31919ba /src/pen-context.cpp | |
| parent | halo (diff) | |
| download | inkscape-224bac8cddd8960f65cf08202c4f40e74c8fc1ae.tar.gz inkscape-224bac8cddd8960f65cf08202c4f40e74c8fc1ae.zip | |
Go back
(bzr r11950.1.93)
Diffstat (limited to 'src/pen-context.cpp')
| -rw-r--r-- | src/pen-context.cpp | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/src/pen-context.cpp b/src/pen-context.cpp index 4a1384657..43f2fd76e 100644 --- a/src/pen-context.cpp +++ b/src/pen-context.cpp @@ -1401,7 +1401,6 @@ static void spdc_reset_colors(SPPenContext *pc) pc->blue_curve->reset(); sp_canvas_bpath_set_bpath(SP_CANVAS_BPATH(pc->blue_bpath), NULL); - sp_canvas_bpath_set_bpath(SP_CANVAS_BPATH(pc->halo_bpath), NULL); // Green while (pc->green_bpaths) { sp_canvas_item_destroy(SP_CANVAS_ITEM(pc->green_bpaths->data)); @@ -1426,7 +1425,6 @@ static void spdc_pen_set_initial_point(SPPenContext *const pc, Geom::Point const pc->p[1] = p; pc->npoints = 2; sp_canvas_bpath_set_bpath(SP_CANVAS_BPATH(pc->red_bpath), NULL); - sp_canvas_bpath_set_bpath(SP_CANVAS_BPATH(pc->halo_bpath), NULL); pc->desktop->canvas->forceFullRedrawAfterInterruptions(5); } @@ -1818,26 +1816,15 @@ static void bspline_spiro_build(SPPenContext *const pc) //LivePathEffectObject *lpeobj = static_cast<LivePathEffectObject*> (curve); //Effect *spr = static_cast<Effect*> ( new LPEbspline(lpeobj) ); //spr->doEffect(curve); - SPCurve *halo = new SPCurve(); if(pc->bspline){ bspline_doEffect(curve); - halo = curve->copy()->create_reverse(); - if(!pc->green_curve->is_empty()) - halo->append_continuous(pc->green_curve, 0.0625); - if(!pc->red_curve->is_empty()) - halo->append_continuous(pc->red_curve, 0.0625); - if(Geom::are_near(halo->first_path()->initialPoint(), halo->last_path()->finalPoint())){ - halo->closepath_current(); - } }else{ spiro_doEffect(curve); - halo = curve->copy(); } - sp_canvas_item_show(pc->blue_bpath); - sp_canvas_bpath_set_bpath(SP_CANVAS_BPATH(pc->halo_bpath), halo); - sp_canvas_bpath_set_stroke(SP_CANVAS_BPATH(pc->halo_bpath), pc->halo_color, 1.0, SP_STROKE_LINEJOIN_MITER, SP_STROKE_LINECAP_BUTT); + sp_canvas_bpath_set_bpath(SP_CANVAS_BPATH(pc->blue_bpath), curve); sp_canvas_bpath_set_stroke(SP_CANVAS_BPATH(pc->blue_bpath), pc->blue_color, 1.0, SP_STROKE_LINEJOIN_MITER, SP_STROKE_LINECAP_BUTT); + sp_canvas_item_show(pc->blue_bpath); curve->unref(); pc->blue_curve->reset(); //We hide the holders that doesn't contribute anything |