technical_graph 0.4.0 → 0.5.0

data/lib/technical_graph/graph_image_drawer_rmagick.rb

@@ -186,6 +186,8 @@ class GraphImageDrawerRmagick
 
 
   def legend(legend_data)
+    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)
@@ -193,9 +195,10 @@ class GraphImageDrawerRmagick
       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], l[:label])
+      plot_text.text(l[:x] + 5, l[:y] + legend_text_offset, l[:label])
 
       plot.draw(@image)
       plot_text.draw(@image)

data/lib/technical_graph.rb

@@ -54,12 +54,13 @@ class TechnicalGraph
 
   # Create graph
   def render
-    @image = @image_drawer.crate_blank_graph_image
-    # recalculate ranges if needed
     @layers.each do |l|
       @data_processor.process_data_layer(l)
     end
 
+    # recalculate ranges if needed
+    @image = @image_drawer.crate_blank_graph_image
+
     # draw axis
     @axis.render_on_image(@image)
     # draw layers

data/test/test_technical_graph_axis.rb

@@ -202,7 +202,9 @@ class TestTechnicalGraphAxis < Test::Unit::TestCase
           :y_axis_interval => 1.0,
           :x_axis_interval => 4.0,
           :x_axis_fixed_interval => true,
-          :y_axis_fixed_interval => true
+          :y_axis_fixed_interval => true,
+
+          :adjust_axis_to_zero => false
         }
       )
 

data/test/test_technical_readme.rb

@@ -2,6 +2,7 @@ require 'helper'
 
 # run only latest test to create new graphs for documentation
 DO_NOT_RUN_OLD_TESTS = true
+README_RENDERED = :rmagick
 
 class TestTechnicalReadme < Test::Unit::TestCase
   context 'generate sample graphs using readme options description' do
@@ -35,7 +36,7 @@ class TestTechnicalReadme < Test::Unit::TestCase
     #
     should 'create simplest graph' do
       return if DO_NOT_RUN_OLD_TESTS
-      @tg = TechnicalGraph.new
+      @tg = TechnicalGraph.new({:drawer_class => README_RENDERED})
       @tg.add_layer(@simple_data_array)
       @tg.render
       file_name = 'samples/readme/01_simplest.png'
@@ -49,7 +50,7 @@ class TestTechnicalReadme < Test::Unit::TestCase
     #
     should 'create 2-layer graph' do
       return if DO_NOT_RUN_OLD_TESTS
-      @tg = TechnicalGraph.new
+      @tg = TechnicalGraph.new({:drawer_class => README_RENDERED})
       @tg.add_layer(@simple_data_array)
       @tg.add_layer(@simple_data_array_b)
       @tg.render
@@ -70,6 +71,7 @@ class TestTechnicalReadme < Test::Unit::TestCase
           :x_max => 10,
           :y_min => -1,
           :y_max => 10,
+          :drawer_class => README_RENDERED
         })
       @tg.add_layer(@simple_data_array)
       @tg.render
@@ -89,7 +91,8 @@ class TestTechnicalReadme < Test::Unit::TestCase
           :x_max => 2,
           :y_min => 1,
           :y_max => 2,
-          :xy_behaviour => :fixed
+          :xy_behaviour => :fixed,
+          :drawer_class => README_RENDERED
         })
       @tg.add_layer(@simple_data_array)
       @tg.render
@@ -109,6 +112,7 @@ class TestTechnicalReadme < Test::Unit::TestCase
           :y_axis_fixed_interval => false,
           :y_axis_count => 20,
           :x_axis_count => 20,
+          :drawer_class => README_RENDERED
         })
       @tg.add_layer(@simple_data_array)
       @tg.render
@@ -128,6 +132,7 @@ class TestTechnicalReadme < Test::Unit::TestCase
           :y_axis_fixed_interval => true,
           :y_axis_interval => 0.8,
           :x_axis_interval => 0.6,
+          :drawer_class => README_RENDERED
         })
       @tg.axis.x_axis_interval.should == 0.6
       @tg.axis.y_axis_interval.should == 0.8
@@ -155,7 +160,8 @@ class TestTechnicalReadme < Test::Unit::TestCase
         {
           :x_axis_label => 'parameter',
           :y_axis_label => 'value',
-          :axis_label_font_size => 36
+          :axis_label_font_size => 36,
+          :drawer_class => README_RENDERED
         })
       @tg.add_layer(@simple_data_array)
       @tg.render
@@ -172,7 +178,8 @@ class TestTechnicalReadme < Test::Unit::TestCase
       return if DO_NOT_RUN_OLD_TESTS
       @tg = TechnicalGraph.new(
         {
-          :truncate_string => "%.3f"
+          :truncate_string => "%.3f",
+          :drawer_class => README_RENDERED
         })
       @layer_params = {
         :value_labels => true
@@ -191,7 +198,8 @@ class TestTechnicalReadme < Test::Unit::TestCase
       return if DO_NOT_RUN_OLD_TESTS
       @tg = TechnicalGraph.new(
         {
-          :truncate_string => "%.1f"
+          :truncate_string => "%.1f",
+          :drawer_class => README_RENDERED
         })
       @layer_params = {
         :value_labels => true
@@ -207,11 +215,12 @@ class TestTechnicalReadme < Test::Unit::TestCase
     end
 
     should 'test image size' do
-      #return if DO_NOT_RUN_OLD_TESTS
+      return if DO_NOT_RUN_OLD_TESTS
       @tg = TechnicalGraph.new(
         {
           :width => 600,
-          :height => 300
+          :height => 300,
+          :drawer_class => README_RENDERED,
         })
       @tg.add_layer(@simple_data_array)
       @tg.render
@@ -223,6 +232,294 @@ class TestTechnicalReadme < Test::Unit::TestCase
       File.exist?(file_name).should == true
     end
 
+    should 'test colors' do
+      return if DO_NOT_RUN_OLD_TESTS
+      @tg = TechnicalGraph.new(
+        {
+          :background_color => '#000000',
+          :background_hatch_color => '#222222',
+          :axis_color => '#FFFFFF',
+          :drawer_class => README_RENDERED,
+        })
+      @tg.add_layer(@simple_data_array, {:color => '#0000FF'})
+      @tg.render
+      file_name = 'samples/readme/10_colors.png'
+      @tg.image_drawer.save_to_file(file_name)
+
+      # test
+      @tg.image_drawer.to_format(@tg.best_output_format).class.should == String
+      File.exist?(file_name).should == true
+    end
+
+    should 'test renderer' do
+      return if DO_NOT_RUN_OLD_TESTS
+
+      @tg = TechnicalGraph.new(
+        {
+          :drawer_class => :rmagick,
+        })
+      @tg.add_layer(@simple_data_array)
+      @tg.render
+      file_name = 'samples/readme/11_renderer_rmagick.png'
+      @tg.image_drawer.save_to_file(file_name)
+
+      @tg = TechnicalGraph.new(
+        {
+          :drawer_class => :rasem
+        })
+      @tg.add_layer(@simple_data_array)
+      @tg.render
+      file_name = 'samples/readme/11_renderer_rasem.png'
+      @tg.image_drawer.save_to_file(file_name)
+
+      # test
+      @tg.image_drawer.to_format(@tg.best_output_format).class.should == String
+      File.exist?(file_name).should == true
+    end
+
+    should 'test anti-aliasing' do
+      return if DO_NOT_RUN_OLD_TESTS
+
+      @tg = TechnicalGraph.new(
+        {
+          :antialias => true,
+          :drawer_class => :rmagick
+        })
+      @tg.add_layer(@simple_data_array)
+      @tg.render
+      file_name = 'samples/readme/12_aa_true.png'
+      @tg.image_drawer.save_to_file(file_name)
+
+      # only for size comparison
+      @tg = TechnicalGraph.new(
+        {
+          :antialias => false,
+          :drawer_class => :rmagick
+        })
+      @tg.add_layer(@simple_data_array)
+      @tg.render
+      file_name = 'samples/readme/12_aa_false.png'
+      @tg.image_drawer.save_to_file(file_name)
+
+      # test
+      @tg.image_drawer.to_format(@tg.best_output_format).class.should == String
+      File.exist?(file_name).should == true
+    end
+
+    
+    should 'test font sizes' do
+      return if DO_NOT_RUN_OLD_TESTS
+
+      @tg = TechnicalGraph.new(
+        {
+          :x_axis_label => 'parameter',
+          :y_axis_label => 'value',
+          :layers_font_size => 14,
+          :axis_font_size => 18,
+          :axis_label_font_size => 48,
+          :drawer_class => README_RENDERED
+        })
+      @tg.add_layer(@simple_data_array, {:value_labels => true})
+      @tg.render
+      file_name = 'samples/readme/13_font_sizes.png'
+      @tg.image_drawer.save_to_file(file_name)
+
+      # test
+      @tg.image_drawer.to_format(@tg.best_output_format).class.should == String
+      File.exist?(file_name).should == true
+    end
+
+
+    should 'test layer labels, colors and legend' do
+      return if DO_NOT_RUN_OLD_TESTS
+
+      @simple_data_array_second = @simple_data_array.collect{|a| {:x => a[:x] + 0.31, :y => a[:y] + 0.21 }}
+      @simple_data_array_third = @simple_data_array.collect{|a| {:x => a[:x] * 0.99 + 0.23, :y => a[:y] * 1.2 - 0.12 }}
+
+      @tg = TechnicalGraph.new(
+        {
+          :legend => true,
+          :legend_font_size => 20,
+          :drawer_class => README_RENDERED
+        })
+      @tg.add_layer(@simple_data_array, {:label => 'simple', :color => '#FFFF00'})
+      @tg.add_layer(@simple_data_array_second, {:label => 'offset', :color => '#00FFFF'})
+      @tg.add_layer(@simple_data_array_third, {:label => 'scaled', :color => '#FF00FF'})
+
+      @tg.render
+      file_name = 'samples/readme/14_simple_legend.png'
+      @tg.image_drawer.save_to_file(file_name)
+
+      # test
+      @tg.image_drawer.to_format(@tg.best_output_format).class.should == String
+      File.exist?(file_name).should == true
+    end
+
+
+    should 'test smoothing' do
+      return if DO_NOT_RUN_OLD_TESTS
+
+      @tg = TechnicalGraph.new(
+        {
+          :width => 2000,
+          :height => 1500,
+          :legend => true,
+          :x_axis_label => "Parameter",
+          :y_axis_label => "Value",
+          :drawer_class => README_RENDERED,
+        }
+      )
+      max = 250 #2000
+
+      @layer_data = Array.new
+      (0..max).each do |i|
+        x = -10.0 + (20.0 * i.to_f / max.to_f)
+        y = 10.0 * Math.cos(i.to_f * (2.0 * 3.14 / max.to_f))
+
+        y += rand * 2.0
+
+        @layer_data << { :x => x, :y => y }
+      end
+
+      # adding simple layer
+      @layer_params = {
+        :label => 'raw',
+        :value_labels => false,
+        :simple_smoother => false,
+        :simple_smoother_level => 1,
+        :simple_smoother_strategy => :gauss,
+        :simple_smoother_x => false,
+      }
+      @layer_params_b = @layer_params.clone.merge(
+        {
+          :label => 'smoothed - level 3',
+          :simple_smoother_level => 3,
+          :simple_smoother => true
+        })
+      @layer_params_e = @layer_params.clone.merge(
+        {
+          :label => 'smoothed - level 50',
+          :simple_smoother_level => 50,
+          :simple_smoother => true
+        })
+
+      @tg.add_layer(@layer_data.clone, @layer_params)
+      @tg.add_layer(@layer_data.clone, @layer_params_b)
+      @tg.add_layer(@layer_data.clone, @layer_params_e)
+
+      @tg.render
+      file_name = 'samples/readme/15_smoothing.png'
+      @tg.image_drawer.save_to_file(file_name)
+
+      # test
+      @tg.image_drawer.to_format(@tg.best_output_format).class.should == String
+      File.exist?(file_name).should == true
+    end
+
+
+
+    should 'test noise filtering' do
+      return if DO_NOT_RUN_OLD_TESTS
+
+      @tg = TechnicalGraph.new(
+        {
+          #:log_level => Logger::DEBUG,
+          :legend => true,
+          :drawer_class => README_RENDERED
+        }
+      )
+      max = 250 #2000
+
+      @layer_data = Array.new
+      (0..max).each do |i|
+        x = -10.0 + (20.0 * i.to_f / max.to_f)
+        y = -10.0 + (20.0 * i.to_f / max.to_f)
+        @layer_data << { :x => x, :y => y }
+      end
+
+      # custom spikes
+      [3, 36, 99, 187, 204].each do |i|
+        offset = 5.0
+        offset *= -1.0 if rand(100) % 2 == 1
+        @layer_data[i][:y] += offset
+      end
+
+      150.times do
+        i = rand(@layer_data.size)
+        offset = rand(80).to_f / 10.0
+        offset *= -1.0 if rand(100) % 2 == 1
+
+        @layer_data[i][:y] += offset
+      end
+
+      # adding simple layer
+      @layer_params = {
+        :label => 'raw',
+        :value_labels => false,
+      }
+      @layer_params_b = @layer_params.clone.merge(
+        {
+          :label => 'n.r. level 3, window 10',
+          :noise_removal_window_size => 10,
+          :noise_removal_level => 3,
+          :noise_removal => true
+        })
+      @layer_params_e = @layer_params.clone.merge(
+        {
+          :label => 'n.r level 10, window 30',
+          :noise_removal_window_size => 10,
+          :noise_removal_level => 30,
+          :noise_removal => true
+        })
+
+      @tg.add_layer(@layer_data.clone, @layer_params)
+      @tg.add_layer(@layer_data.clone, @layer_params_b)
+      @tg.add_layer(@layer_data.clone, @layer_params_e)
+
+      @tg.render
+      file_name = 'samples/readme/16_noise_removal.png'
+      @tg.image_drawer.save_to_file(file_name)
+
+      # test
+      @tg.image_drawer.to_format(@tg.best_output_format).class.should == String
+      File.exist?(file_name).should == true
+    end
+
+
+    should 'test axis enlargement' do
+      return if DO_NOT_RUN_OLD_TESTS
+
+      @tg = TechnicalGraph.new(
+        {
+          :log_level => Logger::DEBUG,
+          :drawer_class => README_RENDERED,
+          :axis_density_enlarge_image => true,
+          :x_axis_min_distance => 500,
+          :x_axis_interval => 1.0,
+          :x_axis_fixed_interval => true,
+          :width => 400
+        }
+      )
+      max = 250 #2000
+
+      @layer_data = Array.new
+      (0..max).each do |i|
+        x = -10.0 + (20.0 * i.to_f / max.to_f)
+        y = -10.0 + rand(2000).to_f / 100.0
+        @layer_data << { :x => x, :y => y }
+      end
+
+      @tg.add_layer(@layer_data)
+
+      @tg.render
+      file_name = 'samples/readme/17_axis_enlargement.png'
+      @tg.image_drawer.save_to_file(file_name)
+
+      # test
+      @tg.image_drawer.to_format(@tg.best_output_format).class.should == String
+      File.exist?(file_name).should == true
+    end
+
 
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: technical_graph
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 11
   prerelease: 
   segments: 
   - 0
-  - 4
+  - 5
   - 0
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Aleksander Kwiatkowski
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-05 00:00:00 +01:00
+date: 2011-11-12 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -29,11 +29,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: rmagick
+  name: rasem
   version_requirements: *id001
   prerelease: false
 - !ruby/object:Gem::Dependency 
-  type: :runtime
+  type: :development
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -43,7 +43,7 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: rasem
+  name: rdoc
   version_requirements: *id002
   prerelease: false
 - !ruby/object:Gem::Dependency