[Personalrobots-commit] SF.net SVN: personalrobots: [95] pkg/trunk

[<jl...@us...>]

Revision: 95
          http://personalrobots.svn.sourceforge.net/personalrobots/?rev=95&view=rev
Author:   jleibs
Date:     2008-04-10 10:08:27 -0700 (Thu, 10 Apr 2008)

Log Message:
-----------
More files fixed to deal with reshuffling of image_flows.

Modified Paths:
--------------
    pkg/trunk/axis_cam/src/axis_cam_polled/axis_cam_polled.cpp
    pkg/trunk/axis_cam/test/test_get/Makefile
    pkg/trunk/axis_cam/test/test_ptz/Makefile
    pkg/trunk/axis_cam/test/test_ptz/test_ptz.cpp
    pkg/trunk/image_utils/examples/image_sender/Makefile
    pkg/trunk/image_utils/examples/image_sender/image_sender.cpp
    pkg/trunk/image_utils/manifest.xml
    pkg/trunk/image_utils/test/get_raster/Makefile
    pkg/trunk/image_utils/test/get_raster/get_raster.cpp
    pkg/trunk/image_utils/test/read_write/Makefile
    pkg/trunk/image_utils/test/read_write/read_write.cpp
    pkg/trunk/image_viewer/nodes/test_image_viewer

Modified: pkg/trunk/axis_cam/src/axis_cam_polled/axis_cam_polled.cpp
===================================================================
--- pkg/trunk/axis_cam/src/axis_cam_polled/axis_cam_polled.cpp	2008-04-10 01:17:24 UTC (rev 94)
+++ pkg/trunk/axis_cam/src/axis_cam_polled/axis_cam_polled.cpp	2008-04-10 17:08:27 UTC (rev 95)
@@ -29,7 +29,7 @@
 
 #include "ros/ros_slave.h"
 #include "SDL/SDL.h"
-#include "image_flows/FlowImage.h"
+#include "common_flows/FlowImage.h"
 #include "common_flows/FlowEmpty.h"
 #include "axis_cam/axis_cam.h"
 

Modified: pkg/trunk/axis_cam/test/test_get/Makefile
===================================================================
--- pkg/trunk/axis_cam/test/test_get/Makefile	2008-04-10 01:17:24 UTC (rev 94)
+++ pkg/trunk/axis_cam/test/test_get/Makefile	2008-04-10 17:08:27 UTC (rev 95)
@@ -2,4 +2,4 @@
 OUT = test_get
 LFLAGS = -L../../lib -laxis_cam -lcurl
 PKG = axis_cam
-include $(shell $(ROS_ROOT)/rospack find roscpp)/make_include/node_just_libros.mk
+include $(shell $(ROS_ROOT)/rospack find roscpp)/make_include/node.mk

Modified: pkg/trunk/axis_cam/test/test_ptz/Makefile
===================================================================
--- pkg/trunk/axis_cam/test/test_ptz/Makefile	2008-04-10 01:17:24 UTC (rev 94)
+++ pkg/trunk/axis_cam/test/test_ptz/Makefile	2008-04-10 17:08:27 UTC (rev 95)
@@ -2,4 +2,4 @@
 OUT = test_ptz
 LFLAGS = -L../../lib -laxis_cam -lcurl
 PKG = axis_cam
-include $(shell $(ROS_ROOT)/rospack find roscpp)/make_include/node_just_libros.mk
+include $(shell $(ROS_ROOT)/rospack find roscpp)/make_include/node.mk

Modified: pkg/trunk/axis_cam/test/test_ptz/test_ptz.cpp
===================================================================
--- pkg/trunk/axis_cam/test/test_ptz/test_ptz.cpp	2008-04-10 01:17:24 UTC (rev 94)
+++ pkg/trunk/axis_cam/test/test_ptz/test_ptz.cpp	2008-04-10 17:08:27 UTC (rev 95)
@@ -33,10 +33,10 @@
 int main(int argc, char **argv)
 {
   AxisCam *axis = new AxisCam("192.168.1.90");
-  axis->ptz(0,0,0);
+  axis->set_ptz(0,0,0);
   for (int i = 0; i < 5; i++)
-    axis->ptz(i*10, i*10, 0);
-  axis->ptz(0,0,0);
+    axis->set_ptz(i*10, i*10, 0);
+  axis->set_ptz(0,0,0);
   delete axis;
   return 0;
 }

Modified: pkg/trunk/image_utils/examples/image_sender/Makefile
===================================================================
--- pkg/trunk/image_utils/examples/image_sender/Makefile	2008-04-10 01:17:24 UTC (rev 94)
+++ pkg/trunk/image_utils/examples/image_sender/Makefile	2008-04-10 17:08:27 UTC (rev 95)
@@ -1,4 +1,4 @@
 SRC = image_sender.cpp
 OUT = ../../nodes/image_sender
-PKG = image_flows
+PKG = image_utils
 include $(shell $(ROS_ROOT)/rospack find roscpp)/make_include/node.mk

Modified: pkg/trunk/image_utils/examples/image_sender/image_sender.cpp
===================================================================
--- pkg/trunk/image_utils/examples/image_sender/image_sender.cpp	2008-04-10 01:17:24 UTC (rev 94)
+++ pkg/trunk/image_utils/examples/image_sender/image_sender.cpp	2008-04-10 17:08:27 UTC (rev 95)
@@ -28,8 +28,8 @@
 // POSSIBILITY OF SUCH DAMAGE.
 
 #include <cstdio>
-#include "image_flows/FlowImage.h"
-#include "image_flows/image_flow_codec.h"
+#include "common_flows/FlowImage.h"
+#include "common_flows/ImageCodec.h"
 #include "ros/ros_slave.h"
 
 class ImageSender : public ROS_Slave
@@ -38,12 +38,12 @@
   double freq;
   string image_file;
   FlowImage *image;
-  ImageFlowCodec<FlowImage> *codec;
+  ImageCodec<FlowImage> *codec;
 
   ImageSender() : ROS_Slave(), freq(1), image_file("test.jpg")
   {
     register_source(image = new FlowImage("image"));
-    codec = new ImageFlowCodec<FlowImage>(image);
+    codec = new ImageCodec<FlowImage>(image);
     register_with_master();
     get_double_param(".freq", &freq);
     get_string_param(".image_file", image_file);

Modified: pkg/trunk/image_utils/manifest.xml
===================================================================
--- pkg/trunk/image_utils/manifest.xml	2008-04-10 01:17:24 UTC (rev 94)
+++ pkg/trunk/image_utils/manifest.xml	2008-04-10 17:08:27 UTC (rev 95)
@@ -10,6 +10,7 @@
   <license>BSD</license>
   <url>http://stair.stanford.edu</url>
   <depend package="roscpp"/>
+  <depend package="common_flows"/>
   <depend package="ijg_libjpeg"/>
 </package>
 

Modified: pkg/trunk/image_utils/test/get_raster/Makefile
===================================================================
--- pkg/trunk/image_utils/test/get_raster/Makefile	2008-04-10 01:17:24 UTC (rev 94)
+++ pkg/trunk/image_utils/test/get_raster/Makefile	2008-04-10 17:08:27 UTC (rev 95)
@@ -1,4 +1,4 @@
 SRC = get_raster.cpp
 OUT = get_raster
-PKG = image_flows
+PKG = image_utils
 include $(shell $(ROS_ROOT)/rospack find roscpp)/make_include/node.mk

Modified: pkg/trunk/image_utils/test/get_raster/get_raster.cpp
===================================================================
--- pkg/trunk/image_utils/test/get_raster/get_raster.cpp	2008-04-10 01:17:24 UTC (rev 94)
+++ pkg/trunk/image_utils/test/get_raster/get_raster.cpp	2008-04-10 17:08:27 UTC (rev 95)
@@ -33,8 +33,8 @@
 #include <unistd.h>
 #include <errno.h>
 #include <string.h>
-#include "image_flows/FlowImage.h"
-#include "image_flows/image_flow_codec.h"
+#include "common_flows/FlowImage.h"
+#include "common_flows/ImageCodec.h"
 
 void toast(char *msg)
 {
@@ -63,7 +63,7 @@
   image.colorspace = "rgb24";
   image.width = 200;
   image.height = 153;
-  ImageFlowCodec<FlowImage> codec(&image);
+  ImageCodec<FlowImage> codec(&image);
   uint8_t *raster;
   if (!(raster = codec.get_raster()))
     printf("couldn't get raster\n");

Modified: pkg/trunk/image_utils/test/read_write/Makefile
===================================================================
--- pkg/trunk/image_utils/test/read_write/Makefile	2008-04-10 01:17:24 UTC (rev 94)
+++ pkg/trunk/image_utils/test/read_write/Makefile	2008-04-10 17:08:27 UTC (rev 95)
@@ -1,4 +1,4 @@
 SRC = read_write.cpp
 OUT = read_write
-PKG = image_flows
+PKG = image_utils
 include $(shell $(ROS_ROOT)/rospack find roscpp)/make_include/node.mk

Modified: pkg/trunk/image_utils/test/read_write/read_write.cpp
===================================================================
--- pkg/trunk/image_utils/test/read_write/read_write.cpp	2008-04-10 01:17:24 UTC (rev 94)
+++ pkg/trunk/image_utils/test/read_write/read_write.cpp	2008-04-10 17:08:27 UTC (rev 95)
@@ -29,14 +29,14 @@
 
 
 #include <cstdio>
-#include "image_flows/FlowImage.h"
-#include "image_flows/image_flow_codec.h"
+#include "common_flows/FlowImage.h"
+#include "common_flows/ImageCodec.h"
 
 int main(int argc, char **argv)
 {
   struct stat sbuf;
   FlowImage image("image");
-  ImageFlowCodec<FlowImage> codec(&image);
+  ImageCodec<FlowImage> codec(&image);
   codec.read_file("test.jpg");
   codec.write_file("out.ppm");
   codec.write_file("out.jpg", 5, false);

Modified: pkg/trunk/image_viewer/nodes/test_image_viewer
===================================================================
--- pkg/trunk/image_viewer/nodes/test_image_viewer	2008-04-10 01:17:24 UTC (rev 94)
+++ pkg/trunk/image_viewer/nodes/test_image_viewer	2008-04-10 17:08:27 UTC (rev 95)
@@ -3,7 +3,7 @@
 g = YAMLGraph.new
 g.param 'image_sender.freq', 0.5
 g.param 'image_sender.image_file', 'examples/image_sender/test.jpg'
-g.node 'image_flows/image_sender', {'launch'=>'xterm'}
+g.node 'image_utils/image_sender', {'launch'=>'xterm'}
 g.node 'image_viewer/image_viewer', {'launch'=>'xterm'}
 #g.node 'vacuum/vacuum', {'launch' => 'xterm'}
 g.flow 'image_sender:image', 'image_viewer:image'


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.