technical_graph 0.1.2 → 0.2.0

data/README.md

@@ -123,17 +123,18 @@ size will be enlarged to maintain set distanced between axis.
 
 Legend options:
 
-* options[:legend] - draw legend, default false
+* options[:legend] - do you want to draw legend?, default false
 * options[:legend_auto] - let legend position to be chosen by algorithm, default true
 * options[:legend_width] - width used for setting proper distance while drawing on right, default 100, legend height is calculated
 * options[:legend_margin] - graph margin used not to draw legend on border, default 50
-* options[:legend_x] - legend X position, default 50
-* options[:legend_y] - legend Y position, default 50
+* options[:legend_x] - legend X position, used when options[:legend_auto] is false, default 50
+* options[:legend_y] - legend Y position, used when options[:legend_auto] is false, default 50
 
 
 Layer options Hash
 ------------------
 
+* layer_options[:label] - label used in legend
 * layer_options[:color] - color of graph layer, ex.: 'red', 'green', '#FFFF00'
 * layer_options[:antialias] - use anti-aliasing for this, default false, override options[:layers_antialias]
 

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.2.0

data/lib/technical_graph/data_layer.rb

@@ -1,5 +1,7 @@
 #encoding: utf-8
 
+require 'technical_graph/graph_color_library'
+
 # Stores only data used for one layer
 # Instances of this class are used elsewhere
 # Stores also drawing parameters for one layer
@@ -9,6 +11,9 @@ class DataLayer
   def initialize(d = [], options = { })
     @data_params = options
 
+    @data_params[:color] ||= GraphColorLibrary.instance.get_color
+    @data_params[:label] ||= ''
+
     # set data and append initial data
     clear_data
     append_data(d)
@@ -33,7 +38,7 @@ class DataLayer
 
   # Color of
   def color
-    return @data_params[:color] || 'blue'
+    return @data_params[:color]
   end
 
   def antialias
@@ -41,7 +46,7 @@ class DataLayer
   end
 
   def label
-    return @data_params[:label] || '' #'data'
+    return @data_params[:label]
   end
 
   # Clear data

data/lib/technical_graph/graph_color_library.rb

@@ -0,0 +1,52 @@
+#encoding: utf-8
+
+require 'singleton'
+
+# Used for auto color grabber
+
+class GraphColorLibrary
+  include Singleton
+  
+  # http://www.imagemagick.org/script/color.php
+  BASIC_COLORS = [
+    'blue',
+    'red',
+    'green',
+    'purple'
+  ]
+
+  ADDITIONAL_COLORS = [
+    'tomato',
+    'sienna1',
+    'chocolate2',
+    'DarkGoldenrod4',
+    'OliveDrab4',
+    'ForestGreen',
+    'turquoise',
+    'DarkCyan',
+    'CadetBlue4',
+    'DeepSkyBlue4',
+    'DodgerBlue2',
+    'CornflowerBlue',
+    'MidnightBlue',
+    'MediumPurple3',
+    'magenta4',
+    'orchid4',
+    'DeepPink3',
+    'PaleVioletRed4',
+    'firebrick3'
+  ]
+
+  FAIL_COLOR = 'black'
+
+  def initialize
+    @colors = BASIC_COLORS + ADDITIONAL_COLORS.sort {rand}
+  end
+
+  def get_color
+    color = @colors.shift
+    return FAIL_COLOR if color.nil?
+    return color
+  end
+
+end

data/test/test_technical_autocolor.rb

@@ -0,0 +1,91 @@
+require 'helper'
+
+class TestTechnicalAutocolor < Test::Unit::TestCase
+  context 'initial options' do
+    should 'draw multilayer graph' do
+      @tg = TechnicalGraph.new(
+        {
+          :truncate_string => "%.1f",
+
+          :x_axis_label => 'x',
+          :y_axis_label => 'y',
+
+          :axis_antialias => true,
+          :layers_antialias => true,
+          :font_antialias => true,
+
+          :layers_font_size => 11,
+          :axis_font_size => 11,
+          :axis_label_font_size => 20,
+
+          #:x_axis_count => 20,
+          #:y_axis_count => 20,
+          #:x_axis_interval => 1.0,
+          #:y_axis_interval => 1.0,
+          #:x_axis_fixed_interval => false,
+          #:y_axis_fixed_interval => false,
+
+          #:x_min => -10.0,
+          #:x_max => 10.0,
+          #:y_min => -10.0,
+          #:y_max => 10.0,
+
+          #:width => 4000,
+          #:height => 3000,
+
+          :legend => true,
+          :legend_auto => true,
+          :legend_width => 90,
+          :legend_margin => 60,
+          :legend_x => 50,
+          :legend_y => 50,
+        }
+      )
+
+      max = 50
+
+      # adding simple layer
+      layer_params_a = {
+        :antialias => true,
+        :label => 'first'
+      }
+      layer_params_b = {
+        :antialias => true,
+        :label => 'second'
+      }
+      layer_params_c = {
+        :antialias => true,
+        :label => 'third'
+      }
+      layer_params_d = {
+        :antialias => true,
+        :label => 'fourth'
+      }
+      layer_data_a = Array.new
+      layer_data_b = Array.new
+      layer_data_c = Array.new
+      layer_data_d = Array.new
+      (0..max).each do |i|
+        layer_data_a << { :x => -10.0 + i.to_f, :y => 10.0 * Math.cos(i.to_f * (4.0 * 3.14 / max.to_f)) }
+        layer_data_b << { :x => -10.0 + i.to_f, :y => 10.0 * Math.cos(0.3 + i.to_f * (4.0 * 3.14 / max.to_f)) }
+        layer_data_c << { :x => -10.0 + i.to_f, :y => 10.0 * Math.cos(0.6 + i.to_f * (4.0 * 3.14 / max.to_f)) }
+        layer_data_d << { :x => -10.0 + i.to_f, :y => 10.0 * Math.cos(0.9 + i.to_f * (4.0 * 3.14 / max.to_f)) }
+      end
+      @tg.add_layer(layer_data_a, layer_params_a)
+      @tg.add_layer(layer_data_b, layer_params_b)
+      @tg.add_layer(layer_data_c, layer_params_c)
+      @tg.add_layer(layer_data_d, layer_params_d)
+
+
+      @tg.layers.last.data.size.should > 0
+      @tg.layers.size.should == 4
+
+      @tg.render
+
+      @tg.image_drawer.save_to_file('test_autocolor.png')
+      @tg.image_drawer.to_png.class.should == String
+
+    end
+  end
+
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: technical_graph
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 1
   - 2
-  version: 0.1.2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Aleksander Kwiatkowski
@@ -123,9 +123,11 @@ files:
 - lib/technical_graph.rb
 - lib/technical_graph/data_layer.rb
 - lib/technical_graph/graph_axis.rb
+- lib/technical_graph/graph_color_library.rb
 - lib/technical_graph/graph_data_processor.rb
 - lib/technical_graph/graph_image_drawer.rb
 - test/helper.rb
+- test/test_technical_autocolor.rb
 - test/test_technical_axis_enlarge.rb
 - test/test_technical_graph.rb
 - test/test_technical_graph_axis.rb