@@ -70,7 +70,6 @@ module CelticKnot next_edge else -puts "thread ------>" @thread = knot.new_thread @step = 0 @@ -109,13 +108,6 @@ puts "thread ------>" difference = @edge.difference(far_edge, @direction) difference = 1.0 if difference == 0.0 -puts "%d: %s %s" % [@step, @node, @edge] -puts " far edge: %s" % far_edge -puts " parallel: %s" % parallel -puts " vector: %s" % vector -puts " midpoint: %s" % @midpoint -puts " direction: %s" % @direction -puts " difference: %f" % difference @thread.add_connection(@midpoint, vector, 4.5 * difference, @edge.normal?) @edge.mark(@node, @direction) lib/celtic_knot/builder.rb @@ -78,19 +78,6 @@ module CelticKnot false end - def to_svg(options={}) - color = options[:color] || "black" - - width = impervious? ? 2 : 1 - dasharray = ignore? ? "3,3" : "none" - - svg = '<path d="' - svg << "M #{n1.x} #{n1.y} L #{n2.x} #{n2.y}" - svg << '" ' - svg << 'stroke="%s" fill="none" stroke-width="%s" stroke-dasharray="%s"' % [color, width, dasharray] - svg << " />" - end - private def mark_near(point, direction) lib/celtic_knot/edge.rb @@ -61,16 +61,6 @@ module CelticKnot return knot end - def to_svg(options={}) - svg = "<g>\n" - - edges = nodes.map { |node| node.edges }.flatten.uniq - edges.each { |edge| svg << edge.to_svg(options) << "\n" } - nodes.each { |node| svg << node.to_svg(options) << "\n" } - - svg << "</g>\n" - end - private def encircle_node(knot, node) @@ -94,7 +84,6 @@ module CelticKnot mid1 = edge.virtual_midpoint(near, direction, :exit) -n = 0 loop do far = edge.other(near) parallel = far - near @@ -102,8 +91,6 @@ n = 0 break if thread.closes?(mid1, vector) -n += 1 -puts "%d: %s %s | %s %s | %s %s" % [n, near, edge, mid1, vector, parallel, direction] thread.add_connection(mid1, vector) edge.mark(near, direction) lib/celtic_knot/graph.rb @@ -15,33 +15,5 @@ module CelticKnot @threads << thread return thread end - - def to_svg(options={}) - svg = "<g>\n" - - options = options.dup - width = options.delete(:width) || 2 - fill_color = options.delete(:fill) || "white" - stroke_color = options.delete(:stroke) || "black" - - stroke_opts = { :stroke => stroke_color, 'stroke-width' => width, :fill => "none" }.merge(options) - fill_opts = { :stroke => fill_color, 'stroke-width' => width-1, :fill => "none" }.merge(options) - - curves.select { |c| !c.over }.each do |curve| - svg << curve.to_svg(stroke_opts) << "\n" - svg << curve.to_svg(fill_opts) << "\n" - end - - curves.select { |c| c.over }.each do |curve| - svg << curve.to_svg(stroke_opts) << "\n" - svg << curve.to_svg(fill_opts) << "\n" - end - - @marks.each do |id, pt| - svg << '<circle cx="%f" cy="%f" r="1" fill="red" stroke="red" id="%s" />' % [pt.x, pt.y, id] - end - - svg << "</g>\n" - end end end lib/celtic_knot/knot.rb @@ -40,10 +40,5 @@ module CelticKnot nearest = 0 if nearest >= edges.length return edges[nearest] end - - def to_svg(options={}) - color = options[:color] || "black" - '<circle cx="%f" cy="%f" r="1" fill="%s" stroke="%s" />' % [x, y, color, color] - end end end lib/celtic_knot/node.rb examples/knot2svg.rb afa29ac19a6e6792895c627ff49c6ea75a6bb9cb Jamis Buck jamis@37signals.com http://github.com/jamis/celtic_knot/commit/d450c776d8b34cf3627189bb939008f01d6b20b8 d450c776d8b34cf3627189bb939008f01d6b20b8 2009-06-07T21:15:00-07:00 2009-06-07T21:15:00-07:00 nix the svg output, since it wasn't working right also pull some debugging output 9c6e55f4758ea3a5ec8323e6c00083f8ce2a21bc Jamis Buck jamis@37signals.com