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

Fix broken commit with better parameter passing; cleanup

Browse Source
This commit is contained in:
Martin Falatic
2013-06-15 16:29:26 -07:00
parent 3390c06b5d
commit 961fbaef69
3 changed files with 6 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
gui/characterSelection.py
View File

@@ -114,18 +114,14 @@ class CharacterSelection(wx.Panel):
currCharID = choice.GetClientData(choice.GetCurrentSelection())
fit = cFit.getFit(event.fitID)
newCharID = fit.character.ID if fit is not None else None
print newCharID
if event.fitID is None:
print "** No active fit **"
self.skillReqsStaticBitmap.SetBitmap(self.cleanSkills)
self.skillReqsStaticBitmap.SetToolTipString("No active fit")
else:
sCharacter = service.Character.getInstance()
reqs = sCharacter.checkRequirements(fit)
sCharacter.skillReqsDict = {'charname':fit.character.name, 'skills':[]}
print "-- Skills required for character \"%s\":" % (fit.character.name,)
if len(reqs) == 0:
print " -- ** All skill prerequisites have been met **"
tip = "All skill prerequisites have been met"
self.skillReqsStaticBitmap.SetBitmap(self.greenSkills)
else:
@@ -133,9 +129,6 @@ class CharacterSelection(wx.Panel):
tip += self._buildSkillsTooltip(reqs)
self.skillReqsStaticBitmap.SetBitmap(self.redSkills)
self.skillReqsStaticBitmap.SetToolTipString(tip.strip())
print ""
print sCharacter.skillReqsDict
print ""
if newCharID == None:
cChar = service.Character.getInstance()
@@ -150,13 +143,11 @@ class CharacterSelection(wx.Panel):
sCharacter = service.Character.getInstance()
if tabulationLevel == 0:
for item, subReqs in reqs.iteritems():
print " -- {%5d} %s" % (item.ID, item.name)
tip += " %s:\n" % item.name
tip += self._buildSkillsTooltip(subReqs, 1)
else:
for name, info in reqs.iteritems():
level, ID, more = info
print " %s{%5d} %s: %d" % (" " * tabulationLevel, ID, name, level)
sCharacter.skillReqsDict['skills'].append(
{'skillID' : ID, 'skill' : name, 'level' : int(level)})
tip += " %s%s: %d\n" % (" " * tabulationLevel, name, level)

3
gui/mainFrame.py
View File

@@ -491,10 +491,9 @@ class MainFrame(wx.Frame):
saveFmt = "xml"
else:
saveFmt = "txt"
print("User selected format %d \'%s\'" % (saveFmtInt, saveFmt))
filePath = saveDialog.GetPath()
self.waitDialog = animUtils.WaitDialog(self)
sCharacter.backupSkills(filePath, saveFmt, self.closeWaitDialog)
sCharacter.backupSkills(filePath, saveFmt, self.getActiveFit(), self.closeWaitDialog)
self.waitDialog.ShowModal()
saveDialog.Destroy()

12
service/character.py
View File

@@ -32,23 +32,21 @@ from codecs import open
from xml.etree import ElementTree
from xml.dom import minidom
import gui.mainFrame
EVEMON_COMPATIBLE_VERSION = "4081"
class SkillBackupThread(threading.Thread):
def __init__(self, path, saveFmt, callback):
def __init__(self, path, saveFmt, activeFit, callback):
threading.Thread.__init__(self)
self.path = path
self.saveFmt = saveFmt
self.activeFit = activeFit
self.callback = callback
def run(self):
path = self.path
mainFrame = gui.mainFrame.MainFrame.getInstance()
sCharacter = Character.getInstance()
sFit = service.Fit.getInstance()
fit = sFit.getFit(mainFrame.getActiveFit())
fit = sFit.getFit(self.activeFit)
backupFile = open(path, "w", encoding="utf-8")
backupData = "";
if self.saveFmt == "xml":
@@ -111,8 +109,8 @@ class Character():
return prettydata
def backupSkills(self, path, saveFmt, callback):
thread = SkillBackupThread(path, saveFmt, callback)
def backupSkills(self, path, saveFmt, activeFit, callback):
thread = SkillBackupThread(path, saveFmt, activeFit, callback)
thread.start()
def all0(self):