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

Add menu which allows to add target profiles to graph

Browse Source
This commit is contained in:
DarkPhoenix
2019-07-31 16:23:11 +03:00
parent 1f5fe47580
commit d571191ec2
5 changed files with 65 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
gui/builtinContextMenus/__init__.py
View File

@@ -4,6 +4,7 @@ from gui.builtinContextMenus import fitOpenNewTab
from gui.builtinContextMenus import envEffectAdd
from gui.builtinContextMenus import fitAddCurrentlyOpen
from gui.builtinContextMenus import commandFitAdd
from gui.builtinContextMenus.targetProfile import adder
# Often-used item manipulations
from gui.builtinContextMenus import shipModeChange
from gui.builtinContextMenus import moduleAmmoChange

74
gui/builtinContextMenus/targetProfile/adder.py
View File

@@ -1,13 +1,12 @@
from collections import OrderedDict
from itertools import chain
# noinspection PyPackageRequirements
import wx
import gui.globalEvents as GE
import gui.mainFrame
from gui.bitmap_loader import BitmapLoader
from eos.saveddata.targetProfile import TargetProfile
from gui.contextMenu import ContextMenuUnconditional
from service.fit import Fit
from service.targetProfile import TargetProfile as svc_TargetProfile
@@ -21,88 +20,69 @@ class TargetProfileAdder(ContextMenuUnconditional):
return False
sTR = svc_TargetProfile.getInstance()
self.patterns = sTR.getTargetProfileList()
self.patterns.sort(key=lambda p: (p.name in ['None'], p.name))
self.callingWindow = callingWindow
self.profiles = sTR.getTargetProfileList()
self.profiles.sort(key=lambda p: (p.name in ['None'], p.name))
return len(self.patterns) > 0
return len(self.profiles) > 0
def getText(self, callingWindow, itmContext):
return 'Add Target Profile'
def handleResistSwitch(self, event):
pattern = self.patternIds.get(event.Id, False)
if pattern is False:
def handleProfileAdd(self, event):
profile = self.profileIds.get(event.Id, False)
if profile is False:
event.Skip()
return
self.callingWindow.addProfile(profile)
sFit = Fit.getInstance()
fitID = self.mainFrame.getActiveFit()
sFit.setTargetProfile(fitID, pattern)
wx.PostEvent(self.mainFrame, GE.FitChanged(fitIDs=(fitID,)))
def addPattern(self, rootMenu, pattern):
def addProfile(self, rootMenu, profile):
id = ContextMenuUnconditional.nextID()
name = getattr(pattern, '_name', pattern.name) if pattern is not None else 'No Profile'
name = getattr(profile, '_name', profile.name)
self.patternIds[id] = pattern
self.profileIds[id] = profile
item = wx.MenuItem(rootMenu, id, name)
rootMenu.Bind(wx.EVT_MENU, self.handleResistSwitch, item)
rootMenu.Bind(wx.EVT_MENU, self.handleProfileAdd, item)
# set pattern attr to menu item
item.pattern = pattern
# determine active pattern
sFit = Fit.getInstance()
fitID = self.mainFrame.getActiveFit()
f = sFit.getFit(fitID)
tr = f.targetProfile
if tr == pattern:
bitmap = BitmapLoader.getBitmap('state_active_small', 'gui')
item.SetBitmap(bitmap)
return item
def getSubMenu(self, callingWindow, context, rootMenu, i, pitem):
msw = True if 'wxMSW' in wx.PlatformInfo else False
self.patternIds = {}
self.profileIds = {}
self.subMenus = OrderedDict()
self.singles = []
sub = wx.Menu()
for pattern in self.patterns:
start, end = pattern.name.find('['), pattern.name.find(']')
for profile in chain([TargetProfile.getIdeal()], self.profiles):
start, end = profile.name.find('['), profile.name.find(']')
if start is not -1 and end is not -1:
currBase = pattern.name[start + 1:end]
currBase = profile.name[start + 1:end]
# set helper attr
setattr(pattern, '_name', pattern.name[end + 1:].strip())
setattr(profile, '_name', profile.name[end + 1:].strip())
if currBase not in self.subMenus:
self.subMenus[currBase] = []
self.subMenus[currBase].append(pattern)
self.subMenus[currBase].append(profile)
else:
self.singles.append(pattern)
sub.Append(self.addPattern(rootMenu if msw else sub, None)) # Add reset
sub.AppendSeparator()
self.singles.append(profile)
# Single items, no parent
for pattern in self.singles:
sub.Append(self.addPattern(rootMenu if msw else sub, pattern))
msw = 'wxMSW' in wx.PlatformInfo
for profile in self.singles:
sub.Append(self.addProfile(rootMenu if msw else sub, profile))
# Items that have a parent
for menuName, patterns in list(self.subMenus.items()):
for menuName, profiles in list(self.subMenus.items()):
# Create parent item for root menu that is simply name of parent
item = wx.MenuItem(rootMenu, ContextMenuUnconditional.nextID(), menuName)
# Create menu for child items
grandSub = wx.Menu()
# sub.Bind(wx.EVT_MENU, self.handleResistSwitch)
# Apply child menu to parent item
item.SetSubMenu(grandSub)
# Append child items to child menu
for pattern in patterns:
grandSub.Append(self.addPattern(rootMenu if msw else grandSub, pattern))
for profile in profiles:
grandSub.Append(self.addProfile(rootMenu if msw else grandSub, profile))
sub.Append(item) # finally, append parent item to root menu
return sub

0
gui/builtinContextMenus/targetProfile/common.py
View File

54
gui/builtinContextMenus/targetProfile/switcher.py
View File

@@ -20,92 +20,88 @@ class TargetProfileSwitcher(ContextMenuUnconditional):
return False
sTR = svc_TargetProfile.getInstance()
self.patterns = sTR.getTargetProfileList()
self.patterns.sort(key=lambda p: (p.name in ['None'], p.name))
self.profiles = sTR.getTargetProfileList()
self.profiles.sort(key=lambda p: (p.name in ['None'], p.name))
return len(self.patterns) > 0
return len(self.profiles) > 0
def getText(self, callingWindow, itmContext):
# We take into consideration just target resists, so call menu item accordingly
return 'Target Resists'
def handleResistSwitch(self, event):
pattern = self.patternIds.get(event.Id, False)
if pattern is False:
profile = self.profileIds.get(event.Id, False)
if profile is False:
event.Skip()
return
sFit = Fit.getInstance()
fitID = self.mainFrame.getActiveFit()
sFit.setTargetProfile(fitID, pattern)
sFit.setTargetProfile(fitID, profile)
wx.PostEvent(self.mainFrame, GE.FitChanged(fitIDs=(fitID,)))
def addPattern(self, rootMenu, pattern):
def addProfile(self, rootMenu, profile):
id = ContextMenuUnconditional.nextID()
name = getattr(pattern, '_name', pattern.name) if pattern is not None else 'No Profile'
name = getattr(profile, '_name', profile.name) if profile is not None else 'No Profile'
self.patternIds[id] = pattern
self.profileIds[id] = profile
item = wx.MenuItem(rootMenu, id, name, kind=wx.ITEM_CHECK)
rootMenu.Bind(wx.EVT_MENU, self.handleResistSwitch, item)
# set pattern attr to menu item
item.pattern = pattern
# determine active pattern
# determine active profile
sFit = Fit.getInstance()
fitID = self.mainFrame.getActiveFit()
f = sFit.getFit(fitID)
tr = f.targetProfile
checked = tr == pattern
checked = tr == profile
return item, checked
def getSubMenu(self, callingWindow, context, rootMenu, i, pitem):
msw = True if 'wxMSW' in wx.PlatformInfo else False
self.patternIds = {}
self.profileIds = {}
self.subMenus = OrderedDict()
self.singles = []
sub = wx.Menu()
for pattern in self.patterns:
start, end = pattern.name.find('['), pattern.name.find(']')
for profile in self.profiles:
start, end = profile.name.find('['), profile.name.find(']')
if start is not -1 and end is not -1:
currBase = pattern.name[start + 1:end]
currBase = profile.name[start + 1:end]
# set helper attr
setattr(pattern, '_name', pattern.name[end + 1:].strip())
setattr(profile, '_name', profile.name[end + 1:].strip())
if currBase not in self.subMenus:
self.subMenus[currBase] = []
self.subMenus[currBase].append(pattern)
self.subMenus[currBase].append(profile)
else:
self.singles.append(pattern)
self.singles.append(profile)
# Add reset
mitem, checked = self.addPattern(rootMenu if msw else sub, None)
msw = 'wxMSW' in wx.PlatformInfo
mitem, checked = self.addProfile(rootMenu if msw else sub, None)
sub.Append(mitem)
mitem.Check(checked)
sub.AppendSeparator()
# Single items, no parent
for pattern in self.singles:
mitem, checked = self.addPattern(rootMenu if msw else sub, pattern)
for profile in self.singles:
mitem, checked = self.addProfile(rootMenu if msw else sub, profile)
sub.Append(mitem)
mitem.Check(checked)
# Items that have a parent
for menuName, patterns in list(self.subMenus.items()):
for menuName, profiles in list(self.subMenus.items()):
# Create parent item for root menu that is simply name of parent
item = wx.MenuItem(rootMenu, ContextMenuUnconditional.nextID(), menuName)
# Create menu for child items
grandSub = wx.Menu()
# sub.Bind(wx.EVT_MENU, self.handleResistSwitch)
# Apply child menu to parent item
item.SetSubMenu(grandSub)
# Append child items to child menu
for pattern in patterns:
mitem, checked = self.addPattern(rootMenu if msw else grandSub, pattern)
for profile in profiles:
mitem, checked = self.addProfile(rootMenu if msw else grandSub, profile)
grandSub.Append(mitem)
mitem.Check(checked)
sub.Append(item) # finally, append parent item to root menu

14
gui/graphFrame/lists.py
View File

@@ -226,7 +226,7 @@ class FitList(BaseList):
@property
def defaultTTText(self):
return 'Drag a fit into this list to graph it'
return 'Drag a fit into this list to graph it'
class TargetList(BaseList):
@@ -294,4 +294,14 @@ class TargetList(BaseList):
@property
def defaultTTText(self):
return 'Drag a fit into this list to have your fits graphed against it'
return 'Drag a fit into this list to have your fits graphed against it'
# Context menu handlers
def addProfile(self, profile):
if profile is None:
return
if profile in self.profiles:
return
self.profiles.append(profile)
self.updateView()
self.graphFrame.draw()