motion-plot 0.4.5 → 0.4.6

data/README.md

@@ -1,22 +1,25 @@
 # Motion::Plot
 
-Build native charts as you are used with Highcharts/D3. This library is a wrapper on top of [CorePlot](https://code.google.com/p/core-plot/), the iOS plotting framework to build native chart using CoreAnimation, Core Data and Cocoa Bindings
+Build native interactive charts using simple JSON as you are used with Highcharts. 
+This library is a wrapper on top of [CorePlot](https://code.google.com/p/core-plot/), the iOS plotting framework to build native chart using CoreAnimation, Core Data and Cocoa Bindings
 
 ## Installation
 
-Add this line to your application's Gemfile:
+1. Add this line to your application's Gemfile:
 
     `gem 'motion-plot'`
 
-And then execute:
+  And then execute:
 
     $ bundle
 
-Or install it yourself as:
+  Or install it yourself as:
 
     $ gem install motion-plot
 
-And add `require 'motion-plot'` to your `Gemfile`
+  And add `require 'motion-plot'` to your `Gemfile`
+
+2. Run 'pod setup' to install core-plot as pod on your local
 
 ## Usage
 

data/lib/motion-plot/chart/bar_plot.rb

@@ -10,7 +10,7 @@ module MotionPlot
 
       bar_x               = CPDBarInitialX
       @data_hash          = {}
-      horizontal_bar      = (@plot_options.bar[:orientation] == "vertical") ? true : false
+      horizontal_bar      = (@plot_options and @plot_options.bar[:orientation] == "vertical") ? true : false
       @delegate_object    = case @stacking
       when "normal"
         StackBarDelegate.new(self)
@@ -48,7 +48,7 @@ module MotionPlot
 
     def animate(bar)
       bar.anchorPoint             = [0.0, 0.0]
-      scale_direction             = (@plot_options.bar[:orientation] == "vertical") ? "transform.scale.x" : "transform.scale.y"
+      scale_direction             = (@plot_options and @plot_options.bar[:orientation] == "vertical") ? "transform.scale.x" : "transform.scale.y"
       scaling                     = CABasicAnimation.animationWithKeyPath(scale_direction)
       scaling.fromValue           = 0.0
       scaling.toValue             = 1.0

data/lib/motion-plot/chart/delegates/bar_delegate.rb

@@ -1,15 +1,5 @@
 module MotionPlot
-  class BarDelegate
-
-    # delegate :series, :to => :delegated_to
-
-    def initialize(source)
-      @delegated_to = source
-    end
-
-    def numberOfRecordsForPlot(plot)
-      @delegated_to.series[plot.identifier].data.size
-    end
+  class BarDelegate < BaseDelegate
 
     def numberForPlot(plot, field:field_enum, recordIndex:index)
       data  = @delegated_to.series[plot.identifier].data

data/lib/motion-plot/chart/delegates/base_delegate.rb

@@ -0,0 +1,13 @@
+module MotionPlot
+  class BaseDelegate
+
+    def initialize(source)
+      @delegated_to = source
+    end
+
+    def numberOfRecordsForPlot(plot)
+      @delegated_to.series[plot.identifier].data.size
+    end
+
+  end
+end

data/lib/motion-plot/chart/delegates/beizer_curve_delegate.rb

@@ -0,0 +1,40 @@
+module MotionPlot
+  class BeizerCurveDelegate < BaseDelegate
+
+    def numberOfRecordsForPlot(plot)
+      step_size = @delegated_to.plot_options.line[:step_size] || 1
+      p @delegated_to.plot_options.line[:data_size] / step_size
+      @delegated_to.plot_options.line[:data_size] / step_size
+    end
+
+    # This implementation of this method will put the line graph in a fix position so it won't be scrollable.
+    def plotSpace(space, willChangePlotRangeTo:new_range, forCoordinate:coordinate)
+      (coordinate == CPTCoordinateY) ? space.yRange : space.xRange
+    end
+
+    def scatterPlot(plot, plotSymbolWasSelectedAtRecordIndex:index)
+      if(@delegated_to.data_label and @delegated_to.data_label.annotation)
+        @delegated_to.graph.plotAreaFrame.plotArea.removeAnnotation(@delegated_to.data_label.annotation)
+        @delegated_to.data_label.annotation = nil
+      end
+
+      y_value = @delegated_to.series[plot.identifier].data[index].round(2)
+      @delegated_to.graph.plotAreaFrame.plotArea.addAnnotation(@delegated_to.data_label.annotation_for(y_value, atCoordinate: [index, y_value], plotSpace: @delegated_to.graph.defaultPlotSpace))
+    end
+
+    def numberForPlot(plot, field:field_enum, recordIndex:index)
+
+      case field_enum
+      when CPTScatterPlotFieldY
+        num = index
+      when CPTScatterPlotFieldX
+        p @delegated_to.series[plot.identifier].data
+
+        num = @delegated_to.series[plot.identifier].data.call(index)
+      end
+      
+      num
+    end    
+  
+  end
+end

data/lib/motion-plot/chart/delegates/line_delegate.rb

@@ -0,0 +1,26 @@
+module MotionPlot
+  class LineDelegate < BaseDelegate
+
+    # This implementation of this method will put the line graph in a fix position so it won't be scrollable.
+    def plotSpace(space, willChangePlotRangeTo:new_range, forCoordinate:coordinate)
+      (coordinate == CPTCoordinateY) ? space.yRange : space.xRange
+    end
+
+    def scatterPlot(plot, plotSymbolWasSelectedAtRecordIndex:index)
+      if(@delegated_to.data_label and @delegated_to.data_label.annotation)
+        @delegated_to.graph.plotAreaFrame.plotArea.removeAnnotation(@delegated_to.data_label.annotation)
+        @delegated_to.data_label.annotation = nil
+      end
+
+      y_value = @delegated_to.series[plot.identifier].data[index].round(2)
+      @delegated_to.graph.plotAreaFrame.plotArea.addAnnotation(@delegated_to.data_label.annotation_for(y_value, atCoordinate: [index, y_value], plotSpace: @delegated_to.graph.defaultPlotSpace))
+    end
+
+    def numberForPlot(plot, field:field_enum, recordIndex:index)
+      data  = @delegated_to.series[plot.identifier].data
+
+      (field_enum == CPTScatterPlotFieldY) ? data[index] : index
+    end
+
+  end
+end

data/lib/motion-plot/chart/delegates/percent_bar_delegate.rb

@@ -1,15 +1,11 @@
 module MotionPlot
-  class PercentBarDelegate
+  class PercentBarDelegate < BaseDelegate
 
     def initialize(source)
-      @delegated_to = source
+      super
       @number_of_plots = @delegated_to.series.keys.size
     end
 
-    def numberOfRecordsForPlot(plot)
-      @delegated_to.series[plot.identifier].data.size
-    end
-
     def numberForPlot(plot, field:field_enum, recordIndex:index)
       case field_enum
       when CPTBarPlotFieldBarLocation

data/lib/motion-plot/chart/delegates/stack_bar_delegate.rb

@@ -1,16 +1,8 @@
 module MotionPlot
-  class StackBarDelegate
+  class StackBarDelegate < BaseDelegate
 
     # consign :series, :to => :delegated_to
-
-    def initialize(source)
-      @delegated_to = source
-    end
-
-    def numberOfRecordsForPlot(plot)
-      @delegated_to.series[plot.identifier].data.size
-    end
-
+    
     def numberForPlot(plot, field:field_enum, recordIndex:index)
       case field_enum
       when CPTBarPlotFieldBarLocation

data/lib/motion-plot/chart/line_plot.rb

@@ -2,6 +2,12 @@ module MotionPlot
   class Line < Base
 
     def add_series
+      @delegate_object = if(@plot_options and @plot_options.line[:beizer]) 
+        BeizerCurveDelegate.new(self) 
+      else
+        LineDelegate.new(self)
+      end
+
       @series.keys.each_with_index do |name, index|
         line                  = CPTScatterPlot.alloc.initWithFrame(CGRectNull)
         line.identifier       = name
@@ -12,9 +18,9 @@ module MotionPlot
         line_style.lineColor  = @series[name].color
 
         line.dataLineStyle    = line_style
-        line.dataSource       = self
-        line.delegate         = self
-        line.interpolation    = CPTScatterPlotInterpolationCurved if(@plot_options.line[:curve_inerpolation])
+        line.dataSource       = @delegate_object
+        line.delegate         = @delegate_object
+        line.interpolation    = CPTScatterPlotInterpolationCurved if(@plot_options and @plot_options.line[:curve_inerpolation])
 
         add_plot_symbol(line, @series[name].plot_symbol.symbol_for(line)) if(@series[name].plot_symbol)
 
@@ -23,31 +29,6 @@ module MotionPlot
       end
     end
 
-    # This implementation of this method will put the line graph in a fix position so it won't be scrollable.
-    def plotSpace(space, willChangePlotRangeTo:new_range, forCoordinate:coordinate)
-      (coordinate == CPTCoordinateY) ? space.yRange : space.xRange
-    end
-
-    def scatterPlot(plot, plotSymbolWasSelectedAtRecordIndex:index)
-      if(@data_label and @data_label.annotation)
-        @graph.plotAreaFrame.plotArea.removeAnnotation(@data_label.annotation)
-        @data_label.annotation = nil
-      end
-
-      y_value = @series[plot.identifier].data[index].round(2)
-      @graph.plotAreaFrame.plotArea.addAnnotation(@data_label.annotation_for(y_value, atCoordinate: [index, y_value], plotSpace: @graph.defaultPlotSpace))
-    end
-
-    def numberOfRecordsForPlot(plot)
-      @series[plot.identifier].data.size
-    end
-
-    def numberForPlot(plot, field:field_enum, recordIndex:index)
-      data  = @series[plot.identifier].data
-
-      (field_enum == CPTScatterPlotFieldY) ? data[index] : index
-    end
-
     protected
     def default_style
       {

data/lib/motion-plot/chart/pie_plot.rb

@@ -18,6 +18,7 @@ module MotionPlot
 
       animate(pie)
       @graph.addPlot(pie)
+      @plots << pie
     end
 
     def default_padding

data/lib/motion-plot/utilities/legend.rb

@@ -35,9 +35,7 @@ module MotionPlot
       legend.cornerRadius = corner_radius
       legend.swatchSize   = swatch_size
       legend.textStyle    = TextStyle.cpt_text_style(@style) if(@style)
-
-      p @style
-      
+            
       legend
     end
 

data/lib/motion-plot/version.rb

@@ -1,3 +1,3 @@
 module MotionPlot
-  VERSION = "0.4.5"
+  VERSION = "0.4.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: motion-plot
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-22 00:00:00.000000000 Z
+date: 2013-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bubble-wrap
@@ -81,6 +81,9 @@ files:
 - lib/motion-plot/chart/bar_plot.rb
 - lib/motion-plot/chart/base.rb
 - lib/motion-plot/chart/delegates/bar_delegate.rb
+- lib/motion-plot/chart/delegates/base_delegate.rb
+- lib/motion-plot/chart/delegates/beizer_curve_delegate.rb
+- lib/motion-plot/chart/delegates/line_delegate.rb
 - lib/motion-plot/chart/delegates/percent_bar_delegate.rb
 - lib/motion-plot/chart/delegates/stack_bar_delegate.rb
 - lib/motion-plot/chart/line_plot.rb