[Issue #783] Fixed cameras showing the same image, and updated copyright

src/drivers/gazeboserver/plugins/turtlebot/CMakeLists.txt

@@ -25,15 +25,13 @@ set(SOURCES src/turtlebotplugin.cc
         src/turtlebotcontrol.cc
         src/turtlebotsensors.cc
 
-        src/cameraproxy.cc
 
         src/interfaces/motorsi.cpp
         src/interfaces/laseri.cpp
         src/interfaces/pose3di.cpp
         #src/interfaces/kinectPlugini.cpp
         src/interfaces/camerai.cpp
         src/interfaces/bumperi.cpp
-        src/interfaces/pushcamerai.cpp
         src/interfaces/cameraibase.cpp
 )
 

src/drivers/gazeboserver/plugins/turtlebot/include/turtlebot/debugtools.h

@@ -13,8 +13,9 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see http://www.gnu.org/licenses/.
- *  Authors :
- *       Victor Arribas Raigadas <v.arribas.urjc@gmai.com>
+ *
+ *  CLONE of https://github.com/jderobot-varribas/gazeboplugin-quadrotor2/blob/2.1.0/include/quadrotor/interfaces/cameraibase.h
+ *  Victor Arribas Raigadas <v.arribas.urjc@gmai.com>
  */
 
 

src/drivers/gazeboserver/plugins/turtlebot/include/turtlebot/interfaces/bumperi.h

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 1997-2015 JDE Developers Team
+ *  Copyright (C) 1997-2017 JDeRobot Developers Team
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by

src/drivers/gazeboserver/plugins/turtlebot/include/turtlebot/interfaces/camerai.h

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 1997-2015 JDE Developers Team
+ *  Copyright (C) 1997-2017 JDE Developers Team
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -13,8 +13,12 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see http://www.gnu.org/licenses/.
- *  Authors :
- *       Victor Arribas Raigadas <v.arribas.urjc@gmai.com>
+ *
+ *  REMIX of https://github.com/jderobot-varribas/gazeboplugin-quadrotor2/blob/2.1.0/include/quadrotor/interfaces/camerai.h
+ *  Victor Arribas Raigadas <v.arribas.urjc@gmai.com>
+ *  
+ *  Authors:
+ *       Francisco Perez Salgado <f.pererz475@gmai.com>
  */
 
 #ifndef CAMERAI_H
@@ -32,14 +36,15 @@ namespace interfaces{
 
 class CameraI: public turtlebot::interfaces::CameraIBase {
 public:
-    CameraI (const turtlebot::TurtlebotSensors *sensor);
+    CameraI (const turtlebot::TurtlebotSensors *sensor, int cam_id);
     virtual ~CameraI ();
 
-    const int cam_id = TurtlebotSensors::CAM_LEFT;
 
 private:
     cv::Mat imgCached;
     const turtlebot::TurtlebotSensors *sensor;
+    const int cam_id;
+
 
 /// Gazebo
 private:

src/drivers/gazeboserver/plugins/turtlebot/include/turtlebot/interfaces/cameraibase.h

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 1997-2015 JDE Developers Team
+ *  Copyright (C) 1997-2017 JDE Developers Team
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -13,8 +13,10 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see http://www.gnu.org/licenses/.
- *  Authors :
- *       Victor Arribas Raigadas <v.arribas.urjc@gmai.com>
+ *
+ *  CLONE of https://github.com/jderobot-varribas/gazeboplugin-quadrotor2/blob/2.1.0/include/quadrotor/interfaces/cameraibase.h
+ *  Victor Arribas Raigadas <v.arribas.urjc@gmai.com>
+ *  
  */
 
 #ifndef CAMERAIBASE_H

src/drivers/gazeboserver/plugins/turtlebot/include/turtlebot/interfaces/laseri.h

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 1997-2015 JDE Developers Team
+ *  Copyright (C) 1997-2017 JDE Developers Team
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -14,7 +14,8 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see http://www.gnu.org/licenses/.
  *  Authors :
- *       Victor Arribas Raigadas <v.arribas.urjc@gmai.com>
+ *       Francisco Perez Salgado <f.pererz475@gmai.com>
+ *       Aitor Martinez Fernandez <aitor.martinez.fernandez@gmail.com>
  */
 
 #ifndef LASER_H

src/drivers/gazeboserver/plugins/turtlebot/include/turtlebot/interfaces/motorsi.h

@@ -1,3 +1,22 @@
+/*
+ *  Copyright (C) 1997-2017 JDE Developers Team
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program 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 General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see http://www.gnu.org/licenses/.
+ *  Authors :
+ *       Francisco Perez Salgado <f.pererz475@gmai.com>
+ */
+
 #ifndef MOTORSI_H
 #define MOTORSI_H
 

src/drivers/gazeboserver/plugins/turtlebot/include/turtlebot/interfaces/pose3di.h

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 1997-2015 JDE Developers Team
+ *  Copyright (C) 1997-2017 JDE Developers Team
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -13,8 +13,9 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see http://www.gnu.org/licenses/.
- *  Authors :
- *       Victor Arribas Raigadas <v.arribas.urjc@gmai.com>
+ *
+ *  CLONE of https://github.com/jderobot-varribas/gazeboplugin-quadrotor2/blob/2.1.0/include/quadrotor/interfaces/pose3di.h
+ *  Victor Arribas Raigadas <v.arribas.urjc@gmai.com>
  */
 
 

src/drivers/gazeboserver/plugins/turtlebot/include/turtlebot/turtlebotcontrol.hh

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 1997-2015 JDE Developers Team
+ *  Copyright (C) 1997-2017 JDE Developers Team
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -13,8 +13,12 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see http://www.gnu.org/licenses/.
- *  Authors :
- *       Victor Arribas Raigadas <v.arribas.urjc@gmai.com>
+ *
+ *  REMIX of https://github.com/jderobot-varribas/gazeboplugin-quadrotor2/blob/2.1.0/include/quadrotor/quadrotorcontrol.hh
+ *  Victor Arribas Raigadas <v.arribas.urjc@gmai.com>
+ *  
+ *  Authors:
+ *       Francisco Perez Salgado <f.pererz475@gmai.com>
  */
 
 #ifndef TURTLEBOTCONTROL_H

src/drivers/gazeboserver/plugins/turtlebot/include/turtlebot/turtlebotice.hh

@@ -13,8 +13,12 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see http://www.gnu.org/licenses/.
- *  Authors :
- *       Victor Arribas Raigadas <v.arribas.urjc@gmai.com>
+ *
+ *  REMIX of https://github.com/jderobot-varribas/gazeboplugin-quadrotor2/blob/2.1.0/include/quadrotor/quadrotorice.hh
+ *  Victor Arribas Raigadas <v.arribas.urjc@gmai.com>
+ *  
+ *  Authors:
+ *       Francisco Perez Salgado <f.pererz475@gmai.com>
  */
 
 #ifndef TURTLEBOTICE_H
@@ -32,13 +36,12 @@
 #include <turtlebot/interfaces/kinectPlugini.h>
 #include <turtlebot/interfaces/motorsi.h>
 #include <turtlebot/interfaces/pose3di.h>
-#include <turtlebot/interfaces/pushcamerai.h>
+#include <turtlebot/interfaces/camerai.h>
 #include <turtlebot/interfaces/laseri.h>
 #include <turtlebot/interfaces/bumperi.h>
 
 #include <turtlebot/turtlebotsensors.hh>
 #include <turtlebot/turtlebotcontrol.hh>
-#include <turtlebot/cameraproxy.hh>
 
 #include <turtlebot/debugtools.h>
 
@@ -47,7 +50,7 @@ namespace turtlebot{
 class TurtlebotIce
 {
 public:
-    TurtlebotIce(Ice::CommunicatorPtr ic, const TurtlebotSensors *sensors, TurtlebotControl *control, CameraProxy *camproxy);
+    TurtlebotIce(Ice::CommunicatorPtr ic, const TurtlebotSensors *sensors, TurtlebotControl *control);
     virtual ~TurtlebotIce();
 
     void run();
@@ -67,7 +70,6 @@ private:
 private:
     const TurtlebotSensors *sensor;
     TurtlebotControl *control;
-    CameraProxy *camproxy;
     boost::mutex lock;
 
 };

src/drivers/gazeboserver/plugins/turtlebot/include/turtlebot/turtlebotplugin.hh

@@ -13,8 +13,12 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see http://www.gnu.org/licenses/.
- *  Authors :
- *       Victor Arribas Raigadas <v.arribas.urjc@gmai.com>
+ *
+ *  REMIX of https://github.com/jderobot-varribas/gazeboplugin-quadrotor2/blob/2.1.0/include/quadrotor/quadrotorplugin.hh
+ *  Victor Arribas Raigadas <v.arribas.urjc@gmai.com>
+ *  
+ *  Authors:
+ *       Francisco Perez Salgado <f.pererz475@gmai.com>
  */
 
 #ifndef TURTLEBOTPLUGIN_H
@@ -29,7 +33,6 @@
 #include <turtlebot/turtlebotsensors.hh>
 #include <turtlebot/turtlebotcontrol.hh>
 #include <turtlebot/turtlebotice.hh>
-#include <turtlebot/cameraproxy.hh>
 
 #include <turtlebot/debugtools.h>
 
@@ -45,7 +48,6 @@ public:
 private:
     TurtlebotSensors sensors;
     TurtlebotControl control;
-    CameraProxy cameraproxy;
 
 
 /// Gazebo

src/drivers/gazeboserver/plugins/turtlebot/include/turtlebot/turtlebotsensors.hh

@@ -13,8 +13,12 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see http://www.gnu.org/licenses/.
- *  Authors :
- *       Victor Arribas Raigadas <v.arribas.urjc@gmai.com>
+ *
+ *  REMIX of https://github.com/jderobot-varribas/gazeboplugin-quadrotor2/blob/2.1.0/include/quadrotor/quadrotorsensors.hh
+ *  Victor Arribas Raigadas <v.arribas.urjc@gmai.com>
+ *  
+ *  Authors:
+ *       Francisco Perez Salgado <f.pererz475@gmai.com>
  */