Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 72953ac

Browse filesBrowse files
alshanalshan
committed
Merge remote-tracking branch 'origin/master'
# Conflicts: # build.gradle.kts
2 parents 97e1da4 + 0d61f21 commit 72953ac
Copy full SHA for 72953ac

File tree

Expand file treeCollapse file tree

16 files changed

+80
-41
lines changed
Filter options
Expand file treeCollapse file tree

16 files changed

+80
-41
lines changed

‎Writerside/images/Python4DS.png

Copy file name to clipboard
-36.3 KB
Binary file not shown.

‎Writerside/images/coding_for_economists.png

Copy file name to clipboard
-472 KB
Binary file not shown.

‎Writerside/images/previews/square-legend_theme.png

Copy file name to clipboard
-25.2 KB
Binary file not shown.

‎Writerside/images/previews/square-theme_legend_scheme.png

Copy file name to clipboard
26.1 KB
Loading

‎Writerside/images/screenshots/geom_label.png renamed to ‎Writerside/images/screenshots/text_geoms.png

Copy file name to clipboard
File renamed without changes.

‎Writerside/topics/annotations.md

Copy file name to clipboardExpand all lines: Writerside/topics/annotations.md
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# Annotating Charts
22

33
You can customize the content of annotations for pie and bar charts by using the parameter `labels` of the corresponding functions.
4+
The parameter takes as value the result of the [`layerLabels()`](%api_annotations%/layer-labels/index.html) function call.
45

56
[Learn more (datalore link)](%nbp-annotations%).
67

‎Writerside/topics/charts.md

Copy file name to clipboardExpand all lines: Writerside/topics/charts.md
+15-1Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,4 +218,18 @@ Examples:
218218
Examples:
219219

220220
- [Flipped coordinates](%nb-coord_flip%)
221-
- [Polar coordinate system](%nb-coord_polar%)
221+
- [Polar coordinate system](%nb-coord_polar%)
222+
223+
224+
## Legends and Guides
225+
226+
[`guideLegend()`](%api_scale%/guide-legend.html),
227+
[`guideColorbar()`](%api_scale%/guide-colorbar.html),
228+
[`guides()`](%api_scale%/guides.html),
229+
[`layerKey()`](%api_scale%/layer-key.html)
230+
231+
Examples:
232+
233+
- [Legend customization](%nb-legend%)
234+
- [Manual legend](%nb-manual_legend%)
235+
- [Customize legend appearance](%nb-legend_theme%)

‎Writerside/topics/formats.md

Copy file name to clipboardExpand all lines: Writerside/topics/formats.md
+16-4Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,10 @@ The numeric format strings are used to format common numeric types. The general
7878
- `Z` - zetta, 10²¹
7979
- `Y` - yotta, 10²⁴
8080

81+
<note>
82+
These formatting rules are compatible with formatting from the d3 library, so you can find out more about the options listed above by visiting <a href="https://d3js.org/d3-format">this page</a>.
83+
</note>
84+
8185
### Number Format Examples
8286

8387
Let's format the number `1024`:
@@ -107,12 +111,20 @@ Some other examples:
107111
```
108112
format number result
109113
.1f 0.42 "0.4"
110-
.3g 0.4449 "0.445"
111-
,.12g -4200000 "-4,200,000"
112-
0,.2f 1234567.449 "1,234,567.45"
114+
0,.1f 1234567.89 "1,234,567.9"
113115
+$,.2f 1e4 "+$10,000.00"
116+
+$,.2~f 1e4 "+$10,000"
117+
~g 0.0000042 "0.0000042"
118+
~g 0.00000042 "4.2e-7"
119+
~g 420000 "420000"
120+
~g 4200000 "4.2e+6"
121+
,.2g -4231 "-4,2e+3"
122+
,.6g -4231 "-4,231.00"
123+
,.6~g -4231 "-4,231"
114124
```
115125

126+
See more examples <a href="https://observablehq.com/@d3/d3-format">here</a>.
127+
116128
## String Template
117129

118130
The number format can be used in a template to create a string with variable substitution.
@@ -220,5 +232,5 @@ You can format text in annotations, see: [Annotating Charts](annotations.md).
220232
## Demo Notebooks
221233

222234
- [Formatting labels on plots](%nb-formatting_axes_etc%)
223-
- [The `label_format` parameter in `geom_text()`](%nb-label_format%)
235+
- [Text geoms](%nb-text_geoms%)
224236
- [Exponent format in Lets-Plot](%nb-superscript_exponent%)

‎Writerside/topics/gallery.md

Copy file name to clipboardExpand all lines: Writerside/topics/gallery.md
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
<list columns="3">
44
<li>
5-
<a href="%nb-legend_theme%">
6-
<img alt="Customize legend appearance" src="square-legend_theme.png"/>
5+
<a href="%nb-theme_legend_scheme%">
6+
<img alt="Theme legend scheme" src="square-theme_legend_scheme.png"/>
77
</a>
88
</li>
99
<li>

‎Writerside/topics/geospatial_charts.md

Copy file name to clipboardExpand all lines: Writerside/topics/geospatial_charts.md
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,6 @@ When declaring additional GeoTools dependencies, check the compatible version in
106106
<img src="projection_provided.png" alt="Using exotic map projections" height="339"/>
107107

108108
- Label geometry:
109-
[geom_label.ipynb](%nb-geom_label%)
109+
[text_geoms.ipynb](%nb-text_geoms%)
110110

111-
<img src="geom_label.png" alt="Label geometry" width="480"/>
111+
<img src="text_geoms.png" alt="Text geoms" width="480"/>

‎Writerside/topics/presentation_options.md

Copy file name to clipboardExpand all lines: Writerside/topics/presentation_options.md
+35-19Lines changed: 35 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,28 @@
1212
[`guideColorbar()`](%api_scale%/guide-colorbar.html),
1313
[`guides()`](%api_scale%/guides.html)
1414

15+
### Examples
16+
17+
- [Themes overview](%nb-themes%)
18+
- [Default theme](%nb-default_theme%)
19+
- [Applying common theme to a plot group](%nb-gggrid_theme%)
20+
- [Plot margins](%nb-theme_plot_margin%)
21+
- [Option to show/hide plot messages](%nb-theme_plot_message%)
22+
- [Justification for text elements](%nb-hjust_vjust%)
23+
- [Margins](%nb-margins%)
24+
- [`margin` parameter of `elementText()`](%nb-text_margins%)
25+
- [Panel border](%nb-panel_border%)
26+
- [Tooltip properties in `theme()`](%nb-tooltips_theme%)
27+
- [Plot title, subtitle and caption](%nb-title_subtitle_caption%)
28+
- [Theme colors for geometries](%nb-geom_theme_colors%)
29+
- [Customize legend appearance](%nb-legend_theme%)
30+
- [Tooltip customization](%nb-tooltip_config%)
31+
- [Set font faces](%nb-set_font_faces%)
32+
- [Set font size and family](%nb-font_size_and_family%)
33+
- [Rotation of axis labels](%nb-axis_text_angle%)
34+
- [Exponent format in Lets-Plot](%nb-superscript_exponent%)
35+
- [Annotation labels on pie-chart](%nb-annotations_for_pie%)
36+
1537
## Predefined Themes
1638

1739
[`minimal2`](%api_theme%/theme-minimal2.html),
@@ -27,6 +49,17 @@
2749
<img alt="All predefined themes" src="complete_themes.png" style="block"/>
2850
</a>
2951

52+
### Predefined Themes Examples
53+
54+
- [Default theme](%nb-default_theme%)
55+
- [Theme flavors](%nb-theme_flavors%)
56+
- [Applying common theme to a plot group](%nb-gggrid_theme%)
57+
- [Margins](%nb-margins%)
58+
- [`margin` parameter of `elementText()`](%nb-text_margins%)
59+
- [Theme colors for geometries](%nb-geom_theme_colors%)
60+
- [Axis position](%nb-axis_position%)
61+
- [Exponent format in Lets-Plot](%nb-superscript_exponent%)
62+
3063
## Color Schemes (Flavors)
3164

3265
[`darcula`](%api_theme%/flavor-darcula.html),
@@ -39,26 +72,9 @@
3972
<img alt="Theme colors for geometries" src="flavors.png" style="block"/>
4073
</a>
4174

42-
## Examples
75+
### Flavors Examples
4376

44-
- [Default theme](%nb-default_theme%)
45-
- [Themes overview](%nb-themes%)
77+
- [Theme flavors](%nb-theme_flavors%)
4678
- [Applying common theme to a plot group](%nb-gggrid_theme%)
47-
- [Plot margins](%nb-theme_plot_margin%)
48-
- [Option to show/hide plot messages](%nb-theme_plot_message%)
49-
- [Justification for text elements](%nb-hjust_vjust%)
50-
- [Margins](%nb-margins%)
51-
- [`margin` parameter of `elementText()`](%nb-text_margins%)
52-
- [Panel border](%nb-panel_border%)
53-
- [Tooltip properties in `theme()`](%nb-tooltips_theme%)
54-
- [Plot title, subtitle and caption](%nb-title_subtitle_caption%)
5579
- [Theme colors for geometries](%nb-geom_theme_colors%)
56-
- [Theme flavors](%nb-theme_flavors%)
57-
- [Customizing the legend](%nb-legend%)
58-
- [Tooltip customization](%nb-tooltip_config%)
59-
- [Set font faces](%nb-set_font_faces%)
60-
- [Set font size and family](%nb-font_size_and_family%)
61-
- [Axis position](%nb-axis_position%)
62-
- [Rotation of axis labels](%nb-axis_text_angle%)
63-
- [Exponent format in Lets-Plot](%nb-superscript_exponent%)
6480
- [Annotation labels on pie-chart](%nb-annotations_for_pie%)

‎Writerside/topics/tooltips.md

Copy file name to clipboardExpand all lines: Writerside/topics/tooltips.md
+2-1Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# Tooltip Customization
22

3-
You can customize the content, values formatting and appearance of tooltip for any geometry layer in your plot.
3+
You can customize the content, values formatting and appearance of tooltip for any geometry layer by using the parameter `tooltips`.
4+
The parameter takes as value the result of the [`layerToltips()`](%api_tooltips%/layer-tooltips/index.html) function call.
45

56
[Learn more (datalore link)](%nbp-tooltips%).
67

‎Writerside/v.list

Copy file name to clipboardExpand all lines: Writerside/v.list
+4-5Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!DOCTYPE vars SYSTEM "https://resources.jetbrains.com/writerside/1.0/vars.dtd">
33
<vars>
4-
<var name="version" value="4.8.0"/>
4+
<var name="version" value="4.9.2"/>
55
<var name="current_year" value="2024"/>
66
<var name="web_root" value="https://lets-plot.org"/>
77

@@ -33,13 +33,13 @@
3333
<!-- Gallery -->
3434
<var name="nb-geotools_naturalearth" value="%nbviewer_demo%/geotools_naturalearth.ipynb"/>
3535
<var name="nb-interact_pan_zoom" value="%nbviewer_demo%/interact_pan_zoom.ipynb"/>
36-
<var name="nb-legend_theme" value="%nbviewer_cookbook%/legend_theme.ipynb"/>
3736
<var name="nb-lp_verse" value="%nbviewer_demo%/lp_verse.ipynb"/>
3837
<var name="nb-mpg_daisy" value="%nbviewer_demo%/mpg_daisy.ipynb"/>
3938
<var name="nb-palmer_penguins" value="%nbviewer_demo%/palmer_penguins.ipynb"/>
4039
<var name="nb-pushkin" value="%nbviewer_demo%/pushkin.ipynb"/>
4140
<var name="nb-spatialdataset_kotlin_isl" value="%nbviewer_demo%/spatialdataset_kotlin_isl.ipynb"/>
4241
<var name="nb-sunshine_hours" value="%nbviewer_demo%/sunshine_hours.ipynb"/>
42+
<var name="nb-theme_legend_scheme" value="%nbviewer_demo%/theme_legend_scheme.ipynb"/>
4343
<var name="nb-us_unemployment" value="%nbviewer_demo%/us_unemployment.ipynb"/>
4444
<var name="nb-wind_rose" value="%nbviewer_demo%/wind_rose.ipynb"/>
4545
<!-- Cookbooks -->
@@ -72,12 +72,10 @@
7272
<var name="nb-geom_dotplot" value="%nbviewer_cookbook%/geom_dotplot.ipynb"/>
7373
<var name="nb-geom_function" value="%nbviewer_cookbook%/geom_function.ipynb"/>
7474
<var name="nb-geom_histogram_threshold" value="%nbviewer_cookbook%/geom_histogram_threshold.ipynb"/>
75-
<var name="nb-geom_label" value="%nbviewer_cookbook%/geom_label.ipynb"/>
7675
<var name="nb-geom_lollipop" value="%nbviewer_cookbook%/geom_lollipop.ipynb"/>
7776
<var name="nb-geom_pie" value="%nbviewer_cookbook%/geom_pie.ipynb"/>
7877
<var name="nb-geom_smooth" value="%nbviewer_cookbook%/geom_smooth.ipynb"/>
7978
<var name="nb-geom_spoke" value="%nbviewer_cookbook%/geom_spoke.ipynb"/>
80-
<var name="nb-geom_text_and_label_new_features" value="%nbviewer_cookbook%/geom_text_and_label_new_features.ipynb"/>
8179
<var name="nb-geom_theme_colors" value="%nbviewer_cookbook%/geom_theme_colors.ipynb"/>
8280
<var name="nb-geom_violin" value="%nbviewer_cookbook%/geom_violin.ipynb"/>
8381
<var name="nb-geom_ydotplot" value="%nbviewer_cookbook%/geom_ydotplot.ipynb"/>
@@ -94,9 +92,9 @@
9492
<var name="nb-image_grayscale" value="%nbviewer_cookbook%/image_grayscale.ipynb"/>
9593
<var name="nb-jittered_points" value="%nbviewer_cookbook%/jittered_points.ipynb"/>
9694
<var name="nb-joint_plot" value="%nbviewer_cookbook%/joint_plot.ipynb"/>
97-
<var name="nb-label_format" value="%nbviewer_cookbook%/label_format.ipynb"/>
9895
<var name="nb-latex_support" value="%nbviewer_cookbook%/latex_support.ipynb"/>
9996
<var name="nb-legend" value="%nbviewer_cookbook%/legend.ipynb"/>
97+
<var name="nb-legend_theme" value="%nbviewer_cookbook%/legend_theme.ipynb"/>
10098
<var name="nb-lines" value="%nbviewer_cookbook%/lines.ipynb"/>
10199
<var name="nb-manual_legend" value="%nbviewer_cookbook%/manual_legend.ipynb"/>
102100
<var name="nb-marginal_layers" value="%nbviewer_cookbook%/marginal_layers.ipynb"/>
@@ -126,6 +124,7 @@
126124
<var name="nb-stat_summary" value="%nbviewer_cookbook%/stat_summary.ipynb"/>
127125
<var name="nb-stat_summary_bin" value="%nbviewer_cookbook%/stat_summary_bin.ipynb"/>
128126
<var name="nb-superscript_exponent" value="%nbviewer_cookbook%/superscript_exponent.ipynb"/>
127+
<var name="nb-text_geoms" value="https://datalore.jetbrains.com/report/static/HZqq77cegYd.E7get_WnChZ/Lb69ZPTQWq3XbupPxnQ4Rh"/>
129128
<var name="nb-text_margins" value="%nbviewer_cookbook%/text_margins.ipynb"/>
130129
<var name="nb-theme_flavors" value="%nbviewer_cookbook%/theme_flavors.ipynb"/>
131130
<var name="nb-theme_plot_margin" value="%nbviewer_cookbook%/theme_plot_margin.ipynb"/>

‎docs/dokka/source/packages.md

Copy file name to clipboardExpand all lines: docs/dokka/source/packages.md
+1-3Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,9 +96,7 @@ letsPlot(data) +
9696

9797
- `geomTile()`, `geomContour()`, `geomPolygon()` (`Stat.contour()`), `geomContourFilled()`: [contours.ipynb](https://nbviewer.org/github/JetBrains/lets-plot-docs/blob/master/source/kotlin_examples/cookbook/contours.ipynb)
9898

99-
- `geomText()`: [label_format.ipynb](https://nbviewer.org/github/JetBrains/lets-plot-docs/blob/master/source/kotlin_examples/cookbook/label_format.ipynb)
100-
101-
- `geomLabel()`: [geom_label.ipynb](https://nbviewer.org/github/JetBrains/lets-plot-docs/blob/master/source/kotlin_examples/cookbook/geom_label.ipynb)
99+
- `geomText()`, `geomLabel()`: [text_geoms.ipynb](https://datalore.jetbrains.com/report/static/HZqq77cegYd.E7get_WnChZ/Lb69ZPTQWq3XbupPxnQ4Rh)
102100

103101
- `geomQQ()`, `geomQQLine()`, `geomQQ2()`, `geomQQ2Line()`, `qqPlot()`: [qq_plots.ipynb](https://nbviewer.org/github/JetBrains/lets-plot-docs/blob/master/source/kotlin_examples/cookbook/qq_plots.ipynb)
104102

‎plot-api/src/commonMain/kotlin/org/jetbrains/letsPlot/geom/geom_label.kt

Copy file name to clipboardExpand all lines: plot-api/src/commonMain/kotlin/org/jetbrains/letsPlot/geom/geom_label.kt
+1-3Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,7 @@ import org.jetbrains.letsPlot.tooltips.TooltipOptions
2424
*
2525
* ## Examples
2626
*
27-
* - [geom_label.ipynb](https://nbviewer.org/github/JetBrains/lets-plot-docs/blob/master/source/kotlin_examples/cookbook/geom_label.ipynb)
28-
*
29-
* - [geom_label_alpha_stroke.ipynb](https://nbviewer.org/github/JetBrains/lets-plot-docs/blob/master/source/kotlin_examples/cookbook/geom_label_alpha_stroke.ipynb)
27+
* - [text_geoms.ipynb](https://datalore.jetbrains.com/report/static/HZqq77cegYd.E7get_WnChZ/Lb69ZPTQWq3XbupPxnQ4Rh)
3028
*
3129
* @param data The data to be displayed in this layer. If null, the default, the data
3230
* is inherited from the plot data as specified in the call to [letsPlot][org.jetbrains.letsPlot.letsPlot].

‎plot-api/src/commonMain/kotlin/org/jetbrains/letsPlot/geom/geom_text.kt

Copy file name to clipboardExpand all lines: plot-api/src/commonMain/kotlin/org/jetbrains/letsPlot/geom/geom_text.kt
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import org.jetbrains.letsPlot.tooltips.TooltipOptions
2323
*
2424
* ## Examples
2525
*
26-
* - [label_format.ipynb](https://nbviewer.org/github/JetBrains/lets-plot-docs/blob/master/source/kotlin_examples/cookbook/label_format.ipynb)
26+
* - [text_geoms.ipynb](https://datalore.jetbrains.com/report/static/HZqq77cegYd.E7get_WnChZ/Lb69ZPTQWq3XbupPxnQ4Rh)
2727
*
2828
* - [formatting_axes_etc.ipynb](https://nbviewer.org/github/JetBrains/lets-plot-docs/blob/master/source/kotlin_examples/cookbook/formatting_axes_etc.ipynb)
2929
*

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.