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

more conversions on the traits

Browse Source
This commit is contained in:
blitzmann
2020-06-25 21:35:26 -04:00
parent dac35597ea
commit 977ae98ea6
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
gui/shipBrowser.py
View File

@@ -233,7 +233,7 @@ class ShipBrowser(wx.Panel):
if override:
filter_ = True
shipTrait = ship.traits.traitText if (ship.traits is not None) else "" # empty string if no traits
shipTrait = ship.traits.display if (ship.traits is not None) else "" # empty string if no traits
if self.filterShipsWithNoFits:
if fits > 0:
@@ -335,7 +335,7 @@ class ShipBrowser(wx.Panel):
self._stage3ShipName = shipName
self._stage3Data = shipID
shipTrait = ship.traits.traitText if (ship.traits is not None) else "" # empty string if no traits
shipTrait = ship.traits.display if (ship.traits is not None) else "" # empty string if no traits
for ID, name, booster, timestamp, notes, graphicID in fitList:
self.lpane.AddWidget(FitItem(self.lpane, ID, (shipName, shipTrait, name, booster, timestamp, notes), shipID, graphicID=graphicID))
@@ -372,7 +372,7 @@ class ShipBrowser(wx.Panel):
fitList = sFit.searchFits(query)
for ship in ships:
shipTrait = ship.traits.traitText if (ship.traits is not None) else "" # empty string if no traits
shipTrait = ship.traits.display if (ship.traits is not None) else "" # empty string if no traits
self.lpane.AddWidget(
ShipItem(self.lpane, ship.ID, (ship.name, shipTrait, len(sFit.getFitsWithShip(ship.ID))),
@@ -384,7 +384,7 @@ class ShipBrowser(wx.Panel):
if not sMkt.getPublicityByItem(ship):
continue
shipTrait = ship.traits.traitText if (ship.traits is not None) else "" # empty string if no traits
shipTrait = ship.traits.display if (ship.traits is not None) else "" # empty string if no traits
self.lpane.AddWidget(FitItem(self.lpane, ID, (shipName, shipTrait, name, booster, timestamp, notes), shipID, graphicID=ship.graphicID))
if len(ships) == 0 and len(fitList) == 0:
@@ -423,7 +423,7 @@ class ShipBrowser(wx.Panel):
if fits:
for fit in fits:
shipItem = fit[3]
shipTrait = shipItem.traits.traitText if (shipItem.traits is not None) else ""
shipTrait = shipItem.traits.display if (shipItem.traits is not None) else ""
self.lpane.AddWidget(FitItem(
self.lpane,