Merge branch 'master' of https://github.com/asakul/nailab

src/nailab/execution/executor.py

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

src/nailab/ui/strategywidget.py

@@ -186,13 +186,13 @@ class StrategyWidget(QtWidgets.QWidget):
 
 
     def update_equity_chart(self):
-        pnl = [x['pnl'] for x in self.result[1]]
-        cumpnl = np.cumsum(pnl)
+        #pnl = [x['pnl'] for x in self.result[1]]
+        #cumpnl = np.cumsum(pnl)
         if self.equity_widget is None:
             self.equity_widget = EquityChartWidget(self)
             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):
         if self.trades_widget is None:

src/nailab/ui/tradeslistwidget.py

@@ -30,8 +30,8 @@ class TradesListWidget(QtWidgets.QWidget):
             item.setText(1, str(trade["size"]))
             item.setText(2, trade["security"])
             item.setText(3, str(trade["entry_time"]))
-            item.setText(4, "{:.2f}".format(trade["entry_price"]))
+            item.setText(4, "{:.4f}".format(trade["entry_price"]))
             item.setText(5, str(trade["exit_time"]))
-            item.setText(6, "{:.2f}".format(trade["exit_price"]))
-            item.setText(7, "{:.2f}".format(trade["pnl"]))
+            item.setText(6, "{:.4f}".format(trade["exit_price"]))
+            item.setText(7, "{:.4f}".format(trade["pnl"]))