diff --git a/gui/builtinContextMenus/ammoPattern.py b/gui/builtinContextMenus/ammoPattern.py index fcbcabf4b..fae1477fc 100755 --- a/gui/builtinContextMenus/ammoPattern.py +++ b/gui/builtinContextMenus/ammoPattern.py @@ -26,7 +26,7 @@ class AmmoPattern(ContextMenu): return False def getText(self, context, selection): - return "Set as damage pattern" + return "Set as Damage Pattern" def activate(self, context, selection, i): item = selection[0] diff --git a/gui/builtinContextMenus/damagePattern.py b/gui/builtinContextMenus/damagePattern.py index 5eb144757..4af1ee318 100644 --- a/gui/builtinContextMenus/damagePattern.py +++ b/gui/builtinContextMenus/damagePattern.py @@ -12,10 +12,12 @@ class DamagePattern(ContextMenu): def display(self, context, selection): return context in ("resistancesViewFull",) and self.mainFrame.getActiveFit() is not None + SPCL_PTRN = ("Selected Ammo", "Uniform") def getText(self, context, selection): sDP = service.DamagePattern.getInstance() self.patterns = sDP.getDamagePatternList() - self.patterns.sort(key=lambda p: p.name) + self.patterns.sort( key=lambda p: (p.name in + DamagePattern.SPCL_PTRN, p.name) ) m = map(lambda p: p.name, self.patterns) return m diff --git a/gui/builtinViewColumns/moduleAmmo.py b/gui/builtinViewColumns/moduleAmmo.py index e4fac82a3..45584adcd 100644 --- a/gui/builtinViewColumns/moduleAmmo.py +++ b/gui/builtinViewColumns/moduleAmmo.py @@ -25,7 +25,7 @@ class ModuleAmmo(ViewColumn): name = "Module Ammo" def __init__(self, fittingView, params): ViewColumn.__init__(self, fittingView) - self.columnText = "Ammo" + self.columnText = "Selected Ammo" def getText(self, mod): return "%s (%s)" % (mod.charge.name, mod.numCharges) if mod.charge is not None else "" diff --git a/gui/patternEditor.py b/gui/patternEditor.py index dfef285d4..6ef0ab6ed 100644 --- a/gui/patternEditor.py +++ b/gui/patternEditor.py @@ -227,7 +227,7 @@ class DmgPatternEditorDlg (wx.Dialog): def patternChanged(self, event=None): p = self.getActivePattern() - if p.name == "Uniform": + if p.name == "Uniform" or p.name == "Selected Ammo": self.restrict() else: self.unrestrict() diff --git a/service/fit.py b/service/fit.py index 0aa76ac24..e912ab9ee 100644 --- a/service/fit.py +++ b/service/fit.py @@ -345,10 +345,10 @@ class Fit(object): try: sDP = DamagePattern.getInstance() - dp = sDP.getDamagePattern("Ammo") + dp = sDP.getDamagePattern("Selected Ammo") except: dp = eos.types.DamagePattern() - dp.name = "Ammo" + dp.name = "Selected Ammo" fit = eos.db.getFit(fitID) for attr in ("em", "thermal", "kinetic", "explosive"):