Markers shape rotation of points on livemap (#1108)

JetBrains · May 29, 2024 · 89daf2c · 89daf2c
1 parent 72ec10f
commit 89daf2c
Show file tree

Hide file tree

Showing 4 changed files with 197 additions and 4 deletions.
diff --git a/docs/dev/notebooks/LP-736-livemap.ipynb b/docs/dev/notebooks/LP-736-livemap.ipynb
diff --git a/livemap/src/commonMain/kotlin/org/jetbrains/letsPlot/livemap/api/PointLayerBuilder.kt b/livemap/src/commonMain/kotlin/org/jetbrains/letsPlot/livemap/api/PointLayerBuilder.kt
@@ -67,6 +67,7 @@ class PointEntityBuilder(
  var animation: Int = 0
  var label: String = ""
  var shape: Int = 1
+ var angle: Double = 0.0
 
  fun build(nonInteractive: Boolean = false): EcsEntity {
  val d = radius * 2.0
@@ -80,7 +81,7 @@ class PointEntityBuilder(
  +IndexComponent(layerIndex!!, index!!)
  }
  + RenderableComponent().apply {
- renderer = PointRenderer(shape)
+ renderer = PointRenderer(shape, angle)
  }
  +ChartElementComponent().apply {
  sizeScalingRange = this@PointEntityBuilder.sizeScalingRange

diff --git a/livemap/src/commonMain/kotlin/org/jetbrains/letsPlot/livemap/chart/point/PointRenderer.kt b/livemap/src/commonMain/kotlin/org/jetbrains/letsPlot/livemap/chart/point/PointRenderer.kt
@@ -5,6 +5,7 @@
 
 package org.jetbrains.letsPlot.livemap.chart.point
 
+import org.jetbrains.letsPlot.commons.intern.math.toRadians
 import org.jetbrains.letsPlot.core.canvas.Context2d
 import org.jetbrains.letsPlot.livemap.chart.ChartElementComponent
 import org.jetbrains.letsPlot.livemap.chart.PointComponent
@@ -17,8 +18,10 @@ import kotlin.math.PI
 import kotlin.math.sqrt
 
 class PointRenderer(
- private val shape: Int
+ private val shape: Int,
+ degreeAngle: Double
 ) : Renderer {
+ private val angle = toRadians(degreeAngle)
 
  override fun render(entity: EcsEntity, ctx: Context2d, renderHelper: RenderHelper) {
  val chartElement = entity.get<ChartElementComponent>()
@@ -31,7 +34,8 @@ class PointRenderer(
  ctx = ctx,
  radius = pointData.scaledRadius(chartElement.scalingSizeFactor),
  stroke = chartElement.scaledStrokeWidth(),
- shape = shape
+ shape = shape,
+ angle = angle
  )
  if (chartElement.fillColor != null) {
  ctx.setFillStyle(chartElement.scaledFillColor())
@@ -43,7 +47,12 @@ class PointRenderer(
  ctx.stroke()
  }
  }
- private fun drawMarker(ctx: Context2d, radius: Double, stroke: Double, shape: Int) {
+ private fun drawMarker(ctx: Context2d, radius: Double, stroke: Double, shape: Int, angle: Double) {
+ val needToRotate = shape !in listOf(1, 10, 16, 19, 20, 21) && angle != 0.0
+ if (needToRotate) {
+ ctx.rotate(angle)
+ }
+
  when (shape) {
  0 -> square(ctx, radius)
  1 -> circle(ctx, radius)
@@ -94,6 +103,10 @@ class PointRenderer(
  25 -> triangle(ctx, radius, stroke, pointingUp = false)
  else -> throw IllegalStateException("Unknown point shape")
  }
+
+ if (needToRotate) {
+ ctx.rotate(-angle)
+ }
  }
 
  private fun circle(ctx: Context2d, r: Double) {

diff --git a/...-livemap/src/commonMain/kotlin/org/jetbrains/letsPlot/core/plot/livemap/LayerConverter.kt b/...-livemap/src/commonMain/kotlin/org/jetbrains/letsPlot/core/plot/livemap/LayerConverter.kt
@@ -91,6 +91,7 @@ object LayerConverter {
  label = it.label
  animation = it.animation
  shape = it.shape
+ angle = it.angle
  radius = it.radius
  fillColor = it.fillColor
  strokeColor = it.strokeColor