jagthedrummer-scruffy 0.2.12 → 0.2.14

data/lib/scruffy/layers/multi.rb

@@ -0,0 +1,74 @@
+module Scruffy::Layers
+  # ==Scruffy::Layers::Multi
+  #
+  # Author:: Jeremy Green
+  # Date:: July 29th, 2009
+  #
+  # Based on:: Scruffy::Layers::Stacked by
+  # Author:: Brasten Sager
+  # Date:: August 12th, 2006
+  #
+  # Provides a generic way for displaying multiple bar graphs side by side.  
+  class Multi < Base
+    include Scruffy::Helpers::LayerContainer
+    
+    # Returns new Multi graph.
+    #
+    # You can provide a block for easily adding layers during (just after) initialization.
+    # Example:
+    #   Multi.new do |multi|
+    #     multi << Scruffy::Layers::Line.new( ... )
+    #     multi.add(:multi_bar, 'My Bar', [...])
+    #   end
+    #
+    # The initialize method passes itself to the block, and since multi is a LayerContainer,
+    # layers can be added just as if they were being added to Graph.
+    def initialize(options={}, &block)
+      super(options)
+
+      block.call(self)    # Allow for population of data with a block during initialization.
+    end
+    
+    # Overrides Base#render to fiddle with layers' points to achieve a multi effect.
+    def render(svg, options = {})
+      #TODO ensure this works with new points
+      #current_points = points
+      layers.each_with_index do |layer,i|
+        
+        #real_points = layer.points
+        #layer.points = current_points
+        layer_options = options.dup
+ 
+        layer_options[:num_bars] = layers.size
+        layer_options[:position] = i
+        layer_options[:color] = layer.preferred_color || layer.color || options[:theme].next_color
+        layer.render(svg, layer_options)
+              
+        options.merge(layer_options)
+        
+        #layer.points = real_points
+        #layer.points.each_with_index { |val, idx| current_points[idx] -= val }
+      end
+    end
+
+    # A multi graph has many data sets.  Return legend information for all of them.
+    def legend_data
+      if relevant_data?
+        retval = []
+        layers.each do |layer|
+          retval << layer.legend_data
+        end
+        retval
+      else
+        nil
+      end
+    end
+
+    # TODO, special points accessor  
+    
+
+    def points=(val)
+      throw ArgumentsError, "Multi layers cannot accept points, only other layers."
+    end
+  end
+end

data/lib/scruffy/layers/multi_bar.rb

@@ -0,0 +1,51 @@
+module Scruffy::Layers
+  # ==Scruffy::Layers::MultiBar
+  #
+  # Author:: Jeremy Green
+  # Date:: July 29th, 2009
+  #
+  # Based on:: Scruffy::Layers::Bar by
+  # Author:: Brasten Sager
+  # Date:: August 6th, 2006
+  #
+  # Standard multi_bar graph.  
+  class MultiBar < Bar
+  
+    
+
+    protected
+    
+      # Due to the size of the bar graph, X-axis coords must 
+      # be squeezed so that the bars do not hang off the ends
+      # of the graph.
+      #
+      # Unfortunately this just mean that bar-graphs and most other graphs
+      # end up on different points.  Maybe adding a padding to the coordinates
+      # should be a graph-wide thing?
+      #
+      # Update : x-axis coords for lines and area charts should now line
+      # up with the center of bar charts.
+      
+      def generate_coordinates(options = {})
+        @point_width = (width / points.size)
+        @point_space = @point_width * 0.1
+        @point_width = @point_width - @point_space
+        @bar_width = @point_width/options[:num_bars]
+        @bar_space = @bar_width * 0.1
+        @bar_width = @bar_width * 0.9
+        
+        #options[:point_distance] = (width - (width / points.size)) / (points.size - 1).to_f
+          
+        #TODO more array work with index, try to rework to be accepting of hashes
+        coords = (0...points.size).map do |idx| 
+          
+          x_coord = (@point_width * idx) + @point_space/2 + @point_space*idx + @bar_width * options[:position] +   @bar_space*(options[:position].to_f - 0.5)
+
+          relative_percent = ((points[idx] == min_value) ? 0 : ((points[idx] - min_value) / (max_value - min_value).to_f))
+          y_coord = (height - (height * relative_percent))
+          [x_coord, y_coord]
+        end
+        coords
+      end
+  end
+end

data/lib/scruffy/version.rb

@@ -2,7 +2,7 @@ module Scruffy
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 2
-    TINY  = 9
+    TINY  = 14
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jagthedrummer-scruffy
 version: !ruby/object:Gem::Version 
-  version: 0.2.12
+  version: 0.2.14
 platform: ruby
 authors: 
 - Brasten Sager
@@ -51,6 +51,8 @@ files:
 - lib/scruffy/layers/average.rb
 - lib/scruffy/layers/line.rb
 - lib/scruffy/layers/box.rb
+- lib/scruffy/layers/multi.rb
+- lib/scruffy/layers/multi_bar.rb
 - lib/scruffy/rasterizers.rb
 - lib/scruffy/renderers.rb
 - lib/scruffy/themes.rb