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

Implement the + button in stage 2 and make the fit count work

Browse Source
This commit is contained in:
cncfanatics
2010-10-26 14:59:58 +02:00
parent 0d33b3dba6
commit f2d81d111f
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gui/shipBrowser.py
View File

@@ -72,11 +72,12 @@ class ShipBrowser(wx.Panel):
def stage2(self, event): def stage2(self, event):
categoryID = event.categoryID categoryID = event.categoryID
sMarket = service.Market.getInstance() sMarket = service.Market.getInstance()
sFit = service.Fit.getInstance()
self.lpane.RemoveAllChildren() self.lpane.RemoveAllChildren()
shipList = sMarket.getShipList(categoryID) shipList = sMarket.getShipList(categoryID)
shipList.sort(key=self.raceNameKey) shipList.sort(key=self.raceNameKey)
for ID, name, race in shipList: for ID, name, race in shipList:
self.lpane.AddWidget(ShipItem(self.lpane, ID, (name, 0), race)) self.lpane.AddWidget(ShipItem(self.lpane, ID, (name, len(sFit.getFitsWithShip(ID))), race))
self.lpane.RefreshList() self.lpane.RefreshList()
self.Show() self.Show()
@@ -379,7 +380,8 @@ class ShipItem(wx.Window):
event.Skip() event.Skip()
def createNewFit(self, event=None): def createNewFit(self, event=None):
print "New :", self.tcFitName.GetValue(), "GTFO from stage2 to stage 3 (refresh stage 3)" sFit = service.Fit.getInstance()
sFit.newFit(self.shipID, self.tcFitName.GetValue())
self.tcFitName.Show(False) self.tcFitName.Show(False)
self.editWasShown = 0 self.editWasShown = 0
wx.PostEvent(self.shipBrowser,Stage3Selected(shipID=self.shipID)) wx.PostEvent(self.shipBrowser,Stage3Selected(shipID=self.shipID))
@@ -586,8 +588,6 @@ class FitItem(wx.Window):
self.editWasShown = 0 self.editWasShown = 0
self.Refresh() self.Refresh()
event.Skip() event.Skip()
def renameFit(self, event=None): def renameFit(self, event=None):

4
service/fit.py
View File

@@ -45,10 +45,10 @@ class Fit(object):
fit = eos.db.getFit(fitID) fit = eos.db.getFit(fitID)
return fit.modules[pos] return fit.modules[pos]
def newFit(self, shipID, name): def newFit(self, shipID, name=None):
fit = eos.types.Fit() fit = eos.types.Fit()
fit.ship = eos.types.Ship(eos.db.getItem(shipID)) fit.ship = eos.types.Ship(eos.db.getItem(shipID))
fit.name = name fit.name = name if name is not None else "New %s" % fit.ship.item.name
fit.damagePattern = DamagePattern.getInstance().getDamagePattern("Uniform") fit.damagePattern = DamagePattern.getInstance().getDamagePattern("Uniform")
eos.db.save(fit) eos.db.save(fit)
fit.calculateModifiedAttributes() fit.calculateModifiedAttributes()