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

Code consistency

Browse Source
This commit is contained in:
blitzmann
2014-07-31 00:14:29 -04:00
parent dd27c3c805
commit c7042f314b
27 changed files with 240 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
gui/boosterView.py
View File

@@ -113,9 +113,9 @@ class BoosterView(d.Display):
event.Skip()
def addItem(self, event):
cFit = service.Fit.getInstance()
sFit = service.Fit.getInstance()
fitID = self.mainFrame.getActiveFit()
trigger = cFit.addBooster(fitID, event.itemID)
trigger = sFit.addBooster(fitID, event.itemID)
if trigger:
wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=fitID))
self.mainFrame.additionsPane.select("Boosters")
@@ -131,8 +131,8 @@ class BoosterView(d.Display):
def removeBooster(self, booster):
fitID = self.mainFrame.getActiveFit()
cFit = service.Fit.getInstance()
cFit.removeBooster(fitID, self.origional.index(booster))
sFit = service.Fit.getInstance()
sFit.removeBooster(fitID, self.origional.index(booster))
wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=fitID))
def click(self, event):
@@ -142,8 +142,8 @@ class BoosterView(d.Display):
col = self.getColumn(event.Position)
if col == self.getColIndex(State):
fitID = self.mainFrame.getActiveFit()
cFit = service.Fit.getInstance()
cFit.toggleBooster(fitID, row)
sFit = service.Fit.getInstance()
sFit.toggleBooster(fitID, row)
wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=fitID))
@@ -155,8 +155,8 @@ class BoosterView(d.Display):
def spawnMenu(self):
sel = self.GetFirstSelected()
if sel != -1:
cFit = service.Fit.getInstance()
fit = cFit.getFit(self.mainFrame.getActiveFit())
sFit = service.Fit.getInstance()
fit = sFit.getFit(self.mainFrame.getActiveFit())
item = fit.boosters[sel]
srcContext = "boosterItem"

12
gui/builtinContextMenus/droneRemoveStack.py
View File

@@ -18,11 +18,11 @@ class ItemRemove(ContextMenu):
srcContext = fullContext[0]
sFit = service.Fit.getInstance()
fitID = self.mainFrame.getActiveFit()
cFit = sFit.getFit(fitID)
idx = cFit.drones.index(selection[0])
sFit.removeDrone(fitID, idx, numDronesToRemove=cFit.drones[idx].amount)
sFit = sFit.getFit(fitID)
idx = sFit.drones.index(selection[0])
sFit.removeDrone(fitID, idx, numDronesToRemove=sFit.drones[idx].amount)
wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=fitID))
ItemRemove.register()
ItemRemove.register()

14
gui/builtinContextMenus/itemRemove.py
View File

@@ -19,23 +19,23 @@ class ItemRemove(ContextMenu):
srcContext = fullContext[0]
sFit = service.Fit.getInstance()
fitID = self.mainFrame.getActiveFit()
cFit = sFit.getFit(fitID)
sFit = sFit.getFit(fitID)
if srcContext == "fittingModule":
for module in selection:
if module is not None:
sFit.removeModule(fitID,cFit.modules.index(module))
sFit.removeModule(fitID,sFit.modules.index(module))
elif srcContext in ("fittingCharge" , "projectedCharge"):
sFit.setAmmo(fitID, None, selection)
elif srcContext == "droneItem":
sFit.removeDrone(fitID, cFit.drones.index(selection[0]))
sFit.removeDrone(fitID, sFit.drones.index(selection[0]))
elif srcContext == "implantItem":
sFit.removeImplant(fitID, cFit.implants.index(selection[0]))
sFit.removeImplant(fitID, sFit.implants.index(selection[0]))
elif srcContext == "boosterItem":
sFit.removeBooster(fitID, cFit.boosters.index(selection[0]))
sFit.removeBooster(fitID, sFit.boosters.index(selection[0]))
else:
sFit.removeProjected(fitID, selection[0])
wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=fitID))

4
gui/builtinContextMenus/itemStats.py
View File

@@ -19,8 +19,8 @@ class ItemStats(ContextMenu):
srcContext = fullContext[0]
if srcContext == "fittingShip":
fitID = self.mainFrame.getActiveFit()
cFit = service.Fit.getInstance()
stuff = cFit.getFit(fitID).ship
sFit = service.Fit.getInstance()
stuff = sFit.getFit(fitID).ship
else:
stuff = selection[0]

4
gui/builtinGraphs/fitDps.py
View File

@@ -53,9 +53,9 @@ class FitDpsGraph(Graph):
def getIcons(self):
icons = {}
sFit = service.Attribute.getInstance()
sAttr = service.Attribute.getInstance()
for key, attrName in self.propertyAttributeMap.iteritems():
iconFile = sFit.getAttributeInfo(attrName).icon.iconFile
iconFile = sAttr.getAttributeInfo(attrName).icon.iconFile
bitmap = bitmapLoader.getBitmap(iconFile, "pack")
if bitmap:
icons[key] = bitmap

4
gui/builtinStatsViews/priceViewFull.py
View File

@@ -108,8 +108,8 @@ class PriceViewFull(StatsView):
if self._timer:
if self._timer.IsRunning():
self._timer.Stop()
cMarket = service.Market.getInstance()
cMarket.getPrices(typeIDs, self.processPrices)
sMkt = service.Market.getInstance()
sMkt.getPrices(typeIDs, self.processPrices)
self.labelEMStatus.SetLabel("Updating prices...")
if not self._timerUpdate:
self._timerUpdate = wx.Timer(self.parent, self._timerIdUpdate)

8
gui/builtinViewColumns/attributeDisplay.py
View File

@@ -29,8 +29,8 @@ class AttributeDisplay(ViewColumn):
name = "attr"
def __init__(self, fittingView, params):
ViewColumn.__init__(self, fittingView)
cAttribute = service.Attribute.getInstance()
info = cAttribute.getAttributeInfo(params["attribute"])
sAttr = service.Attribute.getInstance()
info = sAttr.getAttributeInfo(params["attribute"])
self.info = info
if params["showIcon"]:
if info.name == "power":
@@ -57,10 +57,10 @@ class AttributeDisplay(ViewColumn):
self.direct = True
self.view = fittingView
originalRefresh = fittingView.refresh
sMarket = service.Market.getInstance()
sMkt = service.Market.getInstance()
#Hack into our master view and add a callback for ourselves to know when to query
def refresh(stuff):
self.directInfo = sMarket.directAttrRequest(stuff, info) if stuff else None
self.directInfo = sMkt.directAttrRequest(stuff, info) if stuff else None
originalRefresh(stuff)
fittingView.refresh = refresh

4
gui/builtinViewColumns/capacitorUse.py
View File

@@ -31,8 +31,8 @@ class CapacitorUse(ViewColumn):
self.mask = wx.LIST_MASK_IMAGE
cAttribute = service.Attribute.getInstance()
info = cAttribute.getAttributeInfo("capacitorNeed")
sAttr = service.Attribute.getInstance()
info = sAttr.getAttributeInfo("capacitorNeed")
self.imageId = fittingView.imageList.GetImageIndex(info.icon.iconFile, "pack")
self.bitmap = bitmapLoader.getBitmap(info.icon.iconFile, "pack")

4
gui/builtinViewColumns/maxRange.py
View File

@@ -32,8 +32,8 @@ class MaxRange(ViewColumn):
"displayName": False}
ViewColumn.__init__(self, fittingView)
cAttribute = service.Attribute.getInstance()
info = cAttribute.getAttributeInfo("maxRange")
sAttr = service.Attribute.getInstance()
info = sAttr.getAttributeInfo("maxRange")
self.info = info
if params["showIcon"]:
iconFile = info.icon.iconFile if info.icon else None

4
gui/builtinViewColumns/price.py
View File

@@ -35,8 +35,8 @@ class Price(ViewColumn):
if stuff.item is None:
return ""
sMarket = service.Market.getInstance()
price = sMarket.getPriceNow(stuff.item.ID)
sMkt = service.Market.getInstance()
price = sMkt.getPriceNow(stuff.item.ID)
return formatAmount(price.price, 3, 3, 9, currency=True) if price and price.price else False
def delayedText(self, mod, display, colItem):

4
gui/builtinViewColumns/propertyDisplay.py
View File

@@ -27,11 +27,11 @@ class PropertyDisplay(ViewColumn):
name = "prop"
def __init__(self, fittingView, params):
ViewColumn.__init__(self, fittingView)
cAttribute = service.Attribute.getInstance()
sAttr = service.Attribute.getInstance()
attributeSlave = params["attributeSlave"] or params["property"]
# This function can throw an exception if the database isn't sane
# We need to do a sanity check before this runs
info = cAttribute.getAttributeInfo(attributeSlave)
info = sAttr.getAttributeInfo(attributeSlave)
self.mask = 0
self.propertyName = params["property"]

42
gui/builtinViews/fittingView.py
View File

@@ -262,8 +262,8 @@ class FittingView(d.Display):
try:
# Sometimes there is no active page after deletion, hence the try block
cFit = service.Fit.getInstance()
cFit.refreshFit(self.getActiveFit())
sFit = service.Fit.getInstance()
sFit.refreshFit(self.getActiveFit())
wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=self.activeFitID))
except wx._core.PyDeadObjectError:
pass
@@ -293,8 +293,8 @@ class FittingView(d.Display):
event.Skip()
def updateTab(self):
cFit = service.Fit.getInstance()
fit = cFit.getFit(self.getActiveFit())
sFit = service.Fit.getInstance()
fit = sFit.getFit(self.getActiveFit())
bitmap = bitmapLoader.getImage("race_%s_small" % fit.ship.item.race, "icons")
text = "%s: %s" % (fit.ship.item.name, fit.name)
@@ -308,18 +308,18 @@ class FittingView(d.Display):
itemID = event.itemID
fitID = self.activeFitID
if fitID != None:
cFit = service.Fit.getInstance()
if cFit.isAmmo(itemID):
sFit = service.Fit.getInstance()
if sFit.isAmmo(itemID):
modules = []
sel = self.GetFirstSelected()
while sel != -1 and sel not in self.blanks:
modules.append(self.mods[self.GetItemData(sel)])
sel = self.GetNextSelected(sel)
cFit.setAmmo(fitID, itemID, modules)
sFit.setAmmo(fitID, itemID, modules)
wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=fitID))
else:
populate = cFit.appendModule(fitID, itemID)
populate = sFit.appendModule(fitID, itemID)
if populate is not None:
self.slotsChanged()
wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=fitID))
@@ -337,9 +337,9 @@ class FittingView(d.Display):
self.click(event)
def removeModule(self, module):
cFit = service.Fit.getInstance()
fit = cFit.getFit(self.activeFitID)
populate = cFit.removeModule(self.activeFitID, fit.modules.index(module))
sFit = service.Fit.getInstance()
fit = sFit.getFit(self.activeFitID)
populate = sFit.removeModule(self.activeFitID, fit.modules.index(module))
if populate is not None:
self.slotsChanged()
@@ -353,16 +353,16 @@ class FittingView(d.Display):
if dstRow != -1 and dstRow not in self.blanks:
module = self.mods[dstRow]
cFit = service.Fit.getInstance()
cFit.moveCargoToModule(self.mainFrame.getActiveFit(), module.position, srcIdx, mstate.CmdDown() and module.isEmpty)
sFit = service.Fit.getInstance()
sFit.moveCargoToModule(self.mainFrame.getActiveFit(), module.position, srcIdx, mstate.CmdDown() and module.isEmpty)
wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=self.mainFrame.getActiveFit()))
def swapItems(self, x, y, srcIdx):
'''Swap two modules in fitting window'''
mstate = wx.GetMouseState()
cFit = service.Fit.getInstance()
fit = cFit.getFit(self.activeFitID)
sFit = service.Fit.getInstance()
fit = sFit.getFit(self.activeFitID)
if mstate.CmdDown():
clone = True
@@ -380,9 +380,9 @@ class FittingView(d.Display):
return
if clone and mod2.isEmpty:
cFit.cloneModule(self.mainFrame.getActiveFit(), mod1.position, mod2.position)
sFit.cloneModule(self.mainFrame.getActiveFit(), mod1.position, mod2.position)
else:
cFit.swapModules(self.mainFrame.getActiveFit(), mod1.position, mod2.position)
sFit.swapModules(self.mainFrame.getActiveFit(), mod1.position, mod2.position)
wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=self.mainFrame.getActiveFit()))
@@ -394,8 +394,8 @@ class FittingView(d.Display):
known to the display, and not the backend, so it's safe.
'''
cFit = service.Fit.getInstance()
fit = cFit.getFit(self.activeFitID)
sFit = service.Fit.getInstance()
fit = sFit.getFit(self.activeFitID)
slotOrder = [Slot.SUBSYSTEM, Slot.HIGH, Slot.MED, Slot.LOW, Slot.RIG]
@@ -405,9 +405,9 @@ class FittingView(d.Display):
self.blanks = [] # preliminary markers where blanks will be inserted
if cFit.serviceFittingOptions["rackSlots"]:
if sFit.serviceFittingOptions["rackSlots"]:
# flag to know when to add blanks, based on previous slot
slotDivider = None if cFit.serviceFittingOptions["rackLabels"] else self.mods[0].slot
slotDivider = None if sFit.serviceFittingOptions["rackLabels"] else self.mods[0].slot
# first loop finds where slot dividers must go before modifying self.mods
for i, mod in enumerate(self.mods):

16
gui/cargoView.py
View File

@@ -93,10 +93,10 @@ class CargoView(d.Display):
keycode = event.GetKeyCode()
if keycode == wx.WXK_DELETE or keycode == wx.WXK_NUMPAD_DELETE:
fitID = self.mainFrame.getActiveFit()
cFit = service.Fit.getInstance()
sFit = service.Fit.getInstance()
row = self.GetFirstSelected()
if row != -1:
cFit.removeCargo(fitID, self.GetItemData(row))
sFit.removeCargo(fitID, self.GetItemData(row))
wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=fitID))
event.Skip()
@@ -131,8 +131,8 @@ class CargoView(d.Display):
event.Skip()
return
cFit = service.Fit.getInstance()
fit = cFit.getFit(event.fitID)
sFit = service.Fit.getInstance()
fit = sFit.getFit(event.fitID)
self.original = fit.cargo if fit is not None else None
self.cargo = stuff = fit.cargo if fit is not None else None
@@ -158,9 +158,9 @@ class CargoView(d.Display):
col = self.getColumn(event.Position)
if col != self.getColIndex(State):
fitID = self.mainFrame.getActiveFit()
cFit = service.Fit.getInstance()
sFit = service.Fit.getInstance()
cargo = self.cargo[self.GetItemData(row)]
cFit.removeCargo(fitID, self.original.index(cargo))
sFit.removeCargo(fitID, self.original.index(cargo))
wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=fitID))
def scheduleMenu(self, event):
@@ -171,8 +171,8 @@ class CargoView(d.Display):
def spawnMenu(self):
sel = self.GetFirstSelected()
if sel != -1:
cFit = service.Fit.getInstance()
fit = cFit.getFit(self.mainFrame.getActiveFit())
sFit = service.Fit.getInstance()
fit = sFit.getFit(self.mainFrame.getActiveFit())
cargo = fit.cargo[sel]
sMkt = service.Market.getInstance()

104
gui/characterEditor.py
View File

@@ -45,8 +45,8 @@ class CharacterEditor(wx.Frame):
mainSizer = wx.BoxSizer(wx.VERTICAL)
self.navSizer = wx.BoxSizer(wx.HORIZONTAL)
cChar = service.Character.getInstance()
charList = cChar.getCharacterList()
sChar = service.Character.getInstance()
charList = sChar.getCharacterList()
charList.sort(key=lambda t: t[1])
self.btnSave = wx.Button(self, wx.ID_SAVE)
@@ -124,7 +124,7 @@ class CharacterEditor(wx.Frame):
self.Centre(wx.BOTH)
charID = self.getActiveCharacter()
if cChar.getCharName(charID) in ("All 0", "All 5"):
if sChar.getCharName(charID) in ("All 0", "All 5"):
self.restrict()
self.registerEvents()
@@ -169,9 +169,9 @@ class CharacterEditor(wx.Frame):
def charChanged(self, event):
self.sview.skillTreeListCtrl.DeleteChildren(self.sview.root)
self.sview.populateSkillTree()
cChar = service.Character.getInstance()
sChar = service.Character.getInstance()
charID = self.getActiveCharacter()
if cChar.getCharName(charID) in ("All 0", "All 5"):
if sChar.getCharName(charID) in ("All 0", "All 5"):
self.restrict()
else:
self.unrestrict()
@@ -185,9 +185,9 @@ class CharacterEditor(wx.Frame):
return self.skillTreeChoice.GetClientData(selection) if selection is not None else None
def new(self, event):
cChar = service.Character.getInstance()
charID = cChar.new()
id = self.skillTreeChoice.Append(cChar.getCharName(charID), charID)
sChar = service.Character.getInstance()
charID = sChar.new()
id = self.skillTreeChoice.Append(sChar.getCharName(charID), charID)
self.skillTreeChoice.SetSelection(id)
self.unrestrict()
self.btnSave.SetLabel("Create")
@@ -209,20 +209,20 @@ class CharacterEditor(wx.Frame):
self.navSizer.Add(self.btnSave, 0, wx.ALIGN_CENTER)
self.navSizer.Layout()
cChar = service.Character.getInstance()
currName = cChar.getCharName(self.getActiveCharacter())
sChar = service.Character.getInstance()
currName = sChar.getCharName(self.getActiveCharacter())
self.characterRename.SetValue(currName)
self.characterRename.SetSelection(0, len(currName))
def processRename(self, event):
cChar = service.Character.getInstance()
sChar = service.Character.getInstance()
newName = self.characterRename.GetLineText(0)
if newName == "All 0" or newName == "All 5":
newName = newName + " bases are belong to us"
charID = self.getActiveCharacter()
cChar.rename(charID, newName)
sChar.rename(charID, newName)
self.skillTreeChoice.Show()
self.characterRename.Hide()
@@ -240,9 +240,9 @@ class CharacterEditor(wx.Frame):
self.skillTreeChoice.SetSelection(selection)
def copy(self, event):
cChar = service.Character.getInstance()
charID = cChar.copy(self.getActiveCharacter())
id = self.skillTreeChoice.Append(cChar.getCharName(charID), charID)
sChar = service.Character.getInstance()
charID = sChar.copy(self.getActiveCharacter())
id = self.skillTreeChoice.Append(sChar.getCharName(charID), charID)
self.skillTreeChoice.SetSelection(id)
self.unrestrict()
self.btnSave.SetLabel("Copy")
@@ -250,22 +250,22 @@ class CharacterEditor(wx.Frame):
wx.PostEvent(self, GE.CharChanged())
def delete(self, event):
cChar = service.Character.getInstance()
cChar.delete(self.getActiveCharacter())
sChar = service.Character.getInstance()
sChar.delete(self.getActiveCharacter())
sel = self.skillTreeChoice.GetSelection()
self.skillTreeChoice.Delete(sel)
self.skillTreeChoice.SetSelection(sel - 1)
newSelection = self.getActiveCharacter()
if cChar.getCharName(newSelection) in ("All 0", "All 5"):
if sChar.getCharName(newSelection) in ("All 0", "All 5"):
self.restrict()
wx.PostEvent(self, GE.CharChanged())
def Destroy(self):
cFit = service.Fit.getInstance()
sFit = service.Fit.getInstance()
fitID = self.mainFrame.getActiveFit()
if fitID is not None:
cFit.clearFit(fitID)
sFit.clearFit(fitID)
wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=fitID))
wx.Frame.Destroy(self)
@@ -321,8 +321,8 @@ class SkillTreeView (wx.Panel):
self.Layout()
def populateSkillTree(self):
cChar = service.Character.getInstance()
groups = cChar.getSkillGroups()
sChar = service.Character.getInstance()
groups = sChar.getSkillGroups()
imageId = self.skillBookImageId
root = self.root
tree = self.skillTreeListCtrl
@@ -342,12 +342,12 @@ class SkillTreeView (wx.Panel):
tree.Delete(child)
#Get the real intrestin' stuff
cChar = service.Character.getInstance()
sChar = service.Character.getInstance()
char = self.Parent.Parent.getActiveCharacter()
for id, name in cChar.getSkills(tree.GetPyData(root)):
for id, name in sChar.getSkills(tree.GetPyData(root)):
iconId = self.skillBookImageId
childId = tree.AppendItem(root, name, iconId, data=wx.TreeItemData(id))
level = cChar.getSkillLevel(char, id)
level = sChar.getSkillLevel(char, id)
tree.SetItemText(childId, "Level %d" % level if isinstance(level, int) else level, 1)
tree.SortChildren(root)
@@ -361,26 +361,26 @@ class SkillTreeView (wx.Panel):
if self.skillTreeListCtrl.GetChildrenCount(item) > 0:
return
cChar = service.Character.getInstance()
sChar = service.Character.getInstance()
charID = self.Parent.Parent.getActiveCharacter()
cMarket = service.Market.getInstance()
if cChar.getCharName(charID) not in ("All 0", "All 5"):
self.levelChangeMenu.selection = cMarket.getItem(self.skillTreeListCtrl.GetPyData(item))
sMkt = service.Market.getInstance()
if sChar.getCharName(charID) not in ("All 0", "All 5"):
self.levelChangeMenu.selection = sMkt.getItem(self.skillTreeListCtrl.GetPyData(item))
self.PopupMenu(self.levelChangeMenu)
else:
self.statsMenu.selection = cMarket.getItem(self.skillTreeListCtrl.GetPyData(item))
self.statsMenu.selection = sMkt.getItem(self.skillTreeListCtrl.GetPyData(item))
self.PopupMenu(self.statsMenu)
def changeLevel(self, event):
level = self.levelIds.get(event.Id)
if level is not None:
cChar = service.Character.getInstance()
sChar = service.Character.getInstance()
charID = self.Parent.Parent.getActiveCharacter()
selection = self.skillTreeListCtrl.GetSelection()
skillID = self.skillTreeListCtrl.GetPyData(selection)
self.skillTreeListCtrl.SetItemText(selection, "Level %d" % level if isinstance(level, int) else level, 1)
cChar.changeLevel(charID, skillID, level)
sChar.changeLevel(charID, skillID, level)
event.Skip()
@@ -456,15 +456,15 @@ class ImplantsTreeView (wx.Panel):
self.pluggedImplantsTree.update(self.implants)
def charChanged(self, event):
cChar = service.Character.getInstance()
sChar = service.Character.getInstance()
charID = self.Parent.Parent.getActiveCharacter()
name = cChar.getCharName(charID)
name = sChar.getCharName(charID)
if name == "All 0" or name == "All 5":
self.Enable(False)
else:
self.Enable(True)
self.update(cChar.getImplants(charID))
self.update(sChar.getImplants(charID))
event.Skip()
def expandLookup(self, event):
@@ -473,13 +473,13 @@ class ImplantsTreeView (wx.Panel):
child, cookie = tree.GetFirstChild(root)
text = tree.GetItemText(child)
if text == "dummy" or text == "itemdummy":
cMarket = service.Market.getInstance()
sMkt = service.Market.getInstance()
#A DUMMY! Keeeel!!! EBUL DUMMY MUST DIAF!
tree.Delete(child)
if text == "dummy":
#Add 'real stoof!' instead
for id, name, iconFile, more in cMarket.getChildren(tree.GetPyData(root)):
for id, name, iconFile, more in sMkt.getChildren(tree.GetPyData(root)):
iconId = self.addMarketViewImage(iconFile)
childId = tree.AppendItem(root, name, iconId, data=wx.TreeItemData(id))
if more:
@@ -488,8 +488,8 @@ class ImplantsTreeView (wx.Panel):
tree.AppendItem(childId, "itemdummy")
if text == "itemdummy":
cMarket = service.Market.getInstance()
data, usedMetas = cMarket.getVariations(tree.GetPyData(root))
sMkt = service.Market.getInstance()
data, usedMetas = sMkt.getVariations(tree.GetPyData(root))
for item in data:
id = item.ID
name = item.name
@@ -506,20 +506,20 @@ class ImplantsTreeView (wx.Panel):
return
nchilds = self.availableImplantsTree.GetChildrenCount(root)
cChar = service.Character.getInstance()
sChar = service.Character.getInstance()
charID = self.Parent.Parent.getActiveCharacter()
if nchilds == 0:
itemID = self.availableImplantsTree.GetPyData(root)
cChar.addImplant(charID, itemID)
self.update(cChar.getImplants(charID))
sChar.addImplant(charID, itemID)
self.update(sChar.getImplants(charID))
def removeImplant(self, event):
pos = self.pluggedImplantsTree.GetFirstSelected()
if pos != -1:
cChar = service.Character.getInstance()
sChar = service.Character.getInstance()
charID = self.Parent.Parent.getActiveCharacter()
cChar.removeImplant(charID, self.implants[pos].slot)
self.update(cChar.getImplants(charID))
sChar.removeImplant(charID, self.implants[pos].slot)
self.update(sChar.getImplants(charID))
class AvailableImplantsView(d.Display):
DEFAULT_COLS = ["Base Name",
@@ -608,8 +608,8 @@ class APIView (wx.Panel):
self.charChanged(None)
def charChanged(self, event):
cChar = service.Character.getInstance()
ID, key, char, chars = cChar.getApiDetails(self.Parent.Parent.getActiveCharacter())
sChar = service.Character.getInstance()
ID, key, char, chars = sChar.getApiDetails(self.Parent.Parent.getActiveCharacter())
self.inputID.SetValue(str(ID))
self.inputKey.SetValue(key)
@@ -637,8 +637,8 @@ class APIView (wx.Panel):
self.stStatus.SetLabel("Invalid keyID or vCode!")
return
cChar = service.Character.getInstance()
list = cChar.charList(self.Parent.Parent.getActiveCharacter(), self.inputID.GetLineText(0), self.inputKey.GetLineText(0))
sChar = service.Character.getInstance()
list = sChar.charList(self.Parent.Parent.getActiveCharacter(), self.inputID.GetLineText(0), self.inputKey.GetLineText(0))
if not list:
self.stStatus.SetLabel("Unable to fetch characters list from EVE API!")
@@ -659,8 +659,8 @@ class APIView (wx.Panel):
charName = self.charChoice.GetString(self.charChoice.GetSelection())
if charName:
try:
cChar = service.Character.getInstance()
cChar.apiFetch(self.Parent.Parent.getActiveCharacter(), charName)
sChar = service.Character.getInstance()
sChar.apiFetch(self.Parent.Parent.getActiveCharacter(), charName)
self.stStatus.SetLabel("Successfully fetched %s\'s skills from EVE API." % charName)
except:
self.stStatus.SetLabel("Unable to retrieve %s\'s skills!" % charName)
self.stStatus.SetLabel("Unable to retrieve %s\'s skills!" % charName)

36
gui/characterSelection.py
View File

@@ -77,12 +77,12 @@ class CharacterSelection(wx.Panel):
def refreshCharacterList(self, event=None):
choice = self.charChoice
cChar = service.Character.getInstance()
sChar = service.Character.getInstance()
activeChar = self.getActiveCharacter()
choice.Clear()
charList = cChar.getCharacterList()
cChar.getCharacterList()
charList = sChar.getCharacterList()
sChar.getCharacterList()
picked = False
for id, name, active in charList:
@@ -93,11 +93,11 @@ class CharacterSelection(wx.Panel):
picked = True
if not picked:
charID = cChar.all5ID()
charID = sChar.all5ID()
self.selectChar(charID)
fitID = self.mainFrame.getActiveFit()
cFit = service.Fit.getInstance()
cFit.changeChar(fitID, charID)
sFit = service.Fit.getInstance()
sFit.changeChar(fitID, charID)
choice.Append(u"\u2015 Open Character Editor \u2015", -1)
self.charCache = self.charChoice.GetCurrentSelection()
@@ -106,11 +106,11 @@ class CharacterSelection(wx.Panel):
event.Skip()
def refreshApi(self, event):
cChar = service.Character.getInstance()
ID, key, charName, chars = cChar.getApiDetails(self.getActiveCharacter())
sChar = service.Character.getInstance()
ID, key, charName, chars = sChar.getApiDetails(self.getActiveCharacter())
if charName:
try:
cChar.apiFetch(self.getActiveCharacter(), charName)
sChar.apiFetch(self.getActiveCharacter(), charName)
except:
# can we do a popup, notifying user of API error?
pass
@@ -119,20 +119,20 @@ class CharacterSelection(wx.Panel):
def charChanged(self, event):
fitID = self.mainFrame.getActiveFit()
charID = self.getActiveCharacter()
cChar = service.Character.getInstance()
sChar = service.Character.getInstance()
if charID == -1:
# revert to previous character
self.charChoice.SetSelection(self.charCache)
self.mainFrame.showCharacterEditor(event)
return
if cChar.getCharName(charID) not in ("All 0", "All 5") and cChar.apiEnabled(charID):
if sChar.getCharName(charID) not in ("All 0", "All 5") and sChar.apiEnabled(charID):
self.btnRefresh.Enable(True)
else:
self.btnRefresh.Enable(False)
cFit = service.Fit.getInstance()
cFit.changeChar(fitID, charID)
sFit = service.Fit.getInstance()
sFit.changeChar(fitID, charID)
self.charCache = self.charChoice.GetCurrentSelection()
wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=fitID))
@@ -150,9 +150,9 @@ class CharacterSelection(wx.Panel):
def fitChanged(self, event):
self.charChoice.Enable(event.fitID != None)
choice = self.charChoice
cFit = service.Fit.getInstance()
sFit = service.Fit.getInstance()
currCharID = choice.GetClientData(choice.GetCurrentSelection())
fit = cFit.getFit(event.fitID)
fit = sFit.getFit(event.fitID)
newCharID = fit.character.ID if fit is not None else None
if event.fitID is None:
self.skillReqsStaticBitmap.SetBitmap(self.cleanSkills)
@@ -166,7 +166,7 @@ class CharacterSelection(wx.Panel):
self.skillReqsStaticBitmap.SetBitmap(self.greenSkills)
else:
tip = "Skills required:\n"
condensed = cFit.serviceFittingOptions["compactSkills"]
condensed = sFit.serviceFittingOptions["compactSkills"]
if condensed:
dict = self._buildSkillsTooltipCondensed(reqs, skillsMap = {})
for key in sorted(dict):
@@ -177,8 +177,8 @@ class CharacterSelection(wx.Panel):
self.skillReqsStaticBitmap.SetToolTipString(tip.strip())
if newCharID == None:
cChar = service.Character.getInstance()
self.selectChar(cChar.all5ID())
sChar = service.Character.getInstance()
self.selectChar(sChar.all5ID())
elif currCharID != newCharID:
self.selectChar(newCharID)

22
gui/droneView.py
View File

@@ -139,9 +139,9 @@ class DroneView(d.Display):
'Fighter Bombers', 'Combat Utility Drones',
'Electronic Warfare Drones', 'Logistic Drones', 'Mining Drones', 'Salvage Drones')
def droneKey(self, drone):
sMarket = service.Market.getInstance()
sMkt = service.Market.getInstance()
groupName = sMarket.getMarketGroupByItem(drone.item).name
groupName = sMkt.getMarketGroupByItem(drone.item).name
return (self.DRONE_ORDER.index(groupName),
drone.item.name)
@@ -155,8 +155,8 @@ class DroneView(d.Display):
event.Skip()
return
cFit = service.Fit.getInstance()
fit = cFit.getFit(event.fitID)
sFit = service.Fit.getInstance()
fit = sFit.getFit(event.fitID)
self.original = fit.drones if fit is not None else None
self.drones = stuff = fit.drones[:] if fit is not None else None
@@ -180,9 +180,9 @@ class DroneView(d.Display):
def addItem(self, event):
cFit = service.Fit.getInstance()
sFit = service.Fit.getInstance()
fitID = self.mainFrame.getActiveFit()
trigger = cFit.addDrone(fitID, event.itemID)
trigger = sFit.addDrone(fitID, event.itemID)
if trigger:
wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=fitID))
self.mainFrame.additionsPane.select("Drones")
@@ -196,11 +196,11 @@ class DroneView(d.Display):
if col != self.getColIndex(State):
drone = self.drones[self.GetItemData(row)]
self.removeDrone(drone)
def removeDrone(self, drone):
fitID = self.mainFrame.getActiveFit()
cFit = service.Fit.getInstance()
cFit.removeDrone(fitID, self.original.index(drone))
sFit = service.Fit.getInstance()
sFit.removeDrone(fitID, self.original.index(drone))
wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=fitID))
def click(self, event):
@@ -210,9 +210,9 @@ class DroneView(d.Display):
col = self.getColumn(event.Position)
if col == self.getColIndex(State):
fitID = self.mainFrame.getActiveFit()
cFit = service.Fit.getInstance()
sFit = service.Fit.getInstance()
drone = self.drones[row]
cFit.toggleDrone(fitID, self.original.index(drone))
sFit.toggleDrone(fitID, self.original.index(drone))
wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=fitID))
def scheduleMenu(self, event):

32
gui/gangView.py
View File

@@ -150,15 +150,15 @@ class GangView ( ScrolledPanel ):
event.Skip()
return
cFit = service.Fit.getInstance()
sFit = service.Fit.getInstance()
fleetSrv = service.Fleet.getInstance()
activeFitID = self.mainFrame.getActiveFit()
fit = cFit.getFit(activeFitID)
fit = sFit.getFit(activeFitID)
cChar = service.Character.getInstance()
charList = cChar.getCharacterList()
sChar = service.Character.getInstance()
charList = sChar.getCharacterList()
if activeFitID:
commanders = fleetSrv.loadLinearFleet(fit)
@@ -170,25 +170,25 @@ class GangView ( ScrolledPanel ):
if type == 0:
if fleetCom:
charID = chBooster.GetClientData(chBooster.GetSelection())
cFit.changeChar(fleetCom.ID, charID)
sFit.changeChar(fleetCom.ID, charID)
else:
chBooster.SetSelection(0)
if type == 1:
if wingCom:
charID = chBooster.GetClientData(chBooster.GetSelection())
cFit.changeChar(wingCom.ID, charID)
sFit.changeChar(wingCom.ID, charID)
else:
chBooster.SetSelection(0)
if type == 2:
if squadCom:
charID = chBooster.GetClientData(chBooster.GetSelection())
cFit.changeChar(squadCom.ID, charID)
sFit.changeChar(squadCom.ID, charID)
else:
chBooster.SetSelection(0)
cFit.recalc(fit, withBoosters=True)
sFit.recalc(fit, withBoosters=True)
wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=activeFitID))
else:
@@ -237,8 +237,8 @@ class GangView ( ScrolledPanel ):
fleetSrv = service.Fleet.getInstance()
activeFitID = self.mainFrame.getActiveFit()
cFit = service.Fit.getInstance()
fit = cFit.getFit(event.fitID or activeFitID)
sFit = service.Fit.getInstance()
fit = sFit.getFit(event.fitID or activeFitID)
commanders = (None, None, None)
if activeFitID:
@@ -296,8 +296,8 @@ class GangView ( ScrolledPanel ):
wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=activeFitID))
def RefreshBoosterFits(self, event = None):
sFit = service.Fit.getInstance()
sMarket = service.Market.getInstance()
sFit = service.Fit.getInstance()
sMkt = service.Market.getInstance()
fitList = sFit.getBoosterFits()
for id in self.fleet:
@@ -312,7 +312,7 @@ class GangView ( ScrolledPanel ):
choice.Append("None", -1)
for fit in fitList:
id,name,type = fit
ship = sMarket.getItem(type)
ship = sMkt.getItem(type)
choice.Append(ship.name+': '+name, id)
if chCurrData == id:
currSelFound = True
@@ -326,8 +326,8 @@ class GangView ( ScrolledPanel ):
choice.SetSelection(0)
def RefreshCharacterList(self, event = None):
cChar = service.Character.getInstance()
charList = cChar.getCharacterList()
sChar = service.Character.getInstance()
charList = sChar.getCharacterList()
for id in self.fleet:
choice = self.fleet[id]['chChar']
chCurrSelection = choice.GetSelection()
@@ -398,4 +398,4 @@ class GangView ( ScrolledPanel ):
fit = sFit.getFit(fitID)
self.AddCommander(fit.ID, type)
self.mainFrame.additionsPane.select("Fleet")
self.mainFrame.additionsPane.select("Fleet")

22
gui/implantView.py
View File

@@ -61,8 +61,8 @@ class ImplantView(d.Display):
event.Skip()
return
cFit = service.Fit.getInstance()
fit = cFit.getFit(event.fitID)
sFit = service.Fit.getInstance()
fit = sFit.getFit(event.fitID)
self.original = fit.implants if fit is not None else None
self.implants = stuff = fit.implants if fit is not None else None
@@ -83,9 +83,9 @@ class ImplantView(d.Display):
event.Skip()
def addItem(self, event):
cFit = service.Fit.getInstance()
sFit = service.Fit.getInstance()
fitID = self.mainFrame.getActiveFit()
trigger = cFit.addImplant(fitID, event.itemID)
trigger = sFit.addImplant(fitID, event.itemID)
if trigger:
wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=fitID))
self.mainFrame.additionsPane.select("Implants")
@@ -98,11 +98,11 @@ class ImplantView(d.Display):
col = self.getColumn(event.Position)
if col != self.getColIndex(State):
self.removeImplant(self.implants[self.GetItemData(row)])
def removeImplant(self, implant):
fitID = self.mainFrame.getActiveFit()
cFit = service.Fit.getInstance()
cFit.removeImplant(fitID, self.original.index(implant))
sFit = service.Fit.getInstance()
sFit.removeImplant(fitID, self.original.index(implant))
wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=fitID))
def click(self, event):
@@ -112,8 +112,8 @@ class ImplantView(d.Display):
col = self.getColumn(event.Position)
if col == self.getColIndex(State):
fitID = self.mainFrame.getActiveFit()
cFit = service.Fit.getInstance()
cFit.toggleImplant(fitID, row)
sFit = service.Fit.getInstance()
sFit.toggleImplant(fitID, row)
wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=fitID))
def scheduleMenu(self, event):
@@ -124,8 +124,8 @@ class ImplantView(d.Display):
def spawnMenu(self):
sel = self.GetFirstSelected()
if sel != -1:
cFit = service.Fit.getInstance()
fit = cFit.getFit(self.mainFrame.getActiveFit())
sFit = service.Fit.getInstance()
fit = sFit.getFit(self.mainFrame.getActiveFit())
implant = fit.implants[sel]
sMkt = service.Market.getInstance()

4
gui/itemStats.py
View File

@@ -56,8 +56,8 @@ class ItemStatsDialog(wx.Dialog):
itmContext = None
item = getattr(victim, "item", None) if srcContext.lower() not in ("projectedcharge", "fittingcharge") else getattr(victim, "charge", None)
if item is None:
sMarket = service.Market.getInstance()
item = sMarket.getItem(victim.ID)
sMkt = service.Market.getInstance()
item = sMkt.getItem(victim.ID)
victim = None
self.context = itmContext
if item.icon is not None:

46
gui/marketBrowser.py
View File

@@ -45,7 +45,7 @@ class MarketBrowser(wx.Panel):
vbox.Add(self.splitter, 1, wx.EXPAND)
# Grab market service instance and create child objects
self.sMarket = service.Market.getInstance()
self.sMkt = service.Market.getInstance()
self.searchMode = False
self.marketView = MarketTree(self.splitter, self)
self.itemView = ItemView(self.splitter, self)
@@ -61,7 +61,7 @@ class MarketBrowser(wx.Panel):
p.SetSizer(box)
vbox.Add(p, 0, wx.EXPAND)
self.metaButtons = []
for name in self.sMarket.META_MAP.keys():
for name in self.sMkt.META_MAP.keys():
btn = wx.ToggleButton(p, wx.ID_ANY, name.capitalize(), style=wx.BU_EXACTFIT)
setattr(self, name, btn)
box.Add(btn, 1, wx.ALIGN_CENTER)
@@ -120,11 +120,11 @@ class MarketTree(wx.TreeCtrl):
self.imageList = CachingImageList(16, 16)
self.SetImageList(self.imageList)
self.sMarket = marketBrowser.sMarket
self.sMkt = marketBrowser.sMkt
self.marketBrowser = marketBrowser
# Form market tree root
sMkt = self.sMarket
sMkt = self.sMkt
for mktGrp in sMkt.getMarketRoot():
iconId = self.addImage(sMkt.getIconByMarketGroup(mktGrp))
childId = self.AppendItem(self.root, mktGrp.name, iconId, data=wx.TreeItemData(mktGrp.ID))
@@ -154,7 +154,7 @@ class MarketTree(wx.TreeCtrl):
# Delete it
self.Delete(child)
# And add real market group contents
sMkt = self.sMarket
sMkt = self.sMkt
currentMktGrp = sMkt.getMarketGroup(self.GetPyData(root), eager="children")
for childMktGrp in sMkt.getMarketGroupChildren(currentMktGrp):
# If market should have items but it doesn't, do not show it
@@ -173,7 +173,7 @@ class MarketTree(wx.TreeCtrl):
def jump(self, item):
"""Open market group and meta tab of given item"""
self.marketBrowser.searchMode = False
sMkt = self.sMarket
sMkt = self.sMkt
mg = sMkt.getMarketGroupByItem(item)
metaId = sMkt.getMetaGroupIdByItem(item)
@@ -212,7 +212,7 @@ class ItemView(d.Display):
self.unfilteredStore = set()
self.filteredStore = set()
self.recentlyUsedModules = set()
self.sMarket = marketBrowser.sMarket
self.sMkt = marketBrowser.sMkt
self.searchMode = marketBrowser.searchMode
self.marketBrowser = marketBrowser
@@ -233,8 +233,8 @@ class ItemView(d.Display):
self.metaMap = self.makeReverseMetaMap()
# Fill up recently used modules set
for itemID in self.sMarket.serviceMarketRecentlyUsedModules["pyfaMarketRecentlyUsedModules"]:
self.recentlyUsedModules.add(self.sMarket.getItem(itemID))
for itemID in self.sMkt.serviceMarketRecentlyUsedModules["pyfaMarketRecentlyUsedModules"]:
self.recentlyUsedModules.add(self.sMkt.getItem(itemID))
def startDrag(self, event):
row = self.GetFirstSelected()
@@ -258,16 +258,16 @@ class ItemView(d.Display):
self.storeRecentlyUsedMarketItem(self.active[sel].ID)
self.recentlyUsedModules = set()
for itemID in self.sMarket.serviceMarketRecentlyUsedModules["pyfaMarketRecentlyUsedModules"]:
self.recentlyUsedModules.add(self.sMarket.getItem(itemID))
for itemID in self.sMkt.serviceMarketRecentlyUsedModules["pyfaMarketRecentlyUsedModules"]:
self.recentlyUsedModules.add(self.sMkt.getItem(itemID))
wx.PostEvent(self.mainFrame, ItemSelected(itemID=self.active[sel].ID))
def storeRecentlyUsedMarketItem(self, itemID):
if len(self.sMarket.serviceMarketRecentlyUsedModules["pyfaMarketRecentlyUsedModules"]) > MAX_RECENTLY_USED_MODULES:
self.sMarket.serviceMarketRecentlyUsedModules["pyfaMarketRecentlyUsedModules"].pop(0)
if len(self.sMkt.serviceMarketRecentlyUsedModules["pyfaMarketRecentlyUsedModules"]) > MAX_RECENTLY_USED_MODULES:
self.sMkt.serviceMarketRecentlyUsedModules["pyfaMarketRecentlyUsedModules"].pop(0)
self.sMarket.serviceMarketRecentlyUsedModules["pyfaMarketRecentlyUsedModules"].append(itemID)
self.sMkt.serviceMarketRecentlyUsedModules["pyfaMarketRecentlyUsedModules"].append(itemID)
def selectionMade(self, event=None, forcedMetaSelect=None):
self.marketBrowser.searchMode = False
@@ -280,7 +280,7 @@ class ItemView(d.Display):
# If market group treeview item doesn't have children (other market groups or dummies),
# then it should have items in it and we want to request them
if self.marketView.ItemHasChildren(sel) is False:
sMkt = self.sMarket
sMkt = self.sMkt
# Get current market group
mg = sMkt.getMarketGroup(seldata, eager=("items", "items.metaGroup"))
# Get all its items
@@ -311,7 +311,7 @@ class ItemView(d.Display):
self.unfilteredStore = items
def filterItemStore(self):
sMkt = self.sMarket
sMkt = self.sMkt
selectedMetas = set()
for btn in self.marketBrowser.metaButtons:
if btn.GetValue():
@@ -321,7 +321,7 @@ class ItemView(d.Display):
def setToggles(self, forcedMetaSelect=None):
metaIDs = set()
sMkt = self.sMarket
sMkt = self.sMkt
for item in self.unfilteredStore:
metaIDs.add(sMkt.getMetaGroupIdByItem(item))
anySelection = False
@@ -361,7 +361,7 @@ class ItemView(d.Display):
return
self.marketBrowser.searchMode = True
self.sMarket.searchItems(search, self.populateSearch)
self.sMkt.searchItems(search, self.populateSearch)
def clearSearch(self, event=None):
# Wipe item store and update everything to accomodate with it
@@ -384,7 +384,7 @@ class ItemView(d.Display):
self.filterItemStore()
def itemSort(self, item):
sMkt = self.sMarket
sMkt = self.sMkt
catname = sMkt.getCategoryByItem(item).name
try:
mktgrpid = sMkt.getMarketGroupByItem(item).ID
@@ -406,7 +406,7 @@ class ItemView(d.Display):
item = self.active[sel]
sMkt = self.sMarket
sMkt = self.sMkt
sourceContext = "marketItemGroup" if self.marketBrowser.searchMode is False else "marketItemMisc"
itemContext = sMkt.getCategoryByItem(item).name
@@ -418,7 +418,7 @@ class ItemView(d.Display):
# Get dictionary with meta level attribute
sAttr = service.Attribute.getInstance()
attrs = sAttr.getAttributeInfo("metaLevel")
sMkt = self.sMarket
sMkt = self.sMkt
self.metalvls = sMkt.directAttrRequest(items, attrs)
# Clear selection
self.deselectItems()
@@ -434,7 +434,7 @@ class ItemView(d.Display):
# Get dictionary with meta level attribute
sAttr = service.Attribute.getInstance()
attrs = sAttr.getAttributeInfo("metaLevel")
sMkt = self.sMarket
sMkt = self.sMkt
self.metalvls = sMkt.directAttrRequest(items, attrs)
# Re-sort stuff
items.sort(key=self.itemSort)
@@ -446,7 +446,7 @@ class ItemView(d.Display):
"""
revmap = {}
i = 0
for mgids in self.sMarket.META_MAP.itervalues():
for mgids in self.sMkt.META_MAP.itervalues():
for mgid in mgids:
revmap[mgid] = i
i += 1

20
gui/patternEditor.py
View File

@@ -39,9 +39,9 @@ class DmgPatternEditorDlg (wx.Dialog):
self.headerSizer = headerSizer = wx.BoxSizer(wx.HORIZONTAL)
cDP = service.DamagePattern.getInstance()
sDP = service.DamagePattern.getInstance()
self.choices = cDP.getDamagePatternList()
self.choices = sDP.getDamagePatternList()
# Remove "Selected Ammo" Damage Pattern
for dp in self.choices:
if dp.name == "Selected Ammo":
@@ -266,8 +266,8 @@ class DmgPatternEditorDlg (wx.Dialog):
self.ValuesUpdated()
def newPattern(self,event):
cDP = service.DamagePattern.getInstance()
p = cDP.newPattern()
sDP = service.DamagePattern.getInstance()
p = sDP.newPattern()
self.choices.append(p)
id = self.ccDmgPattern.Append(p.name)
self.ccDmgPattern.SetSelection(id)
@@ -308,8 +308,8 @@ class DmgPatternEditorDlg (wx.Dialog):
self.stPercentages.SetLabel("Invalid name.")
return
cDP = service.DamagePattern.getInstance()
cDP.renamePattern(p, newName)
sDP = service.DamagePattern.getInstance()
sDP.renamePattern(p, newName)
self.headerSizer.Replace(self.namePicker, self.ccDmgPattern)
self.ccDmgPattern.Show()
@@ -328,8 +328,8 @@ class DmgPatternEditorDlg (wx.Dialog):
self.unrestrict()
def copyPattern(self,event):
cDP = service.DamagePattern.getInstance()
p = cDP.copyPattern(self.getActivePattern())
sDP = service.DamagePattern.getInstance()
p = sDP.copyPattern(self.getActivePattern())
self.choices.append(p)
id = self.ccDmgPattern.Append(p.name)
self.ccDmgPattern.SetSelection(id)
@@ -338,9 +338,9 @@ class DmgPatternEditorDlg (wx.Dialog):
self.patternChanged()
def deletePattern(self,event):
cDP = service.DamagePattern.getInstance()
sDP = service.DamagePattern.getInstance()
sel = self.ccDmgPattern.GetSelection()
cDP.deletePattern(self.getActivePattern())
sDP.deletePattern(self.getActivePattern())
self.ccDmgPattern.Delete(sel)
self.ccDmgPattern.SetSelection(max(0, sel - 1))
del self.choices[sel]

12
gui/projectedView.py
View File

@@ -90,10 +90,10 @@ class ProjectedView(d.Display):
keycode = event.GetKeyCode()
if keycode == wx.WXK_DELETE or keycode == wx.WXK_NUMPAD_DELETE:
fitID = self.mainFrame.getActiveFit()
cFit = service.Fit.getInstance()
sFit = service.Fit.getInstance()
row = self.GetFirstSelected()
if row != -1:
cFit.removeProjected(fitID, self.get(row))
sFit.removeProjected(fitID, self.get(row))
wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=fitID))
event.Skip()
@@ -155,8 +155,8 @@ class ProjectedView(d.Display):
event.Skip()
return
cFit = service.Fit.getInstance()
fit = cFit.getFit(event.fitID)
sFit = service.Fit.getInstance()
fit = sFit.getFit(event.fitID)
stuff = []
if fit is not None:
self.modules = fit.projectedModules[:]
@@ -253,6 +253,6 @@ class ProjectedView(d.Display):
col = self.getColumn(event.Position)
if col != self.getColIndex(State):
fitID = self.mainFrame.getActiveFit()
cFit = service.Fit.getInstance()
cFit.removeProjected(fitID, self.get(row))
sFit = service.Fit.getInstance()
sFit.removeProjected(fitID, self.get(row))
wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=fitID))

16
gui/shipBrowser.py
View File

@@ -669,7 +669,7 @@ class ShipBrowser(wx.Panel):
self.navpanel.ShowNewFitButton(False)
self.navpanel.ShowSwitchEmptyGroupsButton(False)
sMarket = service.Market.getInstance()
sMkt = service.Market.getInstance()
sFit = service.Fit.getInstance()
self.lpane.ShowLoading(False)
@@ -678,7 +678,7 @@ class ShipBrowser(wx.Panel):
if len(self.categoryList) == 0:
# set cache of category list
self.categoryList = list(sMarket.getShipRoot())
self.categoryList = list(sMkt.getShipRoot())
self.categoryList.sort(key=lambda ship: ship.name)
# set map & cache of fittings per category
@@ -781,8 +781,8 @@ class ShipBrowser(wx.Panel):
self.lpane.RemoveAllChildren()
sMarket = service.Market.getInstance()
sMarket.getShipListDelayed(categoryID, self.stage2Callback)
sMkt = service.Market.getInstance()
sMkt.getShipListDelayed(categoryID, self.stage2Callback)
self._stage2Data = categoryID
@@ -808,9 +808,9 @@ class ShipBrowser(wx.Panel):
self._activeStage = 3
sFit = service.Fit.getInstance()
sMarket = service.Market.getInstance()
sMkt = service.Market.getInstance()
ship = sMarket.getItem(shipID)
ship = sMkt.getItem(shipID)
categoryID = ship.group.ID
self.lpane.Freeze()
@@ -861,7 +861,7 @@ class ShipBrowser(wx.Panel):
self._lastStage = self._activeStage
self._activeStage = 4
sMarket = service.Market.getInstance()
sMkt = service.Market.getInstance()
sFit = service.Fit.getInstance()
query = event.text
@@ -869,7 +869,7 @@ class ShipBrowser(wx.Panel):
self.lpane.RemoveAllChildren()
if query:
ships = sMarket.searchShips(query)
ships = sMkt.searchShips(query)
fitList = sFit.searchFits(query)
for ship in ships:

4
gui/statsPane.py
View File

@@ -33,8 +33,8 @@ class StatsPane(wx.Panel):
"priceViewFull",]
def fitChanged(self, event):
cFit = service.Fit.getInstance()
fit = cFit.getFit(event.fitID)
sFit = service.Fit.getInstance()
fit = sFit.getFit(event.fitID)
for view in self.views:
view.refreshPanel(fit)
event.Skip()

6
gui/utils/exportHtml.py
View File

@@ -39,7 +39,7 @@ class exportHtmlThread(threading.Thread):
if self.stopRunning:
return;
sMarket = service.Market.getInstance()
sMkt = service.Market.getInstance()
sFit = service.Fit.getInstance()
settings = service.settings.HTMLExportSettings.getInstance()
@@ -133,13 +133,13 @@ class exportHtmlThread(threading.Thread):
""" % (time.time(), localDate)
HTML += ' <ul data-role="listview" class="ui-listview-outer" data-inset="true" data-filter="true">\n'
categoryList = list(sMarket.getShipRoot())
categoryList = list(sMkt.getShipRoot())
categoryList.sort(key=lambda ship: ship.name)
for group in categoryList:
# init market group string to give ships something to attach to
HTMLgroup = ''
ships = list(sMarket.getShipList(group.ID))
ships = list(sMkt.getShipList(group.ID))
ships.sort(key=lambda ship: ship.name)
# Keep track of how many ships per group

10
service/fit.py
View File

@@ -166,8 +166,8 @@ class Fit(object):
def deleteFit(self, fitID):
fit = eos.db.getFit(fitID)
sFlt = Fleet.getInstance()
sFlt.removeAssociatedFleetData(fit)
sFleet = Fleet.getInstance()
sFleet.removeAssociatedFleetData(fit)
self.removeProjectedData(fitID)
eos.db.remove(fit)
@@ -230,10 +230,10 @@ class Fit(object):
fit = eos.db.getFit(fitID)
inited = getattr(fit, "inited", None)
if inited is None or inited is False:
sFlt = Fleet.getInstance()
f = sFlt.getLinearFleet(fit)
sFleet = Fleet.getInstance()
f = sFleet.getLinearFleet(fit)
if f is None:
sFlt.removeAssociatedFleetData(fit)
sFleet.removeAssociatedFleetData(fit)
fit.fleet = None
else:
fit.fleet = f

10
service/market.py
View File

@@ -47,13 +47,13 @@ class ShipBrowserWorkerThread(threading.Thread):
def processRequests(self):
queue = self.queue
cache = self.cache
sMarket = Market.getInstance()
sMkt = Market.getInstance()
while True:
try:
id, callback = queue.get()
set = cache.get(id)
if set is None:
set = sMarket.getShipList(id)
set = sMkt.getShipList(id)
cache[id] = set
wx.CallAfter(callback, (id, set))
@@ -106,9 +106,9 @@ class SearchWorkerThread(threading.Thread):
request, callback = self.searchRequest
self.searchRequest = None
cv.release()
sMarket = Market.getInstance()
sMkt = Market.getInstance()
# Rely on category data provided by eos as we don't hardcode them much in service
filter = eos.types.Category.name.in_(sMarket.SEARCH_CATEGORIES)
filter = eos.types.Category.name.in_(sMkt.SEARCH_CATEGORIES)
results = eos.db.searchItems(request, where=filter,
join=(eos.types.Item.group, eos.types.Group.category),
eager=("icon", "group.category", "metaGroup", "metaGroup.parent"))
@@ -116,7 +116,7 @@ class SearchWorkerThread(threading.Thread):
items = set()
# Return only published items, consult with Market service this time
for item in results:
if sMarket.getPublicityByItem(item):
if sMkt.getPublicityByItem(item):
items.add(item)
wx.CallAfter(callback, items)