Menu
▾
▴
[Personalrobots-commit] SF.net SVN: personalrobots:[3772] pkg/trunk
|
From: <tf...@us...> - 2008-08-28 23:14:48
|
Revision: 3772
http://personalrobots.svn.sourceforge.net/personalrobots/?rev=3772&view=rev
Author: tfoote
Date: 2008-08-28 23:14:57 +0000 (Thu, 28 Aug 2008)
Log Message:
-----------
fixed dependants on axis_cam, bug in pr2_gui (thanks Josh), include and lib path on axis cam
Modified Paths:
--------------
pkg/trunk/drivers/cam/axis_cam/manifest.xml
pkg/trunk/visualization/pr2_gui/manifest.xml
pkg/trunk/visualization/pr2_gui/src/launcherimpl.cpp
pkg/trunk/visualization/pr2_gui/src/launcherimpl.h
pkg/trunk/visualization/wx_camera_panel/manifest.xml
pkg/trunk/visualization/wx_camera_panel/src/wx_camera_panel/CameraPanel.cpp
pkg/trunk/visualization/wx_camera_panel/src/wx_camera_panel/CameraPanel.h
Modified: pkg/trunk/drivers/cam/axis_cam/manifest.xml
===================================================================
--- pkg/trunk/drivers/cam/axis_cam/manifest.xml 2008-08-28 23:01:08 UTC (rev 3771)
+++ pkg/trunk/drivers/cam/axis_cam/manifest.xml 2008-08-28 23:14:57 UTC (rev 3772)
@@ -21,7 +21,7 @@
<sysdepend package="libcurl3-openssl-dev" os="ubuntu" version="7.04-feisty"/>
<sysdepend package="libcurl4-openssl-dev" os="ubuntu" version="8.04-hardy"/>
<export>
- <cpp cflags="-I${prefix}/include" lflags="-L${prefix}/lib -laxis_cam -lcurl"/>
+ <cpp cflags="-I${prefix}/include -I${prefix}/msg/cpp" lflags="-L${prefix}/lib -laxis -lcurl"/>
</export>
</package>
Modified: pkg/trunk/visualization/pr2_gui/manifest.xml
===================================================================
--- pkg/trunk/visualization/pr2_gui/manifest.xml 2008-08-28 23:01:08 UTC (rev 3771)
+++ pkg/trunk/visualization/pr2_gui/manifest.xml 2008-08-28 23:14:57 UTC (rev 3772)
@@ -13,6 +13,7 @@
<depend package="std_msgs"/>
<depend package="irrlicht_viewer"/>
<depend package="pr2Core"/>
+<depend package="axis_cam"/>
<depend package="rosTF"/>
<depend package="wg_robot_description_parser"/>
<export>
Modified: pkg/trunk/visualization/pr2_gui/src/launcherimpl.cpp
===================================================================
--- pkg/trunk/visualization/pr2_gui/src/launcherimpl.cpp 2008-08-28 23:01:08 UTC (rev 3771)
+++ pkg/trunk/visualization/pr2_gui/src/launcherimpl.cpp 2008-08-28 23:14:57 UTC (rev 3772)
@@ -38,8 +38,7 @@
{
//std::cerr << "errorOut!!!\n";
long first = Ros_TC->GetLastPosition();
- wxString line;
- line.FromUTF8(rosErrMsg.msg.c_str());
+ wxString line = wxString::FromAscii( rosErrMsg.msg.c_str() );
Ros_TC->AppendText(line);
}
@@ -261,7 +260,7 @@
PTZL_B->Enable(true);
myNode->subscribe("image_ptz_left", PTZLImage, &LauncherImpl::incomingPTZLImageConn,this);
myNode->subscribe("PTZL_state", PTZL_state, &LauncherImpl::incomingPTZLState,this);
- myNode->advertise<std_msgs::PTZActuatorCmd>("PTZL_cmd");
+ myNode->advertise<axis_cam::PTZActuatorCmd>("PTZL_cmd");
}
else
{
@@ -363,7 +362,7 @@
PTZR_B->Enable(true);
myNode->subscribe("image_ptz_right", PTZRImage, &LauncherImpl::incomingPTZRImageConn,this);
myNode->subscribe("PTZR_state", PTZR_state, &LauncherImpl::incomingPTZRState,this);
- myNode->advertise<std_msgs::PTZActuatorCmd>("PTZR_cmd");
+ myNode->advertise<axis_cam::PTZActuatorCmd>("PTZR_cmd");
}
else
{
Modified: pkg/trunk/visualization/pr2_gui/src/launcherimpl.h
===================================================================
--- pkg/trunk/visualization/pr2_gui/src/launcherimpl.h 2008-08-28 23:01:08 UTC (rev 3771)
+++ pkg/trunk/visualization/pr2_gui/src/launcherimpl.h 2008-08-28 23:14:57 UTC (rev 3772)
@@ -58,8 +58,8 @@
- @b "PTZR_image"/std_msgs::Image : Image received from the right PTZ
- @b "WristL_image"/std_msgs::Image : Image received from the left wrist camera
- @b "WristR_image"/std_msgs::Image : Image received from the right wrist camera
-- @b "PTZL_state"/std_msgs::PTZActuatorState : Receives state from the left PTZ
-- @b "PTZR_state"/std_msgs::PTZActuatorState : Receives state from the right PTZ
+- @b "PTZL_state"/axis_cam::PTZActuatorState : Receives state from the left PTZ
+- @b "PTZR_state"/axis_cam::PTZActuatorState : Receives state from the right PTZ
- @b "/roserr"/rostools::log : Receives roserr messages
- @b "cloud"/std_msgs::PointCloudFloat32 : Point cloud received from head Hokuyo
- @b "scan"/std_msgs::LaserScan : Laser cloud received from base Hokuyo
@@ -71,8 +71,8 @@
- @b "transform"/std_msgs::Empty : Cue to update model (new transform is available)
Publishes to (name/type):
-- @b "PTZR_cmd"/std_msgs::std_msgs::PTZActuatorCmd : Moves the right PTZ to the given position
-- @b "PTZL_cmd"/std_msgs::std_msgs::PTZActuatorCmd : Moves the left PTZ to the given position
+- @b "PTZR_cmd"/axis_cam::axis_cam::PTZActuatorCmd : Moves the right PTZ to the given position
+- @b "PTZL_cmd"/axis_cam::axis_cam::PTZActuatorCmd : Moves the left PTZ to the given position
@todo
@@ -95,8 +95,8 @@
//ros stuff
#include "ros/node.h"
#include "std_msgs/Image.h"
-#include "std_msgs/PTZActuatorCmd.h"
-#include "std_msgs/PTZActuatorState.h"
+#include "axis_cam/PTZActuatorCmd.h"
+#include "axis_cam/PTZActuatorState.h"
#include "rostools/Log.h"
/** Implementing launcher */
class LauncherImpl : public launcher
@@ -187,11 +187,11 @@
///Image for the right wrist
std_msgs::Image WristRImage;
///Command message shared between the PTZs
- std_msgs::PTZActuatorCmd ptz_cmd;
+ axis_cam::PTZActuatorCmd ptz_cmd;
///State of the left PTZ
- std_msgs::PTZActuatorState PTZL_state;
+ axis_cam::PTZActuatorState PTZL_state;
///State of the right PTZ
- std_msgs::PTZActuatorState PTZR_state;
+ axis_cam::PTZActuatorState PTZR_state;
///3d visualization object (irrlicht window)
Vis3d *vis3d_Window;
Modified: pkg/trunk/visualization/wx_camera_panel/manifest.xml
===================================================================
--- pkg/trunk/visualization/wx_camera_panel/manifest.xml 2008-08-28 23:01:08 UTC (rev 3771)
+++ pkg/trunk/visualization/wx_camera_panel/manifest.xml 2008-08-28 23:14:57 UTC (rev 3772)
@@ -10,6 +10,7 @@
<depend package="image_utils"/>
<depend package="roscpp"/>
<depend package="std_msgs"/>
+ <depend package="axis_cam"/>
<depend package="wx_topic_display"/>
<export>
<cpp cflags="-I${prefix}/src/" lflags="-Wl,-rpath,${prefix}/lib -L${prefix}/lib -lwxcamerapanels"/>
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-08-28 23:01:08 UTC (rev 3771)
+++ pkg/trunk/visualization/wx_camera_panel/src/wx_camera_panel/CameraPanel.cpp 2008-08-28 23:14:57 UTC (rev 3772)
@@ -278,7 +278,7 @@
{
if ( IsPTZControlEnabled() )
{
- m_ROSNode->advertise<std_msgs::PTZActuatorCmd>(m_PTZControlTopic, 0);
+ m_ROSNode->advertise<axis_cam::PTZActuatorCmd>(m_PTZControlTopic, 0);
}
}
Modified: pkg/trunk/visualization/wx_camera_panel/src/wx_camera_panel/CameraPanel.h
===================================================================
--- pkg/trunk/visualization/wx_camera_panel/src/wx_camera_panel/CameraPanel.h 2008-08-28 23:01:08 UTC (rev 3771)
+++ pkg/trunk/visualization/wx_camera_panel/src/wx_camera_panel/CameraPanel.h 2008-08-28 23:14:57 UTC (rev 3772)
@@ -36,8 +36,8 @@
// ROS includes
#include <rosthread/mutex.h>
#include <std_msgs/Image.h>
-#include <std_msgs/PTZActuatorState.h>
-#include <std_msgs/PTZActuatorCmd.h>
+#include <axis_cam/PTZActuatorState.h>
+#include <axis_cam/PTZActuatorCmd.h>
#include "image_utils/image_codec.h"
@@ -203,8 +203,8 @@
wxBitmap m_Bitmap;
bool m_RecreateBitmap;
- std_msgs::PTZActuatorState m_PTZStateMessage;
- std_msgs::PTZActuatorCmd m_PTZControlMessage;
+ axis_cam::PTZActuatorState m_PTZStateMessage;
+ axis_cam::PTZActuatorCmd m_PTZControlMessage;
/// Latest pan received from ROS
float m_CurrentPan;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
