Update eos, staticdata in pyfa & make UI adjustments to add implants export
This commit is contained in:
2
eos
2
eos
Submodule eos updated: 25d620a29c...7a4cbc409d
@@ -22,15 +22,17 @@ import wx
|
|||||||
|
|
||||||
class CopySelectDialog(wx.Dialog):
|
class CopySelectDialog(wx.Dialog):
|
||||||
copyFormatEft = 0
|
copyFormatEft = 0
|
||||||
copyFormatXml = 1
|
copyFormatEftImps = 1
|
||||||
copyFormatDna = 2
|
copyFormatXml = 2
|
||||||
|
copyFormatDna = 3
|
||||||
|
|
||||||
def __init__(self, parent):
|
def __init__(self, parent):
|
||||||
wx.Dialog.__init__(self, parent, id = wx.ID_ANY, title = u"Select a format", size = (-1,-1), style = wx.DEFAULT_DIALOG_STYLE)
|
wx.Dialog.__init__(self, parent, id = wx.ID_ANY, title = u"Select a format", size = (-1,-1), style = wx.DEFAULT_DIALOG_STYLE)
|
||||||
mainSizer = wx.BoxSizer(wx.VERTICAL)
|
mainSizer = wx.BoxSizer(wx.VERTICAL)
|
||||||
|
|
||||||
copyFormats = [u"EFT", u"XML", u"DNA"]
|
copyFormats = [u"EFT", u"EFT (Implants)", u"XML", u"DNA"]
|
||||||
copyFormatTooltips = {CopySelectDialog.copyFormatEft: u"Eve Fitting Tool text format",
|
copyFormatTooltips = {CopySelectDialog.copyFormatEft: u"Eve Fitting Tool text format",
|
||||||
|
CopySelectDialog.copyFormatEftImps: u"Eve Fitting Tool text format",
|
||||||
CopySelectDialog.copyFormatXml: u"EvE native XML format",
|
CopySelectDialog.copyFormatXml: u"EvE native XML format",
|
||||||
CopySelectDialog.copyFormatDna: u"A one-line text format"}
|
CopySelectDialog.copyFormatDna: u"A one-line text format"}
|
||||||
selector = wx.RadioBox(self, wx.ID_ANY, label = u"Copy to the clipboard using:", choices = copyFormats, style = wx.RA_SPECIFY_ROWS)
|
selector = wx.RadioBox(self, wx.ID_ANY, label = u"Copy to the clipboard using:", choices = copyFormats, style = wx.RA_SPECIFY_ROWS)
|
||||||
|
|||||||
@@ -423,6 +423,10 @@ class MainFrame(wx.Frame):
|
|||||||
sFit = service.Fit.getInstance()
|
sFit = service.Fit.getInstance()
|
||||||
toClipboard(sFit.exportFit(self.getActiveFit()))
|
toClipboard(sFit.exportFit(self.getActiveFit()))
|
||||||
|
|
||||||
|
def clipboardEftImps(self):
|
||||||
|
sFit = service.Fit.getInstance()
|
||||||
|
toClipboard(sFit.exportEftImps(self.getActiveFit()))
|
||||||
|
|
||||||
def clipboardDna(self):
|
def clipboardDna(self):
|
||||||
sFit = service.Fit.getInstance()
|
sFit = service.Fit.getInstance()
|
||||||
toClipboard(sFit.exportDna(self.getActiveFit()))
|
toClipboard(sFit.exportDna(self.getActiveFit()))
|
||||||
@@ -442,6 +446,7 @@ class MainFrame(wx.Frame):
|
|||||||
|
|
||||||
def exportToClipboard(self, event):
|
def exportToClipboard(self, event):
|
||||||
CopySelectDict = {CopySelectDialog.copyFormatEft: self.clipboardEft,
|
CopySelectDict = {CopySelectDialog.copyFormatEft: self.clipboardEft,
|
||||||
|
CopySelectDialog.copyFormatEftImps: self.clipboardEftImps,
|
||||||
CopySelectDialog.copyFormatXml: self.clipboardXml,
|
CopySelectDialog.copyFormatXml: self.clipboardXml,
|
||||||
CopySelectDialog.copyFormatDna: self.clipboardDna}
|
CopySelectDialog.copyFormatDna: self.clipboardDna}
|
||||||
dlg = CopySelectDialog(self)
|
dlg = CopySelectDialog(self)
|
||||||
|
|||||||
@@ -547,6 +547,10 @@ class Fit(object):
|
|||||||
fit = eos.db.getFit(fitID)
|
fit = eos.db.getFit(fitID)
|
||||||
return fit.exportEft()
|
return fit.exportEft()
|
||||||
|
|
||||||
|
def exportEftImps(self, fitID):
|
||||||
|
fit = eos.db.getFit(fitID)
|
||||||
|
return fit.exportEftImps()
|
||||||
|
|
||||||
def exportDna(self, fitID):
|
def exportDna(self, fitID):
|
||||||
fit = eos.db.getFit(fitID)
|
fit = eos.db.getFit(fitID)
|
||||||
return fit.exportDna()
|
return fit.exportDna()
|
||||||
|
|||||||
Submodule staticdata updated: 521ae56d57...eef02e8e3f
Reference in New Issue
Block a user