Menu
▾
▴
[Personalrobots-commit] SF.net SVN: personalrobots:[4418] pkg/trunk
|
From: <jfa...@us...> - 2008-09-18 00:59:21
|
Revision: 4418
http://personalrobots.svn.sourceforge.net/personalrobots/?rev=4418&view=rev
Author: jfaustwg
Date: 2008-09-18 00:59:31 +0000 (Thu, 18 Sep 2008)
Log Message:
-----------
Change the camera panel to take a name instead of the 3 subscription topics
Also part of this change is updating the camera panel (mostly) to the coding standard
Modified Paths:
--------------
pkg/trunk/demos/2dnav-gazebo/2dnav-gazebo-headless.xml
pkg/trunk/visualization/wx_camera_panel/camera_panels.fbp
pkg/trunk/visualization/wx_camera_panel/scripts/standalone_camera.py
pkg/trunk/visualization/wx_camera_panel/src/test/test.cpp
pkg/trunk/visualization/wx_camera_panel/src/wx_camera_panel/CameraPanel.cpp
pkg/trunk/visualization/wx_camera_panel/src/wx_camera_panel/CameraPanel.h
pkg/trunk/visualization/wx_camera_panel/src/wx_camera_panel/CameraPanelsGenerated.cpp
pkg/trunk/visualization/wx_camera_panel/src/wx_camera_panel/CameraPanelsGenerated.h
pkg/trunk/visualization/wx_camera_panel/src/wx_camera_panel/CameraSetupDialog.cpp
pkg/trunk/visualization/wx_camera_panel/src/wx_camera_panel/CameraSetupDialog.h
Modified: pkg/trunk/demos/2dnav-gazebo/2dnav-gazebo-headless.xml
===================================================================
--- pkg/trunk/demos/2dnav-gazebo/2dnav-gazebo-headless.xml 2008-09-18 00:34:43 UTC (rev 4417)
+++ pkg/trunk/demos/2dnav-gazebo/2dnav-gazebo-headless.xml 2008-09-18 00:59:31 UTC (rev 4418)
@@ -8,9 +8,9 @@
<node pkg="nav_view" type="nav_view" respawn="false" output="screen" />
<!-- for visualization -->
- <node pkg="wx_camera_panel" type="standalone_camera.py" args="-i axis_left/image -s axis_left/ptz_state -c axis_left/ptz_cmd" respawn="true" output="screen" />
- <node pkg="wx_camera_panel" type="standalone_camera.py" args="-i axis_right/image -s axis_right/ptz_state -c axis_right/ptz_cmd" respawn="true" output="screen" />
- <node pkg="ogre_visualizer" type="visualizer_test" respawn="true" output="screen" />
+ <node pkg="wx_camera_panel" type="standalone_camera.py" args="axis_left --ptz" respawn="true" output="screen" />
+ <node pkg="wx_camera_panel" type="standalone_camera.py" args="axis_right --ptz" respawn="true" output="screen" />
+ <node pkg="ogre_visualizer" type="standalone_visualizer.py" respawn="true" output="screen" />
<node pkg="laser_view" type="laser_view" args="scan:=tilt_scan" respawn="true" output="screen" />
<!--node pkg="wxpy_ros" type="ros_panel" respawn="false" output="screen" /--><!-- does not start correctly-->
Modified: pkg/trunk/visualization/wx_camera_panel/camera_panels.fbp
===================================================================
--- pkg/trunk/visualization/wx_camera_panel/camera_panels.fbp 2008-09-18 00:34:43 UTC (rev 4417)
+++ pkg/trunk/visualization/wx_camera_panel/camera_panels.fbp 2008-09-18 00:59:31 UTC (rev 4418)
@@ -90,7 +90,7 @@
<property name="label">Enable</property>
<property name="maximum_size"></property>
<property name="minimum_size"></property>
- <property name="name">m_Enable</property>
+ <property name="name">enable_</property>
<property name="permission">protected</property>
<property name="pos"></property>
<property name="size"></property>
@@ -101,7 +101,7 @@
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnChar"></event>
- <event name="OnCheckBox">OnEnable</event>
+ <event name="OnCheckBox">onEnable</event>
<event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></event>
<event name="OnKeyDown"></event>
@@ -151,7 +151,7 @@
<property name="label">Setup</property>
<property name="maximum_size"></property>
<property name="minimum_size"></property>
- <property name="name">m_Setup</property>
+ <property name="name">setup_</property>
<property name="permission">protected</property>
<property name="pos"></property>
<property name="size"></property>
@@ -161,7 +161,7 @@
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
- <event name="OnButtonClick">OnSetup</event>
+ <event name="OnButtonClick">onSetup</event>
<event name="OnChar"></event>
<event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></event>
@@ -217,7 +217,7 @@
<property name="id">wxID_ANY</property>
<property name="maximum_size"></property>
<property name="minimum_size"></property>
- <property name="name">m_ImagePanel</property>
+ <property name="name">image_panel_</property>
<property name="permission">protected</property>
<property name="pos"></property>
<property name="size"></property>
@@ -234,20 +234,20 @@
<event name="OnKillFocus"></event>
<event name="OnLeaveWindow"></event>
<event name="OnLeftDClick"></event>
- <event name="OnLeftDown">OnLeftMouseDown</event>
- <event name="OnLeftUp">OnLeftMouseUp</event>
+ <event name="OnLeftDown">onLeftMouseDown</event>
+ <event name="OnLeftUp">onLeftMouseUp</event>
<event name="OnMiddleDClick"></event>
- <event name="OnMiddleDown">OnMiddleMouseDown</event>
- <event name="OnMiddleUp">OnMiddleMouseUp</event>
- <event name="OnMotion">OnMouseMotion</event>
+ <event name="OnMiddleDown">onMiddleMouseDown</event>
+ <event name="OnMiddleUp">onMiddleMouseUp</event>
+ <event name="OnMotion">onMouseMotion</event>
<event name="OnMouseEvents"></event>
- <event name="OnMouseWheel">OnMouseWheel</event>
- <event name="OnPaint">OnImagePaint</event>
+ <event name="OnMouseWheel">onMouseWheel</event>
+ <event name="OnPaint">onImagePaint</event>
<event name="OnRightDClick"></event>
- <event name="OnRightDown">OnRightMouseDown</event>
- <event name="OnRightUp">OnRightMouseUp</event>
+ <event name="OnRightDown">onRightMouseDown</event>
+ <event name="OnRightUp">onRightMouseUp</event>
<event name="OnSetFocus"></event>
- <event name="OnSize">OnImageSize</event>
+ <event name="OnSize">onImageSize</event>
<event name="OnUpdateUI"></event>
</object>
</object>
@@ -269,7 +269,7 @@
<property name="minimum_size"></property>
<property name="name">CameraSetupDialogBase</property>
<property name="pos"></property>
- <property name="size">472,400</property>
+ <property name="size">472,333</property>
<property name="style">wxDEFAULT_DIALOG_STYLE</property>
<property name="subclass"></property>
<property name="title">Camera Setup</property>
@@ -318,7 +318,7 @@
<property name="proportion">0</property>
<object class="wxStaticBoxSizer" expanded="1">
<property name="id">wxID_ANY</property>
- <property name="label">Image</property>
+ <property name="label">Camera</property>
<property name="minimum_size"></property>
<property name="name">sbSizer4</property>
<property name="orient">wxVERTICAL</property>
@@ -345,7 +345,7 @@
<property name="font"></property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
- <property name="label">Subscription</property>
+ <property name="label">Name</property>
<property name="maximum_size"></property>
<property name="minimum_size"></property>
<property name="name">m_staticText711</property>
@@ -408,11 +408,11 @@
<property name="maximum_size"></property>
<property name="maxlength">0</property>
<property name="minimum_size"></property>
- <property name="name">m_ImageSubscriptionText</property>
+ <property name="name">camera_name_</property>
<property name="permission">protected</property>
<property name="pos"></property>
<property name="size"></property>
- <property name="style">wxTE_PROCESS_ENTER</property>
+ <property name="style"></property>
<property name="subclass"></property>
<property name="tooltip"></property>
<property name="value"></property>
@@ -448,58 +448,6 @@
<event name="OnUpdateUI"></event>
</object>
</object>
- <object class="sizeritem" expanded="1">
- <property name="border">5</property>
- <property name="flag">wxALL|wxALIGN_CENTER_VERTICAL</property>
- <property name="proportion">0</property>
- <object class="wxButton" expanded="1">
- <property name="bg"></property>
- <property name="context_help"></property>
- <property name="default">0</property>
- <property name="enabled">1</property>
- <property name="fg"></property>
- <property name="font"></property>
- <property name="hidden">0</property>
- <property name="id">wxID_ANY</property>
- <property name="label"> ... </property>
- <property name="maximum_size"></property>
- <property name="minimum_size"></property>
- <property name="name">m_ImageSubscriptionBrowse</property>
- <property name="permission">protected</property>
- <property name="pos"></property>
- <property name="size"></property>
- <property name="style">wxBU_EXACTFIT</property>
- <property name="subclass"></property>
- <property name="tooltip"></property>
- <property name="window_extra_style"></property>
- <property name="window_name"></property>
- <property name="window_style"></property>
- <event name="OnButtonClick">OnImageSubscriptionBrowse</event>
- <event name="OnChar"></event>
- <event name="OnEnterWindow"></event>
- <event name="OnEraseBackground"></event>
- <event name="OnKeyDown"></event>
- <event name="OnKeyUp"></event>
- <event name="OnKillFocus"></event>
- <event name="OnLeaveWindow"></event>
- <event name="OnLeftDClick"></event>
- <event name="OnLeftDown"></event>
- <event name="OnLeftUp"></event>
- <event name="OnMiddleDClick"></event>
- <event name="OnMiddleDown"></event>
- <event name="OnMiddleUp"></event>
- <event name="OnMotion"></event>
- <event name="OnMouseEvents"></event>
- <event name="OnMouseWheel"></event>
- <event name="OnPaint"></event>
- <event name="OnRightDClick"></event>
- <event name="OnRightDown"></event>
- <event name="OnRightUp"></event>
- <event name="OnSetFocus"></event>
- <event name="OnSize"></event>
- <event name="OnUpdateUI"></event>
- </object>
- </object>
</object>
</object>
</object>
@@ -534,7 +482,7 @@
<property name="label">Enable</property>
<property name="maximum_size"></property>
<property name="minimum_size"></property>
- <property name="name">m_EnablePTZCheck</property>
+ <property name="name">enable_ptz_</property>
<property name="permission">protected</property>
<property name="pos"></property>
<property name="size"></property>
@@ -545,7 +493,7 @@
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnChar"></event>
- <event name="OnCheckBox">OnPTZEnableChecked</event>
+ <event name="OnCheckBox"></event>
<event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></event>
<event name="OnKeyDown"></event>
@@ -574,7 +522,7 @@
<property name="border">5</property>
<property name="flag">wxEXPAND</property>
<property name="proportion">1</property>
- <object class="wxBoxSizer" expanded="0">
+ <object class="wxBoxSizer" expanded="1">
<property name="minimum_size"></property>
<property name="name">bSizer12</property>
<property name="orient">wxHORIZONTAL</property>
@@ -698,7 +646,7 @@
<property name="maximum_size"></property>
<property name="min">-9999999</property>
<property name="minimum_size"></property>
- <property name="name">m_PanMinSpin</property>
+ <property name="name">pan_min_</property>
<property name="permission">protected</property>
<property name="pos"></property>
<property name="size"></property>
@@ -804,7 +752,7 @@
<property name="maximum_size"></property>
<property name="min">-9999999</property>
<property name="minimum_size"></property>
- <property name="name">m_PanMaxSpin</property>
+ <property name="name">pan_max_</property>
<property name="permission">protected</property>
<property name="pos"></property>
<property name="size"></property>
@@ -848,7 +796,7 @@
<property name="border">5</property>
<property name="flag">wxEXPAND</property>
<property name="proportion">1</property>
- <object class="wxBoxSizer" expanded="0">
+ <object class="wxBoxSizer" expanded="1">
<property name="minimum_size"></property>
<property name="name">bSizer1211</property>
<property name="orient">wxHORIZONTAL</property>
@@ -972,7 +920,7 @@
<property name="maximum_size"></property>
<property name="min">-9999999</property>
<property name="minimum_size"></property>
- <property name="name">m_TiltMinSpin</property>
+ <property name="name">tilt_min_</property>
<property name="permission">protected</property>
<property name="pos"></property>
<property name="size"></property>
@@ -1078,7 +1026,7 @@
<property name="maximum_size"></property>
<property name="min">-9999999</property>
<property name="minimum_size"></property>
- <property name="name">m_TiltMaxSpin</property>
+ <property name="name">tilt_max_</property>
<property name="permission">protected</property>
<property name="pos"></property>
<property name="size"></property>
@@ -1122,7 +1070,7 @@
<property name="border">5</property>
<property name="flag">wxEXPAND</property>
<property name="proportion">1</property>
- <object class="wxBoxSizer" expanded="0">
+ <object class="wxBoxSizer" expanded="1">
<property name="minimum_size"></property>
<property name="name">bSizer121</property>
<property name="orient">wxHORIZONTAL</property>
@@ -1246,7 +1194,7 @@
<property name="maximum_size"></property>
<property name="min">-9999999</property>
<property name="minimum_size"></property>
- <property name="name">m_ZoomMinSpin</property>
+ <property name="name">zoom_min_</property>
<property name="permission">protected</property>
<property name="pos"></property>
<property name="size"></property>
@@ -1352,7 +1300,7 @@
<property name="maximum_size"></property>
<property name="min">-9999999</property>
<property name="minimum_size"></property>
- <property name="name">m_ZoomMaxSpin</property>
+ <property name="name">zoom_max_</property>
<property name="permission">protected</property>
<property name="pos"></property>
<property name="size"></property>
@@ -1392,314 +1340,6 @@
</object>
</object>
</object>
- <object class="sizeritem" expanded="1">
- <property name="border">5</property>
- <property name="flag">wxEXPAND</property>
- <property name="proportion">1</property>
- <object class="wxBoxSizer" expanded="0">
- <property name="minimum_size"></property>
- <property name="name">bSizer141</property>
- <property name="orient">wxHORIZONTAL</property>
- <property name="permission">none</property>
- <object class="sizeritem" expanded="1">
- <property name="border">5</property>
- <property name="flag">wxALL|wxALIGN_CENTER_VERTICAL</property>
- <property name="proportion">1</property>
- <object class="wxStaticText" expanded="1">
- <property name="bg"></property>
- <property name="context_help"></property>
- <property name="enabled">1</property>
- <property name="fg"></property>
- <property name="font"></property>
- <property name="hidden">0</property>
- <property name="id">wxID_ANY</property>
- <property name="label">State Subscription</property>
- <property name="maximum_size"></property>
- <property name="minimum_size"></property>
- <property name="name">m_staticText71</property>
- <property name="permission">protected</property>
- <property name="pos"></property>
- <property name="size"></property>
- <property name="style"></property>
- <property name="subclass"></property>
- <property name="tooltip"></property>
- <property name="window_extra_style"></property>
- <property name="window_name"></property>
- <property name="window_style"></property>
- <property name="wrap">-1</property>
- <event name="OnChar"></event>
- <event name="OnEnterWindow"></event>
- <event name="OnEraseBackground"></event>
- <event name="OnKeyDown"></event>
- <event name="OnKeyUp"></event>
- <event name="OnKillFocus"></event>
- <event name="OnLeaveWindow"></event>
- <event name="OnLeftDClick"></event>
- <event name="OnLeftDown"></event>
- <event name="OnLeftUp"></event>
- <event name="OnMiddleDClick"></event>
- <event name="OnMiddleDown"></event>
- <event name="OnMiddleUp"></event>
- <event name="OnMotion"></event>
- <event name="OnMouseEvents"></event>
- <event name="OnMouseWheel"></event>
- <event name="OnPaint"></event>
- <event name="OnRightDClick"></event>
- <event name="OnRightDown"></event>
- <event name="OnRightUp"></event>
- <event name="OnSetFocus"></event>
- <event name="OnSize"></event>
- <event name="OnUpdateUI"></event>
- </object>
- </object>
- <object class="sizeritem" expanded="1">
- <property name="border">5</property>
- <property name="flag">wxEXPAND</property>
- <property name="proportion">1</property>
- <object class="wxBoxSizer" expanded="1">
- <property name="minimum_size"></property>
- <property name="name">bSizer37</property>
- <property name="orient">wxHORIZONTAL</property>
- <property name="permission">none</property>
- <object class="sizeritem" expanded="1">
- <property name="border">5</property>
- <property name="flag">wxALL|wxALIGN_CENTER_VERTICAL</property>
- <property name="proportion">1</property>
- <object class="wxTextCtrl" expanded="1">
- <property name="bg"></property>
- <property name="context_help"></property>
- <property name="enabled">1</property>
- <property name="fg"></property>
- <property name="font"></property>
- <property name="hidden">0</property>
- <property name="id">wxID_ANY</property>
- <property name="maximum_size"></property>
- <property name="maxlength">0</property>
- <property name="minimum_size"></property>
- <property name="name">m_PTZStateSubscriptionText</property>
- <property name="permission">protected</property>
- <property name="pos"></property>
- <property name="size"></property>
- <property name="style">wxTE_PROCESS_ENTER</property>
- <property name="subclass"></property>
- <property name="tooltip"></property>
- <property name="value"></property>
- <property name="window_extra_style"></property>
- <property name="window_name"></property>
- <property name="window_style"></property>
- <event name="OnChar"></event>
- <event name="OnEnterWindow"></event>
- <event name="OnEraseBackground"></event>
- <event name="OnKeyDown"></event>
- <event name="OnKeyUp"></event>
- <event name="OnKillFocus"></event>
- <event name="OnLeaveWindow"></event>
- <event name="OnLeftDClick"></event>
- <event name="OnLeftDown"></event>
- <event name="OnLeftUp"></event>
- <event name="OnMiddleDClick"></event>
- <event name="OnMiddleDown"></event>
- <event name="OnMiddleUp"></event>
- <event name="OnMotion"></event>
- <event name="OnMouseEvents"></event>
- <event name="OnMouseWheel"></event>
- <event name="OnPaint"></event>
- <event name="OnRightDClick"></event>
- <event name="OnRightDown"></event>
- <event name="OnRightUp"></event>
- <event name="OnSetFocus"></event>
- <event name="OnSize"></event>
- <event name="OnText"></event>
- <event name="OnTextEnter"></event>
- <event name="OnTextMaxLen"></event>
- <event name="OnTextURL"></event>
- <event name="OnUpdateUI"></event>
- </object>
- </object>
- <object class="sizeritem" expanded="1">
- <property name="border">5</property>
- <property name="flag">wxALL|wxALIGN_CENTER_VERTICAL</property>
- <property name="proportion">0</property>
- <object class="wxButton" expanded="1">
- <property name="bg"></property>
- <property name="context_help"></property>
- <property name="default">0</property>
- <property name="enabled">1</property>
- <property name="fg"></property>
- <property name="font"></property>
- <property name="hidden">0</property>
- <property name="id">wxID_ANY</property>
- <property name="label"> ... </property>
- <property name="maximum_size"></property>
- <property name="minimum_size"></property>
- <property name="name">m_PTZStateSubscriptionBrowse</property>
- <property name="permission">protected</property>
- <property name="pos"></property>
- <property name="size"></property>
- <property name="style">wxBU_EXACTFIT</property>
- <property name="subclass"></property>
- <property name="tooltip"></property>
- <property name="window_extra_style"></property>
- <property name="window_name"></property>
- <property name="window_style"></property>
- <event name="OnButtonClick">OnPTZStateSubscriptionBrowse</event>
- <event name="OnChar"></event>
- <event name="OnEnterWindow"></event>
- <event name="OnEraseBackground"></event>
- <event name="OnKeyDown"></event>
- <event name="OnKeyUp"></event>
- <event name="OnKillFocus"></event>
- <event name="OnLeaveWindow"></event>
- <event name="OnLeftDClick"></event>
- <event name="OnLeftDown"></event>
- <event name="OnLeftUp"></event>
- <event name="OnMiddleDClick"></event>
- <event name="OnMiddleDown"></event>
- <event name="OnMiddleUp"></event>
- <event name="OnMotion"></event>
- <event name="OnMouseEvents"></event>
- <event name="OnMouseWheel"></event>
- <event name="OnPaint"></event>
- <event name="OnRightDClick"></event>
- <event name="OnRightDown"></event>
- <event name="OnRightUp"></event>
- <event name="OnSetFocus"></event>
- <event name="OnSize"></event>
- <event name="OnUpdateUI"></event>
- </object>
- </object>
- </object>
- </object>
- </object>
- </object>
- <object class="sizeritem" expanded="1">
- <property name="border">5</property>
- <property name="flag">wxEXPAND</property>
- <property name="proportion">1</property>
- <object class="wxBoxSizer" expanded="0">
- <property name="minimum_size"></property>
- <property name="name">bSizer1411</property>
- <property name="orient">wxHORIZONTAL</property>
- <property name="permission">none</property>
- <object class="sizeritem" expanded="1">
- <property name="border">5</property>
- <property name="flag">wxALL|wxALIGN_CENTER_VERTICAL</property>
- <property name="proportion">1</property>
- <object class="wxStaticText" expanded="1">
- <property name="bg"></property>
- <property name="context_help"></property>
- <property name="enabled">1</property>
- <property name="fg"></property>
- <property name="font"></property>
- <property name="hidden">0</property>
- <property name="id">wxID_ANY</property>
- <property name="label">Control Command</property>
- <property name="maximum_size"></property>
- <property name="minimum_size"></property>
- <property name="name">m_staticText712</property>
- <property name="permission">protected</property>
- <property name="pos"></property>
- <property name="size"></property>
- <property name="style"></property>
- <property name="subclass"></property>
- <property name="tooltip"></property>
- <property name="window_extra_style"></property>
- <property name="window_name"></property>
- <property name="window_style"></property>
- <property name="wrap">-1</property>
- <event name="OnChar"></event>
- <event name="OnEnterWindow"></event>
- <event name="OnEraseBackground"></event>
- <event name="OnKeyDown"></event>
- <event name="OnKeyUp"></event>
- <event name="OnKillFocus"></event>
- <event name="OnLeaveWindow"></event>
- <event name="OnLeftDClick"></event>
- <event name="OnLeftDown"></event>
- <event name="OnLeftUp"></event>
- <event name="OnMiddleDClick"></event>
- <event name="OnMiddleDown"></event>
- <event name="OnMiddleUp"></event>
- <event name="OnMotion"></event>
- <event name="OnMouseEvents"></event>
- <event name="OnMouseWheel"></event>
- <event name="OnPaint"></event>
- <event name="OnRightDClick"></event>
- <event name="OnRightDown"></event>
- <event name="OnRightUp"></event>
- <event name="OnSetFocus"></event>
- <event name="OnSize"></event>
- <event name="OnUpdateUI"></event>
- </object>
- </object>
- <object class="sizeritem" expanded="1">
- <property name="border">5</property>
- <property name="flag">wxEXPAND|wxALIGN_CENTER_VERTICAL</property>
- <property name="proportion">1</property>
- <object class="wxBoxSizer" expanded="1">
- <property name="minimum_size"></property>
- <property name="name">bSizer38</property>
- <property name="orient">wxVERTICAL</property>
- <property name="permission">none</property>
- <object class="sizeritem" expanded="1">
- <property name="border">5</property>
- <property name="flag">wxALL|wxEXPAND</property>
- <property name="proportion">0</property>
- <object class="wxTextCtrl" expanded="1">
- <property name="bg"></property>
- <property name="context_help"></property>
- <property name="enabled">1</property>
- <property name="fg"></property>
- <property name="font"></property>
- <property name="hidden">0</property>
- <property name="id">wxID_ANY</property>
- <property name="maximum_size"></property>
- <property name="maxlength">0</property>
- <property name="minimum_size"></property>
- <property name="name">m_PTZControlCommandText</property>
- <property name="permission">protected</property>
- <property name="pos"></property>
- <property name="size"></property>
- <property name="style">wxTE_PROCESS_ENTER</property>
- <property name="subclass"></property>
- <property name="tooltip"></property>
- <property name="value"></property>
- <property name="window_extra_style"></property>
- <property name="window_name"></property>
- <property name="window_style"></property>
- <event name="OnChar"></event>
- <event name="OnEnterWindow"></event>
- <event name="OnEraseBackground"></event>
- <event name="OnKeyDown"></event>
- <event name="OnKeyUp"></event>
- <event name="OnKillFocus"></event>
- <event name="OnLeaveWindow"></event>
- <event name="OnLeftDClick"></event>
- <event name="OnLeftDown"></event>
- <event name="OnLeftUp"></event>
- <event name="OnMiddleDClick"></event>
- <event name="OnMiddleDown"></event>
- <event name="OnMiddleUp"></event>
- <event name="OnMotion"></event>
- <event name="OnMouseEvents"></event>
- <event name="OnMouseWheel"></event>
- <event name="OnPaint"></event>
- <event name="OnRightDClick"></event>
- <event name="OnRightDown"></event>
- <event name="OnRightUp"></event>
- <event name="OnSetFocus"></event>
- <event name="OnSize"></event>
- <event name="OnText"></event>
- <event name="OnTextEnter"></event>
- <event name="OnTextMaxLen"></event>
- <event name="OnTextURL"></event>
- <event name="OnUpdateUI"></event>
- </object>
- </object>
- </object>
- </object>
- </object>
- </object>
</object>
</object>
<object class="sizeritem" expanded="1">
@@ -1727,7 +1367,7 @@
<property name="label">Ok</property>
<property name="maximum_size"></property>
<property name="minimum_size"></property>
- <property name="name">m_Ok</property>
+ <property name="name">ok_</property>
<property name="permission">protected</property>
<property name="pos"></property>
<property name="size"></property>
@@ -1737,7 +1377,7 @@
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
- <event name="OnButtonClick">OnOk</event>
+ <event name="OnButtonClick">onOk</event>
<event name="OnChar"></event>
<event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></event>
@@ -1779,7 +1419,7 @@
<property name="label">Cancel</property>
<property name="maximum_size"></property>
<property name="minimum_size"></property>
- <property name="name">m_Cancel</property>
+ <property name="name">cancel_</property>
<property name="permission">protected</property>
<property name="pos"></property>
<property name="size"></property>
@@ -1789,7 +1429,7 @@
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
- <event name="OnButtonClick">OnCancel</event>
+ <event name="OnButtonClick">onCancel</event>
<event name="OnChar"></event>
<event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></event>
Modified: pkg/trunk/visualization/wx_camera_panel/scripts/standalone_camera.py
===================================================================
--- pkg/trunk/visualization/wx_camera_panel/scripts/standalone_camera.py 2008-09-18 00:34:43 UTC (rev 4417)
+++ pkg/trunk/visualization/wx_camera_panel/scripts/standalone_camera.py 2008-09-18 00:59:31 UTC (rev 4418)
@@ -5,32 +5,31 @@
import wx
import wx_camera_panel
+import sys
from optparse import OptionParser
-parser = OptionParser()
-parser.add_option( "-i", "--image", action="store", type="string", dest="image_topic", help="Set the image topic to subscribe to" )
-parser.add_option( "-s", "--ptz_state", action="store", type="string", dest="ptz_state_topic", help="Set the incoming ptz state topic to subscribe to" )
-parser.add_option( "-c", "--ptz_control", action="store", type="string", dest="ptz_control_topic", help="Set the outgoing ptz control topic to advertise on" )
-parser.add_option( "-n", "--name", action="store", type="string", dest="name", help="Set the name of the camera" )
+parser = OptionParser(usage="usage: %prog camera_namespace [options]")
+parser.add_option( "--ptz", action="store_true", dest="ptz", help="Enable PTZ controls" )
(options, args) = parser.parse_args()
+if ( len(args) == 0 ):
+ print( "No namespace specified!\n" )
+ parser.print_usage()
+ sys.exit(1)
+
+name = args[0]
+
app = wx.PySimpleApp()
-titlebar_string = "Camera"
-if ( options.name != None ):
- titlebar_string = titlebar_string + " " + options.name
+titlebar_string = "Camera " + name
frame = wx.Frame(None, wx.ID_ANY, titlebar_string, wx.DefaultPosition, wx.Size( 500, 500 ) )
camera_panel = wx_camera_panel.CameraPanel(frame)
-camera_panel.SetEnabled(True)
+camera_panel.setEnabled(True)
-if ( options.image_topic != None ):
- camera_panel.SetImageSubscription( options.image_topic )
-
-if ( options.ptz_state_topic != None ):
- camera_panel.SetPTZStateSubscription( options.ptz_state_topic )
+if ( options.ptz != None ):
+ camera_panel.setPTZEnabled(options.ptz)
-if ( options.ptz_control_topic != None ):
- camera_panel.SetPTZControlCommand( options.ptz_control_topic )
+camera_panel.setName(name)
frame.Show(True)
app.MainLoop()
Modified: pkg/trunk/visualization/wx_camera_panel/src/test/test.cpp
===================================================================
--- pkg/trunk/visualization/wx_camera_panel/src/test/test.cpp 2008-09-18 00:34:43 UTC (rev 4417)
+++ pkg/trunk/visualization/wx_camera_panel/src/test/test.cpp 2008-09-18 00:59:31 UTC (rev 4418)
@@ -1,10 +1,10 @@
/*
* Copyright (c) 2008, Willow Garage, Inc.
* All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright
@@ -13,7 +13,7 @@
* * Neither the name of the Willow Garage, Inc. nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -34,32 +34,31 @@
#include "ros/node.h"
-class MyFrame : public wxFrame
+class MyFrame : public wxFrame
{
public:
MyFrame(wxWindow* parent) : wxFrame(parent, -1, _("Camera Panels Test App"),
wxDefaultPosition, wxSize(800,600),
- wxDEFAULT_FRAME_STYLE)
+ wxDEFAULT_FRAME_STYLE)
{
CameraPanel* cameraPanel = new CameraPanel( this );
- cameraPanel->SetSize( this->GetSize() );
- cameraPanel->SetImageSubscription( "/PTZR_image" );
- cameraPanel->SetPTZStateSubscription( "/PTZR_state" );
- cameraPanel->SetPTZControlCommand( "/PTZR_cmd" );
- cameraPanel->SetEnabled( true );
+ cameraPanel->SetSize( this->GetSize() );
+ cameraPanel->setName( "PTZR" );
+ cameraPanel->setEnabled( true );
+ cameraPanel->setPTZEnabled( true );
}
-
+
~MyFrame()
{
}
};
// our normal wxApp-derived class, as usual
-class MyApp : public wxApp
+class MyApp : public wxApp
{
public:
-
+
bool OnInit()
{
ros::init(argc, (char**)argv);
@@ -67,7 +66,7 @@
wxFrame* frame = new MyFrame(NULL);
SetTopWindow(frame);
frame->Show();
- return true;
+ return true;
}
int OnExit()
Modified: pkg/trunk/visualization/wx_camera_panel/src/wx_camera_panel/CameraPanel.cpp
===================================================================
--- pkg/trunk/visualization/wx_camera_panel/src/wx_camera_panel/CameraPanel.cpp 2008-09-18 00:34:43 UTC (rev 4417)
+++ pkg/trunk/visualization/wx_camera_panel/src/wx_camera_panel/CameraPanel.cpp 2008-09-18 00:59:31 UTC (rev 4418)
@@ -70,321 +70,339 @@
CameraPanel::CameraPanel(wxWindow* parent)
: CameraPanelBase( parent )
-, m_Enabled( false )
-, m_ImageData( NULL )
-, m_Image( NULL )
-, m_ImageCodec( &m_ImageMessage )
-, m_RecreateBitmap( false )
-, m_CurrentPan( 0.0f )
-, m_CurrentTilt( 0.0f )
-, m_CurrentZoom( 0.0f )
-, m_HasPanTarget( false )
-, m_PanTarget( 0.0f )
-, m_HasTiltTarget( false )
-, m_TiltTarget( 0.0f )
-, m_HasZoomTarget( false )
-, m_ZoomTarget( 0.0f )
-, m_LeftMouseDown( false )
-, m_RightMouseDown( false )
-, m_StartMouseX( 0 )
-, m_StartMouseY( 0 )
-, m_CurrentMouseX( 0 )
-, m_CurrentMouseY( 0 )
-, m_PanMin( -169.0f )
-, m_PanMax( 169.0f )
-, m_TiltMin( -10.0f )
-, m_TiltMax( 90.0f )
-, m_ZoomMin( 1.0f )
-, m_ZoomMax( 9999.0f )
-, m_ZoomScrollTimer( this )
+, enabled_( false )
+, image_data_( NULL )
+, image_( NULL )
+, image_codec_( &image_message_ )
+, recreate_bitmap_( false )
+, current_pan_( 0.0f )
+, current_tilt_( 0.0f )
+, current_zoom_( 0.0f )
+, has_pan_target_( false )
+, pan_target_( 0.0f )
+, has_tilt_target_( false )
+, tilt_target_( 0.0f )
+, has_zoom_target_( false )
+, zoom_target_( 0.0f )
+, left_mouse_down_( false )
+, right_mouse_down_( false )
+, start_mouse_x_( 0 )
+, start_mouse_y_( 0 )
+, current_mouse_x_( 0 )
+, current_mouse_y_( 0 )
+, pan_min_( -169.0f )
+, pan_max_( 169.0f )
+, tilt_min_( -10.0f )
+, tilt_max_( 90.0f )
+, zoom_min_( 1.0f )
+, zoom_max_( 9999.0f )
+, zoom_scroll_timer_( this )
{
wxInitAllImageHandlers();
- Connect( wxEVT_TIMER, wxTimerEventHandler(CameraPanel::OnScrollComplete), NULL, this);
+ Connect( wxEVT_TIMER, wxTimerEventHandler(CameraPanel::onScrollComplete), NULL, this);
- m_ROSNode = ros::node::instance();
+ ros_node_ = ros::node::instance();
/// @todo This should go away once creation of the ros::node is more well-defined
- if (!m_ROSNode)
+ if (!ros_node_)
{
int argc = 0;
ros::init( argc, 0 );
- m_ROSNode = new ros::node( "CameraPanel" );
+ ros_node_ = new ros::node( "CameraPanel" );
}
- ROS_ASSERT( m_ROSNode );
+ ROS_ASSERT( ros_node_ );
- m_ImagePanel->Connect( EVT_FAKE_REFRESH, wxCommandEventHandler( CameraPanel::OnFakeRefresh ), NULL, this );
+ image_panel_->Connect( EVT_FAKE_REFRESH, wxCommandEventHandler( CameraPanel::onFakeRefresh ), NULL, this );
}
CameraPanel::~CameraPanel()
{
- m_ImagePanel->Disconnect( EVT_FAKE_REFRESH, wxCommandEventHandler( CameraPanel::OnFakeRefresh ), NULL, this );
+ image_panel_->Disconnect( EVT_FAKE_REFRESH, wxCommandEventHandler( CameraPanel::onFakeRefresh ), NULL, this );
- SetEnabled( false );
+ setEnabled( false );
- m_ROSNode->shutdown();
- delete m_ROSNode;
+ delete [] image_data_;
+ delete image_;
+}
- delete [] m_ImageData;
- delete m_Image;
+void CameraPanel::setName( const std::string& name )
+{
+ name_ = name;
+
+ setImageSubscription( name + "/image" );
+ setPTZStateSubscription( name + "/ptz_state" );
+ setPTZControlCommand( name + "/ptz_cmd" );
}
-void CameraPanel::SetImageSubscription( const std::string& subscription )
+void CameraPanel::setImageSubscription( const std::string& subscription )
{
- if ( m_ImageTopic == subscription )
+ if ( image_topic_ == subscription )
{
return;
}
// if we already have a subscription, unsubscribe
- if ( !m_ImageTopic.empty() )
+ if ( !image_topic_.empty() )
{
- UnsubscribeImage();
+ unsubscribeImage();
}
- m_ImageTopic = subscription;
+ image_topic_ = subscription;
- if ( !m_ImageTopic.empty() )
+ if ( !image_topic_.empty() )
{
- SubscribeImage();
+ subscribeImage();
}
}
-void CameraPanel::SetPTZStateSubscription( const std::string& subscription )
+void CameraPanel::setPTZStateSubscription( const std::string& subscription )
{
- if ( m_PTZStateTopic == subscription )
+ if ( ptz_state_topic_ == subscription )
{
return;
}
// if we already have a subscription, unsubscribe
- if ( !m_PTZStateTopic.empty() )
+ if ( !ptz_state_topic_.empty() )
{
- UnsubscribePTZState();
+ unsubscribePTZState();
}
- m_PTZStateTopic = subscription;
+ ptz_state_topic_ = subscription;
- if ( !m_PTZStateTopic.empty() )
+ if ( !ptz_state_topic_.empty() )
{
- SubscribePTZState();
+ subscribePTZState();
}
}
-void CameraPanel::SetPTZControlCommand( const std::string& command )
+void CameraPanel::setPTZControlCommand( const std::string& command )
{
- if ( m_PTZControlTopic == command )
+ if ( ptz_control_topic_ == command )
{
return;
}
// if we already have a command we're advertising, stop
- if ( !m_PTZControlTopic.empty() )
+ if ( !ptz_control_topic_.empty() )
{
- StopPTZControl();
+ stopPTZControl();
}
- m_PTZControlTopic = command;
+ ptz_control_topic_ = command;
- if ( !m_PTZControlTopic.empty() )
+ if ( !ptz_control_topic_.empty() )
{
- AdvertisePTZControl();
+ advertisePTZControl();
}
}
-void CameraPanel::SetEnabled( bool enabled )
+void CameraPanel::setEnabled( bool enabled )
{
- if ( m_En...
[truncated message content] |
