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

Merge branch 'development' into feature/strictSkills

Browse Source 
Conflicts:
	eos/gamedata.py
This commit is contained in:
blitzmann
2017-04-26 19:42:29 -04:00
parent 86e6250a63 f7349316b4
commit 77b5e8afdc
5 changed files with 23 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
gui/itemStats.py
View File

@@ -535,6 +535,10 @@ class ItemParams(wx.Panel):
class ItemCompare(wx.Panel):
def __init__(self, parent, stuff, item, items, context=None):
# Start dealing with Price stuff to get that thread going
sPrice = ServicePrice.getInstance()
sPrice.getPrices(items, self.UpdateList)
wx.Panel.__init__(self, parent)
mainSizer = wx.BoxSizer(wx.VERTICAL)
@@ -591,11 +595,10 @@ class ItemCompare(wx.Panel):
wx.DefaultSize, 0)
bSizer.Add(self.toggleViewBtn, 0, wx.ALIGN_CENTER_VERTICAL)
if stuff is not None:
self.refreshBtn = wx.Button(self, wx.ID_ANY, u"Refresh", wx.DefaultPosition, wx.DefaultSize,
wx.BU_EXACTFIT)
bSizer.Add(self.refreshBtn, 0, wx.ALIGN_CENTER_VERTICAL)
self.refreshBtn.Bind(wx.EVT_BUTTON, self.RefreshValues)
self.refreshBtn = wx.Button(self, wx.ID_ANY, u"Refresh", wx.DefaultPosition, wx.DefaultSize,
wx.BU_EXACTFIT)
bSizer.Add(self.refreshBtn, 0, wx.ALIGN_CENTER_VERTICAL)
self.refreshBtn.Bind(wx.EVT_BUTTON, self.RefreshValues)
mainSizer.Add(bSizer, 0, wx.ALIGN_RIGHT)
@@ -610,7 +613,8 @@ class ItemCompare(wx.Panel):
self.PopulateList(event.Column)
self.Thaw()
def UpdateList(self):
def UpdateList(self, items=None):
# We do nothing with `items`, but it gets returned by the price service thread
self.Freeze()
self.paramList.ClearAll()
self.PopulateList()
@@ -680,9 +684,8 @@ class ItemCompare(wx.Panel):
self.paramList.SetStringItem(i, x + 1, valueUnit)
# Add prices
sPrice = ServicePrice.getInstance()
self.paramList.SetStringItem(i, len(self.attrs) + 1, formatAmount(sPrice.getPriceNow(item), 3, 3, 9, currency=True))
# Add prices
self.paramList.SetStringItem(i, len(self.attrs) + 1, formatAmount(item.price.price, 3, 3, 9, currency=True))
self.paramList.RefreshRows()
self.Layout()
@@ -1431,10 +1434,9 @@ class ItemProperties(wx.Panel):
else:
attrName = name.title()
value = getattr(self.item, name)
except Exception as e:
except:
# TODO: Add logging to this.
# We couldn't get a property for some reason. Skip it for now.
print(e)
continue
index = self.paramList.InsertStringItem(sys.maxint, attrName)