From dcb0be74b501e57261daec9b38fd198fff96b89d Mon Sep 17 00:00:00 2001
From: HomeWorld <homeworld@gmail.com>
Date: Mon, 6 Dec 2010 20:22:20 +0200
Subject: [PATCH] Fixed column widths (take in account header too), highlight
 modules that arent supposed to be there - fittingView.MakeSnapshot

---
 gui/builtinViews/fittingView.py | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/gui/builtinViews/fittingView.py b/gui/builtinViews/fittingView.py
index 065ee3837..4132d8358 100644
--- a/gui/builtinViews/fittingView.py
+++ b/gui/builtinViews/fittingView.py
@@ -418,11 +418,16 @@ class FittingView(d.Display):
         for i in xrange(len(self.DEFAULT_COLS)):
             columnsWidths.append(0)
 
-
+        sFit = service.Fit.getInstance()
+        fit = sFit.getFit(self.activeFitID)
+        slotMap = {}
+        for slotType in Slot.getTypes():
+            slot = Slot.getValue(slotType)
+            slotMap[slot] = fit.getSlotsFree(slot) < 0
 
         padding = 2
         isize = 16
-        headerSize = isize + padding * 2
+        headerSize = isize + padding * 3
 
         maxWidth = 0
         maxRowHeight = isize
@@ -499,7 +504,7 @@ class FittingView(d.Display):
 
 
         mdc = wx.MemoryDC()
-        mbmp = wx.EmptyBitmap(maxWidth, (maxRowHeight + padding) * rows + padding + headerSize)
+        mbmp = wx.EmptyBitmap(maxWidth, (maxRowHeight) * rows + padding*2 + headerSize)
 
         mdc.SelectObject(mbmp)
 
@@ -545,9 +550,19 @@ class FittingView(d.Display):
 
             cx += columnsWidths[i]
 
+        brush = wx.Brush(wx.Colour(224, 51, 51))
+        pen = wx.Pen(wx.Colour(224, 51, 51))
+
+        mdc.SetPen(pen)
+        mdc.SetBrush(brush)
+
         cy = padding + headerSize
         for id,st in enumerate(self.mods):
             cx = padding
+
+            if slotMap[st.slot]:
+                mdc.DrawRectangle(cx,cy,maxWidth - cx,maxRowHeight)
+
             for i, col in enumerate(self.activeColumns):
                 if i>maxColumns:
                     break
@@ -576,7 +591,7 @@ class FittingView(d.Display):
 #                    cx += isize + padding
                 cx += columnsWidths[i]
 
-            cy += maxRowHeight + padding
+            cy += maxRowHeight
 
         mdc.SelectObject(wx.NullBitmap)