From c3ce580b8c26a26dc3bae744f09069b4011cfe4c Mon Sep 17 00:00:00 2001 From: blitzmann Date: Tue, 25 Mar 2014 01:11:23 -0400 Subject: [PATCH] Rename DummyModule to Rack --- eos/saveddata/module.py | 10 +++++++--- eos/types.py | 2 +- gui/builtinViewColumns/baseIcon.py | 4 ++-- gui/builtinViewColumns/baseName.py | 4 ++-- gui/builtinViewColumns/state.py | 4 ++-- gui/builtinViews/fittingView.py | 6 +++--- 6 files changed, 17 insertions(+), 13 deletions(-) diff --git a/eos/saveddata/module.py b/eos/saveddata/module.py index b17fdcd37..ad4a52811 100755 --- a/eos/saveddata/module.py +++ b/eos/saveddata/module.py @@ -123,8 +123,8 @@ class Module(HandledItem, HandledCharge, ItemAttrShortcut, ChargeAttrShortcut): return empty @classmethod - def buildDummy(cls, slot): - empty = DummyModule(None) + def buildRack(cls, slot): + empty = Rack(None) empty.__slot = slot empty.__hardpoint = Hardpoint.NONE empty.__item = 0 @@ -636,5 +636,9 @@ class Module(HandledItem, HandledCharge, ItemAttrShortcut, ChargeAttrShortcut): copy.state = self.state return copy -class DummyModule(Module): +class Rack(Module): + ''' + This is simply the Module class named something else to differentiate + it for app logic. This class does not do anything special + ''' pass \ No newline at end of file diff --git a/eos/types.py b/eos/types.py index 544f075d3..358e0828c 100755 --- a/eos/types.py +++ b/eos/types.py @@ -23,7 +23,7 @@ from eos.saveddata.price import Price from eos.saveddata.user import User from eos.saveddata.damagePattern import DamagePattern from eos.saveddata.character import Character, Skill -from eos.saveddata.module import Module, State, Slot, Hardpoint, DummyModule +from eos.saveddata.module import Module, State, Slot, Hardpoint, Rack from eos.saveddata.drone import Drone from eos.saveddata.implant import Implant from eos.saveddata.booster import SideEffect diff --git a/gui/builtinViewColumns/baseIcon.py b/gui/builtinViewColumns/baseIcon.py index 9c9862ae5..5f88227a6 100644 --- a/gui/builtinViewColumns/baseIcon.py +++ b/gui/builtinViewColumns/baseIcon.py @@ -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: diff --git a/gui/builtinViewColumns/baseName.py b/gui/builtinViewColumns/baseName.py index 65d3c4d14..2021ad6ed 100644 --- a/gui/builtinViewColumns/baseName.py +++ b/gui/builtinViewColumns/baseName.py @@ -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): diff --git a/gui/builtinViewColumns/state.py b/gui/builtinViewColumns/state.py index a88757a1b..01e93e4f6 100644 --- a/gui/builtinViewColumns/state.py +++ b/gui/builtinViewColumns/state.py @@ -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: diff --git a/gui/builtinViews/fittingView.py b/gui/builtinViews/fittingView.py index 26e680b76..6c06205a5 100644 --- a/gui/builtinViews/fittingView.py +++ b/gui/builtinViews/fittingView.py @@ -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())