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

Rename DummyModule to Rack

Browse Source
This commit is contained in:
blitzmann
2014-03-25 01:11:23 -04:00
parent 47c46cc9c5
commit c3ce580b8c
6 changed files with 17 additions and 13 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, DummyModule
from eos.types import Drone, Fit, Module, Slot, Rack
class BaseIcon(ViewColumn):
name = "Base Icon"
@@ -19,7 +19,7 @@ class BaseIcon(ViewColumn):
return -1
if isinstance(stuff, Fit):
return self.shipImage
if isinstance(stuff, DummyModule):
if isinstance(stuff, Rack):
return -1
if isinstance(stuff, Module):
if stuff.isEmpty:

4
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, DummyModule
from eos.types import Drone, Fit, Module, Slot, Rack
class BaseName(ViewColumn):
name = "Base Name"
@@ -36,7 +36,7 @@ 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):
elif isinstance(stuff, Rack):
return ""
#return "%s Rack" % Slot.getName(stuff.slot).capitalize()
elif isinstance(stuff, Module):

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, DummyModule
from eos.types import Drone, Module, Rack
from eos.types import State as State_
class State(ViewColumn):
@@ -47,7 +47,7 @@ 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):
elif isinstance(stuff, Rack):
return -1
elif isinstance(stuff, Module):
if stuff.isEmpty:

6
gui/builtinViews/fittingView.py
View File

@@ -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, DummyModule
from eos.types import Slot, Rack
from gui.builtinViewColumns.state import State
from gui import bitmapLoader
import gui.builtinViews.emptyView
@@ -388,7 +388,7 @@ class FittingView(d.Display):
for i, x in enumerate(self.blanks):
self.blanks[i] = x+i # modify blanks
self.mods.insert(x+i, DummyModule.buildDummy(slotOrder.index(i+1)))
self.mods.insert(x+i, Rack.buildRack(slotOrder.index(i+1)))
else:
self.mods = None
@@ -516,7 +516,7 @@ class FittingView(d.Display):
for i, mod in enumerate(self.mods):
if slotMap[mod.slot]:
self.SetItemBackgroundColour(i, wx.Colour(204, 51, 51))
elif sFit.serviceFittingOptions["colorFitBySlot"] and not isinstance(mod, DummyModule):
elif sFit.serviceFittingOptions["colorFitBySlot"] and not isinstance(mod, Rack):
self.SetItemBackgroundColour(i, self.slotColour(mod.slot))
else:
self.SetItemBackgroundColour(i, self.GetBackgroundColour())