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

Code color column to properly show wrapper color

Browse Source
This commit is contained in:
DarkPhoenix
2019-08-06 12:50:11 +03:00
parent 70d1a3534b
commit 0257e70c29
2 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
graphs/colors.py
View File

@@ -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):

11
gui/builtinViewColumns/color.py
View File

@@ -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):