From 5045e6ad43b3cc2118bbb01ffb5b17f1aaf994f8 Mon Sep 17 00:00:00 2001 From: Felix Cheung Date: Sat, 14 Mar 2015 12:00:17 -0700 Subject: [PATCH 1/2] draft: add label and size to scatter3 --- .../scala/org/viz/lightning/types/Three.scala | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/main/scala/org/viz/lightning/types/Three.scala b/src/main/scala/org/viz/lightning/types/Three.scala index 95815f4..cf63e1a 100644 --- a/src/main/scala/org/viz/lightning/types/Three.scala +++ b/src/main/scala/org/viz/lightning/types/Three.scala @@ -4,9 +4,20 @@ import org.viz.lightning.Visualization trait Three extends Base { - def scatter3(x: Array[Double], y: Array[Double], z: Array[Double]): Visualization = { + def scatter3(x: Array[Double], + y: Array[Double], + z: Array[Double], + label: Array[Int] = Array[Int]() + size: Array[Int] = Array[Int]()): Visualization = { val out = (x, y, z).zipped.map((x, y, z) => List(x, y, z)).toList - val payload = Map("points" -> out) + var payload = Map[String, Any]() + payload += "points" -> out + if (label.length > 0) { + payload += "label" -> label.toList + } + if (size.length > 0) { + payload += "size" -> size.toList + } plot("scatter3", payload) } From 7f3bc3f11071e6e8cc2fc2e54bd7e67b479fe052 Mon Sep 17 00:00:00 2001 From: Felix Cheung Date: Sat, 21 Mar 2015 17:00:55 -0700 Subject: [PATCH 2/2] Size from Int -> Size as suggested --- src/main/scala/org/viz/lightning/types/Three.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/scala/org/viz/lightning/types/Three.scala b/src/main/scala/org/viz/lightning/types/Three.scala index cf63e1a..a541496 100644 --- a/src/main/scala/org/viz/lightning/types/Three.scala +++ b/src/main/scala/org/viz/lightning/types/Three.scala @@ -8,7 +8,7 @@ trait Three extends Base { y: Array[Double], z: Array[Double], label: Array[Int] = Array[Int]() - size: Array[Int] = Array[Int]()): Visualization = { + size: Array[Double] = Array[Double]()): Visualization = { val out = (x, y, z).zipped.map((x, y, z) => List(x, y, z)).toList var payload = Map[String, Any]() payload += "points" -> out