technical_graph 0.3.2 → 0.4.0

data/lib/technical_graph/graph_axis.rb

@@ -21,10 +21,18 @@ class GraphAxis
     @technical_graph.data_processor
   end
 
-  def image_drawer
+  def image
     @technical_graph.image_drawer
   end
 
+  def drawer
+    image.drawer
+  end
+
+  def logger
+    @technical_graph.logger
+  end
+
   def truncate_string
     options[:truncate_string]
   end
@@ -62,6 +70,8 @@ class GraphAxis
 
   # Calculate axis using 2 methods
   def calc_axis(from, to, interval, count, fixed_interval)
+    t = Time.now
+
     axis = Array.new
     l = to - from
     current = from
@@ -71,12 +81,16 @@ class GraphAxis
         axis << current
         current += interval
       end
+      logger.debug "fixed interval axis calculation from #{from} to #{to} using int. #{interval}"
+      logger.debug " TIME COST #{Time.now - t}"
       return axis
 
     else
       (0...count).each do |i|
         axis << from + (l.to_f * i.to_f) / count.to_f
       end
+      logger.debug "fixed count axis calculation from #{from} to #{to} using count #{count}"
+      logger.debug " TIME COST #{Time.now - t}"
       return axis
 
     end
@@ -85,8 +99,12 @@ class GraphAxis
   # Enlarge image to maintain proper axis density
   def axis_distance_image_enlarge
     if options[:axis_density_enlarge_image]
+      t = Time.now
       x_axis_distance_image_enlarge
       y_axis_distance_image_enlarge
+
+      logger.debug "axis enlarged"
+      logger.debug " TIME COST #{Time.now - t}"
     end
   end
 
@@ -97,9 +115,9 @@ class GraphAxis
     return if a.size < 2
 
     ax = a[0]
-    ax = image_drawer.calc_bitmap_y(ax).round
+    ax = image.calc_bitmap_y(ax).round
     bx = a[1]
-    bx = image_drawer.calc_bitmap_y(bx).round
+    bx = image.calc_bitmap_y(bx).round
 
     axis_distance = (bx - ax).abs
 
@@ -117,9 +135,9 @@ class GraphAxis
     return if a.size < 2
 
     ay = a[0]
-    ay = image_drawer.calc_bitmap_y(ay).round
+    ay = image.calc_bitmap_y(ay).round
     by = a[1]
-    by = image_drawer.calc_bitmap_y(by).round
+    by = image.calc_bitmap_y(by).round
 
     axis_distance = (by - ay).abs
 
@@ -134,228 +152,62 @@ class GraphAxis
   def render_on_image(image)
     @image = image
 
-    render_values_axis
-    render_parameters_axis
-
-    render_values_zero_axis
-    render_parameters_zero_axis
-
+    render_axis
+    render_zero_axis
     render_axis_labels
   end
 
-  def axis_antialias
-    options[:axis_antialias] == true
-  end
-
-
-  def render_values_axis
-    plot_axis_y_line = Magick::Draw.new
-    plot_axis_y_text = Magick::Draw.new
-
-    plot_axis_y_line.stroke_antialias(axis_antialias)
-    plot_axis_y_text.text_antialias(image_drawer.font_antialias)
-
-    plot_axis_y_line.fill_opacity(0)
-    plot_axis_y_line.stroke(options[:axis_color])
-    plot_axis_y_line.stroke_opacity(1.0)
-    plot_axis_y_line.stroke_width(1.0)
-    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)
-    plot_axis_y_text.text_undercolor(options[:background_color])
-
-    value_axis.each do |y|
-      by = image_drawer.calc_bitmap_y(y)
-      plot_axis_y_line.line(
-        0, by.round,
-        @image.columns-1, by.round
-      )
-
-      string_label = "#{truncate_string % y}"
-
-      plot_axis_y_text.text(
-        5,
-        by.round + 15,
-        string_label
-      )
-    end
-
-    t = Time.now
-    plot_axis_y_line.draw(@image)
-    puts "Y axis time #{Time.now - t}, drawing lines"
-    t = Time.now
-    plot_axis_y_text.draw(@image)
-    puts "Y axis time #{Time.now - t}, drawing text"
-  end
-
-  def render_parameters_axis
-
-    plot_axis_x_line = Magick::Draw.new
-    plot_axis_x_text = Magick::Draw.new
-
-    plot_axis_x_line.stroke_antialias(axis_antialias)
-    plot_axis_x_text.text_antialias(axis_antialias)
-
-    plot_axis_x_line.fill_opacity(0)
-    plot_axis_x_line.stroke(options[:axis_color])
-    plot_axis_x_line.stroke_opacity(1.0)
-    plot_axis_x_line.stroke_width(1.0)
-    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)
-    plot_axis_x_text.text_undercolor(options[:background_color])
-
-    parameter_axis.each do |x|
-      bx = image_drawer.calc_bitmap_x(x)
-      plot_axis_x_line.line(
-        bx.round, 0,
-        bx.round, @image.rows-1
-      )
-
-      string_label = "#{truncate_string % x}"
-
-      plot_axis_x_text.text(
-        bx.round + 5,
-        @image.rows - 15,
-        string_label
-      )
-    end
-
-    t = Time.now
-    plot_axis_x_line.draw(@image)
-    puts "X axis time #{Time.now - t}, drawing lines"
-    t = Time.now
-    plot_axis_x_text.draw(@image)
-    puts "X axis time #{Time.now - t}, drawing lines"
-
-  end
-
-  # TODO: make it DRY
-  def render_values_zero_axis
-    plot_axis_y_line = Magick::Draw.new
-    plot_axis_y_text = Magick::Draw.new
-
-    plot_axis_y_line.stroke_antialias(axis_antialias)
-    plot_axis_y_text.text_antialias(image_drawer.font_antialias)
-
-    plot_axis_y_line.fill_opacity(0)
-    plot_axis_y_line.stroke(options[:axis_color])
-    plot_axis_y_line.stroke_opacity(1.0)
-    plot_axis_y_line.stroke_width(2.0)
-    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)
-    plot_axis_y_text.text_undercolor(options[:background_color])
-
-    y = 0.0
-    by = image_drawer.calc_bitmap_y(y)
-    plot_axis_y_line.line(
-      0, by.round,
-      @image.columns-1, by.round
-    )
-
-    plot_axis_y_text.text(
-      5,
-      by.round + 15,
-      "#{y}"
+  def antialias
+    options[:antialias] == true
+  end
+
+  # Render normal axis
+  def render_axis
+    drawer.axis(
+      # X
+      parameter_axis.collect { |x| image.calc_bitmap_x(x).to_i },
+      # Y
+      value_axis.collect { |y| image.calc_bitmap_y(y).to_i },
+      # options
+      { :color => options[:axis_color], :width => 1 },
+      # draw labels
+      options[:axis_value_and_param_labels],
+      # X axis labels
+      parameter_axis,
+      # Y axis labels
+      value_axis
     )
-
-    # TODO: why normal axis does not need it?
-    plot_axis_y_line.draw(@image)
-    plot_axis_y_text.draw(@image)
   end
 
-  def render_parameters_zero_axis
-
-    plot_axis_x_line = Magick::Draw.new
-    plot_axis_x_text = Magick::Draw.new
-
-    plot_axis_x_line.stroke_antialias(axis_antialias)
-    plot_axis_x_text.text_antialias(image_drawer.font_antialias)
-
-    plot_axis_x_line.fill_opacity(0)
-    plot_axis_x_line.stroke(options[:axis_color])
-    plot_axis_x_line.stroke_opacity(1.0)
-    plot_axis_x_line.stroke_width(2.0)
-    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)
-    plot_axis_x_text.text_undercolor(options[:background_color])
-
-    x = 0.0
-    bx = image_drawer.calc_bitmap_x(x)
-    plot_axis_x_line.line(
-      bx.round, 0,
-      bx.round, @image.rows-1
+  # Render axis for zeros
+  def render_zero_axis
+    drawer.axis(
+      # X - 0
+      image.calc_bitmap_x(0.0).to_i,
+      # Y - 0
+      image.calc_bitmap_y(0.0).to_i,
+      # options, slightly wider
+      { :color => options[:axis_color], :width => 2 },
+      # draw label
+      options[:axis_zero_labels],
+      # X label,
+      [0.0],
+      # Y label
+      [0.0]
     )
-
-    plot_axis_x_text.text(
-      bx.round + 15,
-      @image.rows - 15,
-      "#{x}"
-    )
-
-    # TODO: why normal axis does not need it?
-    plot_axis_x_line.draw(@image)
-    plot_axis_x_text.draw(@image)
   end
 
-  def render_axis_labels
-    if options[:x_axis_label].to_s.size > 0
-      plot_axis_text = Magick::Draw.new
-      plot_axis_text.text_antialias(image_drawer.font_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)
-      plot_axis_text.text_align(Magick::CenterAlign)
-      plot_axis_text.text_undercolor(options[:background_color])
-
-      plot_axis_text.text(
-        (@image.columns / 2).to_i,
-        @image.rows - 40,
-        options[:x_axis_label].to_s
-      )
-      plot_axis_text.draw(@image)
-    end
 
-    if options[:y_axis_label].to_s.size > 0
-      plot_axis_text = Magick::Draw.new
-      plot_axis_text.text_antialias(image_drawer.font_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)
-      plot_axis_text.text_align(Magick::CenterAlign)
-      plot_axis_text.text_undercolor(options[:background_color])
-
-      plot_axis_text = plot_axis_text.rotate(90)
-      plot_axis_text.text(
-        (@image.rows / 2).to_i,
-        -40,
-        options[:y_axis_label].to_s
-      )
-
-      plot_axis_text.draw(@image)
-    end
+  def render_axis_labels
+    drawer.axis_labels(
+      options[:x_axis_label].to_s,
+      options[:y_axis_label].to_s,
+      {
+        :color => options[:axis_color],
+        :width => 1,
+        :size => options[:axis_label_font_size],
+      }
+    )
   end
 
 end

data/lib/technical_graph/graph_color_library.rb

@@ -6,7 +6,8 @@ require 'singleton'
 
 class GraphColorLibrary
   include Singleton
-  
+
+  # rock solid colors
   # http://www.imagemagick.org/script/color.php
   BASIC_COLORS = [
     'blue',
@@ -15,37 +16,52 @@ class GraphColorLibrary
     'purple'
   ]
 
+  # other random picked up, SVG need #RGB and I'm too lazy :]
   ADDITIONAL_COLORS = [
-    'tomato',
-    'sienna1',
-    'chocolate2',
-    'DarkGoldenrod4',
-    'OliveDrab4',
-    'ForestGreen',
-    'turquoise',
-    'DarkCyan',
-    'CadetBlue4',
-    'DeepSkyBlue4',
-    'DodgerBlue2',
-    'CornflowerBlue',
-    'MidnightBlue',
-    'MediumPurple3',
-    'magenta4',
-    'orchid4',
-    'DeepPink3',
-    'PaleVioletRed4',
-    'firebrick3'
+    '#8B3626', #'tomato',
+    '#FF8247', #'sienna1',
+               #'chocolate2',
+               #'DarkGoldenrod4',
+               #'OliveDrab4',
+               #'ForestGreen',
+               #'turquoise',
+               #'DarkCyan',
+               #'CadetBlue4',
+               #'DeepSkyBlue4',
+               #'DodgerBlue2',
+               #'CornflowerBlue',
+               #'MidnightBlue',
+               #'MediumPurple3',
+               #'magenta4',
+               #'orchid4',
+               #'DeepPink3',
+               #'PaleVioletRed4',
+               #'firebrick3'
   ]
 
   FAIL_COLOR = 'black'
 
   def initialize
-    @colors = BASIC_COLORS + ADDITIONAL_COLORS.sort {rand}
+    @colors = BASIC_COLORS + ADDITIONAL_COLORS.sort { rand }
+  end
+
+  # not too bright
+  MAX_INTENSITY = 0xbb
+
+  # Best solution, create random color JIT
+  def random_color
+    str = "#"
+    3.times do
+      str += colour = "%02x" % (rand * MAX_INTENSITY)
+    end
+    return str
   end
 
   def get_color
     color = @colors.shift
-    return FAIL_COLOR if color.nil?
+    #return FAIL_COLOR if color.nil?
+    # better, create random colors just in time
+    return random_color if color.nil?
     return color
   end
 

data/lib/technical_graph/graph_data_processor.rb

@@ -17,6 +17,10 @@ class GraphDataProcessor
     @technical_graph.layers
   end
 
+  def logger
+    @technical_graph.logger
+  end
+
   def initialize(technical_graph)
     @technical_graph = technical_graph
 
@@ -121,7 +125,7 @@ class GraphDataProcessor
     # ranges are set, can't change
     return if fixed?
 
-    # updating ranges
+    # updating ranges, enlarging
     self.raw_y_max = data_layer.y_max if not data_layer.y_max.nil? and data_layer.y_max > self.raw_y_max
     self.raw_x_max = data_layer.x_max if not data_layer.x_max.nil? and data_layer.x_max > self.raw_x_max
 
@@ -149,6 +153,8 @@ class GraphDataProcessor
 
   # Calculate zoomed X position for Array of X'es
   def calc_x_zoomed(old_xes)
+    t = Time.now
+
     # default zoom
     if self.zoom_x == 1.0
       return old_xes
@@ -162,11 +168,15 @@ class GraphDataProcessor
       new_xes << (a + d * self.zoom_x)
     end
 
+    logger.debug "calc_x_zoomed for #{old_xes.size}"
+    logger.debug " TIME COST #{Time.now - t}"
     return new_xes
   end
 
   # Calculate zoomed Y position for Array of Y'es
   def calc_y_zoomed(old_yes)
+    t = Time.now
+
     # default zoom
     if self.zoom_y == 1.0
       return old_yes
@@ -180,6 +190,8 @@ class GraphDataProcessor
       new_yes << (a + d * self.zoom_y)
     end
 
+    logger.debug "calc_y_zoomed for #{old_yes.size}"
+    logger.debug " TIME COST #{Time.now - t}"
     return new_yes
   end