technical_graph 0.3.2 → 0.4.0

data/lib/technical_graph/graph_image_drawer_rmagick.rb

@@ -0,0 +1,237 @@
+require 'rubygems'
+require 'RMagick'
+require 'technical_graph/graph_image_drawer_module'
+
+class GraphImageDrawerRmagick
+  include GraphImageDrawerModule
+
+  def create_blank_image
+    @image = Magick::ImageList.new
+    @image.new_image(
+      width,
+      height,
+      Magick::HatchFill.new(
+        options[:background_color],
+        options[:background_hatch_color]
+      )
+    )
+
+    return @image
+  end
+
+  # Layer used for drawing axis
+  def axis_draw_object
+    plot_axis = Magick::Draw.new
+
+    plot_axis.stroke_antialias(options[:antialias])
+    plot_axis.text_antialias(options[:antialias])
+    plot_axis.fill_opacity(1.0)
+    plot_axis.stroke(options[:axis_color])
+    plot_axis.stroke_opacity(1.0)
+    plot_axis.stroke_width(1.0)
+    plot_axis.stroke_linecap('square')
+    plot_axis.stroke_linejoin('miter')
+
+    plot_axis.pointsize(options[:axis_font_size])
+    plot_axis.font_family('helvetica')
+    plot_axis.font_style(Magick::NormalStyle)
+    plot_axis.text_align(Magick::LeftAlign)
+    plot_axis.text_undercolor(options[:background_color])
+
+    return plot_axis
+  end
+
+  # Layer used for drawing main labels (parameter, value)
+  def axis_labels_draw_object
+    draw = axis_draw_object
+    draw.pointsize(options[:axis_label_font_size])
+    draw.font_style(Magick::NormalStyle)
+    draw.text_align(Magick::CenterAlign)
+
+    return draw
+  end
+
+  # Layer used for drawing value labels
+  def layer_value_labels_draw_object(layer)
+    draw = axis_draw_object
+    draw.pointsize(options[:layers_font_size])
+    return draw
+  end
+
+  # Layer used for drawing chart, lines and dots
+  def layer_draw_object(layer)
+    draw = axis_draw_object
+    draw.fill(layer.color)
+    draw.stroke(layer.color)
+    return draw
+  end
+
+  # Create no-stroke draw object
+  def layer_no_stroke(_draw)
+    draw = _draw.clone
+    draw.stroke_opacity(0.0)
+    draw.stroke_width(0.0)
+    return draw
+  end
+
+  # Create no-fill draw object
+  def layer_no_fill(_draw)
+    draw = _draw.clone
+    draw.fill_opacity(0.0)
+    return draw
+  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
+
+    plot_axis = axis_draw_object
+    plot_axis.stroke(_options[:color])
+    plot_axis.stroke_width(_options[:width])
+    plot_axis_text = layer_no_stroke(plot_axis)
+    plot_axis_text.fill(_options[:color])
+
+    x_array.each_with_index do |x, i|
+      plot_axis.line(x, 0, x, height)
+
+      # labels
+      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|
+      plot_axis.line(0, y, width, y)
+
+      # 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
+
+    plot_axis.draw(@image)
+    plot_axis_text.draw(@image)
+  end
+
+  # Label for parameters and values
+  def axis_labels(parameter_label, value_label, _options = { :color => 'black', :width => 1, :size => 20 })
+    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)
+    # 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
+    plot = layer_draw_object(l)
+    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
+      plot.line(
+        c[:ax], c[:ay],
+        c[:bx], c[:by]
+      )
+
+      drawer.post_dot_drawn(c[:ax], c[:ay])
+      drawer.post_dot_drawn(c[:bx], c[:by])
+    end
+    plot.draw(@image)
+  end
+
+
+  def legend(legend_data)
+    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.circle(l[:x], l[:y], l[:x] + 2, l[:y])
+      plot_text.text(l[:x] + 5, l[:y], 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.write(file)
+
+    logger.debug "saving image"
+    logger.debug " TIME COST #{Time.now - t}"
+  end
+
+  # Export image
+  def to_format(format)
+    t = Time.now
+    i = @image.flatten_images
+    i.format = format
+    blob = i.to_blob
+
+    logger.debug "exporting image as string"
+    logger.debug " TIME COST #{Time.now - t}"
+
+    return blob
+  end
+
+end

data/lib/technical_graph.rb

@@ -1,6 +1,7 @@
 #encoding: utf-8
 
 require 'rubygems'
+require 'logger'
 require 'technical_graph/data_layer'
 require 'technical_graph/graph_data_processor'
 require 'technical_graph/graph_image_drawer'
@@ -20,21 +21,35 @@ class TechnicalGraph
 
   def initialize(options = { })
     @options = options
+
+    @log_device = options[:log_device] || STDOUT
+    @logger = Logger.new(@log_device)
+    @logger.level = options[:log_level] || Logger::INFO
+
     @data_processor = GraphDataProcessor.new(self)
     @image_drawer = GraphImageDrawer.new(self)
     @axis = GraphAxis.new(self)
     @layers = Array.new
   end
-  attr_reader :options
-  attr_reader :data_processor
-  attr_reader :image_drawer
-  attr_reader :axis
 
-  attr_reader :layers
+  attr_reader :options, :data_processor, :image_drawer, :axis, :layers, :logger
+
+  # Best output image format, used for testing
+  def best_output_format
+    if options[:drawer_class] == :rasem
+      return 'svg'
+    end
+    if options[:drawer_class] == :rmagick
+      return 'png'
+    end
+  end
 
   # Add new data layer to layer array
-  def add_layer(data = [], options = {})
-    @layers << DataLayer.new(data, options)
+  def add_layer(data = [], options = { })
+    t = Time.now
+    @layers << DataLayer.new(data, options, self)
+    logger.debug "layer added, size #{data.size}"
+    logger.debug " TIME COST #{Time.now - t}"
   end
 
   # Create graph
@@ -44,7 +59,7 @@ class TechnicalGraph
     @layers.each do |l|
       @data_processor.process_data_layer(l)
     end
-    
+
     # draw axis
     @axis.render_on_image(@image)
     # draw layers

data/test/helper.rb

@@ -15,5 +15,9 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'technical_graph'
 
+# default drawer class
+#DRAWER_CLASS = :rmagick
+DRAWER_CLASS = :rasem
+
 class Test::Unit::TestCase
 end

data/test/test_technical_autocolor.rb

@@ -83,8 +83,8 @@ class TestTechnicalAutocolor < Test::Unit::TestCase
 
       @tg.render
 
-      @tg.image_drawer.save_to_file('samples/tests/test_autocolor.png')
-      @tg.image_drawer.to_png.class.should == String
+      @tg.image_drawer.save_to_file("samples/tests/test_autocolor.#{@tg.best_output_format}")
+      @tg.image_drawer.to_format(@tg.best_output_format).class.should == String
 
     end
   end

data/test/test_technical_axis_enlarge.rb

@@ -59,9 +59,8 @@ class TestTechnicalAxisEnlarge < Test::Unit::TestCase
 
       @tg.render
 
-      @tg.image_drawer.save_to_file('samples/tests/test_axis_enlarge.png')
-      @tg.image_drawer.save_to_file('samples/tests/test_axis_enlarge.svg')
-      @tg.image_drawer.to_png.class.should == String
+      @tg.image_drawer.save_to_file("samples/tests/test_axis_enlarge.#{@tg.best_output_format}")
+      @tg.image_drawer.to_format(@tg.best_output_format).class.should == String
 
     end
   end

data/test/test_technical_graph.rb

@@ -70,11 +70,12 @@ class TestTechnicalGraph < Test::Unit::TestCase
       layer.processed_data.size.should == 2 * @data_size
 
       # @tg.render
-      # @tg.image.save_to_file('samples/tests/test1.png')
+      # @tg.image.save_to_file("samples/tests/test1.#{@th.best_output_format}")
     end
 
     should 'has ability to filter records with similar x\'es' do
-      @tg.add_layer
+      # was turned off by default, performance issue
+      @tg.add_layer([], {:perform_parameter_uniq => true})
       layer = @tg.layers.last
       layer.raw_data.size.should == 0
       layer.processed_data.size.should == 0
@@ -103,7 +104,7 @@ class TestTechnicalGraph < Test::Unit::TestCase
 
       # uniq check
       layer.append_data([{ :z => 0, :y => 1 }])
-      layer.append_data([{}])
+      layer.append_data([{ }])
       layer.raw_data.size.should == 1
       layer.processed_data.size.should == 1
     end

data/test/test_technical_graph_axis.rb

@@ -267,7 +267,7 @@ class TestTechnicalGraphAxis < Test::Unit::TestCase
       @tg.axis.parameter_axis.should == [-8.0, -6.0, -4.0, -2.0, 0.0, 2.0, 4.0, 6.0]
       @tg.axis.value_axis.should == [-4.0, -2.0, 0.0, 2.0]
 
-      @tg.image_drawer.save_to_file('samples/tests/test1.png')
+      @tg.image_drawer.save_to_file("samples/tests/test1.#{@tg.best_output_format}")
     end
 
 
@@ -303,7 +303,7 @@ class TestTechnicalGraphAxis < Test::Unit::TestCase
 
       @tg.render
 
-      @tg.image_drawer.save_to_file('samples/tests/test2.png')
+      @tg.image_drawer.save_to_file("samples/tests/test2.#{@tg.best_output_format}")
     end
 
   end

data/test/test_technical_multilayer.rb

@@ -87,8 +87,8 @@ class TestTechnicalMultilayer < Test::Unit::TestCase
 
       @tg.render
 
-      @tg.image_drawer.save_to_file('samples/tests/test_multilayer.png')
-      @tg.image_drawer.to_png.class.should == String
+      @tg.image_drawer.save_to_file("samples/tests/test_multilayer.#{@tg.best_output_format}")
+      @tg.image_drawer.to_format(@tg.best_output_format).class.should == String
 
     end
   end

data/test/test_technical_rasem.rb

@@ -0,0 +1,22 @@
+require 'helper'
+
+class TestTechnicalRasem < Test::Unit::TestCase
+  context 'drawing SVG graphs using rasem' do
+
+    should 'do some initials' do
+      fake_drawer_class = Struct.new('GraphImageDrawerFake', :width, :height)
+      fake_drawer = fake_drawer_class.new
+      fake_drawer[:width] = 800
+      fake_drawer[:height] = 600
+      d = GraphImageDrawerRasem.new(fake_drawer)
+      d.x_axis([ 0, 100, 200, 300 ])
+      d.close
+      
+      d.save("samples/tests/rasem_init.svg")
+    end
+
+
+  end
+
+
+end

data/test/test_technical_readme.rb

@@ -1,5 +1,8 @@
 require 'helper'
 
+# run only latest test to create new graphs for documentation
+DO_NOT_RUN_OLD_TESTS = true
+
 class TestTechnicalReadme < Test::Unit::TestCase
   context 'generate sample graphs using readme options description' do
     setup do
@@ -31,7 +34,7 @@ class TestTechnicalReadme < Test::Unit::TestCase
 
     #
     should 'create simplest graph' do
-      return # TODO remove it later, when all tests are done
+      return if DO_NOT_RUN_OLD_TESTS
       @tg = TechnicalGraph.new
       @tg.add_layer(@simple_data_array)
       @tg.render
@@ -39,13 +42,13 @@ class TestTechnicalReadme < Test::Unit::TestCase
       @tg.image_drawer.save_to_file(file_name)
 
       # test
-      @tg.image_drawer.to_png.class.should == String
+      @tg.image_drawer.to_format(@tg.best_output_format).class.should == String
       File.exist?(file_name).should == true
     end
 
     #
     should 'create 2-layer graph' do
-      return # TODO remove it later, when all tests are done
+      return if DO_NOT_RUN_OLD_TESTS
       @tg = TechnicalGraph.new
       @tg.add_layer(@simple_data_array)
       @tg.add_layer(@simple_data_array_b)
@@ -54,13 +57,13 @@ class TestTechnicalReadme < Test::Unit::TestCase
       @tg.image_drawer.save_to_file(file_name)
 
       # test
-      @tg.image_drawer.to_png.class.should == String
+      @tg.image_drawer.to_format(@tg.best_output_format).class.should == String
       File.exist?(file_name).should == true
     end
 
     #
     should 'change ranges' do
-      return # TODO remove it later, when all tests are done
+      return if DO_NOT_RUN_OLD_TESTS
       @tg = TechnicalGraph.new(
         {
           :x_min => -2,
@@ -74,12 +77,12 @@ class TestTechnicalReadme < Test::Unit::TestCase
       @tg.image_drawer.save_to_file(file_name)
 
       # test
-      @tg.image_drawer.to_png.class.should == String
+      @tg.image_drawer.to_format(@tg.best_output_format).class.should == String
       File.exist?(file_name).should == true
     end
 
     should 'change ranges (fixed)' do
-      return # TODO remove it later, when all tests are done
+      return if DO_NOT_RUN_OLD_TESTS
       @tg = TechnicalGraph.new(
         {
           :x_min => 1,
@@ -94,12 +97,12 @@ class TestTechnicalReadme < Test::Unit::TestCase
       @tg.image_drawer.save_to_file(file_name)
 
       # test
-      @tg.image_drawer.to_png.class.should == String
+      @tg.image_drawer.to_format(@tg.best_output_format).class.should == String
       File.exist?(file_name).should == true
     end
 
     should 'fixed amount of axis' do
-      return # TODO remove it later, when all tests are done
+      return if DO_NOT_RUN_OLD_TESTS
       @tg = TechnicalGraph.new(
         {
           :x_axis_fixed_interval => false,
@@ -113,12 +116,12 @@ class TestTechnicalReadme < Test::Unit::TestCase
       @tg.image_drawer.save_to_file(file_name)
 
       # test
-      @tg.image_drawer.to_png.class.should == String
+      @tg.image_drawer.to_format(@tg.best_output_format).class.should == String
       File.exist?(file_name).should == true
     end
 
     should 'fixed axis interval' do
-      return # TODO remove it later, when all tests are done
+      return if DO_NOT_RUN_OLD_TESTS
       @tg = TechnicalGraph.new(
         {
           :x_axis_fixed_interval => true,
@@ -142,12 +145,12 @@ class TestTechnicalReadme < Test::Unit::TestCase
       @tg.image_drawer.save_to_file(file_name)
 
       # test
-      @tg.image_drawer.to_png.class.should == String
+      @tg.image_drawer.to_format(@tg.best_output_format).class.should == String
       File.exist?(file_name).should == true
     end
 
     should 'let choose axis label' do
-      return # TODO remove it later, when all tests are done
+      return if DO_NOT_RUN_OLD_TESTS
       @tg = TechnicalGraph.new(
         {
           :x_axis_label => 'parameter',
@@ -160,13 +163,13 @@ class TestTechnicalReadme < Test::Unit::TestCase
       @tg.image_drawer.save_to_file(file_name)
 
       # test
-      @tg.image_drawer.to_png.class.should == String
+      @tg.image_drawer.to_format(@tg.best_output_format).class.should == String
       File.exist?(file_name).should == true
     end
 
 
     should 'test truncate string' do
-      #return # TODO remove it later, when all tests are done
+      return if DO_NOT_RUN_OLD_TESTS
       @tg = TechnicalGraph.new(
         {
           :truncate_string => "%.3f"
@@ -180,12 +183,12 @@ class TestTechnicalReadme < Test::Unit::TestCase
       @tg.image_drawer.save_to_file(file_name)
 
       # test
-      @tg.image_drawer.to_png.class.should == String
+      @tg.image_drawer.to_format(@tg.best_output_format).class.should == String
       File.exist?(file_name).should == true
     end
 
     should 'test truncate string 2' do
-      #return # TODO remove it later, when all tests are done
+      return if DO_NOT_RUN_OLD_TESTS
       @tg = TechnicalGraph.new(
         {
           :truncate_string => "%.1f"
@@ -199,9 +202,27 @@ class TestTechnicalReadme < Test::Unit::TestCase
       @tg.image_drawer.save_to_file(file_name)
 
       # test
-      @tg.image_drawer.to_png.class.should == String
+      @tg.image_drawer.to_format(@tg.best_output_format).class.should == String
       File.exist?(file_name).should == true
     end
 
+    should 'test image size' do
+      #return if DO_NOT_RUN_OLD_TESTS
+      @tg = TechnicalGraph.new(
+        {
+          :width => 600,
+          :height => 300
+        })
+      @tg.add_layer(@simple_data_array)
+      @tg.render
+      file_name = 'samples/readme/09_image_size.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

data/test/test_technical_simple_graph.rb

@@ -55,8 +55,8 @@ class TestTechnicalSimpleGraph < Test::Unit::TestCase
 
       @tg.render
 
-      @tg.image_drawer.save_to_file('samples/tests/test_simple.png')
-      @tg.image_drawer.to_png.class.should == String
+      @tg.image_drawer.save_to_file("samples/tests/test_simple.#{@tg.best_output_format}")
+      @tg.image_drawer.to_format(@tg.best_output_format).class.should == String
 
     end
   end

data/test/test_technical_smoother.rb

@@ -126,7 +126,7 @@ class TestTechnicalSmoother < Test::Unit::TestCase
       tg.add_layer(layer_data_b, layer_params_b)
 
       tg.render
-      tg.image_drawer.save_to_file('samples/tests/test_simple_gauss.png')
+      tg.image_drawer.save_to_file("samples/tests/test_simple_gauss.#{tg.best_output_format}")
     end
 
     should 'create simple graph using only layer params' do
@@ -204,7 +204,7 @@ class TestTechnicalSmoother < Test::Unit::TestCase
 
 
       tg.render
-      tg.image_drawer.save_to_file('samples/tests/test_smoothing_multiple.png')
+      tg.image_drawer.save_to_file("samples/tests/test_smoothing_multiple.#{tg.best_output_format}")
     end
 
 

data/test/test_technical_smoother_adv.rb

@@ -52,8 +52,9 @@ class TestTechnicalSmootherAdv < Test::Unit::TestCase
 
       tg = TechnicalGraph.new(
         {
-          :width => 8000,
-          :height => 6000,
+          :drawer_class => DRAWER_CLASS,
+          :width => 2000, #8000,
+          :height => 1500, #6000,
 
           :legend => true,
           :legend_auto => true,
@@ -61,9 +62,15 @@ class TestTechnicalSmootherAdv < Test::Unit::TestCase
           :legend_margin => 60,
           :legend_x => 50,
           :legend_y => 50,
+
+          :log_level => Logger::DEBUG,
+
+          :x_axis_label => "Parameter",
+          :y_axis_label => "Value",
+          :axis_label_font_size => 28
         }
       )
-      max = 2000
+      max = 50 #2000
 
       layer_data = Array.new
       (0..max).each do |i|
@@ -78,6 +85,7 @@ class TestTechnicalSmootherAdv < Test::Unit::TestCase
 
       # adding simple layer
       layer_params = {
+        #:perform_parameter_uniq => true,
         :antialias => false,
         :color => 'red',
         :label => 'raw',
@@ -85,7 +93,9 @@ class TestTechnicalSmootherAdv < Test::Unit::TestCase
         :simple_smoother => false,
         :simple_smoother_level => 1,
         :simple_smoother_strategy => :gauss,
-        :simple_smoother_x => false
+        :simple_smoother_x => false,
+
+        :value_labels => true
       }
       layer_params_c = layer_params.clone.merge(
         {
@@ -105,7 +115,7 @@ class TestTechnicalSmootherAdv < Test::Unit::TestCase
       tg.add_layer(layer_data.clone, layer_params_d)
 
       tg.render
-      tg.image_drawer.save_to_file('samples/tests/test_smoothing_x_values.png')
+      tg.image_drawer.save_to_file("samples/tests/test_smoothing_x_values.#{tg.best_output_format}")
     end