mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-20 13:54:32 +01:00
Code Issues Projects Releases Packages Wiki Activity

Add modelReady property and let view fill list once model is ready

Browse source
This commit is contained in:
chimp1984 2021-11-01 21:18:44 +01:00
parent ea66a510dc
commit 0271af995b
No known key found for this signature in database
GPG key ID: 9801B4EC591F90E3
2 changed files with 25 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
desktop/src/main/java/bisq/desktop/main/market/trades/TradesChartsView.java
View file

@ -172,6 +172,7 @@ public class TradesChartsView extends ActivatableViewAndModel<VBox, TradesCharts
private ChangeListener<String> priceColumnLabelListener;
private ListChangeListener<XYChart.Data<Number, Number>> itemsChangeListener;
private ListChangeListener<TradeStatistics3> tradeStatisticsByCurrencyListener;
private ChangeListener<Boolean> modelReadyListener;
@SuppressWarnings("FieldCanBeLocal")
private MonadicBinding<Void> currencySelectionBinding;
@ -243,7 +244,9 @@ public class TradesChartsView extends ActivatableViewAndModel<VBox, TradesCharts
};
tradeStatisticsByCurrencyListener = c -> {
nrOfTradeStatisticsLabel.setText(Res.get("market.trades.nrOfTrades", model.selectedTradeStatistics.size()));
fillList();
if (model.modelReady.get()) {
fillList();
}
};
parentHeightListener = (observable, oldValue, newValue) -> layout();
@ -283,10 +286,23 @@ public class TradesChartsView extends ActivatableViewAndModel<VBox, TradesCharts
return null;
});
modelReadyListener = (observable, oldValue, newValue) -> {
if (newValue) {
long ts = System.currentTimeMillis();
fillList();
tableView.setItems(sortedList);
layout();
log.error("{}", System.currentTimeMillis() - ts);
UserThread.execute(() -> model.modelReady.removeListener(modelReadyListener));
}
};
}
@Override
protected void activate() {
long ts = System.currentTimeMillis();
// root.getParent() is null at initialize
tabPaneSelectionModel = GUIUtil.getParentOfType(root, JFXTabPane.class).getSelectionModel();
selectedTabIndexListener = (observable, oldValue, newValue) -> model.setSelectedTabIndex((int) newValue);
@ -358,9 +374,10 @@ public class TradesChartsView extends ActivatableViewAndModel<VBox, TradesCharts
user.requestPersistence();
});
fillList();
tableView.setItems(sortedList);
layout();
model.modelReady.addListener(modelReadyListener);
// modelReadyListener will get triggered once async data preparation in model is completed
log.error("activate took {} ms", System.currentTimeMillis() - ts);
}
@Override
@ -388,6 +405,7 @@ public class TradesChartsView extends ActivatableViewAndModel<VBox, TradesCharts
if (rootParent != null) {
rootParent.heightProperty().removeListener(parentHeightListener);
}
model.modelReady.removeListener(modelReadyListener);
}
private void showVolumeAsUsd(Boolean showUsd) {

3
desktop/src/main/java/bisq/desktop/main/market/trades/TradesChartsViewModel.java
View file

@ -114,6 +114,8 @@ class TradesChartsViewModel extends ActivatableViewModel {
private int selectedTabIndex;
final Map<TickUnit, Map<Long, Long>> usdAveragePriceMapsPerTickUnit = new HashMap<>();
private boolean fillTradeCurrenciesOnActivateCalled;
final BooleanProperty modelReady = new SimpleBooleanProperty(false);
///////////////////////////////////////////////////////////////////////////////////////////
// Constructor, lifecycle
@ -168,6 +170,7 @@ class TradesChartsViewModel extends ActivatableViewModel {
updateSelectedTradeStatistics(getCurrencyCode());
updateChartData();
modelReady.set(true);
});
});
}