From 30f4e3b3a534a377c7b390c928d40049e9b63956 Mon Sep 17 00:00:00 2001
From: jenniferdavid <jenniferdavid87@gmail.com>
Date: Mon, 19 Nov 2018 15:24:35 +0100
Subject: [PATCH] Update detect_object_server.py
---
.../src/scripts/detect_object_server.py | 35 ++-----------------
1 file changed, 3 insertions(+), 32 deletions(-)
diff --git a/simulation_control/src/scripts/detect_object_server.py b/simulation_control/src/scripts/detect_object_server.py
index 196cede..16b5c2a 100644
--- a/simulation_control/src/scripts/detect_object_server.py
+++ b/simulation_control/src/scripts/detect_object_server.py
@@ -1,39 +1,10 @@
-'''Object detection for F651
-
- Copyright (C) 2018, CPS2018 Challenge by Team Halmstad. All rights reserved.
-
- BSD license:
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
- 1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- 2. 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.
- 3. Neither the name of the copyright holder nor the names of
- contributors to this software may be used to endorse or promote
- products derived from this software without specific prior written
- permission.
-
- THIS SOFTWARE IS PROVIDED BY THE AUTHORS 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
- HOLDER OR THE CONTRIBUTORS TO THIS SOFTWARE 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.
- '''
#!/usr/bin/env python
import rospy
import actionlib
import simulation_control.msg
-
+'''Object detection for F651
+ Copyright (C) 2018, CPS2018 Challenge by Team Halmstad. All rights reserved.
+ '''
from geometry_msgs.msg import PoseStamped, Point
class detect_object_server():
def __init__(self):
--
GitLab