[PATCH aggregator 02/10] Added .gitignore file

[Martyn Taylor]

From: martyntaylor <mtaylor(a)redhat.com&gt;

---
 .gitignore |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..395db80
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+website/images/graphs/*
+spec/output/
+.project
+*~
+*.swp
-- 
1.7.1.1

[PATCH aggregator 03/10] Fixed Base renderer

[Martyn Taylor]

From: martyntaylor <mtaylor(a)redhat.com&gt;

---
 lib/scruffy/renderers/base.rb |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/lib/scruffy/renderers/base.rb b/lib/scruffy/renderers/base.rb
index f9108f3..83347aa 100644
--- a/lib/scruffy/renderers/base.rb
+++ b/lib/scruffy/renderers/base.rb
@@ -32,7 +32,7 @@ module Scruffy::Renderers
       svg = Builder::XmlMarkup.new(:indent => 2)
       svg.instruct!
       svg.declare!(:DOCTYPE, :svg, :PUBLIC, "-//W3C//DTD SVG 1.1//EN",
"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd")
-      svg.svg(:xmlns => "http://www.w3.org/2000/svg", 'xmlns:xlink'
=> "http://www.w3.org/1999/xlink", :viewBox =>
"#{options[:size].first} 100 #{options[:size].last} 200") {
+      svg.svg(:xmlns => "http://www.w3.org/2000/svg", 'xmlns:xlink'
=> "http://www.w3.org/1999/xlink", :viewBox =>
"#{options[:size].first} #{options[:size].last}") {
         svg.g(:id => options[:graph_id]) {
           rendertime_renderer.components.each do |component|
             component.render(svg, 
-- 
1.7.1.1

[PATCH aggregator 04/10] Added MultiArea layer

[Martyn Taylor]

From: martyntaylor <mtaylor(a)redhat.com&gt;

---
 lib/scruffy/layers.rb            |    3 +-
 lib/scruffy/layers/multi_area.rb |  119 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 121 insertions(+), 1 deletions(-)
 create mode 100644 lib/scruffy/layers/multi_area.rb

diff --git a/lib/scruffy/layers.rb b/lib/scruffy/layers.rb
index 88908a9..732d802 100644
--- a/lib/scruffy/layers.rb
+++ b/lib/scruffy/layers.rb
@@ -15,10 +15,11 @@ end
 
 require 'scruffy/layers/base'
 require 'scruffy/layers/area'
+require 'scruffy/layers/multi_area'
 require 'scruffy/layers/all_smiles'
 require 'scruffy/layers/bar'
 require 'scruffy/layers/line'
 require 'scruffy/layers/average'
 require 'scruffy/layers/stacked'
 require 'scruffy/layers/pie'
-require 'scruffy/layers/pie_slice'
\ No newline at end of file
+require 'scruffy/layers/pie_slice'
diff --git a/lib/scruffy/layers/multi_area.rb b/lib/scruffy/layers/multi_area.rb
new file mode 100644
index 0000000..10f07e5
--- /dev/null
+++ b/lib/scruffy/layers/multi_area.rb
@@ -0,0 +1,119 @@
+module Scruffy::Layers
+  # ==Scruffy::Layers::MulitArea
+  #
+  # Author:: Martyn Taylor
+  # Date:: July 30th 2010
+  #
+  # Multi Area graph.
+
+  class MultiArea < Base
+
+    attr_accessor :baselines
+    attr_accessor :area_colors
+
+    def initialize(options = {}, &block)
+      super(options)
+      @area_colors = options[:area_colors] ? options[:area_colors] : nil
+      @baselines = options[:baselines] ? options[:baselines] : nil
+    end
+
+    # Render Multi Area graph.
+    def draw(svg, coords, options={})
+      # Check whether to use color from theme, or whether to use user defined colors from
the area_colors array
+      color_count = nil
+      if @area_colors && @area_colors.size > 0
+        area_color = @area_colors[0]
+        color_count = 1
+      else
+        puts "Never Set Area Color"
+        area_color = color
+      end
+
+      # Draw Bottom Level Polygons (Original Coords)
+      draw_poly(svg, coords, area_color, options = {})
+
+      # Draw Lower Area Polygons
+      if @baselines
+        # Get the Color of this Area
+        puts "Drawing Baselines"
+        @baselines.sort! {|x,y| y <=> x }
+        @baselines.each do |baseline|
+          if color_count
+            area_color = area_colors[color_count]
+            color_count = color_count + 1
+            puts area_color.to_s
+            if color_count >= area_colors.size
+              color_count = 0
+            end
+          end
+
+          lower_poly_coords = create_lower_polygon_coords(translate_number(baseline),
coords, options)
+          draw_poly(svg, lower_poly_coords, area_color, options = {})
+        end
+      end
+    end
+
+    private
+    def draw_poly(svg, coords, color, options={})
+      points_value1 = "0,#{height} #{stringify_coords(coords).join(' ')}
#{width},#{height}"
+      svg.polygon(:points => points_value1, :fill => color.to_s, :stroke =>
color.to_s, 'style' => "opacity: #{opacity}")
+    end
+
+    def calculate_intersection(baseline, point1, point2)
+      x1 = point1[0]
+      y1 = point1[1]
+      x2 = point2[0]
+      y2 = point2[1]
+
+      # Check whether baseline intersects with the two point line from these coords
+      if ((y2 >= baseline) && (y1 <= baseline)) || ((y1 >= baseline)
&& (y2 <= baseline))
+        # Calculate point of intersection
+        y = baseline.to_f
+        m = (y2.to_f - y1.to_f) / (x2.to_f - x1.to_f)
+        c = y1.to_f
+
+        x = (y.to_f - c.to_f) / m.to_f
+        return [x + x1, y]
+      elsif (y2 <= baseline) && (y1 <= baseline)
+        return nil
+      else
+        return [x2, y2]
+      end
+    end
+
+
+    def create_lower_polygon_coords(baseline, coords, options={})
+      lower_poly_coords = []
+      if coords[0][1] <= baseline
+        lower_poly_coords << [coords[0][0], baseline]
+      else
+        lower_poly_coords << coords[0]
+      end
+
+      coords.each_index do |index|
+        if index + 1 < coords.size
+          poi = calculate_intersection(baseline, coords[index], coords[index + 1])
+          if poi
+            lower_poly_coords << poi
+            if(coords[index + 1][1] > baseline)
+              lower_poly_coords << coords[index + 1]
+            end
+          end
+        end
+      end
+
+      if coords.last[1] <= baseline
+        lower_poly_coords << [coords.last[0], baseline]
+      else
+        lower_poly_coords << coords.last
+      end
+
+      return lower_poly_coords
+    end
+
+    def translate_number(baseline)
+      relative_percent = ((baseline == min_value) ? 0 : ((baseline.to_f - min_value.to_f)
/ (max_value.to_f - min_value.to_f).to_f))
+      return (height.to_f - (height.to_f * relative_percent))
+    end
+  end
+end
\ No newline at end of file
-- 
1.7.1.1

[PATCH aggregator 05/10] Added user specified values to value markers

[Martyn Taylor]

From: martyntaylor <mtaylor(a)redhat.com&gt;

---
 lib/scruffy/components/value_markers.rb |   43 +++++++++++++++++++++----------
 lib/scruffy/layers/multi_area.rb        |    5 +---
 2 files changed, 30 insertions(+), 18 deletions(-)

diff --git a/lib/scruffy/components/value_markers.rb
b/lib/scruffy/components/value_markers.rb
index 219dd1f..56a3c07 100644
--- a/lib/scruffy/components/value_markers.rb
+++ b/lib/scruffy/components/value_markers.rb
@@ -2,31 +2,46 @@ module Scruffy
   module Components
     class ValueMarkers < Base
       attr_accessor :markers
-      
+      attr_accessor :marker_values
+
       def draw(svg, bounds, options={})
-        markers = (options[:markers] || self.markers) || 5
-        all_values = []
+        @marker_values = options[:marker_values] ? options[:marker_values] : nil
+        @markers = options[:markers] ? options[:markers] : 5
 
-        (0...markers).each do |idx|
-          marker = ((1 / (markers - 1).to_f) * idx) * bounds[:height]
-          all_values << (options[:max_value] - options[:min_value]) * ((1 /
(markers - 1).to_f) * idx) + options[:min_value]
+        if @marker_values
+          draw_marker_values(@marker_values, bounds, svg, options)
+        else
+          all_values = []
+          inc = (options[:max_value] - options[:min_value]) / (@markers - 1)
+          for i in 0...@markers
+            all_values << (inc * i)
+          end
+          draw_marker_values(all_values, bounds, svg, options)
         end
-        
-        (0...markers).each do |idx|
-          marker = ((1 / (markers - 1).to_f) * idx) * bounds[:height]
-          marker_value = (options[:max_value] - options[:min_value]) * ((1 / (markers -
1).to_f) * idx) + options[:min_value]
-          marker_value = options[:value_formatter].route_format(marker_value, idx,
options.merge({:all_values => all_values})) if options[:value_formatter]
+      end
+
+      private
+      def draw_marker_values(marker_values, bounds, svg, options={})
+        count = 0
+        marker_values.each do |mv|
+          # The Y co-ordinate of this marker
+          y_coord_unit = bounds[:height] / (options[:max_value] - options[:min_value])
+          marker = y_coord_unit * mv
+
+          # The Value of the Marker
+          marker_value = mv
+          marker_value = options[:value_formatter].route_format(marker_value, count,
options.merge({:all_values => marker_values})) if options[:value_formatter]
 
+          count = count + 1
           svg.text( marker_value.to_s, 
             :x => bounds[:width], 
             :y => (bounds[:height] - marker), 
-            'font-size' => relative(8),
+            'font-size' => relative(12),
             'font-family' => options[:theme].font_family,
             :fill => ((options.delete(:marker_color_override) ||
options[:theme].marker) || 'white').to_s,
             'text-anchor' => 'end')
         end
-        
       end
     end
   end
-end
\ No newline at end of file
+end
diff --git a/lib/scruffy/layers/multi_area.rb b/lib/scruffy/layers/multi_area.rb
index 10f07e5..ec86b78 100644
--- a/lib/scruffy/layers/multi_area.rb
+++ b/lib/scruffy/layers/multi_area.rb
@@ -25,7 +25,6 @@ module Scruffy::Layers
         area_color = @area_colors[0]
         color_count = 1
       else
-        puts "Never Set Area Color"
         area_color = color
       end
 
@@ -35,13 +34,11 @@ module Scruffy::Layers
       # Draw Lower Area Polygons
       if @baselines
         # Get the Color of this Area
-        puts "Drawing Baselines"
         @baselines.sort! {|x,y| y <=> x }
         @baselines.each do |baseline|
           if color_count
             area_color = area_colors[color_count]
             color_count = color_count + 1
-            puts area_color.to_s
             if color_count >= area_colors.size
               color_count = 0
             end
@@ -116,4 +113,4 @@ module Scruffy::Layers
       return (height.to_f - (height.to_f * relative_percent))
     end
   end
-end
\ No newline at end of file
+end
-- 
1.7.1.1

[PATCH aggregator 06/10] Added Axis component for drawing XY axis

[Martyn Taylor]

From: martyntaylor <mtaylor(a)redhat.com&gt;

---
 lib/scruffy/components.rb      |    1 +
 lib/scruffy/components/axis.rb |   19 +++++++++++++++++++
 lib/scruffy/themes.rb          |    9 +++++++++
 3 files changed, 29 insertions(+), 0 deletions(-)
 create mode 100644 lib/scruffy/components/axis.rb

diff --git a/lib/scruffy/components.rb b/lib/scruffy/components.rb
index 5f96283..7e8bc83 100644
--- a/lib/scruffy/components.rb
+++ b/lib/scruffy/components.rb
@@ -9,6 +9,7 @@
 module Scruffy::Components; end
 
 require 'scruffy/components/base'
+require 'scruffy/components/axis'
 require 'scruffy/components/title'
 require 'scruffy/components/background'
 require 'scruffy/components/graphs'
diff --git a/lib/scruffy/components/axis.rb b/lib/scruffy/components/axis.rb
new file mode 100644
index 0000000..f3d4a9f
--- /dev/null
+++ b/lib/scruffy/components/axis.rb
@@ -0,0 +1,19 @@
+module Scruffy
+  module Components
+    class Axis < Base
+
+      def draw(svg, bounds, options={})
+        draw_x_axis = options[:x_axis] != nil ? options[:x_axis] : true
+        draw_y_axis = options[:y_axis] != nil ? options[:y_axis] : true
+
+        if draw_x_axis
+          svg.line(:x1 => 0, :y1 => bounds[:height], :x2 => bounds[:width], :y2
=> bounds[:height], :style => "stroke: #{options[:theme].axis.to_s};
stroke-width: 1;")
+        end
+
+        if draw_y_axis
+          svg.line(:x1 => 0, :y1 => bounds[:height], :x2 => 0, :y2 => 0,
:style => "stroke: #{options[:theme].axis.to_s}; stroke-width: 1;")
+        end
+      end
+    end
+  end
+end
\ No newline at end of file
diff --git a/lib/scruffy/themes.rb b/lib/scruffy/themes.rb
index 2495ac1..1fa6078 100644
--- a/lib/scruffy/themes.rb
+++ b/lib/scruffy/themes.rb
@@ -20,6 +20,7 @@ module Scruffy::Themes
     attr_accessor :background     # Background color or array of two colors
     attr_accessor :colors         # Array of colors for data graphs
     attr_accessor :marker         # Marker color for grid lines, values, etc.
+    attr_accessor :axis           # Marker color for grid lines, values, etc.
     attr_accessor :font_family    # Font family: Not really supported.  Maybe in the
future.
 
     # Returns a new Scruffy::Themes::Base object.
@@ -35,6 +36,7 @@ module Scruffy::Themes
       self.background = descriptor[:background]
       self.colors     = descriptor[:colors]
       self.marker     = descriptor[:marker]
+      self.axis     = descriptor[:axis]
       self.font_family = descriptor[:font_family]
     end
     
@@ -62,6 +64,7 @@ module Scruffy::Themes
       super({  
               :background => [:black, '#4A465A'],
               :marker => :white, 
+              :axis => :white,
               :colors => %w(#6886B4 #FDD84E #72AE6E #D1695E #8A6EAF #EFAA43 white)
              })
     end
@@ -73,6 +76,7 @@ module Scruffy::Themes
       super({
               :background => ['#101010', '#999977'],
               :marker => :white,
+              :axis => :white,
               :colors => %w(#DD3300 #66AABB #225533 #992200)
             })
       
@@ -85,6 +89,7 @@ module Scruffy::Themes
       super({
               :background => ['#670A0A', '#831515'],
               :marker => '#DBD1C1',
+              :axis => :white,
               :colors => %w(#007777 #444477 #994444 #77FFBB #D75A20)
             })
     end
@@ -96,6 +101,7 @@ module Scruffy::Themes
       super({
               :background => ['#3B411F', '#4A465A'],
               :marker => '#DBD1C1',
+              :axis => '#DBD1C1',
               :colors => %w(#AA3322 #DD3322 #DD6644 #FFEE88 #BBCC66 #779933)
             })
     end
@@ -110,6 +116,7 @@ module Scruffy::Themes
               # :marker => :white,
               :background => [:black, '#4A465A'],
               :marker => :white,
+              :axis => :white,
               :colors => %w(#FFBBBB #00CC33 #7788BB #EEAA44 #FFDD11 #44BBDD #DD6677)
             })
     end
@@ -122,6 +129,7 @@ module Scruffy::Themes
       super({
               :background => [:black, '#4A465A'],
               :marker => :white,
+              :axis => :white,
               :colors => %w(#CC9933 #FFCC66 #CCCC99 #CCCC33 #99CC33 #3333CC #336699
#6633CC #9999CC #333366)
             })
     end
@@ -133,6 +141,7 @@ module Scruffy::Themes
       super({
               :background => ['#670A0A', '#831515'],
               :marker => '#DBD1C1',
+              :axis => '#DBD1C1',
               :colors => %w(#F2C8CA #BF545E #D2808E #97985C #B3B878 #A24550)
             })
     end
-- 
1.7.1.1

[PATCH aggregator 07/10] Added a basic renderer for simple graphs

[Martyn Taylor]

From: martyntaylor <mtaylor(a)redhat.com&gt;

---
 lib/scruffy/renderers.rb       |    1 +
 lib/scruffy/renderers/basic.rb |   20 ++++++++++++++++++++
 2 files changed, 21 insertions(+), 0 deletions(-)
 create mode 100644 lib/scruffy/renderers/basic.rb

diff --git a/lib/scruffy/renderers.rb b/lib/scruffy/renderers.rb
index e89b509..6bb4041 100644
--- a/lib/scruffy/renderers.rb
+++ b/lib/scruffy/renderers.rb
@@ -13,6 +13,7 @@
 module Scruffy::Renderers; end
 
 require 'scruffy/renderers/base'
+require 'scruffy/renderers/basic'
 require 'scruffy/renderers/empty'
 require 'scruffy/renderers/standard'
 require 'scruffy/renderers/reversed'
diff --git a/lib/scruffy/renderers/basic.rb b/lib/scruffy/renderers/basic.rb
new file mode 100644
index 0000000..98f455e
--- /dev/null
+++ b/lib/scruffy/renderers/basic.rb
@@ -0,0 +1,20 @@
+module Scruffy::Renderers
+  # ===Scruffy::Renderers::Basic
+  #
+  # Author:: Martyn Taylor
+  # Date:: July 30th 2010
+  #
+  # The Basic Renderer Creates a Blank Graph with everything ready for adding components
+  class Basic < Base
+
+    def define_layout
+      components << Scruffy::Components::Background.new(:background, :position
=> [0,0], :size =>[100, 100])
+      components << Scruffy::Components::Viewport.new(:view, :position => [2,
26], :size => [89, 66]) do |graph|
+          graph << Scruffy::Components::Graphs.new(:graphs, :position => [3, 0],
:size => [80, 89])
+          graph << Scruffy::Components::ValueMarkers.new(:values, :position =>
[0, 0], :size => [1, 89])
+          graph << Scruffy::Components::Axis.new(:values, :position => [3, 0],
:size => [80, 89])
+      end
+      yield(self.components) if block_given?
+    end
+  end
+end
\ No newline at end of file
-- 
1.7.1.1

[PATCH aggregator 08/10] Added user defined bar percentage widths

[Martyn Taylor]

From: martyntaylor <mtaylor(a)redhat.com&gt;

---
 lib/scruffy/layers/bar.rb |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/lib/scruffy/layers/bar.rb b/lib/scruffy/layers/bar.rb
index 885cda4..c746beb 100644
--- a/lib/scruffy/layers/bar.rb
+++ b/lib/scruffy/layers/bar.rb
@@ -6,9 +6,20 @@ module Scruffy::Layers
   #
   # Standard bar graph.  
   class Bar < Base
-  
+    attr_accessor :bar_width_percent
+
+    def initialize(options = {})
+      super(options)
+      @bar_width_percent = options[:bar_width] ? options[:bar_width] : nil
+    end
+
     # Draw bar graph.
     def draw(svg, coords, options = {})
+      # The percentage of space that the bar itself will fill in its allocated slot
+      if @bar_width_percent
+        @bar_width = @bar_width* @bar_width_percent
+      end
+
       coords.each do |coord|
         x, y, bar_height = (coord.first-(@bar_width * 0.5)), coord.last, (height -
coord.last)
 
@@ -19,7 +30,7 @@ module Scruffy::Layers
                     :style => "fill: black; fill-opacity: 0.15; stroke:
none;" )
 
         }
-        
+
         svg.rect( :x => x, :y => y, :width => @bar_width, :height =>
bar_height, 
                   :fill => color.to_s, 'style' => "opacity:
#{opacity}; stroke: none;" )
       end
-- 
1.7.1.1

[PATCH aggregator 09/10] Added show points field to line layer

[Martyn Taylor]

From: martyntaylor <mtaylor(a)redhat.com&gt;

---
 lib/scruffy/layers/line.rb |   24 ++++++++++++++++++------
 1 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/lib/scruffy/layers/line.rb b/lib/scruffy/layers/line.rb
index d06bdde..793e8e2 100644
--- a/lib/scruffy/layers/line.rb
+++ b/lib/scruffy/layers/line.rb
@@ -6,24 +6,36 @@ module Scruffy::Layers
   #
   # Line graph.
   class Line < Base
-    
+
+    attr_accessor :show_points
+
+    def initialize(options = {})
+      super(options)
+      @show_points = options[:show_points] != nil ? options[:show_points] : true
+    end
+
     # Renders line graph.
     def draw(svg, coords, options={})
       svg.g(:class => 'shadow', :transform =>
"translate(#{relative(0.5)}, #{relative(0.5)})") {
         svg.polyline( :points => stringify_coords(coords).join(' '), :fill
=> 'transparent', 
-                      :stroke => 'black', 'stroke-width' =>
relative(2), 
+                      :stroke => 'black', 'stroke-width' =>
relative(2),
                       :style => 'fill-opacity: 0; stroke-opacity: 0.35' )
 
-        coords.each { |coord| svg.circle( :cx => coord.first, :cy => coord.last +
relative(0.9), :r => relative(2), 
-                                          :style => "stroke-width:
#{relative(2)}; stroke: black; opacity: 0.35;" ) }
+        if @show_points
+          coords.each { |coord| svg.circle( :cx => coord.first, :cy => coord.last +
relative(0.9), :r => relative(2),
+                                           :style => "stroke-width:
#{relative(2)}; stroke: black; opacity: 0.35;" ) }
+        end
       }
 
 
-      svg.polyline( :points => stringify_coords(coords).join(' '), :fill =>
'none', 
+      svg.polyline( :points => stringify_coords(coords).join(' '), :fill =>
'none',
                     :stroke => color.to_s, 'stroke-width' => relative(2) )
 
-      coords.each { |coord| svg.circle( :cx => coord.first, :cy => coord.last, :r
=> relative(2), 
+      if @show_points
+        coords.each { |coord| svg.circle( :cx => coord.first, :cy => coord.last, :r
=> relative(2),
                                         :style => "stroke-width: #{relative(2)};
stroke: #{color.to_s}; fill: #{color.to_s}" ) }
+      end
     end
+
   end
 end
\ No newline at end of file
-- 
1.7.1.1

[PATCH aggregator 10/10] Modified graph to use user defined height

[Martyn Taylor]

From: martyntaylor <mtaylor(a)redhat.com&gt;

---
 lib/scruffy/graph.rb |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/lib/scruffy/graph.rb b/lib/scruffy/graph.rb
index 66cf2c6..9803b42 100644
--- a/lib/scruffy/graph.rb
+++ b/lib/scruffy/graph.rb
@@ -136,7 +136,7 @@ module Scruffy
       options[:theme]               ||= theme
       options[:value_formatter]     ||= value_formatter
       options[:point_markers]       ||= point_markers
-      options[:size]                ||= (options[:width] ? [options[:width],
(options.delete(:width) * 0.6).to_i] : [600, 360])
+      options[:size]                ||= [options[:width] ? options[:width] : 600,
options[:height] ? options[:height] : options[:width] ? options[:width] * 0.6 : 360]
       options[:title]               ||= title
       options[:layers]              ||= layers
       options[:min_value]           ||= bottom_value(:padded)
-- 
1.7.1.1