dyi 0.0.1 → 0.0.2

data/CHANGES

@@ -0,0 +1,20 @@
+= DYI Changelog
+
+== Version 0.0.2 / 2011-09-05
+
+* Minor Enhancements
+  * Modify header comments of output file.
+
+* Bug Fixes
+  * A path is not drawn correctly.
+  * Miter length is not set corrently.
+
+== Version 0.0.1 / 2011-07-15
+
+* Bug Fixes
+  * Clipping is not possible for a shape object.
+  * A path is not drawn correctly.
+
+== Version 0.0.0 / 2011-06-30
+
+* First public release

data/examples/class_diagram.rb

@@ -1,4 +1,7 @@
-require '../lib/dyi'
+# -*- encoding: UTF-8 -*-
+
+require 'rubygems'
+require 'dyi'
 
 class ClassBox
   def initialize class_name
@@ -148,4 +151,4 @@ pen.draw_rectangle(canvas, [310, 600], 770, 200)
 pen.draw_text(canvas, [730, 620], 'DYI::Shape')
 base_class.draw(canvas, pen, [650,630])
 
-canvas.save 'output/test.svg'
+canvas.save 'output/class_diagram.svg'

data/examples/line_and_bar.rb

@@ -1,6 +1,7 @@
 # -*- encoding: UTF-8 -*-
 
-require '../lib/dyi'
+require 'rubygems'
+require 'dyi'
 
 chart = DYI::Chart::LineChart.new 800,500,
   :use_y_second_axises => [true, nil],
@@ -21,6 +22,6 @@ chart = DYI::Chart::LineChart.new 800,500,
 reader = DYI::Chart::CsvReader.read('data/money.csv', :data_types => [:number, :number, :string], :title_column=>0, :column_skip => 1)
 chart.load_data reader
 
-chart.save 'output/test.svg'
-chart.save 'output/test.eps', :eps
-chart.save 'output/test.emf', :emf if defined? IRONRUBY_VERSION
+chart.save 'output/line_and_bar.svg'
+chart.save 'output/line_and_bar.eps', :eps
+chart.save 'output/line_and_bar.emf', :emf if defined? IRONRUBY_VERSION

data/examples/line_chart.rb

@@ -1,6 +1,7 @@
 # -*- encoding: UTF-8 -*-
 
-require '../lib/dyi'
+require 'rubygems'
+require 'dyi'
 
 gr = DYI::Drawing::ColorEffect::LinearGradient.new([0,0],[0,1])
 gr.add_color(0, '#8FD3F5')
@@ -24,7 +25,7 @@ chart = DYI::Chart::LineChart.new 720,300,
 reader = DYI::Chart::ExcelReader.read('data/03311056.xlsx', :sheet => 'Sheet2', :title_column=>1, :column_skip=>2, :title_row=>1, :row_skip=>2)
 chart.load_data reader
 
-chart.save 'output/test.svg'
-chart.save 'output/test.xaml', :xaml
-chart.save 'output/test.eps', :eps
-chart.save 'output/test.emf', :emf if defined? IRONRUBY_VERSION
+chart.save 'output/line_chart.svg'
+chart.save 'output/line_chart.xaml', :xaml
+chart.save 'output/line_chart.eps', :eps
+chart.save 'output/line_chart.emf', :emf if defined? IRONRUBY_VERSION

data/examples/logo.rb

@@ -1,5 +1,7 @@
+# -*- encoding: UTF-8 -*-
+
 require 'rubygems'
-require '../lib/dyi'
+require 'dyi'
 
 canvas = DYI::Drawing::Canvas.new(287.008, 162.637)
 

data/examples/pie_chart.rb

@@ -1,6 +1,7 @@
 # -*- encoding: UTF-8 -*-
 
-require '../lib/dyi'
+require 'rubygems'
+require 'dyi'
 
 chart = DYI::Chart::PieChart.new 400,500,
   :data_label_format => "{name}\n{percent}",
@@ -13,7 +14,7 @@ chart = DYI::Chart::PieChart.new 400,500,
 reader = DYI::Chart::ExcelReader.read('data/currency.xlsx', :title_column=>0, :column_skip=>1)
 chart.load_data reader
 
-chart.save 'output/test.svg'
-chart.save 'output/test.xaml', :xaml
-chart.save 'output/test.eps', :eps
-chart.save 'output/test.emf', :emf if defined? IRONRUBY_VERSION
+chart.save 'output/pie_chart.svg'
+chart.save 'output/pie_chart.xaml', :xaml
+chart.save 'output/pie_chart.eps', :eps
+chart.save 'output/pie_chart.emf', :emf if defined? IRONRUBY_VERSION

data/examples/simple_shapes.rb

@@ -1,4 +1,7 @@
-require '../lib/dyi'
+# -*- encoding: UTF-8 -*-
+
+require 'rubygems'
+require 'dyi'
 
 canvas = DYI::Drawing::Canvas.new(500, 500)
 
@@ -12,4 +15,4 @@ brush.draw_circle(canvas, center_point, 20)
 pen = DYI::Drawing::Pen.new(:color => '#CCFFCC', :width => 5)
 pen.draw_line(canvas, [150,70], [80,140])
 
-canvas.save 'output/test.svg'
+canvas.save 'output/simple_shape.svg'

data/lib/dyi.rb

@@ -21,7 +21,8 @@
 
 
 module DYI
-  VERSION = '0.0.0'
+  VERSION = '0.0.2'
+  URL = 'http://sourceforge.net/projects/dyi/'
 end
 
 %w(

data/lib/dyi/chart/pie_chart.rb

@@ -75,7 +75,7 @@ module DYI #:nodoc:
         if represent_3d?
           brush = Drawing::ColumnBrush.new(back_translate_value.merge(chart_stroke_color ? {:stroke_width => chart_stroke_width, :stroke => chart_stroke_color} : {}))
         else
-          brush = Drawing::Brush.new(chart_stroke_color ? {:stroke_width => chart_stroke_width, :stroke => chart_stroke_color, :stroke_miterlimit => chart_stroke_width / 2.0} : {})
+          brush = Drawing::Brush.new(chart_stroke_color ? {:stroke_width => chart_stroke_width, :stroke => chart_stroke_color, :stroke_miterlimit => chart_stroke_width} : {})
         end
         @chart_canvas = Shape::ShapeGroup.draw_on(@canvas)
         @data_label_canvas = Shape::ShapeGroup.draw_on(@canvas)
@@ -129,11 +129,11 @@ module DYI #:nodoc:
           legend_point = Coordinate.new(
             chart_radius_x * (data_label_position + (dr || 0)) * Math.cos(((accumulation * 2.0 + value) / total_value - 0.5) * Math::PI),
             chart_radius_y * (data_label_position + (dr || 0)) * Math.sin(((accumulation * 2.0 + value) / total_value - 0.5) * Math::PI))
-          Drawing::Pen.black_pen(:font => legend_font).draw_text(
+          Drawing::Pen.black_pen(:font => data_label_font).draw_text(
             @data_label_canvas,
             center_point + legend_point,
             data_label_format.gsub(/\{name\}/, name).gsub(/\{value\}/, value.to_s).gsub(/\{percent\}/, '%.1f%' % (ratio * 100.0).to_s),
-            :text_anchor => 'middle', :font => data_label_font)
+            :text_anchor => 'middle')
         end if hide_data_label_ratio < ratio
       end
     end

data/lib/dyi/formatter/base.rb

@@ -175,7 +175,7 @@ module DYI #:nodoc:
       end
 
       def generator_comment
-        %Q{<!-- Create with DYI #{VERSION} (http://xxxx/) -->}
+        %Q{<!-- Create with DYI #{DYI::VERSION} (#{DYI::URL}) -->}
       end
 
       def declaration

data/lib/dyi/formatter/eps_formatter.rb

@@ -29,6 +29,7 @@ module DYI #:nodoc:
       def header_comment
         <<-EOS
 %!PS-Adobe-3.0 EPSF-3.0
+%%Creator: DYI #{DYI::VERSION} (#{DYI::URL})
 %%CreationDate: #{Time.now.strftime('%a %b %d %H:%M:%S %Y')}
 %%BoundingBox: 0 0 #{@canvas.real_width.to_f('pt').ceil}  #{@canvas.real_height.to_f('pt').ceil}
 %%EndComments

data/lib/dyi/formatter/svg_reader.rb

@@ -19,6 +19,7 @@
 # You should have received a copy of the GNU General Public License
 # along with DYI.  If not, see <http://www.gnu.org/licenses/>.
 
+require 'enumerator'
 require 'rexml/document'
 
 module DYI #:nodoc:
@@ -70,42 +71,75 @@ module DYI #:nodoc:
 
         def create_path(element)
           color = DYI::Color.new(element.attributes['fill']) if element.attributes['fill'] != 'none'
-          pathes = element.attributes['d'].scan(/(M|L|l|H|h|V|v|C|c|z)\s*(\s*(?:\s*,?[\-\.0-9]+)*)/)
-          path = nil
-          if pathes.first.first == 'M'
-            pathes.each do |p_el|
-              coors = p_el[1].scan(/-?[\.0-9]+/).map {|s| s.to_f}
-              case p_el.first
-              when 'M'
-                if path
-                  path.move_to(coors)
-                else
-                  path = DYI::Shape::Path.new(coors, :painting => {:fill => color})
+          paths = element.attributes['d'].scan(/([MmZzLlHhVvCcSsQqTtAa])\s*([+-]?(?:\d+\.?\d*|\.\d+)(?:\s*,?\s*[+-]?(?:\d+\.?\d*|\.\d+))*)?/)
+          enumerator = paths.each
+          path_element = enumerator.next
+          if path_element.first.upcase == 'M'
+            lengths = path_element[1].scan(/[+-]?(?:\d+\.?\d*|\.\d+)/).map{|n| DYI::Length.new(n)}
+            return if lengths.count % 2 == 1
+            points = lengths.each_slice(2).map{|x, y| DYI::Coordinate.new(x, y)}
+            path_data = DYI::Shape::Path::PathData.new(*points)
+            loop do
+              path_element = enumerator.next
+              case path_element.first
+              when 'M', 'm', 'L', 'l', 'C', 'c', 'S', 's', 'Q', 'q', 'T', 't'
+                lengths = path_element[1].scan(/[+-]?(?:\d+\.?\d*|\.\d+)/).map{|n| DYI::Length.new(n)}
+                return unless lengths.size % 2 == 0
+                command_type = case path_element.first
+                                 when 'M' then :move_to
+                                 when 'm' then :rmove_to
+                                 when 'L' then :line_to
+                                 when 'l' then :rline_to
+                                 when 'C' then :curve_to
+                                 when 'c' then :rcurve_to
+                                 when 'S' then :shorthand_curve_to
+                                 when 's' then :rshorthand_curve_to
+                                 when 'Q' then :quadratic_curve_to
+                                 when 'q' then :rquadratic_curve_to
+                                 when 'T' then :shorthand_quadratic_curve_to
+                                 when 't' then :rshorthand_quadratic_curve_to
+                               end
+                points = lengths.each_slice(2).map{|x, y| DYI::Coordinate.new(x, y)}
+                path_data.push_command(command_type, *points)
+              when 'Z', 'z'
+                path_data.push_command(:close_path, *lengths)
+              when 'H', 'h', 'V', 'v'
+                lengths = path_element[1].scan(/[+-]?(?:\d+\.?\d*|\.\d+)/).map{|n| DYI::Length.new(n)}
+                command_type = case path_element.first
+                                 when 'H' then :horizontal_lineto_to
+                                 when 'h' then :rhorizontal_lineto_to
+                                 when 'V' then :vertical_lineto_to
+                                 when 'v' then :rvertical_lineto_to
+                               end
+                path_data.push_command(command_type, *lengths)
+              when 'A', 'a'
+                params = []
+                enumerator = path_element[1].scan(/[+-]?(?:\d+\.?\d*|\.\d+)/).each
+                return unless enumerator.count % 7 == 0
+                loop do
+                  rx = enumerator.next
+                  ry = enumerator.next
+                  rotation = enumerator.next
+                  is_large_arc = enumerator.next
+                  is_clockwise = enumerator.next
+                  cx = enumerator.next
+                  cy = enumerator.next
+                  params << DYI::Length.new(rx) << DYI::Length.new(ry)
+                  params << rotation.to_f
+                  [is_large_arc, is_clockwise].each do |flg|
+                    case flg
+                      when '0' then params << false
+                      when '1' then params << true
+                      else return
+                    end
+                  end
+                  params << Coordinate.new(cx, cy)
                 end
-              when 'L'
-                path.line_to(coors)
-              when 'l'
-                path.line_to(coors, true)
-              when 'H'
-    p 'H'
-                path.line_to([coors.first, path.current_point.y])
-              when 'h'
-                path.line_to([coors.first, 0], true)
-              when 'V'
-    p 'V'
-                path.line_to([path.current_point.x, coors.first])
-              when 'v'
-                path.line_to([0, coors.first], true)
-              when 'C'
-                path.curve_to([coors[0..1], coors[2..3], coors[4..5]])
-              when 'c'
-                path.curve_to([coors[0..1], coors[2..3], coors[4..5]], true)
-              when 'z'
-                path.close_path
+                path_data.push_command(path_element.first == 'A' ? :arc_to : :rarc_to, *params)
               end
             end
           end
-          path
+          DYI::Shape::Path.new(path_data, :painting => {:fill => color})
         end
       end
     end

data/lib/dyi/formatter/xaml_formatter.rb

@@ -286,7 +286,7 @@ module DYI #:nodoc:
           if linejoin = STROKE_LINE_JOIN[painting.stroke_linejoin]
             attr[:StrokeLineJoin] = linejoin
           end
-          attr[:StrokeMitterLimit] = painting.stroke_miterlimit if painting.stroke_miterlimit
+          attr[:StrokeMiterLimit] = painting.stroke_miterlimit if painting.stroke_miterlimit
           if painting.stroke_width
             attr[:StrokeThickness] = painting.stroke_width.to_user_unit
           end

data/lib/dyi/painting.rb

@@ -134,7 +134,7 @@ module DYI #:nodoc:
     end
 
     def stroke_miterlimit=(miterlimit)
-      @stroke_miterlimit = miterlimit.nil? ? nil : miterlimit.to_f
+      @stroke_miterlimit = miterlimit.nil? ? nil : [miterlimit.to_f, 1].max
     end
 
     def stroke_dasharray=(array)

data/lib/dyi/shape.rb

@@ -391,7 +391,10 @@ module DYI #:nodoc:
       attr_painting :painting
 
       def initialize(start_point, options={})
-        @path_data = PathData.new(start_point)
+        @path_data = case start_point
+                       when PathData then start_point
+                       else PathData.new(start_point)
+                     end
         @attributes = init_attributes(options)
       end
 
@@ -946,7 +949,7 @@ module DYI #:nodoc:
         end
 
         def to_compatible_commands(preceding_command)
-          LineCommand.new(relative?, preceding_command, pt)
+          LineCommand.new(relative?, preceding_command, @point)
         end
 
         def to_concise_syntax_fragments
@@ -964,7 +967,7 @@ module DYI #:nodoc:
         end
 
         def to_compatible_commands(preceding_command)
-          LineCommand.new(relative?, preceding_command, pt)
+          LineCommand.new(relative?, preceding_command, @point)
         end
 
         def to_concise_syntax_fragments

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dyi
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Yuo
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-15 00:00:00 Z
+date: 2011-09-05 00:00:00 Z
 dependencies: []
 
 description: "    DYI is a 2D graphics library, very rich and expressive.\n    DYI have been optimized for SVG format, but it is also possible\n    to output other format; for example, EPS.\n"
@@ -27,6 +27,7 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- CHANGES
 - COPYING
 - examples/class_diagram.rb
 - examples/data/03311056.xlsx