Skip to content

Commit 7e12d7a

Browse files
committed
updated docs of format wrt colgroups
1 parent 37ecc69 commit 7e12d7a

File tree

6 files changed

+42
-18
lines changed

6 files changed

+42
-18
lines changed

docs/StardustDocs/resources/modify/operations/formatExample_properties.html

Lines changed: 6 additions & 6 deletions
Large diffs are not rendered by default.

docs/StardustDocs/resources/modify/operations/formatExample_strings.html

Lines changed: 6 additions & 6 deletions
Large diffs are not rendered by default.

docs/StardustDocs/resources/snippets/org.jetbrains.kotlinx.dataframe.samples.api.Modify.update.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -706,8 +706,8 @@
706706
call_DataFrame(function() { DataFrame.renderTable(3) });
707707

708708
/*<!--*/
709-
call_DataFrame(function() { DataFrame.addTable({ cols: [{ name: "<span title=\"firstName: String\">firstName</span>", children: [], rightAlign: false, values: ["Alice","Bob","Charlie","Charlie","Bob","Alice","Charlie"] },
710-
{ name: "<span title=\"lastName: String\">lastName</span>", children: [], rightAlign: false, values: ["Cooper","Dylan","Daniels","Chaplin","Marley","Wolf","Byrd"] },
709+
call_DataFrame(function() { DataFrame.addTable({ cols: [{ name: "<span title=\"firstName: String\">firstName</span>", children: [], rightAlign: false, values: [{ style: "background-color:#98fb98", value: "Alice"},{ style: "background-color:#98fb98", value: "Bob"},{ style: "background-color:#98fb98", value: "Charlie"},{ style: "background-color:#98fb98", value: "Charlie"},{ style: "background-color:#98fb98", value: "Bob"},{ style: "background-color:#98fb98", value: "Alice"},{ style: "background-color:#98fb98", value: "Charlie"}] },
710+
{ name: "<span title=\"lastName: String\">lastName</span>", children: [], rightAlign: false, values: [{ style: "background-color:#98fb98", value: "Cooper"},{ style: "background-color:#98fb98", value: "Dylan"},{ style: "background-color:#98fb98", value: "Daniels"},{ style: "background-color:#98fb98", value: "Chaplin"},{ style: "background-color:#98fb98", value: "Marley"},{ style: "background-color:#98fb98", value: "Wolf"},{ style: "background-color:#98fb98", value: "Byrd"}] },
711711
{ name: "<span title=\"name: DataRow<*>\">name</span>", children: [0, 1], rightAlign: false, values: ["<span class=\"formatted\" title=\"firstName: Alice\nlastName: Cooper\"><span class=\"structural\">{ </span><span class=\"structural\">firstName: </span>Alice<span class=\"structural\">, </span><span class=\"structural\">lastName: </span>Cooper<span class=\"structural\"> }</span></span>","<span class=\"formatted\" title=\"firstName: Bob\nlastName: Dylan\"><span class=\"structural\">{ </span><span class=\"structural\">firstName: </span>Bob<span class=\"structural\">, </span><span class=\"structural\">lastName: </span>Dylan<span class=\"structural\"> }</span></span>","<span class=\"formatted\" title=\"firstName: Charlie\nlastName: Daniels\"><span class=\"structural\">{ </span><span class=\"structural\">firstName: </span>Charlie<span class=\"structural\">, </span><span class=\"structural\">lastName: </span>Dan<span class=\"structural\">...</span><span class=\"structural\"> }</span></span>","<span class=\"formatted\" title=\"firstName: Charlie\nlastName: Chaplin\"><span class=\"structural\">{ </span><span class=\"structural\">firstName: </span>Charlie<span class=\"structural\">, </span><span class=\"structural\">lastName: </span>Cha<span class=\"structural\">...</span><span class=\"structural\"> }</span></span>","<span class=\"formatted\" title=\"firstName: Bob\nlastName: Marley\"><span class=\"structural\">{ </span><span class=\"structural\">firstName: </span>Bob<span class=\"structural\">, </span><span class=\"structural\">lastName: </span>Marley<span class=\"structural\"> }</span></span>","<span class=\"formatted\" title=\"firstName: Alice\nlastName: Wolf\"><span class=\"structural\">{ </span><span class=\"structural\">firstName: </span>Alice<span class=\"structural\">, </span><span class=\"structural\">lastName: </span>Wolf<span class=\"structural\"> }</span></span>","<span class=\"formatted\" title=\"firstName: Charlie\nlastName: Byrd\"><span class=\"structural\">{ </span><span class=\"structural\">firstName: </span>Charlie<span class=\"structural\">, </span><span class=\"structural\">lastName: </span>Byrd<span class=\"structural\"> }</span></span>"] },
712712
{ name: "<span title=\"age: Int\">age</span>", children: [], rightAlign: true, values: ["<span class=\"formatted\" title=\"\"><span class=\"numbers\">15</span></span>","<span class=\"formatted\" title=\"\"><span class=\"numbers\">45</span></span>","<span class=\"formatted\" title=\"\"><span class=\"numbers\">20</span></span>","<span class=\"formatted\" title=\"\"><span class=\"numbers\">40</span></span>","<span class=\"formatted\" title=\"\"><span class=\"numbers\">30</span></span>","<span class=\"formatted\" title=\"\"><span class=\"numbers\">20</span></span>","<span class=\"formatted\" title=\"\"><span class=\"numbers\">30</span></span>"] },
713713
{ name: "<span title=\"city: String?\">city</span>", children: [], rightAlign: false, values: ["London","Dubai","Moscow","Milan","Tokyo","<span class=\"formatted\" title=\"\"><span class=\"null\">null</span></span>","Moscow"] },
@@ -798,7 +798,7 @@
798798

799799
/*<!--*/
800800
call_DataFrame(function() { DataFrame.addTable({ cols: [{ name: "<span title=\"firstName: String\">firstName</span>", children: [], rightAlign: false, values: ["Alice","Bob","Charlie","Charlie","Bob","Alice","Charlie"] },
801-
{ name: "<span title=\"lastName: String\">lastName</span>", children: [], rightAlign: false, values: ["Cooper","Dylan","Daniels","Chaplin","Marley","Wolf","Byrd"] },
801+
{ name: "<span title=\"lastName: String\">lastName</span>", children: [], rightAlign: false, values: [{ style: "background-color:#98fb98", value: "Cooper"},{ style: "background-color:#98fb98", value: "Dylan"},{ style: "background-color:#98fb98", value: "Daniels"},{ style: "background-color:#98fb98", value: "Chaplin"},{ style: "background-color:#98fb98", value: "Marley"},{ style: "background-color:#98fb98", value: "Wolf"},{ style: "background-color:#98fb98", value: "Byrd"}] },
802802
{ name: "<span title=\"name: DataRow<*>\">name</span>", children: [0, 1], rightAlign: false, values: ["<span class=\"formatted\" title=\"firstName: Alice\nlastName: Cooper\"><span class=\"structural\">{ </span><span class=\"structural\">firstName: </span>Alice<span class=\"structural\">, </span><span class=\"structural\">lastName: </span>Cooper<span class=\"structural\"> }</span></span>","<span class=\"formatted\" title=\"firstName: Bob\nlastName: Dylan\"><span class=\"structural\">{ </span><span class=\"structural\">firstName: </span>Bob<span class=\"structural\">, </span><span class=\"structural\">lastName: </span>Dylan<span class=\"structural\"> }</span></span>","<span class=\"formatted\" title=\"firstName: Charlie\nlastName: Daniels\"><span class=\"structural\">{ </span><span class=\"structural\">firstName: </span>Charlie<span class=\"structural\">, </span><span class=\"structural\">lastName: </span>Dan<span class=\"structural\">...</span><span class=\"structural\"> }</span></span>","<span class=\"formatted\" title=\"firstName: Charlie\nlastName: Chaplin\"><span class=\"structural\">{ </span><span class=\"structural\">firstName: </span>Charlie<span class=\"structural\">, </span><span class=\"structural\">lastName: </span>Cha<span class=\"structural\">...</span><span class=\"structural\"> }</span></span>","<span class=\"formatted\" title=\"firstName: Bob\nlastName: Marley\"><span class=\"structural\">{ </span><span class=\"structural\">firstName: </span>Bob<span class=\"structural\">, </span><span class=\"structural\">lastName: </span>Marley<span class=\"structural\"> }</span></span>","<span class=\"formatted\" title=\"firstName: Alice\nlastName: Wolf\"><span class=\"structural\">{ </span><span class=\"structural\">firstName: </span>Alice<span class=\"structural\">, </span><span class=\"structural\">lastName: </span>Wolf<span class=\"structural\"> }</span></span>","<span class=\"formatted\" title=\"firstName: Charlie\nlastName: Byrd\"><span class=\"structural\">{ </span><span class=\"structural\">firstName: </span>Charlie<span class=\"structural\">, </span><span class=\"structural\">lastName: </span>Byrd<span class=\"structural\"> }</span></span>"] },
803803
{ name: "<span title=\"age: Int\">age</span>", children: [], rightAlign: true, values: [{ style: "background-color:#98fb98", value: "<span class=\"formatted\" title=\"\"><span class=\"numbers\">15</span></span>"},{ style: "background-color:#98fb98", value: "<span class=\"formatted\" title=\"\"><span class=\"numbers\">45</span></span>"},{ style: "background-color:#98fb98", value: "<span class=\"formatted\" title=\"\"><span class=\"numbers\">20</span></span>"},{ style: "background-color:#98fb98", value: "<span class=\"formatted\" title=\"\"><span class=\"numbers\">40</span></span>"},{ style: "background-color:#98fb98", value: "<span class=\"formatted\" title=\"\"><span class=\"numbers\">30</span></span>"},{ style: "background-color:#98fb98", value: "<span class=\"formatted\" title=\"\"><span class=\"numbers\">20</span></span>"},{ style: "background-color:#98fb98", value: "<span class=\"formatted\" title=\"\"><span class=\"numbers\">30</span></span>"}] },
804804
{ name: "<span title=\"city: String?\">city</span>", children: [], rightAlign: false, values: ["London","Dubai","Moscow","Milan","Tokyo","<span class=\"formatted\" title=\"\"><span class=\"null\">null</span></span>","Moscow"] },
@@ -811,7 +811,7 @@
811811

812812
/*<!--*/
813813
call_DataFrame(function() { DataFrame.addTable({ cols: [{ name: "<span title=\"firstName: String\">firstName</span>", children: [], rightAlign: false, values: ["Alice","Bob","Charlie","Charlie","Bob","Alice","Charlie"] },
814-
{ name: "<span title=\"lastName: String\">lastName</span>", children: [], rightAlign: false, values: ["Cooper","Dylan","Daniels","Chaplin","Marley","Wolf","Byrd"] },
814+
{ name: "<span title=\"lastName: String\">lastName</span>", children: [], rightAlign: false, values: ["Cooper",{ style: "background-color:#98fb98", value: "Dylan"},"Daniels",{ style: "background-color:#98fb98", value: "Chaplin"},{ style: "background-color:#98fb98", value: "Marley"},"Wolf","Byrd"] },
815815
{ name: "<span title=\"name: DataRow<*>\">name</span>", children: [0, 1], rightAlign: false, values: ["<span class=\"formatted\" title=\"firstName: Alice\nlastName: Cooper\"><span class=\"structural\">{ </span><span class=\"structural\">firstName: </span>Alice<span class=\"structural\">, </span><span class=\"structural\">lastName: </span>Cooper<span class=\"structural\"> }</span></span>","<span class=\"formatted\" title=\"firstName: Bob\nlastName: Dylan\"><span class=\"structural\">{ </span><span class=\"structural\">firstName: </span>Bob<span class=\"structural\">, </span><span class=\"structural\">lastName: </span>Dylan<span class=\"structural\"> }</span></span>","<span class=\"formatted\" title=\"firstName: Charlie\nlastName: Daniels\"><span class=\"structural\">{ </span><span class=\"structural\">firstName: </span>Charlie<span class=\"structural\">, </span><span class=\"structural\">lastName: </span>Dan<span class=\"structural\">...</span><span class=\"structural\"> }</span></span>","<span class=\"formatted\" title=\"firstName: Charlie\nlastName: Chaplin\"><span class=\"structural\">{ </span><span class=\"structural\">firstName: </span>Charlie<span class=\"structural\">, </span><span class=\"structural\">lastName: </span>Cha<span class=\"structural\">...</span><span class=\"structural\"> }</span></span>","<span class=\"formatted\" title=\"firstName: Bob\nlastName: Marley\"><span class=\"structural\">{ </span><span class=\"structural\">firstName: </span>Bob<span class=\"structural\">, </span><span class=\"structural\">lastName: </span>Marley<span class=\"structural\"> }</span></span>","<span class=\"formatted\" title=\"firstName: Alice\nlastName: Wolf\"><span class=\"structural\">{ </span><span class=\"structural\">firstName: </span>Alice<span class=\"structural\">, </span><span class=\"structural\">lastName: </span>Wolf<span class=\"structural\"> }</span></span>","<span class=\"formatted\" title=\"firstName: Charlie\nlastName: Byrd\"><span class=\"structural\">{ </span><span class=\"structural\">firstName: </span>Charlie<span class=\"structural\">, </span><span class=\"structural\">lastName: </span>Byrd<span class=\"structural\"> }</span></span>"] },
816816
{ name: "<span title=\"age: Int\">age</span>", children: [], rightAlign: true, values: ["<span class=\"formatted\" title=\"\"><span class=\"numbers\">15</span></span>",{ style: "background-color:#98fb98", value: "<span class=\"formatted\" title=\"\"><span class=\"numbers\">45</span></span>"},"<span class=\"formatted\" title=\"\"><span class=\"numbers\">20</span></span>",{ style: "background-color:#98fb98", value: "<span class=\"formatted\" title=\"\"><span class=\"numbers\">40</span></span>"},{ style: "background-color:#98fb98", value: "<span class=\"formatted\" title=\"\"><span class=\"numbers\">30</span></span>"},"<span class=\"formatted\" title=\"\"><span class=\"numbers\">20</span></span>","<span class=\"formatted\" title=\"\"><span class=\"numbers\">30</span></span>"] },
817817
{ name: "<span title=\"city: String?\">city</span>", children: [], rightAlign: false, values: ["London","Dubai","Moscow","Milan","Tokyo","<span class=\"formatted\" title=\"\"><span class=\"null\">null</span></span>","Moscow"] },

docs/StardustDocs/resources/snippets/org.jetbrains.kotlinx.dataframe.samples.api.Modify.updateAsFrame.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -605,8 +605,8 @@
605605
call_DataFrame(function() { DataFrame.renderTable(0) });
606606

607607
/*<!--*/
608-
call_DataFrame(function() { DataFrame.addTable({ cols: [{ name: "<span title=\"firstName: String\">firstName</span>", children: [], rightAlign: false, values: ["Alice","Bob","Charlie","Charlie","Bob","Alice","Charlie"] },
609-
{ name: "<span title=\"lastName: String\">lastName</span>", children: [], rightAlign: false, values: ["Cooper","Dylan","Daniels","Chaplin","Marley","Wolf","Byrd"] },
608+
call_DataFrame(function() { DataFrame.addTable({ cols: [{ name: "<span title=\"firstName: String\">firstName</span>", children: [], rightAlign: false, values: [{ style: "background-color:#98fb98", value: "Alice"},{ style: "background-color:#98fb98", value: "Bob"},{ style: "background-color:#98fb98", value: "Charlie"},{ style: "background-color:#98fb98", value: "Charlie"},{ style: "background-color:#98fb98", value: "Bob"},{ style: "background-color:#98fb98", value: "Alice"},{ style: "background-color:#98fb98", value: "Charlie"}] },
609+
{ name: "<span title=\"lastName: String\">lastName</span>", children: [], rightAlign: false, values: [{ style: "background-color:#98fb98", value: "Cooper"},{ style: "background-color:#98fb98", value: "Dylan"},{ style: "background-color:#98fb98", value: "Daniels"},{ style: "background-color:#98fb98", value: "Chaplin"},{ style: "background-color:#98fb98", value: "Marley"},{ style: "background-color:#98fb98", value: "Wolf"},{ style: "background-color:#98fb98", value: "Byrd"}] },
610610
{ name: "<span title=\"name: DataRow<*>\">name</span>", children: [0, 1], rightAlign: false, values: [{ style: "background-color:#98fb98", value: "<span class=\"formatted\" title=\"firstName: Alice\nlastName: Cooper\"><span class=\"structural\">{ </span><span class=\"structural\">firstName: </span>Alice<span class=\"structural\">, </span><span class=\"structural\">lastName: </span>Cooper<span class=\"structural\"> }</span></span>"},{ style: "background-color:#98fb98", value: "<span class=\"formatted\" title=\"firstName: Bob\nlastName: Dylan\"><span class=\"structural\">{ </span><span class=\"structural\">firstName: </span>Bob<span class=\"structural\">, </span><span class=\"structural\">lastName: </span>Dylan<span class=\"structural\"> }</span></span>"},{ style: "background-color:#98fb98", value: "<span class=\"formatted\" title=\"firstName: Charlie\nlastName: Daniels\"><span class=\"structural\">{ </span><span class=\"structural\">firstName: </span>Charlie<span class=\"structural\">, </span><span class=\"structural\">lastName: </span>Dan<span class=\"structural\">...</span><span class=\"structural\"> }</span></span>"},{ style: "background-color:#98fb98", value: "<span class=\"formatted\" title=\"firstName: Charlie\nlastName: Chaplin\"><span class=\"structural\">{ </span><span class=\"structural\">firstName: </span>Charlie<span class=\"structural\">, </span><span class=\"structural\">lastName: </span>Cha<span class=\"structural\">...</span><span class=\"structural\"> }</span></span>"},{ style: "background-color:#98fb98", value: "<span class=\"formatted\" title=\"firstName: Bob\nlastName: Marley\"><span class=\"structural\">{ </span><span class=\"structural\">firstName: </span>Bob<span class=\"structural\">, </span><span class=\"structural\">lastName: </span>Marley<span class=\"structural\"> }</span></span>"},{ style: "background-color:#98fb98", value: "<span class=\"formatted\" title=\"firstName: Alice\nlastName: Wolf\"><span class=\"structural\">{ </span><span class=\"structural\">firstName: </span>Alice<span class=\"structural\">, </span><span class=\"structural\">lastName: </span>Wolf<span class=\"structural\"> }</span></span>"},{ style: "background-color:#98fb98", value: "<span class=\"formatted\" title=\"firstName: Charlie\nlastName: Byrd\"><span class=\"structural\">{ </span><span class=\"structural\">firstName: </span>Charlie<span class=\"structural\">, </span><span class=\"structural\">lastName: </span>Byrd<span class=\"structural\"> }</span></span>"}] },
611611
{ name: "<span title=\"age: Int\">age</span>", children: [], rightAlign: true, values: ["<span class=\"formatted\" title=\"\"><span class=\"numbers\">15</span></span>","<span class=\"formatted\" title=\"\"><span class=\"numbers\">45</span></span>","<span class=\"formatted\" title=\"\"><span class=\"numbers\">20</span></span>","<span class=\"formatted\" title=\"\"><span class=\"numbers\">40</span></span>","<span class=\"formatted\" title=\"\"><span class=\"numbers\">30</span></span>","<span class=\"formatted\" title=\"\"><span class=\"numbers\">20</span></span>","<span class=\"formatted\" title=\"\"><span class=\"numbers\">30</span></span>"] },
612612
{ name: "<span title=\"city: String?\">city</span>", children: [], rightAlign: false, values: ["London","Dubai","Moscow","Milan","Tokyo","<span class=\"formatted\" title=\"\"><span class=\"null\">null</span></span>","Moscow"] },

docs/StardustDocs/topics/format.md

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,22 @@ See [](#grammar) for everything that's available.
4343
The `format` function can be repeated as many times as needed and, to view the result, you can call
4444
[`toHtml()`/`toStandaloneHtml()`](toHTML.md).
4545

46+
Specifying a [column group](DataColumn.md#columngroup) makes all of its inner columns
47+
be formatted in the same way unless overridden.
48+
49+
Formatting is done additively, meaning you can add more formatting to a cell that's already formatted or
50+
override certain attributes inherited from its outer group.
51+
52+
Specifying a [frame column](DataColumn.md#framecolumn) at the moment does nothing
53+
([Issue #1375](https://github.com/Kotlin/dataframe/issues/1375)),
54+
[](convert.md) each nested [`DataFrame`](DataFrame.md) to a `FormattedFrame` instead:
55+
56+
```kotlin
57+
df.convert { myFrameCol }.with {
58+
it.format { someCol }.with { background(green) }
59+
}.toStandaloneHtml()
60+
```
61+
4662
#### Grammar {collapsible="true"}
4763

4864
<inline-frame src="resources/org.jetbrains.kotlinx.dataframe.api.FormatDocs.Grammar.ForHtml.html" width="100%"/>
@@ -63,6 +79,8 @@ val ageMax = df.age.max()
6379

6480
df
6581
.format().with { bold and textColor(black) and background(white) }
82+
.format { name }.with { underline }
83+
.format { name.lastName }.with { italic }
6684
.format { isHappy }.with { background(if (it) green else red) }
6785
.format { weight }.notNull().linearBg(50 to FormattingDsl.blue, 90 to FormattingDsl.red)
6886
.format { age }.perRowCol { row, col ->
@@ -81,6 +99,8 @@ val ageMax = df.max { "age"<Int>() }
8199

82100
df
83101
.format().with { bold and textColor(black) and background(white) }
102+
.format("name").with { underline }
103+
.format { "name"["lastName"] }.with { italic }
84104
.format("isHappy").with {
85105
background(if (it as Boolean) green else red)
86106
}

tests/src/test/kotlin/org/jetbrains/kotlinx/dataframe/samples/api/Modify.kt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,8 @@ class Modify : DataFrameSampleHelper("operations", "modify") {
5555

5656
df
5757
.format().with { bold and textColor(black) and background(white) }
58+
.format("name").with { underline }
59+
.format { "name"["lastName"] }.with { italic }
5860
.format("isHappy").with {
5961
background(if (it as Boolean) green else red)
6062
}
@@ -77,6 +79,8 @@ class Modify : DataFrameSampleHelper("operations", "modify") {
7779

7880
df
7981
.format().with { bold and textColor(black) and background(white) }
82+
.format { name }.with { underline }
83+
.format { name.lastName }.with { italic }
8084
.format { isHappy }.with { background(if (it) green else red) }
8185
.format { weight }.notNull().linearBg(50 to FormattingDsl.blue, 90 to FormattingDsl.red)
8286
.format { age }.perRowCol { row, col ->

0 commit comments

Comments
 (0)