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

Refactor how rack separation works

Browse Source
This commit is contained in:
blitzmann
2014-03-24 19:04:11 -04:00
parent e23ad7b002
commit 2f90ac64ec
6 changed files with 53 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gui/builtinViewColumns/baseIcon.py
View File

@@ -2,7 +2,7 @@ from gui import builtinViewColumns
from gui.viewColumn import ViewColumn
from gui import bitmapLoader
import wx
from eos.types import Drone, Fit, Module, Slot
from eos.types import Drone, Fit, Module, Slot, DummyModule
class BaseIcon(ViewColumn):
name = "Base Icon"
@@ -19,6 +19,8 @@ class BaseIcon(ViewColumn):
return -1
if isinstance(stuff, Fit):
return self.shipImage
if isinstance(stuff, DummyModule):
return -1
if isinstance(stuff, Module):
if stuff.isEmpty:
return self.fittingView.imageList.GetImageIndex("slot_%s_small" % Slot.getName(stuff.slot).lower(), "icons")

5
gui/builtinViewColumns/baseName.py
View File

@@ -21,7 +21,7 @@ from gui import builtinViewColumns
from gui.viewColumn import ViewColumn
from gui import bitmapLoader
import wx
from eos.types import Drone, Fit, Module, Slot
from eos.types import Drone, Fit, Module, Slot, DummyModule
class BaseName(ViewColumn):
name = "Base Name"
@@ -36,6 +36,9 @@ class BaseName(ViewColumn):
return "%dx %s" % (stuff.amount, stuff.item.name)
elif isinstance(stuff, Fit):
return "%s (%s)" % (stuff.name, stuff.ship.item.name)
elif isinstance(stuff, DummyModule):
return ""
#return "%s Rack" % Slot.getName(stuff.slot).capitalize()
elif isinstance(stuff, Module):
if stuff.isEmpty:
return "%s Slot" % Slot.getName(stuff.slot).capitalize()

4
gui/builtinViewColumns/state.py
View File

@@ -20,7 +20,7 @@
from gui.viewColumn import ViewColumn
from gui import bitmapLoader
import wx
from eos.types import Drone, Module
from eos.types import Drone, Module, DummyModule
from eos.types import State as State_
class State(ViewColumn):
@@ -47,6 +47,8 @@ class State(ViewColumn):
def getImageId(self, stuff):
if isinstance(stuff, Drone):
return self.checkedId if stuff.amountActive > 0 else self.uncheckedId
elif isinstance(stuff, DummyModule):
return -1
elif isinstance(stuff, Module):
if stuff.isEmpty:
return -1