unique name for axtools title bar (#107)

* unique name for axtools title bar * reduce line length * use self.action_name instead of action_name
ros · Aug 5, 2018 · f1f6f9b · f1f6f9b
1 parent 058f12b
commit f1f6f9b
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/tools/axclient.py b/tools/axclient.py
@@ -57,9 +57,11 @@
 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)
+        self.client = actionlib.SimpleActionClient(
+            self.action_name, self.action_type.action)
         self.condition = threading.Condition()
         self.goal_msg = None
         self.execute_type = None
@@ -156,7 +158,10 @@ 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)
 

diff --git a/tools/axserver.py b/tools/axserver.py
@@ -56,9 +56,14 @@
 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)
+        self.server = actionlib.SimpleActionServer(
+            self.action_name,
+            self.action_type.action,
+            self.execute
+        )
         self.condition = threading.Condition()
         self.feedback_msg = None
         self.result_msg = None
@@ -179,7 +184,10 @@ 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)