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

move the item slot colours to config and use it from there

Browse Source
This commit is contained in:
Tony Cook
2019-03-01 19:47:04 +11:00
parent af17a4f1c9
commit 9bdb4ea967
3 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
config.py
View File

@@ -1,6 +1,7 @@
import os
import sys
import yaml
import wx
from logbook import CRITICAL, DEBUG, ERROR, FingersCrossedHandler, INFO, Logger, NestedSetup, NullHandler, \
StreamHandler, TimedRotatingFileHandler, WARNING
@@ -47,6 +48,11 @@ LOGLEVEL_MAP = {
"debug": DEBUG,
}
slotColourMap = {1: wx.Colour(250, 235, 204), # yellow = low slots
2: wx.Colour(188, 215, 241), # blue = mid slots
3: wx.Colour(235, 204, 209), # red = high slots
4: '',
5: '' }
def getClientSecret():
return clientHash

13
gui/builtinMarketBrowser/itemView.py
View File

@@ -8,6 +8,7 @@ from gui.display import Display
from gui.utils.staticHelpers import DragDropHelper
from service.attribute import Attribute
from service.fit import Fit
from config import slotColourMap
pyfalog = Logger(__name__)
@@ -268,13 +269,9 @@ class ItemView(Display):
i += 1
return revmap
slotColourMap = { 1: wx.Colour(250, 235, 204),
2: wx.Colour(188, 215, 241),
3: wx.Colour(235, 204, 209) }
def columnBackground(self, colItem, item):
if self.sFit.serviceFittingOptions["colorFitBySlot"]:
slot = item.slot;
if slot in self.slotColourMap:
return self.slotColourMap[slot]
return wx.Colour(255, 255, 255)
slot = item.slot
return slotColourMap.get(slot) or self.GetBackgroundColour()
else:
return self.GetBackgroundColour()

9
gui/builtinViews/fittingView.py
View File

@@ -40,6 +40,7 @@ from gui.contextMenu import ContextMenu
from gui.utils.staticHelpers import DragDropHelper
from service.fit import Fit
from service.market import Market
from config import slotColourMap
pyfalog = Logger(__name__)
@@ -629,14 +630,8 @@ class FittingView(d.Display):
else:
event.Skip()
slotColourMap = {1: wx.Colour(250, 235, 204), # yellow = low slots
2: wx.Colour(188, 215, 241), # blue = mid slots
3: wx.Colour(235, 204, 209), # red = high slots
4: '',
5: ''}
def slotColour(self, slot):
return self.slotColourMap.get(slot) or self.GetBackgroundColour()
return slotColourMap.get(slot) or self.GetBackgroundColour()
def refresh(self, stuff):
"""