mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2024-11-19 18:03:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix updates of list

Browse Source 
Add missing show to error popup
This commit is contained in:
chimp1984 2020-10-25 15:27:47 -05:00
parent 93031ba66e
commit 114b79fc2b
No known key found for this signature in database
GPG Key ID: 9801B4EC591F90E3
2 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
desktop/src/main/java/bisq/desktop/main/market/trades/TradesChartsView.java
View File

@ -152,7 +152,8 @@ public class TradesChartsView extends ActivatableViewAndModel<VBox, TradesCharts
private SingleSelectionModel<Tab> tabPaneSelectionModel;
private TableColumn<TradeStatistics3ListItem, TradeStatistics3ListItem> priceColumn, volumeColumn, marketColumn;
private SortedList<TradeStatistics3ListItem> sortedList;
private final ObservableList<TradeStatistics3ListItem> listItems = FXCollections.observableArrayList();
private final SortedList<TradeStatistics3ListItem> sortedList = new SortedList<>(listItems);
private ChangeListener<Toggle> timeUnitChangeListener;
private ChangeListener<Number> priceAxisYWidthListener;
@ -289,8 +290,10 @@ public class TradesChartsView extends ActivatableViewAndModel<VBox, TradesCharts
if (currencyComboBox.getEditor().getText().isEmpty())
currencyComboBox.getSelectionModel().select(SHOW_ALL);
CurrencyListItem selectedItem = currencyComboBox.getSelectionModel().getSelectedItem();
if (selectedItem != null)
if (selectedItem != null) {
model.onSetTradeCurrency(selectedItem.tradeCurrency);
fillList();
}
});
toggleGroup.getToggles().get(model.tickUnit.ordinal()).setSelected(true);
@ -299,8 +302,7 @@ public class TradesChartsView extends ActivatableViewAndModel<VBox, TradesCharts
toggleGroup.selectedToggleProperty().addListener(timeUnitChangeListener);
priceAxisY.widthProperty().addListener(priceAxisYWidthListener);
volumeAxisY.widthProperty().addListener(volumeAxisYWidthListener);
ObservableList<TradeStatistics3> tradeStatisticsByCurrencyList = model.tradeStatisticsByCurrency;
tradeStatisticsByCurrencyList.addListener(tradeStatisticsByCurrencyListener);
model.tradeStatisticsByCurrency.addListener(tradeStatisticsByCurrencyListener);
priceAxisY.labelProperty().bind(priceColumnLabel);
priceColumnLabel.addListener(priceColumnLabelListener);
@ -308,12 +310,7 @@ public class TradesChartsView extends ActivatableViewAndModel<VBox, TradesCharts
currencySelectionSubscriber = currencySelectionBinding.subscribe((observable, oldValue, newValue) -> {
});
ObservableList<TradeStatistics3ListItem> tradeStatistics3ListItems = FXCollections.observableList(tradeStatisticsByCurrencyList.stream()
.map(tradeStatistics3 -> new TradeStatistics3ListItem(tradeStatistics3,
coinFormatter,
model.showAllTradeCurrenciesProperty.get()))
.collect(Collectors.toList()));
sortedList = new SortedList<>(tradeStatistics3ListItems);
sortedList.comparatorProperty().bind(tableView.comparatorProperty());
tableView.setItems(sortedList);
@ -322,7 +319,7 @@ public class TradesChartsView extends ActivatableViewAndModel<VBox, TradesCharts
priceAxisX.setTickLabelFormatter(getTimeAxisStringConverter());
volumeAxisX.setTickLabelFormatter(getTimeAxisStringConverter());
nrOfTradeStatisticsLabel.setText(Res.get("market.trades.nrOfTrades", tradeStatisticsByCurrencyList.size()));
nrOfTradeStatisticsLabel.setText(Res.get("market.trades.nrOfTrades", model.tradeStatisticsByCurrency.size()));
exportLink.setOnAction(e -> exportToCsv());
@ -333,6 +330,7 @@ public class TradesChartsView extends ActivatableViewAndModel<VBox, TradesCharts
rootParent.heightProperty().addListener(parentHeightListener);
}
fillList();
layout();
}
@ -362,10 +360,21 @@ public class TradesChartsView extends ActivatableViewAndModel<VBox, TradesCharts
}
}
private void fillList() {
ObservableList<TradeStatistics3ListItem> tradeStatistics3ListItems = FXCollections.observableList(model.tradeStatisticsByCurrency.stream()
.map(tradeStatistics3 -> new TradeStatistics3ListItem(tradeStatistics3,
coinFormatter,
model.showAllTradeCurrenciesProperty.get()))
.collect(Collectors.toList()));
listItems.clear();
listItems.addAll(tradeStatistics3ListItems);
}
private void exportToCsv() {
ObservableList<TableColumn<TradeStatistics3ListItem, ?>> tableColumns = tableView.getColumns();
int reportColumns = tableColumns.size() + 1;
boolean showAllTradeCurrencies = model.showAllTradeCurrenciesProperty.get();
CSVEntryConverter<TradeStatistics3ListItem> headerConverter = transactionsListItem -> {
String[] columns = new String[reportColumns];
columns[0] = "Epoch time in ms";
@ -376,7 +385,6 @@ public class TradesChartsView extends ActivatableViewAndModel<VBox, TradesCharts
};
CSVEntryConverter<TradeStatistics3ListItem> contentConverter;
boolean showAllTradeCurrencies = model.showAllTradeCurrenciesProperty.get();
if (showAllTradeCurrencies) {
contentConverter = item -> {
String[] columns = new String[reportColumns];

3
desktop/src/main/java/bisq/desktop/util/GUIUtil.java
View File

@ -276,7 +276,6 @@ public class GUIUtil {
public static <T> void exportCSV(String fileName, CSVEntryConverter<T> headerConverter,
CSVEntryConverter<T> contentConverter, T emptyItem,
List<T> list, Stage stage) {
FileChooser fileChooser = new FileChooser();
fileChooser.setInitialFileName(fileName);
File file = fileChooser.showSaveDialog(stage);
@ -296,7 +295,7 @@ public class GUIUtil {
} catch (RuntimeException | IOException e) {
e.printStackTrace();
log.error(e.getMessage());
new Popup().error(Res.get("guiUtil.accountExport.exportFailed", e.getMessage()));
new Popup().error(Res.get("guiUtil.accountExport.exportFailed", e.getMessage())).show();
}
}
}