From 663cf7104c86e4e28407b2d8c186680b1f9358a0 Mon Sep 17 00:00:00 2001 From: blitzmann Date: Thu, 11 Dec 2014 10:37:07 -0500 Subject: [PATCH] Fix #226, as well as another bug with coloring rack that had too many modules --- gui/builtinViews/fittingView.py | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/gui/builtinViews/fittingView.py b/gui/builtinViews/fittingView.py index 929772c6e..455e1e06b 100644 --- a/gui/builtinViews/fittingView.py +++ b/gui/builtinViews/fittingView.py @@ -26,7 +26,7 @@ import gui.display as d from gui.contextMenu import ContextMenu import gui.shipBrowser import gui.multiSwitch -from eos.types import Slot, Rack +from eos.types import Slot, Rack, Module from gui.builtinViewColumns.state import State from gui import bitmapLoader import gui.builtinViews.emptyView @@ -559,12 +559,14 @@ class FittingView(d.Display): font = (self.GetClassDefaultAttributes()).font for i, mod in enumerate(self.mods): - if hasattr(mod,"slot") and slotMap[mod.slot]: - self.SetItemBackgroundColour(i, wx.Colour(204, 51, 51)) - elif sFit.serviceFittingOptions["colorFitBySlot"] and not isinstance(mod, Rack): - self.SetItemBackgroundColour(i, self.slotColour(mod.slot)) - else: - self.SetItemBackgroundColour(i, self.GetBackgroundColour()) + self.SetItemBackgroundColour(i, self.GetBackgroundColour()) + + # only consider changing color if we're dealing with a Module + if type(mod) is Module: + if slotMap[mod.slot]: # Color too many modules as red + self.SetItemBackgroundColour(i, wx.Colour(204, 51, 51)) + elif sFit.serviceFittingOptions["colorFitBySlot"]: # Color by slot it enabled + self.SetItemBackgroundColour(i, self.slotColour(mod.slot)) # Set rack face to bold if isinstance(mod, Rack) and \