technical_graph 0.0.2 → 0.0.3

data/Gemfile

@@ -1,11 +1,12 @@
 source "http://rubygems.org"
 
 gem 'rmagick'
-gem 'jeweler'
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
+  gem 'jeweler'
+
   gem "shoulda"
   gem "bundler", "~> 1.0.0"
   gem "rspec"

data/README.md

@@ -18,6 +18,7 @@ or
 > tg = TechnicalGraph.new( options )
 
 where:
+
 * options - Hash of parameters, all parameters are described below.
 
 2. Add layer
@@ -29,6 +30,7 @@ or
 > tg.add_layer(layer_data, layer_params)
 
 where:
+
 * layer_data - Array of Hashes, like [{:x => 0, :y => 0}, {:x => 1, :y => 1}, ...]
 * layer_params - Hash of other parameters, all parameters will be described later.
 
@@ -47,7 +49,7 @@ or get image binary content.
 where format is image format, ex. 'png', 'jpeg', ...
 
 
-Option's Hash
+Options Hash
 -------------
 
 Default ranges:
@@ -100,6 +102,26 @@ Possible #RRGGBB or color names (ex. 'white').
 * options[:background_hatch_color] - background hatch color
 * options[:axis_color] - color of axis
 
+Anti-aliasing:
+
+* options[:axis_antialias] - use anti-aliasing for axis, default false
+* options[:layers_antialias] - use anti-aliasing for data layers, default false, can be override using layer option
+* options[:font_antialias] - use anti-aliasing for all fonts, default false
+
+Font size:
+
+* options[:layers_font_size] - size of font used for values in graph
+* options[:axis_font_size] - size of font used in axis
+* options[:axis_label_font_size] - size of font used in options[:x_axis_label] and options[:y_axis_label]
+
+
+
+Layer options Hash
+------------------
+
+* layer_options[:color] - color of graph layer, ex.: 'red', 'green', '#FFFF00'
+* layer_options[:antialias] - use anti-aliasing for this, default false, override options[:layers_antialias]
+
 
 Contributing to technical-graph
 -------------------------------

data/Rakefile

@@ -19,7 +19,7 @@ Jeweler::Tasks.new do |gem|
   gem.homepage = "http://github.com/akwiatkowski/technical_graph"
   gem.license = "LGPLv3"
   gem.summary = %Q{Create simple and neat graphs}
-  gem.description = %Q{Create simple and neat graphs}
+  gem.description = %Q{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.}
   gem.email = "bobikx@poczta.fm"
   gem.authors = ["Aleksander Kwiatkowski"]
 

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/lib/technical_graph/data_layer.rb

@@ -7,8 +7,7 @@
 class DataLayer
 
   def initialize(d = [], options = { })
-    @options = options
-    @data_params = Hash.new
+    @data_params = options
 
     # set data and append initial data
     clear_data
@@ -38,7 +37,7 @@ class DataLayer
   end
 
   def antialias
-    return @data_params[:antialias] == false
+    return @data_params[:antialias]
   end
 
   # Clear data
@@ -54,7 +53,6 @@ class DataLayer
     @data.delete_if { |d| d[:x].nil? or d[:y].nil? }
     @data.sort! { |d, e| d[:x] <=> e[:x] }
 
-    @data_params = Hash.new
     # default X values, if data is not empty
     if @data.size > 0
       @data_params[:x_min] = @data.first[:x] || @options[:default_x_min]

data/lib/technical_graph/graph_axis.rb

@@ -107,6 +107,7 @@ class GraphAxis
     plot_axis_y_line.stroke_linecap('square')
     plot_axis_y_line.stroke_linejoin('miter')
 
+    plot_axis_y_text.pointsize(options[:axis_font_size])
     plot_axis_y_text.font_family('helvetica')
     plot_axis_y_text.font_style(Magick::NormalStyle)
     plot_axis_y_text.text_align(Magick::LeftAlign)
@@ -150,6 +151,7 @@ class GraphAxis
     plot_axis_x_line.stroke_linecap('square')
     plot_axis_x_line.stroke_linejoin('miter')
 
+    plot_axis_x_text.pointsize(options[:axis_font_size])
     plot_axis_x_text.font_family('helvetica')
     plot_axis_x_text.font_style(Magick::NormalStyle)
     plot_axis_x_text.text_align(Magick::LeftAlign)
@@ -165,7 +167,7 @@ class GraphAxis
       string_label = "#{truncate_string % x}"
 
       plot_axis_x_text.text(
-        bx.round + 15,
+        bx.round + 5,
         @image.rows - 15,
         string_label
       )
@@ -194,6 +196,7 @@ class GraphAxis
     plot_axis_y_line.stroke_linecap('square')
     plot_axis_y_line.stroke_linejoin('miter')
 
+    plot_axis_y_text.pointsize(options[:axis_font_size])
     plot_axis_y_text.font_family('helvetica')
     plot_axis_y_text.font_style(Magick::NormalStyle)
     plot_axis_y_text.text_align(Magick::LeftAlign)
@@ -232,6 +235,7 @@ class GraphAxis
     plot_axis_x_line.stroke_linecap('square')
     plot_axis_x_line.stroke_linejoin('miter')
 
+    plot_axis_x_text.pointsize(options[:axis_font_size])
     plot_axis_x_text.font_family('helvetica')
     plot_axis_x_text.font_style(Magick::NormalStyle)
     plot_axis_x_text.text_align(Magick::LeftAlign)
@@ -260,6 +264,7 @@ class GraphAxis
       plot_axis_text = Magick::Draw.new
       plot_axis_text.text_antialias(axis_antialias)
 
+      plot_axis_text.pointsize(options[:axis_label_font_size])
       plot_axis_text.font_family('helvetica')
       plot_axis_text.font_style(Magick::NormalStyle)
       plot_axis_text.text_align(Magick::LeftAlign)
@@ -277,6 +282,7 @@ class GraphAxis
       plot_axis_text = Magick::Draw.new
       plot_axis_text.text_antialias(axis_antialias)
 
+      plot_axis_text.pointsize(options[:axis_label_font_size])
       plot_axis_text.font_family('helvetica')
       plot_axis_text.font_style(Magick::NormalStyle)
       plot_axis_text.text_align(Magick::LeftAlign)

data/lib/technical_graph/graph_image_drawer.rb

@@ -37,6 +37,10 @@ class GraphImageDrawer
     options[:truncate_string]
   end
 
+  def axis_font_size
+    options[:axis_font_size]
+  end
+
 
   # default sizes
   DEFAULT_WIDTH = 1600
@@ -52,6 +56,16 @@ class GraphImageDrawer
     options[:background_color] ||= 'white'
     options[:background_hatch_color] ||= 'lightcyan2'
     options[:axis_color] ||= '#aaaaaa'
+
+    # antialias
+    options[:layers_antialias] = false if options[:layers_antialias].nil?
+    options[:axis_antialias] = false if options[:axis_antialias].nil?
+    options[:font_antialias] = false if options[:font_antialias].nil?
+
+    # font sizes
+    options[:axis_font_size] ||= 10
+    options[:layers_font_size] ||= 10
+    options[:axis_label_font_size] ||= 10
   end
 
   def width
@@ -111,7 +125,11 @@ class GraphImageDrawer
     layer_line = Magick::Draw.new
     layer_text = Magick::Draw.new
 
-    layer_line.stroke_antialias(l.antialias)
+    # global layer antialias can be override using layer option
+    layer_antialias = l.antialias
+    layer_antialias = options[:layers_antialias] if layer_antialias.nil?
+
+    layer_line.stroke_antialias(layer_antialias)
     layer_line.fill(l.color)
     layer_line.fill_opacity(1)
     layer_line.stroke(l.color)
@@ -121,7 +139,7 @@ class GraphImageDrawer
     layer_line.stroke_linejoin('miter')
 
     layer_text.text_antialias(font_antialias)
-    layer_text.pointsize(10)
+    layer_text.pointsize(options[:layers_font_size])
     layer_text.font_family('helvetica')
     layer_text.font_style(Magick::NormalStyle)
     layer_text.text_align(Magick::LeftAlign)

data/technical_graph.gemspec

@@ -5,12 +5,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{technical_graph}
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Aleksander Kwiatkowski"]
-  s.date = %q{2011-09-22}
-  s.description = %q{Create simple and neat graphs}
+  s.date = %q{2011-09-24}
+  s.description = %q{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.}
   s.email = %q{bobikx@poczta.fm}
   s.extra_rdoc_files = [
     "LICENSE.txt",
@@ -37,6 +37,7 @@ Gem::Specification.new do |s|
     "lib/technical_graph/refactoring_backup/test/test_technical_graph.rb",
     "lib/technical_graph/refactoring_backup/test/test_technical_graph_axis.rb",
     "samples/1.png",
+    "samples/home_io_batt_voltage.png",
     "technical_graph.gemspec",
     "test/helper.rb",
     "test/test_technical_graph.rb",
@@ -54,7 +55,7 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rmagick>, [">= 0"])
-      s.add_runtime_dependency(%q<jeweler>, [">= 0"])
+      s.add_development_dependency(%q<jeweler>, [">= 0"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<rspec>, [">= 0"])

data/test/test_technical_simple_graph.rb

@@ -10,6 +10,14 @@ class TestTechnicalGraph < Test::Unit::TestCase
           :x_axis_label => 'x',
           :y_axis_label => 'y',
 
+          :axis_antialias => true,
+          :layers_antialias => true,
+          :font_antialias => true,
+
+          :layers_font_size => 6,
+          :axis_font_size => 8,
+          :axis_label_font_size => 20,
+
           #:x_axis_count => 20,
           #:y_axis_count => 20,
           #:x_axis_interval => 1.0,
@@ -31,7 +39,9 @@ class TestTechnicalGraph < Test::Unit::TestCase
 
       # adding simple layer
       layer_params = {
-        :antialias => true
+        :antialias => false,
+        #:color => 'red'
+        :color => '#FFFF00'
       }
       layer_data = Array.new
       (0..max).each do |i|

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: technical_graph
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Aleksander Kwiatkowski
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-22 00:00:00 +02:00
+date: 2011-09-24 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -33,7 +33,7 @@ dependencies:
   version_requirements: *id001
   prerelease: false
 - !ruby/object:Gem::Dependency 
-  type: :runtime
+  type: :development
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -118,7 +118,7 @@ dependencies:
   name: rcov
   version_requirements: *id007
   prerelease: false
-description: Create simple and neat graphs
+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: []
 
@@ -148,6 +148,7 @@ files:
 - lib/technical_graph/refactoring_backup/test/test_technical_graph.rb
 - lib/technical_graph/refactoring_backup/test/test_technical_graph_axis.rb
 - samples/1.png
+- samples/home_io_batt_voltage.png
 - technical_graph.gemspec
 - test/helper.rb
 - test/test_technical_graph.rb