mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-24 23:18:17 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix date range filter in BSQ Supply screen.

Browse source
This commit is contained in:
jmacxx 2022-08-23 19:34:11 -05:00
parent 75e030f541
commit eacef13b5a
No known key found for this signature in database
GPG key ID: 155297BABFE94A1B
2 changed files with 12 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
desktop/src/main/java/bisq/desktop/components/chart/ChartViewModel.java
View file

@ -157,19 +157,10 @@ public abstract class ChartViewModel<T extends ChartDataModel> extends Activatab
}
}
void initBounds(List<XYChart.Data<Number, Number>> data1,
List<XYChart.Data<Number, Number>> data2) {
Tuple2<Double, Double> xMinMaxTradeFee = getMinMax(data1);
Tuple2<Double, Double> xMinMaxCompensationRequest = getMinMax(data2);
lowerBound = Math.min(xMinMaxTradeFee.first, xMinMaxCompensationRequest.first);
upperBound = Math.max(xMinMaxTradeFee.second, xMinMaxCompensationRequest.second);
}
void initBounds(List<XYChart.Data<Number, Number>> data) {
Tuple2<Double, Double> xMinMaxTradeFee = getMinMax(data);
lowerBound = xMinMaxTradeFee.first;
upperBound = xMinMaxTradeFee.second;
Tuple2<Double, Double> xMinMaxDate = getMinMaxDatesFromSeries(data);
lowerBound = xMinMaxDate.first;
upperBound = xMinMaxDate.second;
}
@ -246,7 +237,10 @@ public abstract class ChartViewModel<T extends ChartDataModel> extends Activatab
.collect(Collectors.toList());
}
private Tuple2<Double, Double> getMinMax(List<XYChart.Data<Number, Number>> chartData) {
private Tuple2<Double, Double> getMinMaxDatesFromSeries(List<XYChart.Data<Number, Number>> chartData) {
if (chartData.size() == 0) {
return new Tuple2<>(0D, 0D);
}
long min = Long.MAX_VALUE, max = 0;
for (XYChart.Data<Number, ?> data : chartData) {
long value = data.getXValue().longValue();

6
desktop/src/main/java/bisq/desktop/main/dao/economy/supply/dao/DaoChartView.java
View file

@ -122,7 +122,11 @@ public class DaoChartView extends ChartView<DaoChartViewModel> {
@Override
protected void initBoundsForTimelineNavigation() {
setBoundsForTimelineNavigation(seriesTotalBurned.getData());
if (seriesSupplyChange.getData().size() > 0) {
setBoundsForTimelineNavigation(seriesSupplyChange.getData());
} else {
setBoundsForTimelineNavigation(seriesTotalBurned.getData());
}
}