motion-plot 0.4.3 → 0.4.4

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

@@ -3,7 +3,7 @@ module MotionPlot
 
     attr_reader :layer_hosting_view, :graph, :series, :plot_space, :major_grid_line_style, :plots, :xaxis, :yaxis, :title
 
-    attr_accessor :legend, :plot_symbol, :axes, :theme, :data_label, :orientation, :plot_options
+    attr_accessor :legend, :axes, :theme, :data_label, :orientation, :plot_options
 
     def bootstrap(options)
       options.each_pair {|key, value|
@@ -34,7 +34,13 @@ module MotionPlot
       @series = {}
       series = options[:series]
       series && series.each_with_index {|hash, index|
-        hash.merge!({index: index, defaults: default_style, plot_options: @plot_options, type: self.plot_type})
+        hash.reverse_merge!({
+          index: index, 
+          defaults: default_style, 
+          plot_options: @plot_options, 
+          type: self.plot_type,
+          plot_symbol: (@plot_symbol ? options[:plot_symbol] : nil)
+        })
         @series[hash[:name]] = Series.new(hash)
       }
 
@@ -46,10 +52,6 @@ module MotionPlot
         @data_label = DataLabel.new(options[:data_label])
       end
 
-      if(@plot_symbol)
-        @plot_symbol = PlotSymbol.new(options[:plot_symbol])
-      end
-
       @plots = []
     end
 
@@ -134,8 +136,8 @@ module MotionPlot
       @plot_space.allowsUserInteraction = true
     end
 
-    def add_plot_symbol(plot, index)
-      plot.plotSymbol                       = @plot_symbol.symbol_for(plot, atIndex: index)
+    def add_plot_symbol(plot, symbol)
+      plot.plotSymbol                       = symbol
       plot.plotSymbolMarginForHitDetection  = 5.0
     end
 

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

@@ -18,7 +18,7 @@ module MotionPlot
         line.delegate         = self
         line.interpolation    = CPTScatterPlotInterpolationCurved if(@curve_inerpolation)
 
-        add_plot_symbol(line, index) if(@plot_symbol)
+        add_plot_symbol(line, @series[name].plot_symbol.symbol_for(line)) if(@series[name].plot_symbol)
 
         @graph.addPlot(line)
         @plots << line

data/lib/motion-plot/core_ext/hash.rb

@@ -0,0 +1,11 @@
+class Hash
+  
+  def reverse_merge(other_hash)
+    other_hash.merge(self)
+  end
+
+  def reverse_merge!(other_hash)
+    replace(reverse_merge(other_hash))
+  end
+
+end

data/lib/motion-plot/series/series.rb

@@ -4,6 +4,7 @@ module MotionPlot
     COLORS = ['4572A7', 'AA4643', '89A54E', '80699B', '3D96AE', 'DB843D', '92A8CD', 'A47D7C', 'B5CA92']
 
     attr_accessor :name, :data, :index, :type, :style
+    attr_reader :plot_symbol
 
     def initialize(args={})
       args.each_pair {|key, value|
@@ -14,7 +15,8 @@ module MotionPlot
       merge_plot_options(style_attr, args[:plot_options])
       merge_style(style_attr, args[:style])
 
-      @style = Style.new(style_attr)
+      @style        = Style.new(style_attr)
+      @plot_symbol  = PlotSymbol.new(args[:plot_symbol].merge(index: @index)) if(args[:plot_symbol])
     end
 
     def color

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

@@ -13,18 +13,36 @@ module MotionPlot
       :snow       => "snowPlotSymbol"
     }
 
-    attr_accessor :enabled, :size
+    class << self
+      def method_missing(m, *args, &block)
+        method_name = m == :default ? :rectangle : m
+
+        raise unless(ALIASES.keys.include?(method_name))        
+
+        CPTPlotSymbol.send(ALIASES[method_name])
+      end
+
+      def [](index)
+        index = 0 if(index > 9)
+
+        send(ALIASES.keys[index])
+      end
+    end    
+
+    attr_accessor :enabled, :size, :type
 
     def initialize(options={})
       options.each_pair {|key, value|
         send("#{key}=", value) if(respond_to?("#{key}="))
       }
+
+      @type = options[:type] ? self.class.send(options[:type]) : MotionPlot::PlotSymbol[options[:index]]
     end
 
-    def symbol_for(plot, atIndex:index)
+    def symbol_for(plot)
       _style            = CPTMutableLineStyle.lineStyle
       _style.lineColor  = plot.dataLineStyle.lineColor
-      symbol            = MotionPlot::PlotSymbol[index]
+      symbol            = @type
       symbol.fill       = CPTFill.fillWithColor(plot.dataLineStyle.lineColor, colorWithAlphaComponent:0.5)
       symbol.lineStyle  = _style
       symbol.size       = CGSizeMake(size.to_f, size.to_f)
@@ -32,20 +50,8 @@ module MotionPlot
       symbol
     end
 
-    class << self
-      def method_missing(m, *args, &block)
-        method_name = m == :default ? :rectangle : m
-
-        raise unless(ALIASES.keys.include?(method_name))        
-
-        CPTPlotSymbol.send(ALIASES[method_name])
-      end
-
-      def [](index)
-        index = 0 if(index > 9)
-
-        send(ALIASES.keys[index])
-      end
+    def size
+      @size || 8
     end
   end
 end

data/lib/motion-plot/version.rb

@@ -1,3 +1,3 @@
 module MotionPlot
-  VERSION = "0.4.3"
+  VERSION = "0.4.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: motion-plot
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-18 00:00:00.000000000 Z
+date: 2013-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bubble-wrap
@@ -67,6 +67,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- .DS_Store
 - .gitignore
 - .repl_history
 - Gemfile
@@ -75,6 +76,7 @@ files:
 - Rakefile
 - app/app_delegate.rb
 - lib/motion-plot.rb
+- lib/motion-plot/.DS_Store
 - lib/motion-plot/chart/area_plot.rb
 - lib/motion-plot/chart/bar_plot.rb
 - lib/motion-plot/chart/base.rb
@@ -83,6 +85,7 @@ files:
 - lib/motion-plot/chart/delegates/stack_bar_delegate.rb
 - lib/motion-plot/chart/line_plot.rb
 - lib/motion-plot/chart/pie_plot.rb
+- lib/motion-plot/core_ext/hash.rb
 - lib/motion-plot/core_ext/ui_color.rb
 - lib/motion-plot/series/series.rb
 - lib/motion-plot/theme/theme.rb