From 277142742563af4ce589d2618aee4057bbc5a497 Mon Sep 17 00:00:00 2001 From: Denis Tereshkin Date: Fri, 14 Dec 2018 16:37:51 +0700 Subject: [PATCH] Minor fixes Editor indentation and equity chart --- src/nailab/ui/equitychartcanvas.py | 7 ++++--- src/nailab/ui/mainwindow.py | 1 - src/nailab/ui/strategywidget.py | 4 ++++ 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/nailab/ui/equitychartcanvas.py b/src/nailab/ui/equitychartcanvas.py index 8f84a44..28630e1 100644 --- a/src/nailab/ui/equitychartcanvas.py +++ b/src/nailab/ui/equitychartcanvas.py @@ -9,11 +9,10 @@ import matplotlib.pyplot as plt class EquityChartCanvas(FigureCanvas): def __init__(self, parent=None, width=5, height=4, dpi=100): - fig = Figure(figsize=(width, height), dpi=dpi) - self.axes = fig.add_subplot(111) + self.fig = Figure(figsize=(width, height), dpi=dpi) self.pnl_data = None - FigureCanvas.__init__(self, fig) + FigureCanvas.__init__(self, self.fig) self.setParent(parent) def set_data(self, cumulative_pnl): @@ -21,6 +20,8 @@ class EquityChartCanvas(FigureCanvas): self.plot() def plot(self): + self.fig.clear() + self.axes = self.fig.add_subplot(111) if self.pnl_data is not None: ax = self.figure.add_subplot(111) ax.plot(self.pnl_data, 'r-') diff --git a/src/nailab/ui/mainwindow.py b/src/nailab/ui/mainwindow.py index 6808ca3..b07a952 100644 --- a/src/nailab/ui/mainwindow.py +++ b/src/nailab/ui/mainwindow.py @@ -32,7 +32,6 @@ class MainWindow(QtWidgets.QMainWindow): def savedChanged(self): for i in range(0, self.ui.tabs.count()): - print(i, self.ui.tabs.widget(i).is_saved()) self.update_tab_name(i) def newStrategy(self): diff --git a/src/nailab/ui/strategywidget.py b/src/nailab/ui/strategywidget.py index 4d4f081..4a9fa9f 100644 --- a/src/nailab/ui/strategywidget.py +++ b/src/nailab/ui/strategywidget.py @@ -57,6 +57,10 @@ class StrategyWidget(QtWidgets.QWidget): if content is not None: self.ui.editor.setText(content) + self.ui.editor.setIndentationsUseTabs(False) + self.ui.editor.setTabWidth(4) + self.ui.editor.setAutoIndent(True) + self.source_file = source_file if self.source_file is not None: self.saved = True