From 0257e70c29583d754359f7d56affa4fcb48aaa1e Mon Sep 17 00:00:00 2001
From: DarkPhoenix <phoenix@mail.ru>
Date: Tue, 6 Aug 2019 12:50:11 +0300
Subject: [PATCH] Code color column to properly show wrapper color

---
 graphs/colors.py                | 16 ++++++++--------
 gui/builtinViewColumns/color.py | 11 +++++++++--
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/graphs/colors.py b/graphs/colors.py
index bce19aade..112f2ff06 100644
--- a/graphs/colors.py
+++ b/graphs/colors.py
@@ -25,14 +25,14 @@ from service.const import Color
 
 # In HSL format
 BASE_COLORS = OrderedDict([
-    (Color.red, (0 / 360.0, 1.0, 0.5, 'color_red')),
-    (Color.green, (120 / 360.0, 1.0, 0.5, 'color_green')),
-    (Color.blue, (240 / 360.0, 1.0, 0.5, 'color_blue')),
-    (Color.yellow, (56 / 360.0, 1.0, 0.5, 'color_yellow')),
-    (Color.cyan, (180 / 360.0, 1.0, 0.5, 'color_cyan')),
-    (Color.magenta, (300 / 360.0, 1.0, 0.5, 'color_magenta')),
-    (Color.orange, (40 / 360.0, 1.0, 0.5, 'color_orange')),
-    (Color.purple, (275 / 360.0, 1.0, 0.5, 'color_purple'))])
+    (Color.red, ((0 / 360.0, 1.0, 0.5), 'color_red')),
+    (Color.green, ((120 / 360.0, 1.0, 0.5), 'color_green')),
+    (Color.blue, ((240 / 360.0, 1.0, 0.5), 'color_blue')),
+    (Color.yellow, ((56 / 360.0, 1.0, 0.5), 'color_yellow')),
+    (Color.cyan, ((180 / 360.0, 1.0, 0.5), 'color_cyan')),
+    (Color.magenta, ((300 / 360.0, 1.0, 0.5), 'color_magenta')),
+    (Color.orange, ((40 / 360.0, 1.0, 0.5), 'color_orange')),
+    (Color.purple, ((275 / 360.0, 1.0, 0.5), 'color_purple'))])
 
 
 def hsl_to_hsv(hsl):
diff --git a/gui/builtinViewColumns/color.py b/gui/builtinViewColumns/color.py
index 671190289..8b0f9c195 100644
--- a/gui/builtinViewColumns/color.py
+++ b/gui/builtinViewColumns/color.py
@@ -20,6 +20,7 @@
 # noinspection PyPackageRequirements
 import wx
 
+from graphs.colors import BASE_COLORS
 from graphs.wrapper import SourceWrapper
 from gui.viewColumn import ViewColumn
 
@@ -36,8 +37,14 @@ class LineColor(ViewColumn):
         self.mask = wx.LIST_MASK_TEXT
 
     def getImageId(self, stuff):
-        red = self.fittingView.imageList.GetImageIndex('color_red', 'gui')
-        return red
+        if isinstance(stuff, SourceWrapper):
+            try:
+                color_data = BASE_COLORS[stuff.color]
+            except KeyError:
+                return -1
+            img = self.fittingView.imageList.GetImageIndex(color_data[1], 'gui')
+            return img
+        return -1
 
     def getToolTip(self, stuff):
         if isinstance(stuff, SourceWrapper):