Fixes critical design issue when it comes to projected fits. Disabled some of the more advanced functionality (projection amount and active) to cope to development. Crash still happens occasionally when adding projected fit for unknown reasons - not 100% reproducable yet

gui/builtinViewColumns/baseName.py

@@ -21,6 +21,8 @@
 from gui import builtinViewColumns
 from gui.viewColumn import ViewColumn
 from gui import bitmapLoader
+import gui.mainFrame
+
 import wx
 from eos.types import Drone, Cargo, Fit, Module, Slot, Rack
 import service
@@ -29,6 +31,7 @@ class BaseName(ViewColumn):
     name = "Base Name"
     def __init__(self, fittingView, params):
         ViewColumn.__init__(self, fittingView)
+        self.mainFrame = gui.mainFrame.MainFrame.getInstance()
         self.columnText = "Name"
         self.shipImage = fittingView.imageList.GetImageIndex("ship_small", "icons")
         self.mask = wx.LIST_MASK_TEXT
@@ -39,7 +42,8 @@ class BaseName(ViewColumn):
         elif isinstance(stuff, Cargo):
             return "%dx %s" % (stuff.amount, stuff.item.name)
         elif isinstance(stuff, Fit):
-            return "%dx %s (%s)" % (stuff.projectionInfo.amount, stuff.name, stuff.ship.item.name)
+            fitID = self.mainFrame.getActiveFit()
+            return "%dx %s (%s)" % (stuff.getProjectionInfo(fitID).amount, stuff.name, stuff.ship.item.name)
         elif isinstance(stuff, Rack):
             if service.Fit.getInstance().serviceFittingOptions["rackLabels"]:
                 if stuff.slot == Slot.MODE:

gui/builtinViewColumns/state.py

@@ -19,6 +19,8 @@
 
 from gui.viewColumn import ViewColumn
 from gui import bitmapLoader
+import gui.mainFrame
+
 import wx
 from eos.types import Drone, Module, Rack, Fit
 from eos.types import State as State_
@@ -27,6 +29,7 @@ class State(ViewColumn):
     name = "State"
     def __init__(self, fittingView, params):
         ViewColumn.__init__(self, fittingView)
+        self.mainFrame = gui.mainFrame.MainFrame.getInstance()
         self.resizable = False
         self.size = 16
         self.maxsize = self.size
@@ -56,9 +59,12 @@ class State(ViewColumn):
             else:
                 return self.fittingView.imageList.GetImageIndex("state_%s_small" % State_.getName(stuff.state).lower(), "icons")
         elif isinstance(stuff, Fit):
-            if stuff.projectionInfo is None:
+            fitID = self.mainFrame.getActiveFit()
+            projectionInfo = stuff.getProjectionInfo(fitID)
+
+            if projectionInfo is None:
                 return -1
-            if stuff.projectionInfo.active:
+            if projectionInfo.active:
                 return generic_active
             return generic_inactive
         else: