Merge pull request #134 from maxstreese/feature/3d-surface

3d Surface Plots
alexarchambault · Nov 22, 2019 · e8eb0dd · e8eb0dd
2 parents 264cd2b + 9beec14
commit e8eb0dd
Show file tree

Hide file tree

Showing 6 changed files with 63 additions and 5 deletions.
diff --git a/core/shared/src/main/scala/plotly/Sequence.scala b/core/shared/src/main/scala/plotly/Sequence.scala
@@ -6,6 +6,7 @@ sealed abstract class Sequence extends Product with Serializable
 
 object Sequence {
   final case class Doubles(seq: Seq[Double]) extends Sequence
+  final case class NestedDoubles(seq: Seq[Seq[Double]]) extends Sequence
   final case class Strings(seq: Seq[String]) extends Sequence
   final case class DateTimes(seq: Seq[LocalDateTime]) extends Sequence
 
@@ -17,6 +18,8 @@ object Sequence {
     Doubles(s.map(_.toDouble))
   implicit def fromLongSeq(s: Seq[Long]): Sequence =
     Doubles(s.map(_.toDouble))
+  implicit def fromNestedDoubleSeq(s: Seq[Seq[Double]]): Sequence =
+    NestedDoubles(s)
   implicit def fromStringSeq(s: Seq[String]): Sequence =
     Strings(s)
   implicit def fromDateTimes(seq: Seq[LocalDateTime]): Sequence =

diff --git a/core/shared/src/main/scala/plotly/Trace.scala b/core/shared/src/main/scala/plotly/Trace.scala
@@ -235,3 +235,28 @@ object Histogram {
       Option(histfunc)
     )
 }
+
+@data class Surface(
+          x: Option[Sequence],
+          y: Option[Sequence],
+          z: Option[Sequence],
+  showscale: Option[Boolean],
+    opacity: Option[Double]
+) extends Trace
+
+object Surface {
+  def apply(
+            x: Sequence  = null,
+            y: Sequence  = null,
+            z: Sequence  = null,
+    showscale: JBoolean  = null,
+      opacity: JDouble   = null
+  ): Surface =
+    Surface(
+      Option(x),
+      Option(y),
+      Option(z),
+      Option(showscale) .map(b => b: Boolean),
+      Option(opacity)   .map(d => d: Double)
+    )
+}
diff --git a/core/shared/src/main/scala/plotly/layout/Layout.scala b/core/shared/src/main/scala/plotly/layout/Layout.scala
@@ -32,7 +32,9 @@ import dataclass.data
          bargap: Option[Double],
     bargroupgap: Option[Double],
       hovermode: Option[HoverMode],
-        boxmode: Option[BoxMode]
+        boxmode: Option[BoxMode],
+          scene: Option[Scene]
+
 )
 
 object Layout {
@@ -62,7 +64,8 @@ object Layout {
            bargap: JDouble         = null,
       bargroupgap: JDouble         = null,
         hovermode: HoverMode       = null,
-          boxmode: BoxMode         = null
+          boxmode: BoxMode         = null,
+            scene: Scene           = null
   ): Layout =
     new Layout(
       Option(title),
@@ -90,6 +93,7 @@ object Layout {
       Option(bargap).map(x => x),
       Option(bargroupgap).map(x => x),
       Option(hovermode),
-      Option(boxmode)
+      Option(boxmode),
+      Option(scene)
     )
 }
diff --git a/core/shared/src/main/scala/plotly/layout/Scene.scala b/core/shared/src/main/scala/plotly/layout/Scene.scala
@@ -0,0 +1,25 @@
+package plotly
+package layout
+
+import java.lang.{ Integer => JInt, Double => JDouble, Boolean => JBoolean }
+
+import dataclass.data
+import plotly.element._
+
+@data class Scene(
+  xaxis: Option[Axis],
+  yaxis: Option[Axis],
+  zaxis: Option[Axis]
+)
+
+object Scene {
+  def apply(
+    xaxis: Axis = null,
+    yaxis: Axis = null,
+    zaxis: Axis = null
+  ): Scene = new Scene(
+    Option(xaxis),
+    Option(yaxis),
+    Option(zaxis)
+  )
+}
diff --git a/render/shared/src/main/scala/plotly/internals/ArgonautCodecsInternals.scala b/render/shared/src/main/scala/plotly/internals/ArgonautCodecsInternals.scala
@@ -45,6 +45,7 @@ object ArgonautCodecsInternals extends ArgonautCodecsExtra {
   implicit val boxMeanBoolIsWrapper: IsWrapper[BoxMean.Bool] = null
   implicit val boxPointsBoolIsWrapper: IsWrapper[BoxPoints.Bool] = null
   implicit val sequenceDoublesIsWrapper: IsWrapper[Sequence.Doubles] = null
+  implicit val sequenceNestedDoublesIsWrapper: IsWrapper[Sequence.NestedDoubles] = null
   implicit val sequenceStringsIsWrapper: IsWrapper[Sequence.Strings] = null
   implicit val sequenceDatetimesIsWrapper: IsWrapper[Sequence.DateTimes] = null
   implicit val doubleElementIsWrapper: IsWrapper[Element.DoubleElement] = null

diff --git a/tests/src/test/scala/plotly/doc/DocumentationTests.scala b/tests/src/test/scala/plotly/doc/DocumentationTests.scala
@@ -249,10 +249,10 @@ class DocumentationTests extends FlatSpec with Matchers {
     // TODO Heatmaps
     // TODO Heatmap and contour colorscales
     // TODO Polar charts
-    "scientific/log"
+    "scientific/log",
     // TODO Financial charts
     // TODO Maps
-    // TODO 3D charts
+    "3d/3d-surface"
   )
 
   val subDirs = subDirNames.map(new File(dir, _))