analytics_charts 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 47373931c25d1f104ceee038219ac0360a8a08fd
-  data.tar.gz: 4cbb57d8a8c73dc1123615b8b7b3288d570974d7
+  metadata.gz: 5f62eba893dde452e53244820cf1b40be9113dc5
+  data.tar.gz: ebb5743f68c3f9ee133c98664b10288032a37850
 SHA512:
-  metadata.gz: 1252d7564c2afaba34908601d2eb8bc2404a92775e3673e40ffcdaee1af1bdee7ab3c29e6ff95a66921dbaa8828c9bfe0378e3caaf23e0bd708914f0dace2f45
-  data.tar.gz: 2802140ca8c37f1661539a0504d9d3cc17375a714472f0f9f4484b10952a94f70b825e6c0389d9f51343fa7cea9de87c46539e5c362113e56d2e29dd60c72993
+  metadata.gz: 200aba6ecbc0c3ef2a84053e0389b046a810ab301b95f84eccc02cebb1dfa96bb97fc1224db272df30c89fd5bfd8028fe741db0a53d0922bd500f38fa7dcb822
+  data.tar.gz: 455a146f16bb27531f03836fb264a1496bf9e78b9d2024aabb4e7721eaecde342da2e163f23a1f1f156658929eadf72d8124c0d17f77b5f23601820b084b1106

data/README.md

@@ -1,6 +1,7 @@
 # AnalyticsCharts
 
 Custom library for a pie chart. Originated from the gruff library, but branched out.
+History of commits before can be found in my forked gruff repository.
 
 ## Installation
 
@@ -18,22 +19,21 @@ Or install it yourself as:
 
 ## Usage
 
-#!/usr/bin/env ruby
-require 'analytics-charts'
-g = AnalyticsCharts::CustomPie.new('./yourImage.png')
-hash = {
-      'fill' => 'blue',
-      'font_family' => 'Helvetica',
-      'pointsize' => 64,
-      'font_weight' => 700
-    }
-
-g.set_pie_geometry(1242,620, 250)
-g.insert_pie_data("ndaf me3", 15.1,1)
-g.insert_pie_data("ndaf me4", 15,3)
-g.insert_pie_data("ndaf me2", 15.7,2)
-g.insert_pie_data("ndaf me1", 300.22,0)
-g.write
+
+	require 'analytics_charts'
+	g = AnalyticsCharts::CustomPie.new('./yourImage.png')
+	hash = {
+	      'fill' => 'blue',
+	      'font_family' => 'Helvetica',
+	      'pointsize' => 64,
+	      'font_weight' => 700
+	    }
+	g.set_pie_geometry(1242,620, 250)
+	g.insert_pie_data("ndaf me3", 15.1,1)
+	g.insert_pie_data("ndaf me4", 15,3)
+	g.insert_pie_data("ndaf me2", 15.7,2)
+	g.insert_pie_data("ndaf me1", 300.22,0)
+	g.write
 
 ## Contributing
 

data/lib/analytics_charts/custom_pie.rb

@@ -5,17 +5,30 @@ class AnalyticsCharts::CustomPie
   attr_accessor :pie_center_x
   attr_accessor :pie_center_y
   attr_accessor :pie_radius
-
-  def initialize(image_path)
+  attr_accessor :label_hash
+  attr_accessor :pie_label_hash
+  attr_accessor :label_start_x
+  attr_accessor :label_start_y
+  attr_accessor :label_offset
+  def initialize(image_path, label_hash, pie_label_hash)
     @base_image = Image.read(image_path)[0]
     @d = Draw.new
     @data = Hash.new # Value is array with two items
     @aggregate = Array([0,0,0,0]) # Cluster brands into categories
     @columns = @base_image.columns
     @rows = @base_image.rows
+    @label_hash = Hash.new
+    @pie_label_hash = Hash.new
+    @label_hash = label_hash if label_hash
+    @pie_label_hash = pie_label_hash if pie_label_hash
     set_pie_colors(%w(#AD1F25 #BE6428 #C1B630 #1E753B))
   end
 
+  def set_label_values(label_start_x, label_start_y, label_offset)
+    @label_start_x = label_start_x
+    @label_start_y = label_start_y
+    @label_offset = label_offset
+  end
   def set_pie_geometry(x, y, radius)
     @pie_center_x = x
     @pie_center_y = y
@@ -130,35 +143,42 @@ class AnalyticsCharts::CustomPie
   end
 
   def draw_labels
-    @d.pointsize = 56
     @d.align = LeftAlign
     sorted_data = @data.sort_by{|key,value| -value[1]} # Sort by descending quality
-    x_offset = 180 #HARD CODED, fix later
-    y_offset = 440 #HARD CODED
+    x_offset = @label_start_x
+    y_offset = @label_start_y
     for data in sorted_data
       if data[1][0] > 0 # Amount > 0
         font_weight = 900 # Very Bold
         text = data[0] + ' <--'
       else
         text = data[0]
-        font_weight = 900 # Normal
+        font_weight = 900 # Very Bold
       end
       case data[1][1]
         when 3
-          insert_text(x_offset, y_offset, text, {'fill'=> '#1E753B', 'font_weight'=> font_weight })
+          # label_hash gets merged and overrided by fill and font_weight.
+          insert_text(x_offset, y_offset, text,
+            @label_hash.merge({'fill'=> '#1E753B', 'font_weight'=> font_weight }))
         when 2
-          insert_text(x_offset, y_offset, text, {'fill'=> '#C1B630', 'font_weight'=> font_weight })
+          insert_text(x_offset, y_offset, text,
+            @label_hash.merge({'fill'=> '#C1B630', 'font_weight'=> font_weight }))
         when 1
-          insert_text(x_offset, y_offset, text, {'fill'=> '#BE6428', 'font_weight'=> font_weight })
+          insert_text(x_offset, y_offset, text,
+           @label_hash.merge({'fill'=> '#BE6428', 'font_weight'=> font_weight }))
         when 0
-          insert_text(x_offset, y_offset, text, {'fill'=> '#AD1F25', 'font_weight'=> font_weight })
+          insert_text(x_offset, y_offset, text,
+            @label_hash.merge({'fill'=> '#AD1F25', 'font_weight'=> font_weight }))
       end
-      y_offset += 60 #HARD CODED, fix later
+      y_offset += @label_offset
     end
   end
 
   def draw_pie_label(center_x, center_y, angle, radius, percent)
-    @d.pointsize = 56 #HARD CODED, fix later
+    #気を付けて、get_type_metrics depends on font and pointsize, image res so need to set those first
+    # See more at http://studio.imagemagick.org/RMagick/doc/draw.html#get_type_metrics
+    @d.font = @pie_label_hash['font'] if @pie_label_hash['font']
+    @d.pointsize = @pie_label_hash['pointsize'] if @pie_label_hash['pointsize']
     width = @d.get_type_metrics(@base_image, percent.to_s).width
     ascent =  @d.get_type_metrics(@base_image, percent.to_s).ascent
     descent =  @d.get_type_metrics(@base_image, percent.to_s).descent
@@ -181,31 +201,36 @@ class AnalyticsCharts::CustomPie
       y -= (ascent / 2.0 - descent) # descent to account for '$' descent,
       # descent value retrieved is negative, so sub instead of add
     end
-
     @d.align = CenterAlign
-    insert_text(x, y, percent, {'fill'=> 'black', 'font_weight'=> 700})
+    # Provide default fill of black
+    insert_text(x, y, percent, {'fill'=> 'black'}.merge(@pie_label_hash))# {'fill'=> 'black', 'font_weight'=> 700, 'pointsize'=>48})
   end
 
   def set_feature(feature, attribute)
-    case feature
-      when 'fill'
-        @d.fill = attribute
-      when 'font'
-        @d.font = attribute
-      when 'font_family'
-        @d.font_family = attribute
-      when 'font_stretch'
-        @d.font_stretch = attribute
-      when 'font_style'
-        @d.font_style = attribute
-      when 'font_weight'
-        @d.font_weight = attribute
-      when 'stroke'
-        @d.stroke = attribute
-      when 'pointsize'
-        @d.pointsize = attribute
-      when 'text_undercolor'
-        @d.undercolor = attribute
+    begin
+      case feature
+        when 'fill'
+          @d.fill = attribute
+        when 'font'
+          @d.font = attribute
+        when 'font_family'
+          @d.font_family = attribute
+        when 'font_stretch'
+          @d.font_stretch = attribute
+        when 'font_style'
+          @d.font_style = attribute
+        when 'font_weight'
+          @d.font_weight = attribute
+        when 'stroke'
+          @d.stroke = attribute
+        when 'pointsize'
+          @d.pointsize = attribute
+        when 'text_undercolor'
+          @d.undercolor = attribute
+      end
+    rescue
+      puts "Tried to set #{feature} to #{attribute}"
+      puts $!, $@
     end
   end
 end

data/lib/analytics_charts/version.rb

@@ -1,3 +1,3 @@
 module AnalyticsCharts
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: analytics_charts
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - STEPHEN YU
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-07 00:00:00.000000000 Z
+date: 2015-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler