Skip to content
This repository was archived by the owner on Oct 11, 2023. It is now read-only.

Commit 52ab762

Browse files
committed
Maintain plot back-reference under BackRef trait
1 parent 1a5ed28 commit 52ab762

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

bokeh/src/main/scala/models/Annotations.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package io.continuum.bokeh
22

3-
@model abstract class Annotation extends Renderer {
4-
object plot extends Field[Plot]
3+
@model abstract class Annotation extends Renderer with BackRef {
54
object level extends Field[RenderLevel](RenderLevel.Annotation)
65
}
76

bokeh/src/main/scala/models/Plots.scala

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,10 @@ package io.continuum.bokeh
7878
}
7979
}
8080

81+
trait BackRef { self: Model =>
82+
object plot extends Field[Plot]
83+
}
84+
8185
object GridPlot {
8286
def apply[R](rows: R*)(implicit r: Row[R, Plot]): GridPlot = {
8387
new GridPlot().children(rows.toList.map(r.toList(_)))

bokeh/src/main/scala/models/Renderers.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,7 @@ package io.continuum.bokeh
4141
object level extends Field[RenderLevel](RenderLevel.Glyph)
4242
}
4343

44-
@model abstract class GuideRenderer extends Renderer {
45-
object plot extends Field[Plot]
44+
@model abstract class GuideRenderer extends Renderer with BackRef {
4645
object bounds extends Field[(Double, Double)] // TODO: Either[Auto, (Float, Float)]]
4746

4847
object x_range_name extends Field[String]("default")

bokeh/src/main/scala/models/Tools.scala

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@ package io.continuum.bokeh
44
object geometries extends Field[List[Js.Obj]]
55
}
66

7-
@model sealed abstract class Tool extends Model {
8-
object plot extends Field[Plot]
9-
}
7+
@model sealed abstract class Tool extends Model with BackRef
108

119
@model class PanTool extends Tool {
1210
object dimensions extends Field[List[Dimension]](List(Dimension.Width, Dimension.Height))

0 commit comments

Comments
 (0)