From 7b78e0d147c4d12ba4ef9e906023d1c8032387d6 Mon Sep 17 00:00:00 2001 From: "Johan B. C. Engelen" Date: Tue, 8 Jul 2008 18:05:08 +0000 Subject: 2geomify the static defined hatchcircles of dropper tool, dyna draw and tweak tool. (bzr r6229) --- src/tweak-context.cpp | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) (limited to 'src/tweak-context.cpp') diff --git a/src/tweak-context.cpp b/src/tweak-context.cpp index 923a219bc..5e572c39e 100644 --- a/src/tweak-context.cpp +++ b/src/tweak-context.cpp @@ -80,19 +80,6 @@ #define DYNA_MIN_WIDTH 1.0e-6 -// FIXME: move it to some shared file to be reused by both calligraphy and dropper -#define C1 0.552 -static NArtBpath const hatch_area_circle[] = { - { NR_MOVETO, 0, 0, 0, 0, -1, 0 }, - { NR_CURVETO, -1, C1, -C1, 1, 0, 1 }, - { NR_CURVETO, C1, 1, 1, C1, 1, 0 }, - { NR_CURVETO, 1, -C1, C1, -1, 0, -1 }, - { NR_CURVETO, -C1, -1, -1, -C1, -1, 0 }, - { NR_END, 0, 0, 0, 0, 0, 0 } -}; -#undef C1 - - static void sp_tweak_context_class_init(SPTweakContextClass *klass); static void sp_tweak_context_init(SPTweakContext *ddc); static void sp_tweak_context_dispose(GObject *object); @@ -240,7 +227,15 @@ sp_tweak_context_setup(SPEventContext *ec) ((SPEventContextClass *) parent_class)->setup(ec); { - SPCurve *c = SPCurve::new_from_foreign_bpath(hatch_area_circle); + /* TODO: have a look at sp_dyna_draw_context_setup where the same is done.. generalize? at least make it an arcto! */ + SPCurve *c = new SPCurve(); + const double C1 = 0.552; + c->moveto(-1,0); + c->curveto(-1, C1, -C1, 1, 0, 1 ); + c->curveto(C1, 1, 1, C1, 1, 0 ); + c->curveto(1, -C1, C1, -1, 0, -1 ); + c->curveto(-C1, -1, -1, -C1, -1, 0 ); + c->closepath(); tc->dilate_area = sp_canvas_bpath_new(sp_desktop_controls(ec->desktop), c); c->unref(); sp_canvas_bpath_set_fill(SP_CANVAS_BPATH(tc->dilate_area), 0x00000000,(SPWindRule)0); -- cgit v1.2.3