Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

unique name for axtools title bar #107

Merged
merged 3 commits into from
Aug 5, 2018
Merged

unique name for axtools title bar #107

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0dd74b8
unique name for axtools title bar
fmessmer Jun 8, 2018
1ca2b67
reduce line length
mikaelarguedas Aug 4, 2018
7399b55
use self.action_name instead of action_name
mikaelarguedas Aug 4, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion tools/axclient.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@
class AXClientApp(wx.App):
def __init__(self, action_type, action_name):
self.action_type = action_type
self.action_name = action_name
wx.App.__init__(self)

self.client = actionlib.SimpleActionClient(action_name, self.action_type.action)
Expand Down Expand Up @@ -156,7 +157,7 @@ def OnQuit(self):

def OnInit(self):

self.frame = wx.Frame(None, -1, self.action_type.name + ' GUI Client')
self.frame = wx.Frame(None, -1, self.action_name + ' - ' + self.action_type.name + ' - GUI Client')

self.sz = wx.BoxSizer(wx.VERTICAL)

Expand Down
3 changes: 2 additions & 1 deletion tools/axserver.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@
class AXServerApp(wx.App):
def __init__(self, action_type, action_name):
self.action_type = action_type
self.action_name = action_name
wx.App.__init__(self)

self.server = actionlib.SimpleActionServer(action_name, self.action_type.action, self.execute)
Expand Down Expand Up @@ -179,7 +180,7 @@ def on_preempt(self, event):

def OnInit(self):

self.frame = wx.Frame(None, -1, self.action_type.name + ' Standin')
self.frame = wx.Frame(None, -1, self.action_name + ' - ' + self.action_type.name + ' - Standin')

self.sz = wx.BoxSizer(wx.VERTICAL)

Expand Down