Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix PlotGrid grid row ordering #61

Merged
merged 2 commits into from
Jan 29, 2021
Merged

Fix PlotGrid grid row ordering #61

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
334aa48
Fix PlotGrid "grid" getter to have consistent ordering of rows
ArtificialPB Jan 29, 2021
ec919f7
Resolve PlotGrid IDE inspections
ArtificialPB Jan 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 12 additions & 9 deletions plotlykt-core/src/jvmMain/kotlin/kscience/plotly/PlotGrid.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,25 @@ package kscience.plotly
import kotlinx.html.div

@UnstablePlotlyAPI
class PlotGrid {
data class PlotCell(val id: String, val plot: Plot, val row: Int, val col: Int, val width: Int = 1)
public class PlotGrid {
public data class PlotCell(val id: String, val plot: Plot, val row: Int, val col: Int, val width: Int = 1)

private val cells = HashMap<String, PlotCell>()

val grid
get() = cells.values.groupBy { it.row }.values.map {
it.sortedBy { plot -> plot.col }
/**
* @return Columns in ascending order, grouped by rows in ascending order.
* */
public val grid: List<List<PlotCell>>
get() = cells.values.groupBy { it.row }.toSortedMap().values.map {
it.sortedBy { cell -> cell.col }
}.toList()

operator fun get(id: String): PlotCell? = cells[id]
public operator fun get(id: String): PlotCell? = cells[id]

private var currentRow = 0
private var currentCol = 0

fun plot(
public fun plot(
plot: Plot,
id: String = plot.toString(),
width: Int = 6,
Expand All @@ -39,7 +42,7 @@ class PlotGrid {
return plot
}

fun plot(
public fun plot(
row: Int? = null,
col: Int? = null,
id: String? = null,
Expand All @@ -52,7 +55,7 @@ class PlotGrid {
}

@UnstablePlotlyAPI
fun Plotly.grid(block: PlotGrid.() -> Unit): PlotlyPage {
public fun Plotly.grid(block: PlotGrid.() -> Unit): PlotlyPage {
val grid = PlotGrid().apply(block)
return page(cdnBootstrap, cdnPlotlyHeader) { container ->
div("col") {
Expand Down