Browse Source

Draw bar-based equity

master
Denis Tereshkin 7 years ago
parent
commit
b0651046a1
  1. 3
      src/nailab/execution/executor.py
  2. 6
      src/nailab/ui/strategywidget.py

3
src/nailab/execution/executor.py

@ -30,6 +30,7 @@ class Executor:
results = strategy.get_analyzer('stats').get_result() results = strategy.get_analyzer('stats').get_result()
trades = strategy.get_analyzer('tradeslist').get_result() trades = strategy.get_analyzer('tradeslist').get_result()
return (results, trades) equity = strategy.get_analyzer('equity').get_result()
return (results, trades, equity)

6
src/nailab/ui/strategywidget.py

@ -174,13 +174,13 @@ class StrategyWidget(QtWidgets.QWidget):
def update_equity_chart(self): def update_equity_chart(self):
pnl = [x['pnl'] for x in self.result[1]] #pnl = [x['pnl'] for x in self.result[1]]
cumpnl = np.cumsum(pnl) #cumpnl = np.cumsum(pnl)
if self.equity_widget is None: if self.equity_widget is None:
self.equity_widget = EquityChartWidget(self) self.equity_widget = EquityChartWidget(self)
self.ui.tabs.addTab(self.equity_widget, "Equity") self.ui.tabs.addTab(self.equity_widget, "Equity")
self.equity_widget.set_data(cumpnl) self.equity_widget.set_data(self.result[2])
def update_trades_list(self): def update_trades_list(self):
if self.trades_widget is None: if self.trades_widget is None:

Loading…
Cancel
Save