dave/pyfa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 12 Wiki Activity

Tox fixes, and catching a few things lost in the merge.

Browse Source
This commit is contained in:
Ebag333
2017-02-11 09:23:23 -08:00
parent 81e5b33bc9
commit 096842de44
8 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gui/graphFrame.py
View File

@@ -42,7 +42,6 @@ except ImportError:
mplImported = False
logger = logging.getLogger(__name__)
@@ -69,10 +68,9 @@ class GraphFrame(wx.Frame):
from matplotlib.figure import Figure
graphFrame_enabled = True
except ImportError:
mpl = Canvas = Figure = None
Patch = mpl = Canvas = Figure = None
graphFrame_enabled = False
self.legendFix = False
if not graphFrame_enabled:
logger.info("Problems importing matplotlib; continuing without graphs")
@@ -284,7 +282,7 @@ class GraphFrame(wx.Frame):
selected_color = legend_colors[i]
except:
selected_color = None
legend2.append(self.Patch(color=selected_color,label=i_name),)
legend2.append(self.Patch(color=selected_color, label=i_name), )
if len(legend2) > 0:
leg = self.subplot.legend(handles=legend2)