diff --git a/config.yaml b/config.yaml index ef42e9d..efd0adc 100644 --- a/config.yaml +++ b/config.yaml @@ -69,6 +69,8 @@ logging: - console - file propagate: 0 +charts: + colormap: Dark2 developer: inspection: true window: diff --git a/mt5_correlation/gui/mdi_child_correlationgraph.py b/mt5_correlation/gui/mdi_child_correlationgraph.py index 09f2e20..4cab250 100644 --- a/mt5_correlation/gui/mdi_child_correlationgraph.py +++ b/mt5_correlation/gui/mdi_child_correlationgraph.py @@ -22,8 +22,8 @@ class MDIChildCorrelationGraph(mdi.CorrelationMDIChild): __tick_fmt_date = matplotlib.dates.DateFormatter('%d-%b') __tick_fmt_time = matplotlib.dates.DateFormatter('%H:%M:%S') - # Colors for graph lines fro symbol1 and symbol2 - __colours = ['green', 'blue'] + # Colors for graph lines for symbol1 and symbol2. Will use first 2 colours in colormap + __colours = matplotlib.cm.get_cmap(cfg.Config().get("charts.colormap")).colors # Fig, axes and canvas __fig = None diff --git a/mt5_correlation/gui/mdi_child_divergedgraph.py b/mt5_correlation/gui/mdi_child_divergedgraph.py index dcb7057..d3c24e8 100644 --- a/mt5_correlation/gui/mdi_child_divergedgraph.py +++ b/mt5_correlation/gui/mdi_child_divergedgraph.py @@ -1,9 +1,13 @@ import logging import matplotlib.dates +import matplotlib.pylab as pl import matplotlib.pyplot as plt import matplotlib.ticker as mticker +import numpy as mp +import numpy as np import wx import wx.lib.scrolledpanel as scrolled +import wxconfig as cfg from matplotlib.backends.backend_wxagg import FigureCanvasWxAgg as FigureCanvas @@ -30,7 +34,7 @@ class MDIChildDivergedGraph(mdi.CorrelationMDIChild): __fig = None # Colors for graph lines - __colours = ['red', 'green', 'blue', 'pink', 'purple', 'black', 'yellow', 'lightblue'] + __colours = matplotlib.cm.get_cmap(cfg.Config().get("charts.colormap")).colors def __init__(self, parent, **kwargs): # Super