Skip to content

Commit f75125e

Browse files
kMutagenekMutagene
committed
plotly.js v2.24: add pattern to multiple traces
- Add Marker pattern for `Chart.Pie`, `Chart.Doughnut`, `Chart.FunnelArea, `Chart.Sunburst, `Chart.Icicle and `Chart.Treemap - Add some xml docs for the `Pattern` object
1 parent a3e1abc commit f75125e

File tree

16 files changed

+407
-74
lines changed

16 files changed

+407
-74
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
[![Build and test](https://github.com/plotly/Plotly.NET/actions/workflows/build-and-test.yml/badge.svg)](https://github.com/plotly/Plotly.NET/actions/workflows/build-and-test.yml)
55
[![](https://img.shields.io/nuget/vpre/Plotly.NET)](https://www.nuget.org/packages/Plotly.NET/)
66
[![Discord](https://img.shields.io/discord/836161044501889064?color=purple&label=Join%20our%20Discord%21&logo=discord&logoColor=white)](https://discord.gg/k3kUtFY8DB)
7-
![](https://img.shields.io/badge/supported%20plotly.js%20version-2.23.2-blue)
7+
![](https://img.shields.io/badge/supported%20plotly.js%20version-2.24.3-blue)
88
[![DOI](https://img.shields.io/badge/DOI-10.12688%2Ff1000research.123971.1-brightgreen)](https://doi.org/10.12688/f1000research.123971.1)
99

1010
### Table of contents

‎src/Plotly.NET/ChartAPI/ChartDomain.fs‎

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

‎src/Plotly.NET/Globals.fs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ open Giraffe.ViewEngine
77

88
/// The plotly js version loaded from cdn in rendered html docs
99
[<Literal>]
10-
let PLOTLYJS_VERSION = "2.23.2"
10+
let PLOTLYJS_VERSION = "2.24.3"
1111

1212
[<Literal>]
1313
let SCRIPT_TEMPLATE =

‎src/Plotly.NET/Plotly.NET.fsproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@
4040
<ItemGroup>
4141
<None Include="RELEASE_NOTES.md" />
4242
<None Include="..\..\docs\img\logo.png" Pack="true" PackagePath="\" />
43-
<EmbeddedResource Include="plotly-2.23.2.min.js" />
44-
<EmbeddedResource Include="plotly-2.23.2.min.js.LICENSE.txt" />
43+
<EmbeddedResource Include="plotly-2.24.3.min.js" />
44+
<EmbeddedResource Include="plotly-2.24.3.min.js.LICENSE.txt" />
4545
<Compile Include="Globals.fs" />
4646
<Compile Include="InternalUtils.fs" />
4747
<Compile Include="CommonAbstractions\ColorKeyword.fs" />

‎src/Plotly.NET/RELEASE_NOTES.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
- Keep up with plotlyjs 2.x incremental updates:
66
- v2.22:
77
- [Implement multi legend support](https://github.com/plotly/Plotly.NET/issues/406)
8+
- v2.23:
9+
- [add `xref` and `yref` attributes for Legend and ColorBar](https://github.com/plotly/Plotly.NET/commit/a3e1abcfda7b316c704d477471be1294860b48b7)
810

911
### 4.2.0 - August 02 2023
1012

‎src/Plotly.NET/Traces/ObjectAbstractions/Pattern.fs‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ type Pattern() =
1010
inherit DynamicObj()
1111

1212
/// <summary>
13-
///
13+
/// Returns a new Pattern object with the given styles
1414
/// </summary>
1515
/// <param name="BGColor">When there is no colorscale sets the color of background pattern fill. Defaults to a `marker.color` background when `fillmode` is "overlay". Otherwise, defaults to a transparent background. </param>
1616
/// <param name="FGColor">When there is no colorscale sets the color of foreground pattern fill. Defaults to a `marker.color` background when `fillmode` is "replace". Otherwise, defaults to dark grey or white to increase contrast with the `bgcolor`.</param>
@@ -46,6 +46,18 @@ type Pattern() =
4646
?Solidity = Solidity
4747
)
4848

49+
/// <summary>
50+
/// Returns a function that applies the given styles to a Pattern object
51+
/// </summary>
52+
/// <param name="BGColor">When there is no colorscale sets the color of background pattern fill. Defaults to a `marker.color` background when `fillmode` is "overlay". Otherwise, defaults to a transparent background. </param>
53+
/// <param name="FGColor">When there is no colorscale sets the color of foreground pattern fill. Defaults to a `marker.color` background when `fillmode` is "replace". Otherwise, defaults to dark grey or white to increase contrast with the `bgcolor`.</param>
54+
/// <param name="FGOpacity">Sets the opacity of the foreground pattern fill. Defaults to a 0.5 when `fillmode` is "overlay". Otherwise, defaults to 1.</param>
55+
/// <param name="FillMode">Determines whether `marker.color` should be used as a default to `bgcolor` or a `fgcolor`.</param>
56+
/// <param name="Shape">Sets the shape of the pattern fill. By default, no pattern is used for filling the area.</param>
57+
/// <param name="MultiShape">Sets the shape of the pattern fill. By default, no pattern is used for filling the area.</param>
58+
/// <param name="Size">Sets the size of unit squares of the pattern fill in pixels, which corresponds to the interval of repetition of the pattern.</param>
59+
/// <param name="MultiSize">Sets the size of unit squares of the pattern fill in pixels, which corresponds to the interval of repetition of the pattern.</param>
60+
/// <param name="Solidity">Sets the solidity of the pattern fill. Solidity is roughly the fraction of the area filled by the pattern. Solidity of 0 shows only the background color without pattern and solidty of 1 shows only the foreground color without pattern.</param>
4961
static member style
5062
(
5163
[<Optional; DefaultParameterValue(null)>] ?BGColor: Color,

‎src/Plotly.NET/plotly-2.23.2.min.js‎

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎src/Plotly.NET/plotly-2.24.3.min.js‎

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Plotly.NET/plotly-2.23.2.min.js.LICENSE.txt renamed to src/Plotly.NET/plotly-2.24.3.min.js.LICENSE.txt

File renamed without changes.

‎tests/Common/FSharpTestBase/FSharpTestBase.fsproj‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77

88
<ItemGroup>
99
<EmbeddedResource Include="..\..\..\docs\img\logo.png" />
10-
<EmbeddedResource Include="..\..\..\src\Plotly.NET\plotly-2.23.2.min.js" />
11-
<EmbeddedResource Include="..\..\..\src\Plotly.NET\plotly-2.23.2.min.js.LICENSE.txt" />
10+
<EmbeddedResource Include="..\..\..\src\Plotly.NET\plotly-2.24.3.min.js" />
11+
<EmbeddedResource Include="..\..\..\src\Plotly.NET\plotly-2.24.3.min.js.LICENSE.txt" />
1212
</ItemGroup>
1313

1414
<ItemGroup>
@@ -21,6 +21,7 @@
2121
<Compile Include="TestCharts\ChartCarpetTestCharts.fs" />
2222
<Compile Include="TestCharts\ChartDomainTestCharts.fs" />
2323
<Compile Include="TestCharts\ChartSmithTestCharts.fs" />
24+
<Compile Include="TestCharts\UpstreamFeatures\2.24.fs" />
2425
<Compile Include="TestCharts\UpstreamFeatures\2.23.fs" />
2526
<Compile Include="TestCharts\UpstreamFeatures\2.22.fs" />
2627
<Compile Include="TestCharts\UpstreamFeatures\2.21.fs" />

0 commit comments

Comments
 (0)