demus/openhab-core
1
0
Fork 0
mirror of https://github.com/danieldemus/openhab-core.git synced 2025-01-25 11:45:49 +01:00
Code Issues 1 Packages Projects Releases Wiki Activity

Revert "Upgrade XChart to 3.8.4 (#3291)" (#3720)

Browse Source 
This reverts commit c2e81a13fd.
This commit is contained in:
Kai Kreuzer 2023-07-21 17:21:14 +02:00 committed by GitHub
parent b8ae55c3f5
commit 7a87001f98
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bundles/org.openhab.core.ui/NOTICE
View File

@ -15,10 +15,10 @@ https://github.com/openhab/openhab-core
== Third-party Content
xchart-3.8.4
xchart-2.6.1
* License: Apache License, 2.0
* Project: http://knowm.org/open-source/xchart
* Source: https://github.com/timmolter/XChart/tree/xchart-3.8.4
* Source: https://github.com/timmolter/XChart/tree/xchart-2.6.1
== Third-party license(s)

3
bundles/org.openhab.core.ui/bnd.bnd
View File

@ -4,7 +4,4 @@ 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
bundles/org.openhab.core.ui/pom.xml
View File

@ -18,7 +18,8 @@
<dependency>
<groupId>org.knowm.xchart</groupId>
<artifactId>xchart</artifactId>
<version>3.8.4</version>
<!-- Newer versions have issues with customized grid lines, see: https://github.com/knowm/XChart/issues/628 -->
<version>3.1.0</version>
</dependency>
<dependency>
<groupId>org.openhab.core.bundles</groupId>

4
bundles/org.openhab.core.ui/src/main/java/org/openhab/core/ui/internal/chart/defaultchartprovider/DefaultChartProvider.java
View File

@ -32,7 +32,7 @@ import org.eclipse.jdt.annotation.Nullable;
import org.knowm.xchart.XYChart;
import org.knowm.xchart.XYChartBuilder;
import org.knowm.xchart.XYSeries;
import org.knowm.xchart.style.AxesChartStyler;
import org.knowm.xchart.style.Styler;
import org.knowm.xchart.style.Styler.LegendPosition;
import org.knowm.xchart.style.XYStyler;
import org.knowm.xchart.style.markers.None;
@ -195,7 +195,7 @@ public class DefaultChartProvider implements ChartProvider {
styler.setYAxisDecimalPattern(yAxisDecimalPattern);
}
styler.setYAxisTickMarkSpacingHint(yAxisSpacing);
styler.setYAxisLabelAlignment(AxesChartStyler.TextAlignment.Right);
styler.setYAxisLabelAlignment(Styler.TextAlignment.Right);
// chart
styler.setChartBackgroundColor(chartTheme.getChartBackgroundColor());
styler.setChartFontColor(chartTheme.getChartFontColor());