diff --git a/gui/builtinPreferenceViews/pyfaGeneralPreferences.py b/gui/builtinPreferenceViews/pyfaGeneralPreferences.py index 2d3e6f8e3..b23b59ebe 100644 --- a/gui/builtinPreferenceViews/pyfaGeneralPreferences.py +++ b/gui/builtinPreferenceViews/pyfaGeneralPreferences.py @@ -40,7 +40,7 @@ class PFGeneralPref ( PreferenceView): self.cbFitColorSlots = wx.CheckBox( panel, wx.ID_ANY, u"Color fitting view by slot", wx.DefaultPosition, wx.DefaultSize, 0 ) mainSizer.Add( self.cbFitColorSlots, 0, wx.ALL|wx.EXPAND, 5 ) - self.cbDivideSlots = wx.CheckBox( panel, wx.ID_ANY, u"Divide slot groups", wx.DefaultPosition, wx.DefaultSize, 0 ) + self.cbDivideSlots = wx.CheckBox( panel, wx.ID_ANY, u"Separate Racks", wx.DefaultPosition, wx.DefaultSize, 0 ) mainSizer.Add( self.cbDivideSlots, 0, wx.ALL|wx.EXPAND, 5 ) # Needs to be implemented - save active fittings and reapply when starting pyfa diff --git a/gui/builtinViews/fittingView.py b/gui/builtinViews/fittingView.py index 30ff18d26..62291ad2c 100644 --- a/gui/builtinViews/fittingView.py +++ b/gui/builtinViews/fittingView.py @@ -459,11 +459,12 @@ class FittingView(d.Display): else: event.Skip() - slotColourMap = {1: wx.Colour(238, 221, 130), - 2: wx.Colour(100, 149, 237), - 3: wx.Colour(205, 120, 120), + 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[slot] or self.GetBackgroundColour()