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

Prevent memory leak in CandleStickChart & VolumeChart #3914

Merged
merged 1 commit into from
Jan 27, 2020
Merged

Prevent memory leak in CandleStickChart & VolumeChart #3914

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 12 additions & 9 deletions desktop/src/main/java/bisq/desktop/main/market/trades/charts/price/CandleStickChart.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,6 @@
import java.util.Iterator;
import java.util.List;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

/**
* A candlestick chart is a style of bar-chart used primarily to describe price movements of a security, derivative,
* or currency over time.
Expand All @@ -81,7 +78,6 @@
* extra value property using a CandleStickExtraValues object.
*/
public class CandleStickChart extends XYChart<Number, Number> {
private static final Logger log = LoggerFactory.getLogger(CandleStickChart.class);

private final StringConverter<Number> priceStringConverter;

Expand Down Expand Up @@ -162,8 +158,7 @@ protected void dataItemChanged(XYChart.Data<Number, Number> item) {
@Override
protected void dataItemAdded(XYChart.Series<Number, Number> series, int itemIndex, XYChart.Data<Number, Number> item) {
Node candle = createCandle(getData().indexOf(series), item, itemIndex);
if (getPlotChildren().contains(candle))
getPlotChildren().remove(candle);
getPlotChildren().remove(candle);

if (shouldAnimate()) {
candle.setOpacity(0);
Expand Down Expand Up @@ -195,18 +190,22 @@ protected void dataItemRemoved(XYChart.Data<Number, Number> item, XYChart.Series
// fade out old candle
FadeTransition ft = new FadeTransition(Duration.millis(500), node);
ft.setToValue(0);
ft.setOnFinished((ActionEvent actionEvent) -> getPlotChildren().remove(node));
ft.setOnFinished((ActionEvent actionEvent) -> {
getPlotChildren().remove(node);
removeDataItemFromDisplay(series, item);
});
ft.play();
} else {
getPlotChildren().remove(node);
removeDataItemFromDisplay(series, item);
}
}

@Override
protected void seriesAdded(XYChart.Series<Number, Number> series, int seriesIndex) {
// handle any data already in series
for (int j = 0; j < series.getData().size(); j++) {
XYChart.Data item = series.getData().get(j);
XYChart.Data<Number, Number> item = series.getData().get(j);
Node candle = createCandle(seriesIndex, item, j);

if (!getPlotChildren().contains(candle)) {
Expand Down Expand Up @@ -256,12 +255,16 @@ protected void seriesRemoved(XYChart.Series<Number, Number> series) {
ft.setOnFinished((ActionEvent actionEvent) -> {
getPlotChildren().remove(seriesPath);
seriesPath.getElements().clear();
removeSeriesFromDisplay(series);
});
ft.play();
} else {
getPlotChildren().remove(seriesPath);
seriesPath.getElements().clear();
removeSeriesFromDisplay(series);
}
} else {
removeSeriesFromDisplay(series);
}
}

Expand All @@ -273,7 +276,7 @@ protected void seriesRemoved(XYChart.Series<Number, Number> series) {
* @param itemIndex The index of the data item in the series
* @return New candle node to represent the give data item
*/
private Node createCandle(int seriesIndex, final XYChart.Data item, int itemIndex) {
private Node createCandle(int seriesIndex, final XYChart.Data<Number, Number> item, int itemIndex) {
Node candle = item.getNode();
// check if candle has already been created
if (candle instanceof Candle) {
Expand Down
25 changes: 15 additions & 10 deletions desktop/src/main/java/bisq/desktop/main/market/trades/charts/volume/VolumeChart.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,10 @@
package bisq.desktop.main.market.trades.charts.volume;

import bisq.desktop.main.market.trades.charts.CandleData;
import bisq.desktop.main.market.trades.charts.price.CandleStickChart;

import javafx.animation.FadeTransition;
import javafx.animation.KeyFrame;
import javafx.animation.Timeline;

import javafx.scene.Node;
import javafx.scene.chart.Axis;
Expand All @@ -36,11 +37,7 @@
import java.util.Iterator;
import java.util.List;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

public class VolumeChart extends XYChart<Number, Number> {
private static final Logger log = LoggerFactory.getLogger(CandleStickChart.class);

private final StringConverter<Number> toolTipStringConverter;

Expand Down Expand Up @@ -91,8 +88,7 @@ protected void dataItemChanged(XYChart.Data<Number, Number> item) {
@Override
protected void dataItemAdded(XYChart.Series<Number, Number> series, int itemIndex, XYChart.Data<Number, Number> item) {
Node volumeBar = createCandle(getData().indexOf(series), item, itemIndex);
if (getPlotChildren().contains(volumeBar))
getPlotChildren().remove(volumeBar);
getPlotChildren().remove(volumeBar);

if (shouldAnimate()) {
volumeBar.setOpacity(0);
Expand All @@ -111,17 +107,21 @@ protected void dataItemRemoved(XYChart.Data<Number, Number> item, XYChart.Series
if (shouldAnimate()) {
FadeTransition ft = new FadeTransition(Duration.millis(500), node);
ft.setToValue(0);
ft.setOnFinished((ActionEvent actionEvent) -> getPlotChildren().remove(node));
ft.setOnFinished((ActionEvent actionEvent) -> {
getPlotChildren().remove(node);
removeDataItemFromDisplay(series, item);
});
ft.play();
} else {
getPlotChildren().remove(node);
removeDataItemFromDisplay(series, item);
}
}

@Override
protected void seriesAdded(XYChart.Series<Number, Number> series, int seriesIndex) {
for (int j = 0; j < series.getData().size(); j++) {
XYChart.Data item = series.getData().get(j);
XYChart.Data<Number, Number> item = series.getData().get(j);
Node volumeBar = createCandle(seriesIndex, item, j);
if (shouldAnimate()) {
volumeBar.setOpacity(0);
Expand All @@ -148,9 +148,14 @@ protected void seriesRemoved(XYChart.Series<Number, Number> series) {
getPlotChildren().remove(volumeBar);
}
}
if (shouldAnimate()) {
new Timeline(new KeyFrame(Duration.millis(500), event -> removeSeriesFromDisplay(series))).play();
} else {
removeSeriesFromDisplay(series);
}
}

private Node createCandle(int seriesIndex, final XYChart.Data item, int itemIndex) {
private Node createCandle(int seriesIndex, final XYChart.Data<Number, Number> item, int itemIndex) {
Node volumeBar = item.getNode();
if (volumeBar instanceof VolumeBar) {
((VolumeBar) volumeBar).setSeriesAndDataStyleClasses("series" + seriesIndex, "data" + itemIndex);
Expand Down