Merge pull request #149 from xdev-software/develop

Release

Author: AB-xdev

CHANGELOG.md

@@ -1,3 +1,10 @@
+## 1.3.1
+* Add subtitle option #141 (@aripddev)
+* Add ``PointStyle#rectRounded`` #143 (@aripddev)
+* Add ``BubbleDataset#pointStyle`` #144 (@aripddev)
+* ``reverse`` property should be on the ``Scale`` object #145
+* Added all available properties for ``Legend``
+
 ## 1.3.0
 * Allows creation of mixed charts #128
   * New chart class: ``MixedChart``
@@ -7,8 +14,8 @@
 * Slim down test dependencies
 
 ## 1.2.0
-* Add TimeScale and TimeTicks to allow building linear time charts #90
-* Add options for the [Zoom plugin](https://www.chartjs.org/chartjs-plugin-zoom/latest/) #117
+* Add TimeScale and TimeTicks to allow building linear time charts #90 (@astappiev)
+* Add options for the [Zoom plugin](https://www.chartjs.org/chartjs-plugin-zoom/latest/) #117 (@astappiev)
 * Updated dependencies
 
 ## 1.1.3
@@ -30,7 +37,7 @@
 * Updated dependencies
 
 ## 1.0.1
-* Added support for [stacked bar chart with groups](https://www.chartjs.org/docs/4.4.0/samples/bar/stacked-groups.html)
+* Added support for [stacked bar chart with groups](https://www.chartjs.org/docs/4.4.0/samples/bar/stacked-groups.html) (@dlemaignent)
 
 ## 1.0.0
 Initial release

CONTRIBUTING.md

@@ -27,6 +27,7 @@ You should have the following things installed:
   * Install the following plugins:
     * [Save Actions](https://plugins.jetbrains.com/plugin/22113) - Provides save actions, like running the formatter or adding ``final`` to fields
     * [SonarLint](https://plugins.jetbrains.com/plugin/7973-sonarlint) - CodeStyle/CodeAnalysis
+      * You may consider disabling telemetry in the settings under ``Tools > Sonarlint -> About``
     * [Checkstyle-IDEA](https://plugins.jetbrains.com/plugin/1065-checkstyle-idea) - CodeStyle/CodeAnalysis
   * Import the project
   * Ensure that everything is encoded in ``UTF-8``

chartjs-java-model/pom.xml

@@ -50,7 +50,7 @@
 
 		<slf4j-version>2.0.13</slf4j-version>
 		<log4j-version>2.23.1</log4j-version>
-		<testcontainers-version>1.19.7</testcontainers-version>
+		<testcontainers-version>1.19.8</testcontainers-version>
 
 		<!-- by default run no tests as Docker is required -->
 		<skipTests>true</skipTests>
@@ -188,7 +188,7 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-site-plugin</artifactId>
-					<version>4.0.0-M13</version>
+					<version>4.0.0-M14</version>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
@@ -201,7 +201,7 @@
 			<plugin>
 				<groupId>com.mycila</groupId>
 				<artifactId>license-maven-plugin</artifactId>
-				<version>4.3</version>
+				<version>4.5</version>
 				<configuration>
 					<properties>
 						<email>${project.organization.url}</email>

chartjs-java-model/src/main/java/software/xdev/chartjs/model/dataset/BubbleDataset.java

@@ -18,6 +18,7 @@
 import java.util.List;
 
 import software.xdev.chartjs.model.datapoint.BubbleDataPoint;
+import software.xdev.chartjs.model.enums.PointStyle;
 import software.xdev.chartjs.model.objects.OptionalArray;
 
 
@@ -34,6 +35,8 @@ public class BubbleDataset extends RoundDataset<BubbleDataset, BubbleDataPoint>
 {
 	private final List<Integer> hoverRadius = new OptionalArray<>();
 
+	private PointStyle pointStyle;
+	
 	@Override
 	protected String defaultType()
 	{
@@ -72,4 +75,15 @@ public List<Integer> getHoverRadius()
 	{
 		return this.hoverRadius;
 	}
+	
+	public PointStyle getPointStyle()
+	{
+		return this.pointStyle;
+	}
+	
+	public BubbleDataset setPointStyle(final PointStyle pointStyle)
+	{
+		this.pointStyle = pointStyle;
+		return this;
+	}
 }

chartjs-java-model/src/main/java/software/xdev/chartjs/model/enums/PointStyle.java

@@ -25,6 +25,7 @@ public enum PointStyle
 	CIRCLE,
 	TRIANGLE,
 	RECT,
+	RECT_ROUNDED,
 	RECT_ROT,
 	CROSS,
 	CROSS_ROT,

chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/Legend.java

@@ -26,9 +26,18 @@ public class Legend
 {
 	protected Boolean display;
 	protected Position position;
-	protected Boolean fullWidth;
+	protected String align;
+	protected Integer maxHeight;
+	protected Integer maxWidth;
+	protected Boolean fullSize;
 	protected JavaScriptFunction onClick;
+	protected JavaScriptFunction onHover;
+	protected JavaScriptFunction onLeave;
+	protected Boolean reverse;
 	protected LegendLabels labels;
+	protected Boolean rtl;
+	protected String textDirection;
+	protected LegendTitle title;
 
 	/**
 	 * @see #setDisplay(Boolean)
@@ -69,21 +78,74 @@ public Legend setPosition(final Legend.Position position)
 	}
 
 	/**
-	 * @see #setFullWidth(Boolean)
+	 * @see #setAlign(String)
 	 */
-	public Boolean getFullWidth()
+	public String getAlign()
 	{
-		return this.fullWidth;
+		return this.align;
+	}
+	
+	/**
+	 * Default 'center'.
+	 * <p>
+	 * Alignment of the legend
+	 */
+	public Legend setAlign(final String align)
+	{
+		this.align = align;
+		return this;
+	}
+	
+	/**
+	 * @see #setMaxHeight(Integer)
+	 */
+	public Integer getMaxHeight()
+	{
+		return this.maxHeight;
+	}
+	
+	/**
+	 * Maximum height of the legend, in pixels
+	 */
+	public Legend setMaxHeight(final Integer maxHeight)
+	{
+		this.maxHeight = maxHeight;
+		return this;
+	}
+	
+	/**
+	 * @see #setMaxWidth(Integer)
+	 */
+	public Integer getMaxWidth()
+	{
+		return this.maxWidth;
+	}
+	
+	/**
+	 * Maximum width of the legend, in pixels
+	 */
+	public Legend setMaxWidth(final Integer maxWidth)
+	{
+		this.maxWidth = maxWidth;
+		return this;
+	}
+	
+	/**
+	 * @see #setFullSize(Boolean)
+	 */
+	public Boolean getFullSize()
+	{
+		return this.fullSize;
 	}
 
 	/**
 	 * Default {@code true}
 	 * <p>
 	 * Marks that this box should take the full width of the canvas (pushing down other boxes)
 	 */
-	public Legend setFullWidth(final Boolean fullWidth)
+	public Legend setFullSize(final Boolean fullSize)
 	{
-		this.fullWidth = fullWidth;
+		this.fullSize = fullSize;
 		return this;
 	}
 
@@ -96,8 +158,6 @@ public JavaScriptFunction getOnClick()
 	}
 
 	/**
-	 * Default {@code function(event, legendItem) {}}
-	 * <p>
 	 * A callback that is called when a click is registered on top of a label item
 	 */
 	public Legend setOnClick(final JavaScriptFunction onClick)
@@ -106,6 +166,59 @@ public Legend setOnClick(final JavaScriptFunction onClick)
 		return this;
 	}
 
+	/**
+	 * @see #setOnHover(JavaScriptFunction)
+	 */
+	public JavaScriptFunction getOnHover()
+	{
+		return this.onHover;
+	}
+	
+	/**
+	 * A callback that is called when a 'mousemove' event is registered on top of a label item
+	 */
+	public Legend setOnHover(final JavaScriptFunction onHover)
+	{
+		this.onHover = onHover;
+		return this;
+	}
+	
+	/**
+	 * @see #setOnLeave(JavaScriptFunction)
+	 */
+	public JavaScriptFunction getOnLeave()
+	{
+		return this.onLeave;
+	}
+	
+	/**
+	 * A callback that is called when a 'mousemove' event is registered outside of a previously hovered label item
+	 */
+	public Legend setOnLeave(final JavaScriptFunction onLeave)
+	{
+		this.onLeave = onLeave;
+		return this;
+	}
+	
+	/**
+	 * @see #setReverse(Boolean)
+	 */
+	public Boolean getReverse()
+	{
+		return this.reverse;
+	}
+	
+	/**
+	 * Default <code>false</code>
+	 * <p>
+	 * Legend will show datasets in reverse order
+	 */
+	public Legend setReverse(final Boolean reverse)
+	{
+		this.reverse = reverse;
+		return this;
+	}
+	
 	/**
 	 * @see #setLabels(LegendLabels)
 	 */
@@ -125,6 +238,58 @@ public Legend setLabels(final LegendLabels labels)
 		return this;
 	}
 
+	/**
+	 * @see #setRtl(Boolean)
+	 */
+	public Boolean getRtl()
+	{
+		return this.rtl;
+	}
+	
+	/**
+	 * <code>true</code> for rendering the legends from right to left
+	 */
+	public Legend setRtl(final Boolean rtl)
+	{
+		this.rtl = rtl;
+		return this;
+	}
+	
+	/**
+	 * @see #setTextDirection(String)
+	 */
+	public String getTextDirection()
+	{
+		return this.textDirection;
+	}
+	
+	/**
+	 * This will force the text direction 'rtl' or 'ltr' on the canvas for rendering the legend, regardless of the css
+	 * specified on the canvas
+	 */
+	public Legend setTextDirection(final String textDirection)
+	{
+		this.textDirection = textDirection;
+		return this;
+	}
+	
+	/**
+	 * @see #setTitle(LegendTitle)
+	 */
+	public LegendTitle getTitle()
+	{
+		return this.title;
+	}
+	
+	/**
+	 * @see LegendTitle
+	 */
+	public Legend setTitle(final LegendTitle title)
+	{
+		this.title = title;
+		return this;
+	}
+	
 	public enum Position
 	{
 		TOP,