technical_graph 0.1.0 → 0.1.1

data/README.md

@@ -114,6 +114,12 @@ Font size:
 * 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]
 
+Sometime because of axis options and large amount of data, axis can be put densely on graph. Turning this option graph
+size will be enlarged to maintain set distanced between axis.
+
+* options[:axis_density_enlarge_image] - turn this options on
+* options[:x_axis_min_distance] - minimum distance between X axis, default 30 pixels
+* options[:y_axis_min_distance] - minimum distance between X axis, default 50 pixels
 
 
 Layer options Hash

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/lib/technical_graph/graph_axis.rb

@@ -74,6 +74,53 @@ class GraphAxis
     end
   end
 
+  # Enlarge image to maintain proper axis density
+  def axis_distance_image_enlarge
+    if options[:axis_density_enlarge_image]
+      x_axis_distance_image_enlarge
+      y_axis_distance_image_enlarge
+    end
+  end
+
+  # Enlarge image to maintain proper axis density
+  def x_axis_distance_image_enlarge
+    a = parameter_axis
+    # must be at least 2 axis
+    return if a.size < 2
+
+    ax = a[0]
+    ax = image_drawer.calc_bitmap_y(ax).round
+    bx = a[1]
+    bx = image_drawer.calc_bitmap_y(bx).round
+
+    axis_distance = (bx - ax).abs
+
+    if axis_distance < options[:x_axis_min_distance]
+      # enlarging image
+      options[:old_width] = options[:width]
+      options[:width] *= (options[:x_axis_min_distance] / axis_distance).ceil
+    end
+  end
+
+  # Enlarge image to maintain proper axis density
+  def y_axis_distance_image_enlarge
+    a = value_axis
+    # must be at least 2 axis
+    return if a.size < 2
+
+    ay = a[0]
+    ay = image_drawer.calc_bitmap_y(ay).round
+    by = a[1]
+    by = image_drawer.calc_bitmap_y(by).round
+
+    axis_distance = (by - ay).abs
+
+    if axis_distance < options[:y_axis_min_distance]
+      # enlarging image
+      options[:old_height] = options[:height]
+      options[:height] *= (options[:y_axis_min_distance] / axis_distance).ceil
+    end
+  end
 
   # Render axis on image
   def render_on_image(image)

data/lib/technical_graph/graph_data_processor.rb

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

data/lib/technical_graph/graph_image_drawer.rb

@@ -33,6 +33,11 @@ class GraphImageDrawer
     @technical_graph.data_processor
   end
 
+  # Axis processing
+  def graph_axis
+    @technical_graph.axis
+  end
+
   def truncate_string
     options[:truncate_string]
   end
@@ -103,8 +108,16 @@ class GraphImageDrawer
     return (offset.to_f * height.to_f) / l.to_f
   end
 
+  # Everything that must be done before creating image
+  def pre_image_create_calculations
+    # check axis density and enlarge if this option is on
+    graph_axis.axis_distance_image_enlarge
+  end
+
   # Create background image
   def crate_blank_graph_image
+    pre_image_create_calculations
+
     @image = Magick::ImageList.new
     @image.new_image(
       width,

data/technical_graph.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{technical_graph}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Aleksander Kwiatkowski"]
-  s.date = %q{2011-09-24}
+  s.date = %q{2011-10-09}
   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 = [
@@ -40,6 +40,7 @@ Gem::Specification.new do |s|
     "samples/home_io_batt_voltage.png",
     "technical_graph.gemspec",
     "test/helper.rb",
+    "test/test_technical_axis_enlarge.rb",
     "test/test_technical_graph.rb",
     "test/test_technical_graph_axis.rb",
     "test/test_technical_simple_graph.rb"

data/test/test_technical_axis_enlarge.rb

@@ -0,0 +1,68 @@
+require 'helper'
+
+class TestTechnicalAxisEnlarge < Test::Unit::TestCase
+  context 'initial options' do
+    should 'enlarge image' do
+      @tg = TechnicalGraph.new(
+        {
+          :truncate_string => "%.1f",
+
+          :x_axis_label => 'x',
+          :y_axis_label => 'y',
+
+          :axis_antialias => true,
+          :layers_antialias => true,
+          :font_antialias => true,
+
+          :layers_font_size => 8,
+          :axis_font_size => 8,
+          :axis_label_font_size => 20,
+
+          :x_axis_count => 50,
+          :y_axis_count => 50,
+          #:x_axis_interval => 1.0,
+          #:y_axis_interval => 1.0,
+          :x_axis_fixed_interval => false,
+          :y_axis_fixed_interval => false,
+
+          #:x_min => -10.0,
+          #:x_max => 10.0,
+          #:y_min => -10.0,
+          #:y_max => 10.0,
+
+          :width => 800,
+          :height => 600,
+
+          :axis_density_enlarge_image => true,
+          :x_axis_min_distance => 50,
+          :y_axis_min_distance => 50,
+        }
+      )
+
+      max = 50
+
+      # adding simple layer
+      layer_params = {
+        :antialias => false,
+        #:color => 'red'
+        :color => '#FFFF00'
+      }
+      layer_data = Array.new
+      (0..max).each do |i|
+        layer_data << { :x => -10.0 + i.to_f, :y => 10.0 * Math.cos(i.to_f * (4.0 * 3.14 / max.to_f)) }
+      end
+      @tg.add_layer(layer_data, layer_params)
+      # should be added
+      @tg.layers.last.data.size.should > 0
+      # checking ranger for layer
+
+      @tg.render
+
+      @tg.image_drawer.save_to_file('test_axis_enlarge.png')
+      @tg.image_drawer.save_to_file('test_axis_enlarge.svg')
+      @tg.image_drawer.to_png.class.should == String
+
+    end
+  end
+
+end

data/test/test_technical_simple_graph.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class TestTechnicalGraph < Test::Unit::TestCase
+class TestTechnicalSimpleGraph < Test::Unit::TestCase
   context 'initial options' do
     should 'draw simple graph' do
       @tg = TechnicalGraph.new(

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: technical_graph
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Aleksander Kwiatkowski
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-24 00:00:00 +02:00
+date: 2011-10-09 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -151,6 +151,7 @@ files:
 - samples/home_io_batt_voltage.png
 - technical_graph.gemspec
 - test/helper.rb
+- test/test_technical_axis_enlarge.rb
 - test/test_technical_graph.rb
 - test/test_technical_graph_axis.rb
 - test/test_technical_simple_graph.rb