From 5d5d9ff153429f2dc6a46561dd85c1041b467cdb Mon Sep 17 00:00:00 2001 From: DarkPhoenix Date: Fri, 26 Jul 2019 15:55:10 +0300 Subject: [PATCH] Rename pattern to profile --- gui/targetProfileEditor.py | 24 ++++++++++++++---------- service/targetProfile.py | 2 +- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/gui/targetProfileEditor.py b/gui/targetProfileEditor.py index 43c0f1e93..8fee1fd35 100644 --- a/gui/targetProfileEditor.py +++ b/gui/targetProfileEditor.py @@ -19,21 +19,23 @@ # noinspection PyPackageRequirements import wx -from service.targetProfile import TargetProfile -from gui.bitmap_loader import BitmapLoader -from gui.utils.clipboard import toClipboard, fromClipboard -from gui.builtinViews.entityEditor import EntityEditor, BaseValidator from logbook import Logger +from gui.bitmap_loader import BitmapLoader +from gui.builtinViews.entityEditor import EntityEditor, BaseValidator +from gui.utils.clipboard import toClipboard, fromClipboard +from service.targetProfile import TargetProfile + + pyfalog = Logger(__name__) -class TargetProfileTextValidor(BaseValidator): +class TargetProfileTextValidator(BaseValidator): def __init__(self): BaseValidator.__init__(self) def Clone(self): - return TargetProfileTextValidor() + return TargetProfileTextValidator() def Validate(self, win): entityEditor = win.parent @@ -55,9 +57,10 @@ class TargetProfileTextValidor(BaseValidator): class TargetProfileEntityEditor(EntityEditor): + def __init__(self, parent): EntityEditor.__init__(self, parent, "Target Profile") - self.SetEditorValidator(TargetProfileTextValidor) + self.SetEditorValidator(TargetProfileTextValidator) def getEntitiesFromContext(self): sTR = TargetProfile.getInstance() @@ -85,6 +88,7 @@ class TargetProfileEntityEditor(EntityEditor): class ResistsEditorDlg(wx.Dialog): DAMAGE_TYPES = ("em", "thermal", "kinetic", "explosive") + ATTRIBUTES = ('maxVelocity', 'signatureRadius', 'radius') def __init__(self, parent): wx.Dialog.__init__( @@ -169,7 +173,7 @@ class ResistsEditorDlg(wx.Dialog): btn.Layout() setattr(self, name, btn) btn.Enable(True) - btn.SetToolTip("%s patterns %s clipboard" % (name, direction)) + btn.SetToolTip("%s profiles %s clipboard" % (name, direction)) footerSizer.Add(btn, 0, wx.ALIGN_CENTER_HORIZONTAL | wx.ALIGN_RIGHT) btn.Bind(wx.EVT_BUTTON, getattr(self, "{}Patterns".format(name.lower()))) @@ -274,7 +278,7 @@ class ResistsEditorDlg(wx.Dialog): sTR = TargetProfile.getInstance() try: sTR.importPatterns(text) - self.stNotice.SetLabel("Patterns successfully imported from clipboard") + self.stNotice.SetLabel("Profiles successfully imported from clipboard") except ImportError as e: pyfalog.error(e) self.stNotice.SetLabel(str(e)) @@ -292,7 +296,7 @@ class ResistsEditorDlg(wx.Dialog): """Event fired when export to clipboard button is clicked""" sTR = TargetProfile.getInstance() toClipboard(sTR.exportPatterns()) - self.stNotice.SetLabel("Patterns exported to clipboard") + self.stNotice.SetLabel("Profiles exported to clipboard") def kbEvent(self, event): keycode = event.GetKeyCode() diff --git a/service/targetProfile.py b/service/targetProfile.py index 445820d0a..41d3c4a98 100644 --- a/service/targetProfile.py +++ b/service/targetProfile.py @@ -47,7 +47,7 @@ class TargetProfile: @staticmethod def newPattern(name): - p = es_TargetProfile(0.0, 0.0, 0.0, 0.0) + p = es_TargetProfile() p.name = name db.save(p) return p