diff --git a/gui/src/main/java/io/bitsquare/gui/main/markets/trades/charts/CandleData.java b/gui/src/main/java/io/bitsquare/gui/main/markets/trades/charts/CandleData.java
index d7e3cbca5d..e41cf373c7 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/markets/trades/charts/CandleData.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/markets/trades/charts/CandleData.java
@@ -1,3 +1,20 @@
+/*
+ * This file is part of Bitsquare.
+ *
+ * Bitsquare is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * Bitsquare is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Bitsquare. If not, see .
+ */
+
package io.bitsquare.gui.main.markets.trades.charts;
public class CandleData {
diff --git a/gui/src/main/java/io/bitsquare/gui/main/markets/trades/charts/volume/VolumeBar.java b/gui/src/main/java/io/bitsquare/gui/main/markets/trades/charts/volume/VolumeBar.java
index b7d29cf435..1bad815254 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/markets/trades/charts/volume/VolumeBar.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/markets/trades/charts/volume/VolumeBar.java
@@ -1,33 +1,18 @@
/*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
- * All rights reserved. Use is subject to license terms.
+ * This file is part of Bitsquare.
*
- * This file is available and licensed under the following license:
+ * Bitsquare is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
*
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
+ * Bitsquare is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
*
- * - Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * - Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the distribution.
- * - Neither the name of Oracle Corporation nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Bitsquare. If not, see .
*/
package io.bitsquare.gui.main.markets.trades.charts.volume;
@@ -38,9 +23,6 @@ import javafx.util.StringConverter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-/**
- * Candle node used for drawing a candle
- */
public class VolumeBar extends Group {
private static final Logger log = LoggerFactory.getLogger(VolumeBar.class);
diff --git a/gui/src/main/java/io/bitsquare/gui/main/markets/trades/charts/volume/VolumeChart.java b/gui/src/main/java/io/bitsquare/gui/main/markets/trades/charts/volume/VolumeChart.java
index 690e0b6275..aabf309d87 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/markets/trades/charts/volume/VolumeChart.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/markets/trades/charts/volume/VolumeChart.java
@@ -1,33 +1,18 @@
/*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
- * All rights reserved. Use is subject to license terms.
+ * This file is part of Bitsquare.
*
- * This file is available and licensed under the following license:
+ * Bitsquare is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
*
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
+ * Bitsquare is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
*
- * - Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * - Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the distribution.
- * - Neither the name of Oracle Corporation nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Bitsquare. If not, see .
*/
package io.bitsquare.gui.main.markets.trades.charts.volume;
@@ -48,46 +33,25 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-/**
- * A candlestick chart is a style of bar-chart used primarily to describe price movements of a security, derivative,
- * or currency over time.
- *
- * The Data Y value is used for the opening price and then the close, high and low values are stored in the Data's
- * extra value property using a CandleStickExtraValues object.
- */
public class VolumeChart extends XYChart {
private static final Logger log = LoggerFactory.getLogger(CandleStickChart.class);
private StringConverter toolTipStringConverter;
- // -------------- CONSTRUCTORS ----------------------------------------------
-
- /**
- * Construct a new CandleStickChart with the given axis.
- *
- * @param xAxis The x axis to use
- * @param yAxis The y axis to use
- */
public VolumeChart(Axis xAxis, Axis yAxis) {
super(xAxis, yAxis);
}
- // -------------- METHODS ------------------------------------------------------------------------------------------
public final void setToolTipStringConverter(StringConverter toolTipStringConverter) {
this.toolTipStringConverter = toolTipStringConverter;
}
- /**
- * Called to update and layout the content for the plot
- */
@Override
protected void layoutPlotChildren() {
- // we have nothing to layout if no data is present
if (getData() == null) {
return;
}
- // update volumeBar positions
for (int seriesIndex = 0; seriesIndex < getData().size(); seriesIndex++) {
XYChart.Series series = getData().get(seriesIndex);
Iterator> iter = getDisplayedDataIterator(series);
@@ -131,7 +95,6 @@ public class VolumeChart extends XYChart {
if (shouldAnimate()) {
volumeBar.setOpacity(0);
getPlotChildren().add(volumeBar);
- // fade in new volumeBar
FadeTransition ft = new FadeTransition(Duration.millis(500), volumeBar);
ft.setToValue(1);
ft.play();
@@ -144,7 +107,6 @@ public class VolumeChart extends XYChart {
protected void dataItemRemoved(XYChart.Data item, XYChart.Series series) {
final Node node = item.getNode();
if (shouldAnimate()) {
- // fade out old volumeBar
FadeTransition ft = new FadeTransition(Duration.millis(500), node);
ft.setToValue(0);
ft.setOnFinished((ActionEvent actionEvent) -> {
@@ -158,14 +120,12 @@ public class VolumeChart extends XYChart {
@Override
protected void seriesAdded(XYChart.Series 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);
Node volumeBar = createCandle(seriesIndex, item, j);
if (shouldAnimate()) {
volumeBar.setOpacity(0);
getPlotChildren().add(volumeBar);
- // fade in new volumeBar
FadeTransition ft = new FadeTransition(Duration.millis(500), volumeBar);
ft.setToValue(1);
ft.play();
@@ -177,11 +137,9 @@ public class VolumeChart extends XYChart {
@Override
protected void seriesRemoved(XYChart.Series series) {
- // remove all volumeBar nodes
for (XYChart.Data d : series.getData()) {
final Node volumeBar = d.getNode();
if (shouldAnimate()) {
- // fade out old volumeBar
FadeTransition ft = new FadeTransition(Duration.millis(500), volumeBar);
ft.setToValue(0);
ft.setOnFinished((ActionEvent actionEvent) -> {
@@ -194,17 +152,8 @@ public class VolumeChart extends XYChart {
}
}
- /**
- * Create a new VolumeBar node to represent a single data item
- *
- * @param seriesIndex The index of the series the data item is in
- * @param item The data item to create node for
- * @param itemIndex The index of the data item in the series
- * @return New volumeBar node to represent the give data item
- */
private Node createCandle(int seriesIndex, final XYChart.Data item, int itemIndex) {
Node volumeBar = item.getNode();
- // check if volumeBar has already been created
if (volumeBar instanceof VolumeBar) {
((VolumeBar) volumeBar).setSeriesAndDataStyleClasses("series" + seriesIndex, "data" + itemIndex);
} else {
@@ -214,15 +163,8 @@ public class VolumeChart extends XYChart {
return volumeBar;
}
- /**
- * This is called when the range has been invalidated and we need to update it. If the axis are auto
- * ranging then we compile a list of all data that the given axis has to plot and call invalidateRange() on the
- * axis passing it that data.
- */
@Override
protected void updateAxisRange() {
- // For volumeBar stick chart we need to override this method as we need to let the axis know that they need to be able
- // to cover the whole area occupied by the high to low range not just its center data value
final Axis xa = getXAxis();
final Axis ya = getYAxis();
List xData = null;