diff --git a/gui/copySelectDialog.py b/gui/copySelectDialog.py index 55b02e535..924822e55 100644 --- a/gui/copySelectDialog.py +++ b/gui/copySelectDialog.py @@ -60,9 +60,9 @@ class CopySelectDialog(wx.Dialog): ("EFT", (CopySelectDialog.copyFormatEft, EFT_OPTIONS)), ("MultiBuy", (CopySelectDialog.copyFormatMultiBuy, MULTIBUY_OPTIONS)), ("ESI", (CopySelectDialog.copyFormatEsi, None)), + ("DNA", (CopySelectDialog.copyFormatDna, None)), ("EFS", (CopySelectDialog.copyFormatEfs, None)), # ("XML", (CopySelectDialog.copyFormatXml, None)), - # ("DNA", (CopySelectDialog.copyFormatDna, None)), )) defaultFormatOptions = {} diff --git a/service/port/dna.py b/service/port/dna.py index e0409be8b..102ec5a23 100644 --- a/service/port/dna.py +++ b/service/port/dna.py @@ -135,7 +135,6 @@ def exportDna(fit, callback): subsystems = [] # EVE cares which order you put these in mods = OrderedDict() charges = OrderedDict() - sFit = svcFit.getInstance() for mod in fit.modules: if not mod.isEmpty: if mod.slot == FittingSlot.SUBSYSTEM: @@ -163,9 +162,6 @@ def exportDna(fit, callback): for fighter in fit.fighters: dna += ":{0};{1}".format(fighter.itemID, fighter.amountActive) - for fighter in fit.fighters: - dna += ":{0};{1}".format(fighter.itemID, fighter.amountActive) - for cargo in fit.cargo: # DNA format is a simple/dumb format. As CCP uses the slot information of the item itself # without designating slots in the DNA standard, we need to make sure we only include