Skip to content

Commit

Permalink
Merge pull request #1212 from CPFL/feature/add_gear_p
Browse files Browse the repository at this point in the history
add gear p
  • Loading branch information
yk-fujii committed Apr 12, 2018
2 parents 65b0b15 + 94a058e commit 3694c87
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 2 deletions.
4 changes: 4 additions & 0 deletions ros/src/util/packages/runtime_manager/scripts/rtmgr.py
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@ def __init__(self, *args, **kwds):
self.button_statchk_r = wx.ToggleButton(self.tab_interface, wx.ID_ANY, _("R"))
self.button_statchk_b = wx.ToggleButton(self.tab_interface, wx.ID_ANY, _("B"))
self.button_statchk_n = wx.ToggleButton(self.tab_interface, wx.ID_ANY, _("N"))
self.button_statchk_p = wx.ToggleButton(self.tab_interface, wx.ID_ANY, _("P"))
self.panel_interface_cc = wx.Panel(self.tab_interface, wx.ID_ANY)
self.button_rosbag_interface = wx.ToggleButton(self.tab_interface, wx.ID_ANY, _("ROSBAG"))
self.button_rviz_interface = wx.ToggleButton(self.tab_interface, wx.ID_ANY, _("RViz"))
Expand Down Expand Up @@ -257,6 +258,7 @@ def __init__(self, *args, **kwds):
self.Bind(wx.EVT_TOGGLEBUTTON, self.OnGear, self.button_statchk_r)
self.Bind(wx.EVT_TOGGLEBUTTON, self.OnGear, self.button_statchk_b)
self.Bind(wx.EVT_TOGGLEBUTTON, self.OnGear, self.button_statchk_n)
self.Bind(wx.EVT_TOGGLEBUTTON, self.OnGear, self.button_statchk_p)
self.Bind(wx.EVT_TOGGLEBUTTON, self.OnRosbagRecord, self.button_rosbag_interface)
self.Bind(wx.EVT_TOGGLEBUTTON, self.OnLaunchKill, self.button_rviz_interface)
self.Bind(wx.EVT_TOGGLEBUTTON, self.OnLaunchKill, self.button_rqt_interface)
Expand Down Expand Up @@ -344,6 +346,7 @@ def __set_properties(self):
self.button_statchk_r.SetMinSize((32, 29))
self.button_statchk_b.SetMinSize((32, 29))
self.button_statchk_n.SetMinSize((32, 29))
self.button_statchk_p.SetMinSize((32, 29))
self.button_stop_rosbag_play.Enable(False)
self.button_pause_rosbag_play.Enable(False)
self.label_rosbag_play_pos.SetMinSize((32, 17))
Expand Down Expand Up @@ -640,6 +643,7 @@ def __do_layout(self):
sizer_66.Add(self.button_statchk_r, 0, wx.ALL | wx.EXPAND, 4)
sizer_66.Add(self.button_statchk_b, 0, wx.ALL | wx.EXPAND, 4)
sizer_66.Add(self.button_statchk_n, 0, wx.ALL | wx.EXPAND, 4)
sizer_66.Add(self.button_statchk_p, 0, wx.ALL | wx.EXPAND, 4)
sizer_77.Add(sizer_66, 0, wx.ALL | wx.EXPAND, 4)
sizer_77.Add(self.panel_interface_cc, 1, wx.ALL, 4)
sizer_26.Add(sizer_77, 0, wx.EXPAND, 0)
Expand Down
12 changes: 12 additions & 0 deletions ros/src/util/packages/runtime_manager/scripts/rtmgr.wxg
Original file line number Diff line number Diff line change
Expand Up @@ -1496,6 +1496,18 @@
<label>N</label>
</object>
</object>
<object class="sizeritem">
<option>0</option>
<border>4</border>
<flag>wxALL|wxEXPAND</flag>
<object class="wxToggleButton" name="button_statchk_p" base="EditToggleButton">
<events>
<handler event="EVT_TOGGLEBUTTON">OnGear</handler>
</events>
<size>32, 29</size>
<label>P</label>
</object>
</object>
</object>
</object>
<object class="sizeritem">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -385,7 +385,7 @@ def hook1G(args):
#
tab = self.tab_states
self.all_tabs.append(tab)

self.state_dic = self.load_yaml('state.yaml')
self.mainstate_dic = self.state_dic["mainstate"]
self.substate_dic = self.state_dic["substate"]
Expand Down Expand Up @@ -746,7 +746,8 @@ def OnGear(self, event):
grp = { self.button_statchk_d : 1,
self.button_statchk_r : 2,
self.button_statchk_b : 3,
self.button_statchk_n : 4 }
self.button_statchk_n : 4,
self.button_statchk_p : 5 }
self.radio_action(event, grp.keys())
v = grp.get(event.GetEventObject())
if v is not None:
Expand Down

0 comments on commit 3694c87

Please sign in to comment.