Simplify implementation of graphical objects - gsl-shell.git - gsl-shell

diff --git a/agg-plot/canvas_svg.cpp b/agg-plot/canvas_svg.cpp
index d8f05cb9..9cb97e1b 100644
--- a/agg-plot/canvas_svg.cpp
+++ b/agg-plot/canvas_svg.cpp

@@ -2,41 +2,21 @@

const double canvas_svg::default_stroke_width = 1.0;

-static void canvas_draw_svg(svg_vs* vs, FILE* f, int id, agg::rgba8 c)

+template <>

+void canvas_svg::draw<sg_object>(sg_object& vs, agg::rgba8 c)

{

- str s = vs->write_svg(id, c);

- canvas_svg::writeln(f, s, " ");

+ int id = m_current_id ++;

+ str s = vs.write_svg(id, c);

+ canvas_svg::writeln(m_output, s, " ");

}

-static void canvas_draw_outline_svg(svg_vs* vs, FILE* f, int id, agg::rgba8 c)

+template <>

+void canvas_svg::draw_outline<sg_object>(sg_object& vs, agg::rgba8 c)

{

+ int id = m_current_id ++;

str path;

- svg_property_list* ls = vs->svg_path(path);

+ svg_property_list* ls = vs.svg_path(path);

str s = svg_stroke_path(path, canvas_svg::default_stroke_width, id, c, ls);

list::free(ls);

- canvas_svg::writeln(f, s, " ");

-}

-

-template <>

-void canvas_svg::draw<svg_vs>(svg_vs& vs, agg::rgba8 c)

-{

- canvas_draw_svg(&vs, m_output, m_current_id++, c);

-}

-

-template <>

-void canvas_svg::draw_outline<svg_vs>(svg_vs& vs, agg::rgba8 c)

-{

- canvas_draw_outline_svg(&vs, m_output, m_current_id++, c);

-}

-

-template <>

-void canvas_svg::draw<drawable>(drawable& vs, agg::rgba8 c)

-{

- canvas_draw_svg(&vs, m_output, m_current_id++, c);

-}

-

-template <>

-void canvas_svg::draw_outline<drawable>(drawable& vs, agg::rgba8 c)

-{

- canvas_draw_outline_svg(&vs, m_output, m_current_id++, c);

+ canvas_svg::writeln(m_output, s, " ");

}