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

Move browser out of context menu file and do not list fits already existing in window

Browse Source
This commit is contained in:
DarkPhoenix
2019-08-01 11:23:26 +03:00
parent 154122388e
commit 61836dbb83
4 changed files with 112 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

87
gui/builtinContextMenus/fitAddBrowse.py
View File

@@ -1,11 +1,8 @@
import re
# noinspection PyPackageRequirements # noinspection PyPackageRequirements
import wx import wx
import gui.mainFrame import gui.mainFrame
from gui.contextMenu import ContextMenuUnconditional from gui.contextMenu import ContextMenuUnconditional
from service.fit import Fit
class AddBrowsedFits(ContextMenuUnconditional): class AddBrowsedFits(ContextMenuUnconditional):
@@ -22,94 +19,16 @@ class AddBrowsedFits(ContextMenuUnconditional):
return 'Add Fit...' return 'Add Fit...'
def activate(self, callingWindow, fullContext, i): def activate(self, callingWindow, fullContext, i):
from gui.builtinViews.fitBrowserLite import FitBrowserLiteDialog
titles = { titles = {
'projected': 'Add Projected Fits', 'projected': 'Add Projected Fits',
'commandView': 'Add Command Fits', 'commandView': 'Add Command Fits',
'graphFitList': 'Add Fits to Graph', 'graphFitList': 'Add Fits to Graph',
'graphTgtList': 'Add Targets to Graph'} 'graphTgtList': 'Add Targets to Graph'}
dlg = FitBrowserLiteDialog(self.mainFrame, title=titles[fullContext[0]]) excludedFitIDs = callingWindow.getExistingFitIDs()
dlg = FitBrowserLiteDialog(self.mainFrame, title=titles[fullContext[0]], excludedFitIDs=excludedFitIDs)
if dlg.ShowModal() == wx.ID_OK: if dlg.ShowModal() == wx.ID_OK:
pass pass
AddBrowsedFits.register() AddBrowsedFits.register()
class FitBrowserLiteDialog(wx.Dialog):
def __init__(self, parent, title='Add Fits'):
wx.Dialog.__init__(self, parent, title=title, style=wx.DEFAULT_DIALOG_STYLE)
from gui.builtinViews.fitListLite import FitListView
self.sFit = Fit.getInstance()
self.allFits = sorted(self.sFit.getAllFitsLite(), key=lambda f: (f.shipName, f.name))
self.SetMinSize((400, 400))
mainSizer = wx.BoxSizer(wx.VERTICAL)
searchSizer = wx.BoxSizer(wx.HORIZONTAL)
self.searchBox = wx.TextCtrl(self, wx.ID_ANY, style=wx.TE_PROCESS_ENTER)
searchSizer.Add(self.searchBox, 1, wx.EXPAND | wx.ALL, 5)
mainSizer.Add(searchSizer, 0, wx.EXPAND | wx.ALL, 0)
listSizer = wx.BoxSizer(wx.HORIZONTAL)
self.fromList = FitListView(self)
listSizer.Add(self.fromList, 1, wx.EXPAND | wx.ALL, 5)
listButtonSizer = wx.BoxSizer(wx.VERTICAL)
listButtonSizer.AddStretchSpacer()
addButton = wx.Button(self, wx.ID_ANY, '>>', wx.DefaultPosition, wx.DefaultSize, 0)
listButtonSizer.Add(addButton, 0, wx.EXPAND | wx.ALL, 5)
removeButton = wx.Button(self, wx.ID_ANY, '<<', wx.DefaultPosition, wx.DefaultSize, 0)
listButtonSizer.Add(removeButton, 0, wx.EXPAND | wx.ALL, 5)
listButtonSizer.AddStretchSpacer()
listSizer.Add(listButtonSizer, 0, wx.EXPAND | wx.ALL, 5)
toList = FitListView(self)
listSizer.Add(toList, 1, wx.EXPAND | wx.ALL, 5)
mainSizer.Add(listSizer, 1, wx.EXPAND | wx.ALL, 0)
buttonSizer = self.CreateButtonSizer(wx.OK | wx.CANCEL)
if buttonSizer:
mainSizer.Add(buttonSizer, 0, wx.EXPAND | wx.ALL, 5)
self.resetContents()
self.inputTimer = wx.Timer(self)
self.Bind(wx.EVT_TIMER, self.OnInputTimer, self.inputTimer)
self.searchBox.Bind(event=wx.EVT_TEXT, handler=self.OnSearchChanged)
self.SetSizer(mainSizer)
self.Layout()
self.SetSize(self.GetBestSize())
self.CenterOnParent()
self.searchBox.SetFocus()
def OnSearchChanged(self, event):
event.Skip()
self.inputTimer.Stop()
self.inputTimer.Start(self.sFit.serviceFittingOptions['marketSearchDelay'], True)
def OnInputTimer(self, event):
event.Skip()
searchPattern = self.searchBox.GetValue().strip()
if not searchPattern:
self.resetContents()
else:
def isMatch(fit, searchTokens):
for token in searchTokens:
if token not in fit.name.lower() and token not in fit.shipName.lower():
return False
return True
matches = []
searchTokens = [t.lower() for t in re.split('\s+', searchPattern)]
for fit in self.allFits:
if isMatch(fit, searchTokens):
matches.append(fit)
self.fromList.updateData(matches)
def resetContents(self):
self.fromList.updateData(self.allFits)

106
gui/builtinViews/fitBrowserLite.py Normal file
View File

@@ -0,0 +1,106 @@
import re
# noinspection PyPackageRequirements
import wx
import gui.display as d
from service.fit import Fit
class FitBrowserLiteDialog(wx.Dialog):
def __init__(self, parent, title='Add Fits', excludedFitIDs=()):
wx.Dialog.__init__(self, parent, title=title, style=wx.DEFAULT_DIALOG_STYLE)
self.sFit = Fit.getInstance()
self.allFits = sorted(
(f for f in self.sFit.getAllFitsLite() if f.ID not in excludedFitIDs),
key=lambda f: (f.shipName, f.name))
self.SetMinSize((400, 400))
mainSizer = wx.BoxSizer(wx.VERTICAL)
searchSizer = wx.BoxSizer(wx.HORIZONTAL)
self.searchBox = wx.TextCtrl(self, wx.ID_ANY, style=wx.TE_PROCESS_ENTER)
searchSizer.Add(self.searchBox, 1, wx.EXPAND | wx.ALL, 5)
mainSizer.Add(searchSizer, 0, wx.EXPAND | wx.ALL, 0)
listSizer = wx.BoxSizer(wx.HORIZONTAL)
self.fromList = FitListView(self)
listSizer.Add(self.fromList, 1, wx.EXPAND | wx.ALL, 5)
listButtonSizer = wx.BoxSizer(wx.VERTICAL)
listButtonSizer.AddStretchSpacer()
addButton = wx.Button(self, wx.ID_ANY, '>>', wx.DefaultPosition, wx.DefaultSize, 0)
listButtonSizer.Add(addButton, 0, wx.EXPAND | wx.ALL, 5)
removeButton = wx.Button(self, wx.ID_ANY, '<<', wx.DefaultPosition, wx.DefaultSize, 0)
listButtonSizer.Add(removeButton, 0, wx.EXPAND | wx.ALL, 5)
listButtonSizer.AddStretchSpacer()
listSizer.Add(listButtonSizer, 0, wx.EXPAND | wx.ALL, 5)
toList = FitListView(self)
listSizer.Add(toList, 1, wx.EXPAND | wx.ALL, 5)
mainSizer.Add(listSizer, 1, wx.EXPAND | wx.ALL, 0)
buttonSizer = self.CreateButtonSizer(wx.OK | wx.CANCEL)
if buttonSizer:
mainSizer.Add(buttonSizer, 0, wx.EXPAND | wx.ALL, 5)
self.resetContents()
self.inputTimer = wx.Timer(self)
self.Bind(wx.EVT_TIMER, self.OnInputTimer, self.inputTimer)
self.searchBox.Bind(event=wx.EVT_TEXT, handler=self.OnSearchChanged)
self.SetSizer(mainSizer)
self.Layout()
self.SetSize(self.GetBestSize())
self.CenterOnParent()
self.searchBox.SetFocus()
def OnSearchChanged(self, event):
event.Skip()
self.inputTimer.Stop()
self.inputTimer.Start(self.sFit.serviceFittingOptions['marketSearchDelay'], True)
def OnInputTimer(self, event):
event.Skip()
searchPattern = self.searchBox.GetValue().strip()
if not searchPattern:
self.resetContents()
else:
def isMatch(fit, searchTokens):
for token in searchTokens:
if token not in fit.name.lower() and token not in fit.shipName.lower():
return False
return True
matches = []
searchTokens = [t.lower() for t in re.split('\s+', searchPattern)]
for fit in self.allFits:
if isMatch(fit, searchTokens):
matches.append(fit)
self.fromList.updateData(matches)
def resetContents(self):
self.fromList.updateData(self.allFits)
class FitListView(d.Display):
DEFAULT_COLS = ['Base Name']
def __init__(self, parent):
super().__init__(parent, style=wx.BORDER_NONE)
self.fits = []
def updateView(self):
self.update(self.fits)
def refreshView(self):
self.refresh(self.fits)
def updateData(self, fits):
self.fits = fits
self.updateView()

23
gui/builtinViews/fitListLite.py
View File

@@ -1,23 +0,0 @@
# noinspection PyPackageRequirements
import wx
import gui.display as d
class FitListView(d.Display):
DEFAULT_COLS = ['Base Name']
def __init__(self, parent):
super().__init__(parent, style=wx.BORDER_NONE)
self.fits = []
def updateView(self):
self.update(self.fits)
def refreshView(self):
self.refresh(self.fits)
def updateData(self, fits):
self.fits = fits
self.updateView()

3
gui/graphFrame/lists.py
View File

@@ -166,6 +166,9 @@ class BaseList(gui.display.Display):
self.updateView() self.updateView()
self.graphFrame.draw() self.graphFrame.draw()
def getExistingFitIDs(self):
return [f.ID for f in self.fits]
class FitList(BaseList): class FitList(BaseList):
def __init__(self, graphFrame, parent): def __init__(self, graphFrame, parent):