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

Jump to bottom

Upgrade XChart to 3.8.4 #3291

Merged
merged 2 commits into from Jun 17, 2023
Merged

Upgrade XChart to 3.8.4 #3291

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f32d4d1
upgrade xChart to 3.8.3
J-N-K Dec 29, 2022
42ab2d5
3.8.4
J-N-K Jun 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions bundles/org.openhab.core.ui/NOTICE
View file
Open in desktop
Expand Up @@ -15,10 +15,10 @@ https://github.com/openhab/openhab-core

== Third-party Content

xchart-2.6.1
xchart-3.8.4
* License: Apache License, 2.0
* Project: http://knowm.org/open-source/xchart
* Source: https://github.com/timmolter/XChart/tree/xchart-2.6.1
* Source: https://github.com/timmolter/XChart/tree/xchart-3.8.4

== Third-party license(s)

Expand Down
3 changes: 3 additions & 0 deletions bundles/org.openhab.core.ui/bnd.bnd
View file
Open in desktop
Expand Up @@ -4,4 +4,7 @@ Private-Package: \
org.knowm.xchart.*
Import-Package: \
de.erichseifert.vectorgraphics2d.*;resolution:=optional,\
de.rototor.pdfbox.*;resolution:=optional,\
com.madgag.*;resolution:=optional,\
org.apache.pdfbox.*;resolution:=optional,\
*
3 changes: 1 addition & 2 deletions bundles/org.openhab.core.ui/pom.xml
View file
Open in desktop
Expand Up @@ -18,8 +18,7 @@
<dependency>
<groupId>org.knowm.xchart</groupId>
<artifactId>xchart</artifactId>
<!-- Newer versions have issues with customized grid lines, see: https://github.com/knowm/XChart/issues/628 -->
<version>3.1.0</version>
<version>3.8.4</version>
</dependency>
<dependency>
<groupId>org.openhab.core.bundles</groupId>
Expand Down
4 changes: 2 additions & 2 deletions ...in/java/org/openhab/core/ui/internal/chart/defaultchartprovider/DefaultChartProvider.java
View file
Open in desktop
Expand Up @@ -32,7 +32,7 @@
import org.knowm.xchart.XYChart;
import org.knowm.xchart.XYChartBuilder;
import org.knowm.xchart.XYSeries;
import org.knowm.xchart.style.Styler;
import org.knowm.xchart.style.AxesChartStyler;
import org.knowm.xchart.style.Styler.LegendPosition;
import org.knowm.xchart.style.XYStyler;
import org.knowm.xchart.style.markers.None;
Expand Down Expand Up @@ -195,7 +195,7 @@ public BufferedImage createChart(@Nullable String serviceId, @Nullable String th
styler.setYAxisDecimalPattern(yAxisDecimalPattern);
}
styler.setYAxisTickMarkSpacingHint(yAxisSpacing);
styler.setYAxisLabelAlignment(Styler.TextAlignment.Right);
styler.setYAxisLabelAlignment(AxesChartStyler.TextAlignment.Right);
// chart
styler.setChartBackgroundColor(chartTheme.getChartBackgroundColor());
styler.setChartFontColor(chartTheme.getChartFontColor());
Expand Down