[Personalrobots-commit] SF.net SVN: personalrobots: [42] pkg/trunk/axis_cam/src

[<mor...@us...>]

Revision: 42
          http://personalrobots.svn.sourceforge.net/personalrobots/?rev=42&view=rev
Author:   morgan_quigley
Date:     2008-03-26 17:35:00 -0700 (Wed, 26 Mar 2008)

Log Message:
-----------
bye bye wget in axis_cam

Added Paths:
-----------
    pkg/trunk/axis_cam/src/axis_cam_polled/
    pkg/trunk/axis_cam/src/axis_cam_polled/Makefile
    pkg/trunk/axis_cam/src/axis_cam_polled/axis_cam_polled.cpp

Removed Paths:
-------------
    pkg/trunk/axis_cam/src/axis_cam_polled/Makefile
    pkg/trunk/axis_cam/src/axis_cam_polled/axis_cam_wget_polled.cpp
    pkg/trunk/axis_cam/src/axis_cam_wget_polled/

Copied: pkg/trunk/axis_cam/src/axis_cam_polled (from rev 38, pkg/trunk/axis_cam/src/axis_cam_wget_polled)

Deleted: pkg/trunk/axis_cam/src/axis_cam_polled/Makefile
===================================================================
--- pkg/trunk/axis_cam/src/axis_cam_wget_polled/Makefile	2008-03-27 00:27:14 UTC (rev 38)
+++ pkg/trunk/axis_cam/src/axis_cam_polled/Makefile	2008-03-27 00:35:00 UTC (rev 42)
@@ -1,4 +0,0 @@
-SRC = axis_cam_wget_polled.cpp
-OUT = ../../nodes/axis_cam_wget_polled
-PKG = axis_cam
-include $(shell $(ROS_ROOT)/rospack find roscpp)/make_include/node.mk

Copied: pkg/trunk/axis_cam/src/axis_cam_polled/Makefile (from rev 41, pkg/trunk/axis_cam/src/axis_cam_wget_polled/Makefile)
===================================================================
--- pkg/trunk/axis_cam/src/axis_cam_polled/Makefile	                        (rev 0)
+++ pkg/trunk/axis_cam/src/axis_cam_polled/Makefile	2008-03-27 00:35:00 UTC (rev 42)
@@ -0,0 +1,4 @@
+SRC = axis_cam_polled.cpp
+OUT = ../../nodes/axis_cam_polled
+PKG = axis_cam
+include $(shell $(ROS_ROOT)/rospack find roscpp)/make_include/node.mk

Copied: pkg/trunk/axis_cam/src/axis_cam_polled/axis_cam_polled.cpp (from rev 41, pkg/trunk/axis_cam/src/axis_cam_wget_polled/axis_cam_polled.cpp)
===================================================================
--- pkg/trunk/axis_cam/src/axis_cam_polled/axis_cam_polled.cpp	                        (rev 0)
+++ pkg/trunk/axis_cam/src/axis_cam_polled/axis_cam_polled.cpp	2008-03-27 00:35:00 UTC (rev 42)
@@ -0,0 +1,92 @@
+///////////////////////////////////////////////////////////////////////////////
+// The axis_cam package provides a library that talks to Axis IP-based cameras
+// as well as ROS nodes which use these libraries
+//
+// Copyright (C) 2008, Morgan Quigley
+//
+// 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 
+//     notice, this list of conditions and the following disclaimer in the 
+//     documentation and/or other materials provided with the distribution.
+//   * Neither the name of Stanford University 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 
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE 
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
+// POSSIBILITY OF SUCH DAMAGE.
+
+#include "ros/ros_slave.h"
+#include "SDL/SDL.h"
+#include "image_flows/FlowImage.h"
+#include "common_flows/FlowEmpty.h"
+#include "axis_cam/axis_cam.h"
+
+class AxisCamPolled : public ROS_Slave
+{
+public:
+  FlowImage *image;
+  FlowEmpty *shutter;
+  string axis_host;
+  AxisCam *cam;
+  int frame_id;
+
+  AxisCamPolled() : ROS_Slave(), cam(NULL), frame_id(0)
+  {
+    register_source(image = new FlowImage("image"));
+    register_sink(shutter = new FlowEmpty("shutter"), 
+      ROS_CALLBACK(AxisCamPolled, shutter_cb));
+    if (!get_string_param(".host", axis_host))
+    {
+      printf("axis_host parameter not specified; defaulting to 192.168.0.90\n");
+      axis_host = "192.168.0.90";
+    }
+    printf("axis host set to [%s]\n", axis_host.c_str());
+    get_int_param(".frame_id", &frame_id);
+    cam = new AxisCam(axis_host);
+  }
+  virtual ~AxisCamPolled()
+  { 
+    if (cam) 
+      delete cam; 
+  }
+  bool take_and_send_image()
+  {
+    uint8_t *jpeg;
+    uint32_t jpeg_size;
+    if (!cam->get_jpeg(&jpeg, &jpeg_size))
+      return false;
+    image->set_data_size(jpeg_size);
+    memcpy(image->data, jpeg, jpeg_size);
+    image->width = 704;
+    image->height = 480;
+    image->compression = "jpeg";
+    image->colorspace = "rgb24";
+    image->frame_id = frame_id;
+    image->publish();
+    return true;
+  }
+  void shutter_cb()
+  {
+    take_and_send_image();
+  }
+};
+
+int main(int argc, char **argv)
+{
+  AxisCamPolled a;
+  a.spin();
+  return 0;
+}
+

Deleted: pkg/trunk/axis_cam/src/axis_cam_polled/axis_cam_wget_polled.cpp
===================================================================
--- pkg/trunk/axis_cam/src/axis_cam_wget_polled/axis_cam_wget_polled.cpp	2008-03-27 00:27:14 UTC (rev 38)
+++ pkg/trunk/axis_cam/src/axis_cam_polled/axis_cam_wget_polled.cpp	2008-03-27 00:35:00 UTC (rev 42)
@@ -1,91 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// The axis_cam package provides a library that talks to Axis IP-based cameras
-// as well as ROS nodes which use these libraries
-//
-// Copyright (C) 2008, Morgan Quigley
-//
-// 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 
-//     notice, this list of conditions and the following disclaimer in the 
-//     documentation and/or other materials provided with the distribution.
-//   * Neither the name of Stanford University 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 
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE 
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
-// POSSIBILITY OF SUCH DAMAGE.
-
-#include "ros/ros_slave.h"
-#include "SDL/SDL.h"
-#include "image_flows/FlowImage.h"
-#include "common_flows/FlowEmpty.h"
-#include "axis_cam/axis_cam.h"
-
-class AxisCamWgetPolled : public ROS_Slave
-{
-public:
-  FlowImage *image;
-  FlowEmpty *shutter;
-  string axis_host;
-  AxisCam *cam;
-  int frame_id;
-
-  AxisCamWgetPolled() : ROS_Slave(), cam(NULL), frame_id(0)
-  {
-    register_source(image = new FlowImage("image"));
-    register_sink(shutter = new FlowEmpty("shutter"), ROS_CALLBACK(AxisCamWgetPolled, shutter_callback));
-    if (!get_string_param(".host", axis_host))
-    {
-      printf("axis_host parameter not specified; defaulting to 192.168.0.90\n");
-      axis_host = "192.168.0.90";
-    }
-    printf("axis host set to [%s]\n", axis_host.c_str());
-    get_int_param(".frame_id", &frame_id);
-    cam = new AxisCam(axis_host);
-  }
-  virtual ~AxisCamWgetPolled()
-  { 
-    if (cam) 
-      delete cam; 
-  }
-  bool take_and_send_image()
-  {
-    uint8_t *jpeg;
-    uint32_t jpeg_size;
-    if (!cam->wget_jpeg(&jpeg, &jpeg_size))
-      return false;
-    image->set_data_size(jpeg_size);
-    memcpy(image->data, jpeg, jpeg_size);
-    image->width = 704;
-    image->height = 480;
-    image->compression = "jpeg";
-    image->colorspace = "rgb24";
-    image->frame_id = frame_id;
-    image->publish();
-    return true;
-  }
-  void shutter_callback()
-  {
-    take_and_send_image();
-  }
-};
-
-int main(int argc, char **argv)
-{
-  AxisCamWgetPolled a;
-  a.spin();
-  return 0;
-}
-


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