dave/pyfa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 12 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

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"]