svg-lib 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1838ec9557c2332e4ca7a8daa07b3d3d64ae0aebccd8d373f88bcbec7a2ee5fd
-  data.tar.gz: f5b7bdf0371fd15426349d87e9cf80204aae66d4c719f26088830c400f22bf27
+  metadata.gz: c8f8207432872d10688057afbacf6cc999b9ff5faa8d00b7275544fe9849e2d1
+  data.tar.gz: ed17273e56404503fb201f50508cdcdef727f84e003e3bd51ae82e76be157282
 SHA512:
-  metadata.gz: 1ec3399c2bb0cdf2a8da8acd9c83513d2e7563a4c0db4a81a3c74b9d587417edec65a34fec9671b18a07818e1e34766fb01bffff7a74c5768ab624cebe27e5b2
-  data.tar.gz: fea5449f4ccf671806db77cc29cfc9e48c53063324e6f20d5be2799fd9b627bb788cfee0564e3b94a76b5d5cd2398dbbdb009ea8db3c238b9b90f776b9079faa
+  metadata.gz: 93f86a3d95912ce0368ea653dde8b0290bbbbf6005dc237916fadad8989d98fd2702b4b606d5fe17bbdfb39b3becf3f9fa02cf6d6c2d65c0b1f5cfe00b7ca2b1
+  data.tar.gz: b47ee1352fd8e04ee36a5e3b44166b0d3f951102cef8f2d9636f4be0fe7fe4bc9220dd6c6222771f02028312535dfa22808c5592da67bfca29147980e8738922

data/bin/eplot

@@ -28,6 +28,17 @@ opts[:width] = 800
 opts[:height] = 800
 opts[:noaxis] = false
 
+opts[:lpad] = 100
+opts[:rpad] = 50
+opts[:tpad] = 100
+opts[:bpad] = 100
+opts[:xaxfmt] = "%-0.4f"
+opts[:yaxfmt] = "%-0.4f"
+
+opts[:xrng] = nil 
+
+opts[:legendfontsize] = 14
+
 progname = File.basename($PROGRAM_NAME,File.extname($PROGRAM_NAME))
 parser = OptionParser.new do |parser|
   parser.banner = <<~banner 
@@ -106,6 +117,39 @@ parser = OptionParser.new do |parser|
     opts[:labels] = list.split(",")
   end 
 
+  parser.on("--noaxis") do 
+    opts[:noaxis] = true
+  end 
+
+  parser.on("--lpad=INT", "left padding in px") do |int|
+    opts[:lpad] = int.to_i
+  end 
+  parser.on("--rpad=INT", "right padding in px") do |int|
+    opts[:rpad] = int.to_i
+  end 
+  parser.on("--tpad=INT", "top padding in px") do |int|
+    opts[:tpad] = int.to_i 
+  end 
+  parser.on("--bpad=INT", "bottom padding in px") do |int|
+    opts[:bpad] = int.to_i 
+  end 
+
+  parser.on("--legendfontsize=INT" "legend font size in px") do |int|
+    opts[:legendfontsize] = int.to_i 
+  end 
+
+  parser.on("--xaxfmt=STR", "format for x axis labels") do |str|
+    opts[:xaxfmt] = str
+  end 
+
+  parser.on("--yaxfmt=STR", "format for y axis labels") do |str|
+    opts[:yaxfmt] = str
+  end 
+
+  parser.on("--xrng=\"FLOAT,FLOAT\"", "range for x labels when only one column is given") do |str|
+    b,e = str.split(",").map{|e| e.to_f}
+    opts[:xrng] = (b..e)
+  end 
 
   parser.on("-h","--help","shows this message") do 
     STDERR.puts parser
@@ -129,7 +173,7 @@ end
 
 # MAIN PROGRAM ================================================================
 
-SVG.new(x: 0.0, y: 0.0, width: opts[:width], height: opts[:height],font_family: "monospaced") do |svg|
+SVG.new(x: 0.0, y: 0.0, width: opts[:width], height: opts[:height],) do |svg|
   plt = SVG::Plot.new(svg)
   plt.title = opts[:title];
   plt.xlabel = opts[:xlabel];
@@ -139,6 +183,14 @@ SVG.new(x: 0.0, y: 0.0, width: opts[:width], height: opts[:height],font_family:
   plt.miny   = opts[:miny] || plt.miny
   plt.maxy   = opts[:maxy] || plt.maxy
 
+  plt.padleft = opts[:lpad]
+  plt.padright = opts[:rpad]
+  plt.padtop  = opts[:tpad]
+  plt.padbottom = opts[:bpad]
+  plt.legendfontsize = opts[:legendfontsize]
+
+  plt.xlabelformat = opts[:xaxfmt]
+  plt.ylabelformat = opts[:yaxfmt]
 
   datavar = []
   data    = []
@@ -161,7 +213,9 @@ SVG.new(x: 0.0, y: 0.0, width: opts[:width], height: opts[:height],font_family:
       x = data.map{|e| e[0]}   
       data = data.map{|e| e[1]}
     else
-      x = (1 .. data.size).to_a.map{|e| e.to_f}
+      rng = opts[:xrng] || (0...data.size)
+      rngstep = (rng.end - rng.begin).to_f/(data.size-1)
+      x = rng.step(rngstep).to_a.map{|e| e}
       data = data.map{|e| e[0]}
     end 
 
@@ -172,23 +226,25 @@ SVG.new(x: 0.0, y: 0.0, width: opts[:width], height: opts[:height],font_family:
   plt.minmax(rawx,rawdata,xlog: opts[:xlog], ylog: opts[:ylog])
 
   
-  yticks,ylabels = plt.yticks(log: opts[:ylog])
+  yticks,ylabels = plt.yticks
   if opts[:boxplot]
     plt.boxplot(rawdata,ylog: opts[:ylog],labels: opts[:labels])
     xticks,xlabels = plt.boxplotticks(rawdata.size)
     xlabels = ["",*opts[:labels],""]
     plt.axis(xticks,xlabels,stroke: "black",fill: "black",flip: true,rotang: -15) unless opts[:noaxis]
   else
-    xticks,xlabels = plt.xticks(log: opts[:xlog]) 
+    xticks,xlabels = plt.xticks
     rawdata.each_with_index do |y,i|
       if opts[:scatterplot]
         plt.scatter(rawx[i],y,
           ylog: opts[:ylog],
+          xlog: opts[:xlog],
           label: opts[:labels][i],
           marker: opts[:markers][i])
       else
         plt.plot(rawx[i],y,
           ylog: opts[:ylog],
+          xlog: opts[:xlog],
           label: opts[:labels][i],
           marker: opts[:markers][i],
           linestyle: opts[:linestyles][i])

data/lib/plot2d.rb

@@ -18,8 +18,8 @@ class SVG
       return @@markers 
     end 
     @@linestyles = [
-      "-","--","-.",":","3","10 1","10 5","5 10","5 2 2 5","2 10",
-      "2 10","5 2 2 5","5 10","10 5","10 1","3",":","-.","--","-"
+      "-","--","-.",":","3","10 1","10 5","5 10","5 2 2 5","3 10",
+      "3 10","5 2 2 5","5 10","10 5","10 1","3",":","-.","--","-"
     ] * 2
     def self.linestyles
       return @@linestyles
@@ -27,32 +27,13 @@ class SVG
   
     attr_accessor :minx,:maxx,:miny,:maxy
 
-    def minmax(x,y,xlog: false,ylog: false)
-      miny,maxy = y.flatten.minmax
-      @miny = miny unless (@miny && @miny.finite?)
-      @maxy = maxy unless (@maxy && @maxy.finite?)
-      
-      if ylog 
-        @miny = Math.log([1e-12,@miny].max,10)
-        @maxy = Math.log(@maxy,10)
-      end 
-      minx,maxx = x.flatten.minmax 
-      @minx = minx unless (@minx && @minx.finite?)
-      @maxx = maxx unless (@maxx && @maxx.finite?)
-
-      if xlog 
-        @minx = Math.log([1e-12,@minx].max,10)
-        @maxx = Math.log(@maxx,10)
-      end 
-    end 
-
     attr_accessor :padleft, :padright,:padtop,:padbottom,:colors,:labels,:markers,
       :linestyles,:opacities,:linewidth
 
 
     attr_accessor :markernum,:markersize
     attr_accessor :xlabel,:ylabel,:axcolor,:axlinewidth,:axlabelstrokewidth,
-      :axlabelfontsize
+      :axlabelfontsize,:xlabelformat,:ylabelformat
     attr_accessor :ticksnum,:tickslen,:tickstextlen,:ticksfontsize,:ticksstrokewidth
     attr_accessor :legendfontsize,:legendbgcolor,:legendbgopacity,:legendfgcolor,
       :legendlinelen,:legendheight,:legendpad
@@ -64,7 +45,7 @@ class SVG
       @padleft   = 100
       @padright  = 50
       @padtop    = 50
-      @padbottom = 90
+      @padbottom = 100
       @colors    = [] 
       @labels    = []
       @markers   = [] 
@@ -115,21 +96,57 @@ class SVG
       @legendfgcolor = "white"
     end 
 
+    def minmax(x,y,xlog: false,ylog: false)
+      y = y.flatten 
+      if ylog 
+        y = y
+          .map{|e|begin Math.log(e,10) rescue -1.0/0.0 end } 
+          .reject{|e| e.infinite?} 
+      end 
+
+      miny,maxy = y.minmax
+      @miny = miny unless (@miny && @miny.finite?)
+      @maxy = maxy unless (@maxy && @maxy.finite?)
+
+      x = x.flatten 
+      if xlog 
+        x = x
+          .map{|e|begin Math.log(e,10) rescue -1.0/0.0 end } 
+          .reject{|e| e.infinite?} 
+      end 
+      minx,maxx = x.minmax
+      @minx = minx unless (@minx && @minx.finite?)
+      @maxx = maxx unless (@maxx && @maxx.finite?)
+    end 
+
+
+
     def self.mapxcoords(x,minx,maxx,w,padleft,padright,log)
-      begin x = log ? Math.log(x,10) : x rescue x = 1e-12 end 
+      begin 
+        x = log ? Math.log(x,10) : x 
+      rescue 
+        STDERR.puts "WARNING error execption Math.log(#{x},10)"
+        x = -1.0/0.0
+      end 
       xnew = padleft + ((x - minx)/((maxx-minx) + 1e-100))*(w-(padleft + padright))
     end 
 
     def self.mapycoords(y,miny,maxy,h,padtop,padbottom,log)
-      begin y = log ? Math.log(y,10) : y rescue y = 1e-12 end 
+      begin 
+        y = log ? Math.log(y,10) : y 
+      rescue 
+        STDERR.puts "WARNING error execption Math.log(#{y},10)"
+        y = -1.0/0.0
+      end
       ynew = padtop + ((maxy - y)/((maxy-miny) + 1e-100))*(h-(padtop + padbottom))
     end
 
     def map_and_zip(xraw,yraw,minx,maxx,miny,maxy,xlog,ylog)
       xp = xraw.map{|v| Plot.mapxcoords(v,minx,maxx,@svg.width,@padleft,@padright,xlog)}
       yp = yraw.map{|v| Plot.mapycoords(v,miny,maxy,@svg.height,@padtop,@padbottom,ylog)}
-      
-      return xp.zip(yp) 
+      pts = xp.zip(yp)  
+      pts = pts.reject{|p| p[0].infinite? || p[1].infinite?}
+      return pts
     end 
 
     def set_plot_style(label,color,marker,linestyle,opacity)
@@ -149,19 +166,19 @@ class SVG
     def title
       @svg.g(id: "title",text_anchor: "middle") do |g| 
         g.text(
-          x: (@svg.width).to_i / 2, y: @titlefontsize,
+          x: @svg.width / 2, y: @titlefontsize,
           text: @title,
           font_size: @titlefontsize)
       end 
     end 
 
     def legend
-      legendtextwidth = @legendfontsize*@labels.map{|e| e.size}.max / 2
+      legendtextwidth = @legendfontsize*0.75*@labels.map{|e| e.size}.max
       legendwidth  = @legendlinelen + 3*@legendpad + legendtextwidth
       legendheight = 2*@legendpad + @labels.size*2*@legendfontsize
 
       t = SVG.transform do |t|
-        t.translate(@svg.width-legendwidth-@padright,0)
+        t.translate(@svg.width-legendwidth-@padright,@padtop)
       end 
 
       @svg.g(id: "legend",transform: t) do |g|
@@ -202,7 +219,11 @@ class SVG
     def axis(ticks,labels, flip: false, rotang: 0,**args)
       min,max = ticks[0], ticks[-1]
       # Dibujar el eje
-      @svg.g(id: "axis#{flip ? @xlabel : @ylabel}", text_anchor: "middle",stroke: @axcolor, fill: @axcolor,**args) do |axis|
+      @svg.g(id: "axis#{flip ? @xlabel : @ylabel}", 
+        text_anchor: "middle",
+        stroke: @axcolor, 
+        stroke_width: @axlinewidth,
+        fill: @axcolor,**args) do |axis|
         axis.path() do |path|
           path.m(min[0],min[1])
           path.l(max[0],max[1])
@@ -211,9 +232,9 @@ class SVG
         # Mostrar nombre
         t = SVG.transform do |t|
           if flip
-            t.translate(@svg.width/2,@svg.height - @axlabelfontsize/2)
+            t.translate(@svg.width/2,@svg.height - @axlabelfontsize)
           else 
-            t.translate(@axlabelfontsize/2,@svg.height/2)
+            t.translate(@axlabelfontsize,@svg.height/2)
             t.rotate(-90,0,0)
           end 
         end 
@@ -250,18 +271,18 @@ class SVG
       end 
     end
 
-    def yticks(min: @miny,max: @maxy,frmt: @ylabelformat, ticksnum: @ticksnum,log: false)
+    def yticks(min: @miny,max: @maxy,frmt: @ylabelformat, ticksnum: @ticksnum)
       ticks = []
       labels = []
 
-      ticks.push([@padleft,Plot.mapycoords(min,min,max,@svg.height,@padtop,@padbottom,log)])
+      ticks.push([@padleft,Plot.mapycoords(min,min,max,@svg.height,@padtop,@padbottom,false)])
       labels.push(frmt % min)
         ticksnum.times do |i|
           v = min + ((max - min) / (ticksnum+1)) * (i+1)
-          ticks.push([@padleft,Plot.mapycoords(v,min,max,@svg.height,@padtop,@padbottom,log)])
+          ticks.push([@padleft,Plot.mapycoords(v,min,max,@svg.height,@padtop,@padbottom,false)])
           labels.push(frmt % v)
         end 
-        ticks.push([@padleft,Plot.mapycoords(max,min,max,@svg.height,@padtop,@padbottom,log)])
+        ticks.push([@padleft,Plot.mapycoords(max,min,max,@svg.height,@padtop,@padbottom,false)])
         labels.push(frmt % max)
         return ticks,labels
     end 
@@ -286,18 +307,18 @@ class SVG
       return ticks,labels
     end 
 
-    def xticks(min: @minx, max: @maxy, ticksnum: @ticksnum, frmt: @xlabelformat,log: false)
+    def xticks(min: @minx, max: @maxx, ticksnum: @ticksnum, frmt: @xlabelformat)
       ticks = []
       labels = []
 
-      ticks.push([Plot.mapxcoords(min,min,max,@svg.height,@padleft,@padright,log),@svg.height-@padbottom])
+      ticks.push([Plot.mapxcoords(min,min,max,@svg.height,@padleft,@padright,false),@svg.height-@padbottom])
       labels.push(frmt % min)
       ticksnum.times do |i|
         v = min + ((max - min) / (ticksnum+1)) * (i+1)
-        ticks.push([Plot.mapxcoords(v,min,max,@svg.height,@padleft,@padright,log),@svg.height-@padbottom])
+        ticks.push([Plot.mapxcoords(v,min,max,@svg.height,@padleft,@padright,false),@svg.height-@padbottom])
         labels.push(frmt % v)
       end 
-      ticks.push([Plot.mapxcoords(max,min,max,@svg.height,@padleft,@padright,log),@svg.height-@padbottom])
+      ticks.push([Plot.mapxcoords(max,min,max,@svg.height,@padleft,@padright,false),@svg.height-@padbottom])
       labels.push(frmt % max)
       return ticks,labels
 

data/lib/plot2d/lineplot.rb

@@ -20,7 +20,7 @@ class SVG
         stroke_width: @linewidth,
         opacity: @opacities.last) do |g|
 
-        g.path(title: @labels.last,fill: "none",stroke_dasharray: self.linestyle(linestyle)) do |path|
+          g.path(title: @labels.last,fill: "none",stroke_dasharray: self.linestyle(@linestyles.last)) do |path|
           missing = true
           points.each do |(x,y)|
             if !x.finite? || !y.finite?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: svg-lib
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Ricardo Nieto
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-17 00:00:00.000000000 Z
+date: 2020-10-19 00:00:00.000000000 Z
 dependencies: []
 description: basic svg-lib ruby implementation
 email: nifr91@gmail.com