technical_graph 0.4.0 → 0.5.0

data/Gemfile

@@ -1,11 +1,16 @@
 source "http://rubygems.org"
 
-gem 'rmagick'
 gem 'rasem'
 
+# optional gem
+if Gem.source_index.find_name('rmagick').size > 0
+  gem 'rmagick'
+end
+
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
+  gem "rdoc"
   gem "shoulda"
   gem "bundler", "~> 1.0.0"
   gem "rspec"

data/Gemfile.lock

@@ -7,18 +7,20 @@ GEM
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    rake (0.9.2)
+    json (1.6.1)
+    rake (0.9.2.2)
     rasem (0.6.1)
-    rcov (0.9.10)
-    rmagick (2.13.1)
-    rspec (2.6.0)
-      rspec-core (~> 2.6.0)
-      rspec-expectations (~> 2.6.0)
-      rspec-mocks (~> 2.6.0)
-    rspec-core (2.6.4)
-    rspec-expectations (2.6.0)
+    rcov (0.9.11)
+    rdoc (3.11)
+      json (~> 1.4)
+    rspec (2.7.0)
+      rspec-core (~> 2.7.0)
+      rspec-expectations (~> 2.7.0)
+      rspec-mocks (~> 2.7.0)
+    rspec-core (2.7.1)
+    rspec-expectations (2.7.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.6.0)
+    rspec-mocks (2.7.0)
     shoulda (2.11.3)
 
 PLATFORMS
@@ -29,6 +31,6 @@ DEPENDENCIES
   jeweler
   rasem
   rcov
-  rmagick
+  rdoc
   rspec
   shoulda

data/Rakefile

@@ -58,7 +58,7 @@ end
 
 task :default => :test
 
-require 'rake/rdoctask'
+require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
 

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.5.0

data/lib/technical_graph/data_layer.rb

@@ -30,7 +30,7 @@ class DataLayer
     @data_params = options
 
     @data_params[:color] ||= GraphColorLibrary.instance.get_color
-    @data_params[:label] ||= ''
+    @data_params[:label] ||= ' '
     # default true, write values near dots
     @data_params[:value_labels] = false if options[:value_labels] == false
 

data/lib/technical_graph/data_layer_processor_noise_removal.rb

@@ -6,13 +6,18 @@ module DataLayerProcessorNoiseRemoval
   DEFAULT_NOISE_REMOVAL_LEVEL = 3
   DEFAULT_NOISE_REMOVAL_WINDOW_SIZE = 10
 
+  NOISE_COEFF = 1000
+  NOISE_POWER_COEFF = 8
+
   def noise_removal_initialize(options)
     @noise_removal = options[:noise_removal] == true
     @noise_removal_level = options[:noise_removal_level] || DEFAULT_NOISE_REMOVAL_LEVEL
     @noise_removal_window_size = options[:noise_removal_window_size] || DEFAULT_NOISE_REMOVAL_WINDOW_SIZE
+
+    @noise_threshold = Math.log(NOISE_COEFF / @noise_removal_level)
   end
 
-  attr_accessor :noise_removal_level, :noise_removal_window_size, :noise_removal
+  attr_accessor :noise_removal_level, :noise_removal_window_size, :noise_removal, :noise_threshold
 
   # Smooth values
   def noise_removal_process
@@ -53,19 +58,50 @@ module DataLayerProcessorNoiseRemoval
     i_from = noise_removal_window_from(i)
     i_to = noise_removal_window_to(i)
 
-    part_array = data.clone_partial_w_fill(i_from, i_to)
-    y_mean = part_array.collect { |p| p.y }.float_mean
 
-    # another algorithm
-    noise_strength = (data[i].y - y_mean).abs / y_mean
-    return noise_strength_enough?(noise_strength)
+    # y_mean = part_array.collect { |p| p.y }.float_mean
+    # # another algorithm
+    # noise_strength = (data[i].y - y_mean).abs / y_mean
+    # return noise_strength_enough?(noise_strength)
+
+    # calc. avg 'derivative'
+    avg_der = calc_avg_derivative(i_from, i_to)
+    current_der = calc_avg_derivative(i-1, i+1)
+
+    # safety
+    return false if avg_der == 0 or current_der == 0
+
+    begin
+      current_level = Math.log((current_der / avg_der) ** NOISE_POWER_COEFF).abs
+    rescue Errno::EDOM
+      # can not calculate logarithm
+      return false
+    rescue Errno::ERANGE
+      # can not calculate logarithm
+      return false
+    end
+    logger.debug "noise removal, avg der #{avg_der}, current #{current_der}, current lev #{current_level}, threshold #{noise_threshold}"
+    return current_level > noise_threshold
   end
 
-  # Some magic here, beware
-  def noise_strength_enough?(noise_strength)
-    threshold_strength = Math.log(@noise_removal_level)
-    return noise_strength > threshold_strength
+  def calc_avg_derivative(i_from, i_to)
+    part_array = data.clone_partial_w_fill(i_from, i_to)
+    derivatives = Array.new
+    (1...part_array.size).each do |i|
+      x_len = (part_array[i].x - part_array[i - 1].x).abs
+      y_len = (part_array[i].y - part_array[i - 1].y).abs
+      derivatives << (x_len / y_len).abs if x_len.abs > 0
+    end
+    avg_der = derivatives.float_mean
+    return avg_der
   end
 
+  ## Some magic here, beware
+  #def noise_strength_enough?(noise_strength)
+  #  threshold_strength = Math.log(@noise_removal_level)
+  #  logger.debug "Noise removal noise str #{noise_strength}, threshold #{threshold_strength}"
+  #  return noise_strength > threshold_strength
+  #end
+
 
 end

data/lib/technical_graph/graph_axis.rb

@@ -58,6 +58,10 @@ class GraphAxis
     options[:x_axis_interval]
   end
 
+  def adjust_axis_to_zero
+    options[:adjust_axis_to_zero]
+  end
+
   # Where to put axis values
   def value_axis
     return calc_axis(data_processor.y_min, data_processor.y_max, options[:y_axis_interval], options[:y_axis_count], y_axis_fixed?)
@@ -81,6 +85,8 @@ class GraphAxis
         axis << current
         current += interval
       end
+      axis = move_axis_to_fit_zero(axis) if adjust_axis_to_zero
+
       logger.debug "fixed interval axis calculation from #{from} to #{to} using int. #{interval}"
       logger.debug " TIME COST #{Time.now - t}"
       return axis
@@ -89,6 +95,8 @@ class GraphAxis
       (0...count).each do |i|
         axis << from + (l.to_f * i.to_f) / count.to_f
       end
+      axis = move_axis_to_fit_zero(axis) if adjust_axis_to_zero
+
       logger.debug "fixed count axis calculation from #{from} to #{to} using count #{count}"
       logger.debug " TIME COST #{Time.now - t}"
       return axis
@@ -96,6 +104,25 @@ class GraphAxis
     end
   end
 
+  # Process axis array, give offset to match zero axis, and remove zero axis from array
+  def move_axis_to_fit_zero(axis)
+    # if zero axis is within
+    if axis.min <= 0 and axis.max >= 0
+      # if there is axis within -1..1
+      axis.each_with_index do |a, i|
+        if a >= -1.0 and a <= 1.0
+          # this is the offset, move using found offset
+          return axis.collect { |b| b - a }
+        end
+      end
+    end
+
+    # TODO when it won't work?
+
+    # return unmodified
+    return axis
+  end
+
   # Enlarge image to maintain proper axis density
   def axis_distance_image_enlarge
     if options[:axis_density_enlarge_image]
@@ -112,6 +139,7 @@ class GraphAxis
   def x_axis_distance_image_enlarge
     a = parameter_axis
     # must be at least 2 axis
+    logger.debug "axis enlargement - parameter_axis #{a.inspect}"
     return if a.size < 2
 
     ax = a[0]
@@ -121,10 +149,12 @@ class GraphAxis
 
     axis_distance = (bx - ax).abs
 
+    logger.debug "axis enlargement - width, axis distance #{axis_distance} should be at least #{options[:x_axis_min_distance]}"
     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
+      logger.debug "axis enlarged - width modified to #{options[:width]}"
     end
   end
 
@@ -132,6 +162,7 @@ class GraphAxis
   def y_axis_distance_image_enlarge
     a = value_axis
     # must be at least 2 axis
+    logger.debug "axis enlargement - value_axis #{a.inspect}"
     return if a.size < 2
 
     ay = a[0]
@@ -141,10 +172,12 @@ class GraphAxis
 
     axis_distance = (by - ay).abs
 
+    logger.debug "axis enlargement - height, axis distance #{axis_distance} should be at least #{options[:y_axis_min_distance]}"
     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
+      logger.debug "axis enlarged - height modified from #{options[:old_height]} to #{options[:height]}"
     end
   end
 

data/lib/technical_graph/graph_color_library.rb

@@ -42,6 +42,11 @@ class GraphColorLibrary
   FAIL_COLOR = 'black'
 
   def initialize
+    reset
+  end
+
+  # Reset color bank
+  def reset
     @colors = BASIC_COLORS + ADDITIONAL_COLORS.sort { rand }
   end
 

data/lib/technical_graph/graph_data_processor.rb

@@ -48,7 +48,7 @@ class GraphDataProcessor
     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?
+    options[:axis_density_enlarge_image] = false if options[:axis_density_enlarge_image].nil?
     # distance in pixels
     options[:x_axis_min_distance] ||= 30
     # distance in pixels

data/lib/technical_graph/graph_image_drawer.rb

@@ -17,15 +17,24 @@ 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] == :rmagick
-      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
@@ -87,6 +96,8 @@ class GraphImageDrawer
     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?
 
+    options[:adjust_axis_to_zero] = true if options[:adjust_axis_to_zero].nil?
+
     # colors
     options[:background_color] ||= 'white'
     options[:background_hatch_color] ||= 'lightcyan2'
@@ -99,6 +110,7 @@ class GraphImageDrawer
     options[:axis_font_size] ||= 10
     options[:layers_font_size] ||= 10
     options[:axis_label_font_size] ||= 10
+    options[:legend_font_size] ||= 10
 
     # legend
     options[:legend] = false if options[:legend].nil?
@@ -155,6 +167,10 @@ class GraphImageDrawer
     options[:legend_width]
   end
 
+  def legend_height
+    options[:legend_height]
+  end
+
   def legend_margin
     options[:legend_margin]
   end
@@ -182,6 +198,9 @@ class GraphImageDrawer
 
   # Create background image
   def crate_blank_graph_image
+    # reset color banks
+    GraphColorLibrary.instance.reset
+    # calculate some stuff :]
     pre_image_create_calculations
     # create drawing proxy
     @drawer = drawing_class.new(self)
@@ -231,16 +250,28 @@ class GraphImageDrawer
     end
   end
 
-  # height of 1 layer
-  ONE_LAYER_LEGEND_HEIGHT = 15
+  # height of 1 layer without font size
+  ONE_LAYER_LEGEND_SPACER = 5
+
+  def one_layer_legend_height
+    options[:legend_font_size] + ONE_LAYER_LEGEND_SPACER
+  end
+
+  # Enlarge legend's width using legend labels sizes
+  def recalculate_legend_size
+    layers.each do |l|
+      w = l.label.size * options[:legend_font_size]
+      options[:legend_width] = w if w > legend_width
+    end
+
+    options[:legend_height] = layers.size * one_layer_legend_height
+  end
 
   # Choose best location
   def recalculate_legend_position
     return unless legend_auto_position
     logger.debug "Auto position calculation, drawn points #{@drawn_points.size}"
 
-    legend_height = layers.size * ONE_LAYER_LEGEND_HEIGHT
-
     # check 8 places:
     positions = [
       { :x => legend_margin, :y => 0 + legend_margin }, # top-left
@@ -285,6 +316,7 @@ class GraphImageDrawer
   # Render legend on graph
   def render_data_legend
     return unless draw_legend?
+    recalculate_legend_size
     recalculate_legend_position
 
     x = legend_x
@@ -300,7 +332,7 @@ class GraphImageDrawer
       h[:y] = y
 
       legend_data << h
-      y += ONE_LAYER_LEGEND_HEIGHT
+      y += one_layer_legend_height
     end
 
     drawer.legend(legend_data)

data/lib/technical_graph/graph_image_drawer_rasem.rb

@@ -24,8 +24,16 @@ class GraphImageDrawerRasem
     @image.group :stroke => _options[:color], :stroke_width => _options[:width] do
       x_array.each_with_index do |x, i|
         line(x, 0, x, _s.height, { })
+      end
 
-        # labels
+      y_array.each_with_index do |y, i|
+        line(0, y, _s.width, y, { })
+      end
+    end
+
+    # labels
+    @image.group :fill => _options[:color] do
+      x_array.each_with_index do |x, i|
         label = x_labels[i]
         if render_labels and not label.nil?
           label = "#{_s.truncate_string % label}"
@@ -34,8 +42,6 @@ class GraphImageDrawerRasem
       end
 
       y_array.each_with_index do |y, i|
-        line(0, y, _s.width, y, { })
-
         # labels
         label = y_labels[i]
         if render_labels and not label.nil?
@@ -49,7 +55,7 @@ class GraphImageDrawerRasem
   # Label for parameters and values
   def axis_labels(parameter_label, value_label, _options = { :color => 'black', :width => 1, :size => 20 })
     _s = self
-    @image.group :stroke => _options[:color], :stroke_width => _options[:width] do
+    @image.group :fill => _options[:color] do
       text(
         (_s.width / 2).to_i,
         _s.height - 40,
@@ -73,12 +79,12 @@ class GraphImageDrawerRasem
     if l.value_labels
       t = Time.now
 
-      @image.group :stroke => _s.options[:axis_color], :stroke_width => 1 do
+      @image.group :fill => _s.options[:axis_color] do
         _coords.each do |c|
           string_label = "#{_s.truncate_string % c[:dy]}"
           text(
             c[:ax] + 5, c[:ay],
-            string_label
+            string_label, {}
           )
         end
       end
@@ -113,11 +119,12 @@ class GraphImageDrawerRasem
 
   def legend(legend_data)
     _s = self
+    legend_text_offset = (options[:legend_font_size] / 2.0).round - 4
 
-    @image.group :stroke_width => 1, :stroke => '' do
+    @image.group  do
       legend_data.each do |l|
-        circle(l[:x], l[:y], 2, { :stroke => l[:color], :fill => l[:color] })
-        text(l[:x] + 5, l[:y], l[:label], { :stroke => l[:color], :fill => l[:color] })
+        circle(l[:x], l[:y], 2, { :stroke => l[:color], :fill => l[:color], :stroke_width => 1 })
+        text(l[:x] + 5, l[:y] + legend_text_offset, l[:label], { :fill => l[:color], 'font-size' => "#{_s.options[:legend_font_size]}px" })
       end
     end
   end
@@ -145,6 +152,8 @@ class GraphImageDrawerRasem
       else
         # ugly hack, save to svg and then convert using image magick
         tmp_file = file.gsub(/#{format}/, 'svg')
+        # change temp filename if it exist
+        tmp_file = File.join(Dir.tmpdir, "#{random_filename}.svg") if File.exists?(tmp_file)
         # save to svg
         save(tmp_file)
         # convert