Add scatter plot

Author: ruivieira

docs/README.md

@@ -7,7 +7,21 @@
 ```nim
 let figure = newFigure()
 figure.add newLinePlot[int,float](@[1, 2, 3, 4], @[5.5, 7.6, 11.1, 6.5])
-figure.save("docs/lineplot_default.png")
 ```
 
-![plot](lineplot_default.png)
+![plot](lineplot_default.png)
+
+### line, scatter with options
+
+```nim
+let figure2 = newFigure()
+let lp = newLinePlot[int,float](x, y)
+lp.linestyle = "--"
+lp.colour = "red"
+figure2.add lp
+let sp = newScatterPlot[int,float](x, y)
+sp.colour = "green"
+figure2.add sp
+```
+
+![plot](scatterplot_default.png)

docs/examples.nim

@@ -1,5 +1,18 @@
 import "../src/matplotnim"
 
+let x = @[1, 2, 3, 4]
+let y = @[5.5, 7.6, 11.1, 6.5]
+
 let figure = newFigure()
-figure.add newLinePlot[int,float](@[1, 2, 3, 4], @[5.5, 7.6, 11.1, 6.5])
-figure.save("docs/lineplot_default.png")
+figure.add newLinePlot[int,float](x, y)
+figure.save("docs/lineplot_default.png")
+
+let figure2 = newFigure()
+let lp = newLinePlot[int,float](x, y)
+lp.linestyle = "--"
+lp.colour = "red"
+figure2.add lp
+let sp = newScatterPlot[int,float](x, y)
+sp.colour = "green"
+figure2.add sp
+figure2.save("docs/scatterplot_default.png")

docs/scatterplot_default.png

@@ -1,13 +1,13 @@
 # Package
 
 version       = "0.1.0"
-author        = "Rui  Vieira"
-description   = "A Nim wrapper for Python\'s matplotlib"
+author        = "Rui Vieira"
+description   = "Nim wrapper for matplotlib"
 license       = "Apache-2.0"
 srcDir        = "src"
 
 
 # Dependencies
 
 requires "nim >= 0.19.4"
-require "tempfile"
+requires "tempfile"

matplotnim.nimble

@@ -4,6 +4,12 @@ import strformat
 import tempfile
 import os
 
+func numberToStr[T](data: seq[T]): seq[string] = data.map(proc(k:T):string = $k)
+
+func makeList[T](data: seq[T]): string = 
+  let str = numberToStr(data).join(",")
+  return fmt"[{str}]"
+
 type Plot = ref object of RootObj
 method render(this: Plot): string {.base.} = ""
 
@@ -43,14 +49,46 @@ proc newFigure*(): Figure =
 proc add*(figure: Figure, plot: Plot) =
   figure.plots.add plot
 
+# Line plots
 type LinePlot[A, B] = ref object of Plot
   linestyle*: string
+  colour*: string
   x*: seq[A]
   y*: seq[B]
 method render[A,B](this: LinePlot[A,B]): string =
-  let xs = this.x.map(proc(k:A):string = $k).join(",")
-  let ys = this.y.map(proc(k:B):string = $k).join(",")
-  return fmt"plt.plot([{xs}],[{ys}])"
+  let xs = makeList(this.x)
+  let ys = makeList(this.y)
+  var options: seq[string] = @[]
+  if this.linestyle!="":
+    options.add fmt"linestyle='{this.linestyle}'"
+  if this.colour!="":
+    options.add fmt"color='{this.colour}'"
+  if len(options)>0:
+    let optstr = options.join(",")
+    return fmt"plt.plot({xs},{ys},{optstr})"
+  else:
+    return fmt"plt.plot({xs},{ys})"
 
 proc newLinePlot*[A,B](x: seq[A], y: seq[B]): LinePlot[A, B] =
-  LinePlot[A, B](linestyle: "-", x: x, y: y)
+  LinePlot[A, B](linestyle: "", colour: "",  x: x, y: y)
+
+# Scatter plots
+type ScatterPlot[A,B] = ref object of Plot
+  colour*: string
+  x*: seq[A]
+  y*: seq[B]
+method render[A,B](this: ScatterPlot[A,B]): string =
+  let xs = makeList(this.x)
+  let ys = makeList(this.y)
+  var options: seq[string] = @[]
+  if this.colour!="":
+    options.add fmt"color='{this.colour}'"
+  if len(options)>0:
+    let optstr = options.join(",")
+    return fmt"plt.scatter({xs},{ys},{optstr})"
+  else:
+    return fmt"plt.scatter({xs},{ys})"
+
+proc newScatterPlot*[A,B](x: seq[A], y: seq[B]): ScatterPlot[A, B] =
+  ScatterPlot[A, B](colour: "",  x: x, y: y)
+