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

Add context menu support to graph window

Browse Source
This commit is contained in:
DarkPhoenix
2019-07-06 02:30:06 +03:00
parent 389b5d57aa
commit 5d1d2b87df
2 changed files with 25 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
gui/graphFrame/panel.py
View File

@@ -24,8 +24,8 @@ from collections import namedtuple
import wx import wx
from gui.bitmap_loader import BitmapLoader from gui.bitmap_loader import BitmapLoader
from gui.contextMenu import ContextMenu
from service.fit import Fit from service.fit import Fit
from service.settings import GraphSettings
from .input import ConstantBox, RangeBox from .input import ConstantBox, RangeBox
from .lists import FitList, TargetList from .lists import FitList, TargetList
from .vector import VectorPicker from .vector import VectorPicker
@@ -92,6 +92,19 @@ class GraphControlPanel(wx.Panel):
graphOptsSizer.Add(self.tgtVectorSizer, 0, wx.EXPAND | wx.LEFT, 10) graphOptsSizer.Add(self.tgtVectorSizer, 0, wx.EXPAND | wx.LEFT, 10)
optsSizer.Add(graphOptsSizer, 1, wx.EXPAND | wx.ALL, 0) optsSizer.Add(graphOptsSizer, 1, wx.EXPAND | wx.ALL, 0)
contextSizer = wx.BoxSizer(wx.VERTICAL)
savedFont = self.GetFont()
contextIconFont = wx.SystemSettings.GetFont(wx.SYS_DEFAULT_GUI_FONT)
contextIconFont.SetPointSize(8)
self.SetFont(contextIconFont)
self.contextIcon = wx.StaticText(self, wx.ID_ANY, '\u2630', size=wx.Size((10, -1)))
self.contextIcon.Bind(wx.EVT_CONTEXT_MENU, self.contextMenuHandler)
self.contextIcon.Bind(wx.EVT_LEFT_UP, self.contextMenuHandler)
self.SetFont(savedFont)
contextSizer.Add(self.contextIcon, 0, wx.EXPAND | wx.ALL, 0)
optsSizer.Add(contextSizer, 0, wx.EXPAND | wx.ALL, 0)
mainSizer.Add(optsSizer, 0, wx.EXPAND | wx.ALL, 10) mainSizer.Add(optsSizer, 0, wx.EXPAND | wx.ALL, 10)
srcTgtSizer = wx.BoxSizer(wx.HORIZONTAL) srcTgtSizer = wx.BoxSizer(wx.HORIZONTAL)
@@ -146,6 +159,9 @@ class GraphControlPanel(wx.Panel):
# Inputs # Inputs
self._updateInputs(storeInputs=False) self._updateInputs(storeInputs=False)
# Context icon
self.contextIcon.Show(ContextMenu.hasMenu(None, None, (view.internalName,)))
if layout: if layout:
self.graphFrame.Layout() self.graphFrame.Layout()
self.graphFrame.UpdateWindowSize() self.graphFrame.UpdateWindowSize()
@@ -324,3 +340,10 @@ class GraphControlPanel(wx.Panel):
def _setVectorDefaults(self): def _setVectorDefaults(self):
self.srcVector.SetValue(length=0, angle=90) self.srcVector.SetValue(length=0, angle=90)
self.tgtVector.SetValue(length=1, angle=90) self.tgtVector.SetValue(length=1, angle=90)
def contextMenuHandler(self, event):
viewName = self.graphFrame.getView().internalName
menu = ContextMenu.getMenu(None, None, (viewName,))
if menu is not None:
self.PopupMenu(menu)
event.Skip()

2
gui/toggle_panel.py
View File

@@ -15,7 +15,7 @@
import wx import wx
class TogglePanel (wx.Panel): class TogglePanel(wx.Panel):
def __init__(self, parent, force_layout=False, *args, **kargs): def __init__(self, parent, force_layout=False, *args, **kargs):
super().__init__(parent, *args, **kargs) super().__init__(parent, *args, **kargs)