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

change to ternary operators (less ugly)

Browse Source
This commit is contained in:
Indiction
2016-11-06 20:37:24 +01:00
parent ba47420577
commit a0ef1a3d9b
1 changed files with 11 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
gui/shipBrowser.py
View File

@@ -745,10 +745,8 @@ class ShipBrowser(wx.Panel):
filter = subRacesFilter[ship.race] if ship.race else True filter = subRacesFilter[ship.race] if ship.race else True
if override: if override:
filter = True filter = True
if ship.traits is not None:
shipTrait = ship.traits.traitText shipTrait = ship.traits.traitText if (ship.traits is not None) else "" # empty string if no traits
else:
shipTrait = ""
if self.filterShipsWithNoFits: if self.filterShipsWithNoFits:
if fits>0: if fits>0:
@@ -850,10 +848,8 @@ class ShipBrowser(wx.Panel):
self._stage3ShipName = shipName self._stage3ShipName = shipName
self._stage3Data = shipID self._stage3Data = shipID
if ship.traits is not None:
shipTrait = ship.traits.traitText shipTrait = ship.traits.traitText if (ship.traits is not None) else "" # empty string if no traits
else:
shipTrait = ""
for ID, name, booster, timestamp in fitList: for ID, name, booster, timestamp in fitList:
self.lpane.AddWidget(FitItem(self.lpane, ID, (shipName, shipTrait, name, booster, timestamp),shipID)) self.lpane.AddWidget(FitItem(self.lpane, ID, (shipName, shipTrait, name, booster, timestamp),shipID))
@@ -890,18 +886,14 @@ class ShipBrowser(wx.Panel):
fitList = sFit.searchFits(query) fitList = sFit.searchFits(query)
for ship in ships: for ship in ships:
if ship.traits is not None: shipTrait = ship.traits.traitText if (ship.traits is not None) else "" # empty string if no traits
shipTrait = ship.traits.traitText
else:
shipTrait = ""
self.lpane.AddWidget(ShipItem(self.lpane, ship.ID, (ship.name, shipTrait, len(sFit.getFitsWithShip(ship.ID))), ship.race)) self.lpane.AddWidget(ShipItem(self.lpane, ship.ID, (ship.name, shipTrait, len(sFit.getFitsWithShip(ship.ID))), ship.race))
for ID, name, shipID, shipName, booster, timestamp in fitList: for ID, name, shipID, shipName, booster, timestamp in fitList:
ship = sMkt.getItem(shipID) ship = sMkt.getItem(shipID)
if ship.traits is not None: shipTrait = ship.traits.traitText if (ship.traits is not None) else "" # empty string if no traits
shipTrait = ship.traits.traitText
else:
shipTrait = ""
self.lpane.AddWidget(FitItem(self.lpane, ID, (shipName, shipTrait, name, booster, timestamp), shipID)) self.lpane.AddWidget(FitItem(self.lpane, ID, (shipName, shipTrait, name, booster, timestamp), shipID))
if len(ships) == 0 and len(fitList) == 0 : if len(ships) == 0 and len(fitList) == 0 :
self.lpane.AddWidget(PFStaticText(self.lpane, label = u"No matching results.")) self.lpane.AddWidget(PFStaticText(self.lpane, label = u"No matching results."))
@@ -937,10 +929,8 @@ class ShipBrowser(wx.Panel):
if fits: if fits:
for fit in fits: for fit in fits:
if fit.ship.traits is None: shipTrait = fit.ship.traits.traitText if (fit.ship.traits is not None) else "" # empty string if no traits
shipTrait = ""
else:
shipTrait = fit.ship.traits.traitText
self.lpane.AddWidget(FitItem( self.lpane.AddWidget(FitItem(
self.lpane, self.lpane,
fit.ID, ( fit.ID, (
@@ -1480,7 +1470,7 @@ class FitItem(SFItem.SFBrowserItem):
self.dragTLFBmp = None self.dragTLFBmp = None
self.bkBitmap = None self.bkBitmap = None
if self.shipTrait != "": if self.shipTrait != "": # show no tooltip if no trait available
self.SetToolTip(wx.ToolTip(self.shipName+'\n--------------------------\n'+self.shipTrait)) self.SetToolTip(wx.ToolTip(self.shipName+'\n--------------------------\n'+self.shipTrait))
self.padding = 4 self.padding = 4
self.editWidth = 150 self.editWidth = 150