gerbilcharts 0.10.1 → 0.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8cfbb968e895a1b19ac3ee0bbb5fbea7c3efab67
-  data.tar.gz: c98f2a149352ece738bbf9c3cfe822b174a74da7
+  metadata.gz: ae218d88a23763effecb15e0346be1bf3eccd45d
+  data.tar.gz: c3eeeb771b06434aebf930fb4f1fea46c1a6c706
 SHA512:
-  metadata.gz: 76d03d90f2810c6065e04fb134714472fe8d4507a75a6436b90ba392c15406fd5a138c391e8647e44ae43285357be40882efb6529c2d0848f68581249aaa63c6
-  data.tar.gz: 792deb97e26e7b9ca61e19eba9fe4d36eb1101c80e0d3e362a7e612c325394a8618c9b36e09d889a3e2c2407f21cb1a971c2b016b5272c1510e83dc16bad7ddb
+  metadata.gz: 365f4a57e66319c8a216c08d98e765b8be019976a71d4f6212c2bdbd1d139568ff9be9263471a6e3c2b9cfcf0c92f139d284ba3a624c19a61a24a1f321cca959
+  data.tar.gz: c03e0890545ad1681c4980fdd37161a81d13cad70d124b843b8074914bddd55e8775a278a3bb305e3d4a9a1ea7027e67adc04b5bde60827c77266c19b02c4193

data/lib/gerbilcharts/surfaces/line_surface.rb

@@ -26,6 +26,11 @@ class LineSurface < Surface
     ry.update(-ry.rmax) if butterfly 
     set_ajaxSurfaceContext(rx.rmax,ry.rmax,"LINE") if parent.usesAjax?
 
+
+	  draw_ref_model_lines(g,rx,ry) 
+      draw_range_bands(g,rx,ry) 
+      draw_annotations(g,rx,ry) 
+
     parent.modelgroup.each_model_with_index do |mod,i|
       mod.each_tuple do |x,y|
   	    y = -y if butterfly and i.odd?
@@ -55,11 +60,6 @@ class LineSurface < Surface
       g.endline(:id => "lineitem#{i}")
     end
 
-	  draw_ref_model_lines(g,rx,ry) 
-
-      draw_range_bands(g,rx,ry) 
-
-      draw_annotations(g,rx,ry) 
 
   end
 

data/lib/gerbilcharts/surfaces/rect.rb

@@ -82,6 +82,15 @@ class Rect
       @bottom-@top
   end
 
+  def intersect_point(x,y)
+    x = [ x, @left].max
+    x = [ x, @right].min
+    y = [ y, @top].max
+    y = [ y, @bottom].min
+
+    return x,y
+  end
+
   def translate_x(newx)
 	w=width
 	@left=newx

data/lib/gerbilcharts/surfaces/surface.rb

@@ -95,16 +95,13 @@ class Surface < GraphElement
 			xpos = scale_x anno[:x],rx
 			ypos = scale_y anno[:y],ry
 
-			if ypos - 20 > @bounds.top + 10 
-				g.line  xpos,ypos, xpos, ypos-20 
-				g.textout(xpos, ypos-20, anno[:label], {:class => "reflinelabel"})
-			else
-				rh  = @bounds.rand_h
-				g.line  xpos,ypos, xpos, rh 
-				g.textout(xpos, rh, anno[:label], {:class => "reflinelabel"})
-			end
-
-			g.circle(xpos,ypos,5)
+            xlab,ylab =  @bounds.intersect_point( xpos + rand(-100..-30), ypos+rand(-5..+80))
+
+            g.line  xpos,ypos, xlab, ylab, {:style => "stroke: #bbb"} 
+            g.textout(xlab, ylab, anno[:label], {:class => "legendtext", :style => "text-anchor:middle"})
+           
+
+			g.circle(xpos,ypos,2)
 
 	  end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gerbilcharts
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.10.2
 platform: ruby
 authors:
 - vivek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-19 00:00:00.000000000 Z
+date: 2015-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda