technical_graph 0.5.1 → 0.6.0

data/lib/technical_graph/graph_color_library.rb

@@ -10,10 +10,10 @@ class GraphColorLibrary
   # rock solid colors
   # http://www.imagemagick.org/script/color.php
   BASIC_COLORS = [
-    'blue',
-    'red',
-    'green',
-    'purple'
+    '#0000FF', #'blue',
+    '#FF0000', #'red',
+    '#00FF00', #'green',
+    '#FF00FF', #'purple'
   ]
 
   # other random picked up, SVG need #RGB and I'm too lazy :]
@@ -39,7 +39,7 @@ class GraphColorLibrary
                #'firebrick3'
   ]
 
-  FAIL_COLOR = 'black'
+  FAIL_COLOR = '#000000' #'black'
 
   def initialize
     reset

data/lib/technical_graph/graph_data_processor.rb

@@ -49,10 +49,12 @@ class GraphDataProcessor
 
     # when set enlarge image so axis are located in sensible distance between themselves
     options[:axis_density_enlarge_image] = false if options[:axis_density_enlarge_image].nil?
+    options[:x_axis_density_enlarge_image] = false if options[:x_axis_density_enlarge_image].nil?
+    options[:y_axis_density_enlarge_image] = false if options[:y_axis_density_enlarge_image].nil?
     # distance in pixels
     options[:x_axis_min_distance] ||= 30
     # distance in pixels
-    options[:y_axis_min_distance] ||= 50
+    options[:y_axis_min_distance] ||= 30
 
     # default truncate string used for rendering numbers
     options[:truncate_string] ||= "%.2f"

data/lib/technical_graph/graph_image_drawer.rb

@@ -17,26 +17,26 @@ class GraphImageDrawer
 
   # Which type of drawing class use?
   def drawing_class
-    if options[:drawer_class] == :rmagick and rmagick_installed?
-      require 'technical_graph/graph_image_drawer_rmagick'
-      return GraphImageDrawerRmagick
-    end
-
     if options[:drawer_class] == :rasem
       require 'technical_graph/graph_image_drawer_rasem'
       return GraphImageDrawerRasem
     end
 
+    if options[:drawer_class] == :chunky_png
+      require 'technical_graph/graph_image_drawer_chunky'
+      return GraphImageDrawerChunky
+    end
+
+    if options[:drawer_class] == :rmagick and rmagick_installed?
+      require 'technical_graph/graph_image_drawer_rmagick'
+      return GraphImageDrawerRmagick
+    end
+
     # default
     require 'technical_graph/graph_image_drawer_rasem'
     return GraphImageDrawerRasem
   end
 
-  # Check if rmagick is installed
-  def rmagick_installed?
-    return Gem.source_index.find_name('rmagick').size > 0
-  end
-
   # Best output image format, used for testing
   def best_output_format
     @technical_graph.best_output_format
@@ -81,6 +81,9 @@ class GraphImageDrawer
   DEFAULT_WIDTH = 1600
   DEFAULT_HEIGHT = 1200
 
+  @@default_width = DEFAULT_WIDTH
+  @@default_height = DEFAULT_HEIGHT
+
   def initialize(technical_graph)
     @technical_graph = technical_graph
 
@@ -90,8 +93,8 @@ class GraphImageDrawer
     #options[:drawer_class] ||= :rmagick
     options[:drawer_class] ||= :rasem
 
-    options[:width] ||= DEFAULT_WIDTH
-    options[:height] ||= DEFAULT_HEIGHT
+    options[:width] ||= @@default_width
+    options[:height] ||= @@default_height
 
     options[:axis_value_and_param_labels] = true if options[:axis_value_and_param_labels].nil?
     options[:axis_zero_labels] = true if options[:axis_zero_labels].nil?
@@ -143,6 +146,26 @@ class GraphImageDrawer
     options[:height] = h.to_i if h.to_i > 0
   end
 
+  # Get default graph width
+  def self.width
+    @@default_width
+  end
+
+  # Get default graph height
+  def self.height
+    @@default_height
+  end
+
+  # Set default graph width
+  def self.width=(w)
+    @@default_width = w.to_i if w.to_i > 0
+  end
+
+  # Set default graph height
+  def self.height=(h)
+    @@default_height = h.to_i if h.to_i > 0
+  end
+
   def antialias
     options[:antialias] == true
   end

data/lib/technical_graph/graph_image_drawer_chunky.rb

@@ -0,0 +1,161 @@
+#encoding: utf-8
+
+require 'technical_graph/graph_image_drawer_module'
+require 'rubygems'
+require 'chunky_png'
+require 'oily_png' if gem_available? 'oily_png'
+
+class GraphImageDrawerChunky
+  include GraphImageDrawerModule
+
+  # Initialize blank image
+  def create_blank_image
+    @image = ChunkyPNG::Image.new(width, height, ChunkyPNG::Color::WHITE)
+  end
+
+  # Draw both array axis
+  def axis(x_array, y_array, _options = { :color => 'black', :width => 1 }, render_labels = false, x_labels = [], y_labels = [])
+    # for single axis
+    x_array = [x_array] if not x_array.kind_of? Array
+    y_array = [y_array] if not y_array.kind_of? Array
+
+    x_array.each_with_index do |x, i|
+      @image.line(x, 0, x, height, ChunkyPNG::Color.from_hex(_options[:color]))
+
+      # labels
+      # chunky_png probably can't write text
+
+      #label = x_labels[i]
+      #if render_labels and not label.nil?
+      #  label = "#{truncate_string % label}"
+      #  plot_axis_text.text(x + 15, height - 15, label)
+      #end
+    end
+
+    y_array.each_with_index do |y, i|
+      @image.line(0, y, width, y, ChunkyPNG::Color.from_hex(_options[:color]))
+
+      # labels
+      #label = y_labels[i]
+      #if render_labels and not label.nil?
+      #  label = "#{truncate_string % label}"
+      #  plot_axis_text.text(15, y + 15, label)
+      #end
+    end
+
+  end
+
+  # Label for parameters and values
+  def axis_labels(parameter_label, value_label, _options = { :color => 'black', :width => 1, :size => 20 })
+    # chunky_png probably can't write text
+
+    #if options[:x_axis_label].to_s.size > 0
+    #  plot = axis_labels_draw_object
+    #  plot.stroke(_options[:color])
+    #  plot.stroke_width(_options[:width])
+    #
+    #  plot.text(
+    #    (width / 2).to_i,
+    #    height - 40,
+    #    options[:x_axis_label].to_s
+    #  )
+    #  plot.draw(@image)
+    #end
+    #
+    #
+    #if options[:y_axis_label].to_s.size > 0
+    #  plot = axis_labels_draw_object
+    #  plot.stroke(_options[:color])
+    #  plot.stroke_width(_options[:width])
+    #  plot = plot.rotate(90)
+    #
+    #  plot.text(
+    #    (height / 2).to_i,
+    #    -40,
+    #    options[:y_axis_label].to_s
+    #  )
+    #  plot.draw(@image)
+    #end
+  end
+
+  def render_data_layer(l, coords)
+    # chunky_png probably can't write text
+
+    ## value labels
+    #if l.value_labels
+    #  plot = layer_no_stroke(layer_value_labels_draw_object(l))
+    #  coords.each do |c|
+    #    string_label = "#{truncate_string % c[:dy]}"
+    #    plot.text(
+    #      c[:ax] + 5, c[:ay],
+    #      string_label
+    #    )
+    #  end
+    #  plot.draw(@image)
+    #end
+
+    # lines and dots
+    coords.each do |c|
+      # additional circle
+      #plot.circle(c[:ax], c[:ay], c[:ax] + 2, c[:ay])
+      #plot.circle(c[:bx], c[:by], c[:bx] + 2, c[:by])
+
+      # line
+      @image.line(c[:ax], c[:ay], c[:bx], c[:by], ChunkyPNG::Color.from_hex(l.color))
+    end
+  end
+
+
+  def legend(legend_data)
+    # chunky_png probably can't write text
+
+    #legend_text_offset = (options[:legend_font_size] / 2.0).round - 4
+    #
+    #legend_data.each do |l|
+    #  plot = axis_draw_object
+    #  plot_text = layer_no_stroke(plot)
+    #
+    #  plot.fill(l[:color])
+    #  plot.stroke(l[:color])
+    #  plot_text.fill(l[:color])
+    #  plot_text.pointsize(options[:legend_font_size])
+    #
+    #  plot.circle(l[:x], l[:y], l[:x] + 2, l[:y])
+    #  plot_text.text(l[:x] + 5, l[:y] + legend_text_offset, l[:label])
+    #
+    #  plot.draw(@image)
+    #  plot_text.draw(@image)
+    #end
+  end
+
+  def close
+    # only for compatibility
+    @closed = true
+  end
+
+  def closed?
+    @closed
+  end
+
+  # Save output to file
+  def save(file)
+    t = Time.now
+
+    @image.save(file)
+
+    logger.debug "saving image"
+    logger.debug " TIME COST #{Time.now - t}"
+  end
+
+  # Export image
+  def to_format(format)
+    t = Time.now
+    blob = @image.to_blob
+
+    logger.debug "exporting image as string"
+    logger.debug " TIME COST #{Time.now - t}"
+
+    return blob
+  end
+
+end

data/lib/technical_graph/graph_image_drawer_rmagick.rb

@@ -125,7 +125,9 @@ class GraphImageDrawerRmagick
     if options[:x_axis_label].to_s.size > 0
       plot = axis_labels_draw_object
       plot.stroke(_options[:color])
-      plot.stroke_width(_options[:width])
+      plot.stroke_width(0.0)
+      plot.fill_opacity(1.0)
+      plot.stroke_opacity(0.0)
 
       plot.text(
         (width / 2).to_i,
@@ -139,7 +141,9 @@ class GraphImageDrawerRmagick
     if options[:y_axis_label].to_s.size > 0
       plot = axis_labels_draw_object
       plot.stroke(_options[:color])
-      plot.stroke_width(_options[:width])
+      plot.stroke_width(0.0)
+      plot.fill_opacity(1.0)
+      plot.stroke_opacity(0.0)
       plot = plot.rotate(90)
 
       plot.text(

metadata

@@ -1,133 +1,135 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: technical_graph
-version: !ruby/object:Gem::Version 
-  hash: 9
+version: !ruby/object:Gem::Version
+  version: 0.6.0
   prerelease: 
-  segments: 
-  - 0
-  - 5
-  - 1
-  version: 0.5.1
 platform: ruby
-authors: 
+authors:
 - Aleksander Kwiatkowski
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-12-11 00:00:00 +01:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-05-26 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rasem
+  requirement: &23351560 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *23351560
+- !ruby/object:Gem::Dependency
+  name: chunky_png
+  requirement: &23350860 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  name: rasem
-  version_requirements: *id001
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
   prerelease: false
-- !ruby/object:Gem::Dependency 
-  type: :development
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *23350860
+- !ruby/object:Gem::Dependency
+  name: rmagick
+  requirement: &23350140 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  name: rdoc
-  version_requirements: *id002
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
   prerelease: false
-- !ruby/object:Gem::Dependency 
-  type: :development
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *23350140
+- !ruby/object:Gem::Dependency
+  name: oily_png
+  requirement: &23349380 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  name: shoulda
-  version_requirements: *id003
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *23349380
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: &23348320 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
-- !ruby/object:Gem::Dependency 
+  version_requirements: *23348320
+- !ruby/object:Gem::Dependency
+  name: shoulda
+  requirement: &23347480 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *23347480
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: &23346800 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.0.0
-  name: bundler
-  version_requirements: *id004
-  prerelease: false
-- !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  name: rspec
-  version_requirements: *id005
   prerelease: false
-- !ruby/object:Gem::Dependency 
-  type: :development
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *23346800
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &23346180 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  name: jeweler
-  version_requirements: *id006
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
-- !ruby/object:Gem::Dependency 
+  version_requirements: *23346180
+- !ruby/object:Gem::Dependency
+  name: jeweler
+  requirement: &23320780 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *23320780
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: &23320140 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  name: rcov
-  version_requirements: *id007
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
-description: Purpose of this gem is to create neat, simple, technical graphs. This is alternative to most new libraries which create small, candy graphs using JavaScript.
+  version_requirements: *23320140
+description: Purpose of this gem is to create neat, simple, technical graphs. This
+  is alternative to most new libraries which create small, candy graphs using JavaScript.
 email: bobikx@poczta.fm
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.txt
 - README.md
-files: 
+files:
 - DOCUMENTATION.md
 - DOCUMENTATION.textile
 - Gemfile
@@ -143,59 +145,41 @@ files:
 - lib/technical_graph/data_layer_processor_noise_removal.rb
 - lib/technical_graph/data_layer_processor_simple_smoother.rb
 - lib/technical_graph/data_point.rb
+- lib/technical_graph/gem.rb
 - lib/technical_graph/graph_axis.rb
 - lib/technical_graph/graph_color_library.rb
 - lib/technical_graph/graph_data_processor.rb
 - lib/technical_graph/graph_image_drawer.rb
+- lib/technical_graph/graph_image_drawer_chunky.rb
 - lib/technical_graph/graph_image_drawer_module.rb
 - lib/technical_graph/graph_image_drawer_rasem.rb
 - lib/technical_graph/graph_image_drawer_rmagick.rb
-- test/helper.rb
-- test/test_technical_autocolor.rb
-- test/test_technical_axis_enlarge.rb
-- test/test_technical_fix1.rb
-- test/test_technical_graph.rb
-- test/test_technical_graph_axis.rb
-- test/test_technical_multilayer.rb
-- test/test_technical_noise_removal.rb
-- test/test_technical_rasem.rb
-- test/test_technical_readme.rb
-- test/test_technical_simple_graph.rb
-- test/test_technical_smoother.rb
-- test/test_technical_smoother_adv.rb
-has_rdoc: true
 homepage: http://github.com/akwiatkowski/technical_graph
-licenses: 
+licenses:
 - LGPLv3
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 1155677963396469989
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Create simple and neat graphs
 test_files: []
-