Revision: 8147
http://playerstage.svn.sourceforge.net/playerstage/?rev=8147&view=rev
Author: thjc
Date: 2009-07-28 06:24:55 +0000 (Tue, 28 Jul 2009)
Log Message:
-----------
More copyright header work. Add explicit headers to files and remove
laser_obstacle_avoid.py which we dont have origins for
Modified Paths:
--------------
code/player/trunk/libplayercore/bindings/java/main.java
code/player/trunk/libplayercore/bindings/java/parse.py
code/player/trunk/libplayercore/bindings/java/playercore_java.i
code/player/trunk/libplayerjpeg/playerjpeg.c
code/player/trunk/libplayerjpeg/playerjpeg.h
code/player/trunk/libplayertcp/bindings/java/main.java
code/player/trunk/libplayertcp/bindings/java/playertcp_java.i
code/player/trunk/libplayertcp/playertcp_errutils.h
code/player/trunk/server/codetools/find_no_copyright.sh
Removed Paths:
-------------
code/player/trunk/examples/python/laser_obstacle_avoid.py
Deleted: code/player/trunk/examples/python/laser_obstacle_avoid.py
===================================================================
--- code/player/trunk/examples/python/laser_obstacle_avoid.py 2009-07-28
03:50:55 UTC (rev 8146)
+++ code/player/trunk/examples/python/laser_obstacle_avoid.py 2009-07-28
06:24:55 UTC (rev 8147)
@@ -1,71 +0,0 @@
-#!/usr/bin/env python
-
-import math
-from playerc import *
-
-def limit(val, bottom, top):
- if val > top:
- return top
- elif val < bottom:
- return bottom
- return val
-
-# Create a client object
-c = playerc_client(None, 'localhost', 6665)
-# Connect it
-if c.connect() != 0:
- raise playerc_error_str()
-
-# Create a proxy for position2d:0
-p = playerc_position2d(c,0)
-if p.subscribe(PLAYERC_OPEN_MODE) != 0:
- raise playerc_error_str()
-
-# Retrieve the geometry
-if p.get_geom() != 0:
- raise playerc_error_str()
-print 'Robot size: (%.3f,%.3f)' % (p.size[0], p.size[1])
-
-# Create a proxy for laser:0
-l = playerc_laser(c,0)
-if l.subscribe(PLAYERC_OPEN_MODE) != 0:
- raise playerc_error_str()
-
-# Retrieve the geometry
-if l.get_geom() != 0:
- raise playerc_error_str()
-#print 'Laser pose: (%.3f,%.3f,%.3f)' % (l.pose[0],l.pose[1],l.pose[2])
-
-while True:
- if c.read() == None:
- raise playerc_error_str()
- minR = l.min_right
- minL = l.min_left
-
- print "minR:", minR, "minL:", minL
- left = (1e5*minR)/500-100
- right = (1e5*minL)/500-100
-
- if left > 100:
- left = 100
- if right > 100:
- right = 100
-
- newspeed = (right+left)/1e3
-
- newturnrate = (right-left)
- newturnrate = limit(newturnrate, -40.0, 40.0)
- newturnrate = math.radians(newturnrate)
-
- print "speed: ", newspeed, "turn: ", newturnrate
- print help(p.set_cmd_vel)
-
- p.set_cmd_vel(newspeed, newspeed, newturnrate, 1)
-
-# Clean up
-p.unsubscribe()
-l.unsubscribe()
-c.disconnect()
-
-
-
Modified: code/player/trunk/libplayercore/bindings/java/main.java
===================================================================
--- code/player/trunk/libplayercore/bindings/java/main.java 2009-07-28
03:50:55 UTC (rev 8146)
+++ code/player/trunk/libplayercore/bindings/java/main.java 2009-07-28
06:24:55 UTC (rev 8147)
@@ -1,3 +1,24 @@
+/*
+ * Player - One Hell of a Robot Server
+ * Copyright (C) 2005
+ * Brian Gerkey
+ *
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
// Jplayercore defines the JNI classes that wrap the underlying C structs
// and C++ classes.
// Jplayercore also defines the standard (i.e., non-JNI) classes that
correspond
Modified: code/player/trunk/libplayercore/bindings/java/parse.py
===================================================================
--- code/player/trunk/libplayercore/bindings/java/parse.py 2009-07-28
03:50:55 UTC (rev 8146)
+++ code/player/trunk/libplayercore/bindings/java/parse.py 2009-07-28
06:24:55 UTC (rev 8147)
@@ -1,5 +1,24 @@
#!/usr/bin/env python
+# * Player - One Hell of a Robot Server
+# * Copyright 2005
+# * Brian Gerkey
+# *
+# *
+# * This library is free software; you can redistribute it and/or
+# * modify it under the terms of the GNU Lesser General Public
+# * License as published by the Free Software Foundation; either
+# * version 2.1 of the License, or (at your option) any later version.
+# *
+# * This library is distributed in the hope that it will be useful,
+# * but WITHOUT ANY WARRANTY; without even the implied warranty of
+# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# * Lesser General Public License for more details.
+# *
+# * You should have received a copy of the GNU Lesser General Public
+# * License along with this library; if not, write to the Free Software
+# * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
import re
import string
import sys
Modified: code/player/trunk/libplayercore/bindings/java/playercore_java.i
===================================================================
--- code/player/trunk/libplayercore/bindings/java/playercore_java.i
2009-07-28 03:50:55 UTC (rev 8146)
+++ code/player/trunk/libplayercore/bindings/java/playercore_java.i
2009-07-28 06:24:55 UTC (rev 8147)
@@ -1,4 +1,25 @@
-// Specify the module name and enable "directors", which we need in
+/*
+ * Player - One Hell of a Robot Server
+ * Copyright (C) 2005
+ * Brian Gerkey
+ *
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+ // Specify the module name and enable "directors", which we need in
// order to be able to extend the Driver class in Java and have the virtual
// methods work correctly.
%module(directors="1") playercore_java
Modified: code/player/trunk/libplayerjpeg/playerjpeg.c
===================================================================
--- code/player/trunk/libplayerjpeg/playerjpeg.c 2009-07-28 03:50:55 UTC
(rev 8146)
+++ code/player/trunk/libplayerjpeg/playerjpeg.c 2009-07-28 06:24:55 UTC
(rev 8147)
@@ -1,3 +1,24 @@
+/*
+ * Player - One Hell of a Robot Server
+ * Copyright (C) 2005
+ * Brian Gerkey, Andrew Howard
+ *
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
/* $Author$
* $Name$
* $Id$
Modified: code/player/trunk/libplayerjpeg/playerjpeg.h
===================================================================
--- code/player/trunk/libplayerjpeg/playerjpeg.h 2009-07-28 03:50:55 UTC
(rev 8146)
+++ code/player/trunk/libplayerjpeg/playerjpeg.h 2009-07-28 06:24:55 UTC
(rev 8147)
@@ -1,3 +1,24 @@
+/*
+ * Player - One Hell of a Robot Server
+ * Copyright (C) 2005
+ * Brian Gerkey, Andrew Howard
+ *
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
/* $Author$
* $Name$
* $Id$
Modified: code/player/trunk/libplayertcp/bindings/java/main.java
===================================================================
--- code/player/trunk/libplayertcp/bindings/java/main.java 2009-07-28
03:50:55 UTC (rev 8146)
+++ code/player/trunk/libplayertcp/bindings/java/main.java 2009-07-28
06:24:55 UTC (rev 8147)
@@ -1,3 +1,24 @@
+/*
+ * Player - One Hell of a Robot Server
+ * Copyright (C) 2005
+ * Brian Gerkey
+ *
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
// Jplayercore defines the JNI classes that wrap the underlying C structs
// and C++ classes.
Modified: code/player/trunk/libplayertcp/bindings/java/playertcp_java.i
===================================================================
--- code/player/trunk/libplayertcp/bindings/java/playertcp_java.i
2009-07-28 03:50:55 UTC (rev 8146)
+++ code/player/trunk/libplayertcp/bindings/java/playertcp_java.i
2009-07-28 06:24:55 UTC (rev 8147)
@@ -1,4 +1,25 @@
-%module playertcp_java
+/*
+ * Player - One Hell of a Robot Server
+ * Copyright (C) 2005
+ * Brian Gerkey
+ *
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+ %module playertcp_java
%include "typemaps.i"
%include "arrays_java.i"
Modified: code/player/trunk/libplayertcp/playertcp_errutils.h
===================================================================
--- code/player/trunk/libplayertcp/playertcp_errutils.h 2009-07-28 03:50:55 UTC
(rev 8146)
+++ code/player/trunk/libplayertcp/playertcp_errutils.h 2009-07-28 06:24:55 UTC
(rev 8147)
@@ -1,3 +1,24 @@
+/*
+ * Player - One Hell of a Robot Server
+ * Copyright (C) 2009
+ * Geoff Biggs
+ *
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
#if defined (WIN32)
#define ErrNo WSAGetLastError()
#else
Modified: code/player/trunk/server/codetools/find_no_copyright.sh
===================================================================
--- code/player/trunk/server/codetools/find_no_copyright.sh 2009-07-28
03:50:55 UTC (rev 8146)
+++ code/player/trunk/server/codetools/find_no_copyright.sh 2009-07-28
06:24:55 UTC (rev 8147)
@@ -1,2 +1,2 @@
#!/bin/bash
-grep -c "[Cc]opyright" `for ext in .h .hh .hpp .c .cc .cxx .cpp .py .rb .i; do
find -iname "*$ext"; done | grep -v ^./build` | grep 0$ | sort | sed -e "s/:0//"
+grep -c "[Cc]opyright" `for ext in .h .hh .hpp .c .cc .cxx .cpp .py .rb .i
.java; do find -iname "*$ext"; done | grep -v ^./build` | grep 0$ | sort | sed
-e "s/:0//"
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
