lychiyu/frequi_origin
1
0
Fork 0
mirror of https://github.com/freqtrade/frequi.git synced 2024-11-26 13:05:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Encode more info in icons/colors

Browse Source
This commit is contained in:
Matthias 2022-04-25 15:31:23 +02:00
parent 86897e1f64
commit e87e073357
1 changed files with 39 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/components/charts/CandleChart.vue
View File

@ -123,15 +123,20 @@ export default defineComponent({
/** Return trade entries for charting */ /** Return trade entries for charting */
const getTradeEntries = () => { const getTradeEntries = () => {
const trades: (string | number)[][] = []; const tradeEntries: number[][] = [];
const tradesClose: (string | number)[][] = []; const tradesClose: number[][] = [];
for (let i = 0, len = filteredTrades.value.length; i < len; i += 1) { for (let i = 0, len = filteredTrades.value.length; i < len; i += 1) {
const trade: Trade = filteredTrades.value[i]; const trade: Trade = filteredTrades.value[i];
if ( if (
trade.open_timestamp >= props.dataset.data_start_ts && trade.open_timestamp >= props.dataset.data_start_ts &&
trade.open_timestamp <= props.dataset.data_stop_ts trade.open_timestamp <= props.dataset.data_stop_ts
) { ) {
trades.push([roundTimeframe(timeframems.value, trade.open_timestamp), trade.open_rate]); tradeEntries.push([
roundTimeframe(timeframems.value, trade.open_timestamp),
trade.open_rate,
trade.profit_abs,
trade.is_short ? 1 : 0,
]);
} }
if ( if (
trade.close_timestamp !== undefined && trade.close_timestamp !== undefined &&
@ -142,11 +147,13 @@ export default defineComponent({
tradesClose.push([ tradesClose.push([
roundTimeframe(timeframems.value, trade.close_timestamp), roundTimeframe(timeframems.value, trade.close_timestamp),
trade.close_rate, trade.close_rate,
trade.profit_abs,
trade.is_short ? 1 : 0,
]); ]);
} }
} }
} }
return { trades, tradesClose }; return { tradeEntries, tradesClose };
}; };
const updateChart = (initial = false) => { const updateChart = (initial = false) => {
@ -487,8 +494,7 @@ export default defineComponent({
chartOptions.value.grid[chartOptions.value.grid.length - 1].bottom = '50px'; chartOptions.value.grid[chartOptions.value.grid.length - 1].bottom = '50px';
delete chartOptions.value.grid[chartOptions.value.grid.length - 1].top; delete chartOptions.value.grid[chartOptions.value.grid.length - 1].top;
} }
const { trades, tradesClose } = getTradeEntries(); const { tradeEntries, tradesClose } = getTradeEntries();
const name = 'Trades'; const name = 'Trades';
const nameClose = 'Trades Close'; const nameClose = 'Trades Close';
if (!Array.isArray(chartOptions.value.legend) && chartOptions.value.legend?.data) { if (!Array.isArray(chartOptions.value.legend) && chartOptions.value.legend?.data) {
@ -499,10 +505,20 @@ export default defineComponent({
type: 'scatter', type: 'scatter',
xAxisIndex: 0, xAxisIndex: 0,
yAxisIndex: 0, yAxisIndex: 0,
encode: {
x: 0,
y: 1,
},
itemStyle: { itemStyle: {
color: tradeBuyColor, color: tradeBuyColor,
}, },
data: trades, symbol: (v, params) => {
// TODO: finish me
// console.log('v', v, params);
// 1 == short, 0 == long
return v[3] === 0 ? 'circle' : 'pin';
}, // Symbol per long/short wins??
data: tradeEntries,
}; };
if (Array.isArray(chartOptions.value?.series)) { if (Array.isArray(chartOptions.value?.series)) {
chartOptions.value.series.push(sp); chartOptions.value.series.push(sp);
@ -515,9 +531,23 @@ export default defineComponent({
type: 'scatter', type: 'scatter',
xAxisIndex: 0, xAxisIndex: 0,
yAxisIndex: 0, yAxisIndex: 0,
itemStyle: { encode: {
color: tradeSellColor, x: 0,
y: 1,
}, },
itemStyle: {
// color: tradeSellColor,
color: (v) => {
// TODO: finish me
// console.log('vc', v);
return v.data[2] > 0 ? 'green' : tradeSellColor;
},
},
symbol: (v, params) => {
// TODO: finish me
// console.log('v', v, params);
return v[2] > 0 ? 'rect' : 'triangleup';
}, // Symbol per long/short wins??
data: tradesClose, data: tradesClose,
}; };
if (chartOptions.value.series && Array.isArray(chartOptions.value.series)) { if (chartOptions.value.series && Array.isArray(chartOptions.value.series)) {