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

Plug plot line lightness into everything

Browse Source
This commit is contained in:
DarkPhoenix
2019-08-06 16:11:56 +03:00
parent bc8c70fa9c
commit 636672fdce
7 changed files with 106 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gui/builtinViewColumns/graphColor.py
View File

@@ -20,7 +20,7 @@
# noinspection PyPackageRequirements
import wx
from graphs.colors import BASE_COLORS
from graphs.style import BASE_COLORS
from graphs.wrapper import SourceWrapper
from gui.viewColumn import ViewColumn
@@ -39,10 +39,10 @@ class GraphColor(ViewColumn):
def getImageId(self, stuff):
if isinstance(stuff, SourceWrapper):
try:
color_data = BASE_COLORS[stuff.colorID]
colorData = BASE_COLORS[stuff.colorID]
except KeyError:
return -1
img = self.fittingView.imageList.GetImageIndex(color_data.iconName, 'gui')
img = self.fittingView.imageList.GetImageIndex(colorData.iconName, 'gui')
return img
return -1

10
gui/builtinViewColumns/graphLightness.py
View File

@@ -20,7 +20,7 @@
# noinspection PyPackageRequirements
import wx
from graphs.colors import BASE_COLORS
from graphs.style import LIGHTNESSES
from graphs.wrapper import TargetWrapper
from gui.viewColumn import ViewColumn
@@ -38,8 +38,12 @@ class GraphLightness(ViewColumn):
def getImageId(self, stuff):
if isinstance(stuff, TargetWrapper):
# img = self.fittingView.imageList.GetImageIndex(color_data.iconName, 'gui')
return -1
try:
lightnessData = LIGHTNESSES[stuff.lightnessID]
except KeyError:
return -1
img = self.fittingView.imageList.GetImageIndex(lightnessData.iconName, 'gui')
return img
return -1
def getToolTip(self, stuff):