[Jderobot-admin] jderobot-r1147 - in trunk/src/stable/components/naoserver: . functions hinges interfaces/cpp/jderobot interfaces/slice/jderobot
bmenendez en jderobot.org
bmenendez en jderobot.org
Sab Ene 25 21:27:32 CET 2014
Author: bmenendez
Date: 2014-01-25 21:27:32 +0100 (Sat, 25 Jan 2014)
New Revision: 1147
Added:
trunk/src/stable/components/naoserver/functions/ImageConstants.h
trunk/src/stable/components/naoserver/hinges/HingeEncoders.cpp
trunk/src/stable/components/naoserver/hinges/HingeEncoders.h
trunk/src/stable/components/naoserver/hinges/LeftAnkleEncoders.cpp
trunk/src/stable/components/naoserver/hinges/LeftAnkleEncoders.h
trunk/src/stable/components/naoserver/hinges/LeftElbowEncoders.cpp
trunk/src/stable/components/naoserver/hinges/LeftElbowEncoders.h
trunk/src/stable/components/naoserver/hinges/LeftHipEncoders.cpp
trunk/src/stable/components/naoserver/hinges/LeftHipEncoders.h
trunk/src/stable/components/naoserver/hinges/LeftKneeEncoders.cpp
trunk/src/stable/components/naoserver/hinges/LeftKneeEncoders.h
trunk/src/stable/components/naoserver/hinges/LeftShoulderEncoders.cpp
trunk/src/stable/components/naoserver/hinges/LeftShoulderEncoders.h
trunk/src/stable/components/naoserver/hinges/NeckEncoders.cpp
trunk/src/stable/components/naoserver/hinges/NeckEncoders.h
trunk/src/stable/components/naoserver/hinges/RightAnkleEncoders.cpp
trunk/src/stable/components/naoserver/hinges/RightAnkleEncoders.h
trunk/src/stable/components/naoserver/hinges/RightElbowEncoders.cpp
trunk/src/stable/components/naoserver/hinges/RightElbowEncoders.h
trunk/src/stable/components/naoserver/hinges/RightHipEncoders.cpp
trunk/src/stable/components/naoserver/hinges/RightHipEncoders.h
trunk/src/stable/components/naoserver/hinges/RightKneeEncoders.cpp
trunk/src/stable/components/naoserver/hinges/RightKneeEncoders.h
trunk/src/stable/components/naoserver/hinges/RightShoulderEncoders.cpp
trunk/src/stable/components/naoserver/hinges/RightShoulderEncoders.h
Removed:
trunk/src/stable/components/naoserver/build-robot/
trunk/src/stable/components/naoserver/functions/vision/
trunk/src/stable/components/naoserver/interfaces/cpp/jderobot/camera.cpp
trunk/src/stable/components/naoserver/interfaces/cpp/jderobot/camera.h
trunk/src/stable/components/naoserver/interfaces/cpp/jderobot/common.cpp
trunk/src/stable/components/naoserver/interfaces/cpp/jderobot/common.h
trunk/src/stable/components/naoserver/interfaces/cpp/jderobot/containers.cpp
trunk/src/stable/components/naoserver/interfaces/cpp/jderobot/containers.h
trunk/src/stable/components/naoserver/interfaces/cpp/jderobot/datetime.cpp
trunk/src/stable/components/naoserver/interfaces/cpp/jderobot/datetime.h
trunk/src/stable/components/naoserver/interfaces/cpp/jderobot/encoders.cpp
trunk/src/stable/components/naoserver/interfaces/cpp/jderobot/encoders.h
trunk/src/stable/components/naoserver/interfaces/cpp/jderobot/exceptions.cpp
trunk/src/stable/components/naoserver/interfaces/cpp/jderobot/exceptions.h
trunk/src/stable/components/naoserver/interfaces/cpp/jderobot/image.cpp
trunk/src/stable/components/naoserver/interfaces/cpp/jderobot/image.h
trunk/src/stable/components/naoserver/interfaces/cpp/jderobot/motors.cpp
trunk/src/stable/components/naoserver/interfaces/cpp/jderobot/motors.h
trunk/src/stable/components/naoserver/interfaces/cpp/jderobot/naofollowball.cpp
trunk/src/stable/components/naoserver/interfaces/cpp/jderobot/naofollowball.h
trunk/src/stable/components/naoserver/interfaces/cpp/jderobot/naomotions.cpp
trunk/src/stable/components/naoserver/interfaces/cpp/jderobot/naomotions.h
trunk/src/stable/components/naoserver/interfaces/cpp/jderobot/pose3dencoders.cpp
trunk/src/stable/components/naoserver/interfaces/cpp/jderobot/pose3dencoders.h
trunk/src/stable/components/naoserver/interfaces/cpp/jderobot/pose3dmotors.cpp
trunk/src/stable/components/naoserver/interfaces/cpp/jderobot/pose3dmotors.h
trunk/src/stable/components/naoserver/interfaces/slice/jderobot/naofollowball.ice
Modified:
trunk/src/stable/components/naoserver/CMakeLists.txt
trunk/src/stable/components/naoserver/GenerateJderobot.cmake
trunk/src/stable/components/naoserver/functions/NaoServerCamera.cpp
trunk/src/stable/components/naoserver/functions/NaoServerCamera.h
trunk/src/stable/components/naoserver/hinges/Common.h
trunk/src/stable/components/naoserver/hinges/HingeMotors.cpp
trunk/src/stable/components/naoserver/hinges/HingeMotors.h
trunk/src/stable/components/naoserver/hinges/NeckSpeed.cpp
trunk/src/stable/components/naoserver/hinges/NeckSpeed.h
trunk/src/stable/components/naoserver/naoserver.cpp
trunk/src/stable/components/naoserver/naoserver.h
Log:
#147 NaoServer updated, it was outdated.
Modified: trunk/src/stable/components/naoserver/CMakeLists.txt
===================================================================
--- trunk/src/stable/components/naoserver/CMakeLists.txt 2014-01-25 18:44:50 UTC (rev 1146)
+++ trunk/src/stable/components/naoserver/CMakeLists.txt 2014-01-25 20:27:32 UTC (rev 1147)
@@ -15,7 +15,6 @@
interfaces/slice
hinges
functions
- functions/vision
include
)
@@ -32,24 +31,18 @@
interfaces/cpp/jderobot/pose3dmotors.cpp interfaces/cpp/jderobot/pose3dmotors.h
interfaces/cpp/jderobot/pose3dencoders.cpp interfaces/cpp/jderobot/pose3dencoders.h
interfaces/cpp/jderobot/naomotions.cpp interfaces/cpp/jderobot/naomotions.h
-interfaces/cpp/jderobot/naofollowball.cpp interfaces/cpp/jderobot/naofollowball.h
-functions/vision/VisionDefinitions.h
-functions/vision/ImageInput.cpp functions/vision/ImageInput.h
-functions/vision/ImageHandler.cpp functions/vision/ImageHandler.h
-functions/vision/colorFilter/SimpleColorFilter.cpp functions/vision/colorFilter/SimpleColorFilter.h
functions/Dictionary.cpp functions/Dictionary.h
-#functions/NaoServerCamera.cpp functions/NaoServerCamera.h
+functions/NaoServerCamera.cpp functions/NaoServerCamera.h
functions/NaoServerMotors.cpp functions/NaoServerMotors.h
functions/NaoServerMotions.cpp functions/NaoServerMotions.h
hinges/Singleton.h
hinges/Common.h
-hinges/JointControl.cpp hinges/JointControl.h
-hinges/PIDController.cpp hinges/PIDController.h
+
hinges/HingeMotors.cpp hinges/HingeMotors.h
hinges/NeckMotors.cpp hinges/NeckMotors.h
-#hinges/NeckSpeed.cpp hinges/NeckSpeed.h
+hinges/NeckSpeed.cpp hinges/NeckSpeed.h
hinges/LeftShoulderMotors.cpp hinges/LeftShoulderMotors.h
hinges/RightShoulderMotors.cpp hinges/RightShoulderMotors.h
hinges/LeftElbowMotors.cpp hinges/LeftElbowMotors.h
@@ -60,7 +53,20 @@
hinges/RightKneeMotors.cpp hinges/RightKneeMotors.h
hinges/LeftAnkleMotors.cpp hinges/LeftAnkleMotors.h
hinges/RightAnkleMotors.cpp hinges/RightAnkleMotors.h
-#hinges/NaoFollowBall.cpp hinges/NaoFollowBall.h
+
+hinges/HingeEncoders.cpp hinges/HingeEncoders.h
+hinges/NeckEncoders.cpp hinges/NeckEncoders.h
+hinges/LeftShoulderEncoders.cpp hinges/LeftShoulderEncoders.h
+hinges/RightShoulderEncoders.cpp hinges/RightShoulderEncoders.h
+hinges/LeftElbowEncoders.cpp hinges/LeftElbowEncoders.h
+hinges/RightElbowEncoders.cpp hinges/RightElbowEncoders.h
+hinges/LeftHipEncoders.cpp hinges/LeftHipEncoders.h
+hinges/RightHipEncoders.cpp hinges/RightHipEncoders.h
+hinges/LeftKneeEncoders.cpp hinges/LeftKneeEncoders.h
+hinges/RightKneeEncoders.cpp hinges/RightKneeEncoders.h
+hinges/LeftAnkleEncoders.cpp hinges/LeftAnkleEncoders.h
+hinges/RightAnkleEncoders.cpp hinges/RightAnkleEncoders.h
+
naoserver.cpp naoserver.h
mainServer.cpp
)
Modified: trunk/src/stable/components/naoserver/GenerateJderobot.cmake
===================================================================
--- trunk/src/stable/components/naoserver/GenerateJderobot.cmake 2014-01-25 18:44:50 UTC (rev 1146)
+++ trunk/src/stable/components/naoserver/GenerateJderobot.cmake 2014-01-25 20:27:32 UTC (rev 1147)
@@ -3,7 +3,7 @@
## Update: 25/01/2012 by Gonzalo Abella
##------------------------------------------------------------
-set(SLICE2CPPE ${PROJECT_SOURCE_DIR}/bin/slice2cppe)
+set(SLICE2CPPE /opt/IceE-1.3.0/bin/slice2cppe)
### Bica for jderobot begin
@@ -11,6 +11,15 @@
set(JDEROBOT_OUTPUT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/interfaces/cpp/jderobot)
set (JDEROBOT_FILES
+ camera
+ common
+ containers
+ datetime
+ encoders
+ exceptions
+ image
+ motors
+ naomotions
pose3dmotors
pose3dencoders
)
@@ -21,5 +30,20 @@
execute_process(COMMAND ${SLICE2CPPE} ${args})
endforeach()
+#foreach (file ${JDEROBOT_FILES})
+# set (jderobot_file ${file})
+# get_filename_component (jderobot_file_name ${jderobot_file} NAME_WE)
+
+# set(args --output-dir=${JDEROBOT_OUTPUT_DIR} -I. -I${JDEROBOT_ICEFILES_DIR}/${jderobot_file})
+
+# message("args: " ${args})
+
+# ADD_CUSTOM_COMMAND (
+# OUTPUT ${JDEROBOT_OUTPUT_DIR}/${jderobot_file_name}.cpp ${JDEROBOT_OUTPUT_DIR}/${jderobot_file_name}.h
+# DEPENDS ${JDEROBOT_ICEFILES_DIR}/${jderobot_file}
+# COMMAND ${SLICE2CPP} ${args}
+# )
+#endforeach()
+
### Bica for jderobot end
Added: trunk/src/stable/components/naoserver/functions/ImageConstants.h
===================================================================
--- trunk/src/stable/components/naoserver/functions/ImageConstants.h (rev 0)
+++ trunk/src/stable/components/naoserver/functions/ImageConstants.h 2014-01-25 20:27:32 UTC (rev 1147)
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 1997-2013 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
+ * the Free Software Foundation; either version 2 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 Library 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 : Borja Menéndez <borjamonserrano en gmail.com>
+ *
+ */
+
+#ifndef IMAGECONSTANTS_H
+#define IMAGECONSTANTS_H
+
+const int UPPER_CAMERA = 0;
+const int LOWER_CAMERA = 1;
+
+const int IMG_WIDTH = 320;
+const int IMG_HEIGHT = 240;
+const int IMG_CHANNELS = 3;
+const int IMG_CHANNELS_YUV = 2;
+const int BYTES_PER_CHANNEL = 8;
+
+#endif // IMAGECONSTANTS_H
Modified: trunk/src/stable/components/naoserver/functions/NaoServerCamera.cpp
===================================================================
--- trunk/src/stable/components/naoserver/functions/NaoServerCamera.cpp 2014-01-25 18:44:50 UTC (rev 1146)
+++ trunk/src/stable/components/naoserver/functions/NaoServerCamera.cpp 2014-01-25 20:27:32 UTC (rev 1147)
@@ -21,125 +21,225 @@
#include "NaoServerCamera.h"
const string NaoServerCamera::UPPER_CAMERA_CONFIG_FILE =
- "/home/nao/bica/conf/ballPerception/cameraUpper.conf";
+ "/home/nao/bica/conf/ballPerception/cameraUpper.conf";
const string NaoServerCamera::LOWER_CAMERA_CONFIG_FILE =
- "/home/nao/bica/conf/ballPerception/cameraLower.conf";
+ "/home/nao/bica/conf/ballPerception/cameraLower.conf";
/*************************************************************
* CONSTRUCTOR
*************************************************************/
NaoServerCamera::NaoServerCamera () {
- colorFilter = SimpleColorFilter::getInstance();
- _ImageHandler = ImageHandler::getInstance();
-
- camera_initialized = false;
-
camConfUpper.createDictionary();
camConfLower.createDictionary();
pthread_mutex_init(&mutex, NULL);
+
+ jderobot::ImageDescriptionPtr imgDescription(new jderobot::ImageDescription);
+ imgDescription->width = IMG_WIDTH;
+ imgDescription->height = IMG_HEIGHT;
+ imgDescription->size = IMG_WIDTH * IMG_HEIGHT * IMG_CHANNELS;
+ imgDescription->format = "YUV888";
+}
- this->imgDebug.arrayReserve(ImageInput::IMG_WIDTH * ImageInput::IMG_HEIGHT * ImageInput::IMG_CHANNELS * sizeof(char));
- this->colorSrc = new char[ImageInput::IMG_WIDTH * ImageInput::IMG_HEIGHT * ImageInput::IMG_CHANNELS];
+/*************************************************************
+ * DESTRUCTOR
+ *************************************************************/
+NaoServerCamera::~NaoServerCamera () {
+ try {
+ pcamera->unsubscribe(fLEMname);
+ } catch (AL::ALError& e) {
+ cerr << "Unable to unsubscribe Lem: " << e.toString() << endl;
+ }
+}
- jderobot::ImageDescriptionPtr imgDescription(new jderobot::ImageDescription);
- imgDescription->width = ImageInput::IMG_WIDTH;
- imgDescription->height = ImageInput::IMG_HEIGHT;
- imgDescription->size = ImageInput::IMG_WIDTH * ImageInput::IMG_HEIGHT * ImageInput::IMG_CHANNELS;
- imgDescription->format = "YUV888";
+/*************************************************************
+ * CAMERA
+ *************************************************************/
+jderobot::ImageDescriptionPtr NaoServerCamera::getImageDescription ( const Ice::Current& c ) {
+ return imgDescription;
+}
- newImageTaken = false;
+jderobot::ImageDataPtr NaoServerCamera::getImageData ( const Ice::Current& c ) {
+/* struct timeval a, b;
+ long diff;
+ long totala, totalb;
+
+ gettimeofday(&a, NULL);
+ totala = a.tv_sec * 1000000 + a.tv_usec;
+*/
+ int imgSize = IMG_WIDTH * IMG_HEIGHT * IMG_CHANNELS;
+
+ jderobot::ImageDataPtr reply(new jderobot::ImageData);
+ reply->description = new jderobot::ImageDescription();
+ reply->description->width = IMG_WIDTH;
+ reply->description->height = IMG_HEIGHT;
+ reply->description->size = imgSize;
+ reply->description->format = "RGB8";
+ IceUtil::Time t = IceUtil::Time::now();
+ reply->timeStamp.seconds = (long)t.toSeconds();
+ reply->timeStamp.useconds = (long)t.toMicroSeconds() - reply->timeStamp.seconds*1000000;
+ reply->pixelData.resize(imgSize);
+
+ pthread_mutex_lock(&mutex);
+
+// cout << "atrapado aqui" << endl;
+
+ memcpy(&(reply->pixelData[0]), img, imgSize);
+
+ pthread_mutex_unlock(&mutex);
+/*
+ gettimeofday(&b, NULL);
+ totalb = b.tv_sec * 1000000 + b.tv_usec;
+ diff = (totalb - totala) / 1000;
+
+ std::cout << "getting an image consume: " << diff << std::endl;
+*/
+ return reply;
+}
- struct timeval current;
- long current_m;
+jderobot::CameraDescriptionPtr NaoServerCamera::getCameraDescription ( const Ice::Current& c ) {
+ return NULL;
+}
- gettimeofday(¤t, NULL);
- current_m = current.tv_sec * 1000000 + current.tv_usec;
+Ice::Int NaoServerCamera::setCameraDescription ( const jderobot::CameraDescriptionPtr &description, const Ice::Current& c ) {
+ return 0;
+}
- lastTimeStamp = current_m;//newImage->fTimeStamp;
- wtime = 0;
+std::string NaoServerCamera::startCameraStreaming ( const Ice::Current& ) {
+ return "";
}
-void* NaoServerCamera::EntryPoint ( void* pthis ) {
- NaoServerCamera *pt = NaoServerCamera::getInstance();
- pt->Capture();
+void NaoServerCamera::stopCameraStreaming ( const Ice::Current& ) {}
+
+/*************************************************************
+ * ANOTHER FUNCTIONS
+ *************************************************************/
+void NaoServerCamera::init ( const string newName, AL::ALPtr<AL::ALBroker> parentBroker ) {
+ try {
+ pcamera = new AL::ALVideoDeviceProxy(parentBroker);
+ cam = pcamera->getParam(kCameraSelectID);
+ fLEMname = pcamera->subscribe(string("playerGVM"), kQVGA,
+// kYUV422InterlacedColorSpace, 30);
+ kRGBColorSpace, 15);
+ } catch ( AL::ALError& e ) {
+ cerr << "[Perception::initCamera()] " << e.toString() << endl;
+ }
+
+ loadCameraParams(UPPER_CAMERA_CONFIG_FILE, LOWER_CAMERA_CONFIG_FILE);
+
+ try {
+ pcamera->setParam(kCameraSelectID, UPPER_CAMERA);
+ this->cam = cam;
+ } catch (ALError& e) {
+ cerr << "Unable to change camera: " << e.toString() << endl;
+ }
+
+ pthread_t update_thread;
+ int rc;
+ rc = pthread_create(&update_thread, NULL, NaoServerCamera::updateThread, NULL);
+
+ if (rc){
+ std::cout << "ERROR; return code from pthread_create() is " << rc << std::endl;
+ exit(-1);
+ }
}
-void NaoServerCamera::Capture () {
- struct timeval s1;
+void* NaoServerCamera::updateThread ( void* obj ) {
+ NaoServerCamera* naoservercamera = NaoServerCamera::getInstance();
+ naoservercamera->capture();
+}
+void NaoServerCamera::capture () {
while (true) {
AL::ALImage* newImage = NULL;
try {
- newImage = (AL::ALImage*) (pcamera->getDirectRawImageLocal(fLEMname));
+// newImage = (AL::ALImage*) (pcamera->getDirectRawImageLocal(fLEMname));
+ newImage = (AL::ALImage*) (pcamera->getImageLocal(fLEMname));
} catch ( AL::ALError& e ) {
cerr << "[Perception::getImageLocal()] Error: " << e.toString() << endl;
}
-
+/*
+ struct timeval a, b;
+ long diff;
+ long totala, totalb;
+
+ gettimeofday(&a, NULL);
+ totala = a.tv_sec * 1000000 + a.tv_usec;
+*/
pthread_mutex_lock(&mutex);
- memcpy(imgBuff, (char*)(newImage->getData()), ImageInput::IMG_WIDTH * ImageInput::IMG_HEIGHT * ImageInput::IMG_CHANNELS_YUV);
-
+// cout << "trapped here!" << endl;
+// this->getColorRGB((char*)(newImage->getData()), img);
+ memcpy(img, (char*)(newImage->getData()), IMG_WIDTH * IMG_HEIGHT * IMG_CHANNELS);
pthread_mutex_unlock(&mutex);
-
- gettimeofday(&s1, NULL);
- newImageTaken = true;
- image_ts = s1.tv_sec * 1000000 + s1.tv_usec;
-
+/*
+ gettimeofday(&b, NULL);
+ totalb = b.tv_sec * 1000000 + b.tv_usec;
+ diff = (totalb - totala) / 1000;
+
+ std::cout << "updating the image consume: " << diff << std::endl;
+*/
try {
- pcamera->releaseDirectRawImage(fLEMname);
+// pcamera->releaseDirectRawImage(fLEMname);
+ pcamera->releaseImage(fLEMname);
} catch ( AL::ALError& e ) {
cerr << "Error in releasing image: " << e.toString() << endl;
}
}
}
-NaoServerCamera::~NaoServerCamera () {
- try {
- pcamera->unsubscribe(fLEMname);
- } catch (AL::ALError& e) {
- cerr << "Unable to unsubscribe Lem: " << e.toString() << endl;
- }
+void NaoServerCamera::getColorRGB ( char* source, char* destiny ) {
+ char r, g, b;
+ int row, col;
+ int pixel;
- cvReleaseImage(&cvImage);
- cvReleaseImage(&cvAux);
+ for ( col = 0; col < IMG_WIDTH; col++ ) {
+ for ( row = 0; row < IMG_HEIGHT; row++ ) {
+ // Get the values
+ this->getValues(source, col, row, r, g, b);
+
+ pixel = (row * IMG_WIDTH + col) * 3;
- delete this->colorSrc;
+ destiny[pixel] = r;
+ destiny[pixel+1] = g;
+ destiny[pixel+2] = b;
+ }
+ }
}
-void NaoServerCamera::init ( const string newName, AL::ALPtr<AL::ALBroker> parentBroker ) {
- try {
- pcamera = new AL::ALVideoDeviceProxy(parentBroker);
- cam = pcamera->getParam(kCameraSelectID);
- fLEMname = pcamera->subscribe(string("GVM"), kQQVGA,
- kYUV422InterlacedColorSpace, 30);
-// fLEMname = pcamera->subscribe(string("playerGVM"), kQVGA,
-// kYUV422InterlacedColorSpace, 30);
- } catch ( AL::ALError& e ) {
- cerr << "[Perception::initCamera()] " << e.toString() << endl;
- }
+void NaoServerCamera::getValues ( char* image, int col, int row, char &r, char &g, char &b ) {
+ unsigned char rt=0, gt=0, bt=0;
+ int pixel, posSrc;
- filterParams.arraySetSize(6);
+ pixel = row * IMG_WIDTH + col;
+ posSrc = pixel * 2;
- cvImage = cvCreateImage(cvSize(ImageInput::IMG_WIDTH, ImageInput::IMG_HEIGHT), ImageInput::BYTES_PER_CHANNEL, 2);
- cvAux = cvCreateImage(cvSize(ImageInput::IMG_WIDTH, ImageInput::IMG_HEIGHT), ImageInput::BYTES_PER_CHANNEL, ImageInput::IMG_CHANNELS);
+ /*Get real pixel color*/
+ if (pixel % 2 == 0)
+ this->yuv2rgb(image[posSrc], image[posSrc + 1], image[posSrc + 3], rt, gt, bt);
+ else
+ this->yuv2rgb(image[posSrc], image[posSrc - 1], image[posSrc + 1], rt, gt, bt);
- camera_initialized = true;
+ r = (char) bt;
+ g = (char) gt;
+ b = (char) rt;
+}
- for (int i = 0; i < 2; i++)
- loadCameraParams(UPPER_CAMERA_CONFIG_FILE, LOWER_CAMERA_CONFIG_FILE);
+void NaoServerCamera::yuv2rgb ( unsigned char Y, unsigned char U, unsigned char V,
+ unsigned char &R, unsigned char &G, unsigned char &B ) {
+ int r = Y + ((1436 * (V - 128)) >> 10),
+ g = Y - ((354 * (U - 128) + 732 * (V - 128)) >> 10),
+ b = Y + ((1814 * (U - 128)) >> 10);
- setCam(ImageInput::UPPER_CAMERA);
-
- int rc;
- rc = pthread_create(&capture_thread, NULL, NaoServerCamera::EntryPoint, this);
+ if(r < 0) r = 0; else if(r > 255) r = 255;
+ if(g < 0) g = 0; else if(g > 255) g = 255;
+ if(b < 0) b = 0; else if(b > 255) b = 255;
- if (rc){
- std::cout << "ERROR; return code from pthread_create() is " << rc << std::endl;
- exit(-1);
- }
+ //Crop RGB
+ R = (unsigned char) r;
+ G = (unsigned char) g;
+ B = (unsigned char) b;
}
-/*Camera parameters*/
void NaoServerCamera::loadCameraParams ( const string upper_file, const string lower_file ) {
Dictionary *conf;
ostringstream s;
@@ -154,9 +254,9 @@
newkCameraAutoWhiteBalanceID;
for (int cameraID = 1; cameraID >= 0; cameraID--) {
- if (cameraID == ImageInput::LOWER_CAMERA)
+ if (cameraID == LOWER_CAMERA)
conf = &camConfLower;
- else if (cameraID == ImageInput::UPPER_CAMERA)
+ else if (cameraID == UPPER_CAMERA)
conf = &camConfUpper;
else
s << "[Perception::loadCameraParams()] Bad camera identifier (" << cameraID << endl;
@@ -202,69 +302,3 @@
}
}
}
-
-void NaoServerCamera::setCam(const int cam) {
-// if (!camera_initialized)
-// initCamera();
-
- try {
- pcamera->setParam(kCameraSelectID, cam);
- this->cam = cam;
- } catch (ALError& e) {
- cerr << "Unable to change camera: " << e.toString() << endl;
- }
-}
-
-jderobot::ImageDataPtr NaoServerCamera::getImageData () {
- jderobot::ImageDataPtr reply(new jderobot::ImageData);
- reply->description = new jderobot::ImageDescription();
- reply->description->width = ImageInput::IMG_WIDTH;
- reply->description->height = ImageInput::IMG_HEIGHT;
- reply->description->size = ImageInput::IMG_WIDTH * ImageInput::IMG_HEIGHT * ImageInput::IMG_CHANNELS;
- reply->description->format = "RGB8";
-
- int imgSize = ImageInput::IMG_WIDTH * ImageInput::IMG_HEIGHT * ImageInput::IMG_CHANNELS * sizeof(char);
-
- IceUtil::Time t = IceUtil::Time::now();
- reply->timeStamp.seconds = (long)t.toSeconds();
- reply->timeStamp.useconds = (long)t.toMicroSeconds() - reply->timeStamp.seconds*1000000;
- reply->pixelData.resize(imgSize);
-
- IplImage* src;
-
- this->newImage();
- src = cvCreateImage(cvSize(ImageInput::IMG_WIDTH,ImageInput::IMG_HEIGHT),
- ImageInput::BYTES_PER_CHANNEL, ImageInput::IMG_CHANNELS);
-
- _ImageHandler->getImageRGBInverted(src->imageData, false, 0);
-
- memmove( &(reply->pixelData[0]), (char *) src->imageData, imgSize);//copy data to reply
-
- cvReleaseImage(&src);
-
- return reply;
-}
-
-bool NaoServerCamera::newImage () {
- if (newImageTaken) {
- long end, start;
- struct timeval s1;
-
- pthread_mutex_lock(&mutex);
-
- gettimeofday(&s1, NULL);
- start = s1.tv_sec * 1000000 + s1.tv_usec;
- _ImageHandler->setImage(cam, imgBuff, colorFilter);
- gettimeofday(&s1, NULL);
- end = s1.tv_sec * 1000000 + s1.tv_usec;
-
- pthread_mutex_unlock(&mutex);
-
- newImageTaken = false;
-
- wtime = (end-start);
- return true;
- } else {
- return false;
- }
-}
Modified: trunk/src/stable/components/naoserver/functions/NaoServerCamera.h
===================================================================
--- trunk/src/stable/components/naoserver/functions/NaoServerCamera.h 2014-01-25 18:44:50 UTC (rev 1146)
+++ trunk/src/stable/components/naoserver/functions/NaoServerCamera.h 2014-01-25 20:27:32 UTC (rev 1147)
@@ -38,34 +38,23 @@
#include "alcore/altypes.h"
#include "altools/alxplatform.h"
-#include "alcore/alptr.h"
-#include "alcommon/albroker.h"
-#include "alcommon/almodule.h"
#include "alcommon/albrokermanager.h"
#include "alcommon/altoolsmain.h"
-#include "alcore/alptr.h"
-#include "alproxies/alledsproxy.h"
-#include "alproxies/almemoryproxy.h"
-#include "alproxies/alsensorsproxy.h"
-#include "alproxies/alsonarproxy.h"
-#include "alproxies/alrobotposeproxy.h"
-#include "alcommon/alproxy.h"
-#include "alcommon/albroker.h"
-
-#include "Singleton.h"
-#include "ImageInput.h"
-#include "vision/colorFilter/SimpleColorFilter.h"
-#include "ImageHandler.h"
-
#include <IceE/IceE.h>
#include <camera.h>
+#include <iostream>
+#include <string>
+
+#include "ImageConstants.h"
+#include "Singleton.h"
+#include "Dictionary.h"
+
#include "opencv/cv.h"
#include "opencv/highgui.h"
using namespace std;
-using namespace jderobot;
namespace AL
{
@@ -73,70 +62,49 @@
}
using namespace AL;
-class NaoServerCamera : public Singleton<NaoServerCamera> {
+class NaoServerCamera : public Singleton<NaoServerCamera>, public jderobot::Camera {
public:
// Constructor
NaoServerCamera ();
// Destructor
- ~NaoServerCamera ();
-
+ virtual ~NaoServerCamera ();
+
+ /*Camera*/
+ jderobot::ImageDescriptionPtr getImageDescription ( const Ice::Current& c );
+ jderobot::ImageDataPtr getImageData ( const Ice::Current& c );
+ jderobot::CameraDescriptionPtr getCameraDescription ( const Ice::Current& c );
+ Ice::Int setCameraDescription ( const jderobot::CameraDescriptionPtr &description, const Ice::Current& c );
+ std::string startCameraStreaming ( const Ice::Current& );
+ void stopCameraStreaming ( const Ice::Current& );
+
+ // Another functions
void init ( const string newName, AL::ALPtr<AL::ALBroker> parentBroker );
-
- /*Camera*/
- jderobot::ImageDataPtr getImageData ();
+ void update ();
- ImageHandler *getImageHandler() {return _ImageHandler;};
-
- inline SimpleColorFilter* getColorFilter() { return this->colorFilter; };
- inline int getCam() { return cam; };
- inline void lock() { pthread_mutex_lock(&mutex); };
- inline void unlock() { pthread_mutex_unlock(&mutex); };
- void setCam(const int cam);
-
- // External methods
- int getCamParam(const int param);
-
- virtual void setCam (CameraType cam, const Ice::Current& c);
-
- long getImageTs() {return image_ts;};
-
private:
- void initCamera();
- bool newImage();
- void loadCameraParams(string upper_file, string lower_file);
-
+ AL::ALVideoDeviceProxy* pcamera;
+ jderobot::ImageDescriptionPtr imgDescription;
+
+ int cam;
+
+ pthread_mutex_t mutex;
+ Dictionary camConfUpper, camConfLower;
+
static const string UPPER_CAMERA_CONFIG_FILE;
static const string LOWER_CAMERA_CONFIG_FILE;
+ std::string fLEMname;
- int cam;
- bool camera_initialized;
- string fLEMname;
- AL::ALValue imgDebug, filterParams;
- char * colorSrc;
- IplImage *cvImage, *cvAux;
- pthread_mutex_t mutex;
- Dictionary camConfUpper, camConfLower;
- SimpleColorFilter *colorFilter;
-
- bool imageTaken;
-
- AL::ALVideoDeviceProxy *pcamera;
- jderobot::ImageDescriptionPtr imgDescription;
-
- ImageHandler * _ImageHandler;
-
- long long lastTimeStamp;
- long wtime;
-
- //capture thread
- pthread_t capture_thread;
- bool newImageTaken;
- char imgBuff[ImageInput::IMG_WIDTH * ImageInput::IMG_HEIGHT * ImageInput::IMG_CHANNELS_YUV];
- long image_ts;
-
protected:
- static void* EntryPoint(void*);
- void Capture();
+ char img[IMG_WIDTH * IMG_HEIGHT * IMG_CHANNELS];
+
+ static void* updateThread ( void* obj );
+ void capture ();
+
+ void getColorRGB ( char* source, char* destiny );
+ void getValues ( char* image, int col, int row, char &r, char &g, char &b );
+ void yuv2rgb ( unsigned char Y, unsigned char U, unsigned char V, unsigned char &R, unsigned char &G, unsigned char &B );
+ void loadCameraParams ( const string upper_file, const string lower_file );
};
-#endif
+
+#endif // NAOSERVERCAMERA_H
Modified: trunk/src/stable/components/naoserver/hinges/Common.h
===================================================================
--- trunk/src/stable/components/naoserver/hinges/Common.h 2014-01-25 18:44:50 UTC (rev 1146)
+++ trunk/src/stable/components/naoserver/hinges/Common.h 2014-01-25 20:27:32 UTC (rev 1147)
@@ -21,6 +21,13 @@
#ifndef COMMON_H
#define COMMON_H
+/**
+* defines the sign of a (-1 or 1)
+*/
+#ifndef sign
+#define sign(a) ( (a) < 0 ? -1 : 1 )
+#endif
+
const double pi = 3.1415926535897932384626433832795;
/** constant for a 1 degree*/
Added: trunk/src/stable/components/naoserver/hinges/HingeEncoders.cpp
===================================================================
--- trunk/src/stable/components/naoserver/hinges/HingeEncoders.cpp (rev 0)
+++ trunk/src/stable/components/naoserver/hinges/HingeEncoders.cpp 2014-01-25 20:27:32 UTC (rev 1147)
@@ -0,0 +1,69 @@
+/*
+ * Copyright (C) 1997-2013 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
+ * the Free Software Foundation; either version 2 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 Library 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 : Borja Menéndez <borjamonserrano en gmail.com>
+ *
+ */
+
+#include "HingeEncoders.h"
+
+/*************************************************************
+ * CONSTRUCTOR
+ *************************************************************/
+HingeEncoders::HingeEncoders () {}
+
+/*************************************************************
+ * DESTRUCTOR
+ *************************************************************/
+HingeEncoders::~HingeEncoders () {}
+
+/*************************************************************
+ * ANOTHER FUNCTIONS
+ *************************************************************/
+void HingeEncoders::init ( const std::string newName,
+ AL::ALPtr<AL::ALBroker> parentBroker ) {
+ this->name = newName;
+
+ try {
+ this->motion = parentBroker->getMotionProxy();
+ } catch ( AL::ALError& e ) {
+ std::cerr << "[HingeEncoders ()::init(): " << e.toString() << std::endl;
+ }
+}
+
+/*************************************************************
+ * POSE3DENCODERS
+ *************************************************************/
+jderobot::Pose3DEncodersDataPtr HingeEncoders::getPose3DEncodersData ( const Ice::Current& ) {
+ jderobot::Pose3DEncodersDataPtr pose3DEncodersData;
+
+ if (this->bPitch) {
+ std::vector<float> commandAngles = this->motion->getAngles(this->jointPitch, false);
+ pose3DEncodersData->tilt = commandAngles[0];
+ }
+
+ if (this->bYaw) {
+ std::vector<float> commandAngles = this->motion->getAngles(this->jointYaw, false);
+ pose3DEncodersData->pan = commandAngles[0];
+ }
+
+ if (this->bPitch) {
+ std::vector<float> commandAngles = this->motion->getAngles(this->jointRoll, false);
+ pose3DEncodersData->roll = commandAngles[0];
+ }
+
+ return pose3DEncodersData;
+};
Added: trunk/src/stable/components/naoserver/hinges/HingeEncoders.h
===================================================================
--- trunk/src/stable/components/naoserver/hinges/HingeEncoders.h (rev 0)
+++ trunk/src/stable/components/naoserver/hinges/HingeEncoders.h 2014-01-25 20:27:32 UTC (rev 1147)
@@ -0,0 +1,63 @@
+/*
+ * Copyright (C) 1997-2013 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
+ * the Free Software Foundation; either version 2 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 Library 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 : Borja Menéndez <borjamonserrano en gmail.com>
+ *
+ */
+
+#ifndef HINGEENCODERS_H
+#define HINGEENCODERS_H
+
+#include <iostream>
+#include <stdio.h>
+
+#include "alcore/alptr.h"
+#include "alproxies/alledsproxy.h"
+#include "alproxies/almemoryproxy.h"
+#include "alproxies/alsensorsproxy.h"
+#include "alproxies/alsonarproxy.h"
+#include "alproxies/alrobotposeproxy.h"
+#include "alproxies/almotionproxy.h"
+#include "alcommon/alproxy.h"
+#include "alcommon/albroker.h"
+#include "alcommon/almodule.h"
+
+#include <IceE/IceE.h>
+#include <pose3dencoders.h>
+
+class HingeEncoders : public jderobot::Pose3DEncoders {
+ public:
+ // Constructor
+ HingeEncoders ();
+
+ // Destructor
+ ~HingeEncoders ();
+
+ // Setters
+
+ // Another functions
+ void init ( const std::string newName, AL::ALPtr<AL::ALBroker> parentBroker );
+
+ /*Pose3DEncoders*/
+ jderobot::Pose3DEncodersDataPtr getPose3DEncodersData ( const Ice::Current& );
+
+ protected:
+ std::string name;
+ bool bPitch, bYaw, bRoll;
+ AL::ALValue jointPitch, jointYaw, jointRoll;
+ AL::ALPtr<AL::ALMotionProxy> motion;
+};
+#endif // HINGEENCODERS_H
Modified: trunk/src/stable/components/naoserver/hinges/HingeMotors.cpp
===================================================================
--- trunk/src/stable/components/naoserver/hinges/HingeMotors.cpp 2014-01-25 18:44:50 UTC (rev 1146)
+++ trunk/src/stable/components/naoserver/hinges/HingeMotors.cpp 2014-01-25 20:27:32 UTC (rev 1147)
@@ -40,6 +40,10 @@
this->stiffness = stiffness;
this->speed = speed;
+ this->tilt = 0.0;
+ this->pan = 0.0;
+ this->roll = 0.0;
+
try {
this->motion = parentBroker->getMotionProxy();
if (this->bPitch)
@@ -57,33 +61,35 @@
* POSE3DMOTORS
*************************************************************/
Ice::Int HingeMotors::setPose3DMotorsData ( const jderobot::Pose3DMotorsDataPtr & data, const Ice::Current& ) {
- if (this->bPitch)
+ if (this->bPitch) {
+ this->tilt = data->tilt;
this->motion->setAngles(this->jointPitch, data->tilt, this->speed);
- if (this->bYaw)
+ }
+
+ if (this->bYaw) {
+ this->pan = data->pan;
this->motion->setAngles(this->jointYaw, data->pan, this->speed);
- if (this->bRoll)
+ }
+
+ if (this->bRoll) {
+ this->roll = data->roll;
this->motion->setAngles(this->jointRoll, data->roll, this->speed);
-
+ }
+
return 0;
};
jderobot::Pose3DMotorsDataPtr HingeMotors::getPose3DMotorsData ( const Ice::Current& ) {
jderobot::Pose3DMotorsDataPtr pose3DMotorsData;
- if (this->bPitch) {
- std::vector<float> commandAngles = this->motion->getAngles(this->jointPitch, false);
- pose3DMotorsData->tilt = commandAngles[0];
- }
+ if (this->bPitch)
+ pose3DMotorsData->tilt = this->tilt;
- if (this->bYaw) {
- std::vector<float> commandAngles = this->motion->getAngles(this->jointYaw, false);
- pose3DMotorsData->pan = commandAngles[0];
- }
+ if (this->bYaw)
+ pose3DMotorsData->pan = this->pan;
- if (this->bPitch) {
- std::vector<float> commandAngles = this->motion->getAngles(this->jointRoll, false);
- pose3DMotorsData->roll = commandAngles[0];
- }
+ if (this->bPitch)
+ pose3DMotorsData->roll = this->roll;
return pose3DMotorsData;
};
Modified: trunk/src/stable/components/naoserver/hinges/HingeMotors.h
===================================================================
--- trunk/src/stable/components/naoserver/hinges/HingeMotors.h 2014-01-25 18:44:50 UTC (rev 1146)
+++ trunk/src/stable/components/naoserver/hinges/HingeMotors.h 2014-01-25 20:27:32 UTC (rev 1147)
@@ -59,6 +59,7 @@
protected:
std::string name;
float stiffness, speed;
+ float tilt, pan, roll;
bool bPitch, bYaw, bRoll;
AL::ALValue jointPitch, jointYaw, jointRoll;
AL::ALPtr<AL::ALMotionProxy> motion;
Added: trunk/src/stable/components/naoserver/hinges/LeftAnkleEncoders.cpp
===================================================================
--- trunk/src/stable/components/naoserver/hinges/LeftAnkleEncoders.cpp (rev 0)
+++ trunk/src/stable/components/naoserver/hinges/LeftAnkleEncoders.cpp 2014-01-25 20:27:32 UTC (rev 1147)
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 1997-2013 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
+ * the Free Software Foundation; either version 2 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 Library 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 : Borja Menéndez <borjamonserrano en gmail.com>
+ *
+ */
+
+#include "LeftAnkleEncoders.h"
+
+/*************************************************************
+ * CONSTRUCTOR
+ *************************************************************/
+LeftAnkleEncoders::LeftAnkleEncoders () {
+ jointPitch = "LAnklePitch";
+ jointRoll = "LAnkleRoll";
+ bPitch = true;
+ bYaw = false;
+ bRoll = true;
+}
Added: trunk/src/stable/components/naoserver/hinges/LeftAnkleEncoders.h
===================================================================
--- trunk/src/stable/components/naoserver/hinges/LeftAnkleEncoders.h (rev 0)
+++ trunk/src/stable/components/naoserver/hinges/LeftAnkleEncoders.h 2014-01-25 20:27:32 UTC (rev 1147)
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 1997-2013 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
+ * the Free Software Foundation; either version 2 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 Library 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 : Borja Menéndez <borjamonserrano en gmail.com>
+ *
+ */
+
+#ifndef LEFTANKLEENCODERS_H
+#define LEFTANKLEENCODERS_H
+
+#include "HingeEncoders.h"
+
+#include "Singleton.h"
+
+class LeftAnkleEncoders : public Singleton<LeftAnkleEncoders>, public HingeEncoders {
+ public:
+ // Constructor (overriding)
+ LeftAnkleEncoders ();
+};
+#endif // LEFTANKLEENCODERS_H
Added: trunk/src/stable/components/naoserver/hinges/LeftElbowEncoders.cpp
===================================================================
--- trunk/src/stable/components/naoserver/hinges/LeftElbowEncoders.cpp (rev 0)
+++ trunk/src/stable/components/naoserver/hinges/LeftElbowEncoders.cpp 2014-01-25 20:27:32 UTC (rev 1147)
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 1997-2013 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
+ * the Free Software Foundation; either version 2 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 Library 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 : Borja Menéndez <borjamonserrano en gmail.com>
+ *
+ */
+
+#include "LeftElbowEncoders.h"
+
+/*************************************************************
+ * CONSTRUCTOR
+ *************************************************************/
+LeftElbowEncoders::LeftElbowEncoders () {
+ jointYaw = "LElbowYaw";
+ jointRoll = "LElbowRoll";
+ bPitch = false;
+ bYaw = true;
+ bRoll = true;
+}
Added: trunk/src/stable/components/naoserver/hinges/LeftElbowEncoders.h
===================================================================
--- trunk/src/stable/components/naoserver/hinges/LeftElbowEncoders.h (rev 0)
+++ trunk/src/stable/components/naoserver/hinges/LeftElbowEncoders.h 2014-01-25 20:27:32 UTC (rev 1147)
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 1997-2013 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
+ * the Free Software Foundation; either version 2 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 Library 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 : Borja Menéndez <borjamonserrano en gmail.com>
+ *
+ */
+
+#ifndef LEFTELBOWENCODERS_H
+#define LEFTELBOWENCODERS_H
+
+#include "HingeEncoders.h"
+
+#include "Singleton.h"
+
+class LeftElbowEncoders : public Singleton<LeftElbowEncoders>, public HingeEncoders {
+ public:
+ // Constructor (overriding)
+ LeftElbowEncoders ();
+};
+#endif // LEFTELBOWENCODERS_H
Added: trunk/src/stable/components/naoserver/hinges/LeftHipEncoders.cpp
===================================================================
--- trunk/src/stable/components/naoserver/hinges/LeftHipEncoders.cpp (rev 0)
+++ trunk/src/stable/components/naoserver/hinges/LeftHipEncoders.cpp 2014-01-25 20:27:32 UTC (rev 1147)
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 1997-2013 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
+ * the Free Software Foundation; either version 2 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 Library 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 : Borja Menéndez <borjamonserrano en gmail.com>
+ *
+ */
+
+#include "LeftHipEncoders.h"
+
+/*************************************************************
+ * CONSTRUCTOR
+ *************************************************************/
+LeftHipEncoders::LeftHipEncoders () {
+ jointPitch = "LHipPitch";
+ jointYaw = "LHipYawPitch";
+ jointRoll = "LHipRoll";
+ bPitch = true;
+ bYaw = true;
+ bRoll = true;
+}
Added: trunk/src/stable/components/naoserver/hinges/LeftHipEncoders.h
===================================================================
--- trunk/src/stable/components/naoserver/hinges/LeftHipEncoders.h (rev 0)
+++ trunk/src/stable/components/naoserver/hinges/LeftHipEncoders.h 2014-01-25 20:27:32 UTC (rev 1147)
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 1997-2013 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
+ * the Free Software Foundation; either version 2 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 Library 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 : Borja Menéndez <borjamonserrano en gmail.com>
+ *
+ */
+
+#ifndef LEFTHIPENCODERS_H
+#define LEFTHIPENCODERS_H
+
+#include "HingeEncoders.h"
+
+#include "Singleton.h"
+
+class LeftHipEncoders : public Singleton<LeftHipEncoders>, public HingeEncoders {
+ public:
+ // Constructor (overriding)
+ LeftHipEncoders ();
+};
+#endif // LEFTHIPENCODERS_H
Added: trunk/src/stable/components/naoserver/hinges/LeftKneeEncoders.cpp
===================================================================
--- trunk/src/stable/components/naoserver/hinges/LeftKneeEncoders.cpp (rev 0)
+++ trunk/src/stable/components/naoserver/hinges/LeftKneeEncoders.cpp 2014-01-25 20:27:32 UTC (rev 1147)
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 1997-2013 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
+ * the Free Software Foundation; either version 2 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 Library 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 : Borja Menéndez <borjamonserrano en gmail.com>
+ *
+ */
+
+#include "LeftKneeEncoders.h"
+
+/*************************************************************
+ * CONSTRUCTOR
+ *************************************************************/
+LeftKneeEncoders::LeftKneeEncoders () {
+ jointPitch = "LKneePitch";
+ bPitch = true;
+ bYaw = false;
+ bRoll = false;
+}
Added: trunk/src/stable/components/naoserver/hinges/LeftKneeEncoders.h
===================================================================
--- trunk/src/stable/components/naoserver/hinges/LeftKneeEncoders.h (rev 0)
+++ trunk/src/stable/components/naoserver/hinges/LeftKneeEncoders.h 2014-01-25 20:27:32 UTC (rev 1147)
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 1997-2013 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
+ * the Free Software Foundation; either version 2 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 Library 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 : Borja Menéndez <borjamonserrano en gmail.com>
+ *
+ */
+
+#ifndef LEFTKNEEENCODERS_H
+#define LEFTKNEEENCODERS_H
+
+#include "HingeEncoders.h"
+
+#include "Singleton.h"
+
+class LeftKneeEncoders : public Singleton<LeftKneeEncoders>, public HingeEncoders {
+ public:
+ // Constructor (overriding)
+ LeftKneeEncoders ();
+};
+#endif // LEFTKNEEENCODERS_H
Added: trunk/src/stable/components/naoserver/hinges/LeftShoulderEncoders.cpp
===================================================================
--- trunk/src/stable/components/naoserver/hinges/LeftShoulderEncoders.cpp (rev 0)
+++ trunk/src/stable/components/naoserver/hinges/LeftShoulderEncoders.cpp 2014-01-25 20:27:32 UTC (rev 1147)
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 1997-2013 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
+ * the Free Software Foundation; either version 2 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 Library 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 : Borja Menéndez <borjamonserrano en gmail.com>
+ *
+ */
+
+#include "LeftShoulderEncoders.h"
+
+/*************************************************************
+ * CONSTRUCTOR
+ *************************************************************/
+LeftShoulderEncoders::LeftShoulderEncoders () {
+ jointPitch = "LShoulderPitch";
+ jointRoll = "LShoulderRoll";
+ bPitch = true;
+ bYaw = false;
+ bRoll = true;
+}
Added: trunk/src/stable/components/naoserver/hinges/LeftShoulderEncoders.h
===================================================================
--- trunk/src/stable/components/naoserver/hinges/LeftShoulderEncoders.h (rev 0)
+++ trunk/src/stable/components/naoserver/hinges/LeftShoulderEncoders.h 2014-01-25 20:27:32 UTC (rev 1147)
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 1997-2013 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
+ * the Free Software Foundation; either version 2 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 Library 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 : Borja Menéndez <borjamonserrano en gmail.com>
+ *
+ */
+
+#ifndef LEFTSHOULDERENCODERS_H
+#define LEFTSHOULDERENCODERS_H
+
+#include "HingeEncoders.h"
+
+#include "Singleton.h"
+
+class LeftShoulderEncoders : public Singleton<LeftShoulderEncoders>, public HingeEncoders {
+ public:
+ // Constructor (overriding)
+ LeftShoulderEncoders ();
+};
+#endif // LEFTSHOULDERENCODERS_H
Added: trunk/src/stable/components/naoserver/hinges/NeckEncoders.cpp
===================================================================
--- trunk/src/stable/components/naoserver/hinges/NeckEncoders.cpp (rev 0)
+++ trunk/src/stable/components/naoserver/hinges/NeckEncoders.cpp 2014-01-25 20:27:32 UTC (rev 1147)
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 1997-2013 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
+ * the Free Software Foundation; either version 2 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 Library 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 : Borja Menéndez <borjamonserrano en gmail.com>
+ *
+ */
+
+#include "NeckEncoders.h"
+
+/*************************************************************
+ * CONSTRUCTOR
+ *************************************************************/
+NeckEncoders::NeckEncoders () {
+ jointPitch = "HeadPitch";
+ jointYaw = "HeadYaw";
+ bPitch = true;
+ bYaw = true;
+ bRoll = false;
+}
Added: trunk/src/stable/components/naoserver/hinges/NeckEncoders.h
===================================================================
--- trunk/src/stable/components/naoserver/hinges/NeckEncoders.h (rev 0)
+++ trunk/src/stable/components/naoserver/hinges/NeckEncoders.h 2014-01-25 20:27:32 UTC (rev 1147)
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 1997-2013 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
+ * the Free Software Foundation; either version 2 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 Library 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 : Borja Menéndez <borjamonserrano en gmail.com>
+ *
+ */
+
+#ifndef NECKENCODERS_H
+#define NECKENCODERS_H
+
+#include "HingeEncoders.h"
+
+#include "Singleton.h"
+
+class NeckEncoders : public Singleton<NeckEncoders>, public HingeEncoders {
+ public:
+ // Constructor (overriding)
+ NeckEncoders ();
+};
+#endif // NECKENCODERS_H
Modified: trunk/src/stable/components/naoserver/hinges/NeckSpeed.cpp
===================================================================
--- trunk/src/stable/components/naoserver/hinges/NeckSpeed.cpp 2014-01-25 18:44:50 UTC (rev 1146)
+++ trunk/src/stable/components/naoserver/hinges/NeckSpeed.cpp 2014-01-25 20:27:32 UTC (rev 1147)
@@ -20,32 +20,18 @@
#include "NeckSpeed.h"
-const float NeckSpeed::VEL_PAN_MIN = 0.02;
-const float NeckSpeed::VEL_PAN_MAX = 0.3; // Real robot
-const float NeckSpeed::VEL_TILT_MIN = 0.02;
-const float NeckSpeed::VEL_TILT_MAX = 0.2; // Real robot
-
-const float NeckSpeed::MAXTILT[MAX_TILT_VECTOR] = {14.0f, 14.0f, 14.0f, 14.0f, 14.0f,
- 16.0f, 18.0f, 20.0f, 22.0f, 26.0f,
- 30.0f, 30.0f, 30.0f, 30.0f, 30.0f,
- 26.0f, 22.0f, 20.0f, 18.0f, 16.0f,
- 14.0f, 14.0f, 14.0f, 14.0f, 14.0f};
-
/*************************************************************
* CONSTRUCTOR
*************************************************************/
NeckSpeed::NeckSpeed () {
- this->pan = new JointControl("HeadYaw", MIN_PAN_ANGLE / MAX_PANU, MAX_PAN_ANGLE / MAX_PANU, VEL_PAN_MIN, VEL_PAN_MAX);
- this->tilt = new JointControl("HeadPitch", MIN_TILT_ANGLE / MAX_TILT, MAX_TILT_ANGLE / MAX_TILT, VEL_TILT_MIN, VEL_TILT_MAX);
+ this->jointPitch = "HeadPitch";
+ this->jointYaw = "HeadYaw";
}
/*************************************************************
* DESTRUCTOR
*************************************************************/
-NeckSpeed::~NeckSpeed () {
- delete this->pan;
- delete this->tilt;
-}
+NeckSpeed::~NeckSpeed () {}
/*************************************************************
* ANOTHER FUNCTIONS
@@ -57,52 +43,21 @@
this->stiffness = stiffness;
this->speed = speed;
- this->motion = parentBroker->getMotionProxy();
-
- this->pan->init(parentBroker);
- this->tilt->init(parentBroker);
-}
-
-float NeckSpeed::getTiltLimit ( float currentYaw, float currentVy ) {
- if (currentVy < 0)
- return 0.0;
-
- int idxm, idxM;
-
- idxm = (toDegrees(currentYaw) / 10) + (MAX_TILT_VECTOR / 2);
-
- if (currentYaw < 0){
- if (idxm > 0)
- idxM = idxm - 1;
- else
- idxM = idxm;
- }else{
- if (idxm < MAX_TILT_VECTOR - 1)
- idxM = idxm + 1;
- else
- idxM = idxm;
+ try {
+ this->motion = parentBroker->getMotionProxy();
+ this->motion->setStiffnesses(this->jointPitch, this->stiffness);
+ this->motion->setStiffnesses(this->jointYaw, this->stiffness);
+ } catch ( AL::ALError& e ) {
+ std::cerr << "[HingeMotors ()::init(): " << e.toString() << std::endl;
}
-
- return toRadians((MAXTILT[idxM] + MAXTILT[idxm]) / 2.0);
}
/*************************************************************
* POSE3DMOTORS
*************************************************************/
Ice::Int NeckSpeed::setPose3DMotorsData ( const jderobot::Pose3DMotorsDataPtr & data, const Ice::Current& ) {
- this->pan->set(-data->panSpeed);
- this->tilt->set(data->tiltSpeed);
-
- // --- Head Control ---
- this->pan->move();
-
- // --- Tilt control ---
- if (this->tilt->getOutput() > 0.0)
- target = this->getTiltLimit(this->pan->getJointValue(), this->tilt->getOutput());
- else
- target = toRadians(MIN_TILT);
- this->tilt->setLimitedTarget(target);
- this->tilt->move();
+ this->motion->changeAngles(this->jointYaw, data->panSpeed * 0.42 / 2.0, std::abs(data->panSpeed));
+ this->motion->changeAngles(this->jointPitch, data->tiltSpeed * 0.32 / 2.0, std::abs(data->tiltSpeed));
};
jderobot::Pose3DMotorsDataPtr NeckSpeed::getPose3DMotorsData ( const Ice::Current& ) {
Modified: trunk/src/stable/components/naoserver/hinges/NeckSpeed.h
===================================================================
--- trunk/src/stable/components/naoserver/hinges/NeckSpeed.h 2014-01-25 18:44:50 UTC (rev 1146)
+++ trunk/src/stable/components/naoserver/hinges/NeckSpeed.h 2014-01-25 20:27:32 UTC (rev 1147)
@@ -23,12 +23,23 @@
#include <iostream>
#include <stdio.h>
+#include <cmath>
+#include "alcore/alptr.h"
+#include "alproxies/alledsproxy.h"
+#include "alproxies/almemoryproxy.h"
+#include "alproxies/alsensorsproxy.h"
+#include "alproxies/alsonarproxy.h"
+#include "alproxies/alrobotposeproxy.h"
+#include "alproxies/almotionproxy.h"
+#include "alcommon/alproxy.h"
+#include "alcommon/albroker.h"
+#include "alcommon/almodule.h"
+
#include <IceE/IceE.h>
#include <pose3dmotors.h>
#include "Singleton.h"
-#include "JointControl.h"
#include "Common.h"
class NeckSpeed : public Singleton<NeckSpeed>, public jderobot::Pose3DMotors {
@@ -50,31 +61,8 @@
private:
std::string name;
float stiffness, speed;
- bool bPitch, bYaw, bRoll;
- AL::ALValue jointPitch, jointYaw, jointRoll;
+ AL::ALValue jointPitch, jointYaw;
AL::ALPtr<AL::ALMotionProxy> motion;
- JointControl *pan, *tilt;
- float getTiltLimit ( float currentYaw, float currentVy );
- float target;
-
- static const float MAX_PANU = 80.0f;
- static const float MAX_PANL = 40.0f;
- static const float MAX_TILT = 45.0f;
- static const float MIN_TILT = -39.0f;
- static const float MIN_PAN_ANGLE = 5.0f;
- static const float MAX_PAN_ANGLE = 70.0f;
- static const float MIN_TILT_ANGLE = 5.0f;
- static const float MAX_TILT_ANGLE = 30.0f;
-
- static const int MAX_TILT_VECTOR = 25;
- static const float MAXTILT[MAX_TILT_VECTOR];
-
- //Velocities are expressed in % (18,12 is ok)
- static const float VEL_PAN_MIN;
- static const float VEL_PAN_MAX; // Real robot
- static const float VEL_TILT_MIN;
- static const float VEL_TILT_MAX; // Real robot
-
};
#endif // NECKSPEED_H
Added: trunk/src/stable/components/naoserver/hinges/RightAnkleEncoders.cpp
===================================================================
--- trunk/src/stable/components/naoserver/hinges/RightAnkleEncoders.cpp (rev 0)
+++ trunk/src/stable/components/naoserver/hinges/RightAnkleEncoders.cpp 2014-01-25 20:27:32 UTC (rev 1147)
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 1997-2013 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
+ * the Free Software Foundation; either version 2 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 Library 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 : Borja Menéndez <borjamonserrano en gmail.com>
+ *
+ */
+
+#include "RightAnkleEncoders.h"
+
+/*************************************************************
+ * CONSTRUCTOR
+ *************************************************************/
+RightAnkleEncoders::RightAnkleEncoders () {
+ jointPitch = "RAnklePitch";
+ jointRoll = "RAnkleRoll";
+ bPitch = true;
+ bYaw = false;
+ bRoll = true;
+}
Added: trunk/src/stable/components/naoserver/hinges/RightAnkleEncoders.h
===================================================================
--- trunk/src/stable/components/naoserver/hinges/RightAnkleEncoders.h (rev 0)
+++ trunk/src/stable/components/naoserver/hinges/RightAnkleEncoders.h 2014-01-25 20:27:32 UTC (rev 1147)
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 1997-2013 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
+ * the Free Software Foundation; either version 2 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 Library 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 : Borja Menéndez <borjamonserrano en gmail.com>
+ *
+ */
+
+#ifndef RIGHTANKLEENCODERS_H
+#define RIGHTANKLEENCODERS_H
+
+#include "HingeEncoders.h"
+
+#include "Singleton.h"
+
+class RightAnkleEncoders : public Singleton<RightAnkleEncoders>, public HingeEncoders {
+ public:
+ // Constructor (overriding)
+ RightAnkleEncoders ();
+};
+#endif // RIGHTANKLEENCODERS_H
Added: trunk/src/stable/components/naoserver/hinges/RightElbowEncoders.cpp
===================================================================
--- trunk/src/stable/components/naoserver/hinges/RightElbowEncoders.cpp (rev 0)
+++ trunk/src/stable/components/naoserver/hinges/RightElbowEncoders.cpp 2014-01-25 20:27:32 UTC (rev 1147)
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 1997-2013 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
+ * the Free Software Foundation; either version 2 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 Library 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 : Borja Menéndez <borjamonserrano en gmail.com>
+ *
+ */
+
+#include "RightElbowEncoders.h"
+
+/*************************************************************
+ * CONSTRUCTOR
+ *************************************************************/
+RightElbowEncoders::RightElbowEncoders () {
+ jointYaw = "RElbowYaw";
+ jointRoll = "RElbowRoll";
+ bPitch = false;
+ bYaw = true;
+ bRoll = true;
+}
Added: trunk/src/stable/components/naoserver/hinges/RightElbowEncoders.h
===================================================================
--- trunk/src/stable/components/naoserver/hinges/RightElbowEncoders.h (rev 0)
+++ trunk/src/stable/components/naoserver/hinges/RightElbowEncoders.h 2014-01-25 20:27:32 UTC (rev 1147)
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 1997-2013 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
+ * the Free Software Foundation; either version 2 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 Library 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 : Borja Menéndez <borjamonserrano en gmail.com>
+ *
+ */
+
+#ifndef RIGHTELBOWENCODERS_H
+#define RIGHTELBOWENCODERS_H
+
+#include "HingeEncoders.h"
+
+#include "Singleton.h"
+
+class RightElbowEncoders : public Singleton<RightElbowEncoders>, public HingeEncoders {
+ public:
+ // Constructor (overriding)
+ RightElbowEncoders ();
+};
+#endif // RIGHTELBOWENCODERS_H
Added: trunk/src/stable/components/naoserver/hinges/RightHipEncoders.cpp
===================================================================
--- trunk/src/stable/components/naoserver/hinges/RightHipEncoders.cpp (rev 0)
+++ trunk/src/stable/components/naoserver/hinges/RightHipEncoders.cpp 2014-01-25 20:27:32 UTC (rev 1147)
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 1997-2013 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
+ * the Free Software Foundation; either version 2 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 Library 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 : Borja Menéndez <borjamonserrano en gmail.com>
+ *
+ */
+
+#include "RightHipEncoders.h"
+
+/*************************************************************
+ * CONSTRUCTOR
+ *************************************************************/
+RightHipEncoders::RightHipEncoders () {
+ jointPitch = "RHipPitch";
+ jointYaw = "RHipYawPitch";
+ jointRoll = "RHipRoll";
+ bPitch = true;
+ bYaw = true;
+ bRoll = true;
+}
Added: trunk/src/stable/components/naoserver/hinges/RightHipEncoders.h
===================================================================
--- trunk/src/stable/components/naoserver/hinges/RightHipEncoders.h (rev 0)
+++ trunk/src/stable/components/naoserver/hinges/RightHipEncoders.h 2014-01-25 20:27:32 UTC (rev 1147)
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 1997-2013 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
+ * the Free Software Foundation; either version 2 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 Library 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 : Borja Menéndez <borjamonserrano en gmail.com>
+ *
+ */
+
+#ifndef RIGHTHIPENCODERS_H
+#define RIGHTHIPENCODERS_H
+
+#include "HingeEncoders.h"
+
+#include "Singleton.h"
+
+class RightHipEncoders : public Singleton<RightHipEncoders>, public HingeEncoders {
+ public:
+ // Constructor (overriding)
+ RightHipEncoders ();
+};
+#endif // RIGHTHIPENCODERS_H
Added: trunk/src/stable/components/naoserver/hinges/RightKneeEncoders.cpp
===================================================================
--- trunk/src/stable/components/naoserver/hinges/RightKneeEncoders.cpp (rev 0)
+++ trunk/src/stable/components/naoserver/hinges/RightKneeEncoders.cpp 2014-01-25 20:27:32 UTC (rev 1147)
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 1997-2013 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
+ * the Free Software Foundation; either version 2 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 Library 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 : Borja Menéndez <borjamonserrano en gmail.com>
+ *
+ */
+
+#include "RightKneeEncoders.h"
+
+/*************************************************************
+ * CONSTRUCTOR
+ *************************************************************/
+RightKneeEncoders::RightKneeEncoders () {
+ jointPitch = "RKneePitch";
+ bPitch = true;
+ bYaw = false;
+ bRoll = false;
+}
Added: trunk/src/stable/components/naoserver/hinges/RightKneeEncoders.h
===================================================================
--- trunk/src/stable/components/naoserver/hinges/RightKneeEncoders.h (rev 0)
+++ trunk/src/stable/components/naoserver/hinges/RightKneeEncoders.h 2014-01-25 20:27:32 UTC (rev 1147)
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 1997-2013 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
+ * the Free Software Foundation; either version 2 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 Library 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 : Borja Menéndez <borjamonserrano en gmail.com>
+ *
+ */
+
+#ifndef RIGHTKNEEENCODERS_H
+#define RIGHTKNEEENCODERS_H
+
+#include "HingeEncoders.h"
+
+#include "Singleton.h"
+
+class RightKneeEncoders : public Singleton<RightKneeEncoders>, public HingeEncoders {
+ public:
+ // Constructor (overriding)
+ RightKneeEncoders ();
+};
+#endif // RIGHTKNEEENCODERS_H
Added: trunk/src/stable/components/naoserver/hinges/RightShoulderEncoders.cpp
===================================================================
--- trunk/src/stable/components/naoserver/hinges/RightShoulderEncoders.cpp (rev 0)
+++ trunk/src/stable/components/naoserver/hinges/RightShoulderEncoders.cpp 2014-01-25 20:27:32 UTC (rev 1147)
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 1997-2013 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
+ * the Free Software Foundation; either version 2 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 Library 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 : Borja Menéndez <borjamonserrano en gmail.com>
+ *
+ */
+
+#include "RightShoulderEncoders.h"
+
+/*************************************************************
+ * CONSTRUCTOR
+ *************************************************************/
+RightShoulderEncoders::RightShoulderEncoders () {
+ jointPitch = "RShoulderPitch";
+ jointRoll = "RShoulderRoll";
+ bPitch = true;
+ bYaw = false;
+ bRoll = true;
+}
Added: trunk/src/stable/components/naoserver/hinges/RightShoulderEncoders.h
===================================================================
--- trunk/src/stable/components/naoserver/hinges/RightShoulderEncoders.h (rev 0)
+++ trunk/src/stable/components/naoserver/hinges/RightShoulderEncoders.h 2014-01-25 20:27:32 UTC (rev 1147)
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 1997-2013 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
+ * the Free Software Foundation; either version 2 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 Library 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 : Borja Menéndez <borjamonserrano en gmail.com>
+ *
+ */
+
+#ifndef RIGHTSHOULDERENCODERS_H
+#define RIGHTSHOULDERENCODERS_H
+
+#include "HingeEncoders.h"
+
+#include "Singleton.h"
+
+class RightShoulderEncoders : public Singleton<RightShoulderEncoders>, public HingeEncoders {
+ public:
+ // Constructor (overriding)
+ RightShoulderEncoders ();
+};
+#endif // RIGHTSHOULDERENCODERS_H
Deleted: trunk/src/stable/components/naoserver/interfaces/cpp/jderobot/camera.cpp
===================================================================
--- trunk/src/stable/components/naoserver/interfaces/cpp/jderobot/camera.cpp 2014-01-25 18:44:50 UTC (rev 1146)
+++ trunk/src/stable/components/naoserver/interfaces/cpp/jderobot/camera.cpp 2014-01-25 20:27:32 UTC (rev 1147)
@@ -1,686 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice-E is licensed to you under the terms described in the
-// ICEE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-// Ice-E version 1.3.0
-// Generated from file `camera.ice'
-
-#include <camera.h>
-#include <IceE/LocalException.h>
-#include <IceE/ObjectFactory.h>
-#include <IceE/BasicStream.h>
-#include <IceE/LocalException.h>
-#include <IceE/Iterator.h>
-
-#ifndef ICEE_IGNORE_VERSION
-# if ICEE_INT_VERSION / 100 != 103
-# error IceE version mismatch!
-# endif
-# if ICEE_INT_VERSION % 100 < 0
-# error IceE patch level mismatch!
-# endif
-#endif
-
-static const ::std::string __jderobot__Camera__getCameraDescription_name = "getCameraDescription";
-
-static const ::std::string __jderobot__Camera__setCameraDescription_name = "setCameraDescription";
-
-static const ::std::string __jderobot__Camera__startCameraStreaming_name = "startCameraStreaming";
-
-static const ::std::string __jderobot__Camera__stopCameraStreaming_name = "stopCameraStreaming";
-
-::Ice::Object* IceInternal::upCast(::jderobot::CameraDescription* p) { return p; }
-::IceProxy::Ice::Object* IceInternal::upCast(::IceProxy::jderobot::CameraDescription* p) { return p; }
-
-::Ice::Object* IceInternal::upCast(::jderobot::Camera* p) { return p; }
-::IceProxy::Ice::Object* IceInternal::upCast(::IceProxy::jderobot::Camera* p) { return p; }
-
-void
-jderobot::__read(::IceInternal::BasicStream* __is, ::jderobot::CameraDescriptionPrx& v)
-{
- ::Ice::ObjectPrx proxy;
- __is->read(proxy);
- if(!proxy)
- {
- v = 0;
- }
- else
- {
- v = new ::IceProxy::jderobot::CameraDescription;
- v->__copyFrom(proxy);
- }
-}
-
-void
-jderobot::__read(::IceInternal::BasicStream* __is, ::jderobot::CameraPrx& v)
-{
- ::Ice::ObjectPrx proxy;
- __is->read(proxy);
- if(!proxy)
- {
- v = 0;
- }
- else
- {
- v = new ::IceProxy::jderobot::Camera;
- v->__copyFrom(proxy);
- }
-}
-
-jderobot::CameraDescription::CameraDescription(const ::std::string& __ice_name, const ::std::string& __ice_shortDescription, const ::std::string& __ice_streamingUri, ::Ice::Float __ice_fdistx, ::Ice::Float __ice_fdisty, ::Ice::Float __ice_u0, ::Ice::Float __ice_v0, ::Ice::Float __ice_skew, ::Ice::Float __ice_posx, ::Ice::Float __ice_posy, ::Ice::Float __ice_posz, ::Ice::Float __ice_foax, ::Ice::Float __ice_foay, ::Ice::Float __ice_foaz, ::Ice::Float __ice_roll) :
- name(__ice_name),
- shortDescription(__ice_shortDescription),
- streamingUri(__ice_streamingUri),
- fdistx(__ice_fdistx),
- fdisty(__ice_fdisty),
- u0(__ice_u0),
- v0(__ice_v0),
- skew(__ice_skew),
- posx(__ice_posx),
- posy(__ice_posy),
- posz(__ice_posz),
- foax(__ice_foax),
- foay(__ice_foay),
- foaz(__ice_foaz),
- roll(__ice_roll)
-{
-}
-
-static const ::std::string __jderobot__CameraDescription_ids[2] =
-{
- "::Ice::Object",
- "::jderobot::CameraDescription"
-};
-
-bool
-jderobot::CameraDescription::ice_isA(const ::std::string& _s, const ::Ice::Current&) const
-{
- return ::std::binary_search(__jderobot__CameraDescription_ids, __jderobot__CameraDescription_ids + 2, _s);
-}
-
-::std::vector< ::std::string>
-jderobot::CameraDescription::ice_ids(const ::Ice::Current&) const
-{
- return ::std::vector< ::std::string>(&__jderobot__CameraDescription_ids[0], &__jderobot__CameraDescription_ids[2]);
-}
-
-const ::std::string&
-jderobot::CameraDescription::ice_id(const ::Ice::Current&) const
-{
- return __jderobot__CameraDescription_ids[1];
-}
-
-const ::std::string&
-jderobot::CameraDescription::ice_staticId()
-{
- return __jderobot__CameraDescription_ids[1];
-}
-
-void
-jderobot::CameraDescription::__write(::IceInternal::BasicStream* __os) const
-{
- __os->writeTypeId(ice_staticId());
- __os->startWriteSlice();
- __os->write(name);
- __os->write(shortDescription);
- __os->write(streamingUri);
- __os->write(fdistx);
- __os->write(fdisty);
- __os->write(u0);
- __os->write(v0);
- __os->write(skew);
- __os->write(posx);
- __os->write(posy);
- __os->write(posz);
- __os->write(foax);
- __os->write(foay);
- __os->write(foaz);
- __os->write(roll);
- __os->endWriteSlice();
- ::Ice::Object::__write(__os);
-}
-
-void
-jderobot::CameraDescription::__read(::IceInternal::BasicStream* __is, bool __rid)
-{
- if(__rid)
- {
- ::std::string myId;
- __is->readTypeId(myId);
- }
- __is->startReadSlice();
- __is->read(name);
- __is->read(shortDescription);
- __is->read(streamingUri);
- __is->read(fdistx);
- __is->read(fdisty);
- __is->read(u0);
- __is->read(v0);
- __is->read(skew);
- __is->read(posx);
- __is->read(posy);
- __is->read(posz);
- __is->read(foax);
- __is->read(foay);
- __is->read(foaz);
- __is->read(roll);
- __is->endReadSlice();
- ::Ice::Object::__read(__is, true);
-}
-
-class __F__jderobot__CameraDescription : public ::Ice::ObjectFactory
-{
-public:
-
- virtual ::Ice::ObjectPtr
- create(const ::std::string& type)
- {
- assert(type == ::jderobot::CameraDescription::ice_staticId());
- return new ::jderobot::CameraDescription;
- }
-
- virtual void
- destroy()
- {
- }
-};
-
-static ::Ice::ObjectFactoryPtr __F__jderobot__CameraDescription_Ptr = new __F__jderobot__CameraDescription;
-
-const ::Ice::ObjectFactoryPtr&
-jderobot::CameraDescription::ice_factory()
-{
- return __F__jderobot__CameraDescription_Ptr;
-}
-
-class __F__jderobot__CameraDescription__Init
-{
-public:
-
- __F__jderobot__CameraDescription__Init()
- {
- ::IceInternal::factoryTable->addObjectFactory(::jderobot::CameraDescription::ice_staticId(), ::jderobot::CameraDescription::ice_factory());
- }
-
- ~__F__jderobot__CameraDescription__Init()
- {
- ::IceInternal::factoryTable->removeObjectFactory(::jderobot::CameraDescription::ice_staticId());
- }
-};
-
-static __F__jderobot__CameraDescription__Init __F__jderobot__CameraDescription__i;
-
-#ifdef __APPLE__
-extern "C" { void __F__jderobot__CameraDescription__initializer() {} }
-#endif
-
-
-bool
-jderobot::operator==(const ::jderobot::CameraDescription& l, const ::jderobot::CameraDescription& r)
-{
- return static_cast<const ::Ice::Object&>(l) == static_cast<const ::Ice::Object&>(r);
-}
-
-bool
-jderobot::operator<(const ::jderobot::CameraDescription& l, const ::jderobot::CameraDescription& r)
-{
- return static_cast<const ::Ice::Object&>(l) < static_cast<const ::Ice::Object&>(r);
-}
-
-void
-jderobot::__patch__CameraDescriptionPtr(void* __addr, ::Ice::ObjectPtr& v)
-{
- ::jderobot::CameraDescriptionPtr* p = static_cast< ::jderobot::CameraDescriptionPtr*>(__addr);
- assert(p);
- *p = ::jderobot::CameraDescriptionPtr::dynamicCast(v);
- if(v && !*p)
- {
- IceInternal::Ex::throwUOE(::jderobot::CameraDescription::ice_staticId(), v->ice_id());
- }
-}
-
-static const ::std::string __jderobot__Camera_ids[3] =
-{
- "::Ice::Object",
- "::jderobot::Camera",
- "::jderobot::ImageProvider"
-};
-
-bool
-jderobot::Camera::ice_isA(const ::std::string& _s, const ::Ice::Current&) const
-{
- return ::std::binary_search(__jderobot__Camera_ids, __jderobot__Camera_ids + 3, _s);
-}
-
-::std::vector< ::std::string>
-jderobot::Camera::ice_ids(const ::Ice::Current&) const
-{
- return ::std::vector< ::std::string>(&__jderobot__Camera_ids[0], &__jderobot__Camera_ids[3]);
-}
-
-const ::std::string&
-jderobot::Camera::ice_id(const ::Ice::Current&) const
-{
- return __jderobot__Camera_ids[1];
-}
-
-const ::std::string&
-jderobot::Camera::ice_staticId()
-{
- return __jderobot__Camera_ids[1];
-}
-
-#ifndef ICEE_PURE_CLIENT
-::Ice::DispatchStatus
-jderobot::Camera::___getCameraDescription(::IceInternal::Incoming& __inS, const ::Ice::Current& __current)
-{
- __checkMode(::Ice::Idempotent, __current.mode);
- ::IceInternal::BasicStream* __os = __inS.os();
- ::jderobot::CameraDescriptionPtr __ret = getCameraDescription(__current);
- __os->write(::Ice::ObjectPtr(::IceInternal::upCast(__ret.get())));
- __os->writePendingObjects();
- return ::Ice::DispatchOK;
-}
-#endif // ICEE_PURE_CLIENT
-
-#ifndef ICEE_PURE_CLIENT
-::Ice::DispatchStatus
-jderobot::Camera::___setCameraDescription(::IceInternal::Incoming& __inS, const ::Ice::Current& __current)
-{
- __checkMode(::Ice::Normal, __current.mode);
- ::IceInternal::BasicStream* __is = __inS.is();
- ::jderobot::CameraDescriptionPtr description;
- __is->read(::jderobot::__patch__CameraDescriptionPtr, &description);
- __is->readPendingObjects();
- ::IceInternal::BasicStream* __os = __inS.os();
- ::Ice::Int __ret = setCameraDescription(description, __current);
- __os->write(__ret);
- return ::Ice::DispatchOK;
-}
-#endif // ICEE_PURE_CLIENT
-
-#ifndef ICEE_PURE_CLIENT
-::Ice::DispatchStatus
-jderobot::Camera::___startCameraStreaming(::IceInternal::Incoming& __inS, const ::Ice::Current& __current)
-{
- __checkMode(::Ice::Normal, __current.mode);
- ::IceInternal::BasicStream* __os = __inS.os();
- ::std::string __ret = startCameraStreaming(__current);
- __os->write(__ret);
- return ::Ice::DispatchOK;
-}
-#endif // ICEE_PURE_CLIENT
-
-#ifndef ICEE_PURE_CLIENT
-::Ice::DispatchStatus
-jderobot::Camera::___stopCameraStreaming(::IceInternal::Incoming& __inS, const ::Ice::Current& __current)
-{
- __checkMode(::Ice::Normal, __current.mode);
- stopCameraStreaming(__current);
- return ::Ice::DispatchOK;
-}
-#endif // ICEE_PURE_CLIENT
-
-#ifndef ICEE_PURE_CLIENT
-static ::std::string __jderobot__Camera_all[] =
-{
- "getCameraDescription",
- "getImageData",
- "getImageDescription",
- "ice_id",
- "ice_ids",
- "ice_isA",
- "ice_ping",
- "setCameraDescription",
- "startCameraStreaming",
- "stopCameraStreaming"
-};
-
-::Ice::DispatchStatus
-jderobot::Camera::__dispatch(::IceInternal::Incoming& in, const ::Ice::Current& current)
-{
- ::std::pair< ::std::string*, ::std::string*> r = ::std::equal_range(__jderobot__Camera_all, __jderobot__Camera_all + 10, current.operation);
- if(r.first == r.second)
- {
- throw Ice::OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
- }
-
- switch(r.first - __jderobot__Camera_all)
- {
- case 0:
- {
- return ___getCameraDescription(in, current);
- }
- case 1:
- {
- return ___getImageData(in, current);
- }
- case 2:
- {
- return ___getImageDescription(in, current);
- }
- case 3:
- {
- return ___ice_id(in, current);
- }
- case 4:
- {
- return ___ice_ids(in, current);
- }
- case 5:
- {
- return ___ice_isA(in, current);
- }
- case 6:
- {
- return ___ice_ping(in, current);
- }
- case 7:
- {
- return ___setCameraDescription(in, current);
- }
- case 8:
- {
- return ___startCameraStreaming(in, current);
- }
- case 9:
- {
- return ___stopCameraStreaming(in, current);
- }
- }
-
- assert(false);
- throw Ice::OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
-}
-#endif // ICEE_PURE_CLIENT
-
-void
-jderobot::Camera::__write(::IceInternal::BasicStream* __os) const
-{
- __os->writeTypeId(ice_staticId());
- __os->startWriteSlice();
- __os->endWriteSlice();
- ::Ice::Object::__write(__os);
-}
-
-void
-jderobot::Camera::__read(::IceInternal::BasicStream* __is, bool __rid)
-{
- if(__rid)
- {
- ::std::string myId;
- __is->readTypeId(myId);
- }
- __is->startReadSlice();
- __is->endReadSlice();
- ::Ice::Object::__read(__is, true);
-}
-
-
-bool
-jderobot::operator==(const ::jderobot::Camera& l, const ::jderobot::Camera& r)
-{
- return static_cast<const ::Ice::Object&>(l) == static_cast<const ::Ice::Object&>(r);
-}
-
-bool
-jderobot::operator<(const ::jderobot::Camera& l, const ::jderobot::Camera& r)
-{
- return static_cast<const ::Ice::Object&>(l) < static_cast<const ::Ice::Object&>(r);
-}
-
-void
-jderobot::__patch__CameraPtr(void* __addr, ::Ice::ObjectPtr& v)
-{
- ::jderobot::CameraPtr* p = static_cast< ::jderobot::CameraPtr*>(__addr);
- assert(p);
- *p = ::jderobot::CameraPtr::dynamicCast(v);
- if(v && !*p)
- {
- IceInternal::Ex::throwUOE(::jderobot::Camera::ice_staticId(), v->ice_id());
- }
-}
-
-const ::std::string&
-IceProxy::jderobot::CameraDescription::ice_staticId()
-{
- return __jderobot__CameraDescription_ids[1];
-}
-
-::IceProxy::Ice::Object*
-IceProxy::jderobot::CameraDescription::__newInstance() const
-{
- return new CameraDescription;
-}
-
-::jderobot::CameraDescriptionPtr
-IceProxy::jderobot::Camera::getCameraDescription(const ::Ice::Context* __ctx)
-{
- int __cnt = 0;
- while(true)
- {
- ::IceInternal::RequestHandlerPtr __handler;
- try
- {
- __checkTwowayOnly(__jderobot__Camera__getCameraDescription_name);
- __handler = __getRequestHandler();
- ::IceInternal::Outgoing __outS(__handler.get(), _reference.get(), __jderobot__Camera__getCameraDescription_name, ::Ice::Idempotent, __ctx);
- bool __ok = __outS.invoke();
- try
- {
- if(!__ok)
- {
- __outS.is()->throwUnknownUserException();
- }
- ::jderobot::CameraDescriptionPtr __ret;
- ::IceInternal::BasicStream* __is = __outS.is();
- __is->read(::jderobot::__patch__CameraDescriptionPtr, &__ret);
- __is->readPendingObjects();
- return __ret;
- }
- catch(const ::Ice::LocalException& __ex)
- {
- throw ::IceInternal::LocalExceptionWrapper(__ex, false);
- }
-#if defined(_MSC_VER) && defined(_M_ARM) // ARM bug.
- catch(...)
- {
- throw;
- }
-#endif
- }
- catch(const ::IceInternal::LocalExceptionWrapper& __ex)
- {
- __handleExceptionWrapperRelaxed(__handler, __ex, __cnt);
- }
- catch(const ::Ice::LocalException& __ex)
- {
- __handleException(__handler, __ex, __cnt);
- }
-#if defined(_MSC_VER) && defined(_M_ARM) // ARM bug.
- catch(...)
- {
- throw;
- }
-#endif
- }
-}
-
-::Ice::Int
-IceProxy::jderobot::Camera::setCameraDescription(const ::jderobot::CameraDescriptionPtr& description, const ::Ice::Context* __ctx)
-{
- int __cnt = 0;
- while(true)
- {
- ::IceInternal::RequestHandlerPtr __handler;
- try
- {
- __checkTwowayOnly(__jderobot__Camera__setCameraDescription_name);
- __handler = __getRequestHandler();
- ::IceInternal::Outgoing __outS(__handler.get(), _reference.get(), __jderobot__Camera__setCameraDescription_name, ::Ice::Normal, __ctx);
- try
- {
- ::IceInternal::BasicStream* __os = __outS.os();
- __os->write(::Ice::ObjectPtr(::IceInternal::upCast(description.get())));
- __os->writePendingObjects();
- }
- catch(const ::Ice::LocalException& __ex)
- {
- __outS.abort(__ex);
- }
- bool __ok = __outS.invoke();
- try
- {
- if(!__ok)
- {
- __outS.is()->throwUnknownUserException();
- }
- ::Ice::Int __ret;
- ::IceInternal::BasicStream* __is = __outS.is();
- __is->read(__ret);
- return __ret;
- }
- catch(const ::Ice::LocalException& __ex)
- {
- throw ::IceInternal::LocalExceptionWrapper(__ex, false);
- }
-#if defined(_MSC_VER) && defined(_M_ARM) // ARM bug.
- catch(...)
- {
- throw;
- }
-#endif
- }
- catch(const ::IceInternal::LocalExceptionWrapper& __ex)
- {
- __handleExceptionWrapper(__handler, __ex);
- }
- catch(const ::Ice::LocalException& __ex)
- {
- __handleException(__handler, __ex, __cnt);
- }
-#if defined(_MSC_VER) && defined(_M_ARM) // ARM bug.
- catch(...)
- {
- throw;
- }
-#endif
- }
-}
-
-::std::string
-IceProxy::jderobot::Camera::startCameraStreaming(const ::Ice::Context* __ctx)
-{
- int __cnt = 0;
- while(true)
- {
- ::IceInternal::RequestHandlerPtr __handler;
- try
- {
- __checkTwowayOnly(__jderobot__Camera__startCameraStreaming_name);
- __handler = __getRequestHandler();
- ::IceInternal::Outgoing __outS(__handler.get(), _reference.get(), __jderobot__Camera__startCameraStreaming_name, ::Ice::Normal, __ctx);
- bool __ok = __outS.invoke();
- try
- {
- if(!__ok)
- {
- __outS.is()->throwUnknownUserException();
- }
- ::std::string __ret;
- ::IceInternal::BasicStream* __is = __outS.is();
- __is->read(__ret);
- return __ret;
- }
- catch(const ::Ice::LocalException& __ex)
- {
- throw ::IceInternal::LocalExceptionWrapper(__ex, false);
- }
-#if defined(_MSC_VER) && defined(_M_ARM) // ARM bug.
- catch(...)
- {
- throw;
- }
-#endif
- }
- catch(const ::IceInternal::LocalExceptionWrapper& __ex)
- {
- __handleExceptionWrapper(__handler, __ex);
- }
- catch(const ::Ice::LocalException& __ex)
- {
- __handleException(__handler, __ex, __cnt);
- }
-#if defined(_MSC_VER) && defined(_M_ARM) // ARM bug.
- catch(...)
- {
- throw;
- }
-#endif
- }
-}
-
-void
-IceProxy::jderobot::Camera::stopCameraStreaming(const ::Ice::Context* __ctx)
-{
- int __cnt = 0;
- while(true)
- {
- ::IceInternal::RequestHandlerPtr __handler;
- try
- {
- __handler = __getRequestHandler();
- ::IceInternal::Outgoing __outS(__handler.get(), _reference.get(), __jderobot__Camera__stopCameraStreaming_name, ::Ice::Normal, __ctx);
- bool __ok = __outS.invoke();
- try
- {
- if(!__ok)
- {
- __outS.is()->throwUnknownUserException();
- }
- }
- catch(const ::Ice::LocalException& __ex)
- {
- throw ::IceInternal::LocalExceptionWrapper(__ex, false);
- }
-#if defined(_MSC_VER) && defined(_M_ARM) // ARM bug.
- catch(...)
- {
- throw;
- }
-#endif
- return;
- }
- catch(const ::IceInternal::LocalExceptionWrapper& __ex)
- {
- __handleExceptionWrapper(__handler, __ex);
- }
- catch(const ::Ice::LocalException& __ex)
- {
- __handleException(__handler, __ex, __cnt);
- }
-#if defined(_MSC_VER) && defined(_M_ARM) // ARM bug.
- catch(...)
- {
- throw;
- }
-#endif
- }
-}
-
-const ::std::string&
-IceProxy::jderobot::Camera::ice_staticId()
-{
- return __jderobot__Camera_ids[1];
-}
-
-::IceProxy::Ice::Object*
-IceProxy::jderobot::Camera::__newInstance() const
-{
- return new Camera;
-}
Deleted: trunk/src/stable/components/naoserver/interfaces/cpp/jderobot/camera.h
===================================================================
--- trunk/src/stable/components/naoserver/interfaces/cpp/jderobot/camera.h 2014-01-25 18:44:50 UTC (rev 1146)
+++ trunk/src/stable/components/naoserver/interfaces/cpp/jderobot/camera.h 2014-01-25 20:27:32 UTC (rev 1147)
@@ -1,401 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice-E is licensed to you under the terms described in the
-// ICEE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-// Ice-E version 1.3.0
-// Generated from file `camera.ice'
-
-#ifndef ___users_eperdices_GO2012_naoserver_src_interfaces_cpp_jderobot_camera_h__
-#define ___users_eperdices_GO2012_naoserver_src_interfaces_cpp_jderobot_camera_h__
-
-#include <IceE/ProxyF.h>
-#include <IceE/ObjectF.h>
-#include <IceE/Exception.h>
-#include <IceE/ScopedArray.h>
-#include <IceE/Proxy.h>
-#include <IceE/Object.h>
-#ifndef ICEE_PURE_CLIENT
-# include <IceE/Incoming.h>
-#endif
-#include <IceE/Outgoing.h>
-#include <IceE/UserExceptionFactory.h>
-#include <IceE/FactoryTable.h>
-#include <jderobot/image.h>
-#include <IceE/UndefSysMacros.h>
-
-#ifndef ICEE_IGNORE_VERSION
-# if ICEE_INT_VERSION / 100 != 103
-# error IceE version mismatch!
-# endif
-# if ICEE_INT_VERSION % 100 < 0
-# error IceE patch level mismatch!
-# endif
-#endif
-
-namespace IceProxy
-{
-
-namespace jderobot
-{
-
-class CameraDescription;
-
-class Camera;
-
-}
-
-}
-
-namespace jderobot
-{
-
-class CameraDescription;
-bool operator==(const CameraDescription&, const CameraDescription&);
-bool operator<(const CameraDescription&, const CameraDescription&);
-
-class Camera;
-bool operator==(const Camera&, const Camera&);
-bool operator<(const Camera&, const Camera&);
-
-}
-
-namespace IceInternal
-{
-
-::Ice::Object* upCast(::jderobot::CameraDescription*);
-::IceProxy::Ice::Object* upCast(::IceProxy::jderobot::CameraDescription*);
-
-::Ice::Object* upCast(::jderobot::Camera*);
-::IceProxy::Ice::Object* upCast(::IceProxy::jderobot::Camera*);
-
-}
-
-namespace jderobot
-{
-
-typedef ::IceInternal::Handle< ::jderobot::CameraDescription> CameraDescriptionPtr;
-typedef ::IceInternal::ProxyHandle< ::IceProxy::jderobot::CameraDescription> CameraDescriptionPrx;
-
-void __read(::IceInternal::BasicStream*, CameraDescriptionPrx&);
-void __patch__CameraDescriptionPtr(void*, ::Ice::ObjectPtr&);
-
-typedef ::IceInternal::Handle< ::jderobot::Camera> CameraPtr;
-typedef ::IceInternal::ProxyHandle< ::IceProxy::jderobot::Camera> CameraPrx;
-
-void __read(::IceInternal::BasicStream*, CameraPrx&);
-void __patch__CameraPtr(void*, ::Ice::ObjectPtr&);
-
-}
-
-namespace jderobot
-{
-
-}
-
-namespace jderobot
-{
-
-class CameraDescription : virtual public ::Ice::Object
-{
-public:
-
- typedef CameraDescriptionPrx ProxyType;
- typedef CameraDescriptionPtr PointerType;
-
- CameraDescription() {}
- CameraDescription(const ::std::string&, const ::std::string&, const ::std::string&, ::Ice::Float, ::Ice::Float, ::Ice::Float, ::Ice::Float, ::Ice::Float, ::Ice::Float, ::Ice::Float, ::Ice::Float, ::Ice::Float, ::Ice::Float, ::Ice::Float, ::Ice::Float);
-
- virtual bool ice_isA(const ::std::string&, const ::Ice::Current& = ::Ice::Current()) const;
- virtual ::std::vector< ::std::string> ice_ids(const ::Ice::Current& = ::Ice::Current()) const;
- virtual const ::std::string& ice_id(const ::Ice::Current& = ::Ice::Current()) const;
- static const ::std::string& ice_staticId();
-
-
- virtual void __write(::IceInternal::BasicStream*) const;
- virtual void __read(::IceInternal::BasicStream*, bool);
-
- static const ::Ice::ObjectFactoryPtr& ice_factory();
-
-protected:
-
- virtual ~CameraDescription() {}
-
-
-public:
-
- ::std::string name;
- ::std::string shortDescription;
- ::std::string streamingUri;
- ::Ice::Float fdistx;
- ::Ice::Float fdisty;
- ::Ice::Float u0;
- ::Ice::Float v0;
- ::Ice::Float skew;
- ::Ice::Float posx;
- ::Ice::Float posy;
- ::Ice::Float posz;
- ::Ice::Float foax;
- ::Ice::Float foay;
- ::Ice::Float foaz;
- ::Ice::Float roll;
-};
-
-class Camera : virtual public ::jderobot::ImageProvider
-{
-public:
-
- typedef CameraPrx ProxyType;
- typedef CameraPtr PointerType;
-
-
- virtual bool ice_isA(const ::std::string&, const ::Ice::Current& = ::Ice::Current()) const;
- virtual ::std::vector< ::std::string> ice_ids(const ::Ice::Current& = ::Ice::Current()) const;
- virtual const ::std::string& ice_id(const ::Ice::Current& = ::Ice::Current()) const;
- static const ::std::string& ice_staticId();
-
- virtual ::jderobot::CameraDescriptionPtr getCameraDescription(const ::Ice::Current& = ::Ice::Current()) = 0;
-#ifndef ICEE_PURE_CLIENT
- ::Ice::DispatchStatus ___getCameraDescription(::IceInternal::Incoming&, const ::Ice::Current&);
-#endif // ICEE_PURE_CLIENT
-
- virtual ::Ice::Int setCameraDescription(const ::jderobot::CameraDescriptionPtr&, const ::Ice::Current& = ::Ice::Current()) = 0;
-#ifndef ICEE_PURE_CLIENT
- ::Ice::DispatchStatus ___setCameraDescription(::IceInternal::Incoming&, const ::Ice::Current&);
-#endif // ICEE_PURE_CLIENT
-
- virtual ::std::string startCameraStreaming(const ::Ice::Current& = ::Ice::Current()) = 0;
-#ifndef ICEE_PURE_CLIENT
- ::Ice::DispatchStatus ___startCameraStreaming(::IceInternal::Incoming&, const ::Ice::Current&);
-#endif // ICEE_PURE_CLIENT
-
- virtual void stopCameraStreaming(const ::Ice::Current& = ::Ice::Current()) = 0;
-#ifndef ICEE_PURE_CLIENT
- ::Ice::DispatchStatus ___stopCameraStreaming(::IceInternal::Incoming&, const ::Ice::Current&);
-#endif // ICEE_PURE_CLIENT
-
-#ifndef ICEE_PURE_CLIENT
- virtual ::Ice::DispatchStatus __dispatch(::IceInternal::Incoming&, const ::Ice::Current&);
-#endif // ICEE_PURE_CLIENT
-
- virtual void __write(::IceInternal::BasicStream*) const;
- virtual void __read(::IceInternal::BasicStream*, bool);
-};
-
-}
-
-namespace IceProxy
-{
-
-namespace jderobot
-{
-
-class CameraDescription : virtual public ::IceProxy::Ice::Object
-{
-public:
-
- ::IceInternal::ProxyHandle<CameraDescription> ice_context(const ::Ice::Context& __context) const
- {
- return dynamic_cast<CameraDescription*>(::IceProxy::Ice::Object::ice_context(__context).get());
- }
-
- ::IceInternal::ProxyHandle<CameraDescription> ice_secure(bool __secure) const
- {
- return dynamic_cast<CameraDescription*>(::IceProxy::Ice::Object::ice_secure(__secure).get());
- }
-
-#ifdef ICEE_HAS_ROUTER
- ::IceInternal::ProxyHandle<CameraDescription> ice_router(const ::Ice::RouterPrx& __router) const
- {
- return dynamic_cast<CameraDescription*>(::IceProxy::Ice::Object::ice_router(__router).get());
- }
-#endif // ICEE_HAS_ROUTER
-
-#ifdef ICEE_HAS_LOCATOR
- ::IceInternal::ProxyHandle<CameraDescription> ice_locator(const ::Ice::LocatorPrx& __locator) const
- {
- return dynamic_cast<CameraDescription*>(::IceProxy::Ice::Object::ice_locator(__locator).get());
- }
-
- ::IceInternal::ProxyHandle<CameraDescription> ice_adapterId(const std::string& __id) const
- {
- return dynamic_cast<CameraDescription*>(::IceProxy::Ice::Object::ice_adapterId(__id).get());
- }
-#endif // ICEE_HAS_LOCATOR
-
- ::IceInternal::ProxyHandle<CameraDescription> ice_twoway() const
- {
- return dynamic_cast<CameraDescription*>(::IceProxy::Ice::Object::ice_twoway().get());
- }
-
- ::IceInternal::ProxyHandle<CameraDescription> ice_oneway() const
- {
- return dynamic_cast<CameraDescription*>(::IceProxy::Ice::Object::ice_oneway().get());
- }
-
- ::IceInternal::ProxyHandle<CameraDescription> ice_batchOneway() const
- {
- return dynamic_cast<CameraDescription*>(::IceProxy::Ice::Object::ice_batchOneway().get());
- }
-
- ::IceInternal::ProxyHandle<CameraDescription> ice_datagram() const
- {
- return dynamic_cast<CameraDescription*>(::IceProxy::Ice::Object::ice_datagram().get());
- }
-
- ::IceInternal::ProxyHandle<CameraDescription> ice_batchDatagram() const
- {
- return dynamic_cast<CameraDescription*>(::IceProxy::Ice::Object::ice_batchDatagram().get());
- }
-
- ::IceInternal::ProxyHandle<CameraDescription> ice_timeout(int __timeout) const
- {
- return dynamic_cast<CameraDescription*>(::IceProxy::Ice::Object::ice_timeout(__timeout).get());
- }
-
- static const ::std::string& ice_staticId();
-
-private:
-
- virtual ::IceProxy::Ice::Object* __newInstance() const;
-};
-
-class Camera : virtual public ::IceProxy::jderobot::ImageProvider
-{
-public:
-
- ::jderobot::CameraDescriptionPtr getCameraDescription()
- {
- return getCameraDescription(0);
- }
- ::jderobot::CameraDescriptionPtr getCameraDescription(const ::Ice::Context& __ctx)
- {
- return getCameraDescription(&__ctx);
- }
-
-private:
-
- ::jderobot::CameraDescriptionPtr getCameraDescription(const ::Ice::Context*);
-
-public:
-
- ::Ice::Int setCameraDescription(const ::jderobot::CameraDescriptionPtr& description)
- {
- return setCameraDescription(description, 0);
- }
- ::Ice::Int setCameraDescription(const ::jderobot::CameraDescriptionPtr& description, const ::Ice::Context& __ctx)
- {
- return setCameraDescription(description, &__ctx);
- }
-
-private:
-
- ::Ice::Int setCameraDescription(const ::jderobot::CameraDescriptionPtr&, const ::Ice::Context*);
-
-public:
-
- ::std::string startCameraStreaming()
- {
- return startCameraStreaming(0);
- }
- ::std::string startCameraStreaming(const ::Ice::Context& __ctx)
- {
- return startCameraStreaming(&__ctx);
- }
-
-private:
-
- ::std::string startCameraStreaming(const ::Ice::Context*);
-
-public:
-
- void stopCameraStreaming()
- {
- stopCameraStreaming(0);
- }
- void stopCameraStreaming(const ::Ice::Context& __ctx)
- {
- stopCameraStreaming(&__ctx);
- }
-
-private:
-
- void stopCameraStreaming(const ::Ice::Context*);
-
-public:
-
- ::IceInternal::ProxyHandle<Camera> ice_context(const ::Ice::Context& __context) const
- {
- return dynamic_cast<Camera*>(::IceProxy::Ice::Object::ice_context(__context).get());
- }
-
- ::IceInternal::ProxyHandle<Camera> ice_secure(bool __secure) const
- {
- return dynamic_cast<Camera*>(::IceProxy::Ice::Object::ice_secure(__secure).get());
- }
-
-#ifdef ICEE_HAS_ROUTER
- ::IceInternal::ProxyHandle<Camera> ice_router(const ::Ice::RouterPrx& __router) const
- {
- return dynamic_cast<Camera*>(::IceProxy::Ice::Object::ice_router(__router).get());
- }
-#endif // ICEE_HAS_ROUTER
-
-#ifdef ICEE_HAS_LOCATOR
- ::IceInternal::ProxyHandle<Camera> ice_locator(const ::Ice::LocatorPrx& __locator) const
- {
- return dynamic_cast<Camera*>(::IceProxy::Ice::Object::ice_locator(__locator).get());
- }
-
- ::IceInternal::ProxyHandle<Camera> ice_adapterId(const std::string& __id) const
- {
- return dynamic_cast<Camera*>(::IceProxy::Ice::Object::ice_adapterId(__id).get());
- }
-#endif // ICEE_HAS_LOCATOR
-
- ::IceInternal::ProxyHandle<Camera> ice_twoway() const
- {
- return dynamic_cast<Camera*>(::IceProxy::Ice::Object::ice_twoway().get());
- }
-
- ::IceInternal::ProxyHandle<Camera> ice_oneway() const
- {
- return dynamic_cast<Camera*>(::IceProxy::Ice::Object::ice_oneway().get());
- }
-
- ::IceInternal::ProxyHandle<Camera> ice_batchOneway() const
- {
- return dynamic_cast<Camera*>(::IceProxy::Ice::Object::ice_batchOneway().get());
- }
-
- ::IceInternal::ProxyHandle<Camera> ice_datagram() const
- {
- return dynamic_cast<Camera*>(::IceProxy::Ice::Object::ice_datagram().get());
- }
-
- ::IceInternal::ProxyHandle<Camera> ice_batchDatagram() const
- {
- return dynamic_cast<Camera*>(::IceProxy::Ice::Object::ice_batchDatagram().get());
- }
-
- ::IceInternal::ProxyHandle<Camera> ice_timeout(int __timeout) const
- {
- return dynamic_cast<Camera*>(::IceProxy::Ice::Object::ice_timeout(__timeout).get());
- }
-
- static const ::std::string& ice_staticId();
-
-private:
-
- virtual ::IceProxy::Ice::Object* __newInstance() const;
-};
-
-}
-
-}
-
-#endif
Deleted: trunk/src/stable/components/naoserver/interfaces/cpp/jderobot/common.cpp
===================================================================
--- trunk/src/stable/components/naoserver/interfaces/cpp/jderobot/common.cpp 2014-01-25 18:44:50 UTC (rev 1146)
+++ trunk/src/stable/components/naoserver/interfaces/cpp/jderobot/common.cpp 2014-01-25 20:27:32 UTC (rev 1147)
@@ -1,26 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice-E is licensed to you under the terms described in the
-// ICEE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-// Ice-E version 1.3.0
-// Generated from file `common.ice'
-
-#include <common.h>
-#include <IceE/BasicStream.h>
-#include <IceE/Object.h>
-#include <IceE/LocalException.h>
-#include <IceE/Iterator.h>
-
-#ifndef ICEE_IGNORE_VERSION
-# if ICEE_INT_VERSION / 100 != 103
-# error IceE version mismatch!
-# endif
-# if ICEE_INT_VERSION % 100 < 0
-# error IceE patch level mismatch!
-# endif
-#endif
Deleted: trunk/src/stable/components/naoserver/interfaces/cpp/jderobot/common.h
===================================================================
--- trunk/src/stable/components/naoserver/interfaces/cpp/jderobot/common.h 2014-01-25 18:44:50 UTC (rev 1146)
+++ trunk/src/stable/components/naoserver/interfaces/cpp/jderobot/common.h 2014-01-25 20:27:32 UTC (rev 1147)
@@ -1,41 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice-E is licensed to you under the terms described in the
-// ICEE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-// Ice-E version 1.3.0
-// Generated from file `common.ice'
-
-#ifndef ___users_eperdices_GO2012_naoserver_src_interfaces_cpp_jderobot_common_h__
-#define ___users_eperdices_GO2012_naoserver_src_interfaces_cpp_jderobot_common_h__
-
-#include <IceE/ProxyF.h>
-#include <IceE/ObjectF.h>
-#include <IceE/Exception.h>
-#include <IceE/ScopedArray.h>
-#include <IceE/UserExceptionFactory.h>
-#include <IceE/FactoryTable.h>
-#include <jderobot/datetime.h>
-#include <jderobot/exceptions.h>
-#include <jderobot/containers.h>
-#include <IceE/UndefSysMacros.h>
-
-#ifndef ICEE_IGNORE_VERSION
-# if ICEE_INT_VERSION / 100 != 103
-# error IceE version mismatch!
-# endif
-# if ICEE_INT_VERSION % 100 < 0
-# error IceE patch level mismatch!
-# endif
-#endif
-
-namespace jderobot
-{
-
-}
-
-#endif
Deleted: trunk/src/stable/components/naoserver/interfaces/cpp/jderobot/containers.cpp
===================================================================
--- trunk/src/stable/components/naoserver/interfaces/cpp/jderobot/containers.cpp 2014-01-25 18:44:50 UTC (rev 1146)
+++ trunk/src/stable/components/naoserver/interfaces/cpp/jderobot/containers.cpp 2014-01-25 20:27:32 UTC (rev 1147)
@@ -1,25 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice-E is licensed to you under the terms described in the
-// ICEE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-// Ice-E version 1.3.0
-// Generated from file `containers.ice'
-
-#include <containers.h>
-#include <IceE/BasicStream.h>
-#include <IceE/Object.h>
-#include <IceE/Iterator.h>
-
-#ifndef ICEE_IGNORE_VERSION
-# if ICEE_INT_VERSION / 100 != 103
-# error IceE version mismatch!
-# endif
-# if ICEE_INT_VERSION % 100 < 0
-# error IceE patch level mismatch!
-# endif
-#endif
Deleted: trunk/src/stable/components/naoserver/interfaces/cpp/jderobot/containers.h
===================================================================
--- trunk/src/stable/components/naoserver/interfaces/cpp/jderobot/containers.h 2014-01-25 18:44:50 UTC (rev 1146)
+++ trunk/src/stable/components/naoserver/interfaces/cpp/jderobot/containers.h 2014-01-25 20:27:32 UTC (rev 1147)
@@ -1,42 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice-E is licensed to you under the terms described in the
-// ICEE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-// Ice-E version 1.3.0
-// Generated from file `containers.ice'
-
-#ifndef ___users_eperdices_GO2012_naoserver_src_interfaces_cpp_jderobot_containers_h__
-#define ___users_eperdices_GO2012_naoserver_src_interfaces_cpp_jderobot_containers_h__
-
-#include <IceE/ProxyF.h>
-#include <IceE/ObjectF.h>
-#include <IceE/Exception.h>
-#include <IceE/ScopedArray.h>
-#include <IceE/UndefSysMacros.h>
-
-#ifndef ICEE_IGNORE_VERSION
-# if ICEE_INT_VERSION / 100 != 103
-# error IceE version mismatch!
-# endif
-# if ICEE_INT_VERSION % 100 < 0
-# error IceE patch level mismatch!
-# endif
-#endif
-
-namespace jderobot
-{
-
-typedef ::std::vector< ::Ice::Byte> ByteSeq;
-
-typedef ::std::vector< ::Ice::Int> IntSeq;
-
-typedef ::std::vector< ::Ice::Float> seqFloat;
-
-}
-
-#endif
Deleted: trunk/src/stable/components/naoserver/interfaces/cpp/jderobot/datetime.cpp
===================================================================
--- trunk/src/stable/components/naoserver/interfaces/cpp/jderobot/datetime.cpp 2014-01-25 18:44:50 UTC (rev 1146)
+++ trunk/src/stable/components/naoserver/interfaces/cpp/jderobot/datetime.cpp 2014-01-25 20:27:32 UTC (rev 1147)
@@ -1,83 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice-E is licensed to you under the terms described in the
-// ICEE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-// Ice-E version 1.3.0
-// Generated from file `datetime.ice'
-
-#include <datetime.h>
-#include <IceE/BasicStream.h>
-#include <IceE/Object.h>
-#include <IceE/Iterator.h>
-
-#ifndef ICEE_IGNORE_VERSION
-# if ICEE_INT_VERSION / 100 != 103
-# error IceE version mismatch!
-# endif
-# if ICEE_INT_VERSION % 100 < 0
-# error IceE patch level mismatch!
-# endif
-#endif
-
-bool
-jderobot::Time::operator==(const Time& __rhs) const
-{
- if(this == &__rhs)
- {
- return true;
- }
- if(seconds != __rhs.seconds)
- {
- return false;
- }
- if(useconds != __rhs.useconds)
- {
- return false;
- }
- return true;
-}
-
-bool
-jderobot::Time::operator<(const Time& __rhs) const
-{
- if(this == &__rhs)
- {
- return false;
- }
- if(seconds < __rhs.seconds)
- {
- return true;
- }
- else if(__rhs.seconds < seconds)
- {
- return false;
- }
- if(useconds < __rhs.useconds)
- {
- return true;
- }
- else if(__rhs.useconds < useconds)
- {
- return false;
- }
- return false;
-}
-
-void
-jderobot::Time::__write(::IceInternal::BasicStream* __os) const
-{
- __os->write(seconds);
- __os->write(useconds);
-}
-
-void
-jderobot::Time::__read(::IceInternal::BasicStream* __is)
-{
- __is->read(seconds);
- __is->read(useconds);
-}
Deleted: trunk/src/stable/components/naoserver/interfaces/cpp/jderobot/datetime.h
===================================================================
--- trunk/src/stable/components/naoserver/interfaces/cpp/jderobot/datetime.h 2014-01-25 18:44:50 UTC (rev 1146)
+++ trunk/src/stable/components/naoserver/interfaces/cpp/jderobot/datetime.h 2014-01-25 20:27:32 UTC (rev 1147)
@@ -1,64 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice-E is licensed to you under the terms described in the
-// ICEE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-// Ice-E version 1.3.0
-// Generated from file `datetime.ice'
-
-#ifndef ___users_eperdices_GO2012_naoserver_src_interfaces_cpp_jderobot_datetime_h__
-#define ___users_eperdices_GO2012_naoserver_src_interfaces_cpp_jderobot_datetime_h__
-
-#include <IceE/ProxyF.h>
-#include <IceE/ObjectF.h>
-#include <IceE/Exception.h>
-#include <IceE/ScopedArray.h>
-#include <IceE/UndefSysMacros.h>
-
-#ifndef ICEE_IGNORE_VERSION
-# if ICEE_INT_VERSION / 100 != 103
-# error IceE version mismatch!
-# endif
-# if ICEE_INT_VERSION % 100 < 0
-# error IceE patch level mismatch!
-# endif
-#endif
-
-namespace jderobot
-{
-
-struct Time
-{
- ::Ice::Long seconds;
- ::Ice::Long useconds;
-
- bool operator==(const Time&) const;
- bool operator<(const Time&) const;
- bool operator!=(const Time& __rhs) const
- {
- return !operator==(__rhs);
- }
- bool operator<=(const Time& __rhs) const
- {
- return operator<(__rhs) || operator==(__rhs);
- }
- bool operator>(const Time& __rhs) const
- {
- return !operator<(__rhs) && !operator==(__rhs);
- }
- bool operator>=(const Time& __rhs) const
- {
- return !operator<(__rhs);
- }
-
- void __write(::IceInternal::BasicStream*) const;
- void __read(::IceInternal::BasicStream*);
-};
-
-}
-
-#endif
Deleted: trunk/src/stable/components/naoserver/interfaces/cpp/jderobot/encoders.cpp
===================================================================
--- trunk/src/stable/components/naoserver/interfaces/cpp/jderobot/encoders.cpp 2014-01-25 18:44:50 UTC (rev 1146)
+++ trunk/src/stable/components/naoserver/interfaces/cpp/jderobot/encoders.cpp 2014-01-25 20:27:32 UTC (rev 1147)
@@ -1,424 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice-E is licensed to you under the terms described in the
-// ICEE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-// Ice-E version 1.3.0
-// Generated from file `encoders.ice'
-
-#include <encoders.h>
-#include <IceE/LocalException.h>
-#include <IceE/ObjectFactory.h>
-#include <IceE/BasicStream.h>
-#include <IceE/LocalException.h>
-#include <IceE/Iterator.h>
-
-#ifndef ICEE_IGNORE_VERSION
-# if ICEE_INT_VERSION / 100 != 103
-# error IceE version mismatch!
-# endif
-# if ICEE_INT_VERSION % 100 < 0
-# error IceE patch level mismatch!
-# endif
-#endif
-
-static const ::std::string __jderobot__Encoders__getEncodersData_name = "getEncodersData";
-
-::Ice::Object* IceInternal::upCast(::jderobot::EncodersData* p) { return p; }
-::IceProxy::Ice::Object* IceInternal::upCast(::IceProxy::jderobot::EncodersData* p) { return p; }
-
-::Ice::Object* IceInternal::upCast(::jderobot::Encoders* p) { return p; }
-::IceProxy::Ice::Object* IceInternal::upCast(::IceProxy::jderobot::Encoders* p) { return p; }
-
-void
-jderobot::__read(::IceInternal::BasicStream* __is, ::jderobot::EncodersDataPrx& v)
-{
- ::Ice::ObjectPrx proxy;
- __is->read(proxy);
- if(!proxy)
- {
- v = 0;
- }
- else
- {
- v = new ::IceProxy::jderobot::EncodersData;
- v->__copyFrom(proxy);
- }
-}
-
-void
-jderobot::__read(::IceInternal::BasicStream* __is, ::jderobot::EncodersPrx& v)
-{
- ::Ice::ObjectPrx proxy;
- __is->read(proxy);
- if(!proxy)
- {
- v = 0;
- }
- else
- {
- v = new ::IceProxy::jderobot::Encoders;
- v->__copyFrom(proxy);
- }
-}
-
-jderobot::EncodersData::EncodersData(::Ice::Float __ice_robotx, ::Ice::Float __ice_roboty, ::Ice::Float __ice_robottheta, ::Ice::Float __ice_robotcos, ::Ice::Float __ice_robotsin) :
- robotx(__ice_robotx),
- roboty(__ice_roboty),
- robottheta(__ice_robottheta),
- robotcos(__ice_robotcos),
- robotsin(__ice_robotsin)
-{
-}
-
-static const ::std::string __jderobot__EncodersData_ids[2] =
-{
- "::Ice::Object",
- "::jderobot::EncodersData"
-};
-
-bool
-jderobot::EncodersData::ice_isA(const ::std::string& _s, const ::Ice::Current&) const
-{
- return ::std::binary_search(__jderobot__EncodersData_ids, __jderobot__EncodersData_ids + 2, _s);
-}
-
-::std::vector< ::std::string>
-jderobot::EncodersData::ice_ids(const ::Ice::Current&) const
-{
- return ::std::vector< ::std::string>(&__jderobot__EncodersData_ids[0], &__jderobot__EncodersData_ids[2]);
-}
-
-const ::std::string&
-jderobot::EncodersData::ice_id(const ::Ice::Current&) const
-{
- return __jderobot__EncodersData_ids[1];
-}
-
-const ::std::string&
-jderobot::EncodersData::ice_staticId()
-{
- return __jderobot__EncodersData_ids[1];
-}
-
-void
-jderobot::EncodersData::__write(::IceInternal::BasicStream* __os) const
-{
- __os->writeTypeId(ice_staticId());
- __os->startWriteSlice();
- __os->write(robotx);
- __os->write(roboty);
- __os->write(robottheta);
- __os->write(robotcos);
- __os->write(robotsin);
- __os->endWriteSlice();
- ::Ice::Object::__write(__os);
-}
-
-void
-jderobot::EncodersData::__read(::IceInternal::BasicStream* __is, bool __rid)
-{
- if(__rid)
- {
- ::std::string myId;
- __is->readTypeId(myId);
- }
- __is->startReadSlice();
- __is->read(robotx);
- __is->read(roboty);
- __is->read(robottheta);
- __is->read(robotcos);
- __is->read(robotsin);
- __is->endReadSlice();
- ::Ice::Object::__read(__is, true);
-}
-
-class __F__jderobot__EncodersData : public ::Ice::ObjectFactory
-{
-public:
-
- virtual ::Ice::ObjectPtr
- create(const ::std::string& type)
- {
- assert(type == ::jderobot::EncodersData::ice_staticId());
- return new ::jderobot::EncodersData;
- }
-
- virtual void
- destroy()
- {
- }
-};
-
-static ::Ice::ObjectFactoryPtr __F__jderobot__EncodersData_Ptr = new __F__jderobot__EncodersData;
-
-const ::Ice::ObjectFactoryPtr&
-jderobot::EncodersData::ice_factory()
-{
- return __F__jderobot__EncodersData_Ptr;
-}
-
-class __F__jderobot__EncodersData__Init
-{
-public:
-
- __F__jderobot__EncodersData__Init()
- {
- ::IceInternal::factoryTable->addObjectFactory(::jderobot::EncodersData::ice_staticId(), ::jderobot::EncodersData::ice_factory());
- }
-
- ~__F__jderobot__EncodersData__Init()
- {
- ::IceInternal::factoryTable->removeObjectFactory(::jderobot::EncodersData::ice_staticId());
- }
-};
-
-static __F__jderobot__EncodersData__Init __F__jderobot__EncodersData__i;
-
-#ifdef __APPLE__
-extern "C" { void __F__jderobot__EncodersData__initializer() {} }
-#endif
-
-
-bool
-jderobot::operator==(const ::jderobot::EncodersData& l, const ::jderobot::EncodersData& r)
-{
- return static_cast<const ::Ice::Object&>(l) == static_cast<const ::Ice::Object&>(r);
-}
-
-bool
-jderobot::operator<(const ::jderobot::EncodersData& l, const ::jderobot::EncodersData& r)
-{
- return static_cast<const ::Ice::Object&>(l) < static_cast<const ::Ice::Object&>(r);
-}
-
-void
-jderobot::__patch__EncodersDataPtr(void* __addr, ::Ice::ObjectPtr& v)
-{
- ::jderobot::EncodersDataPtr* p = static_cast< ::jderobot::EncodersDataPtr*>(__addr);
- assert(p);
- *p = ::jderobot::EncodersDataPtr::dynamicCast(v);
- if(v && !*p)
- {
- IceInternal::Ex::throwUOE(::jderobot::EncodersData::ice_staticId(), v->ice_id());
- }
-}
-
-static const ::std::string __jderobot__Encoders_ids[2] =
-{
- "::Ice::Object",
- "::jderobot::Encoders"
-};
-
-bool
-jderobot::Encoders::ice_isA(const ::std::string& _s, const ::Ice::Current&) const
-{
- return ::std::binary_search(__jderobot__Encoders_ids, __jderobot__Encoders_ids + 2, _s);
-}
-
-::std::vector< ::std::string>
-jderobot::Encoders::ice_ids(const ::Ice::Current&) const
-{
- return ::std::vector< ::std::string>(&__jderobot__Encoders_ids[0], &__jderobot__Encoders_ids[2]);
-}
-
-const ::std::string&
-jderobot::Encoders::ice_id(const ::Ice::Current&) const
-{
- return __jderobot__Encoders_ids[1];
-}
-
-const ::std::string&
-jderobot::Encoders::ice_staticId()
-{
- return __jderobot__Encoders_ids[1];
-}
-
-#ifndef ICEE_PURE_CLIENT
-::Ice::DispatchStatus
-jderobot::Encoders::___getEncodersData(::IceInternal::Incoming& __inS, const ::Ice::Current& __current)
-{
- __checkMode(::Ice::Idempotent, __current.mode);
- ::IceInternal::BasicStream* __os = __inS.os();
- ::jderobot::EncodersDataPtr __ret = getEncodersData(__current);
- __os->write(::Ice::ObjectPtr(::IceInternal::upCast(__ret.get())));
- __os->writePendingObjects();
- return ::Ice::DispatchOK;
-}
-#endif // ICEE_PURE_CLIENT
-
-#ifndef ICEE_PURE_CLIENT
-static ::std::string __jderobot__Encoders_all[] =
-{
- "getEncodersData",
- "ice_id",
- "ice_ids",
- "ice_isA",
- "ice_ping"
-};
-
-::Ice::DispatchStatus
-jderobot::Encoders::__dispatch(::IceInternal::Incoming& in, const ::Ice::Current& current)
-{
- ::std::pair< ::std::string*, ::std::string*> r = ::std::equal_range(__jderobot__Encoders_all, __jderobot__Encoders_all + 5, current.operation);
- if(r.first == r.second)
- {
- throw Ice::OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
- }
-
- switch(r.first - __jderobot__Encoders_all)
- {
- case 0:
- {
- return ___getEncodersData(in, current);
- }
- case 1:
- {
- return ___ice_id(in, current);
- }
- case 2:
- {
- return ___ice_ids(in, current);
- }
- case 3:
- {
- return ___ice_isA(in, current);
- }
- case 4:
- {
- return ___ice_ping(in, current);
- }
- }
-
- assert(false);
- throw Ice::OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
-}
-#endif // ICEE_PURE_CLIENT
-
-void
-jderobot::Encoders::__write(::IceInternal::BasicStream* __os) const
-{
- __os->writeTypeId(ice_staticId());
- __os->startWriteSlice();
- __os->endWriteSlice();
- ::Ice::Object::__write(__os);
-}
-
-void
-jderobot::Encoders::__read(::IceInternal::BasicStream* __is, bool __rid)
-{
- if(__rid)
- {
- ::std::string myId;
- __is->readTypeId(myId);
- }
- __is->startReadSlice();
- __is->endReadSlice();
- ::Ice::Object::__read(__is, true);
-}
-
-
-bool
-jderobot::operator==(const ::jderobot::Encoders& l, const ::jderobot::Encoders& r)
-{
- return static_cast<const ::Ice::Object&>(l) == static_cast<const ::Ice::Object&>(r);
-}
-
-bool
-jderobot::operator<(const ::jderobot::Encoders& l, const ::jderobot::Encoders& r)
-{
- return static_cast<const ::Ice::Object&>(l) < static_cast<const ::Ice::Object&>(r);
-}
-
-void
-jderobot::__patch__EncodersPtr(void* __addr, ::Ice::ObjectPtr& v)
-{
- ::jderobot::EncodersPtr* p = static_cast< ::jderobot::EncodersPtr*>(__addr);
- assert(p);
- *p = ::jderobot::EncodersPtr::dynamicCast(v);
- if(v && !*p)
- {
- IceInternal::Ex::throwUOE(::jderobot::Encoders::ice_staticId(), v->ice_id());
- }
-}
-
-const ::std::string&
-IceProxy::jderobot::EncodersData::ice_staticId()
-{
- return __jderobot__EncodersData_ids[1];
-}
-
-::IceProxy::Ice::Object*
-IceProxy::jderobot::EncodersData::__newInstance() const
-{
- return new EncodersData;
-}
-
-::jderobot::EncodersDataPtr
-IceProxy::jderobot::Encoders::getEncodersData(const ::Ice::Context* __ctx)
-{
- int __cnt = 0;
- while(true)
- {
- ::IceInternal::RequestHandlerPtr __handler;
- try
- {
- __checkTwowayOnly(__jderobot__Encoders__getEncodersData_name);
- __handler = __getRequestHandler();
- ::IceInternal::Outgoing __outS(__handler.get(), _reference.get(), __jderobot__Encoders__getEncodersData_name, ::Ice::Idempotent, __ctx);
- bool __ok = __outS.invoke();
- try
- {
- if(!__ok)
- {
- __outS.is()->throwUnknownUserException();
- }
- ::jderobot::EncodersDataPtr __ret;
- ::IceInternal::BasicStream* __is = __outS.is();
- __is->read(::jderobot::__patch__EncodersDataPtr, &__ret);
- __is->readPendingObjects();
- return __ret;
- }
- catch(const ::Ice::LocalException& __ex)
- {
- throw ::IceInternal::LocalExceptionWrapper(__ex, false);
- }
-#if defined(_MSC_VER) && defined(_M_ARM) // ARM bug.
- catch(...)
- {
- throw;
- }
-#endif
- }
- catch(const ::IceInternal::LocalExceptionWrapper& __ex)
- {
- __handleExceptionWrapperRelaxed(__handler, __ex, __cnt);
- }
- catch(const ::Ice::LocalException& __ex)
- {
- __handleException(__handler, __ex, __cnt);
- }
-#if defined(_MSC_VER) && defined(_M_ARM) // ARM bug.
- catch(...)
- {
- throw;
- }
-#endif
- }
-}
-
-const ::std::string&
-IceProxy::jderobot::Encoders::ice_staticId()
-{
- return __jderobot__Encoders_ids[1];
-}
-
-::IceProxy::Ice::Object*
-IceProxy::jderobot::Encoders::__newInstance() const
-{
- return new Encoders;
-}
Deleted: trunk/src/stable/components/naoserver/interfaces/cpp/jderobot/encoders.h
===================================================================
--- trunk/src/stable/components/naoserver/interfaces/cpp/jderobot/encoders.h 2014-01-25 18:44:50 UTC (rev 1146)
+++ trunk/src/stable/components/naoserver/interfaces/cpp/jderobot/encoders.h 2014-01-25 20:27:32 UTC (rev 1147)
@@ -1,331 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice-E is licensed to you under the terms described in the
-// ICEE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-// Ice-E version 1.3.0
-// Generated from file `encoders.ice'
-
-#ifndef ___users_eperdices_GO2012_naoserver_src_interfaces_cpp_jderobot_encoders_h__
-#define ___users_eperdices_GO2012_naoserver_src_interfaces_cpp_jderobot_encoders_h__
-
-#include <IceE/ProxyF.h>
-#include <IceE/ObjectF.h>
-#include <IceE/Exception.h>
-#include <IceE/ScopedArray.h>
-#include <IceE/Proxy.h>
-#include <IceE/Object.h>
-#ifndef ICEE_PURE_CLIENT
-# include <IceE/Incoming.h>
-#endif
-#include <IceE/Outgoing.h>
-#include <IceE/UserExceptionFactory.h>
-#include <IceE/FactoryTable.h>
-#include <jderobot/common.h>
-#include <IceE/UndefSysMacros.h>
-
-#ifndef ICEE_IGNORE_VERSION
-# if ICEE_INT_VERSION / 100 != 103
-# error IceE version mismatch!
-# endif
-# if ICEE_INT_VERSION % 100 < 0
-# error IceE patch level mismatch!
-# endif
-#endif
-
-namespace IceProxy
-{
-
-namespace jderobot
-{
-
-class EncodersData;
-
-class Encoders;
-
-}
-
-}
-
-namespace jderobot
-{
-
-class EncodersData;
-bool operator==(const EncodersData&, const EncodersData&);
-bool operator<(const EncodersData&, const EncodersData&);
-
-class Encoders;
-bool operator==(const Encoders&, const Encoders&);
-bool operator<(const Encoders&, const Encoders&);
-
-}
-
-namespace IceInternal
-{
-
-::Ice::Object* upCast(::jderobot::EncodersData*);
-::IceProxy::Ice::Object* upCast(::IceProxy::jderobot::EncodersData*);
-
-::Ice::Object* upCast(::jderobot::Encoders*);
-::IceProxy::Ice::Object* upCast(::IceProxy::jderobot::Encoders*);
-
-}
-
-namespace jderobot
-{
-
-typedef ::IceInternal::Handle< ::jderobot::EncodersData> EncodersDataPtr;
-typedef ::IceInternal::ProxyHandle< ::IceProxy::jderobot::EncodersData> EncodersDataPrx;
-
-void __read(::IceInternal::BasicStream*, EncodersDataPrx&);
-void __patch__EncodersDataPtr(void*, ::Ice::ObjectPtr&);
-
-typedef ::IceInternal::Handle< ::jderobot::Encoders> EncodersPtr;
-typedef ::IceInternal::ProxyHandle< ::IceProxy::jderobot::Encoders> EncodersPrx;
-
-void __read(::IceInternal::BasicStream*, EncodersPrx&);
-void __patch__EncodersPtr(void*, ::Ice::ObjectPtr&);
-
-}
-
-namespace jderobot
-{
-
-}
-
-namespace jderobot
-{
-
-class EncodersData : virtual public ::Ice::Object
-{
-public:
-
- typedef EncodersDataPrx ProxyType;
- typedef EncodersDataPtr PointerType;
-
- EncodersData() {}
- EncodersData(::Ice::Float, ::Ice::Float, ::Ice::Float, ::Ice::Float, ::Ice::Float);
-
- virtual bool ice_isA(const ::std::string&, const ::Ice::Current& = ::Ice::Current()) const;
- virtual ::std::vector< ::std::string> ice_ids(const ::Ice::Current& = ::Ice::Current()) const;
- virtual const ::std::string& ice_id(const ::Ice::Current& = ::Ice::Current()) const;
- static const ::std::string& ice_staticId();
-
-
- virtual void __write(::IceInternal::BasicStream*) const;
- virtual void __read(::IceInternal::BasicStream*, bool);
-
- static const ::Ice::ObjectFactoryPtr& ice_factory();
-
-protected:
-
- virtual ~EncodersData() {}
-
-
-public:
-
- ::Ice::Float robotx;
- ::Ice::Float roboty;
- ::Ice::Float robottheta;
- ::Ice::Float robotcos;
- ::Ice::Float robotsin;
-};
-
-class Encoders : virtual public ::Ice::Object
-{
-public:
-
- typedef EncodersPrx ProxyType;
- typedef EncodersPtr PointerType;
-
-
- virtual bool ice_isA(const ::std::string&, const ::Ice::Current& = ::Ice::Current()) const;
- virtual ::std::vector< ::std::string> ice_ids(const ::Ice::Current& = ::Ice::Current()) const;
- virtual const ::std::string& ice_id(const ::Ice::Current& = ::Ice::Current()) const;
- static const ::std::string& ice_staticId();
-
- virtual ::jderobot::EncodersDataPtr getEncodersData(const ::Ice::Current& = ::Ice::Current()) = 0;
-#ifndef ICEE_PURE_CLIENT
- ::Ice::DispatchStatus ___getEncodersData(::IceInternal::Incoming&, const ::Ice::Current&);
-#endif // ICEE_PURE_CLIENT
-
-#ifndef ICEE_PURE_CLIENT
- virtual ::Ice::DispatchStatus __dispatch(::IceInternal::Incoming&, const ::Ice::Current&);
-#endif // ICEE_PURE_CLIENT
-
- virtual void __write(::IceInternal::BasicStream*) const;
- virtual void __read(::IceInternal::BasicStream*, bool);
-};
-
-}
-
-namespace IceProxy
-{
-
-namespace jderobot
-{
-
-class EncodersData : virtual public ::IceProxy::Ice::Object
-{
-public:
-
- ::IceInternal::ProxyHandle<EncodersData> ice_context(const ::Ice::Context& __context) const
- {
- return dynamic_cast<EncodersData*>(::IceProxy::Ice::Object::ice_context(__context).get());
- }
-
- ::IceInternal::ProxyHandle<EncodersData> ice_secure(bool __secure) const
- {
- return dynamic_cast<EncodersData*>(::IceProxy::Ice::Object::ice_secure(__secure).get());
- }
-
-#ifdef ICEE_HAS_ROUTER
- ::IceInternal::ProxyHandle<EncodersData> ice_router(const ::Ice::RouterPrx& __router) const
- {
- return dynamic_cast<EncodersData*>(::IceProxy::Ice::Object::ice_router(__router).get());
- }
-#endif // ICEE_HAS_ROUTER
-
-#ifdef ICEE_HAS_LOCATOR
- ::IceInternal::ProxyHandle<EncodersData> ice_locator(const ::Ice::LocatorPrx& __locator) const
- {
- return dynamic_cast<EncodersData*>(::IceProxy::Ice::Object::ice_locator(__locator).get());
- }
-
- ::IceInternal::ProxyHandle<EncodersData> ice_adapterId(const std::string& __id) const
- {
- return dynamic_cast<EncodersData*>(::IceProxy::Ice::Object::ice_adapterId(__id).get());
- }
-#endif // ICEE_HAS_LOCATOR
-
- ::IceInternal::ProxyHandle<EncodersData> ice_twoway() const
- {
- return dynamic_cast<EncodersData*>(::IceProxy::Ice::Object::ice_twoway().get());
- }
-
- ::IceInternal::ProxyHandle<EncodersData> ice_oneway() const
- {
- return dynamic_cast<EncodersData*>(::IceProxy::Ice::Object::ice_oneway().get());
- }
-
- ::IceInternal::ProxyHandle<EncodersData> ice_batchOneway() const
- {
- return dynamic_cast<EncodersData*>(::IceProxy::Ice::Object::ice_batchOneway().get());
- }
-
- ::IceInternal::ProxyHandle<EncodersData> ice_datagram() const
- {
- return dynamic_cast<EncodersData*>(::IceProxy::Ice::Object::ice_datagram().get());
- }
-
- ::IceInternal::ProxyHandle<EncodersData> ice_batchDatagram() const
- {
- return dynamic_cast<EncodersData*>(::IceProxy::Ice::Object::ice_batchDatagram().get());
- }
-
- ::IceInternal::ProxyHandle<EncodersData> ice_timeout(int __timeout) const
- {
- return dynamic_cast<EncodersData*>(::IceProxy::Ice::Object::ice_timeout(__timeout).get());
- }
-
- static const ::std::string& ice_staticId();
-
-private:
-
- virtual ::IceProxy::Ice::Object* __newInstance() const;
-};
-
-class Encoders : virtual public ::IceProxy::Ice::Object
-{
-public:
-
- ::jderobot::EncodersDataPtr getEncodersData()
- {
- return getEncodersData(0);
- }
- ::jderobot::EncodersDataPtr getEncodersData(const ::Ice::Context& __ctx)
- {
- return getEncodersData(&__ctx);
- }
-
-private:
-
- ::jderobot::EncodersDataPtr getEncodersData(const ::Ice::Context*);
-
-public:
-
- ::IceInternal::ProxyHandle<Encoders> ice_context(const ::Ice::Context& __context) const
- {
- return dynamic_cast<Encoders*>(::IceProxy::Ice::Object::ice_context(__context).get());
- }
-
- ::IceInternal::ProxyHandle<Encoders> ice_secure(bool __secure) const
- {
- return dynamic_cast<Encoders*>(::IceProxy::Ice::Object::ice_secure(__secure).get());
- }
-
-#ifdef ICEE_HAS_ROUTER
- ::IceInternal::ProxyHandle<Encoders> ice_router(const ::Ice::RouterPrx& __router) const
- {
- return dynamic_cast<Encoders*>(::IceProxy::Ice::Object::ice_router(__router).get());
- }
-#endif // ICEE_HAS_ROUTER
-
-#ifdef ICEE_HAS_LOCATOR
- ::IceInternal::ProxyHandle<Encoders> ice_locator(const ::Ice::LocatorPrx& __locator) const
- {
- return dynamic_cast<Encoders*>(::IceProxy::Ice::Object::ice_locator(__locator).get());
- }
-
- ::IceInternal::ProxyHandle<Encoders> ice_adapterId(const std::string& __id) const
- {
- return dynamic_cast<Encoders*>(::IceProxy::Ice::Object::ice_adapterId(__id).get());
- }
-#endif // ICEE_HAS_LOCATOR
-
- ::IceInternal::ProxyHandle<Encoders> ice_twoway() const
- {
- return dynamic_cast<Encoders*>(::IceProxy::Ice::Object::ice_twoway().get());
- }
-
- ::IceInternal::ProxyHandle<Encoders> ice_oneway() const
- {
- return dynamic_cast<Encoders*>(::IceProxy::Ice::Object::ice_oneway().get());
- }
-
- ::IceInternal::ProxyHandle<Encoders> ice_batchOneway() const
- {
- return dynamic_cast<Encoders*>(::IceProxy::Ice::Object::ice_batchOneway().get());
- }
-
- ::IceInternal::ProxyHandle<Encoders> ice_datagram() const
- {
- return dynamic_cast<Encoders*>(::IceProxy::Ice::Object::ice_datagram().get());
- }
-
- ::IceInternal::ProxyHandle<Encoders> ice_batchDatagram() const
- {
- return dynamic_cast<Encoders*>(::IceProxy::Ice::Object::ice_batchDatagram().get());
- }
-
- ::IceInternal::ProxyHandle<Encoders> ice_timeout(int __timeout) const
- {
- return dynamic_cast<Encoders*>(::IceProxy::Ice::Object::ice_timeout(__timeout).get());
- }
-
- static const ::std::string& ice_staticId();
-
-private:
-
- virtual ::IceProxy::Ice::Object* __newInstance() const;
-};
-
-}
-
-}
-
-#endif
Deleted: trunk/src/stable/components/naoserver/interfaces/cpp/jderobot/exceptions.cpp
===================================================================
--- trunk/src/stable/components/naoserver/interfaces/cpp/jderobot/exceptions.cpp 2014-01-25 18:44:50 UTC (rev 1146)
+++ trunk/src/stable/components/naoserver/interfaces/cpp/jderobot/exceptions.cpp 2014-01-25 20:27:32 UTC (rev 1147)
@@ -1,650 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice-E is licensed to you under the terms described in the
-// ICEE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-// Ice-E version 1.3.0
-// Generated from file `exceptions.ice'
-
-#include <exceptions.h>
-#include <IceE/BasicStream.h>
-#include <IceE/Object.h>
-#include <IceE/LocalException.h>
-#include <IceE/Iterator.h>
-
-#ifndef ICEE_IGNORE_VERSION
-# if ICEE_INT_VERSION / 100 != 103
-# error IceE version mismatch!
-# endif
-# if ICEE_INT_VERSION % 100 < 0
-# error IceE patch level mismatch!
-# endif
-#endif
-
-jderobot::JderobotException::JderobotException(const ::std::string& __ice_what) :
- ::Ice::UserException(),
- what(__ice_what)
-{
-}
-
-jderobot::JderobotException::~JderobotException() throw()
-{
-}
-
-static const char* __jderobot__JderobotException_name = "jderobot::JderobotException";
-
-::std::string
-jderobot::JderobotException::ice_name() const
-{
- return __jderobot__JderobotException_name;
-}
-
-::Ice::Exception*
-jderobot::JderobotException::ice_clone() const
-{
- return new JderobotException(*this);
-}
-
-void
-jderobot::JderobotException::ice_throw() const
-{
- throw *this;
-}
-
-void
-jderobot::JderobotException::__write(::IceInternal::BasicStream* __os) const
-{
- __os->write(::std::string("::jderobot::JderobotException"), false);
- __os->startWriteSlice();
- __os->write(what);
- __os->endWriteSlice();
-}
-
-void
-jderobot::JderobotException::__read(::IceInternal::BasicStream* __is, bool __rid)
-{
- if(__rid)
- {
- ::std::string myId;
- __is->read(myId, false);
- }
- __is->startReadSlice();
- __is->read(what);
- __is->endReadSlice();
-}
-
-struct __F__jderobot__JderobotException : public ::IceInternal::UserExceptionFactory
-{
- virtual void
- createAndThrow()
- {
- throw ::jderobot::JderobotException();
- }
-};
-
-static ::IceInternal::UserExceptionFactoryPtr __F__jderobot__JderobotException__Ptr = new __F__jderobot__JderobotException;
-
-const ::IceInternal::UserExceptionFactoryPtr&
-jderobot::JderobotException::ice_factory()
-{
- return __F__jderobot__JderobotException__Ptr;
-}
-
-class __F__jderobot__JderobotException__Init
-{
-public:
-
- __F__jderobot__JderobotException__Init()
- {
- ::IceInternal::factoryTable->addExceptionFactory("::jderobot::JderobotException", ::jderobot::JderobotException::ice_factory());
- }
-
- ~__F__jderobot__JderobotException__Init()
- {
- ::IceInternal::factoryTable->removeExceptionFactory("::jderobot::JderobotException");
- }
-};
-
-static __F__jderobot__JderobotException__Init __F__jderobot__JderobotException__i;
-
-#ifdef __APPLE__
-extern "C" { void __F__jderobot__JderobotException__initializer() {} }
-#endif
-
-jderobot::ConfigurationNotExistException::ConfigurationNotExistException(const ::std::string& __ice_what) :
- ::jderobot::JderobotException(__ice_what)
-{
-}
-
-jderobot::ConfigurationNotExistException::~ConfigurationNotExistException() throw()
-{
-}
-
-static const char* __jderobot__ConfigurationNotExistException_name = "jderobot::ConfigurationNotExistException";
-
-::std::string
-jderobot::ConfigurationNotExistException::ice_name() const
-{
- return __jderobot__ConfigurationNotExistException_name;
-}
-
-::Ice::Exception*
-jderobot::ConfigurationNotExistException::ice_clone() const
-{
- return new ConfigurationNotExistException(*this);
-}
-
-void
-jderobot::ConfigurationNotExistException::ice_throw() const
-{
- throw *this;
-}
-
-void
-jderobot::ConfigurationNotExistException::__write(::IceInternal::BasicStream* __os) const
-{
- __os->write(::std::string("::jderobot::ConfigurationNotExistException"), false);
- __os->startWriteSlice();
- __os->endWriteSlice();
- ::jderobot::JderobotException::__write(__os);
-}
-
-void
-jderobot::ConfigurationNotExistException::__read(::IceInternal::BasicStream* __is, bool __rid)
-{
- if(__rid)
- {
- ::std::string myId;
- __is->read(myId, false);
- }
- __is->startReadSlice();
- __is->endReadSlice();
- ::jderobot::JderobotException::__read(__is, true);
-}
-
-struct __F__jderobot__ConfigurationNotExistException : public ::IceInternal::UserExceptionFactory
-{
- virtual void
- createAndThrow()
- {
- throw ::jderobot::ConfigurationNotExistException();
- }
-};
-
-static ::IceInternal::UserExceptionFactoryPtr __F__jderobot__ConfigurationNotExistException__Ptr = new __F__jderobot__ConfigurationNotExistException;
-
-const ::IceInternal::UserExceptionFactoryPtr&
-jderobot::ConfigurationNotExistException::ice_factory()
-{
- return __F__jderobot__ConfigurationNotExistException__Ptr;
-}
-
-class __F__jderobot__ConfigurationNotExistException__Init
-{
-public:
-
- __F__jderobot__ConfigurationNotExistException__Init()
- {
- ::IceInternal::factoryTable->addExceptionFactory("::jderobot::ConfigurationNotExistException", ::jderobot::ConfigurationNotExistException::ice_factory());
- }
-
- ~__F__jderobot__ConfigurationNotExistException__Init()
- {
- ::IceInternal::factoryTable->removeExceptionFactory("::jderobot::ConfigurationNotExistException");
- }
-};
-
-static __F__jderobot__ConfigurationNotExistException__Init __F__jderobot__ConfigurationNotExistException__i;
-
-#ifdef __APPLE__
-extern "C" { void __F__jderobot__ConfigurationNotExistException__initializer() {} }
-#endif
-
-jderobot::DataNotExistException::DataNotExistException(const ::std::string& __ice_what) :
- ::jderobot::JderobotException(__ice_what)
-{
-}
-
-jderobot::DataNotExistException::~DataNotExistException() throw()
-{
-}
-
-static const char* __jderobot__DataNotExistException_name = "jderobot::DataNotExistException";
-
-::std::string
-jderobot::DataNotExistException::ice_name() const
-{
- return __jderobot__DataNotExistException_name;
-}
-
-::Ice::Exception*
-jderobot::DataNotExistException::ice_clone() const
-{
- return new DataNotExistException(*this);
-}
-
-void
-jderobot::DataNotExistException::ice_throw() const
-{
- throw *this;
-}
-
-void
-jderobot::DataNotExistException::__write(::IceInternal::BasicStream* __os) const
-{
- __os->write(::std::string("::jderobot::DataNotExistException"), false);
- __os->startWriteSlice();
- __os->endWriteSlice();
- ::jderobot::JderobotException::__write(__os);
-}
-
-void
-jderobot::DataNotExistException::__read(::IceInternal::BasicStream* __is, bool __rid)
-{
- if(__rid)
- {
- ::std::string myId;
- __is->read(myId, false);
- }
- __is->startReadSlice();
- __is->endReadSlice();
- ::jderobot::JderobotException::__read(__is, true);
-}
-
-struct __F__jderobot__DataNotExistException : public ::IceInternal::UserExceptionFactory
-{
- virtual void
- createAndThrow()
- {
- throw ::jderobot::DataNotExistException();
- }
-};
-
-static ::IceInternal::UserExceptionFactoryPtr __F__jderobot__DataNotExistException__Ptr = new __F__jderobot__DataNotExistException;
-
-const ::IceInternal::UserExceptionFactoryPtr&
-jderobot::DataNotExistException::ice_factory()
-{
- return __F__jderobot__DataNotExistException__Ptr;
-}
-
-class __F__jderobot__DataNotExistException__Init
-{
-public:
-
- __F__jderobot__DataNotExistException__Init()
- {
- ::IceInternal::factoryTable->addExceptionFactory("::jderobot::DataNotExistException", ::jderobot::DataNotExistException::ice_factory());
- }
-
- ~__F__jderobot__DataNotExistException__Init()
- {
- ::IceInternal::factoryTable->removeExceptionFactory("::jderobot::DataNotExistException");
- }
-};
-
-static __F__jderobot__DataNotExistException__Init __F__jderobot__DataNotExistException__i;
-
-#ifdef __APPLE__
-extern "C" { void __F__jderobot__DataNotExistException__initializer() {} }
-#endif
-
-jderobot::HardwareFailedException::HardwareFailedException(const ::std::string& __ice_what) :
- ::jderobot::JderobotException(__ice_what)
-{
-}
-
-jderobot::HardwareFailedException::~HardwareFailedException() throw()
-{
-}
-
-static const char* __jderobot__HardwareFailedException_name = "jderobot::HardwareFailedException";
-
-::std::string
-jderobot::HardwareFailedException::ice_name() const
-{
- return __jderobot__HardwareFailedException_name;
-}
-
-::Ice::Exception*
-jderobot::HardwareFailedException::ice_clone() const
-{
- return new HardwareFailedException(*this);
-}
-
-void
-jderobot::HardwareFailedException::ice_throw() const
-{
- throw *this;
-}
-
-void
-jderobot::HardwareFailedException::__write(::IceInternal::BasicStream* __os) const
-{
- __os->write(::std::string("::jderobot::HardwareFailedException"), false);
- __os->startWriteSlice();
- __os->endWriteSlice();
- ::jderobot::JderobotException::__write(__os);
-}
-
-void
-jderobot::HardwareFailedException::__read(::IceInternal::BasicStream* __is, bool __rid)
-{
- if(__rid)
- {
- ::std::string myId;
- __is->read(myId, false);
- }
- __is->startReadSlice();
- __is->endReadSlice();
- ::jderobot::JderobotException::__read(__is, true);
-}
-
-struct __F__jderobot__HardwareFailedException : public ::IceInternal::UserExceptionFactory
-{
- virtual void
- createAndThrow()
- {
- throw ::jderobot::HardwareFailedException();
- }
-};
-
-static ::IceInternal::UserExceptionFactoryPtr __F__jderobot__HardwareFailedException__Ptr = new __F__jderobot__HardwareFailedException;
-
-const ::IceInternal::UserExceptionFactoryPtr&
-jderobot::HardwareFailedException::ice_factory()
-{
- return __F__jderobot__HardwareFailedException__Ptr;
-}
-
-class __F__jderobot__HardwareFailedException__Init
-{
-public:
-
- __F__jderobot__HardwareFailedException__Init()
- {
- ::IceInternal::factoryTable->addExceptionFactory("::jderobot::HardwareFailedException", ::jderobot::HardwareFailedException::ice_factory());
- }
-
- ~__F__jderobot__HardwareFailedException__Init()
- {
- ::IceInternal::factoryTable->removeExceptionFactory("::jderobot::HardwareFailedException");
- }
-};
-
-static __F__jderobot__HardwareFailedException__Init __F__jderobot__HardwareFailedException__i;
-
-#ifdef __APPLE__
-extern "C" { void __F__jderobot__HardwareFailedException__initializer() {} }
-#endif
-
-jderobot::NoTopicException::NoTopicException(const ::std::string& __ice_what) :
- ::jderobot::JderobotException(__ice_what)
-{
-}
-
-jderobot::NoTopicException::~NoTopicException() throw()
-{
-}
-
-static const char* __jderobot__NoTopicException_name = "jderobot::NoTopicException";
-
-::std::string
-jderobot::NoTopicException::ice_name() const
-{
- return __jderobot__NoTopicException_name;
-}
-
-::Ice::Exception*
-jderobot::NoTopicException::ice_clone() const
-{
- return new NoTopicException(*this);
-}
-
-void
-jderobot::NoTopicException::ice_throw() const
-{
- throw *this;
-}
-
-void
-jderobot::NoTopicException::__write(::IceInternal::BasicStream* __os) const
-{
- __os->write(::std::string("::jderobot::NoTopicException"), false);
- __os->startWriteSlice();
- __os->endWriteSlice();
- ::jderobot::JderobotException::__write(__os);
-}
-
-void
-jderobot::NoTopicException::__read(::IceInternal::BasicStream* __is, bool __rid)
-{
- if(__rid)
- {
- ::std::string myId;
- __is->read(myId, false);
- }
- __is->startReadSlice();
- __is->endReadSlice();
- ::jderobot::JderobotException::__read(__is, true);
-}
-
-struct __F__jderobot__NoTopicException : public ::IceInternal::UserExceptionFactory
-{
- virtual void
- createAndThrow()
- {
- throw ::jderobot::NoTopicException();
- }
-};
-
-static ::IceInternal::UserExceptionFactoryPtr __F__jderobot__NoTopicException__Ptr = new __F__jderobot__NoTopicException;
-
-const ::IceInternal::UserExceptionFactoryPtr&
-jderobot::NoTopicException::ice_factory()
-{
- return __F__jderobot__NoTopicException__Ptr;
-}
-
-class __F__jderobot__NoTopicException__Init
-{
-public:
-
- __F__jderobot__NoTopicException__Init()
- {
- ::IceInternal::factoryTable->addExceptionFactory("::jderobot::NoTopicException", ::jderobot::NoTopicException::ice_factory());
- }
-
- ~__F__jderobot__NoTopicException__Init()
- {
- ::IceInternal::factoryTable->removeExceptionFactory("::jderobot::NoTopicException");
- }
-};
-
-static __F__jderobot__NoTopicException__Init __F__jderobot__NoTopicException__i;
-
-#ifdef __APPLE__
-extern "C" { void __F__jderobot__NoTopicException__initializer() {} }
-#endif
-
-jderobot::SubscriptionFailedException::SubscriptionFailedException(const ::std::string& __ice_what) :
- ::jderobot::JderobotException(__ice_what)
-{
-}
-
-jderobot::SubscriptionFailedException::~SubscriptionFailedException() throw()
-{
-}
-
-static const char* __jderobot__SubscriptionFailedException_name = "jderobot::SubscriptionFailedException";
-
-::std::string
-jderobot::SubscriptionFailedException::ice_name() const
-{
- return __jderobot__SubscriptionFailedException_name;
-}
-
-::Ice::Exception*
-jderobot::SubscriptionFailedException::ice_clone() const
-{
- return new SubscriptionFailedException(*this);
-}
-
-void
-jderobot::SubscriptionFailedException::ice_throw() const
-{
- throw *this;
-}
-
-void
-jderobot::SubscriptionFailedException::__write(::IceInternal::BasicStream* __os) const
-{
- __os->write(::std::string("::jderobot::SubscriptionFailedException"), false);
- __os->startWriteSlice();
- __os->endWriteSlice();
- ::jderobot::JderobotException::__write(__os);
-}
-
-void
-jderobot::SubscriptionFailedException::__read(::IceInternal::BasicStream* __is, bool __rid)
-{
- if(__rid)
- {
- ::std::string myId;
- __is->read(myId, false);
- }
- __is->startReadSlice();
- __is->endReadSlice();
- ::jderobot::JderobotException::__read(__is, true);
-}
-
-struct __F__jderobot__SubscriptionFailedException : public ::IceInternal::UserExceptionFactory
-{
- virtual void
- createAndThrow()
- {
- throw ::jderobot::SubscriptionFailedException();
- }
-};
-
-static ::IceInternal::UserExceptionFactoryPtr __F__jderobot__SubscriptionFailedException__Ptr = new __F__jderobot__SubscriptionFailedException;
-
-const ::IceInternal::UserExceptionFactoryPtr&
-jderobot::SubscriptionFailedException::ice_factory()
-{
- return __F__jderobot__SubscriptionFailedException__Ptr;
-}
-
-class __F__jderobot__SubscriptionFailedException__Init
-{
-public:
-
- __F__jderobot__SubscriptionFailedException__Init()
- {
- ::IceInternal::factoryTable->addExceptionFactory("::jderobot::SubscriptionFailedException", ::jderobot::SubscriptionFailedException::ice_factory());
- }
-
- ~__F__jderobot__SubscriptionFailedException__Init()
- {
- ::IceInternal::factoryTable->removeExceptionFactory("::jderobot::SubscriptionFailedException");
- }
-};
-
-static __F__jderobot__SubscriptionFailedException__Init __F__jderobot__SubscriptionFailedException__i;
-
-#ifdef __APPLE__
-extern "C" { void __F__jderobot__SubscriptionFailedException__initializer() {} }
-#endif
-
-jderobot::SubscriptionPushFailedException::SubscriptionPushFailedException(const ::std::string& __ice_what) :
- ::jderobot::JderobotException(__ice_what)
-{
-}
-
-jderobot::SubscriptionPushFailedException::~SubscriptionPushFailedException() throw()
-{
-}
-
-static const char* __jderobot__SubscriptionPushFailedException_name = "jderobot::SubscriptionPushFailedException";
-
-::std::string
-jderobot::SubscriptionPushFailedException::ice_name() const
-{
- return __jderobot__SubscriptionPushFailedException_name;
-}
-
-::Ice::Exception*
-jderobot::SubscriptionPushFailedException::ice_clone() const
-{
- return new SubscriptionPushFailedException(*this);
-}
-
-void
-jderobot::SubscriptionPushFailedException::ice_throw() const
-{
- throw *this;
-}
-
-void
-jderobot::SubscriptionPushFailedException::__write(::IceInternal::BasicStream* __os) const
-{
- __os->write(::std::string("::jderobot::SubscriptionPushFailedException"), false);
- __os->startWriteSlice();
- __os->endWriteSlice();
- ::jderobot::JderobotException::__write(__os);
-}
-
-void
-jderobot::SubscriptionPushFailedException::__read(::IceInternal::BasicStream* __is, bool __rid)
-{
- if(__rid)
- {
- ::std::string myId;
- __is->read(myId, false);
- }
- __is->startReadSlice();
- __is->endReadSlice();
- ::jderobot::JderobotException::__read(__is, true);
-}
-
-struct __F__jderobot__SubscriptionPushFailedException : public ::IceInternal::UserExceptionFactory
-{
- virtual void
- createAndThrow()
- {
- throw ::jderobot::SubscriptionPushFailedException();
- }
-};
-
-static ::IceInternal::UserExceptionFactoryPtr __F__jderobot__SubscriptionPushFailedException__Ptr = new __F__jderobot__SubscriptionPushFailedException;
-
-const ::IceInternal::UserExceptionFactoryPtr&
-jderobot::SubscriptionPushFailedException::ice_factory()
-{
- return __F__jderobot__SubscriptionPushFailedException__Ptr;
-}
-
-class __F__jderobot__SubscriptionPushFailedException__Init
-{
-public:
-
- __F__jderobot__SubscriptionPushFailedException__Init()
- {
- ::IceInternal::factoryTable->addExceptionFactory("::jderobot::SubscriptionPushFailedException", ::jderobot::SubscriptionPushFailedException::ice_factory());
- }
-
- ~__F__jderobot__SubscriptionPushFailedException__Init()
- {
- ::IceInternal::factoryTable->removeExceptionFactory("::jderobot::SubscriptionPushFailedException");
- }
-};
-
-static __F__jderobot__SubscriptionPushFailedException__Init __F__jderobot__SubscriptionPushFailedException__i;
-
-#ifdef __APPLE__
-extern "C" { void __F__jderobot__SubscriptionPushFailedException__initializer() {} }
-#endif
Deleted: trunk/src/stable/components/naoserver/interfaces/cpp/jderobot/exceptions.h
===================================================================
--- trunk/src/stable/components/naoserver/interfaces/cpp/jderobot/exceptions.h 2014-01-25 18:44:50 UTC (rev 1146)
+++ trunk/src/stable/components/naoserver/interfaces/cpp/jderobot/exceptions.h 2014-01-25 20:27:32 UTC (rev 1147)
@@ -1,168 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice-E is licensed to you under the terms described in the
-// ICEE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-// Ice-E version 1.3.0
-// Generated from file `exceptions.ice'
-
-#ifndef ___users_eperdices_GO2012_naoserver_src_interfaces_cpp_jderobot_exceptions_h__
-#define ___users_eperdices_GO2012_naoserver_src_interfaces_cpp_jderobot_exceptions_h__
-
-#include <IceE/ProxyF.h>
-#include <IceE/ObjectF.h>
-#include <IceE/Exception.h>
-#include <IceE/ScopedArray.h>
-#include <IceE/UserExceptionFactory.h>
-#include <IceE/FactoryTable.h>
-#include <IceE/UndefSysMacros.h>
-
-#ifndef ICEE_IGNORE_VERSION
-# if ICEE_INT_VERSION / 100 != 103
-# error IceE version mismatch!
-# endif
-# if ICEE_INT_VERSION % 100 < 0
-# error IceE patch level mismatch!
-# endif
-#endif
-
-namespace jderobot
-{
-
-class JderobotException : public ::Ice::UserException
-{
-public:
-
- JderobotException() {}
- explicit JderobotException(const ::std::string&);
- virtual ~JderobotException() throw();
-
- virtual ::std::string ice_name() const;
- virtual ::Ice::Exception* ice_clone() const;
- virtual void ice_throw() const;
-
- static const ::IceInternal::UserExceptionFactoryPtr& ice_factory();
-
- ::std::string what;
-
- virtual void __write(::IceInternal::BasicStream*) const;
- virtual void __read(::IceInternal::BasicStream*, bool);
-};
-
-static JderobotException __JderobotException_init;
-
-class ConfigurationNotExistException : public ::jderobot::JderobotException
-{
-public:
-
- ConfigurationNotExistException() {}
- explicit ConfigurationNotExistException(const ::std::string&);
- virtual ~ConfigurationNotExistException() throw();
-
- virtual ::std::string ice_name() const;
- virtual ::Ice::Exception* ice_clone() const;
- virtual void ice_throw() const;
-
- static const ::IceInternal::UserExceptionFactoryPtr& ice_factory();
-
- virtual void __write(::IceInternal::BasicStream*) const;
- virtual void __read(::IceInternal::BasicStream*, bool);
-};
-
-class DataNotExistException : public ::jderobot::JderobotException
-{
-public:
-
- DataNotExistException() {}
- explicit DataNotExistException(const ::std::string&);
- virtual ~DataNotExistException() throw();
-
- virtual ::std::string ice_name() const;
- virtual ::Ice::Exception* ice_clone() const;
- virtual void ice_throw() const;
-
- static const ::IceInternal::UserExceptionFactoryPtr& ice_factory();
-
- virtual void __write(::IceInternal::BasicStream*) const;
- virtual void __read(::IceInternal::BasicStream*, bool);
-};
-
-class HardwareFailedException : public ::jderobot::JderobotException
-{
-public:
-
- HardwareFailedException() {}
- explicit HardwareFailedException(const ::std::string&);
- virtual ~HardwareFailedException() throw();
-
- virtual ::std::string ice_name() const;
- virtual ::Ice::Exception* ice_clone() const;
- virtual void ice_throw() const;
-
- static const ::IceInternal::UserExceptionFactoryPtr& ice_factory();
-
- virtual void __write(::IceInternal::BasicStream*) const;
- virtual void __read(::IceInternal::BasicStream*, bool);
-};
-
-class NoTopicException : public ::jderobot::JderobotException
-{
-public:
-
- NoTopicException() {}
- explicit NoTopicException(const ::std::string&);
- virtual ~NoTopicException() throw();
-
- virtual ::std::string ice_name() const;
- virtual ::Ice::Exception* ice_clone() const;
- virtual void ice_throw() const;
-
- static const ::IceInternal::UserExceptionFactoryPtr& ice_factory();
-
- virtual void __write(::IceInternal::BasicStream*) const;
- virtual void __read(::IceInternal::BasicStream*, bool);
-};
-
-class SubscriptionFailedException : public ::jderobot::JderobotException
-{
-public:
-
- SubscriptionFailedException() {}
- explicit SubscriptionFailedException(const ::std::string&);
- virtual ~SubscriptionFailedException() throw();
-
- virtual ::std::string ice_name() const;
- virtual ::Ice::Exception* ice_clone() const;
- virtual void ice_throw() const;
-
- static const ::IceInternal::UserExceptionFactoryPtr& ice_factory();
-
- virtual void __write(::IceInternal::BasicStream*) const;
- virtual void __read(::IceInternal::BasicStream*, bool);
-};
-
-class SubscriptionPushFailedException : public ::jderobot::JderobotException
-{
-public:
-
- SubscriptionPushFailedException() {}
- explicit SubscriptionPushFailedException(const ::std::string&);
- virtual ~SubscriptionPushFailedException() throw();
-
- virtual ::std::string ice_name() const;
- virtual ::Ice::Exception* ice_clone() const;
- virtual void ice_throw() const;
-
- static const ::IceInternal::UserExceptionFactoryPtr& ice_factory();
-
- virtual void __write(::IceInternal::BasicStream*) const;
- virtual void __read(::IceInternal::BasicStream*, bool);
-};
-
-}
-
-#endif
Deleted: trunk/src/stable/components/naoserver/interfaces/cpp/jderobot/image.cpp
===================================================================
--- trunk/src/stable/components/naoserver/interfaces/cpp/jderobot/image.cpp 2014-01-25 18:44:50 UTC (rev 1146)
+++ trunk/src/stable/components/naoserver/interfaces/cpp/jderobot/image.cpp 2014-01-25 20:27:32 UTC (rev 1147)
@@ -1,2030 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice-E is licensed to you under the terms described in the
-// ICEE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-// Ice-E version 1.3.0
-// Generated from file `image.ice'
-
-#include <image.h>
-#include <IceE/LocalException.h>
-#include <IceE/ObjectFactory.h>
-#include <IceE/BasicStream.h>
-#include <IceE/LocalException.h>
-#include <IceE/Iterator.h>
-
-#ifndef ICEE_IGNORE_VERSION
-# if ICEE_INT_VERSION / 100 != 103
-# error IceE version mismatch!
-# endif
-# if ICEE_INT_VERSION % 100 < 0
-# error IceE patch level mismatch!
-# endif
-#endif
-
-static const ::std::string __jderobot__ImageProvider__getImageDescription_name = "getImageDescription";
-
-static const ::std::string __jderobot__ImageProvider__getImageData_name = "getImageData";
-
-static const ::std::string __jderobot__ImageSelector__getImageDataWithFeatures_name = "getImageDataWithFeatures";
-
-static const ::std::string __jderobot__ImageSelector__getHSVFilter_name = "getHSVFilter";
-
-static const ::std::string __jderobot__ImageSelector__setHSVFilter_name = "setHSVFilter";
-
-static const ::std::string __jderobot__ImageSelector__setCam_name = "setCam";
-
-static const ::std::string __jderobot__CalibrationProvider__getCalibrationImg_name = "getCalibrationImg";
-
-static const ::std::string __jderobot__CalibrationProvider__getCalibrationParams_name = "getCalibrationParams";
-
-static const ::std::string __jderobot__CalibrationProvider__setCalibrationParams_name = "setCalibrationParams";
-
-::Ice::Object* IceInternal::upCast(::jderobot::ImageDescription* p) { return p; }
-::IceProxy::Ice::Object* IceInternal::upCast(::IceProxy::jderobot::ImageDescription* p) { return p; }
-
-::Ice::Object* IceInternal::upCast(::jderobot::ImageData* p) { return p; }
-::IceProxy::Ice::Object* IceInternal::upCast(::IceProxy::jderobot::ImageData* p) { return p; }
-
-::Ice::Object* IceInternal::upCast(::jderobot::HSVFilter* p) { return p; }
-::IceProxy::Ice::Object* IceInternal::upCast(::IceProxy::jderobot::HSVFilter* p) { return p; }
-
-::Ice::Object* IceInternal::upCast(::jderobot::CalibrationParams* p) { return p; }
-::IceProxy::Ice::Object* IceInternal::upCast(::IceProxy::jderobot::CalibrationParams* p) { return p; }
-
-::Ice::Object* IceInternal::upCast(::jderobot::ImageProvider* p) { return p; }
-::IceProxy::Ice::Object* IceInternal::upCast(::IceProxy::jderobot::ImageProvider* p) { return p; }
-
-::Ice::Object* IceInternal::upCast(::jderobot::ImageSelector* p) { return p; }
-::IceProxy::Ice::Object* IceInternal::upCast(::IceProxy::jderobot::ImageSelector* p) { return p; }
-
-::Ice::Object* IceInternal::upCast(::jderobot::CalibrationProvider* p) { return p; }
-::IceProxy::Ice::Object* IceInternal::upCast(::IceProxy::jderobot::CalibrationProvider* p) { return p; }
-
-void
-jderobot::__read(::IceInternal::BasicStream* __is, ::jderobot::ImageDescriptionPrx& v)
-{
- ::Ice::ObjectPrx proxy;
- __is->read(proxy);
- if(!proxy)
- {
- v = 0;
- }
- else
- {
- v = new ::IceProxy::jderobot::ImageDescription;
- v->__copyFrom(proxy);
- }
-}
-
-void
-jderobot::__read(::IceInternal::BasicStream* __is, ::jderobot::ImageDataPrx& v)
-{
- ::Ice::ObjectPrx proxy;
- __is->read(proxy);
- if(!proxy)
- {
- v = 0;
- }
- else
- {
- v = new ::IceProxy::jderobot::ImageData;
- v->__copyFrom(proxy);
- }
-}
-
-void
-jderobot::__read(::IceInternal::BasicStream* __is, ::jderobot::HSVFilterPrx& v)
-{
- ::Ice::ObjectPrx proxy;
- __is->read(proxy);
- if(!proxy)
- {
- v = 0;
- }
- else
- {
- v = new ::IceProxy::jderobot::HSVFilter;
- v->__copyFrom(proxy);
- }
-}
-
-void
-jderobot::__read(::IceInternal::BasicStream* __is, ::jderobot::CalibrationParamsPrx& v)
-{
- ::Ice::ObjectPrx proxy;
- __is->read(proxy);
- if(!proxy)
- {
- v = 0;
- }
- else
- {
- v = new ::IceProxy::jderobot::CalibrationParams;
- v->__copyFrom(proxy);
- }
-}
-
-void
-jderobot::__read(::IceInternal::BasicStream* __is, ::jderobot::ImageProviderPrx& v)
-{
- ::Ice::ObjectPrx proxy;
- __is->read(proxy);
- if(!proxy)
- {
- v = 0;
- }
- else
- {
- v = new ::IceProxy::jderobot::ImageProvider;
- v->__copyFrom(proxy);
- }
-}
-
-void
-jderobot::__read(::IceInternal::BasicStream* __is, ::jderobot::ImageSelectorPrx& v)
-{
- ::Ice::ObjectPrx proxy;
- __is->read(proxy);
- if(!proxy)
- {
- v = 0;
- }
- else
- {
- v = new ::IceProxy::jderobot::ImageSelector;
- v->__copyFrom(proxy);
- }
-}
-
-void
-jderobot::__read(::IceInternal::BasicStream* __is, ::jderobot::CalibrationProviderPrx& v)
-{
- ::Ice::ObjectPrx proxy;
- __is->read(proxy);
- if(!proxy)
- {
- v = 0;
- }
- else
- {
- v = new ::IceProxy::jderobot::CalibrationProvider;
- v->__copyFrom(proxy);
- }
-}
-
-void
-jderobot::__write(::IceInternal::BasicStream* __os, ::jderobot::FeaturesType v)
-{
- __os->write(static_cast< ::Ice::Byte>(v), 10);
-}
-
-void
-jderobot::__read(::IceInternal::BasicStream* __is, ::jderobot::FeaturesType& v)
-{
- ::Ice::Byte val;
- __is->read(val, 10);
- v = static_cast< ::jderobot::FeaturesType>(val);
-}
-
-void
-jderobot::__write(::IceInternal::BasicStream* __os, ::jderobot::ObjectsType v)
-{
- __os->write(static_cast< ::Ice::Byte>(v), 5);
-}
-
-void
-jderobot::__read(::IceInternal::BasicStream* __is, ::jderobot::ObjectsType& v)
-{
- ::Ice::Byte val;
- __is->read(val, 5);
- v = static_cast< ::jderobot::ObjectsType>(val);
-}
-
-void
-jderobot::__write(::IceInternal::BasicStream* __os, ::jderobot::CameraType v)
-{
- __os->write(static_cast< ::Ice::Byte>(v), 2);
-}
-
-void
-jderobot::__read(::IceInternal::BasicStream* __is, ::jderobot::CameraType& v)
-{
- ::Ice::Byte val;
- __is->read(val, 2);
- v = static_cast< ::jderobot::CameraType>(val);
-}
-
-jderobot::ImageDescription::ImageDescription(::Ice::Int __ice_width, ::Ice::Int __ice_height, ::Ice::Int __ice_size, const ::std::string& __ice_format) :
- width(__ice_width),
- height(__ice_height),
- size(__ice_size),
- format(__ice_format)
-{
-}
-
-static const ::std::string __jderobot__ImageDescription_ids[2] =
-{
- "::Ice::Object",
- "::jderobot::ImageDescription"
-};
-
-bool
-jderobot::ImageDescription::ice_isA(const ::std::string& _s, const ::Ice::Current&) const
-{
- return ::std::binary_search(__jderobot__ImageDescription_ids, __jderobot__ImageDescription_ids + 2, _s);
-}
-
-::std::vector< ::std::string>
-jderobot::ImageDescription::ice_ids(const ::Ice::Current&) const
-{
- return ::std::vector< ::std::string>(&__jderobot__ImageDescription_ids[0], &__jderobot__ImageDescription_ids[2]);
-}
-
-const ::std::string&
-jderobot::ImageDescription::ice_id(const ::Ice::Current&) const
-{
- return __jderobot__ImageDescription_ids[1];
-}
-
-const ::std::string&
-jderobot::ImageDescription::ice_staticId()
-{
- return __jderobot__ImageDescription_ids[1];
-}
-
-void
-jderobot::ImageDescription::__write(::IceInternal::BasicStream* __os) const
-{
- __os->writeTypeId(ice_staticId());
- __os->startWriteSlice();
- __os->write(width);
- __os->write(height);
- __os->write(size);
- __os->write(format);
- __os->endWriteSlice();
- ::Ice::Object::__write(__os);
-}
-
-void
-jderobot::ImageDescription::__read(::IceInternal::BasicStream* __is, bool __rid)
-{
- if(__rid)
- {
- ::std::string myId;
- __is->readTypeId(myId);
- }
- __is->startReadSlice();
- __is->read(width);
- __is->read(height);
- __is->read(size);
- __is->read(format);
- __is->endReadSlice();
- ::Ice::Object::__read(__is, true);
-}
-
-class __F__jderobot__ImageDescription : public ::Ice::ObjectFactory
-{
-public:
-
- virtual ::Ice::ObjectPtr
- create(const ::std::string& type)
- {
- assert(type == ::jderobot::ImageDescription::ice_staticId());
- return new ::jderobot::ImageDescription;
- }
-
- virtual void
- destroy()
- {
- }
-};
-
-static ::Ice::ObjectFactoryPtr __F__jderobot__ImageDescription_Ptr = new __F__jderobot__ImageDescription;
-
-const ::Ice::ObjectFactoryPtr&
-jderobot::ImageDescription::ice_factory()
-{
- return __F__jderobot__ImageDescription_Ptr;
-}
-
-class __F__jderobot__ImageDescription__Init
-{
-public:
-
- __F__jderobot__ImageDescription__Init()
- {
- ::IceInternal::factoryTable->addObjectFactory(::jderobot::ImageDescription::ice_staticId(), ::jderobot::ImageDescription::ice_factory());
- }
-
- ~__F__jderobot__ImageDescription__Init()
- {
- ::IceInternal::factoryTable->removeObjectFactory(::jderobot::ImageDescription::ice_staticId());
- }
-};
-
-static __F__jderobot__ImageDescription__Init __F__jderobot__ImageDescription__i;
-
-#ifdef __APPLE__
-extern "C" { void __F__jderobot__ImageDescription__initializer() {} }
-#endif
-
-
-bool
-jderobot::operator==(const ::jderobot::ImageDescription& l, const ::jderobot::ImageDescription& r)
-{
- return static_cast<const ::Ice::Object&>(l) == static_cast<const ::Ice::Object&>(r);
-}
-
-bool
-jderobot::operator<(const ::jderobot::ImageDescription& l, const ::jderobot::ImageDescription& r)
-{
- return static_cast<const ::Ice::Object&>(l) < static_cast<const ::Ice::Object&>(r);
-}
-
-void
-jderobot::__patch__ImageDescriptionPtr(void* __addr, ::Ice::ObjectPtr& v)
-{
- ::jderobot::ImageDescriptionPtr* p = static_cast< ::jderobot::ImageDescriptionPtr*>(__addr);
- assert(p);
- *p = ::jderobot::ImageDescriptionPtr::dynamicCast(v);
- if(v && !*p)
- {
- IceInternal::Ex::throwUOE(::jderobot::ImageDescription::ice_staticId(), v->ice_id());
- }
-}
-
-jderobot::ImageData::ImageData(const ::jderobot::Time& __ice_timeStamp, const ::jderobot::ImageDescriptionPtr& __ice_description, const ::jderobot::ByteSeq& __ice_pixelData) :
- timeStamp(__ice_timeStamp),
- description(__ice_description),
- pixelData(__ice_pixelData)
-{
-}
-
-static const ::std::string __jderobot__ImageData_ids[2] =
-{
- "::Ice::Object",
- "::jderobot::ImageData"
-};
-
-bool
-jderobot::ImageData::ice_isA(const ::std::string& _s, const ::Ice::Current&) const
-{
- return ::std::binary_search(__jderobot__ImageData_ids, __jderobot__ImageData_ids + 2, _s);
-}
-
-::std::vector< ::std::string>
-jderobot::ImageData::ice_ids(const ::Ice::Current&) const
-{
- return ::std::vector< ::std::string>(&__jderobot__ImageData_ids[0], &__jderobot__ImageData_ids[2]);
-}
-
-const ::std::string&
-jderobot::ImageData::ice_id(const ::Ice::Current&) const
-{
- return __jderobot__ImageData_ids[1];
-}
-
-const ::std::string&
-jderobot::ImageData::ice_staticId()
-{
- return __jderobot__ImageData_ids[1];
-}
-
-void
-jderobot::ImageData::__write(::IceInternal::BasicStream* __os) const
-{
- __os->writeTypeId(ice_staticId());
- __os->startWriteSlice();
- timeStamp.__write(__os);
- __os->write(::Ice::ObjectPtr(::IceInternal::upCast(description.get())));
- if(pixelData.size() == 0)
- {
- __os->writeSize(0);
- }
- else
- {
- __os->write(&pixelData[0], &pixelData[0] + pixelData.size());
- }
- __os->endWriteSlice();
- ::Ice::Object::__write(__os);
-}
-
-void
-jderobot::ImageData::__read(::IceInternal::BasicStream* __is, bool __rid)
-{
- if(__rid)
- {
- ::std::string myId;
- __is->readTypeId(myId);
- }
- __is->startReadSlice();
- timeStamp.__read(__is);
- __is->read(::jderobot::__patch__ImageDescriptionPtr, &description);
- ::std::pair<const ::Ice::Byte*, const ::Ice::Byte*> ___pixelData;
- __is->read(___pixelData);
- ::std::vector< ::Ice::Byte>(___pixelData.first, ___pixelData.second).swap(pixelData);
- __is->endReadSlice();
- ::Ice::Object::__read(__is, true);
-}
-
-class __F__jderobot__ImageData : public ::Ice::ObjectFactory
-{
-public:
-
- virtual ::Ice::ObjectPtr
- create(const ::std::string& type)
- {
- assert(type == ::jderobot::ImageData::ice_staticId());
- return new ::jderobot::ImageData;
- }
-
- virtual void
- destroy()
- {
- }
-};
-
-static ::Ice::ObjectFactoryPtr __F__jderobot__ImageData_Ptr = new __F__jderobot__ImageData;
-
-const ::Ice::ObjectFactoryPtr&
-jderobot::ImageData::ice_factory()
-{
- return __F__jderobot__ImageData_Ptr;
-}
-
-class __F__jderobot__ImageData__Init
-{
-public:
-
- __F__jderobot__ImageData__Init()
- {
- ::IceInternal::factoryTable->addObjectFactory(::jderobot::ImageData::ice_staticId(), ::jderobot::ImageData::ice_factory());
- }
-
- ~__F__jderobot__ImageData__Init()
- {
- ::IceInternal::factoryTable->removeObjectFactory(::jderobot::ImageData::ice_staticId());
- }
-};
-
-static __F__jderobot__ImageData__Init __F__jderobot__ImageData__i;
-
-#ifdef __APPLE__
-extern "C" { void __F__jderobot__ImageData__initializer() {} }
-#endif
-
-
-bool
-jderobot::operator==(const ::jderobot::ImageData& l, const ::jderobot::ImageData& r)
-{
- return static_cast<const ::Ice::Object&>(l) == static_cast<const ::Ice::Object&>(r);
-}
-
-bool
-jderobot::operator<(const ::jderobot::ImageData& l, const ::jderobot::ImageData& r)
-{
- return static_cast<const ::Ice::Object&>(l) < static_cast<const ::Ice::Object&>(r);
-}
-
-void
-jderobot::__patch__ImageDataPtr(void* __addr, ::Ice::ObjectPtr& v)
-{
- ::jderobot::ImageDataPtr* p = static_cast< ::jderobot::ImageDataPtr*>(__addr);
- assert(p);
- *p = ::jderobot::ImageDataPtr::dynamicCast(v);
- if(v && !*p)
- {
- IceInternal::Ex::throwUOE(::jderobot::ImageData::ice_staticId(), v->ice_id());
- }
-}
-
-jderobot::HSVFilter::HSVFilter(::Ice::Float __ice_hmin, ::Ice::Float __ice_hmax, ::Ice::Float __ice_smin, ::Ice::Float __ice_smax, ::Ice::Float __ice_vmin, ::Ice::Float __ice_vmax) :
- hmin(__ice_hmin),
- hmax(__ice_hmax),
- smin(__ice_smin),
- smax(__ice_smax),
- vmin(__ice_vmin),
- vmax(__ice_vmax)
-{
-}
-
-static const ::std::string __jderobot__HSVFilter_ids[2] =
-{
- "::Ice::Object",
- "::jderobot::HSVFilter"
-};
-
-bool
-jderobot::HSVFilter::ice_isA(const ::std::string& _s, const ::Ice::Current&) const
-{
- return ::std::binary_search(__jderobot__HSVFilter_ids, __jderobot__HSVFilter_ids + 2, _s);
-}
-
-::std::vector< ::std::string>
-jderobot::HSVFilter::ice_ids(const ::Ice::Current&) const
-{
- return ::std::vector< ::std::string>(&__jderobot__HSVFilter_ids[0], &__jderobot__HSVFilter_ids[2]);
-}
-
-const ::std::string&
-jderobot::HSVFilter::ice_id(const ::Ice::Current&) const
-{
- return __jderobot__HSVFilter_ids[1];
-}
-
-const ::std::string&
-jderobot::HSVFilter::ice_staticId()
-{
- return __jderobot__HSVFilter_ids[1];
-}
-
-void
-jderobot::HSVFilter::__write(::IceInternal::BasicStream* __os) const
-{
- __os->writeTypeId(ice_staticId());
- __os->startWriteSlice();
- __os->write(hmin);
- __os->write(hmax);
- __os->write(smin);
- __os->write(smax);
- __os->write(vmin);
- __os->write(vmax);
- __os->endWriteSlice();
- ::Ice::Object::__write(__os);
-}
-
-void
-jderobot::HSVFilter::__read(::IceInternal::BasicStream* __is, bool __rid)
-{
- if(__rid)
- {
- ::std::string myId;
- __is->readTypeId(myId);
- }
- __is->startReadSlice();
- __is->read(hmin);
- __is->read(hmax);
- __is->read(smin);
- __is->read(smax);
- __is->read(vmin);
- __is->read(vmax);
- __is->endReadSlice();
- ::Ice::Object::__read(__is, true);
-}
-
-class __F__jderobot__HSVFilter : public ::Ice::ObjectFactory
-{
-public:
-
- virtual ::Ice::ObjectPtr
- create(const ::std::string& type)
- {
- assert(type == ::jderobot::HSVFilter::ice_staticId());
- return new ::jderobot::HSVFilter;
- }
-
- virtual void
- destroy()
- {
- }
-};
-
-static ::Ice::ObjectFactoryPtr __F__jderobot__HSVFilter_Ptr = new __F__jderobot__HSVFilter;
-
-const ::Ice::ObjectFactoryPtr&
-jderobot::HSVFilter::ice_factory()
-{
- return __F__jderobot__HSVFilter_Ptr;
-}
-
-class __F__jderobot__HSVFilter__Init
-{
-public:
-
- __F__jderobot__HSVFilter__Init()
- {
- ::IceInternal::factoryTable->addObjectFactory(::jderobot::HSVFilter::ice_staticId(), ::jderobot::HSVFilter::ice_factory());
- }
-
- ~__F__jderobot__HSVFilter__Init()
- {
- ::IceInternal::factoryTable->removeObjectFactory(::jderobot::HSVFilter::ice_staticId());
- }
-};
-
-static __F__jderobot__HSVFilter__Init __F__jderobot__HSVFilter__i;
-
-#ifdef __APPLE__
-extern "C" { void __F__jderobot__HSVFilter__initializer() {} }
-#endif
-
-
-bool
-jderobot::operator==(const ::jderobot::HSVFilter& l, const ::jderobot::HSVFilter& r)
-{
- return static_cast<const ::Ice::Object&>(l) == static_cast<const ::Ice::Object&>(r);
-}
-
-bool
-jderobot::operator<(const ::jderobot::HSVFilter& l, const ::jderobot::HSVFilter& r)
-{
- return static_cast<const ::Ice::Object&>(l) < static_cast<const ::Ice::Object&>(r);
-}
-
-void
-jderobot::__patch__HSVFilterPtr(void* __addr, ::Ice::ObjectPtr& v)
-{
- ::jderobot::HSVFilterPtr* p = static_cast< ::jderobot::HSVFilterPtr*>(__addr);
- assert(p);
- *p = ::jderobot::HSVFilterPtr::dynamicCast(v);
- if(v && !*p)
- {
- IceInternal::Ex::throwUOE(::jderobot::HSVFilter::ice_staticId(), v->ice_id());
- }
-}
-
-jderobot::CalibrationParams::CalibrationParams(::Ice::Float __ice_robotx, ::Ice::Float __ice_roboty, ::Ice::Float __ice_robott, ::Ice::Float __ice_u0, ::Ice::Float __ice_v0, ::Ice::Float __ice_fdistx, ::Ice::Float __ice_fdisty) :
- robotx(__ice_robotx),
- roboty(__ice_roboty),
- robott(__ice_robott),
- u0(__ice_u0),
- v0(__ice_v0),
- fdistx(__ice_fdistx),
- fdisty(__ice_fdisty)
-{
-}
-
-static const ::std::string __jderobot__CalibrationParams_ids[2] =
-{
- "::Ice::Object",
- "::jderobot::CalibrationParams"
-};
-
-bool
-jderobot::CalibrationParams::ice_isA(const ::std::string& _s, const ::Ice::Current&) const
-{
- return ::std::binary_search(__jderobot__CalibrationParams_ids, __jderobot__CalibrationParams_ids + 2, _s);
-}
-
-::std::vector< ::std::string>
-jderobot::CalibrationParams::ice_ids(const ::Ice::Current&) const
-{
- return ::std::vector< ::std::string>(&__jderobot__CalibrationParams_ids[0], &__jderobot__CalibrationParams_ids[2]);
-}
-
-const ::std::string&
-jderobot::CalibrationParams::ice_id(const ::Ice::Current&) const
-{
- return __jderobot__CalibrationParams_ids[1];
-}
-
-const ::std::string&
-jderobot::CalibrationParams::ice_staticId()
-{
- return __jderobot__CalibrationParams_ids[1];
-}
-
-void
-jderobot::CalibrationParams::__write(::IceInternal::BasicStream* __os) const
-{
- __os->writeTypeId(ice_staticId());
- __os->startWriteSlice();
- __os->write(robotx);
- __os->write(roboty);
- __os->write(robott);
- __os->write(u0);
- __os->write(v0);
- __os->write(fdistx);
- __os->write(fdisty);
- __os->endWriteSlice();
- ::Ice::Object::__write(__os);
-}
-
-void
-jderobot::CalibrationParams::__read(::IceInternal::BasicStream* __is, bool __rid)
-{
- if(__rid)
- {
- ::std::string myId;
- __is->readTypeId(myId);
- }
- __is->startReadSlice();
- __is->read(robotx);
- __is->read(roboty);
- __is->read(robott);
- __is->read(u0);
- __is->read(v0);
- __is->read(fdistx);
- __is->read(fdisty);
- __is->endReadSlice();
- ::Ice::Object::__read(__is, true);
-}
-
-class __F__jderobot__CalibrationParams : public ::Ice::ObjectFactory
-{
-public:
-
- virtual ::Ice::ObjectPtr
- create(const ::std::string& type)
- {
- assert(type == ::jderobot::CalibrationParams::ice_staticId());
- return new ::jderobot::CalibrationParams;
- }
-
- virtual void
- destroy()
- {
- }
-};
-
-static ::Ice::ObjectFactoryPtr __F__jderobot__CalibrationParams_Ptr = new __F__jderobot__CalibrationParams;
-
-const ::Ice::ObjectFactoryPtr&
-jderobot::CalibrationParams::ice_factory()
-{
- return __F__jderobot__CalibrationParams_Ptr;
-}
-
-class __F__jderobot__CalibrationParams__Init
-{
-public:
-
- __F__jderobot__CalibrationParams__Init()
- {
- ::IceInternal::factoryTable->addObjectFactory(::jderobot::CalibrationParams::ice_staticId(), ::jderobot::CalibrationParams::ice_factory());
- }
-
- ~__F__jderobot__CalibrationParams__Init()
- {
- ::IceInternal::factoryTable->removeObjectFactory(::jderobot::CalibrationParams::ice_staticId());
- }
-};
-
-static __F__jderobot__CalibrationParams__Init __F__jderobot__CalibrationParams__i;
-
-#ifdef __APPLE__
-extern "C" { void __F__jderobot__CalibrationParams__initializer() {} }
-#endif
-
-
-bool
-jderobot::operator==(const ::jderobot::CalibrationParams& l, const ::jderobot::CalibrationParams& r)
-{
- return static_cast<const ::Ice::Object&>(l) == static_cast<const ::Ice::Object&>(r);
-}
-
-bool
-jderobot::operator<(const ::jderobot::CalibrationParams& l, const ::jderobot::CalibrationParams& r)
-{
- return static_cast<const ::Ice::Object&>(l) < static_cast<const ::Ice::Object&>(r);
-}
-
-void
-jderobot::__patch__CalibrationParamsPtr(void* __addr, ::Ice::ObjectPtr& v)
-{
- ::jderobot::CalibrationParamsPtr* p = static_cast< ::jderobot::CalibrationParamsPtr*>(__addr);
- assert(p);
- *p = ::jderobot::CalibrationParamsPtr::dynamicCast(v);
- if(v && !*p)
- {
- IceInternal::Ex::throwUOE(::jderobot::CalibrationParams::ice_staticId(), v->ice_id());
- }
-}
-
-static const ::std::string __jderobot__ImageProvider_ids[2] =
-{
- "::Ice::Object",
- "::jderobot::ImageProvider"
-};
-
-bool
-jderobot::ImageProvider::ice_isA(const ::std::string& _s, const ::Ice::Current&) const
-{
- return ::std::binary_search(__jderobot__ImageProvider_ids, __jderobot__ImageProvider_ids + 2, _s);
-}
-
-::std::vector< ::std::string>
-jderobot::ImageProvider::ice_ids(const ::Ice::Current&) const
-{
- return ::std::vector< ::std::string>(&__jderobot__ImageProvider_ids[0], &__jderobot__ImageProvider_ids[2]);
-}
-
-const ::std::string&
-jderobot::ImageProvider::ice_id(const ::Ice::Current&) const
-{
- return __jderobot__ImageProvider_ids[1];
-}
-
-const ::std::string&
-jderobot::ImageProvider::ice_staticId()
-{
- return __jderobot__ImageProvider_ids[1];
-}
-
-#ifndef ICEE_PURE_CLIENT
-::Ice::DispatchStatus
-jderobot::ImageProvider::___getImageDescription(::IceInternal::Incoming& __inS, const ::Ice::Current& __current)
-{
- __checkMode(::Ice::Idempotent, __current.mode);
- ::IceInternal::BasicStream* __os = __inS.os();
- ::jderobot::ImageDescriptionPtr __ret = getImageDescription(__current);
- __os->write(::Ice::ObjectPtr(::IceInternal::upCast(__ret.get())));
- __os->writePendingObjects();
- return ::Ice::DispatchOK;
-}
-#endif // ICEE_PURE_CLIENT
-
-#ifndef ICEE_PURE_CLIENT
-::Ice::DispatchStatus
-jderobot::ImageProvider::___getImageData(::IceInternal::Incoming& __inS, const ::Ice::Current& __current)
-{
- __checkMode(::Ice::Idempotent, __current.mode);
- ::IceInternal::BasicStream* __os = __inS.os();
- try
- {
- ::jderobot::ImageDataPtr __ret = getImageData(__current);
- __os->write(::Ice::ObjectPtr(::IceInternal::upCast(__ret.get())));
- __os->writePendingObjects();
- }
- catch(const ::jderobot::DataNotExistException& __ex)
- {
- __os->write(__ex);
- return ::Ice::DispatchUserException;
- }
- catch(const ::jderobot::HardwareFailedException& __ex)
- {
- __os->write(__ex);
- return ::Ice::DispatchUserException;
- }
- return ::Ice::DispatchOK;
-}
-#endif // ICEE_PURE_CLIENT
-
-#ifndef ICEE_PURE_CLIENT
-static ::std::string __jderobot__ImageProvider_all[] =
-{
- "getImageData",
- "getImageDescription",
- "ice_id",
- "ice_ids",
- "ice_isA",
- "ice_ping"
-};
-
-::Ice::DispatchStatus
-jderobot::ImageProvider::__dispatch(::IceInternal::Incoming& in, const ::Ice::Current& current)
-{
- ::std::pair< ::std::string*, ::std::string*> r = ::std::equal_range(__jderobot__ImageProvider_all, __jderobot__ImageProvider_all + 6, current.operation);
- if(r.first == r.second)
- {
- throw Ice::OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
- }
-
- switch(r.first - __jderobot__ImageProvider_all)
- {
- case 0:
- {
- return ___getImageData(in, current);
- }
- case 1:
- {
- return ___getImageDescription(in, current);
- }
- case 2:
- {
- return ___ice_id(in, current);
- }
- case 3:
- {
- return ___ice_ids(in, current);
- }
- case 4:
- {
- return ___ice_isA(in, current);
- }
- case 5:
- {
- return ___ice_ping(in, current);
- }
- }
-
- assert(false);
- throw Ice::OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
-}
-#endif // ICEE_PURE_CLIENT
-
-void
-jderobot::ImageProvider::__write(::IceInternal::BasicStream* __os) const
-{
- __os->writeTypeId(ice_staticId());
- __os->startWriteSlice();
- __os->endWriteSlice();
- ::Ice::Object::__write(__os);
-}
-
-void
-jderobot::ImageProvider::__read(::IceInternal::BasicStream* __is, bool __rid)
-{
- if(__rid)
- {
- ::std::string myId;
- __is->readTypeId(myId);
- }
- __is->startReadSlice();
- __is->endReadSlice();
- ::Ice::Object::__read(__is, true);
-}
-
-
-bool
-jderobot::operator==(const ::jderobot::ImageProvider& l, const ::jderobot::ImageProvider& r)
-{
- return static_cast<const ::Ice::Object&>(l) == static_cast<const ::Ice::Object&>(r);
-}
-
-bool
-jderobot::operator<(const ::jderobot::ImageProvider& l, const ::jderobot::ImageProvider& r)
-{
- return static_cast<const ::Ice::Object&>(l) < static_cast<const ::Ice::Object&>(r);
-}
-
-void
-jderobot::__patch__ImageProviderPtr(void* __addr, ::Ice::ObjectPtr& v)
-{
- ::jderobot::ImageProviderPtr* p = static_cast< ::jderobot::ImageProviderPtr*>(__addr);
- assert(p);
- *p = ::jderobot::ImageProviderPtr::dynamicCast(v);
- if(v && !*p)
- {
- IceInternal::Ex::throwUOE(::jderobot::ImageProvider::ice_staticId(), v->ice_id());
- }
-}
-
-static const ::std::string __jderobot__ImageSelector_ids[3] =
-{
- "::Ice::Object",
- "::jderobot::ImageProvider",
- "::jderobot::ImageSelector"
-};
-
-bool
-jderobot::ImageSelector::ice_isA(const ::std::string& _s, const ::Ice::Current&) const
-{
- return ::std::binary_search(__jderobot__ImageSelector_ids, __jderobot__ImageSelector_ids + 3, _s);
-}
-
-::std::vector< ::std::string>
-jderobot::ImageSelector::ice_ids(const ::Ice::Current&) const
-{
- return ::std::vector< ::std::string>(&__jderobot__ImageSelector_ids[0], &__jderobot__ImageSelector_ids[3]);
-}
-
-const ::std::string&
-jderobot::ImageSelector::ice_id(const ::Ice::Current&) const
-{
- return __jderobot__ImageSelector_ids[2];
-}
-
-const ::std::string&
-jderobot::ImageSelector::ice_staticId()
-{
- return __jderobot__ImageSelector_ids[2];
-}
-
-#ifndef ICEE_PURE_CLIENT
-::Ice::DispatchStatus
-jderobot::ImageSelector::___getImageDataWithFeatures(::IceInternal::Incoming& __inS, const ::Ice::Current& __current)
-{
- __checkMode(::Ice::Idempotent, __current.mode);
- ::IceInternal::BasicStream* __is = __inS.is();
- ::jderobot::FeaturesType type;
- ::jderobot::__read(__is, type);
- ::IceInternal::BasicStream* __os = __inS.os();
- try
- {
- ::jderobot::ImageDataPtr __ret = getImageDataWithFeatures(type, __current);
- __os->write(::Ice::ObjectPtr(::IceInternal::upCast(__ret.get())));
- __os->writePendingObjects();
- }
- catch(const ::jderobot::DataNotExistException& __ex)
- {
- __os->write(__ex);
- return ::Ice::DispatchUserException;
- }
- catch(const ::jderobot::HardwareFailedException& __ex)
- {
- __os->write(__ex);
- return ::Ice::DispatchUserException;
- }
- return ::Ice::DispatchOK;
-}
-#endif // ICEE_PURE_CLIENT
-
-#ifndef ICEE_PURE_CLIENT
-::Ice::DispatchStatus
-jderobot::ImageSelector::___getHSVFilter(::IceInternal::Incoming& __inS, const ::Ice::Current& __current)
-{
- __checkMode(::Ice::Idempotent, __current.mode);
- ::IceInternal::BasicStream* __is = __inS.is();
- ::jderobot::CameraType cam;
- ::jderobot::ObjectsType obj;
- ::jderobot::__read(__is, cam);
- ::jderobot::__read(__is, obj);
- ::IceInternal::BasicStream* __os = __inS.os();
- ::jderobot::HSVFilterPtr __ret = getHSVFilter(cam, obj, __current);
- __os->write(::Ice::ObjectPtr(::IceInternal::upCast(__ret.get())));
- __os->writePendingObjects();
- return ::Ice::DispatchOK;
-}
-#endif // ICEE_PURE_CLIENT
-
-#ifndef ICEE_PURE_CLIENT
-::Ice::DispatchStatus
-jderobot::ImageSelector::___setHSVFilter(::IceInternal::Incoming& __inS, const ::Ice::Current& __current)
-{
- __checkMode(::Ice::Idempotent, __current.mode);
- ::IceInternal::BasicStream* __is = __inS.is();
- ::jderobot::CameraType cam;
- ::jderobot::ObjectsType obj;
- ::jderobot::HSVFilterPtr newFilter;
- ::jderobot::__read(__is, cam);
- ::jderobot::__read(__is, obj);
- __is->read(::jderobot::__patch__HSVFilterPtr, &newFilter);
- __is->readPendingObjects();
- setHSVFilter(cam, obj, newFilter, __current);
- return ::Ice::DispatchOK;
-}
-#endif // ICEE_PURE_CLIENT
-
-#ifndef ICEE_PURE_CLIENT
-::Ice::DispatchStatus
-jderobot::ImageSelector::___setCam(::IceInternal::Incoming& __inS, const ::Ice::Current& __current)
-{
- __checkMode(::Ice::Idempotent, __current.mode);
- ::IceInternal::BasicStream* __is = __inS.is();
- ::jderobot::CameraType cam;
- ::jderobot::__read(__is, cam);
- setCam(cam, __current);
- return ::Ice::DispatchOK;
-}
-#endif // ICEE_PURE_CLIENT
-
-#ifndef ICEE_PURE_CLIENT
-static ::std::string __jderobot__ImageSelector_all[] =
-{
- "getHSVFilter",
- "getImageData",
- "getImageDataWithFeatures",
- "getImageDescription",
- "ice_id",
- "ice_ids",
- "ice_isA",
- "ice_ping",
- "setCam",
- "setHSVFilter"
-};
-
-::Ice::DispatchStatus
-jderobot::ImageSelector::__dispatch(::IceInternal::Incoming& in, const ::Ice::Current& current)
-{
- ::std::pair< ::std::string*, ::std::string*> r = ::std::equal_range(__jderobot__ImageSelector_all, __jderobot__ImageSelector_all + 10, current.operation);
- if(r.first == r.second)
- {
- throw Ice::OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
- }
-
- switch(r.first - __jderobot__ImageSelector_all)
- {
- case 0:
- {
- return ___getHSVFilter(in, current);
- }
- case 1:
- {
- return ___getImageData(in, current);
- }
- case 2:
- {
- return ___getImageDataWithFeatures(in, current);
- }
- case 3:
- {
- return ___getImageDescription(in, current);
- }
- case 4:
- {
- return ___ice_id(in, current);
- }
- case 5:
- {
- return ___ice_ids(in, current);
- }
- case 6:
- {
- return ___ice_isA(in, current);
- }
- case 7:
- {
- return ___ice_ping(in, current);
- }
- case 8:
- {
- return ___setCam(in, current);
- }
- case 9:
- {
- return ___setHSVFilter(in, current);
- }
- }
-
- assert(false);
- throw Ice::OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
-}
-#endif // ICEE_PURE_CLIENT
-
-void
-jderobot::ImageSelector::__write(::IceInternal::BasicStream* __os) const
-{
- __os->writeTypeId(ice_staticId());
- __os->startWriteSlice();
- __os->endWriteSlice();
- ::Ice::Object::__write(__os);
-}
-
-void
-jderobot::ImageSelector::__read(::IceInternal::BasicStream* __is, bool __rid)
-{
- if(__rid)
- {
- ::std::string myId;
- __is->readTypeId(myId);
- }
- __is->startReadSlice();
- __is->endReadSlice();
- ::Ice::Object::__read(__is, true);
-}
-
-
-bool
-jderobot::operator==(const ::jderobot::ImageSelector& l, const ::jderobot::ImageSelector& r)
-{
- return static_cast<const ::Ice::Object&>(l) == static_cast<const ::Ice::Object&>(r);
-}
-
-bool
-jderobot::operator<(const ::jderobot::ImageSelector& l, const ::jderobot::ImageSelector& r)
-{
- return static_cast<const ::Ice::Object&>(l) < static_cast<const ::Ice::Object&>(r);
-}
-
-void
-jderobot::__patch__ImageSelectorPtr(void* __addr, ::Ice::ObjectPtr& v)
-{
- ::jderobot::ImageSelectorPtr* p = static_cast< ::jderobot::ImageSelectorPtr*>(__addr);
- assert(p);
- *p = ::jderobot::ImageSelectorPtr::dynamicCast(v);
- if(v && !*p)
- {
- IceInternal::Ex::throwUOE(::jderobot::ImageSelector::ice_staticId(), v->ice_id());
- }
-}
-
-static const ::std::string __jderobot__CalibrationProvider_ids[2] =
-{
- "::Ice::Object",
- "::jderobot::CalibrationProvider"
-};
-
-bool
-jderobot::CalibrationProvider::ice_isA(const ::std::string& _s, const ::Ice::Current&) const
-{
- return ::std::binary_search(__jderobot__CalibrationProvider_ids, __jderobot__CalibrationProvider_ids + 2, _s);
-}
-
-::std::vector< ::std::string>
-jderobot::CalibrationProvider::ice_ids(const ::Ice::Current&) const
-{
- return ::std::vector< ::std::string>(&__jderobot__CalibrationProvider_ids[0], &__jderobot__CalibrationProvider_ids[2]);
-}
-
-const ::std::string&
-jderobot::CalibrationProvider::ice_id(const ::Ice::Current&) const
-{
- return __jderobot__CalibrationProvider_ids[1];
-}
-
-const ::std::string&
-jderobot::CalibrationProvider::ice_staticId()
-{
- return __jderobot__CalibrationProvider_ids[1];
-}
-
-#ifndef ICEE_PURE_CLIENT
-::Ice::DispatchStatus
-jderobot::CalibrationProvider::___getCalibrationImg(::IceInternal::Incoming& __inS, const ::Ice::Current& __current)
-{
- __checkMode(::Ice::Idempotent, __current.mode);
- ::IceInternal::BasicStream* __os = __inS.os();
- try
- {
- ::jderobot::ImageDataPtr __ret = getCalibrationImg(__current);
- __os->write(::Ice::ObjectPtr(::IceInternal::upCast(__ret.get())));
- __os->writePendingObjects();
- }
- catch(const ::jderobot::DataNotExistException& __ex)
- {
- __os->write(__ex);
- return ::Ice::DispatchUserException;
- }
- catch(const ::jderobot::HardwareFailedException& __ex)
- {
- __os->write(__ex);
- return ::Ice::DispatchUserException;
- }
- return ::Ice::DispatchOK;
-}
-#endif // ICEE_PURE_CLIENT
-
-#ifndef ICEE_PURE_CLIENT
-::Ice::DispatchStatus
-jderobot::CalibrationProvider::___getCalibrationParams(::IceInternal::Incoming& __inS, const ::Ice::Current& __current)
-{
- __checkMode(::Ice::Idempotent, __current.mode);
- ::IceInternal::BasicStream* __os = __inS.os();
- ::jderobot::CalibrationParamsPtr __ret = getCalibrationParams(__current);
- __os->write(::Ice::ObjectPtr(::IceInternal::upCast(__ret.get())));
- __os->writePendingObjects();
- return ::Ice::DispatchOK;
-}
-#endif // ICEE_PURE_CLIENT
-
-#ifndef ICEE_PURE_CLIENT
-::Ice::DispatchStatus
-jderobot::CalibrationProvider::___setCalibrationParams(::IceInternal::Incoming& __inS, const ::Ice::Current& __current)
-{
- __checkMode(::Ice::Idempotent, __current.mode);
- ::IceInternal::BasicStream* __is = __inS.is();
- ::jderobot::CalibrationParamsPtr newParams;
- __is->read(::jderobot::__patch__CalibrationParamsPtr, &newParams);
- __is->readPendingObjects();
- setCalibrationParams(newParams, __current);
- return ::Ice::DispatchOK;
-}
-#endif // ICEE_PURE_CLIENT
-
-#ifndef ICEE_PURE_CLIENT
-static ::std::string __jderobot__CalibrationProvider_all[] =
-{
- "getCalibrationImg",
- "getCalibrationParams",
- "ice_id",
- "ice_ids",
- "ice_isA",
- "ice_ping",
- "setCalibrationParams"
-};
-
-::Ice::DispatchStatus
-jderobot::CalibrationProvider::__dispatch(::IceInternal::Incoming& in, const ::Ice::Current& current)
-{
- ::std::pair< ::std::string*, ::std::string*> r = ::std::equal_range(__jderobot__CalibrationProvider_all, __jderobot__CalibrationProvider_all + 7, current.operation);
- if(r.first == r.second)
- {
- throw Ice::OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
- }
-
- switch(r.first - __jderobot__CalibrationProvider_all)
- {
- case 0:
- {
- return ___getCalibrationImg(in, current);
- }
- case 1:
- {
- return ___getCalibrationParams(in, current);
- }
- case 2:
- {
- return ___ice_id(in, current);
- }
- case 3:
- {
- return ___ice_ids(in, current);
- }
- case 4:
- {
- return ___ice_isA(in, current);
- }
- case 5:
- {
- return ___ice_ping(in, current);
- }
- case 6:
- {
- return ___setCalibrationParams(in, current);
- }
- }
-
- assert(false);
- throw Ice::OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
-}
-#endif // ICEE_PURE_CLIENT
-
-void
-jderobot::CalibrationProvider::__write(::IceInternal::BasicStream* __os) const
-{
- __os->writeTypeId(ice_staticId());
- __os->startWriteSlice();
- __os->endWriteSlice();
- ::Ice::Object::__write(__os);
-}
-
-void
-jderobot::CalibrationProvider::__read(::IceInternal::BasicStream* __is, bool __rid)
-{
- if(__rid)
- {
- ::std::string myId;
- __is->readTypeId(myId);
- }
- __is->startReadSlice();
- __is->endReadSlice();
- ::Ice::Object::__read(__is, true);
-}
-
-
-bool
-jderobot::operator==(const ::jderobot::CalibrationProvider& l, const ::jderobot::CalibrationProvider& r)
-{
- return static_cast<const ::Ice::Object&>(l) == static_cast<const ::Ice::Object&>(r);
-}
-
-bool
-jderobot::operator<(const ::jderobot::CalibrationProvider& l, const ::jderobot::CalibrationProvider& r)
-{
- return static_cast<const ::Ice::Object&>(l) < static_cast<const ::Ice::Object&>(r);
-}
-
-void
-jderobot::__patch__CalibrationProviderPtr(void* __addr, ::Ice::ObjectPtr& v)
-{
- ::jderobot::CalibrationProviderPtr* p = static_cast< ::jderobot::CalibrationProviderPtr*>(__addr);
- assert(p);
- *p = ::jderobot::CalibrationProviderPtr::dynamicCast(v);
- if(v && !*p)
- {
- IceInternal::Ex::throwUOE(::jderobot::CalibrationProvider::ice_staticId(), v->ice_id());
- }
-}
-
-const ::std::string&
-IceProxy::jderobot::ImageDescription::ice_staticId()
-{
- return __jderobot__ImageDescription_ids[1];
-}
-
-::IceProxy::Ice::Object*
-IceProxy::jderobot::ImageDescription::__newInstance() const
-{
- return new ImageDescription;
-}
-
-const ::std::string&
-IceProxy::jderobot::ImageData::ice_staticId()
-{
- return __jderobot__ImageData_ids[1];
-}
-
-::IceProxy::Ice::Object*
-IceProxy::jderobot::ImageData::__newInstance() const
-{
- return new ImageData;
-}
-
-const ::std::string&
-IceProxy::jderobot::HSVFilter::ice_staticId()
-{
- return __jderobot__HSVFilter_ids[1];
-}
-
-::IceProxy::Ice::Object*
-IceProxy::jderobot::HSVFilter::__newInstance() const
-{
- return new HSVFilter;
-}
-
-const ::std::string&
-IceProxy::jderobot::CalibrationParams::ice_staticId()
-{
- return __jderobot__CalibrationParams_ids[1];
-}
-
-::IceProxy::Ice::Object*
-IceProxy::jderobot::CalibrationParams::__newInstance() const
-{
- return new CalibrationParams;
-}
-
-::jderobot::ImageDescriptionPtr
-IceProxy::jderobot::ImageProvider::getImageDescription(const ::Ice::Context* __ctx)
-{
- int __cnt = 0;
- while(true)
- {
- ::IceInternal::RequestHandlerPtr __handler;
- try
- {
- __checkTwowayOnly(__jderobot__ImageProvider__getImageDescription_name);
- __handler = __getRequestHandler();
- ::IceInternal::Outgoing __outS(__handler.get(), _reference.get(), __jderobot__ImageProvider__getImageDescription_name, ::Ice::Idempotent, __ctx);
- bool __ok = __outS.invoke();
- try
- {
- if(!__ok)
- {
- __outS.is()->throwUnknownUserException();
- }
- ::jderobot::ImageDescriptionPtr __ret;
- ::IceInternal::BasicStream* __is = __outS.is();
- __is->read(::jderobot::__patch__ImageDescriptionPtr, &__ret);
- __is->readPendingObjects();
- return __ret;
- }
- catch(const ::Ice::LocalException& __ex)
- {
- throw ::IceInternal::LocalExceptionWrapper(__ex, false);
- }
-#if defined(_MSC_VER) && defined(_M_ARM) // ARM bug.
- catch(...)
- {
- throw;
- }
-#endif
- }
- catch(const ::IceInternal::LocalExceptionWrapper& __ex)
- {
- __handleExceptionWrapperRelaxed(__handler, __ex, __cnt);
- }
- catch(const ::Ice::LocalException& __ex)
- {
- __handleException(__handler, __ex, __cnt);
- }
-#if defined(_MSC_VER) && defined(_M_ARM) // ARM bug.
- catch(...)
- {
- throw;
- }
-#endif
- }
-}
-
-::jderobot::ImageDataPtr
-IceProxy::jderobot::ImageProvider::getImageData(const ::Ice::Context* __ctx)
-{
- int __cnt = 0;
- while(true)
- {
- ::IceInternal::RequestHandlerPtr __handler;
- try
- {
- __checkTwowayOnly(__jderobot__ImageProvider__getImageData_name);
- __handler = __getRequestHandler();
- ::IceInternal::Outgoing __outS(__handler.get(), _reference.get(), __jderobot__ImageProvider__getImageData_name, ::Ice::Idempotent, __ctx);
- bool __ok = __outS.invoke();
- try
- {
- if(!__ok)
- {
- try
- {
- __outS.is()->throwException();
- }
- catch(const ::jderobot::DataNotExistException&)
- {
- throw;
- }
- catch(const ::jderobot::HardwareFailedException&)
- {
- throw;
- }
- catch(const ::Ice::UserException& __ex)
- {
- ::Ice::UnknownUserException __uex(__FILE__, __LINE__);
- __uex.unknown = __ex.ice_name();
- throw __uex;
- }
- }
- ::jderobot::ImageDataPtr __ret;
- ::IceInternal::BasicStream* __is = __outS.is();
- __is->read(::jderobot::__patch__ImageDataPtr, &__ret);
- __is->readPendingObjects();
- return __ret;
- }
- catch(const ::Ice::LocalException& __ex)
- {
- throw ::IceInternal::LocalExceptionWrapper(__ex, false);
- }
-#if defined(_MSC_VER) && defined(_M_ARM) // ARM bug.
- catch(...)
- {
- throw;
- }
-#endif
- }
- catch(const ::IceInternal::LocalExceptionWrapper& __ex)
- {
- __handleExceptionWrapperRelaxed(__handler, __ex, __cnt);
- }
- catch(const ::Ice::LocalException& __ex)
- {
- __handleException(__handler, __ex, __cnt);
- }
-#if defined(_MSC_VER) && defined(_M_ARM) // ARM bug.
- catch(...)
- {
- throw;
- }
-#endif
- }
-}
-
-const ::std::string&
-IceProxy::jderobot::ImageProvider::ice_staticId()
-{
- return __jderobot__ImageProvider_ids[1];
-}
-
-::IceProxy::Ice::Object*
-IceProxy::jderobot::ImageProvider::__newInstance() const
-{
- return new ImageProvider;
-}
-
-::jderobot::ImageDataPtr
-IceProxy::jderobot::ImageSelector::getImageDataWithFeatures(::jderobot::FeaturesType type, const ::Ice::Context* __ctx)
-{
- int __cnt = 0;
- while(true)
- {
- ::IceInternal::RequestHandlerPtr __handler;
- try
- {
- __checkTwowayOnly(__jderobot__ImageSelector__getImageDataWithFeatures_name);
- __handler = __getRequestHandler();
- ::IceInternal::Outgoing __outS(__handler.get(), _reference.get(), __jderobot__ImageSelector__getImageDataWithFeatures_name, ::Ice::Idempotent, __ctx);
- try
- {
- ::IceInternal::BasicStream* __os = __outS.os();
- ::jderobot::__write(__os, type);
- }
- catch(const ::Ice::LocalException& __ex)
- {
- __outS.abort(__ex);
- }
- bool __ok = __outS.invoke();
- try
- {
- if(!__ok)
- {
- try
- {
- __outS.is()->throwException();
- }
- catch(const ::jderobot::DataNotExistException&)
- {
- throw;
- }
- catch(const ::jderobot::HardwareFailedException&)
- {
- throw;
- }
- catch(const ::Ice::UserException& __ex)
- {
- ::Ice::UnknownUserException __uex(__FILE__, __LINE__);
- __uex.unknown = __ex.ice_name();
- throw __uex;
- }
- }
- ::jderobot::ImageDataPtr __ret;
- ::IceInternal::BasicStream* __is = __outS.is();
- __is->read(::jderobot::__patch__ImageDataPtr, &__ret);
- __is->readPendingObjects();
- return __ret;
- }
- catch(const ::Ice::LocalException& __ex)
- {
- throw ::IceInternal::LocalExceptionWrapper(__ex, false);
- }
-#if defined(_MSC_VER) && defined(_M_ARM) // ARM bug.
- catch(...)
- {
- throw;
- }
-#endif
- }
- catch(const ::IceInternal::LocalExceptionWrapper& __ex)
- {
- __handleExceptionWrapperRelaxed(__handler, __ex, __cnt);
- }
- catch(const ::Ice::LocalException& __ex)
- {
- __handleException(__handler, __ex, __cnt);
- }
-#if defined(_MSC_VER) && defined(_M_ARM) // ARM bug.
- catch(...)
- {
- throw;
- }
-#endif
- }
-}
-
-::jderobot::HSVFilterPtr
-IceProxy::jderobot::ImageSelector::getHSVFilter(::jderobot::CameraType cam, ::jderobot::ObjectsType obj, const ::Ice::Context* __ctx)
-{
- int __cnt = 0;
- while(true)
- {
- ::IceInternal::RequestHandlerPtr __handler;
- try
- {
- __checkTwowayOnly(__jderobot__ImageSelector__getHSVFilter_name);
- __handler = __getRequestHandler();
- ::IceInternal::Outgoing __outS(__handler.get(), _reference.get(), __jderobot__ImageSelector__getHSVFilter_name, ::Ice::Idempotent, __ctx);
- try
- {
- ::IceInternal::BasicStream* __os = __outS.os();
- ::jderobot::__write(__os, cam);
- ::jderobot::__write(__os, obj);
- }
- catch(const ::Ice::LocalException& __ex)
- {
- __outS.abort(__ex);
- }
- bool __ok = __outS.invoke();
- try
- {
- if(!__ok)
- {
- __outS.is()->throwUnknownUserException();
- }
- ::jderobot::HSVFilterPtr __ret;
- ::IceInternal::BasicStream* __is = __outS.is();
- __is->read(::jderobot::__patch__HSVFilterPtr, &__ret);
- __is->readPendingObjects();
- return __ret;
- }
- catch(const ::Ice::LocalException& __ex)
- {
- throw ::IceInternal::LocalExceptionWrapper(__ex, false);
- }
-#if defined(_MSC_VER) && defined(_M_ARM) // ARM bug.
- catch(...)
- {
- throw;
- }
-#endif
- }
- catch(const ::IceInternal::LocalExceptionWrapper& __ex)
- {
- __handleExceptionWrapperRelaxed(__handler, __ex, __cnt);
- }
- catch(const ::Ice::LocalException& __ex)
- {
- __handleException(__handler, __ex, __cnt);
- }
-#if defined(_MSC_VER) && defined(_M_ARM) // ARM bug.
- catch(...)
- {
- throw;
- }
-#endif
- }
-}
-
-void
-IceProxy::jderobot::ImageSelector::setHSVFilter(::jderobot::CameraType cam, ::jderobot::ObjectsType obj, const ::jderobot::HSVFilterPtr& newFilter, const ::Ice::Context* __ctx)
-{
- int __cnt = 0;
- while(true)
- {
- ::IceInternal::RequestHandlerPtr __handler;
- try
- {
- __handler = __getRequestHandler();
- ::IceInternal::Outgoing __outS(__handler.get(), _reference.get(), __jderobot__ImageSelector__setHSVFilter_name, ::Ice::Idempotent, __ctx);
- try
- {
- ::IceInternal::BasicStream* __os = __outS.os();
- ::jderobot::__write(__os, cam);
- ::jderobot::__write(__os, obj);
- __os->write(::Ice::ObjectPtr(::IceInternal::upCast(newFilter.get())));
- __os->writePendingObjects();
- }
- catch(const ::Ice::LocalException& __ex)
- {
- __outS.abort(__ex);
- }
- bool __ok = __outS.invoke();
- try
- {
- if(!__ok)
- {
- __outS.is()->throwUnknownUserException();
- }
- }
- catch(const ::Ice::LocalException& __ex)
- {
- throw ::IceInternal::LocalExceptionWrapper(__ex, false);
- }
-#if defined(_MSC_VER) && defined(_M_ARM) // ARM bug.
- catch(...)
- {
- throw;
- }
-#endif
- return;
- }
- catch(const ::IceInternal::LocalExceptionWrapper& __ex)
- {
- __handleExceptionWrapperRelaxed(__handler, __ex, __cnt);
- }
- catch(const ::Ice::LocalException& __ex)
- {
- __handleException(__handler, __ex, __cnt);
- }
-#if defined(_MSC_VER) && defined(_M_ARM) // ARM bug.
- catch(...)
- {
- throw;
- }
-#endif
- }
-}
-
-void
-IceProxy::jderobot::ImageSelector::setCam(::jderobot::CameraType cam, const ::Ice::Context* __ctx)
-{
- int __cnt = 0;
- while(true)
- {
- ::IceInternal::RequestHandlerPtr __handler;
- try
- {
- __handler = __getRequestHandler();
- ::IceInternal::Outgoing __outS(__handler.get(), _reference.get(), __jderobot__ImageSelector__setCam_name, ::Ice::Idempotent, __ctx);
- try
- {
- ::IceInternal::BasicStream* __os = __outS.os();
- ::jderobot::__write(__os, cam);
- }
- catch(const ::Ice::LocalException& __ex)
- {
- __outS.abort(__ex);
- }
- bool __ok = __outS.invoke();
- try
- {
- if(!__ok)
- {
- __outS.is()->throwUnknownUserException();
- }
- }
- catch(const ::Ice::LocalException& __ex)
- {
- throw ::IceInternal::LocalExceptionWrapper(__ex, false);
- }
-#if defined(_MSC_VER) && defined(_M_ARM) // ARM bug.
- catch(...)
- {
- throw;
- }
-#endif
- return;
- }
- catch(const ::IceInternal::LocalExceptionWrapper& __ex)
- {
- __handleExceptionWrapperRelaxed(__handler, __ex, __cnt);
- }
- catch(const ::Ice::LocalException& __ex)
- {
- __handleException(__handler, __ex, __cnt);
- }
-#if defined(_MSC_VER) && defined(_M_ARM) // ARM bug.
- catch(...)
- {
- throw;
- }
-#endif
- }
-}
-
-const ::std::string&
-IceProxy::jderobot::ImageSelector::ice_staticId()
-{
- return __jderobot__ImageSelector_ids[2];
-}
-
-::IceProxy::Ice::Object*
-IceProxy::jderobot::ImageSelector::__newInstance() const
-{
- return new ImageSelector;
-}
-
-::jderobot::ImageDataPtr
-IceProxy::jderobot::CalibrationProvider::getCalibrationImg(const ::Ice::Context* __ctx)
-{
- int __cnt = 0;
- while(true)
- {
- ::IceInternal::RequestHandlerPtr __handler;
- try
- {
- __checkTwowayOnly(__jderobot__CalibrationProvider__getCalibrationImg_name);
- __handler = __getRequestHandler();
- ::IceInternal::Outgoing __outS(__handler.get(), _reference.get(), __jderobot__CalibrationProvider__getCalibrationImg_name, ::Ice::Idempotent, __ctx);
- bool __ok = __outS.invoke();
- try
- {
- if(!__ok)
- {
- try
- {
- __outS.is()->throwException();
- }
- catch(const ::jderobot::DataNotExistException&)
- {
- throw;
- }
- catch(const ::jderobot::HardwareFailedException&)
- {
- throw;
- }
- catch(const ::Ice::UserException& __ex)
- {
- ::Ice::UnknownUserException __uex(__FILE__, __LINE__);
- __uex.unknown = __ex.ice_name();
- throw __uex;
- }
- }
- ::jderobot::ImageDataPtr __ret;
- ::IceInternal::BasicStream* __is = __outS.is();
- __is->read(::jderobot::__patch__ImageDataPtr, &__ret);
- __is->readPendingObjects();
- return __ret;
- }
- catch(const ::Ice::LocalException& __ex)
- {
- throw ::IceInternal::LocalExceptionWrapper(__ex, false);
- }
-#if defined(_MSC_VER) && defined(_M_ARM) // ARM bug.
- catch(...)
- {
- throw;
- }
-#endif
- }
- catch(const ::IceInternal::LocalExceptionWrapper& __ex)
- {
- __handleExceptionWrapperRelaxed(__handler, __ex, __cnt);
- }
- catch(const ::Ice::LocalException& __ex)
- {
- __handleException(__handler, __ex, __cnt);
- }
-#if defined(_MSC_VER) && defined(_M_ARM) // ARM bug.
- catch(...)
- {
- throw;
- }
-#endif
- }
-}
-
-::jderobot::CalibrationParamsPtr
-IceProxy::jderobot::CalibrationProvider::getCalibrationParams(const ::Ice::Context* __ctx)
-{
- int __cnt = 0;
- while(true)
- {
- ::IceInternal::RequestHandlerPtr __handler;
- try
- {
- __checkTwowayOnly(__jderobot__CalibrationProvider__getCalibrationParams_name);
- __handler = __getRequestHandler();
- ::IceInternal::Outgoing __outS(__handler.get(), _reference.get(), __jderobot__CalibrationProvider__getCalibrationParams_name, ::Ice::Idempotent, __ctx);
- bool __ok = __outS.invoke();
- try
- {
- if(!__ok)
- {
- __outS.is()->throwUnknownUserException();
- }
- ::jderobot::CalibrationParamsPtr __ret;
- ::IceInternal::BasicStream* __is = __outS.is();
- __is->read(::jderobot::__patch__CalibrationParamsPtr, &__ret);
- __is->readPendingObjects();
- return __ret;
- }
- catch(const ::Ice::LocalException& __ex)
- {
- throw ::IceInternal::LocalExceptionWrapper(__ex, false);
- }
-#if defined(_MSC_VER) && defined(_M_ARM) // ARM bug.
- catch(...)
- {
- throw;
- }
-#endif
- }
- catch(const ::IceInternal::LocalExceptionWrapper& __ex)
- {
- __handleExceptionWrapperRelaxed(__handler, __ex, __cnt);
- }
- catch(const ::Ice::LocalException& __ex)
- {
- __handleException(__handler, __ex, __cnt);
- }
-#if defined(_MSC_VER) && defined(_M_ARM) // ARM bug.
- catch(...)
- {
- throw;
- }
-#endif
- }
-}
-
-void
-IceProxy::jderobot::CalibrationProvider::setCalibrationParams(const ::jderobot::CalibrationParamsPtr& newParams, const ::Ice::Context* __ctx)
-{
- int __cnt = 0;
- while(true)
- {
- ::IceInternal::RequestHandlerPtr __handler;
- try
- {
- __handler = __getRequestHandler();
- ::IceInternal::Outgoing __outS(__handler.get(), _reference.get(), __jderobot__CalibrationProvider__setCalibrationParams_name, ::Ice::Idempotent, __ctx);
- try
- {
- ::IceInternal::BasicStream* __os = __outS.os();
- __os->write(::Ice::ObjectPtr(::IceInternal::upCast(newParams.get())));
- __os->writePendingObjects();
- }
- catch(const ::Ice::LocalException& __ex)
- {
- __outS.abort(__ex);
- }
- bool __ok = __outS.invoke();
- try
- {
- if(!__ok)
- {
- __outS.is()->throwUnknownUserException();
- }
- }
- catch(const ::Ice::LocalException& __ex)
- {
- throw ::IceInternal::LocalExceptionWrapper(__ex, false);
- }
-#if defined(_MSC_VER) && defined(_M_ARM) // ARM bug.
- catch(...)
- {
- throw;
- }
-#endif
- return;
- }
- catch(const ::IceInternal::LocalExceptionWrapper& __ex)
- {
- __handleExceptionWrapperRelaxed(__handler, __ex, __cnt);
- }
- catch(const ::Ice::LocalException& __ex)
- {
- __handleException(__handler, __ex, __cnt);
- }
-#if defined(_MSC_VER) && defined(_M_ARM) // ARM bug.
- catch(...)
- {
- throw;
- }
-#endif
- }
-}
-
-const ::std::string&
-IceProxy::jderobot::CalibrationProvider::ice_staticId()
-{
- return __jderobot__CalibrationProvider_ids[1];
-}
-
-::IceProxy::Ice::Object*
-IceProxy::jderobot::CalibrationProvider::__newInstance() const
-{
- return new CalibrationProvider;
-}
Deleted: trunk/src/stable/components/naoserver/interfaces/cpp/jderobot/image.h
===================================================================
--- trunk/src/stable/components/naoserver/interfaces/cpp/jderobot/image.h 2014-01-25 18:44:50 UTC (rev 1146)
+++ trunk/src/stable/components/naoserver/interfaces/cpp/jderobot/image.h 2014-01-25 20:27:32 UTC (rev 1147)
@@ -1,1101 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice-E is licensed to you under the terms described in the
-// ICEE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-// Ice-E version 1.3.0
-// Generated from file `image.ice'
-
-#ifndef ___users_eperdices_GO2012_naoserver_src_interfaces_cpp_jderobot_image_h__
-#define ___users_eperdices_GO2012_naoserver_src_interfaces_cpp_jderobot_image_h__
-
-#include <IceE/ProxyF.h>
-#include <IceE/ObjectF.h>
-#include <IceE/Exception.h>
-#include <IceE/ScopedArray.h>
-#include <IceE/Proxy.h>
-#include <IceE/Object.h>
-#ifndef ICEE_PURE_CLIENT
-# include <IceE/Incoming.h>
-#endif
-#include <IceE/Outgoing.h>
-#include <IceE/UserExceptionFactory.h>
-#include <IceE/FactoryTable.h>
-#include <jderobot/common.h>
-#include <IceE/UndefSysMacros.h>
-
-#ifndef ICEE_IGNORE_VERSION
-# if ICEE_INT_VERSION / 100 != 103
-# error IceE version mismatch!
-# endif
-# if ICEE_INT_VERSION % 100 < 0
-# error IceE patch level mismatch!
-# endif
-#endif
-
-namespace IceProxy
-{
-
-namespace jderobot
-{
-
-class ImageDescription;
-
-class ImageData;
-
-class HSVFilter;
-
-class CalibrationParams;
-
-class ImageProvider;
-
-class ImageSelector;
-
-class CalibrationProvider;
-
-}
-
-}
-
-namespace jderobot
-{
-
-class ImageDescription;
-bool operator==(const ImageDescription&, const ImageDescription&);
-bool operator<(const ImageDescription&, const ImageDescription&);
-
-class ImageData;
-bool operator==(const ImageData&, const ImageData&);
-bool operator<(const ImageData&, const ImageData&);
-
-class HSVFilter;
-bool operator==(const HSVFilter&, const HSVFilter&);
-bool operator<(const HSVFilter&, const HSVFilter&);
-
-class CalibrationParams;
-bool operator==(const CalibrationParams&, const CalibrationParams&);
-bool operator<(const CalibrationParams&, const CalibrationParams&);
-
-class ImageProvider;
-bool operator==(const ImageProvider&, const ImageProvider&);
-bool operator<(const ImageProvider&, const ImageProvider&);
-
-class ImageSelector;
-bool operator==(const ImageSelector&, const ImageSelector&);
-bool operator<(const ImageSelector&, const ImageSelector&);
-
-class CalibrationProvider;
-bool operator==(const CalibrationProvider&, const CalibrationProvider&);
-bool operator<(const CalibrationProvider&, const CalibrationProvider&);
-
-}
-
-namespace IceInternal
-{
-
-::Ice::Object* upCast(::jderobot::ImageDescription*);
-::IceProxy::Ice::Object* upCast(::IceProxy::jderobot::ImageDescription*);
-
-::Ice::Object* upCast(::jderobot::ImageData*);
-::IceProxy::Ice::Object* upCast(::IceProxy::jderobot::ImageData*);
-
-::Ice::Object* upCast(::jderobot::HSVFilter*);
-::IceProxy::Ice::Object* upCast(::IceProxy::jderobot::HSVFilter*);
-
-::Ice::Object* upCast(::jderobot::CalibrationParams*);
-::IceProxy::Ice::Object* upCast(::IceProxy::jderobot::CalibrationParams*);
-
-::Ice::Object* upCast(::jderobot::ImageProvider*);
-::IceProxy::Ice::Object* upCast(::IceProxy::jderobot::ImageProvider*);
-
-::Ice::Object* upCast(::jderobot::ImageSelector*);
-::IceProxy::Ice::Object* upCast(::IceProxy::jderobot::ImageSelector*);
-
-::Ice::Object* upCast(::jderobot::CalibrationProvider*);
-::IceProxy::Ice::Object* upCast(::IceProxy::jderobot::CalibrationProvider*);
-
-}
-
-namespace jderobot
-{
-
-typedef ::IceInternal::Handle< ::jderobot::ImageDescription> ImageDescriptionPtr;
-typedef ::IceInternal::ProxyHandle< ::IceProxy::jderobot::ImageDescription> ImageDescriptionPrx;
-
-void __read(::IceInternal::BasicStream*, ImageDescriptionPrx&);
-void __patch__ImageDescriptionPtr(void*, ::Ice::ObjectPtr&);
-
-typedef ::IceInternal::Handle< ::jderobot::ImageData> ImageDataPtr;
-typedef ::IceInternal::ProxyHandle< ::IceProxy::jderobot::ImageData> ImageDataPrx;
-
-void __read(::IceInternal::BasicStream*, ImageDataPrx&);
-void __patch__ImageDataPtr(void*, ::Ice::ObjectPtr&);
-
-typedef ::IceInternal::Handle< ::jderobot::HSVFilter> HSVFilterPtr;
-typedef ::IceInternal::ProxyHandle< ::IceProxy::jderobot::HSVFilter> HSVFilterPrx;
-
-void __read(::IceInternal::BasicStream*, HSVFilterPrx&);
-void __patch__HSVFilterPtr(void*, ::Ice::ObjectPtr&);
-
-typedef ::IceInternal::Handle< ::jderobot::CalibrationParams> CalibrationParamsPtr;
-typedef ::IceInternal::ProxyHandle< ::IceProxy::jderobot::CalibrationParams> CalibrationParamsPrx;
-
-void __read(::IceInternal::BasicStream*, CalibrationParamsPrx&);
-void __patch__CalibrationParamsPtr(void*, ::Ice::ObjectPtr&);
-
-typedef ::IceInternal::Handle< ::jderobot::ImageProvider> ImageProviderPtr;
-typedef ::IceInternal::ProxyHandle< ::IceProxy::jderobot::ImageProvider> ImageProviderPrx;
-
-void __read(::IceInternal::BasicStream*, ImageProviderPrx&);
-void __patch__ImageProviderPtr(void*, ::Ice::ObjectPtr&);
-
-typedef ::IceInternal::Handle< ::jderobot::ImageSelector> ImageSelectorPtr;
-typedef ::IceInternal::ProxyHandle< ::IceProxy::jderobot::ImageSelector> ImageSelectorPrx;
-
-void __read(::IceInternal::BasicStream*, ImageSelectorPrx&);
-void __patch__ImageSelectorPtr(void*, ::Ice::ObjectPtr&);
-
-typedef ::IceInternal::Handle< ::jderobot::CalibrationProvider> CalibrationProviderPtr;
-typedef ::IceInternal::ProxyHandle< ::IceProxy::jderobot::CalibrationProvider> CalibrationProviderPrx;
-
-void __read(::IceInternal::BasicStream*, CalibrationProviderPrx&);
-void __patch__CalibrationProviderPtr(void*, ::Ice::ObjectPtr&);
-
-}
-
-namespace jderobot
-{
-
-enum FeaturesType
-{
- Detected,
- Filtered,
- Ball,
- BlueNet,
- YellowNet,
- Field,
- Lines,
- Regions,
- Segments,
- HSV
-};
-
-void __write(::IceInternal::BasicStream*, FeaturesType);
-void __read(::IceInternal::BasicStream*, FeaturesType&);
-
-enum ObjectsType
-{
- BallObj,
- BlueNetObj,
- YellowNetObj,
- FieldObj,
- LinesObj
-};
-
-void __write(::IceInternal::BasicStream*, ObjectsType);
-void __read(::IceInternal::BasicStream*, ObjectsType&);
-
-enum CameraType
-{
- UPPERCAMERA,
- LOWERCAMERA
-};
-
-void __write(::IceInternal::BasicStream*, CameraType);
-void __read(::IceInternal::BasicStream*, CameraType&);
-
-}
-
-namespace jderobot
-{
-
-class ImageDescription : virtual public ::Ice::Object
-{
-public:
-
- typedef ImageDescriptionPrx ProxyType;
- typedef ImageDescriptionPtr PointerType;
-
- ImageDescription() {}
- ImageDescription(::Ice::Int, ::Ice::Int, ::Ice::Int, const ::std::string&);
-
- virtual bool ice_isA(const ::std::string&, const ::Ice::Current& = ::Ice::Current()) const;
- virtual ::std::vector< ::std::string> ice_ids(const ::Ice::Current& = ::Ice::Current()) const;
- virtual const ::std::string& ice_id(const ::Ice::Current& = ::Ice::Current()) const;
- static const ::std::string& ice_staticId();
-
-
- virtual void __write(::IceInternal::BasicStream*) const;
- virtual void __read(::IceInternal::BasicStream*, bool);
-
- static const ::Ice::ObjectFactoryPtr& ice_factory();
-
-protected:
-
- virtual ~ImageDescription() {}
-
-
-public:
-
- ::Ice::Int width;
- ::Ice::Int height;
- ::Ice::Int size;
- ::std::string format;
-};
-
-class ImageData : virtual public ::Ice::Object
-{
-public:
-
- typedef ImageDataPrx ProxyType;
- typedef ImageDataPtr PointerType;
-
- ImageData() {}
- ImageData(const ::jderobot::Time&, const ::jderobot::ImageDescriptionPtr&, const ::jderobot::ByteSeq&);
-
- virtual bool ice_isA(const ::std::string&, const ::Ice::Current& = ::Ice::Current()) const;
- virtual ::std::vector< ::std::string> ice_ids(const ::Ice::Current& = ::Ice::Current()) const;
- virtual const ::std::string& ice_id(const ::Ice::Current& = ::Ice::Current()) const;
- static const ::std::string& ice_staticId();
-
-
- virtual void __write(::IceInternal::BasicStream*) const;
- virtual void __read(::IceInternal::BasicStream*, bool);
-
- static const ::Ice::ObjectFactoryPtr& ice_factory();
-
-protected:
-
- virtual ~ImageData() {}
-
-
-public:
-
- ::jderobot::Time timeStamp;
- ::jderobot::ImageDescriptionPtr description;
- ::jderobot::ByteSeq pixelData;
-};
-
-class HSVFilter : virtual public ::Ice::Object
-{
-public:
-
- typedef HSVFilterPrx ProxyType;
- typedef HSVFilterPtr PointerType;
-
- HSVFilter() {}
- HSVFilter(::Ice::Float, ::Ice::Float, ::Ice::Float, ::Ice::Float, ::Ice::Float, ::Ice::Float);
-
- virtual bool ice_isA(const ::std::string&, const ::Ice::Current& = ::Ice::Current()) const;
- virtual ::std::vector< ::std::string> ice_ids(const ::Ice::Current& = ::Ice::Current()) const;
- virtual const ::std::string& ice_id(const ::Ice::Current& = ::Ice::Current()) const;
- static const ::std::string& ice_staticId();
-
-
- virtual void __write(::IceInternal::BasicStream*) const;
- virtual void __read(::IceInternal::BasicStream*, bool);
-
- static const ::Ice::ObjectFactoryPtr& ice_factory();
-
-protected:
-
- virtual ~HSVFilter() {}
-
-
-public:
-
- ::Ice::Float hmin;
- ::Ice::Float hmax;
- ::Ice::Float smin;
- ::Ice::Float smax;
- ::Ice::Float vmin;
- ::Ice::Float vmax;
-};
-
-class CalibrationParams : virtual public ::Ice::Object
-{
-public:
-
- typedef CalibrationParamsPrx ProxyType;
- typedef CalibrationParamsPtr PointerType;
-
- CalibrationParams() {}
- CalibrationParams(::Ice::Float, ::Ice::Float, ::Ice::Float, ::Ice::Float, ::Ice::Float, ::Ice::Float, ::Ice::Float);
-
- virtual bool ice_isA(const ::std::string&, const ::Ice::Current& = ::Ice::Current()) const;
- virtual ::std::vector< ::std::string> ice_ids(const ::Ice::Current& = ::Ice::Current()) const;
- virtual const ::std::string& ice_id(const ::Ice::Current& = ::Ice::Current()) const;
- static const ::std::string& ice_staticId();
-
-
- virtual void __write(::IceInternal::BasicStream*) const;
- virtual void __read(::IceInternal::BasicStream*, bool);
-
- static const ::Ice::ObjectFactoryPtr& ice_factory();
-
-protected:
-
- virtual ~CalibrationParams() {}
-
-
-public:
-
- ::Ice::Float robotx;
- ::Ice::Float roboty;
- ::Ice::Float robott;
- ::Ice::Float u0;
- ::Ice::Float v0;
- ::Ice::Float fdistx;
- ::Ice::Float fdisty;
-};
-
-class ImageProvider : virtual public ::Ice::Object
-{
-public:
-
- typedef ImageProviderPrx ProxyType;
- typedef ImageProviderPtr PointerType;
-
-
- virtual bool ice_isA(const ::std::string&, const ::Ice::Current& = ::Ice::Current()) const;
- virtual ::std::vector< ::std::string> ice_ids(const ::Ice::Current& = ::Ice::Current()) const;
- virtual const ::std::string& ice_id(const ::Ice::Current& = ::Ice::Current()) const;
- static const ::std::string& ice_staticId();
-
- virtual ::jderobot::ImageDescriptionPtr getImageDescription(const ::Ice::Current& = ::Ice::Current()) = 0;
-#ifndef ICEE_PURE_CLIENT
- ::Ice::DispatchStatus ___getImageDescription(::IceInternal::Incoming&, const ::Ice::Current&);
-#endif // ICEE_PURE_CLIENT
-
- virtual ::jderobot::ImageDataPtr getImageData(const ::Ice::Current& = ::Ice::Current()) = 0;
-#ifndef ICEE_PURE_CLIENT
- ::Ice::DispatchStatus ___getImageData(::IceInternal::Incoming&, const ::Ice::Current&);
-#endif // ICEE_PURE_CLIENT
-
-#ifndef ICEE_PURE_CLIENT
- virtual ::Ice::DispatchStatus __dispatch(::IceInternal::Incoming&, const ::Ice::Current&);
-#endif // ICEE_PURE_CLIENT
-
- virtual void __write(::IceInternal::BasicStream*) const;
- virtual void __read(::IceInternal::BasicStream*, bool);
-};
-
-class ImageSelector : virtual public ::jderobot::ImageProvider
-{
-public:
-
- typedef ImageSelectorPrx ProxyType;
- typedef ImageSelectorPtr PointerType;
-
-
- virtual bool ice_isA(const ::std::string&, const ::Ice::Current& = ::Ice::Current()) const;
- virtual ::std::vector< ::std::string> ice_ids(const ::Ice::Current& = ::Ice::Current()) const;
- virtual const ::std::string& ice_id(const ::Ice::Current& = ::Ice::Current()) const;
- static const ::std::string& ice_staticId();
-
- virtual ::jderobot::ImageDataPtr getImageDataWithFeatures(::jderobot::FeaturesType, const ::Ice::Current& = ::Ice::Current()) = 0;
-#ifndef ICEE_PURE_CLIENT
- ::Ice::DispatchStatus ___getImageDataWithFeatures(::IceInternal::Incoming&, const ::Ice::Current&);
-#endif // ICEE_PURE_CLIENT
-
- virtual ::jderobot::HSVFilterPtr getHSVFilter(::jderobot::CameraType, ::jderobot::ObjectsType, const ::Ice::Current& = ::Ice::Current()) = 0;
-#ifndef ICEE_PURE_CLIENT
- ::Ice::DispatchStatus ___getHSVFilter(::IceInternal::Incoming&, const ::Ice::Current&);
-#endif // ICEE_PURE_CLIENT
-
- virtual void setHSVFilter(::jderobot::CameraType, ::jderobot::ObjectsType, const ::jderobot::HSVFilterPtr&, const ::Ice::Current& = ::Ice::Current()) = 0;
-#ifndef ICEE_PURE_CLIENT
- ::Ice::DispatchStatus ___setHSVFilter(::IceInternal::Incoming&, const ::Ice::Current&);
-#endif // ICEE_PURE_CLIENT
-
- virtual void setCam(::jderobot::CameraType, const ::Ice::Current& = ::Ice::Current()) = 0;
-#ifndef ICEE_PURE_CLIENT
- ::Ice::DispatchStatus ___setCam(::IceInternal::Incoming&, const ::Ice::Current&);
-#endif // ICEE_PURE_CLIENT
-
-#ifndef ICEE_PURE_CLIENT
- virtual ::Ice::DispatchStatus __dispatch(::IceInternal::Incoming&, const ::Ice::Current&);
-#endif // ICEE_PURE_CLIENT
-
- virtual void __write(::IceInternal::BasicStream*) const;
- virtual void __read(::IceInternal::BasicStream*, bool);
-};
-
-class CalibrationProvider : virtual public ::Ice::Object
-{
-public:
-
- typedef CalibrationProviderPrx ProxyType;
- typedef CalibrationProviderPtr PointerType;
-
-
- virtual bool ice_isA(const ::std::string&, const ::Ice::Current& = ::Ice::Current()) const;
- virtual ::std::vector< ::std::string> ice_ids(const ::Ice::Current& = ::Ice::Current()) const;
- virtual const ::std::string& ice_id(const ::Ice::Current& = ::Ice::Current()) const;
- static const ::std::string& ice_staticId();
-
- virtual ::jderobot::ImageDataPtr getCalibrationImg(const ::Ice::Current& = ::Ice::Current()) = 0;
-#ifndef ICEE_PURE_CLIENT
- ::Ice::DispatchStatus ___getCalibrationImg(::IceInternal::Incoming&, const ::Ice::Current&);
-#endif // ICEE_PURE_CLIENT
-
- virtual ::jderobot::CalibrationParamsPtr getCalibrationParams(const ::Ice::Current& = ::Ice::Current()) = 0;
-#ifndef ICEE_PURE_CLIENT
- ::Ice::DispatchStatus ___getCalibrationParams(::IceInternal::Incoming&, const ::Ice::Current&);
-#endif // ICEE_PURE_CLIENT
-
- virtual void setCalibrationParams(const ::jderobot::CalibrationParamsPtr&, const ::Ice::Current& = ::Ice::Current()) = 0;
-#ifndef ICEE_PURE_CLIENT
- ::Ice::DispatchStatus ___setCalibrationParams(::IceInternal::Incoming&, const ::Ice::Current&);
-#endif // ICEE_PURE_CLIENT
-
-#ifndef ICEE_PURE_CLIENT
- virtual ::Ice::DispatchStatus __dispatch(::IceInternal::Incoming&, const ::Ice::Current&);
-#endif // ICEE_PURE_CLIENT
-
- virtual void __write(::IceInternal::BasicStream*) const;
- virtual void __read(::IceInternal::BasicStream*, bool);
-};
-
-}
-
-namespace IceProxy
-{
-
-namespace jderobot
-{
-
-class ImageDescription : virtual public ::IceProxy::Ice::Object
-{
-public:
-
- ::IceInternal::ProxyHandle<ImageDescription> ice_context(const ::Ice::Context& __context) const
- {
- return dynamic_cast<ImageDescription*>(::IceProxy::Ice::Object::ice_context(__context).get());
- }
-
- ::IceInternal::ProxyHandle<ImageDescription> ice_secure(bool __secure) const
- {
- return dynamic_cast<ImageDescription*>(::IceProxy::Ice::Object::ice_secure(__secure).get());
- }
-
-#ifdef ICEE_HAS_ROUTER
- ::IceInternal::ProxyHandle<ImageDescription> ice_router(const ::Ice::RouterPrx& __router) const
- {
- return dynamic_cast<ImageDescription*>(::IceProxy::Ice::Object::ice_router(__router).get());
- }
-#endif // ICEE_HAS_ROUTER
-
-#ifdef ICEE_HAS_LOCATOR
- ::IceInternal::ProxyHandle<ImageDescription> ice_locator(const ::Ice::LocatorPrx& __locator) const
- {
- return dynamic_cast<ImageDescription*>(::IceProxy::Ice::Object::ice_locator(__locator).get());
- }
-
- ::IceInternal::ProxyHandle<ImageDescription> ice_adapterId(const std::string& __id) const
- {
- return dynamic_cast<ImageDescription*>(::IceProxy::Ice::Object::ice_adapterId(__id).get());
- }
-#endif // ICEE_HAS_LOCATOR
-
- ::IceInternal::ProxyHandle<ImageDescription> ice_twoway() const
- {
- return dynamic_cast<ImageDescription*>(::IceProxy::Ice::Object::ice_twoway().get());
- }
-
- ::IceInternal::ProxyHandle<ImageDescription> ice_oneway() const
- {
- return dynamic_cast<ImageDescription*>(::IceProxy::Ice::Object::ice_oneway().get());
- }
-
- ::IceInternal::ProxyHandle<ImageDescription> ice_batchOneway() const
- {
- return dynamic_cast<ImageDescription*>(::IceProxy::Ice::Object::ice_batchOneway().get());
- }
-
- ::IceInternal::ProxyHandle<ImageDescription> ice_datagram() const
- {
- return dynamic_cast<ImageDescription*>(::IceProxy::Ice::Object::ice_datagram().get());
- }
-
- ::IceInternal::ProxyHandle<ImageDescription> ice_batchDatagram() const
- {
- return dynamic_cast<ImageDescription*>(::IceProxy::Ice::Object::ice_batchDatagram().get());
- }
-
- ::IceInternal::ProxyHandle<ImageDescription> ice_timeout(int __timeout) const
- {
- return dynamic_cast<ImageDescription*>(::IceProxy::Ice::Object::ice_timeout(__timeout).get());
- }
-
- static const ::std::string& ice_staticId();
-
-private:
-
- virtual ::IceProxy::Ice::Object* __newInstance() const;
-};
-
-class ImageData : virtual public ::IceProxy::Ice::Object
-{
-public:
-
- ::IceInternal::ProxyHandle<ImageData> ice_context(const ::Ice::Context& __context) const
- {
- return dynamic_cast<ImageData*>(::IceProxy::Ice::Object::ice_context(__context).get());
- }
-
- ::IceInternal::ProxyHandle<ImageData> ice_secure(bool __secure) const
- {
- return dynamic_cast<ImageData*>(::IceProxy::Ice::Object::ice_secure(__secure).get());
- }
-
-#ifdef ICEE_HAS_ROUTER
- ::IceInternal::ProxyHandle<ImageData> ice_router(const ::Ice::RouterPrx& __router) const
- {
- return dynamic_cast<ImageData*>(::IceProxy::Ice::Object::ice_router(__router).get());
- }
-#endif // ICEE_HAS_ROUTER
-
-#ifdef ICEE_HAS_LOCATOR
- ::IceInternal::ProxyHandle<ImageData> ice_locator(const ::Ice::LocatorPrx& __locator) const
- {
- return dynamic_cast<ImageData*>(::IceProxy::Ice::Object::ice_locator(__locator).get());
- }
-
- ::IceInternal::ProxyHandle<ImageData> ice_adapterId(const std::string& __id) const
- {
- return dynamic_cast<ImageData*>(::IceProxy::Ice::Object::ice_adapterId(__id).get());
- }
-#endif // ICEE_HAS_LOCATOR
-
- ::IceInternal::ProxyHandle<ImageData> ice_twoway() const
- {
- return dynamic_cast<ImageData*>(::IceProxy::Ice::Object::ice_twoway().get());
- }
-
- ::IceInternal::ProxyHandle<ImageData> ice_oneway() const
- {
- return dynamic_cast<ImageData*>(::IceProxy::Ice::Object::ice_oneway().get());
- }
-
- ::IceInternal::ProxyHandle<ImageData> ice_batchOneway() const
- {
- return dynamic_cast<ImageData*>(::IceProxy::Ice::Object::ice_batchOneway().get());
- }
-
- ::IceInternal::ProxyHandle<ImageData> ice_datagram() const
- {
- return dynamic_cast<ImageData*>(::IceProxy::Ice::Object::ice_datagram().get());
- }
-
- ::IceInternal::ProxyHandle<ImageData> ice_batchDatagram() const
- {
- return dynamic_cast<ImageData*>(::IceProxy::Ice::Object::ice_batchDatagram().get());
- }
-
- ::IceInternal::ProxyHandle<ImageData> ice_timeout(int __timeout) const
- {
- return dynamic_cast<ImageData*>(::IceProxy::Ice::Object::ice_timeout(__timeout).get());
- }
-
- static const ::std::string& ice_staticId();
-
-private:
-
- virtual ::IceProxy::Ice::Object* __newInstance() const;
-};
-
-class HSVFilter : virtual public ::IceProxy::Ice::Object
-{
-public:
-
- ::IceInternal::ProxyHandle<HSVFilter> ice_context(const ::Ice::Context& __context) const
- {
- return dynamic_cast<HSVFilter*>(::IceProxy::Ice::Object::ice_context(__context).get());
- }
-
- ::IceInternal::ProxyHandle<HSVFilter> ice_secure(bool __secure) const
- {
- return dynamic_cast<HSVFilter*>(::IceProxy::Ice::Object::ice_secure(__secure).get());
- }
-
-#ifdef ICEE_HAS_ROUTER
- ::IceInternal::ProxyHandle<HSVFilter> ice_router(const ::Ice::RouterPrx& __router) const
- {
- return dynamic_cast<HSVFilter*>(::IceProxy::Ice::Object::ice_router(__router).get());
- }
-#endif // ICEE_HAS_ROUTER
-
-#ifdef ICEE_HAS_LOCATOR
- ::IceInternal::ProxyHandle<HSVFilter> ice_locator(const ::Ice::LocatorPrx& __locator) const
- {
- return dynamic_cast<HSVFilter*>(::IceProxy::Ice::Object::ice_locator(__locator).get());
- }
-
- ::IceInternal::ProxyHandle<HSVFilter> ice_adapterId(const std::string& __id) const
- {
- return dynamic_cast<HSVFilter*>(::IceProxy::Ice::Object::ice_adapterId(__id).get());
- }
-#endif // ICEE_HAS_LOCATOR
-
- ::IceInternal::ProxyHandle<HSVFilter> ice_twoway() const
- {
- return dynamic_cast<HSVFilter*>(::IceProxy::Ice::Object::ice_twoway().get());
- }
-
- ::IceInternal::ProxyHandle<HSVFilter> ice_oneway() const
- {
- return dynamic_cast<HSVFilter*>(::IceProxy::Ice::Object::ice_oneway().get());
- }
-
- ::IceInternal::ProxyHandle<HSVFilter> ice_batchOneway() const
- {
- return dynamic_cast<HSVFilter*>(::IceProxy::Ice::Object::ice_batchOneway().get());
- }
-
- ::IceInternal::ProxyHandle<HSVFilter> ice_datagram() const
- {
- return dynamic_cast<HSVFilter*>(::IceProxy::Ice::Object::ice_datagram().get());
- }
-
- ::IceInternal::ProxyHandle<HSVFilter> ice_batchDatagram() const
- {
- return dynamic_cast<HSVFilter*>(::IceProxy::Ice::Object::ice_batchDatagram().get());
- }
-
- ::IceInternal::ProxyHandle<HSVFilter> ice_timeout(int __timeout) const
- {
- return dynamic_cast<HSVFilter*>(::IceProxy::Ice::Object::ice_timeout(__timeout).get());
- }
-
- static const ::std::string& ice_staticId();
-
-private:
-
- virtual ::IceProxy::Ice::Object* __newInstance() const;
-};
-
-class CalibrationParams : virtual public ::IceProxy::Ice::Object
-{
-public:
-
- ::IceInternal::ProxyHandle<CalibrationParams> ice_context(const ::Ice::Context& __context) const
- {
- return dynamic_cast<CalibrationParams*>(::IceProxy::Ice::Object::ice_context(__context).get());
- }
-
- ::IceInternal::ProxyHandle<CalibrationParams> ice_secure(bool __secure) const
- {
- return dynamic_cast<CalibrationParams*>(::IceProxy::Ice::Object::ice_secure(__secure).get());
- }
-
-#ifdef ICEE_HAS_ROUTER
- ::IceInternal::ProxyHandle<CalibrationParams> ice_router(const ::Ice::RouterPrx& __router) const
- {
- return dynamic_cast<CalibrationParams*>(::IceProxy::Ice::Object::ice_router(__router).get());
- }
-#endif // ICEE_HAS_ROUTER
-
-#ifdef ICEE_HAS_LOCATOR
- ::IceInternal::ProxyHandle<CalibrationParams> ice_locator(const ::Ice::LocatorPrx& __locator) const
- {
- return dynamic_cast<CalibrationParams*>(::IceProxy::Ice::Object::ice_locator(__locator).get());
- }
-
- ::IceInternal::ProxyHandle<CalibrationParams> ice_adapterId(const std::string& __id) const
- {
- return dynamic_cast<CalibrationParams*>(::IceProxy::Ice::Object::ice_adapterId(__id).get());
- }
-#endif // ICEE_HAS_LOCATOR
-
- ::IceInternal::ProxyHandle<CalibrationParams> ice_twoway() const
- {
- return dynamic_cast<CalibrationParams*>(::IceProxy::Ice::Object::ice_twoway().get());
- }
-
- ::IceInternal::ProxyHandle<CalibrationParams> ice_oneway() const
- {
- return dynamic_cast<CalibrationParams*>(::IceProxy::Ice::Object::ice_oneway().get());
- }
-
- ::IceInternal::ProxyHandle<CalibrationParams> ice_batchOneway() const
- {
- return dynamic_cast<CalibrationParams*>(::IceProxy::Ice::Object::ice_batchOneway().get());
- }
-
- ::IceInternal::ProxyHandle<CalibrationParams> ice_datagram() const
- {
- return dynamic_cast<CalibrationParams*>(::IceProxy::Ice::Object::ice_datagram().get());
- }
-
- ::IceInternal::ProxyHandle<CalibrationParams> ice_batchDatagram() const
- {
- return dynamic_cast<CalibrationParams*>(::IceProxy::Ice::Object::ice_batchDatagram().get());
- }
-
- ::IceInternal::ProxyHandle<CalibrationParams> ice_timeout(int __timeout) const
- {
- return dynamic_cast<CalibrationParams*>(::IceProxy::Ice::Object::ice_timeout(__timeout).get());
- }
-
- static const ::std::string& ice_staticId();
-
-private:
-
- virtual ::IceProxy::Ice::Object* __newInstance() const;
-};
-
-class ImageProvider : virtual public ::IceProxy::Ice::Object
-{
-public:
-
- ::jderobot::ImageDescriptionPtr getImageDescription()
- {
- return getImageDescription(0);
- }
- ::jderobot::ImageDescriptionPtr getImageDescription(const ::Ice::Context& __ctx)
- {
- return getImageDescription(&__ctx);
- }
-
-private:
-
- ::jderobot::ImageDescriptionPtr getImageDescription(const ::Ice::Context*);
-
-public:
-
- ::jderobot::ImageDataPtr getImageData()
- {
- return getImageData(0);
- }
- ::jderobot::ImageDataPtr getImageData(const ::Ice::Context& __ctx)
- {
- return getImageData(&__ctx);
- }
-
-private:
-
- ::jderobot::ImageDataPtr getImageData(const ::Ice::Context*);
-
-public:
-
- ::IceInternal::ProxyHandle<ImageProvider> ice_context(const ::Ice::Context& __context) const
- {
- return dynamic_cast<ImageProvider*>(::IceProxy::Ice::Object::ice_context(__context).get());
- }
-
- ::IceInternal::ProxyHandle<ImageProvider> ice_secure(bool __secure) const
- {
- return dynamic_cast<ImageProvider*>(::IceProxy::Ice::Object::ice_secure(__secure).get());
- }
-
-#ifdef ICEE_HAS_ROUTER
- ::IceInternal::ProxyHandle<ImageProvider> ice_router(const ::Ice::RouterPrx& __router) const
- {
- return dynamic_cast<ImageProvider*>(::IceProxy::Ice::Object::ice_router(__router).get());
- }
-#endif // ICEE_HAS_ROUTER
-
-#ifdef ICEE_HAS_LOCATOR
- ::IceInternal::ProxyHandle<ImageProvider> ice_locator(const ::Ice::LocatorPrx& __locator) const
- {
- return dynamic_cast<ImageProvider*>(::IceProxy::Ice::Object::ice_locator(__locator).get());
- }
-
- ::IceInternal::ProxyHandle<ImageProvider> ice_adapterId(const std::string& __id) const
- {
- return dynamic_cast<ImageProvider*>(::IceProxy::Ice::Object::ice_adapterId(__id).get());
- }
-#endif // ICEE_HAS_LOCATOR
-
- ::IceInternal::ProxyHandle<ImageProvider> ice_twoway() const
- {
- return dynamic_cast<ImageProvider*>(::IceProxy::Ice::Object::ice_twoway().get());
- }
-
- ::IceInternal::ProxyHandle<ImageProvider> ice_oneway() const
- {
- return dynamic_cast<ImageProvider*>(::IceProxy::Ice::Object::ice_oneway().get());
- }
-
- ::IceInternal::ProxyHandle<ImageProvider> ice_batchOneway() const
- {
- return dynamic_cast<ImageProvider*>(::IceProxy::Ice::Object::ice_batchOneway().get());
- }
-
- ::IceInternal::ProxyHandle<ImageProvider> ice_datagram() const
- {
- return dynamic_cast<ImageProvider*>(::IceProxy::Ice::Object::ice_datagram().get());
- }
-
- ::IceInternal::ProxyHandle<ImageProvider> ice_batchDatagram() const
- {
- return dynamic_cast<ImageProvider*>(::IceProxy::Ice::Object::ice_batchDatagram().get());
- }
-
- ::IceInternal::ProxyHandle<ImageProvider> ice_timeout(int __timeout) const
- {
- return dynamic_cast<ImageProvider*>(::IceProxy::Ice::Object::ice_timeout(__timeout).get());
- }
-
- static const ::std::string& ice_staticId();
-
-private:
-
- virtual ::IceProxy::Ice::Object* __newInstance() const;
-};
-
-class ImageSelector : virtual public ::IceProxy::jderobot::ImageProvider
-{
-public:
-
- ::jderobot::ImageDataPtr getImageDataWithFeatures(::jderobot::FeaturesType type)
- {
- return getImageDataWithFeatures(type, 0);
- }
- ::jderobot::ImageDataPtr getImageDataWithFeatures(::jderobot::FeaturesType type, const ::Ice::Context& __ctx)
- {
- return getImageDataWithFeatures(type, &__ctx);
- }
-
-private:
-
- ::jderobot::ImageDataPtr getImageDataWithFeatures(::jderobot::FeaturesType, const ::Ice::Context*);
-
-public:
-
- ::jderobot::HSVFilterPtr getHSVFilter(::jderobot::CameraType cam, ::jderobot::ObjectsType obj)
- {
- return getHSVFilter(cam, obj, 0);
- }
- ::jderobot::HSVFilterPtr getHSVFilter(::jderobot::CameraType cam, ::jderobot::ObjectsType obj, const ::Ice::Context& __ctx)
- {
- return getHSVFilter(cam, obj, &__ctx);
- }
-
-private:
-
- ::jderobot::HSVFilterPtr getHSVFilter(::jderobot::CameraType, ::jderobot::ObjectsType, const ::Ice::Context*);
-
-public:
-
- void setHSVFilter(::jderobot::CameraType cam, ::jderobot::ObjectsType obj, const ::jderobot::HSVFilterPtr& newFilter)
- {
- setHSVFilter(cam, obj, newFilter, 0);
- }
- void setHSVFilter(::jderobot::CameraType cam, ::jderobot::ObjectsType obj, const ::jderobot::HSVFilterPtr& newFilter, const ::Ice::Context& __ctx)
- {
- setHSVFilter(cam, obj, newFilter, &__ctx);
- }
-
-private:
-
- void setHSVFilter(::jderobot::CameraType, ::jderobot::ObjectsType, const ::jderobot::HSVFilterPtr&, const ::Ice::Context*);
-
-public:
-
- void setCam(::jderobot::CameraType cam)
- {
- setCam(cam, 0);
- }
- void setCam(::jderobot::CameraType cam, const ::Ice::Context& __ctx)
- {
- setCam(cam, &__ctx);
- }
-
-private:
-
- void setCam(::jderobot::CameraType, const ::Ice::Context*);
-
-public:
-
- ::IceInternal::ProxyHandle<ImageSelector> ice_context(const ::Ice::Context& __context) const
- {
- return dynamic_cast<ImageSelector*>(::IceProxy::Ice::Object::ice_context(__context).get());
- }
-
- ::IceInternal::ProxyHandle<ImageSelector> ice_secure(bool __secure) const
- {
- return dynamic_cast<ImageSelector*>(::IceProxy::Ice::Object::ice_secure(__secure).get());
- }
-
-#ifdef ICEE_HAS_ROUTER
- ::IceInternal::ProxyHandle<ImageSelector> ice_router(const ::Ice::RouterPrx& __router) const
- {
- return dynamic_cast<ImageSelector*>(::IceProxy::Ice::Object::ice_router(__router).get());
- }
-#endif // ICEE_HAS_ROUTER
-
-#ifdef ICEE_HAS_LOCATOR
- ::IceInternal::ProxyHandle<ImageSelector> ice_locator(const ::Ice::LocatorPrx& __locator) const
- {
- return dynamic_cast<ImageSelector*>(::IceProxy::Ice::Object::ice_locator(__locator).get());
- }
-
- ::IceInternal::ProxyHandle<ImageSelector> ice_adapterId(const std::string& __id) const
- {
- return dynamic_cast<ImageSelector*>(::IceProxy::Ice::Object::ice_adapterId(__id).get());
- }
-#endif // ICEE_HAS_LOCATOR
-
- ::IceInternal::ProxyHandle<ImageSelector> ice_twoway() const
- {
- return dynamic_cast<ImageSelector*>(::IceProxy::Ice::Object::ice_twoway().get());
- }
-
- ::IceInternal::ProxyHandle<ImageSelector> ice_oneway() const
- {
- return dynamic_cast<ImageSelector*>(::IceProxy::Ice::Object::ice_oneway().get());
- }
-
- ::IceInternal::ProxyHandle<ImageSelector> ice_batchOneway() const
- {
- return dynamic_cast<ImageSelector*>(::IceProxy::Ice::Object::ice_batchOneway().get());
- }
-
- ::IceInternal::ProxyHandle<ImageSelector> ice_datagram() const
- {
- return dynamic_cast<ImageSelector*>(::IceProxy::Ice::Object::ice_datagram().get());
- }
-
- ::IceInternal::ProxyHandle<ImageSelector> ice_batchDatagram() const
- {
- return dynamic_cast<ImageSelector*>(::IceProxy::Ice::Object::ice_batchDatagram().get());
- }
-
- ::IceInternal::ProxyHandle<ImageSelector> ice_timeout(int __timeout) const
- {
- return dynamic_cast<ImageSelector*>(::IceProxy::Ice::Object::ice_timeout(__timeout).get());
- }
-
- static const ::std::string& ice_staticId();
-
-private:
-
- virtual ::IceProxy::Ice::Object* __newInstance() const;
-};
-
-class CalibrationProvider : virtual public ::IceProxy::Ice::Object
-{
-public:
-
- ::jderobot::ImageDataPtr getCalibrationImg()
- {
- return getCalibrationImg(0);
- }
- ::jderobot::ImageDataPtr getCalibrationImg(const ::Ice::Context& __ctx)
- {
- return getCalibrationImg(&__ctx);
- }
-
-private:
-
- ::jderobot::ImageDataPtr getCalibrationImg(const ::Ice::Context*);
-
-public:
-
- ::jderobot::CalibrationParamsPtr getCalibrationParams()
- {
- return getCalibrationParams(0);
- }
- ::jderobot::CalibrationParamsPtr getCalibrationParams(const ::Ice::Context& __ctx)
- {
- return getCalibrationParams(&__ctx);
- }
-
-private:
-
- ::jderobot::CalibrationParamsPtr getCalibrationParams(const ::Ice::Context*);
-
-public:
-
- void setCalibrationParams(const ::jderobot::CalibrationParamsPtr& newParams)
- {
- setCalibrationParams(newParams, 0);
- }
- void setCalibrationParams(const ::jderobot::CalibrationParamsPtr& newParams, const ::Ice::Context& __ctx)
- {
- setCalibrationParams(newParams, &__ctx);
- }
-
-private:
-
- void setCalibrationParams(const ::jderobot::CalibrationParamsPtr&, const ::Ice::Context*);
-
-public:
-
- ::IceInternal::ProxyHandle<CalibrationProvider> ice_context(const ::Ice::Context& __context) const
- {
- return dynamic_cast<CalibrationProvider*>(::IceProxy::Ice::Object::ice_context(__context).get());
- }
-
- ::IceInternal::ProxyHandle<CalibrationProvider> ice_secure(bool __secure) const
- {
- return dynamic_cast<CalibrationProvider*>(::IceProxy::Ice::Object::ice_secure(__secure).get());
- }
-
-#ifdef ICEE_HAS_ROUTER
- ::IceInternal::ProxyHandle<CalibrationProvider> ice_router(const ::Ice::RouterPrx& __router) const
- {
- return dynamic_cast<CalibrationProvider*>(::IceProxy::Ice::Object::ice_router(__router).get());
- }
-#endif // ICEE_HAS_ROUTER
-
-#ifdef ICEE_HAS_LOCATOR
- ::IceInternal::ProxyHandle<CalibrationProvider> ice_locator(const ::Ice::LocatorPrx& __locator) const
- {
- return dynamic_cast<CalibrationProvider*>(::IceProxy::Ice::Object::ice_locator(__locator).get());
- }
-
- ::IceInternal::ProxyHandle<CalibrationProvider> ice_adapterId(const std::string& __id) const
- {
- return dynamic_cast<CalibrationProvider*>(::IceProxy::Ice::Object::ice_adapterId(__id).get());
- }
-#endif // ICEE_HAS_LOCATOR
-
- ::IceInternal::ProxyHandle<CalibrationProvider> ice_twoway() const
- {
- return dynamic_cast<CalibrationProvider*>(::IceProxy::Ice::Object::ice_twoway().get());
- }
-
- ::IceInternal::ProxyHandle<CalibrationProvider> ice_oneway() const
- {
- return dynamic_cast<CalibrationProvider*>(::IceProxy::Ice::Object::ice_oneway().get());
- }
-
- ::IceInternal::ProxyHandle<CalibrationProvider> ice_batchOneway() const
- {
- return dynamic_cast<CalibrationProvider*>(::IceProxy::Ice::Object::ice_batchOneway().get());
- }
-
- ::IceInternal::ProxyHandle<CalibrationProvider> ice_datagram() const
- {
- return dynamic_cast<CalibrationProvider*>(::IceProxy::Ice::Object::ice_datagram().get());
- }
-
- ::IceInternal::ProxyHandle<CalibrationProvider> ice_batchDatagram() const
- {
- return dynamic_cast<CalibrationProvider*>(::IceProxy::Ice::Object::ice_batchDatagram().get());
- }
-
- ::IceInternal::ProxyHandle<CalibrationProvider> ice_timeout(int __timeout) const
- {
- return dynamic_cast<CalibrationProvider*>(::IceProxy::Ice::Object::ice_timeout(__timeout).get());
- }
-
- static const ::std::string& ice_staticId();
-
-private:
-
- virtual ::IceProxy::Ice::Object* __newInstance() const;
-};
-
-}
-
-}
-
-#endif
Deleted: trunk/src/stable/components/naoserver/interfaces/cpp/jderobot/motors.cpp
===================================================================
--- trunk/src/stable/components/naoserver/interfaces/cpp/jderobot/motors.cpp 2014-01-25 18:44:50 UTC (rev 1146)
+++ trunk/src/stable/components/naoserver/interfaces/cpp/jderobot/motors.cpp 2014-01-25 20:27:32 UTC (rev 1147)
@@ -1,640 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice-E is licensed to you under the terms described in the
-// ICEE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-// Ice-E version 1.3.0
-// Generated from file `motors.ice'
-
-#include <motors.h>
-#include <IceE/LocalException.h>
-#include <IceE/ObjectFactory.h>
-#include <IceE/BasicStream.h>
-#include <IceE/LocalException.h>
-#include <IceE/Iterator.h>
-
-#ifndef ICEE_IGNORE_VERSION
-# if ICEE_INT_VERSION / 100 != 103
-# error IceE version mismatch!
-# endif
-# if ICEE_INT_VERSION % 100 < 0
-# error IceE patch level mismatch!
-# endif
-#endif
-
-static const ::std::string __jderobot__Motors__getV_name = "getV";
-
-static const ::std::string __jderobot__Motors__setV_name = "setV";
-
-static const ::std::string __jderobot__Motors__getW_name = "getW";
-
-static const ::std::string __jderobot__Motors__setW_name = "setW";
-
-static const ::std::string __jderobot__Motors__getL_name = "getL";
-
-static const ::std::string __jderobot__Motors__setL_name = "setL";
-
-::Ice::Object* IceInternal::upCast(::jderobot::Motors* p) { return p; }
-::IceProxy::Ice::Object* IceInternal::upCast(::IceProxy::jderobot::Motors* p) { return p; }
-
-void
-jderobot::__read(::IceInternal::BasicStream* __is, ::jderobot::MotorsPrx& v)
-{
- ::Ice::ObjectPrx proxy;
- __is->read(proxy);
- if(!proxy)
- {
- v = 0;
- }
- else
- {
- v = new ::IceProxy::jderobot::Motors;
- v->__copyFrom(proxy);
- }
-}
-
-static const ::std::string __jderobot__Motors_ids[2] =
-{
- "::Ice::Object",
- "::jderobot::Motors"
-};
-
-bool
-jderobot::Motors::ice_isA(const ::std::string& _s, const ::Ice::Current&) const
-{
- return ::std::binary_search(__jderobot__Motors_ids, __jderobot__Motors_ids + 2, _s);
-}
-
-::std::vector< ::std::string>
-jderobot::Motors::ice_ids(const ::Ice::Current&) const
-{
- return ::std::vector< ::std::string>(&__jderobot__Motors_ids[0], &__jderobot__Motors_ids[2]);
-}
-
-const ::std::string&
-jderobot::Motors::ice_id(const ::Ice::Current&) const
-{
- return __jderobot__Motors_ids[1];
-}
-
-const ::std::string&
-jderobot::Motors::ice_staticId()
-{
- return __jderobot__Motors_ids[1];
-}
-
-#ifndef ICEE_PURE_CLIENT
-::Ice::DispatchStatus
-jderobot::Motors::___getV(::IceInternal::Incoming& __inS, const ::Ice::Current& __current)
-{
- __checkMode(::Ice::Normal, __current.mode);
- ::IceInternal::BasicStream* __os = __inS.os();
- ::Ice::Float __ret = getV(__current);
- __os->write(__ret);
- return ::Ice::DispatchOK;
-}
-#endif // ICEE_PURE_CLIENT
-
-#ifndef ICEE_PURE_CLIENT
-::Ice::DispatchStatus
-jderobot::Motors::___setV(::IceInternal::Incoming& __inS, const ::Ice::Current& __current)
-{
- __checkMode(::Ice::Normal, __current.mode);
- ::IceInternal::BasicStream* __is = __inS.is();
- ::Ice::Float v;
- __is->read(v);
- ::IceInternal::BasicStream* __os = __inS.os();
- ::Ice::Int __ret = setV(v, __current);
- __os->write(__ret);
- return ::Ice::DispatchOK;
-}
-#endif // ICEE_PURE_CLIENT
-
-#ifndef ICEE_PURE_CLIENT
-::Ice::DispatchStatus
-jderobot::Motors::___getW(::IceInternal::Incoming& __inS, const ::Ice::Current& __current)
-{
- __checkMode(::Ice::Normal, __current.mode);
- ::IceInternal::BasicStream* __os = __inS.os();
- ::Ice::Float __ret = getW(__current);
- __os->write(__ret);
- return ::Ice::DispatchOK;
-}
-#endif // ICEE_PURE_CLIENT
-
-#ifndef ICEE_PURE_CLIENT
-::Ice::DispatchStatus
-jderobot::Motors::___setW(::IceInternal::Incoming& __inS, const ::Ice::Current& __current)
-{
- __checkMode(::Ice::Normal, __current.mode);
- ::IceInternal::BasicStream* __is = __inS.is();
- ::Ice::Float w;
- __is->read(w);
- ::IceInternal::BasicStream* __os = __inS.os();
- ::Ice::Int __ret = setW(w, __current);
- __os->write(__ret);
- return ::Ice::DispatchOK;
-}
-#endif // ICEE_PURE_CLIENT
-
-#ifndef ICEE_PURE_CLIENT
-::Ice::DispatchStatus
-jderobot::Motors::___getL(::IceInternal::Incoming& __inS, const ::Ice::Current& __current)
-{
- __checkMode(::Ice::Normal, __current.mode);
- ::IceInternal::BasicStream* __os = __inS.os();
- ::Ice::Float __ret = getL(__current);
- __os->write(__ret);
- return ::Ice::DispatchOK;
-}
-#endif // ICEE_PURE_CLIENT
-
-#ifndef ICEE_PURE_CLIENT
-::Ice::DispatchStatus
-jderobot::Motors::___setL(::IceInternal::Incoming& __inS, const ::Ice::Current& __current)
-{
- __checkMode(::Ice::Normal, __current.mode);
- ::IceInternal::BasicStream* __is = __inS.is();
- ::Ice::Float l;
- __is->read(l);
- ::IceInternal::BasicStream* __os = __inS.os();
- ::Ice::Int __ret = setL(l, __current);
- __os->write(__ret);
- return ::Ice::DispatchOK;
-}
-#endif // ICEE_PURE_CLIENT
-
-#ifndef ICEE_PURE_CLIENT
-static ::std::string __jderobot__Motors_all[] =
-{
- "getL",
- "getV",
- "getW",
- "ice_id",
- "ice_ids",
- "ice_isA",
- "ice_ping",
- "setL",
- "setV",
- "setW"
-};
-
-::Ice::DispatchStatus
-jderobot::Motors::__dispatch(::IceInternal::Incoming& in, const ::Ice::Current& current)
-{
- ::std::pair< ::std::string*, ::std::string*> r = ::std::equal_range(__jderobot__Motors_all, __jderobot__Motors_all + 10, current.operation);
- if(r.first == r.second)
- {
- throw Ice::OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
- }
-
- switch(r.first - __jderobot__Motors_all)
- {
- case 0:
- {
- return ___getL(in, current);
- }
- case 1:
- {
- return ___getV(in, current);
- }
- case 2:
- {
- return ___getW(in, current);
- }
- case 3:
- {
- return ___ice_id(in, current);
- }
- case 4:
- {
- return ___ice_ids(in, current);
- }
- case 5:
- {
- return ___ice_isA(in, current);
- }
- case 6:
- {
- return ___ice_ping(in, current);
- }
- case 7:
- {
- return ___setL(in, current);
- }
- case 8:
- {
- return ___setV(in, current);
- }
- case 9:
- {
- return ___setW(in, current);
- }
- }
-
- assert(false);
- throw Ice::OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
-}
-#endif // ICEE_PURE_CLIENT
-
-void
-jderobot::Motors::__write(::IceInternal::BasicStream* __os) const
-{
- __os->writeTypeId(ice_staticId());
- __os->startWriteSlice();
- __os->endWriteSlice();
- ::Ice::Object::__write(__os);
-}
-
-void
-jderobot::Motors::__read(::IceInternal::BasicStream* __is, bool __rid)
-{
- if(__rid)
- {
- ::std::string myId;
- __is->readTypeId(myId);
- }
- __is->startReadSlice();
- __is->endReadSlice();
- ::Ice::Object::__read(__is, true);
-}
-
-
-bool
-jderobot::operator==(const ::jderobot::Motors& l, const ::jderobot::Motors& r)
-{
- return static_cast<const ::Ice::Object&>(l) == static_cast<const ::Ice::Object&>(r);
-}
-
-bool
-jderobot::operator<(const ::jderobot::Motors& l, const ::jderobot::Motors& r)
-{
- return static_cast<const ::Ice::Object&>(l) < static_cast<const ::Ice::Object&>(r);
-}
-
-void
-jderobot::__patch__MotorsPtr(void* __addr, ::Ice::ObjectPtr& v)
-{
- ::jderobot::MotorsPtr* p = static_cast< ::jderobot::MotorsPtr*>(__addr);
- assert(p);
- *p = ::jderobot::MotorsPtr::dynamicCast(v);
- if(v && !*p)
- {
- IceInternal::Ex::throwUOE(::jderobot::Motors::ice_staticId(), v->ice_id());
- }
-}
-
-::Ice::Float
-IceProxy::jderobot::Motors::getV(const ::Ice::Context* __ctx)
-{
- int __cnt = 0;
- while(true)
- {
- ::IceInternal::RequestHandlerPtr __handler;
- try
- {
- __checkTwowayOnly(__jderobot__Motors__getV_name);
- __handler = __getRequestHandler();
- ::IceInternal::Outgoing __outS(__handler.get(), _reference.get(), __jderobot__Motors__getV_name, ::Ice::Normal, __ctx);
- bool __ok = __outS.invoke();
- try
- {
- if(!__ok)
- {
- __outS.is()->throwUnknownUserException();
- }
- ::Ice::Float __ret;
- ::IceInternal::BasicStream* __is = __outS.is();
- __is->read(__ret);
- return __ret;
- }
- catch(const ::Ice::LocalException& __ex)
- {
- throw ::IceInternal::LocalExceptionWrapper(__ex, false);
- }
-#if defined(_MSC_VER) && defined(_M_ARM) // ARM bug.
- catch(...)
- {
- throw;
- }
-#endif
- }
- catch(const ::IceInternal::LocalExceptionWrapper& __ex)
- {
- __handleExceptionWrapper(__handler, __ex);
- }
- catch(const ::Ice::LocalException& __ex)
- {
- __handleException(__handler, __ex, __cnt);
- }
-#if defined(_MSC_VER) && defined(_M_ARM) // ARM bug.
- catch(...)
- {
- throw;
- }
-#endif
- }
-}
-
-::Ice::Int
-IceProxy::jderobot::Motors::setV(::Ice::Float v, const ::Ice::Context* __ctx)
-{
- int __cnt = 0;
- while(true)
- {
- ::IceInternal::RequestHandlerPtr __handler;
- try
- {
- __checkTwowayOnly(__jderobot__Motors__setV_name);
- __handler = __getRequestHandler();
- ::IceInternal::Outgoing __outS(__handler.get(), _reference.get(), __jderobot__Motors__setV_name, ::Ice::Normal, __ctx);
- try
- {
- ::IceInternal::BasicStream* __os = __outS.os();
- __os->write(v);
- }
- catch(const ::Ice::LocalException& __ex)
- {
- __outS.abort(__ex);
- }
- bool __ok = __outS.invoke();
- try
- {
- if(!__ok)
- {
- __outS.is()->throwUnknownUserException();
- }
- ::Ice::Int __ret;
- ::IceInternal::BasicStream* __is = __outS.is();
- __is->read(__ret);
- return __ret;
- }
- catch(const ::Ice::LocalException& __ex)
- {
- throw ::IceInternal::LocalExceptionWrapper(__ex, false);
- }
-#if defined(_MSC_VER) && defined(_M_ARM) // ARM bug.
- catch(...)
- {
- throw;
- }
-#endif
- }
- catch(const ::IceInternal::LocalExceptionWrapper& __ex)
- {
- __handleExceptionWrapper(__handler, __ex);
- }
- catch(const ::Ice::LocalException& __ex)
- {
- __handleException(__handler, __ex, __cnt);
- }
-#if defined(_MSC_VER) && defined(_M_ARM) // ARM bug.
- catch(...)
- {
- throw;
- }
-#endif
- }
-}
-
-::Ice::Float
-IceProxy::jderobot::Motors::getW(const ::Ice::Context* __ctx)
-{
- int __cnt = 0;
- while(true)
- {
- ::IceInternal::RequestHandlerPtr __handler;
- try
- {
- __checkTwowayOnly(__jderobot__Motors__getW_name);
- __handler = __getRequestHandler();
- ::IceInternal::Outgoing __outS(__handler.get(), _reference.get(), __jderobot__Motors__getW_name, ::Ice::Normal, __ctx);
- bool __ok = __outS.invoke();
- try
- {
- if(!__ok)
- {
- __outS.is()->throwUnknownUserException();
- }
- ::Ice::Float __ret;
- ::IceInternal::BasicStream* __is = __outS.is();
- __is->read(__ret);
- return __ret;
- }
- catch(const ::Ice::LocalException& __ex)
- {
- throw ::IceInternal::LocalExceptionWrapper(__ex, false);
- }
-#if defined(_MSC_VER) && defined(_M_ARM) // ARM bug.
- catch(...)
- {
- throw;
- }
-#endif
- }
- catch(const ::IceInternal::LocalExceptionWrapper& __ex)
- {
- __handleExceptionWrapper(__handler, __ex);
- }
- catch(const ::Ice::LocalException& __ex)
- {
- __handleException(__handler, __ex, __cnt);
- }
-#if defined(_MSC_VER) && defined(_M_ARM) // ARM bug.
- catch(...)
- {
- throw;
- }
-#endif
- }
-}
-
-::Ice::Int
-IceProxy::jderobot::Motors::setW(::Ice::Float w, const ::Ice::Context* __ctx)
-{
- int __cnt = 0;
- while(true)
- {
- ::IceInternal::RequestHandlerPtr __handler;
- try
- {
- __checkTwowayOnly(__jderobot__Motors__setW_name);
- __handler = __getRequestHandler();
- ::IceInternal::Outgoing __outS(__handler.get(), _reference.get(), __jderobot__Motors__setW_name, ::Ice::Normal, __ctx);
- try
- {
- ::IceInternal::BasicStream* __os = __outS.os();
- __os->write(w);
- }
- catch(const ::Ice::LocalException& __ex)
- {
- __outS.abort(__ex);
- }
- bool __ok = __outS.invoke();
- try
- {
- if(!__ok)
- {
- __outS.is()->throwUnknownUserException();
- }
- ::Ice::Int __ret;
- ::IceInternal::BasicStream* __is = __outS.is();
- __is->read(__ret);
- return __ret;
- }
- catch(const ::Ice::LocalException& __ex)
- {
- throw ::IceInternal::LocalExceptionWrapper(__ex, false);
- }
-#if defined(_MSC_VER) && defined(_M_ARM) // ARM bug.
- catch(...)
- {
- throw;
- }
-#endif
- }
- catch(const ::IceInternal::LocalExceptionWrapper& __ex)
- {
- __handleExceptionWrapper(__handler, __ex);
- }
- catch(const ::Ice::LocalException& __ex)
- {
- __handleException(__handler, __ex, __cnt);
- }
-#if defined(_MSC_VER) && defined(_M_ARM) // ARM bug.
- catch(...)
- {
- throw;
- }
-#endif
- }
-}
-
-::Ice::Float
-IceProxy::jderobot::Motors::getL(const ::Ice::Context* __ctx)
-{
- int __cnt = 0;
- while(true)
- {
- ::IceInternal::RequestHandlerPtr __handler;
- try
- {
- __checkTwowayOnly(__jderobot__Motors__getL_name);
- __handler = __getRequestHandler();
- ::IceInternal::Outgoing __outS(__handler.get(), _reference.get(), __jderobot__Motors__getL_name, ::Ice::Normal, __ctx);
- bool __ok = __outS.invoke();
- try
- {
- if(!__ok)
- {
- __outS.is()->throwUnknownUserException();
- }
- ::Ice::Float __ret;
- ::IceInternal::BasicStream* __is = __outS.is();
- __is->read(__ret);
- return __ret;
- }
- catch(const ::Ice::LocalException& __ex)
- {
- throw ::IceInternal::LocalExceptionWrapper(__ex, false);
- }
-#if defined(_MSC_VER) && defined(_M_ARM) // ARM bug.
- catch(...)
- {
- throw;
- }
-#endif
- }
- catch(const ::IceInternal::LocalExceptionWrapper& __ex)
- {
- __handleExceptionWrapper(__handler, __ex);
- }
- catch(const ::Ice::LocalException& __ex)
- {
- __handleException(__handler, __ex, __cnt);
- }
-#if defined(_MSC_VER) && defined(_M_ARM) // ARM bug.
- catch(...)
- {
- throw;
- }
-#endif
- }
-}
-
-::Ice::Int
-IceProxy::jderobot::Motors::setL(::Ice::Float l, const ::Ice::Context* __ctx)
-{
- int __cnt = 0;
- while(true)
- {
- ::IceInternal::RequestHandlerPtr __handler;
- try
- {
- __checkTwowayOnly(__jderobot__Motors__setL_name);
- __handler = __getRequestHandler();
- ::IceInternal::Outgoing __outS(__handler.get(), _reference.get(), __jderobot__Motors__setL_name, ::Ice::Normal, __ctx);
- try
- {
- ::IceInternal::BasicStream* __os = __outS.os();
- __os->write(l);
- }
- catch(const ::Ice::LocalException& __ex)
- {
- __outS.abort(__ex);
- }
- bool __ok = __outS.invoke();
- try
- {
- if(!__ok)
- {
- __outS.is()->throwUnknownUserException();
- }
- ::Ice::Int __ret;
- ::IceInternal::BasicStream* __is = __outS.is();
- __is->read(__ret);
- return __ret;
- }
- catch(const ::Ice::LocalException& __ex)
- {
- throw ::IceInternal::LocalExceptionWrapper(__ex, false);
- }
-#if defined(_MSC_VER) && defined(_M_ARM) // ARM bug.
- catch(...)
- {
- throw;
- }
-#endif
- }
- catch(const ::IceInternal::LocalExceptionWrapper& __ex)
- {
- __handleExceptionWrapper(__handler, __ex);
- }
- catch(const ::Ice::LocalException& __ex)
- {
- __handleException(__handler, __ex, __cnt);
- }
-#if defined(_MSC_VER) && defined(_M_ARM) // ARM bug.
- catch(...)
- {
- throw;
- }
-#endif
- }
-}
-
-const ::std::string&
-IceProxy::jderobot::Motors::ice_staticId()
-{
- return __jderobot__Motors_ids[1];
-}
-
-::IceProxy::Ice::Object*
-IceProxy::jderobot::Motors::__newInstance() const
-{
- return new Motors;
-}
Deleted: trunk/src/stable/components/naoserver/interfaces/cpp/jderobot/motors.h
===================================================================
--- trunk/src/stable/components/naoserver/interfaces/cpp/jderobot/motors.h 2014-01-25 18:44:50 UTC (rev 1146)
+++ trunk/src/stable/components/naoserver/interfaces/cpp/jderobot/motors.h 2014-01-25 20:27:32 UTC (rev 1147)
@@ -1,311 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice-E is licensed to you under the terms described in the
-// ICEE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-// Ice-E version 1.3.0
-// Generated from file `motors.ice'
-
-#ifndef ___users_eperdices_GO2012_naoserver_src_interfaces_cpp_jderobot_motors_h__
-#define ___users_eperdices_GO2012_naoserver_src_interfaces_cpp_jderobot_motors_h__
-
-#include <IceE/ProxyF.h>
-#include <IceE/ObjectF.h>
-#include <IceE/Exception.h>
-#include <IceE/ScopedArray.h>
-#include <IceE/Proxy.h>
-#include <IceE/Object.h>
-#ifndef ICEE_PURE_CLIENT
-# include <IceE/Incoming.h>
-#endif
-#include <IceE/Outgoing.h>
-#include <IceE/UserExceptionFactory.h>
-#include <IceE/FactoryTable.h>
-#include <jderobot/common.h>
-#include <IceE/UndefSysMacros.h>
-
-#ifndef ICEE_IGNORE_VERSION
-# if ICEE_INT_VERSION / 100 != 103
-# error IceE version mismatch!
-# endif
-# if ICEE_INT_VERSION % 100 < 0
-# error IceE patch level mismatch!
-# endif
-#endif
-
-namespace IceProxy
-{
-
-namespace jderobot
-{
-
-class Motors;
-
-}
-
-}
-
-namespace jderobot
-{
-
-class Motors;
-bool operator==(const Motors&, const Motors&);
-bool operator<(const Motors&, const Motors&);
-
-}
-
-namespace IceInternal
-{
-
-::Ice::Object* upCast(::jderobot::Motors*);
-::IceProxy::Ice::Object* upCast(::IceProxy::jderobot::Motors*);
-
-}
-
-namespace jderobot
-{
-
-typedef ::IceInternal::Handle< ::jderobot::Motors> MotorsPtr;
-typedef ::IceInternal::ProxyHandle< ::IceProxy::jderobot::Motors> MotorsPrx;
-
-void __read(::IceInternal::BasicStream*, MotorsPrx&);
-void __patch__MotorsPtr(void*, ::Ice::ObjectPtr&);
-
-}
-
-namespace jderobot
-{
-
-}
-
-namespace jderobot
-{
-
-class Motors : virtual public ::Ice::Object
-{
-public:
-
- typedef MotorsPrx ProxyType;
- typedef MotorsPtr PointerType;
-
-
- virtual bool ice_isA(const ::std::string&, const ::Ice::Current& = ::Ice::Current()) const;
- virtual ::std::vector< ::std::string> ice_ids(const ::Ice::Current& = ::Ice::Current()) const;
- virtual const ::std::string& ice_id(const ::Ice::Current& = ::Ice::Current()) const;
- static const ::std::string& ice_staticId();
-
- virtual ::Ice::Float getV(const ::Ice::Current& = ::Ice::Current()) = 0;
-#ifndef ICEE_PURE_CLIENT
- ::Ice::DispatchStatus ___getV(::IceInternal::Incoming&, const ::Ice::Current&);
-#endif // ICEE_PURE_CLIENT
-
- virtual ::Ice::Int setV(::Ice::Float, const ::Ice::Current& = ::Ice::Current()) = 0;
-#ifndef ICEE_PURE_CLIENT
- ::Ice::DispatchStatus ___setV(::IceInternal::Incoming&, const ::Ice::Current&);
-#endif // ICEE_PURE_CLIENT
-
- virtual ::Ice::Float getW(const ::Ice::Current& = ::Ice::Current()) = 0;
-#ifndef ICEE_PURE_CLIENT
- ::Ice::DispatchStatus ___getW(::IceInternal::Incoming&, const ::Ice::Current&);
-#endif // ICEE_PURE_CLIENT
-
- virtual ::Ice::Int setW(::Ice::Float, const ::Ice::Current& = ::Ice::Current()) = 0;
-#ifndef ICEE_PURE_CLIENT
- ::Ice::DispatchStatus ___setW(::IceInternal::Incoming&, const ::Ice::Current&);
-#endif // ICEE_PURE_CLIENT
-
- virtual ::Ice::Float getL(const ::Ice::Current& = ::Ice::Current()) = 0;
-#ifndef ICEE_PURE_CLIENT
- ::Ice::DispatchStatus ___getL(::IceInternal::Incoming&, const ::Ice::Current&);
-#endif // ICEE_PURE_CLIENT
-
- virtual ::Ice::Int setL(::Ice::Float, const ::Ice::Current& = ::Ice::Current()) = 0;
-#ifndef ICEE_PURE_CLIENT
- ::Ice::DispatchStatus ___setL(::IceInternal::Incoming&, const ::Ice::Current&);
-#endif // ICEE_PURE_CLIENT
-
-#ifndef ICEE_PURE_CLIENT
- virtual ::Ice::DispatchStatus __dispatch(::IceInternal::Incoming&, const ::Ice::Current&);
-#endif // ICEE_PURE_CLIENT
-
- virtual void __write(::IceInternal::BasicStream*) const;
- virtual void __read(::IceInternal::BasicStream*, bool);
-};
-
-}
-
-namespace IceProxy
-{
-
-namespace jderobot
-{
-
-class Motors : virtual public ::IceProxy::Ice::Object
-{
-public:
-
- ::Ice::Float getV()
- {
- return getV(0);
- }
- ::Ice::Float getV(const ::Ice::Context& __ctx)
- {
- return getV(&__ctx);
- }
-
-private:
-
- ::Ice::Float getV(const ::Ice::Context*);
-
-public:
-
- ::Ice::Int setV(::Ice::Float v)
- {
- return setV(v, 0);
- }
- ::Ice::Int setV(::Ice::Float v, const ::Ice::Context& __ctx)
- {
- return setV(v, &__ctx);
- }
-
-private:
-
- ::Ice::Int setV(::Ice::Float, const ::Ice::Context*);
-
-public:
-
- ::Ice::Float getW()
- {
- return getW(0);
- }
- ::Ice::Float getW(const ::Ice::Context& __ctx)
- {
- return getW(&__ctx);
- }
-
-private:
-
- ::Ice::Float getW(const ::Ice::Context*);
-
-public:
-
- ::Ice::Int setW(::Ice::Float w)
- {
- return setW(w, 0);
- }
- ::Ice::Int setW(::Ice::Float w, const ::Ice::Context& __ctx)
- {
- return setW(w, &__ctx);
- }
-
-private:
-
- ::Ice::Int setW(::Ice::Float, const ::Ice::Context*);
-
-public:
-
- ::Ice::Float getL()
- {
- return getL(0);
- }
- ::Ice::Float getL(const ::Ice::Context& __ctx)
- {
- return getL(&__ctx);
- }
-
-private:
-
- ::Ice::Float getL(const ::Ice::Context*);
-
-public:
-
- ::Ice::Int setL(::Ice::Float l)
- {
- return setL(l, 0);
- }
- ::Ice::Int setL(::Ice::Float l, const ::Ice::Context& __ctx)
- {
- return setL(l, &__ctx);
- }
-
-private:
-
- ::Ice::Int setL(::Ice::Float, const ::Ice::Context*);
-
-public:
-
- ::IceInternal::ProxyHandle<Motors> ice_context(const ::Ice::Context& __context) const
- {
- return dynamic_cast<Motors*>(::IceProxy::Ice::Object::ice_context(__context).get());
- }
-
- ::IceInternal::ProxyHandle<Motors> ice_secure(bool __secure) const
- {
- return dynamic_cast<Motors*>(::IceProxy::Ice::Object::ice_secure(__secure).get());
- }
-
-#ifdef ICEE_HAS_ROUTER
- ::IceInternal::ProxyHandle<Motors> ice_router(const ::Ice::RouterPrx& __router) const
- {
- return dynamic_cast<Motors*>(::IceProxy::Ice::Object::ice_router(__router).get());
- }
-#endif // ICEE_HAS_ROUTER
-
-#ifdef ICEE_HAS_LOCATOR
- ::IceInternal::ProxyHandle<Motors> ice_locator(const ::Ice::LocatorPrx& __locator) const
- {
- return dynamic_cast<Motors*>(::IceProxy::Ice::Object::ice_locator(__locator).get());
- }
-
- ::IceInternal::ProxyHandle<Motors> ice_adapterId(const std::string& __id) const
- {
- return dynamic_cast<Motors*>(::IceProxy::Ice::Object::ice_adapterId(__id).get());
- }
-#endif // ICEE_HAS_LOCATOR
-
- ::IceInternal::ProxyHandle<Motors> ice_twoway() const
- {
- return dynamic_cast<Motors*>(::IceProxy::Ice::Object::ice_twoway().get());
- }
-
- ::IceInternal::ProxyHandle<Motors> ice_oneway() const
- {
- return dynamic_cast<Motors*>(::IceProxy::Ice::Object::ice_oneway().get());
- }
-
- ::IceInternal::ProxyHandle<Motors> ice_batchOneway() const
- {
- return dynamic_cast<Motors*>(::IceProxy::Ice::Object::ice_batchOneway().get());
- }
-
- ::IceInternal::ProxyHandle<Motors> ice_datagram() const
- {
- return dynamic_cast<Motors*>(::IceProxy::Ice::Object::ice_datagram().get());
- }
-
- ::IceInternal::ProxyHandle<Motors> ice_batchDatagram() const
- {
- return dynamic_cast<Motors*>(::IceProxy::Ice::Object::ice_batchDatagram().get());
- }
-
- ::IceInternal::ProxyHandle<Motors> ice_timeout(int __timeout) const
- {
- return dynamic_cast<Motors*>(::IceProxy::Ice::Object::ice_timeout(__timeout).get());
- }
-
- static const ::std::string& ice_staticId();
-
-private:
-
- virtual ::IceProxy::Ice::Object* __newInstance() const;
-};
-
-}
-
-}
-
-#endif
Deleted: trunk/src/stable/components/naoserver/interfaces/cpp/jderobot/naofollowball.cpp
===================================================================
--- trunk/src/stable/components/naoserver/interfaces/cpp/jderobot/naofollowball.cpp 2014-01-25 18:44:50 UTC (rev 1146)
+++ trunk/src/stable/components/naoserver/interfaces/cpp/jderobot/naofollowball.cpp 2014-01-25 20:27:32 UTC (rev 1147)
@@ -1,565 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice-E is licensed to you under the terms described in the
-// ICEE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-// Ice-E version 1.3.0
-// Generated from file `naofollowball.ice'
-
-#include <naofollowball.h>
-#include <IceE/LocalException.h>
-#include <IceE/ObjectFactory.h>
-#include <IceE/BasicStream.h>
-#include <IceE/Iterator.h>
-
-#ifndef ICEE_IGNORE_VERSION
-# if ICEE_INT_VERSION / 100 != 103
-# error IceE version mismatch!
-# endif
-# if ICEE_INT_VERSION % 100 < 0
-# error IceE patch level mismatch!
-# endif
-#endif
-
-static const ::std::string __jderobot__NaoFollowBall__setParams_name = "setParams";
-
-static const ::std::string __jderobot__NaoFollowBall__setMinParams_name = "setMinParams";
-
-static const ::std::string __jderobot__NaoFollowBall__setMaxParams_name = "setMaxParams";
-
-static const ::std::string __jderobot__NaoFollowBall__start_name = "start";
-
-static const ::std::string __jderobot__NaoFollowBall__stop_name = "stop";
-
-::Ice::Object* IceInternal::upCast(::jderobot::NaoFollowBall* p) { return p; }
-::IceProxy::Ice::Object* IceInternal::upCast(::IceProxy::jderobot::NaoFollowBall* p) { return p; }
-
-void
-jderobot::__read(::IceInternal::BasicStream* __is, ::jderobot::NaoFollowBallPrx& v)
-{
- ::Ice::ObjectPrx proxy;
- __is->read(proxy);
- if(!proxy)
- {
- v = 0;
- }
- else
- {
- v = new ::IceProxy::jderobot::NaoFollowBall;
- v->__copyFrom(proxy);
- }
-}
-
-static const ::std::string __jderobot__NaoFollowBall_ids[2] =
-{
- "::Ice::Object",
- "::jderobot::NaoFollowBall"
-};
-
-bool
-jderobot::NaoFollowBall::ice_isA(const ::std::string& _s, const ::Ice::Current&) const
-{
- return ::std::binary_search(__jderobot__NaoFollowBall_ids, __jderobot__NaoFollowBall_ids + 2, _s);
-}
-
-::std::vector< ::std::string>
-jderobot::NaoFollowBall::ice_ids(const ::Ice::Current&) const
-{
- return ::std::vector< ::std::string>(&__jderobot__NaoFollowBall_ids[0], &__jderobot__NaoFollowBall_ids[2]);
-}
-
-const ::std::string&
-jderobot::NaoFollowBall::ice_id(const ::Ice::Current&) const
-{
- return __jderobot__NaoFollowBall_ids[1];
-}
-
-const ::std::string&
-jderobot::NaoFollowBall::ice_staticId()
-{
- return __jderobot__NaoFollowBall_ids[1];
-}
-
-#ifndef ICEE_PURE_CLIENT
-::Ice::DispatchStatus
-jderobot::NaoFollowBall::___setParams(::IceInternal::Incoming& __inS, const ::Ice::Current& __current)
-{
- __checkMode(::Ice::Normal, __current.mode);
- ::IceInternal::BasicStream* __is = __inS.is();
- ::Ice::Int rMin;
- ::Ice::Int rMax;
- ::Ice::Int gMin;
- ::Ice::Int gMax;
- ::Ice::Int bMin;
- ::Ice::Int bMax;
- __is->read(rMin);
- __is->read(rMax);
- __is->read(gMin);
- __is->read(gMax);
- __is->read(bMin);
- __is->read(bMax);
- setParams(rMin, rMax, gMin, gMax, bMin, bMax, __current);
- return ::Ice::DispatchOK;
-}
-#endif // ICEE_PURE_CLIENT
-
-#ifndef ICEE_PURE_CLIENT
-::Ice::DispatchStatus
-jderobot::NaoFollowBall::___setMinParams(::IceInternal::Incoming& __inS, const ::Ice::Current& __current)
-{
- __checkMode(::Ice::Normal, __current.mode);
- ::IceInternal::BasicStream* __is = __inS.is();
- ::Ice::Int rMin;
- ::Ice::Int gMin;
- ::Ice::Int bMin;
- __is->read(rMin);
- __is->read(gMin);
- __is->read(bMin);
- setMinParams(rMin, gMin, bMin, __current);
- return ::Ice::DispatchOK;
-}
-#endif // ICEE_PURE_CLIENT
-
-#ifndef ICEE_PURE_CLIENT
-::Ice::DispatchStatus
-jderobot::NaoFollowBall::___setMaxParams(::IceInternal::Incoming& __inS, const ::Ice::Current& __current)
-{
- __checkMode(::Ice::Normal, __current.mode);
- ::IceInternal::BasicStream* __is = __inS.is();
- ::Ice::Int rMax;
- ::Ice::Int gMax;
- ::Ice::Int bMax;
- __is->read(rMax);
- __is->read(gMax);
- __is->read(bMax);
- setMaxParams(rMax, gMax, bMax, __current);
- return ::Ice::DispatchOK;
-}
-#endif // ICEE_PURE_CLIENT
-
-#ifndef ICEE_PURE_CLIENT
-::Ice::DispatchStatus
-jderobot::NaoFollowBall::___start(::IceInternal::Incoming& __inS, const ::Ice::Current& __current)
-{
- __checkMode(::Ice::Normal, __current.mode);
- start(__current);
- return ::Ice::DispatchOK;
-}
-#endif // ICEE_PURE_CLIENT
-
-#ifndef ICEE_PURE_CLIENT
-::Ice::DispatchStatus
-jderobot::NaoFollowBall::___stop(::IceInternal::Incoming& __inS, const ::Ice::Current& __current)
-{
- __checkMode(::Ice::Normal, __current.mode);
- stop(__current);
- return ::Ice::DispatchOK;
-}
-#endif // ICEE_PURE_CLIENT
-
-#ifndef ICEE_PURE_CLIENT
-static ::std::string __jderobot__NaoFollowBall_all[] =
-{
- "ice_id",
- "ice_ids",
- "ice_isA",
- "ice_ping",
- "setMaxParams",
- "setMinParams",
- "setParams",
- "start",
- "stop"
-};
-
-::Ice::DispatchStatus
-jderobot::NaoFollowBall::__dispatch(::IceInternal::Incoming& in, const ::Ice::Current& current)
-{
- ::std::pair< ::std::string*, ::std::string*> r = ::std::equal_range(__jderobot__NaoFollowBall_all, __jderobot__NaoFollowBall_all + 9, current.operation);
- if(r.first == r.second)
- {
- throw Ice::OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
- }
-
- switch(r.first - __jderobot__NaoFollowBall_all)
- {
- case 0:
- {
- return ___ice_id(in, current);
- }
- case 1:
- {
- return ___ice_ids(in, current);
- }
- case 2:
- {
- return ___ice_isA(in, current);
- }
- case 3:
- {
- return ___ice_ping(in, current);
- }
- case 4:
- {
- return ___setMaxParams(in, current);
- }
- case 5:
- {
- return ___setMinParams(in, current);
- }
- case 6:
- {
- return ___setParams(in, current);
- }
- case 7:
- {
- return ___start(in, current);
- }
- case 8:
- {
- return ___stop(in, current);
- }
- }
-
- assert(false);
- throw Ice::OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
-}
-#endif // ICEE_PURE_CLIENT
-
-void
-jderobot::NaoFollowBall::__write(::IceInternal::BasicStream* __os) const
-{
- __os->writeTypeId(ice_staticId());
- __os->startWriteSlice();
- __os->endWriteSlice();
- ::Ice::Object::__write(__os);
-}
-
-void
-jderobot::NaoFollowBall::__read(::IceInternal::BasicStream* __is, bool __rid)
-{
- if(__rid)
- {
- ::std::string myId;
- __is->readTypeId(myId);
- }
- __is->startReadSlice();
- __is->endReadSlice();
- ::Ice::Object::__read(__is, true);
-}
-
-
-bool
-jderobot::operator==(const ::jderobot::NaoFollowBall& l, const ::jderobot::NaoFollowBall& r)
-{
- return static_cast<const ::Ice::Object&>(l) == static_cast<const ::Ice::Object&>(r);
-}
-
-bool
-jderobot::operator<(const ::jderobot::NaoFollowBall& l, const ::jderobot::NaoFollowBall& r)
-{
- return static_cast<const ::Ice::Object&>(l) < static_cast<const ::Ice::Object&>(r);
-}
-
-void
-jderobot::__patch__NaoFollowBallPtr(void* __addr, ::Ice::ObjectPtr& v)
-{
- ::jderobot::NaoFollowBallPtr* p = static_cast< ::jderobot::NaoFollowBallPtr*>(__addr);
- assert(p);
- *p = ::jderobot::NaoFollowBallPtr::dynamicCast(v);
- if(v && !*p)
- {
- IceInternal::Ex::throwUOE(::jderobot::NaoFollowBall::ice_staticId(), v->ice_id());
- }
-}
-
-void
-IceProxy::jderobot::NaoFollowBall::setParams(::Ice::Int rMin, ::Ice::Int rMax, ::Ice::Int gMin, ::Ice::Int gMax, ::Ice::Int bMin, ::Ice::Int bMax, const ::Ice::Context* __ctx)
-{
- int __cnt = 0;
- while(true)
- {
- ::IceInternal::RequestHandlerPtr __handler;
- try
- {
- __handler = __getRequestHandler();
- ::IceInternal::Outgoing __outS(__handler.get(), _reference.get(), __jderobot__NaoFollowBall__setParams_name, ::Ice::Normal, __ctx);
- try
- {
- ::IceInternal::BasicStream* __os = __outS.os();
- __os->write(rMin);
- __os->write(rMax);
- __os->write(gMin);
- __os->write(gMax);
- __os->write(bMin);
- __os->write(bMax);
- }
- catch(const ::Ice::LocalException& __ex)
- {
- __outS.abort(__ex);
- }
- bool __ok = __outS.invoke();
- try
- {
- if(!__ok)
- {
- __outS.is()->throwUnknownUserException();
- }
- }
- catch(const ::Ice::LocalException& __ex)
- {
- throw ::IceInternal::LocalExceptionWrapper(__ex, false);
- }
-#if defined(_MSC_VER) && defined(_M_ARM) // ARM bug.
- catch(...)
- {
- throw;
- }
-#endif
- return;
- }
- catch(const ::IceInternal::LocalExceptionWrapper& __ex)
- {
- __handleExceptionWrapper(__handler, __ex);
- }
- catch(const ::Ice::LocalException& __ex)
- {
- __handleException(__handler, __ex, __cnt);
- }
-#if defined(_MSC_VER) && defined(_M_ARM) // ARM bug.
- catch(...)
- {
- throw;
- }
-#endif
- }
-}
-
-void
-IceProxy::jderobot::NaoFollowBall::setMinParams(::Ice::Int rMin, ::Ice::Int gMin, ::Ice::Int bMin, const ::Ice::Context* __ctx)
-{
- int __cnt = 0;
- while(true)
- {
- ::IceInternal::RequestHandlerPtr __handler;
- try
- {
- __handler = __getRequestHandler();
- ::IceInternal::Outgoing __outS(__handler.get(), _reference.get(), __jderobot__NaoFollowBall__setMinParams_name, ::Ice::Normal, __ctx);
- try
- {
- ::IceInternal::BasicStream* __os = __outS.os();
- __os->write(rMin);
- __os->write(gMin);
- __os->write(bMin);
- }
- catch(const ::Ice::LocalException& __ex)
- {
- __outS.abort(__ex);
- }
- bool __ok = __outS.invoke();
- try
- {
- if(!__ok)
- {
- __outS.is()->throwUnknownUserException();
- }
- }
- catch(const ::Ice::LocalException& __ex)
- {
- throw ::IceInternal::LocalExceptionWrapper(__ex, false);
- }
-#if defined(_MSC_VER) && defined(_M_ARM) // ARM bug.
- catch(...)
- {
- throw;
- }
-#endif
- return;
- }
- catch(const ::IceInternal::LocalExceptionWrapper& __ex)
- {
- __handleExceptionWrapper(__handler, __ex);
- }
- catch(const ::Ice::LocalException& __ex)
- {
- __handleException(__handler, __ex, __cnt);
- }
-#if defined(_MSC_VER) && defined(_M_ARM) // ARM bug.
- catch(...)
- {
- throw;
- }
-#endif
- }
-}
-
-void
-IceProxy::jderobot::NaoFollowBall::setMaxParams(::Ice::Int rMax, ::Ice::Int gMax, ::Ice::Int bMax, const ::Ice::Context* __ctx)
-{
- int __cnt = 0;
- while(true)
- {
- ::IceInternal::RequestHandlerPtr __handler;
- try
- {
- __handler = __getRequestHandler();
- ::IceInternal::Outgoing __outS(__handler.get(), _reference.get(), __jderobot__NaoFollowBall__setMaxParams_name, ::Ice::Normal, __ctx);
- try
- {
- ::IceInternal::BasicStream* __os = __outS.os();
- __os->write(rMax);
- __os->write(gMax);
- __os->write(bMax);
- }
- catch(const ::Ice::LocalException& __ex)
- {
- __outS.abort(__ex);
- }
- bool __ok = __outS.invoke();
- try
- {
- if(!__ok)
- {
- __outS.is()->throwUnknownUserException();
- }
- }
- catch(const ::Ice::LocalException& __ex)
- {
- throw ::IceInternal::LocalExceptionWrapper(__ex, false);
- }
-#if defined(_MSC_VER) && defined(_M_ARM) // ARM bug.
- catch(...)
- {
- throw;
- }
-#endif
- return;
- }
- catch(const ::IceInternal::LocalExceptionWrapper& __ex)
- {
- __handleExceptionWrapper(__handler, __ex);
- }
- catch(const ::Ice::LocalException& __ex)
- {
- __handleException(__handler, __ex, __cnt);
- }
-#if defined(_MSC_VER) && defined(_M_ARM) // ARM bug.
- catch(...)
- {
- throw;
- }
-#endif
- }
-}
-
-void
-IceProxy::jderobot::NaoFollowBall::start(const ::Ice::Context* __ctx)
-{
- int __cnt = 0;
- while(true)
- {
- ::IceInternal::RequestHandlerPtr __handler;
- try
- {
- __handler = __getRequestHandler();
- ::IceInternal::Outgoing __outS(__handler.get(), _reference.get(), __jderobot__NaoFollowBall__start_name, ::Ice::Normal, __ctx);
- bool __ok = __outS.invoke();
- try
- {
- if(!__ok)
- {
- __outS.is()->throwUnknownUserException();
- }
- }
- catch(const ::Ice::LocalException& __ex)
- {
- throw ::IceInternal::LocalExceptionWrapper(__ex, false);
- }
-#if defined(_MSC_VER) && defined(_M_ARM) // ARM bug.
- catch(...)
- {
- throw;
- }
-#endif
- return;
- }
- catch(const ::IceInternal::LocalExceptionWrapper& __ex)
- {
- __handleExceptionWrapper(__handler, __ex);
- }
- catch(const ::Ice::LocalException& __ex)
- {
- __handleException(__handler, __ex, __cnt);
- }
-#if defined(_MSC_VER) && defined(_M_ARM) // ARM bug.
- catch(...)
- {
- throw;
- }
-#endif
- }
-}
-
-void
-IceProxy::jderobot::NaoFollowBall::stop(const ::Ice::Context* __ctx)
-{
- int __cnt = 0;
- while(true)
- {
- ::IceInternal::RequestHandlerPtr __handler;
- try
- {
- __handler = __getRequestHandler();
- ::IceInternal::Outgoing __outS(__handler.get(), _reference.get(), __jderobot__NaoFollowBall__stop_name, ::Ice::Normal, __ctx);
- bool __ok = __outS.invoke();
- try
- {
- if(!__ok)
- {
- __outS.is()->throwUnknownUserException();
- }
- }
- catch(const ::Ice::LocalException& __ex)
- {
- throw ::IceInternal::LocalExceptionWrapper(__ex, false);
- }
-#if defined(_MSC_VER) && defined(_M_ARM) // ARM bug.
- catch(...)
- {
- throw;
- }
-#endif
- return;
- }
- catch(const ::IceInternal::LocalExceptionWrapper& __ex)
- {
- __handleExceptionWrapper(__handler, __ex);
- }
- catch(const ::Ice::LocalException& __ex)
- {
- __handleException(__handler, __ex, __cnt);
- }
-#if defined(_MSC_VER) && defined(_M_ARM) // ARM bug.
- catch(...)
- {
- throw;
- }
-#endif
- }
-}
-
-const ::std::string&
-IceProxy::jderobot::NaoFollowBall::ice_staticId()
-{
- return __jderobot__NaoFollowBall_ids[1];
-}
-
-::IceProxy::Ice::Object*
-IceProxy::jderobot::NaoFollowBall::__newInstance() const
-{
- return new NaoFollowBall;
-}
Deleted: trunk/src/stable/components/naoserver/interfaces/cpp/jderobot/naofollowball.h
===================================================================
--- trunk/src/stable/components/naoserver/interfaces/cpp/jderobot/naofollowball.h 2014-01-25 18:44:50 UTC (rev 1146)
+++ trunk/src/stable/components/naoserver/interfaces/cpp/jderobot/naofollowball.h 2014-01-25 20:27:32 UTC (rev 1147)
@@ -1,288 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice-E is licensed to you under the terms described in the
-// ICEE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-// Ice-E version 1.3.0
-// Generated from file `naofollowball.ice'
-
-#ifndef __naofollowball_h__
-#define __naofollowball_h__
-
-#include <IceE/ProxyF.h>
-#include <IceE/ObjectF.h>
-#include <IceE/Exception.h>
-#include <IceE/ScopedArray.h>
-#include <IceE/Proxy.h>
-#include <IceE/Object.h>
-#ifndef ICEE_PURE_CLIENT
-# include <IceE/Incoming.h>
-#endif
-#include <IceE/Outgoing.h>
-#include <IceE/UndefSysMacros.h>
-
-#ifndef ICEE_IGNORE_VERSION
-# if ICEE_INT_VERSION / 100 != 103
-# error IceE version mismatch!
-# endif
-# if ICEE_INT_VERSION % 100 < 0
-# error IceE patch level mismatch!
-# endif
-#endif
-
-namespace IceProxy
-{
-
-namespace jderobot
-{
-
-class NaoFollowBall;
-
-}
-
-}
-
-namespace jderobot
-{
-
-class NaoFollowBall;
-bool operator==(const NaoFollowBall&, const NaoFollowBall&);
-bool operator<(const NaoFollowBall&, const NaoFollowBall&);
-
-}
-
-namespace IceInternal
-{
-
-::Ice::Object* upCast(::jderobot::NaoFollowBall*);
-::IceProxy::Ice::Object* upCast(::IceProxy::jderobot::NaoFollowBall*);
-
-}
-
-namespace jderobot
-{
-
-typedef ::IceInternal::Handle< ::jderobot::NaoFollowBall> NaoFollowBallPtr;
-typedef ::IceInternal::ProxyHandle< ::IceProxy::jderobot::NaoFollowBall> NaoFollowBallPrx;
-
-void __read(::IceInternal::BasicStream*, NaoFollowBallPrx&);
-void __patch__NaoFollowBallPtr(void*, ::Ice::ObjectPtr&);
-
-}
-
-namespace jderobot
-{
-
-}
-
-namespace jderobot
-{
-
-class NaoFollowBall : virtual public ::Ice::Object
-{
-public:
-
- typedef NaoFollowBallPrx ProxyType;
- typedef NaoFollowBallPtr PointerType;
-
-
- virtual bool ice_isA(const ::std::string&, const ::Ice::Current& = ::Ice::Current()) const;
- virtual ::std::vector< ::std::string> ice_ids(const ::Ice::Current& = ::Ice::Current()) const;
- virtual const ::std::string& ice_id(const ::Ice::Current& = ::Ice::Current()) const;
- static const ::std::string& ice_staticId();
-
- virtual void setParams(::Ice::Int, ::Ice::Int, ::Ice::Int, ::Ice::Int, ::Ice::Int, ::Ice::Int, const ::Ice::Current& = ::Ice::Current()) = 0;
-#ifndef ICEE_PURE_CLIENT
- ::Ice::DispatchStatus ___setParams(::IceInternal::Incoming&, const ::Ice::Current&);
-#endif // ICEE_PURE_CLIENT
-
- virtual void setMinParams(::Ice::Int, ::Ice::Int, ::Ice::Int, const ::Ice::Current& = ::Ice::Current()) = 0;
-#ifndef ICEE_PURE_CLIENT
- ::Ice::DispatchStatus ___setMinParams(::IceInternal::Incoming&, const ::Ice::Current&);
-#endif // ICEE_PURE_CLIENT
-
- virtual void setMaxParams(::Ice::Int, ::Ice::Int, ::Ice::Int, const ::Ice::Current& = ::Ice::Current()) = 0;
-#ifndef ICEE_PURE_CLIENT
- ::Ice::DispatchStatus ___setMaxParams(::IceInternal::Incoming&, const ::Ice::Current&);
-#endif // ICEE_PURE_CLIENT
-
- virtual void start(const ::Ice::Current& = ::Ice::Current()) = 0;
-#ifndef ICEE_PURE_CLIENT
- ::Ice::DispatchStatus ___start(::IceInternal::Incoming&, const ::Ice::Current&);
-#endif // ICEE_PURE_CLIENT
-
- virtual void stop(const ::Ice::Current& = ::Ice::Current()) = 0;
-#ifndef ICEE_PURE_CLIENT
- ::Ice::DispatchStatus ___stop(::IceInternal::Incoming&, const ::Ice::Current&);
-#endif // ICEE_PURE_CLIENT
-
-#ifndef ICEE_PURE_CLIENT
- virtual ::Ice::DispatchStatus __dispatch(::IceInternal::Incoming&, const ::Ice::Current&);
-#endif // ICEE_PURE_CLIENT
-
- virtual void __write(::IceInternal::BasicStream*) const;
- virtual void __read(::IceInternal::BasicStream*, bool);
-};
-
-}
-
-namespace IceProxy
-{
-
-namespace jderobot
-{
-
-class NaoFollowBall : virtual public ::IceProxy::Ice::Object
-{
-public:
-
- void setParams(::Ice::Int rMin, ::Ice::Int rMax, ::Ice::Int gMin, ::Ice::Int gMax, ::Ice::Int bMin, ::Ice::Int bMax)
- {
- setParams(rMin, rMax, gMin, gMax, bMin, bMax, 0);
- }
- void setParams(::Ice::Int rMin, ::Ice::Int rMax, ::Ice::Int gMin, ::Ice::Int gMax, ::Ice::Int bMin, ::Ice::Int bMax, const ::Ice::Context& __ctx)
- {
- setParams(rMin, rMax, gMin, gMax, bMin, bMax, &__ctx);
- }
-
-private:
-
- void setParams(::Ice::Int, ::Ice::Int, ::Ice::Int, ::Ice::Int, ::Ice::Int, ::Ice::Int, const ::Ice::Context*);
-
-public:
-
- void setMinParams(::Ice::Int rMin, ::Ice::Int gMin, ::Ice::Int bMin)
- {
- setMinParams(rMin, gMin, bMin, 0);
- }
- void setMinParams(::Ice::Int rMin, ::Ice::Int gMin, ::Ice::Int bMin, const ::Ice::Context& __ctx)
- {
- setMinParams(rMin, gMin, bMin, &__ctx);
- }
-
-private:
-
- void setMinParams(::Ice::Int, ::Ice::Int, ::Ice::Int, const ::Ice::Context*);
-
-public:
-
- void setMaxParams(::Ice::Int rMax, ::Ice::Int gMax, ::Ice::Int bMax)
- {
- setMaxParams(rMax, gMax, bMax, 0);
- }
- void setMaxParams(::Ice::Int rMax, ::Ice::Int gMax, ::Ice::Int bMax, const ::Ice::Context& __ctx)
- {
- setMaxParams(rMax, gMax, bMax, &__ctx);
- }
-
-private:
-
- void setMaxParams(::Ice::Int, ::Ice::Int, ::Ice::Int, const ::Ice::Context*);
-
-public:
-
- void start()
- {
- start(0);
- }
- void start(const ::Ice::Context& __ctx)
- {
- start(&__ctx);
- }
-
-private:
-
- void start(const ::Ice::Context*);
-
-public:
-
- void stop()
- {
- stop(0);
- }
- void stop(const ::Ice::Context& __ctx)
- {
- stop(&__ctx);
- }
-
-private:
-
- void stop(const ::Ice::Context*);
-
-public:
-
- ::IceInternal::ProxyHandle<NaoFollowBall> ice_context(const ::Ice::Context& __context) const
- {
- return dynamic_cast<NaoFollowBall*>(::IceProxy::Ice::Object::ice_context(__context).get());
- }
-
- ::IceInternal::ProxyHandle<NaoFollowBall> ice_secure(bool __secure) const
- {
- return dynamic_cast<NaoFollowBall*>(::IceProxy::Ice::Object::ice_secure(__secure).get());
- }
-
-#ifdef ICEE_HAS_ROUTER
- ::IceInternal::ProxyHandle<NaoFollowBall> ice_router(const ::Ice::RouterPrx& __router) const
- {
- return dynamic_cast<NaoFollowBall*>(::IceProxy::Ice::Object::ice_router(__router).get());
- }
-#endif // ICEE_HAS_ROUTER
-
-#ifdef ICEE_HAS_LOCATOR
- ::IceInternal::ProxyHandle<NaoFollowBall> ice_locator(const ::Ice::LocatorPrx& __locator) const
- {
- return dynamic_cast<NaoFollowBall*>(::IceProxy::Ice::Object::ice_locator(__locator).get());
- }
-
- ::IceInternal::ProxyHandle<NaoFollowBall> ice_adapterId(const std::string& __id) const
- {
- return dynamic_cast<NaoFollowBall*>(::IceProxy::Ice::Object::ice_adapterId(__id).get());
- }
-#endif // ICEE_HAS_LOCATOR
-
- ::IceInternal::ProxyHandle<NaoFollowBall> ice_twoway() const
- {
- return dynamic_cast<NaoFollowBall*>(::IceProxy::Ice::Object::ice_twoway().get());
- }
-
- ::IceInternal::ProxyHandle<NaoFollowBall> ice_oneway() const
- {
- return dynamic_cast<NaoFollowBall*>(::IceProxy::Ice::Object::ice_oneway().get());
- }
-
- ::IceInternal::ProxyHandle<NaoFollowBall> ice_batchOneway() const
- {
- return dynamic_cast<NaoFollowBall*>(::IceProxy::Ice::Object::ice_batchOneway().get());
- }
-
- ::IceInternal::ProxyHandle<NaoFollowBall> ice_datagram() const
- {
- return dynamic_cast<NaoFollowBall*>(::IceProxy::Ice::Object::ice_datagram().get());
- }
-
- ::IceInternal::ProxyHandle<NaoFollowBall> ice_batchDatagram() const
- {
- return dynamic_cast<NaoFollowBall*>(::IceProxy::Ice::Object::ice_batchDatagram().get());
- }
-
- ::IceInternal::ProxyHandle<NaoFollowBall> ice_timeout(int __timeout) const
- {
- return dynamic_cast<NaoFollowBall*>(::IceProxy::Ice::Object::ice_timeout(__timeout).get());
- }
-
- static const ::std::string& ice_staticId();
-
-private:
-
- virtual ::IceProxy::Ice::Object* __newInstance() const;
-};
-
-}
-
-}
-
-#endif
Deleted: trunk/src/stable/components/naoserver/interfaces/cpp/jderobot/naomotions.cpp
===================================================================
--- trunk/src/stable/components/naoserver/interfaces/cpp/jderobot/naomotions.cpp 2014-01-25 18:44:50 UTC (rev 1146)
+++ trunk/src/stable/components/naoserver/interfaces/cpp/jderobot/naomotions.cpp 2014-01-25 20:27:32 UTC (rev 1147)
@@ -1,274 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice-E is licensed to you under the terms described in the
-// ICEE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-// Ice-E version 1.3.0
-// Generated from file `naomotions.ice'
-
-#include <naomotions.h>
-#include <IceE/LocalException.h>
-#include <IceE/ObjectFactory.h>
-#include <IceE/BasicStream.h>
-#include <IceE/Iterator.h>
-
-#ifndef ICEE_IGNORE_VERSION
-# if ICEE_INT_VERSION / 100 != 103
-# error IceE version mismatch!
-# endif
-# if ICEE_INT_VERSION % 100 < 0
-# error IceE patch level mismatch!
-# endif
-#endif
-
-static const ::std::string __jderobot__NaoMotions__setMotion_name = "setMotion";
-
-::Ice::Object* IceInternal::upCast(::jderobot::NaoMotions* p) { return p; }
-::IceProxy::Ice::Object* IceInternal::upCast(::IceProxy::jderobot::NaoMotions* p) { return p; }
-
-void
-jderobot::__read(::IceInternal::BasicStream* __is, ::jderobot::NaoMotionsPrx& v)
-{
- ::Ice::ObjectPrx proxy;
- __is->read(proxy);
- if(!proxy)
- {
- v = 0;
- }
- else
- {
- v = new ::IceProxy::jderobot::NaoMotions;
- v->__copyFrom(proxy);
- }
-}
-
-void
-jderobot::__write(::IceInternal::BasicStream* __os, ::jderobot::MotionType v)
-{
- __os->write(static_cast< ::Ice::Byte>(v), 7);
-}
-
-void
-jderobot::__read(::IceInternal::BasicStream* __is, ::jderobot::MotionType& v)
-{
- ::Ice::Byte val;
- __is->read(val, 7);
- v = static_cast< ::jderobot::MotionType>(val);
-}
-
-static const ::std::string __jderobot__NaoMotions_ids[2] =
-{
- "::Ice::Object",
- "::jderobot::NaoMotions"
-};
-
-bool
-jderobot::NaoMotions::ice_isA(const ::std::string& _s, const ::Ice::Current&) const
-{
- return ::std::binary_search(__jderobot__NaoMotions_ids, __jderobot__NaoMotions_ids + 2, _s);
-}
-
-::std::vector< ::std::string>
-jderobot::NaoMotions::ice_ids(const ::Ice::Current&) const
-{
- return ::std::vector< ::std::string>(&__jderobot__NaoMotions_ids[0], &__jderobot__NaoMotions_ids[2]);
-}
-
-const ::std::string&
-jderobot::NaoMotions::ice_id(const ::Ice::Current&) const
-{
- return __jderobot__NaoMotions_ids[1];
-}
-
-const ::std::string&
-jderobot::NaoMotions::ice_staticId()
-{
- return __jderobot__NaoMotions_ids[1];
-}
-
-#ifndef ICEE_PURE_CLIENT
-::Ice::DispatchStatus
-jderobot::NaoMotions::___setMotion(::IceInternal::Incoming& __inS, const ::Ice::Current& __current)
-{
- __checkMode(::Ice::Normal, __current.mode);
- ::IceInternal::BasicStream* __is = __inS.is();
- ::jderobot::MotionType motion;
- ::jderobot::__read(__is, motion);
- ::IceInternal::BasicStream* __os = __inS.os();
- ::Ice::Int __ret = setMotion(motion, __current);
- __os->write(__ret);
- return ::Ice::DispatchOK;
-}
-#endif // ICEE_PURE_CLIENT
-
-#ifndef ICEE_PURE_CLIENT
-static ::std::string __jderobot__NaoMotions_all[] =
-{
- "ice_id",
- "ice_ids",
- "ice_isA",
- "ice_ping",
- "setMotion"
-};
-
-::Ice::DispatchStatus
-jderobot::NaoMotions::__dispatch(::IceInternal::Incoming& in, const ::Ice::Current& current)
-{
- ::std::pair< ::std::string*, ::std::string*> r = ::std::equal_range(__jderobot__NaoMotions_all, __jderobot__NaoMotions_all + 5, current.operation);
- if(r.first == r.second)
- {
- throw Ice::OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
- }
-
- switch(r.first - __jderobot__NaoMotions_all)
- {
- case 0:
- {
- return ___ice_id(in, current);
- }
- case 1:
- {
- return ___ice_ids(in, current);
- }
- case 2:
- {
- return ___ice_isA(in, current);
- }
- case 3:
- {
- return ___ice_ping(in, current);
- }
- case 4:
- {
- return ___setMotion(in, current);
- }
- }
-
- assert(false);
- throw Ice::OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
-}
-#endif // ICEE_PURE_CLIENT
-
-void
-jderobot::NaoMotions::__write(::IceInternal::BasicStream* __os) const
-{
- __os->writeTypeId(ice_staticId());
- __os->startWriteSlice();
- __os->endWriteSlice();
- ::Ice::Object::__write(__os);
-}
-
-void
-jderobot::NaoMotions::__read(::IceInternal::BasicStream* __is, bool __rid)
-{
- if(__rid)
- {
- ::std::string myId;
- __is->readTypeId(myId);
- }
- __is->startReadSlice();
- __is->endReadSlice();
- ::Ice::Object::__read(__is, true);
-}
-
-
-bool
-jderobot::operator==(const ::jderobot::NaoMotions& l, const ::jderobot::NaoMotions& r)
-{
- return static_cast<const ::Ice::Object&>(l) == static_cast<const ::Ice::Object&>(r);
-}
-
-bool
-jderobot::operator<(const ::jderobot::NaoMotions& l, const ::jderobot::NaoMotions& r)
-{
- return static_cast<const ::Ice::Object&>(l) < static_cast<const ::Ice::Object&>(r);
-}
-
-void
-jderobot::__patch__NaoMotionsPtr(void* __addr, ::Ice::ObjectPtr& v)
-{
- ::jderobot::NaoMotionsPtr* p = static_cast< ::jderobot::NaoMotionsPtr*>(__addr);
- assert(p);
- *p = ::jderobot::NaoMotionsPtr::dynamicCast(v);
- if(v && !*p)
- {
- IceInternal::Ex::throwUOE(::jderobot::NaoMotions::ice_staticId(), v->ice_id());
- }
-}
-
-::Ice::Int
-IceProxy::jderobot::NaoMotions::setMotion(::jderobot::MotionType motion, const ::Ice::Context* __ctx)
-{
- int __cnt = 0;
- while(true)
- {
- ::IceInternal::RequestHandlerPtr __handler;
- try
- {
- __checkTwowayOnly(__jderobot__NaoMotions__setMotion_name);
- __handler = __getRequestHandler();
- ::IceInternal::Outgoing __outS(__handler.get(), _reference.get(), __jderobot__NaoMotions__setMotion_name, ::Ice::Normal, __ctx);
- try
- {
- ::IceInternal::BasicStream* __os = __outS.os();
- ::jderobot::__write(__os, motion);
- }
- catch(const ::Ice::LocalException& __ex)
- {
- __outS.abort(__ex);
- }
- bool __ok = __outS.invoke();
- try
- {
- if(!__ok)
- {
- __outS.is()->throwUnknownUserException();
- }
- ::Ice::Int __ret;
- ::IceInternal::BasicStream* __is = __outS.is();
- __is->read(__ret);
- return __ret;
- }
- catch(const ::Ice::LocalException& __ex)
- {
- throw ::IceInternal::LocalExceptionWrapper(__ex, false);
- }
-#if defined(_MSC_VER) && defined(_M_ARM) // ARM bug.
- catch(...)
- {
- throw;
- }
-#endif
- }
- catch(const ::IceInternal::LocalExceptionWrapper& __ex)
- {
- __handleExceptionWrapper(__handler, __ex);
- }
- catch(const ::Ice::LocalException& __ex)
- {
- __handleException(__handler, __ex, __cnt);
- }
-#if defined(_MSC_VER) && defined(_M_ARM) // ARM bug.
- catch(...)
- {
- throw;
- }
-#endif
- }
-}
-
-const ::std::string&
-IceProxy::jderobot::NaoMotions::ice_staticId()
-{
- return __jderobot__NaoMotions_ids[1];
-}
-
-::IceProxy::Ice::Object*
-IceProxy::jderobot::NaoMotions::__newInstance() const
-{
- return new NaoMotions;
-}
Deleted: trunk/src/stable/components/naoserver/interfaces/cpp/jderobot/naomotions.h
===================================================================
--- trunk/src/stable/components/naoserver/interfaces/cpp/jderobot/naomotions.h 2014-01-25 18:44:50 UTC (rev 1146)
+++ trunk/src/stable/components/naoserver/interfaces/cpp/jderobot/naomotions.h 2014-01-25 20:27:32 UTC (rev 1147)
@@ -1,222 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice-E is licensed to you under the terms described in the
-// ICEE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-// Ice-E version 1.3.0
-// Generated from file `naomotions.ice'
-
-#ifndef __naomotions_h__
-#define __naomotions_h__
-
-#include <IceE/ProxyF.h>
-#include <IceE/ObjectF.h>
-#include <IceE/Exception.h>
-#include <IceE/ScopedArray.h>
-#include <IceE/Proxy.h>
-#include <IceE/Object.h>
-#ifndef ICEE_PURE_CLIENT
-# include <IceE/Incoming.h>
-#endif
-#include <IceE/Outgoing.h>
-#include <IceE/UndefSysMacros.h>
-
-#ifndef ICEE_IGNORE_VERSION
-# if ICEE_INT_VERSION / 100 != 103
-# error IceE version mismatch!
-# endif
-# if ICEE_INT_VERSION % 100 < 0
-# error IceE patch level mismatch!
-# endif
-#endif
-
-namespace IceProxy
-{
-
-namespace jderobot
-{
-
-class NaoMotions;
-
-}
-
-}
-
-namespace jderobot
-{
-
-class NaoMotions;
-bool operator==(const NaoMotions&, const NaoMotions&);
-bool operator<(const NaoMotions&, const NaoMotions&);
-
-}
-
-namespace IceInternal
-{
-
-::Ice::Object* upCast(::jderobot::NaoMotions*);
-::IceProxy::Ice::Object* upCast(::IceProxy::jderobot::NaoMotions*);
-
-}
-
-namespace jderobot
-{
-
-typedef ::IceInternal::Handle< ::jderobot::NaoMotions> NaoMotionsPtr;
-typedef ::IceInternal::ProxyHandle< ::IceProxy::jderobot::NaoMotions> NaoMotionsPrx;
-
-void __read(::IceInternal::BasicStream*, NaoMotionsPrx&);
-void __patch__NaoMotionsPtr(void*, ::Ice::ObjectPtr&);
-
-}
-
-namespace jderobot
-{
-
-enum MotionType
-{
- RigthKick,
- LeftKick,
- StandupBack,
- StandupFront,
- Intercept,
- ChangeCamera,
- ResetNaoqi
-};
-
-void __write(::IceInternal::BasicStream*, MotionType);
-void __read(::IceInternal::BasicStream*, MotionType&);
-
-}
-
-namespace jderobot
-{
-
-class NaoMotions : virtual public ::Ice::Object
-{
-public:
-
- typedef NaoMotionsPrx ProxyType;
- typedef NaoMotionsPtr PointerType;
-
-
- virtual bool ice_isA(const ::std::string&, const ::Ice::Current& = ::Ice::Current()) const;
- virtual ::std::vector< ::std::string> ice_ids(const ::Ice::Current& = ::Ice::Current()) const;
- virtual const ::std::string& ice_id(const ::Ice::Current& = ::Ice::Current()) const;
- static const ::std::string& ice_staticId();
-
- virtual ::Ice::Int setMotion(::jderobot::MotionType, const ::Ice::Current& = ::Ice::Current()) = 0;
-#ifndef ICEE_PURE_CLIENT
- ::Ice::DispatchStatus ___setMotion(::IceInternal::Incoming&, const ::Ice::Current&);
-#endif // ICEE_PURE_CLIENT
-
-#ifndef ICEE_PURE_CLIENT
- virtual ::Ice::DispatchStatus __dispatch(::IceInternal::Incoming&, const ::Ice::Current&);
-#endif // ICEE_PURE_CLIENT
-
- virtual void __write(::IceInternal::BasicStream*) const;
- virtual void __read(::IceInternal::BasicStream*, bool);
-};
-
-}
-
-namespace IceProxy
-{
-
-namespace jderobot
-{
-
-class NaoMotions : virtual public ::IceProxy::Ice::Object
-{
-public:
-
- ::Ice::Int setMotion(::jderobot::MotionType motion)
- {
- return setMotion(motion, 0);
- }
- ::Ice::Int setMotion(::jderobot::MotionType motion, const ::Ice::Context& __ctx)
- {
- return setMotion(motion, &__ctx);
- }
-
-private:
-
- ::Ice::Int setMotion(::jderobot::MotionType, const ::Ice::Context*);
-
-public:
-
- ::IceInternal::ProxyHandle<NaoMotions> ice_context(const ::Ice::Context& __context) const
- {
- return dynamic_cast<NaoMotions*>(::IceProxy::Ice::Object::ice_context(__context).get());
- }
-
- ::IceInternal::ProxyHandle<NaoMotions> ice_secure(bool __secure) const
- {
- return dynamic_cast<NaoMotions*>(::IceProxy::Ice::Object::ice_secure(__secure).get());
- }
-
-#ifdef ICEE_HAS_ROUTER
- ::IceInternal::ProxyHandle<NaoMotions> ice_router(const ::Ice::RouterPrx& __router) const
- {
- return dynamic_cast<NaoMotions*>(::IceProxy::Ice::Object::ice_router(__router).get());
- }
-#endif // ICEE_HAS_ROUTER
-
-#ifdef ICEE_HAS_LOCATOR
- ::IceInternal::ProxyHandle<NaoMotions> ice_locator(const ::Ice::LocatorPrx& __locator) const
- {
- return dynamic_cast<NaoMotions*>(::IceProxy::Ice::Object::ice_locator(__locator).get());
- }
-
- ::IceInternal::ProxyHandle<NaoMotions> ice_adapterId(const std::string& __id) const
- {
- return dynamic_cast<NaoMotions*>(::IceProxy::Ice::Object::ice_adapterId(__id).get());
- }
-#endif // ICEE_HAS_LOCATOR
-
- ::IceInternal::ProxyHandle<NaoMotions> ice_twoway() const
- {
- return dynamic_cast<NaoMotions*>(::IceProxy::Ice::Object::ice_twoway().get());
- }
-
- ::IceInternal::ProxyHandle<NaoMotions> ice_oneway() const
- {
- return dynamic_cast<NaoMotions*>(::IceProxy::Ice::Object::ice_oneway().get());
- }
-
- ::IceInternal::ProxyHandle<NaoMotions> ice_batchOneway() const
- {
- return dynamic_cast<NaoMotions*>(::IceProxy::Ice::Object::ice_batchOneway().get());
- }
-
- ::IceInternal::ProxyHandle<NaoMotions> ice_datagram() const
- {
- return dynamic_cast<NaoMotions*>(::IceProxy::Ice::Object::ice_datagram().get());
- }
-
- ::IceInternal::ProxyHandle<NaoMotions> ice_batchDatagram() const
- {
- return dynamic_cast<NaoMotions*>(::IceProxy::Ice::Object::ice_batchDatagram().get());
- }
-
- ::IceInternal::ProxyHandle<NaoMotions> ice_timeout(int __timeout) const
- {
- return dynamic_cast<NaoMotions*>(::IceProxy::Ice::Object::ice_timeout(__timeout).get());
- }
-
- static const ::std::string& ice_staticId();
-
-private:
-
- virtual ::IceProxy::Ice::Object* __newInstance() const;
-};
-
-}
-
-}
-
-#endif
Deleted: trunk/src/stable/components/naoserver/interfaces/cpp/jderobot/pose3dencoders.cpp
===================================================================
--- trunk/src/stable/components/naoserver/interfaces/cpp/jderobot/pose3dencoders.cpp 2014-01-25 18:44:50 UTC (rev 1146)
+++ trunk/src/stable/components/naoserver/interfaces/cpp/jderobot/pose3dencoders.cpp 2014-01-25 20:27:32 UTC (rev 1147)
@@ -1,430 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice-E is licensed to you under the terms described in the
-// ICEE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-// Ice-E version 1.3.0
-// Generated from file `pose3dencoders.ice'
-
-#include <pose3dencoders.h>
-#include <IceE/LocalException.h>
-#include <IceE/ObjectFactory.h>
-#include <IceE/BasicStream.h>
-#include <IceE/LocalException.h>
-#include <IceE/Iterator.h>
-
-#ifndef ICEE_IGNORE_VERSION
-# if ICEE_INT_VERSION / 100 != 103
-# error IceE version mismatch!
-# endif
-# if ICEE_INT_VERSION % 100 < 0
-# error IceE patch level mismatch!
-# endif
-#endif
-
-static const ::std::string __jderobot__Pose3DEncoders__getPose3DEncodersData_name = "getPose3DEncodersData";
-
-::Ice::Object* IceInternal::upCast(::jderobot::Pose3DEncodersData* p) { return p; }
-::IceProxy::Ice::Object* IceInternal::upCast(::IceProxy::jderobot::Pose3DEncodersData* p) { return p; }
-
-::Ice::Object* IceInternal::upCast(::jderobot::Pose3DEncoders* p) { return p; }
-::IceProxy::Ice::Object* IceInternal::upCast(::IceProxy::jderobot::Pose3DEncoders* p) { return p; }
-
-void
-jderobot::__read(::IceInternal::BasicStream* __is, ::jderobot::Pose3DEncodersDataPrx& v)
-{
- ::Ice::ObjectPrx proxy;
- __is->read(proxy);
- if(!proxy)
- {
- v = 0;
- }
- else
- {
- v = new ::IceProxy::jderobot::Pose3DEncodersData;
- v->__copyFrom(proxy);
- }
-}
-
-void
-jderobot::__read(::IceInternal::BasicStream* __is, ::jderobot::Pose3DEncodersPrx& v)
-{
- ::Ice::ObjectPrx proxy;
- __is->read(proxy);
- if(!proxy)
- {
- v = 0;
- }
- else
- {
- v = new ::IceProxy::jderobot::Pose3DEncoders;
- v->__copyFrom(proxy);
- }
-}
-
-jderobot::Pose3DEncodersData::Pose3DEncodersData(::Ice::Float __ice_x, ::Ice::Float __ice_y, ::Ice::Float __ice_z, ::Ice::Float __ice_pan, ::Ice::Float __ice_tilt, ::Ice::Float __ice_roll, ::Ice::Int __ice_clock) :
- x(__ice_x),
- y(__ice_y),
- z(__ice_z),
- pan(__ice_pan),
- tilt(__ice_tilt),
- roll(__ice_roll),
- clock(__ice_clock)
-{
-}
-
-static const ::std::string __jderobot__Pose3DEncodersData_ids[2] =
-{
- "::Ice::Object",
- "::jderobot::Pose3DEncodersData"
-};
-
-bool
-jderobot::Pose3DEncodersData::ice_isA(const ::std::string& _s, const ::Ice::Current&) const
-{
- return ::std::binary_search(__jderobot__Pose3DEncodersData_ids, __jderobot__Pose3DEncodersData_ids + 2, _s);
-}
-
-::std::vector< ::std::string>
-jderobot::Pose3DEncodersData::ice_ids(const ::Ice::Current&) const
-{
- return ::std::vector< ::std::string>(&__jderobot__Pose3DEncodersData_ids[0], &__jderobot__Pose3DEncodersData_ids[2]);
-}
-
-const ::std::string&
-jderobot::Pose3DEncodersData::ice_id(const ::Ice::Current&) const
-{
- return __jderobot__Pose3DEncodersData_ids[1];
-}
-
-const ::std::string&
-jderobot::Pose3DEncodersData::ice_staticId()
-{
- return __jderobot__Pose3DEncodersData_ids[1];
-}
-
-void
-jderobot::Pose3DEncodersData::__write(::IceInternal::BasicStream* __os) const
-{
- __os->writeTypeId(ice_staticId());
- __os->startWriteSlice();
- __os->write(x);
- __os->write(y);
- __os->write(z);
- __os->write(pan);
- __os->write(tilt);
- __os->write(roll);
- __os->write(clock);
- __os->endWriteSlice();
- ::Ice::Object::__write(__os);
-}
-
-void
-jderobot::Pose3DEncodersData::__read(::IceInternal::BasicStream* __is, bool __rid)
-{
- if(__rid)
- {
- ::std::string myId;
- __is->readTypeId(myId);
- }
- __is->startReadSlice();
- __is->read(x);
- __is->read(y);
- __is->read(z);
- __is->read(pan);
- __is->read(tilt);
- __is->read(roll);
- __is->read(clock);
- __is->endReadSlice();
- ::Ice::Object::__read(__is, true);
-}
-
-class __F__jderobot__Pose3DEncodersData : public ::Ice::ObjectFactory
-{
-public:
-
- virtual ::Ice::ObjectPtr
- create(const ::std::string& type)
- {
- assert(type == ::jderobot::Pose3DEncodersData::ice_staticId());
- return new ::jderobot::Pose3DEncodersData;
- }
-
- virtual void
- destroy()
- {
- }
-};
-
-static ::Ice::ObjectFactoryPtr __F__jderobot__Pose3DEncodersData_Ptr = new __F__jderobot__Pose3DEncodersData;
-
-const ::Ice::ObjectFactoryPtr&
-jderobot::Pose3DEncodersData::ice_factory()
-{
- return __F__jderobot__Pose3DEncodersData_Ptr;
-}
-
-class __F__jderobot__Pose3DEncodersData__Init
-{
-public:
-
- __F__jderobot__Pose3DEncodersData__Init()
- {
- ::IceInternal::factoryTable->addObjectFactory(::jderobot::Pose3DEncodersData::ice_staticId(), ::jderobot::Pose3DEncodersData::ice_factory());
- }
-
- ~__F__jderobot__Pose3DEncodersData__Init()
- {
- ::IceInternal::factoryTable->removeObjectFactory(::jderobot::Pose3DEncodersData::ice_staticId());
- }
-};
-
-static __F__jderobot__Pose3DEncodersData__Init __F__jderobot__Pose3DEncodersData__i;
-
-#ifdef __APPLE__
-extern "C" { void __F__jderobot__Pose3DEncodersData__initializer() {} }
-#endif
-
-
-bool
-jderobot::operator==(const ::jderobot::Pose3DEncodersData& l, const ::jderobot::Pose3DEncodersData& r)
-{
- return static_cast<const ::Ice::Object&>(l) == static_cast<const ::Ice::Object&>(r);
-}
-
-bool
-jderobot::operator<(const ::jderobot::Pose3DEncodersData& l, const ::jderobot::Pose3DEncodersData& r)
-{
- return static_cast<const ::Ice::Object&>(l) < static_cast<const ::Ice::Object&>(r);
-}
-
-void
-jderobot::__patch__Pose3DEncodersDataPtr(void* __addr, ::Ice::ObjectPtr& v)
-{
- ::jderobot::Pose3DEncodersDataPtr* p = static_cast< ::jderobot::Pose3DEncodersDataPtr*>(__addr);
- assert(p);
- *p = ::jderobot::Pose3DEncodersDataPtr::dynamicCast(v);
- if(v && !*p)
- {
- IceInternal::Ex::throwUOE(::jderobot::Pose3DEncodersData::ice_staticId(), v->ice_id());
- }
-}
-
-static const ::std::string __jderobot__Pose3DEncoders_ids[2] =
-{
- "::Ice::Object",
- "::jderobot::Pose3DEncoders"
-};
-
-bool
-jderobot::Pose3DEncoders::ice_isA(const ::std::string& _s, const ::Ice::Current&) const
-{
- return ::std::binary_search(__jderobot__Pose3DEncoders_ids, __jderobot__Pose3DEncoders_ids + 2, _s);
-}
-
-::std::vector< ::std::string>
-jderobot::Pose3DEncoders::ice_ids(const ::Ice::Current&) const
-{
- return ::std::vector< ::std::string>(&__jderobot__Pose3DEncoders_ids[0], &__jderobot__Pose3DEncoders_ids[2]);
-}
-
-const ::std::string&
-jderobot::Pose3DEncoders::ice_id(const ::Ice::Current&) const
-{
- return __jderobot__Pose3DEncoders_ids[1];
-}
-
-const ::std::string&
-jderobot::Pose3DEncoders::ice_staticId()
-{
- return __jderobot__Pose3DEncoders_ids[1];
-}
-
-#ifndef ICEE_PURE_CLIENT
-::Ice::DispatchStatus
-jderobot::Pose3DEncoders::___getPose3DEncodersData(::IceInternal::Incoming& __inS, const ::Ice::Current& __current)
-{
- __checkMode(::Ice::Idempotent, __current.mode);
- ::IceInternal::BasicStream* __os = __inS.os();
- ::jderobot::Pose3DEncodersDataPtr __ret = getPose3DEncodersData(__current);
- __os->write(::Ice::ObjectPtr(::IceInternal::upCast(__ret.get())));
- __os->writePendingObjects();
- return ::Ice::DispatchOK;
-}
-#endif // ICEE_PURE_CLIENT
-
-#ifndef ICEE_PURE_CLIENT
-static ::std::string __jderobot__Pose3DEncoders_all[] =
-{
- "getPose3DEncodersData",
- "ice_id",
- "ice_ids",
- "ice_isA",
- "ice_ping"
-};
-
-::Ice::DispatchStatus
-jderobot::Pose3DEncoders::__dispatch(::IceInternal::Incoming& in, const ::Ice::Current& current)
-{
- ::std::pair< ::std::string*, ::std::string*> r = ::std::equal_range(__jderobot__Pose3DEncoders_all, __jderobot__Pose3DEncoders_all + 5, current.operation);
- if(r.first == r.second)
- {
- throw Ice::OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
- }
-
- switch(r.first - __jderobot__Pose3DEncoders_all)
- {
- case 0:
- {
- return ___getPose3DEncodersData(in, current);
- }
- case 1:
- {
- return ___ice_id(in, current);
- }
- case 2:
- {
- return ___ice_ids(in, current);
- }
- case 3:
- {
- return ___ice_isA(in, current);
- }
- case 4:
- {
- return ___ice_ping(in, current);
- }
- }
-
- assert(false);
- throw Ice::OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
-}
-#endif // ICEE_PURE_CLIENT
-
-void
-jderobot::Pose3DEncoders::__write(::IceInternal::BasicStream* __os) const
-{
- __os->writeTypeId(ice_staticId());
- __os->startWriteSlice();
- __os->endWriteSlice();
- ::Ice::Object::__write(__os);
-}
-
-void
-jderobot::Pose3DEncoders::__read(::IceInternal::BasicStream* __is, bool __rid)
-{
- if(__rid)
- {
- ::std::string myId;
- __is->readTypeId(myId);
- }
- __is->startReadSlice();
- __is->endReadSlice();
- ::Ice::Object::__read(__is, true);
-}
-
-
-bool
-jderobot::operator==(const ::jderobot::Pose3DEncoders& l, const ::jderobot::Pose3DEncoders& r)
-{
- return static_cast<const ::Ice::Object&>(l) == static_cast<const ::Ice::Object&>(r);
-}
-
-bool
-jderobot::operator<(const ::jderobot::Pose3DEncoders& l, const ::jderobot::Pose3DEncoders& r)
-{
- return static_cast<const ::Ice::Object&>(l) < static_cast<const ::Ice::Object&>(r);
-}
-
-void
-jderobot::__patch__Pose3DEncodersPtr(void* __addr, ::Ice::ObjectPtr& v)
-{
- ::jderobot::Pose3DEncodersPtr* p = static_cast< ::jderobot::Pose3DEncodersPtr*>(__addr);
- assert(p);
- *p = ::jderobot::Pose3DEncodersPtr::dynamicCast(v);
- if(v && !*p)
- {
- IceInternal::Ex::throwUOE(::jderobot::Pose3DEncoders::ice_staticId(), v->ice_id());
- }
-}
-
-const ::std::string&
-IceProxy::jderobot::Pose3DEncodersData::ice_staticId()
-{
- return __jderobot__Pose3DEncodersData_ids[1];
-}
-
-::IceProxy::Ice::Object*
-IceProxy::jderobot::Pose3DEncodersData::__newInstance() const
-{
- return new Pose3DEncodersData;
-}
-
-::jderobot::Pose3DEncodersDataPtr
-IceProxy::jderobot::Pose3DEncoders::getPose3DEncodersData(const ::Ice::Context* __ctx)
-{
- int __cnt = 0;
- while(true)
- {
- ::IceInternal::RequestHandlerPtr __handler;
- try
- {
- __checkTwowayOnly(__jderobot__Pose3DEncoders__getPose3DEncodersData_name);
- __handler = __getRequestHandler();
- ::IceInternal::Outgoing __outS(__handler.get(), _reference.get(), __jderobot__Pose3DEncoders__getPose3DEncodersData_name, ::Ice::Idempotent, __ctx);
- bool __ok = __outS.invoke();
- try
- {
- if(!__ok)
- {
- __outS.is()->throwUnknownUserException();
- }
- ::jderobot::Pose3DEncodersDataPtr __ret;
- ::IceInternal::BasicStream* __is = __outS.is();
- __is->read(::jderobot::__patch__Pose3DEncodersDataPtr, &__ret);
- __is->readPendingObjects();
- return __ret;
- }
- catch(const ::Ice::LocalException& __ex)
- {
- throw ::IceInternal::LocalExceptionWrapper(__ex, false);
- }
-#if defined(_MSC_VER) && defined(_M_ARM) // ARM bug.
- catch(...)
- {
- throw;
- }
-#endif
- }
- catch(const ::IceInternal::LocalExceptionWrapper& __ex)
- {
- __handleExceptionWrapperRelaxed(__handler, __ex, __cnt);
- }
- catch(const ::Ice::LocalException& __ex)
- {
- __handleException(__handler, __ex, __cnt);
- }
-#if defined(_MSC_VER) && defined(_M_ARM) // ARM bug.
- catch(...)
- {
- throw;
- }
-#endif
- }
-}
-
-const ::std::string&
-IceProxy::jderobot::Pose3DEncoders::ice_staticId()
-{
- return __jderobot__Pose3DEncoders_ids[1];
-}
-
-::IceProxy::Ice::Object*
-IceProxy::jderobot::Pose3DEncoders::__newInstance() const
-{
- return new Pose3DEncoders;
-}
Deleted: trunk/src/stable/components/naoserver/interfaces/cpp/jderobot/pose3dencoders.h
===================================================================
--- trunk/src/stable/components/naoserver/interfaces/cpp/jderobot/pose3dencoders.h 2014-01-25 18:44:50 UTC (rev 1146)
+++ trunk/src/stable/components/naoserver/interfaces/cpp/jderobot/pose3dencoders.h 2014-01-25 20:27:32 UTC (rev 1147)
@@ -1,333 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice-E is licensed to you under the terms described in the
-// ICEE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-// Ice-E version 1.3.0
-// Generated from file `pose3dencoders.ice'
-
-#ifndef ___users_eperdices_GO2012_naoserver_src_interfaces_cpp_jderobot_pose3dencoders_h__
-#define ___users_eperdices_GO2012_naoserver_src_interfaces_cpp_jderobot_pose3dencoders_h__
-
-#include <IceE/ProxyF.h>
-#include <IceE/ObjectF.h>
-#include <IceE/Exception.h>
-#include <IceE/ScopedArray.h>
-#include <IceE/Proxy.h>
-#include <IceE/Object.h>
-#ifndef ICEE_PURE_CLIENT
-# include <IceE/Incoming.h>
-#endif
-#include <IceE/Outgoing.h>
-#include <IceE/UserExceptionFactory.h>
-#include <IceE/FactoryTable.h>
-#include <jderobot/common.h>
-#include <IceE/UndefSysMacros.h>
-
-#ifndef ICEE_IGNORE_VERSION
-# if ICEE_INT_VERSION / 100 != 103
-# error IceE version mismatch!
-# endif
-# if ICEE_INT_VERSION % 100 < 0
-# error IceE patch level mismatch!
-# endif
-#endif
-
-namespace IceProxy
-{
-
-namespace jderobot
-{
-
-class Pose3DEncodersData;
-
-class Pose3DEncoders;
-
-}
-
-}
-
-namespace jderobot
-{
-
-class Pose3DEncodersData;
-bool operator==(const Pose3DEncodersData&, const Pose3DEncodersData&);
-bool operator<(const Pose3DEncodersData&, const Pose3DEncodersData&);
-
-class Pose3DEncoders;
-bool operator==(const Pose3DEncoders&, const Pose3DEncoders&);
-bool operator<(const Pose3DEncoders&, const Pose3DEncoders&);
-
-}
-
-namespace IceInternal
-{
-
-::Ice::Object* upCast(::jderobot::Pose3DEncodersData*);
-::IceProxy::Ice::Object* upCast(::IceProxy::jderobot::Pose3DEncodersData*);
-
-::Ice::Object* upCast(::jderobot::Pose3DEncoders*);
-::IceProxy::Ice::Object* upCast(::IceProxy::jderobot::Pose3DEncoders*);
-
-}
-
-namespace jderobot
-{
-
-typedef ::IceInternal::Handle< ::jderobot::Pose3DEncodersData> Pose3DEncodersDataPtr;
-typedef ::IceInternal::ProxyHandle< ::IceProxy::jderobot::Pose3DEncodersData> Pose3DEncodersDataPrx;
-
-void __read(::IceInternal::BasicStream*, Pose3DEncodersDataPrx&);
-void __patch__Pose3DEncodersDataPtr(void*, ::Ice::ObjectPtr&);
-
-typedef ::IceInternal::Handle< ::jderobot::Pose3DEncoders> Pose3DEncodersPtr;
-typedef ::IceInternal::ProxyHandle< ::IceProxy::jderobot::Pose3DEncoders> Pose3DEncodersPrx;
-
-void __read(::IceInternal::BasicStream*, Pose3DEncodersPrx&);
-void __patch__Pose3DEncodersPtr(void*, ::Ice::ObjectPtr&);
-
-}
-
-namespace jderobot
-{
-
-}
-
-namespace jderobot
-{
-
-class Pose3DEncodersData : virtual public ::Ice::Object
-{
-public:
-
- typedef Pose3DEncodersDataPrx ProxyType;
- typedef Pose3DEncodersDataPtr PointerType;
-
- Pose3DEncodersData() {}
- Pose3DEncodersData(::Ice::Float, ::Ice::Float, ::Ice::Float, ::Ice::Float, ::Ice::Float, ::Ice::Float, ::Ice::Int);
-
- virtual bool ice_isA(const ::std::string&, const ::Ice::Current& = ::Ice::Current()) const;
- virtual ::std::vector< ::std::string> ice_ids(const ::Ice::Current& = ::Ice::Current()) const;
- virtual const ::std::string& ice_id(const ::Ice::Current& = ::Ice::Current()) const;
- static const ::std::string& ice_staticId();
-
-
- virtual void __write(::IceInternal::BasicStream*) const;
- virtual void __read(::IceInternal::BasicStream*, bool);
-
- static const ::Ice::ObjectFactoryPtr& ice_factory();
-
-protected:
-
- virtual ~Pose3DEncodersData() {}
-
-
-public:
-
- ::Ice::Float x;
- ::Ice::Float y;
- ::Ice::Float z;
- ::Ice::Float pan;
- ::Ice::Float tilt;
- ::Ice::Float roll;
- ::Ice::Int clock;
-};
-
-class Pose3DEncoders : virtual public ::Ice::Object
-{
-public:
-
- typedef Pose3DEncodersPrx ProxyType;
- typedef Pose3DEncodersPtr PointerType;
-
-
- virtual bool ice_isA(const ::std::string&, const ::Ice::Current& = ::Ice::Current()) const;
- virtual ::std::vector< ::std::string> ice_ids(const ::Ice::Current& = ::Ice::Current()) const;
- virtual const ::std::string& ice_id(const ::Ice::Current& = ::Ice::Current()) const;
- static const ::std::string& ice_staticId();
-
- virtual ::jderobot::Pose3DEncodersDataPtr getPose3DEncodersData(const ::Ice::Current& = ::Ice::Current()) = 0;
-#ifndef ICEE_PURE_CLIENT
- ::Ice::DispatchStatus ___getPose3DEncodersData(::IceInternal::Incoming&, const ::Ice::Current&);
-#endif // ICEE_PURE_CLIENT
-
-#ifndef ICEE_PURE_CLIENT
- virtual ::Ice::DispatchStatus __dispatch(::IceInternal::Incoming&, const ::Ice::Current&);
-#endif // ICEE_PURE_CLIENT
-
- virtual void __write(::IceInternal::BasicStream*) const;
- virtual void __read(::IceInternal::BasicStream*, bool);
-};
-
-}
-
-namespace IceProxy
-{
-
-namespace jderobot
-{
-
-class Pose3DEncodersData : virtual public ::IceProxy::Ice::Object
-{
-public:
-
- ::IceInternal::ProxyHandle<Pose3DEncodersData> ice_context(const ::Ice::Context& __context) const
- {
- return dynamic_cast<Pose3DEncodersData*>(::IceProxy::Ice::Object::ice_context(__context).get());
- }
-
- ::IceInternal::ProxyHandle<Pose3DEncodersData> ice_secure(bool __secure) const
- {
- return dynamic_cast<Pose3DEncodersData*>(::IceProxy::Ice::Object::ice_secure(__secure).get());
- }
-
-#ifdef ICEE_HAS_ROUTER
- ::IceInternal::ProxyHandle<Pose3DEncodersData> ice_router(const ::Ice::RouterPrx& __router) const
- {
- return dynamic_cast<Pose3DEncodersData*>(::IceProxy::Ice::Object::ice_router(__router).get());
- }
-#endif // ICEE_HAS_ROUTER
-
-#ifdef ICEE_HAS_LOCATOR
- ::IceInternal::ProxyHandle<Pose3DEncodersData> ice_locator(const ::Ice::LocatorPrx& __locator) const
- {
- return dynamic_cast<Pose3DEncodersData*>(::IceProxy::Ice::Object::ice_locator(__locator).get());
- }
-
- ::IceInternal::ProxyHandle<Pose3DEncodersData> ice_adapterId(const std::string& __id) const
- {
- return dynamic_cast<Pose3DEncodersData*>(::IceProxy::Ice::Object::ice_adapterId(__id).get());
- }
-#endif // ICEE_HAS_LOCATOR
-
- ::IceInternal::ProxyHandle<Pose3DEncodersData> ice_twoway() const
- {
- return dynamic_cast<Pose3DEncodersData*>(::IceProxy::Ice::Object::ice_twoway().get());
- }
-
- ::IceInternal::ProxyHandle<Pose3DEncodersData> ice_oneway() const
- {
- return dynamic_cast<Pose3DEncodersData*>(::IceProxy::Ice::Object::ice_oneway().get());
- }
-
- ::IceInternal::ProxyHandle<Pose3DEncodersData> ice_batchOneway() const
- {
- return dynamic_cast<Pose3DEncodersData*>(::IceProxy::Ice::Object::ice_batchOneway().get());
- }
-
- ::IceInternal::ProxyHandle<Pose3DEncodersData> ice_datagram() const
- {
- return dynamic_cast<Pose3DEncodersData*>(::IceProxy::Ice::Object::ice_datagram().get());
- }
-
- ::IceInternal::ProxyHandle<Pose3DEncodersData> ice_batchDatagram() const
- {
- return dynamic_cast<Pose3DEncodersData*>(::IceProxy::Ice::Object::ice_batchDatagram().get());
- }
-
- ::IceInternal::ProxyHandle<Pose3DEncodersData> ice_timeout(int __timeout) const
- {
- return dynamic_cast<Pose3DEncodersData*>(::IceProxy::Ice::Object::ice_timeout(__timeout).get());
- }
-
- static const ::std::string& ice_staticId();
-
-private:
-
- virtual ::IceProxy::Ice::Object* __newInstance() const;
-};
-
-class Pose3DEncoders : virtual public ::IceProxy::Ice::Object
-{
-public:
-
- ::jderobot::Pose3DEncodersDataPtr getPose3DEncodersData()
- {
- return getPose3DEncodersData(0);
- }
- ::jderobot::Pose3DEncodersDataPtr getPose3DEncodersData(const ::Ice::Context& __ctx)
- {
- return getPose3DEncodersData(&__ctx);
- }
-
-private:
-
- ::jderobot::Pose3DEncodersDataPtr getPose3DEncodersData(const ::Ice::Context*);
-
-public:
-
- ::IceInternal::ProxyHandle<Pose3DEncoders> ice_context(const ::Ice::Context& __context) const
- {
- return dynamic_cast<Pose3DEncoders*>(::IceProxy::Ice::Object::ice_context(__context).get());
- }
-
- ::IceInternal::ProxyHandle<Pose3DEncoders> ice_secure(bool __secure) const
- {
- return dynamic_cast<Pose3DEncoders*>(::IceProxy::Ice::Object::ice_secure(__secure).get());
- }
-
-#ifdef ICEE_HAS_ROUTER
- ::IceInternal::ProxyHandle<Pose3DEncoders> ice_router(const ::Ice::RouterPrx& __router) const
- {
- return dynamic_cast<Pose3DEncoders*>(::IceProxy::Ice::Object::ice_router(__router).get());
- }
-#endif // ICEE_HAS_ROUTER
-
-#ifdef ICEE_HAS_LOCATOR
- ::IceInternal::ProxyHandle<Pose3DEncoders> ice_locator(const ::Ice::LocatorPrx& __locator) const
- {
- return dynamic_cast<Pose3DEncoders*>(::IceProxy::Ice::Object::ice_locator(__locator).get());
- }
-
- ::IceInternal::ProxyHandle<Pose3DEncoders> ice_adapterId(const std::string& __id) const
- {
- return dynamic_cast<Pose3DEncoders*>(::IceProxy::Ice::Object::ice_adapterId(__id).get());
- }
-#endif // ICEE_HAS_LOCATOR
-
- ::IceInternal::ProxyHandle<Pose3DEncoders> ice_twoway() const
- {
- return dynamic_cast<Pose3DEncoders*>(::IceProxy::Ice::Object::ice_twoway().get());
- }
-
- ::IceInternal::ProxyHandle<Pose3DEncoders> ice_oneway() const
- {
- return dynamic_cast<Pose3DEncoders*>(::IceProxy::Ice::Object::ice_oneway().get());
- }
-
- ::IceInternal::ProxyHandle<Pose3DEncoders> ice_batchOneway() const
- {
- return dynamic_cast<Pose3DEncoders*>(::IceProxy::Ice::Object::ice_batchOneway().get());
- }
-
- ::IceInternal::ProxyHandle<Pose3DEncoders> ice_datagram() const
- {
- return dynamic_cast<Pose3DEncoders*>(::IceProxy::Ice::Object::ice_datagram().get());
- }
-
- ::IceInternal::ProxyHandle<Pose3DEncoders> ice_batchDatagram() const
- {
- return dynamic_cast<Pose3DEncoders*>(::IceProxy::Ice::Object::ice_batchDatagram().get());
- }
-
- ::IceInternal::ProxyHandle<Pose3DEncoders> ice_timeout(int __timeout) const
- {
- return dynamic_cast<Pose3DEncoders*>(::IceProxy::Ice::Object::ice_timeout(__timeout).get());
- }
-
- static const ::std::string& ice_staticId();
-
-private:
-
- virtual ::IceProxy::Ice::Object* __newInstance() const;
-};
-
-}
-
-}
-
-#endif
Deleted: trunk/src/stable/components/naoserver/interfaces/cpp/jderobot/pose3dmotors.cpp
===================================================================
--- trunk/src/stable/components/naoserver/interfaces/cpp/jderobot/pose3dmotors.cpp 2014-01-25 18:44:50 UTC (rev 1146)
+++ trunk/src/stable/components/naoserver/interfaces/cpp/jderobot/pose3dmotors.cpp 2014-01-25 20:27:32 UTC (rev 1147)
@@ -1,767 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice-E is licensed to you under the terms described in the
-// ICEE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-// Ice-E version 1.3.0
-// Generated from file `pose3dmotors.ice'
-
-#include <pose3dmotors.h>
-#include <IceE/LocalException.h>
-#include <IceE/ObjectFactory.h>
-#include <IceE/BasicStream.h>
-#include <IceE/LocalException.h>
-#include <IceE/Iterator.h>
-
-#ifndef ICEE_IGNORE_VERSION
-# if ICEE_INT_VERSION / 100 != 103
-# error IceE version mismatch!
-# endif
-# if ICEE_INT_VERSION % 100 < 0
-# error IceE patch level mismatch!
-# endif
-#endif
-
-static const ::std::string __jderobot__Pose3DMotors__setPose3DMotorsData_name = "setPose3DMotorsData";
-
-static const ::std::string __jderobot__Pose3DMotors__getPose3DMotorsData_name = "getPose3DMotorsData";
-
-static const ::std::string __jderobot__Pose3DMotors__getPose3DMotorsParams_name = "getPose3DMotorsParams";
-
-::Ice::Object* IceInternal::upCast(::jderobot::Pose3DMotorsData* p) { return p; }
-::IceProxy::Ice::Object* IceInternal::upCast(::IceProxy::jderobot::Pose3DMotorsData* p) { return p; }
-
-::Ice::Object* IceInternal::upCast(::jderobot::Pose3DMotorsParams* p) { return p; }
-::IceProxy::Ice::Object* IceInternal::upCast(::IceProxy::jderobot::Pose3DMotorsParams* p) { return p; }
-
-::Ice::Object* IceInternal::upCast(::jderobot::Pose3DMotors* p) { return p; }
-::IceProxy::Ice::Object* IceInternal::upCast(::IceProxy::jderobot::Pose3DMotors* p) { return p; }
-
-void
-jderobot::__read(::IceInternal::BasicStream* __is, ::jderobot::Pose3DMotorsDataPrx& v)
-{
- ::Ice::ObjectPrx proxy;
- __is->read(proxy);
- if(!proxy)
- {
- v = 0;
- }
- else
- {
- v = new ::IceProxy::jderobot::Pose3DMotorsData;
- v->__copyFrom(proxy);
- }
-}
-
-void
-jderobot::__read(::IceInternal::BasicStream* __is, ::jderobot::Pose3DMotorsParamsPrx& v)
-{
- ::Ice::ObjectPrx proxy;
- __is->read(proxy);
- if(!proxy)
- {
- v = 0;
- }
- else
- {
- v = new ::IceProxy::jderobot::Pose3DMotorsParams;
- v->__copyFrom(proxy);
- }
-}
-
-void
-jderobot::__read(::IceInternal::BasicStream* __is, ::jderobot::Pose3DMotorsPrx& v)
-{
- ::Ice::ObjectPrx proxy;
- __is->read(proxy);
- if(!proxy)
- {
- v = 0;
- }
- else
- {
- v = new ::IceProxy::jderobot::Pose3DMotors;
- v->__copyFrom(proxy);
- }
-}
-
-jderobot::Pose3DMotorsData::Pose3DMotorsData(::Ice::Float __ice_x, ::Ice::Float __ice_y, ::Ice::Float __ice_z, ::Ice::Float __ice_pan, ::Ice::Float __ice_tilt, ::Ice::Float __ice_roll, ::Ice::Float __ice_panSpeed, ::Ice::Float __ice_tiltSpeed) :
- x(__ice_x),
- y(__ice_y),
- z(__ice_z),
- pan(__ice_pan),
- tilt(__ice_tilt),
- roll(__ice_roll),
- panSpeed(__ice_panSpeed),
- tiltSpeed(__ice_tiltSpeed)
-{
-}
-
-static const ::std::string __jderobot__Pose3DMotorsData_ids[2] =
-{
- "::Ice::Object",
- "::jderobot::Pose3DMotorsData"
-};
-
-bool
-jderobot::Pose3DMotorsData::ice_isA(const ::std::string& _s, const ::Ice::Current&) const
-{
- return ::std::binary_search(__jderobot__Pose3DMotorsData_ids, __jderobot__Pose3DMotorsData_ids + 2, _s);
-}
-
-::std::vector< ::std::string>
-jderobot::Pose3DMotorsData::ice_ids(const ::Ice::Current&) const
-{
- return ::std::vector< ::std::string>(&__jderobot__Pose3DMotorsData_ids[0], &__jderobot__Pose3DMotorsData_ids[2]);
-}
-
-const ::std::string&
-jderobot::Pose3DMotorsData::ice_id(const ::Ice::Current&) const
-{
- return __jderobot__Pose3DMotorsData_ids[1];
-}
-
-const ::std::string&
-jderobot::Pose3DMotorsData::ice_staticId()
-{
- return __jderobot__Pose3DMotorsData_ids[1];
-}
-
-void
-jderobot::Pose3DMotorsData::__write(::IceInternal::BasicStream* __os) const
-{
- __os->writeTypeId(ice_staticId());
- __os->startWriteSlice();
- __os->write(x);
- __os->write(y);
- __os->write(z);
- __os->write(pan);
- __os->write(tilt);
- __os->write(roll);
- __os->write(panSpeed);
- __os->write(tiltSpeed);
- __os->endWriteSlice();
- ::Ice::Object::__write(__os);
-}
-
-void
-jderobot::Pose3DMotorsData::__read(::IceInternal::BasicStream* __is, bool __rid)
-{
- if(__rid)
- {
- ::std::string myId;
- __is->readTypeId(myId);
- }
- __is->startReadSlice();
- __is->read(x);
- __is->read(y);
- __is->read(z);
- __is->read(pan);
- __is->read(tilt);
- __is->read(roll);
- __is->read(panSpeed);
- __is->read(tiltSpeed);
- __is->endReadSlice();
- ::Ice::Object::__read(__is, true);
-}
-
-class __F__jderobot__Pose3DMotorsData : public ::Ice::ObjectFactory
-{
-public:
-
- virtual ::Ice::ObjectPtr
- create(const ::std::string& type)
- {
- assert(type == ::jderobot::Pose3DMotorsData::ice_staticId());
- return new ::jderobot::Pose3DMotorsData;
- }
-
- virtual void
- destroy()
- {
- }
-};
-
-static ::Ice::ObjectFactoryPtr __F__jderobot__Pose3DMotorsData_Ptr = new __F__jderobot__Pose3DMotorsData;
-
-const ::Ice::ObjectFactoryPtr&
-jderobot::Pose3DMotorsData::ice_factory()
-{
- return __F__jderobot__Pose3DMotorsData_Ptr;
-}
-
-class __F__jderobot__Pose3DMotorsData__Init
-{
-public:
-
- __F__jderobot__Pose3DMotorsData__Init()
- {
- ::IceInternal::factoryTable->addObjectFactory(::jderobot::Pose3DMotorsData::ice_staticId(), ::jderobot::Pose3DMotorsData::ice_factory());
- }
-
- ~__F__jderobot__Pose3DMotorsData__Init()
- {
- ::IceInternal::factoryTable->removeObjectFactory(::jderobot::Pose3DMotorsData::ice_staticId());
- }
-};
-
-static __F__jderobot__Pose3DMotorsData__Init __F__jderobot__Pose3DMotorsData__i;
-
-#ifdef __APPLE__
-extern "C" { void __F__jderobot__Pose3DMotorsData__initializer() {} }
-#endif
-
-
-bool
-jderobot::operator==(const ::jderobot::Pose3DMotorsData& l, const ::jderobot::Pose3DMotorsData& r)
-{
- return static_cast<const ::Ice::Object&>(l) == static_cast<const ::Ice::Object&>(r);
-}
-
-bool
-jderobot::operator<(const ::jderobot::Pose3DMotorsData& l, const ::jderobot::Pose3DMotorsData& r)
-{
- return static_cast<const ::Ice::Object&>(l) < static_cast<const ::Ice::Object&>(r);
-}
-
-void
-jderobot::__patch__Pose3DMotorsDataPtr(void* __addr, ::Ice::ObjectPtr& v)
-{
- ::jderobot::Pose3DMotorsDataPtr* p = static_cast< ::jderobot::Pose3DMotorsDataPtr*>(__addr);
- assert(p);
- *p = ::jderobot::Pose3DMotorsDataPtr::dynamicCast(v);
- if(v && !*p)
- {
- IceInternal::Ex::throwUOE(::jderobot::Pose3DMotorsData::ice_staticId(), v->ice_id());
- }
-}
-
-jderobot::Pose3DMotorsParams::Pose3DMotorsParams(::Ice::Float __ice_maxPan, ::Ice::Float __ice_minPan, ::Ice::Float __ice_maxTilt, ::Ice::Float __ice_minTilt, ::Ice::Float __ice_maxPanSpeed, ::Ice::Float __ice_maxTiltSpeed) :
- maxPan(__ice_maxPan),
- minPan(__ice_minPan),
- maxTilt(__ice_maxTilt),
- minTilt(__ice_minTilt),
- maxPanSpeed(__ice_maxPanSpeed),
- maxTiltSpeed(__ice_maxTiltSpeed)
-{
-}
-
-static const ::std::string __jderobot__Pose3DMotorsParams_ids[2] =
-{
- "::Ice::Object",
- "::jderobot::Pose3DMotorsParams"
-};
-
-bool
-jderobot::Pose3DMotorsParams::ice_isA(const ::std::string& _s, const ::Ice::Current&) const
-{
- return ::std::binary_search(__jderobot__Pose3DMotorsParams_ids, __jderobot__Pose3DMotorsParams_ids + 2, _s);
-}
-
-::std::vector< ::std::string>
-jderobot::Pose3DMotorsParams::ice_ids(const ::Ice::Current&) const
-{
- return ::std::vector< ::std::string>(&__jderobot__Pose3DMotorsParams_ids[0], &__jderobot__Pose3DMotorsParams_ids[2]);
-}
-
-const ::std::string&
-jderobot::Pose3DMotorsParams::ice_id(const ::Ice::Current&) const
-{
- return __jderobot__Pose3DMotorsParams_ids[1];
-}
-
-const ::std::string&
-jderobot::Pose3DMotorsParams::ice_staticId()
-{
- return __jderobot__Pose3DMotorsParams_ids[1];
-}
-
-void
-jderobot::Pose3DMotorsParams::__write(::IceInternal::BasicStream* __os) const
-{
- __os->writeTypeId(ice_staticId());
- __os->startWriteSlice();
- __os->write(maxPan);
- __os->write(minPan);
- __os->write(maxTilt);
- __os->write(minTilt);
- __os->write(maxPanSpeed);
- __os->write(maxTiltSpeed);
- __os->endWriteSlice();
- ::Ice::Object::__write(__os);
-}
-
-void
-jderobot::Pose3DMotorsParams::__read(::IceInternal::BasicStream* __is, bool __rid)
-{
- if(__rid)
- {
- ::std::string myId;
- __is->readTypeId(myId);
- }
- __is->startReadSlice();
- __is->read(maxPan);
- __is->read(minPan);
- __is->read(maxTilt);
- __is->read(minTilt);
- __is->read(maxPanSpeed);
- __is->read(maxTiltSpeed);
- __is->endReadSlice();
- ::Ice::Object::__read(__is, true);
-}
-
-class __F__jderobot__Pose3DMotorsParams : public ::Ice::ObjectFactory
-{
-public:
-
- virtual ::Ice::ObjectPtr
- create(const ::std::string& type)
- {
- assert(type == ::jderobot::Pose3DMotorsParams::ice_staticId());
- return new ::jderobot::Pose3DMotorsParams;
- }
-
- virtual void
- destroy()
- {
- }
-};
-
-static ::Ice::ObjectFactoryPtr __F__jderobot__Pose3DMotorsParams_Ptr = new __F__jderobot__Pose3DMotorsParams;
-
-const ::Ice::ObjectFactoryPtr&
-jderobot::Pose3DMotorsParams::ice_factory()
-{
- return __F__jderobot__Pose3DMotorsParams_Ptr;
-}
-
-class __F__jderobot__Pose3DMotorsParams__Init
-{
-public:
-
- __F__jderobot__Pose3DMotorsParams__Init()
- {
- ::IceInternal::factoryTable->addObjectFactory(::jderobot::Pose3DMotorsParams::ice_staticId(), ::jderobot::Pose3DMotorsParams::ice_factory());
- }
-
- ~__F__jderobot__Pose3DMotorsParams__Init()
- {
- ::IceInternal::factoryTable->removeObjectFactory(::jderobot::Pose3DMotorsParams::ice_staticId());
- }
-};
-
-static __F__jderobot__Pose3DMotorsParams__Init __F__jderobot__Pose3DMotorsParams__i;
-
-#ifdef __APPLE__
-extern "C" { void __F__jderobot__Pose3DMotorsParams__initializer() {} }
-#endif
-
-
-bool
-jderobot::operator==(const ::jderobot::Pose3DMotorsParams& l, const ::jderobot::Pose3DMotorsParams& r)
-{
- return static_cast<const ::Ice::Object&>(l) == static_cast<const ::Ice::Object&>(r);
-}
-
-bool
-jderobot::operator<(const ::jderobot::Pose3DMotorsParams& l, const ::jderobot::Pose3DMotorsParams& r)
-{
- return static_cast<const ::Ice::Object&>(l) < static_cast<const ::Ice::Object&>(r);
-}
-
-void
-jderobot::__patch__Pose3DMotorsParamsPtr(void* __addr, ::Ice::ObjectPtr& v)
-{
- ::jderobot::Pose3DMotorsParamsPtr* p = static_cast< ::jderobot::Pose3DMotorsParamsPtr*>(__addr);
- assert(p);
- *p = ::jderobot::Pose3DMotorsParamsPtr::dynamicCast(v);
- if(v && !*p)
- {
- IceInternal::Ex::throwUOE(::jderobot::Pose3DMotorsParams::ice_staticId(), v->ice_id());
- }
-}
-
-static const ::std::string __jderobot__Pose3DMotors_ids[2] =
-{
- "::Ice::Object",
- "::jderobot::Pose3DMotors"
-};
-
-bool
-jderobot::Pose3DMotors::ice_isA(const ::std::string& _s, const ::Ice::Current&) const
-{
- return ::std::binary_search(__jderobot__Pose3DMotors_ids, __jderobot__Pose3DMotors_ids + 2, _s);
-}
-
-::std::vector< ::std::string>
-jderobot::Pose3DMotors::ice_ids(const ::Ice::Current&) const
-{
- return ::std::vector< ::std::string>(&__jderobot__Pose3DMotors_ids[0], &__jderobot__Pose3DMotors_ids[2]);
-}
-
-const ::std::string&
-jderobot::Pose3DMotors::ice_id(const ::Ice::Current&) const
-{
- return __jderobot__Pose3DMotors_ids[1];
-}
-
-const ::std::string&
-jderobot::Pose3DMotors::ice_staticId()
-{
- return __jderobot__Pose3DMotors_ids[1];
-}
-
-#ifndef ICEE_PURE_CLIENT
-::Ice::DispatchStatus
-jderobot::Pose3DMotors::___setPose3DMotorsData(::IceInternal::Incoming& __inS, const ::Ice::Current& __current)
-{
- __checkMode(::Ice::Normal, __current.mode);
- ::IceInternal::BasicStream* __is = __inS.is();
- ::jderobot::Pose3DMotorsDataPtr data;
- __is->read(::jderobot::__patch__Pose3DMotorsDataPtr, &data);
- __is->readPendingObjects();
- ::IceInternal::BasicStream* __os = __inS.os();
- ::Ice::Int __ret = setPose3DMotorsData(data, __current);
- __os->write(__ret);
- return ::Ice::DispatchOK;
-}
-#endif // ICEE_PURE_CLIENT
-
-#ifndef ICEE_PURE_CLIENT
-::Ice::DispatchStatus
-jderobot::Pose3DMotors::___getPose3DMotorsData(::IceInternal::Incoming& __inS, const ::Ice::Current& __current)
-{
- __checkMode(::Ice::Idempotent, __current.mode);
- ::IceInternal::BasicStream* __os = __inS.os();
- ::jderobot::Pose3DMotorsDataPtr __ret = getPose3DMotorsData(__current);
- __os->write(::Ice::ObjectPtr(::IceInternal::upCast(__ret.get())));
- __os->writePendingObjects();
- return ::Ice::DispatchOK;
-}
-#endif // ICEE_PURE_CLIENT
-
-#ifndef ICEE_PURE_CLIENT
-::Ice::DispatchStatus
-jderobot::Pose3DMotors::___getPose3DMotorsParams(::IceInternal::Incoming& __inS, const ::Ice::Current& __current)
-{
- __checkMode(::Ice::Idempotent, __current.mode);
- ::IceInternal::BasicStream* __os = __inS.os();
- ::jderobot::Pose3DMotorsParamsPtr __ret = getPose3DMotorsParams(__current);
- __os->write(::Ice::ObjectPtr(::IceInternal::upCast(__ret.get())));
- __os->writePendingObjects();
- return ::Ice::DispatchOK;
-}
-#endif // ICEE_PURE_CLIENT
-
-#ifndef ICEE_PURE_CLIENT
-static ::std::string __jderobot__Pose3DMotors_all[] =
-{
- "getPose3DMotorsData",
- "getPose3DMotorsParams",
- "ice_id",
- "ice_ids",
- "ice_isA",
- "ice_ping",
- "setPose3DMotorsData"
-};
-
-::Ice::DispatchStatus
-jderobot::Pose3DMotors::__dispatch(::IceInternal::Incoming& in, const ::Ice::Current& current)
-{
- ::std::pair< ::std::string*, ::std::string*> r = ::std::equal_range(__jderobot__Pose3DMotors_all, __jderobot__Pose3DMotors_all + 7, current.operation);
- if(r.first == r.second)
- {
- throw Ice::OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
- }
-
- switch(r.first - __jderobot__Pose3DMotors_all)
- {
- case 0:
- {
- return ___getPose3DMotorsData(in, current);
- }
- case 1:
- {
- return ___getPose3DMotorsParams(in, current);
- }
- case 2:
- {
- return ___ice_id(in, current);
- }
- case 3:
- {
- return ___ice_ids(in, current);
- }
- case 4:
- {
- return ___ice_isA(in, current);
- }
- case 5:
- {
- return ___ice_ping(in, current);
- }
- case 6:
- {
- return ___setPose3DMotorsData(in, current);
- }
- }
-
- assert(false);
- throw Ice::OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
-}
-#endif // ICEE_PURE_CLIENT
-
-void
-jderobot::Pose3DMotors::__write(::IceInternal::BasicStream* __os) const
-{
- __os->writeTypeId(ice_staticId());
- __os->startWriteSlice();
- __os->endWriteSlice();
- ::Ice::Object::__write(__os);
-}
-
-void
-jderobot::Pose3DMotors::__read(::IceInternal::BasicStream* __is, bool __rid)
-{
- if(__rid)
- {
- ::std::string myId;
- __is->readTypeId(myId);
- }
- __is->startReadSlice();
- __is->endReadSlice();
- ::Ice::Object::__read(__is, true);
-}
-
-
-bool
-jderobot::operator==(const ::jderobot::Pose3DMotors& l, const ::jderobot::Pose3DMotors& r)
-{
- return static_cast<const ::Ice::Object&>(l) == static_cast<const ::Ice::Object&>(r);
-}
-
-bool
-jderobot::operator<(const ::jderobot::Pose3DMotors& l, const ::jderobot::Pose3DMotors& r)
-{
- return static_cast<const ::Ice::Object&>(l) < static_cast<const ::Ice::Object&>(r);
-}
-
-void
-jderobot::__patch__Pose3DMotorsPtr(void* __addr, ::Ice::ObjectPtr& v)
-{
- ::jderobot::Pose3DMotorsPtr* p = static_cast< ::jderobot::Pose3DMotorsPtr*>(__addr);
- assert(p);
- *p = ::jderobot::Pose3DMotorsPtr::dynamicCast(v);
- if(v && !*p)
- {
- IceInternal::Ex::throwUOE(::jderobot::Pose3DMotors::ice_staticId(), v->ice_id());
- }
-}
-
-const ::std::string&
-IceProxy::jderobot::Pose3DMotorsData::ice_staticId()
-{
- return __jderobot__Pose3DMotorsData_ids[1];
-}
-
-::IceProxy::Ice::Object*
-IceProxy::jderobot::Pose3DMotorsData::__newInstance() const
-{
- return new Pose3DMotorsData;
-}
-
-const ::std::string&
-IceProxy::jderobot::Pose3DMotorsParams::ice_staticId()
-{
- return __jderobot__Pose3DMotorsParams_ids[1];
-}
-
-::IceProxy::Ice::Object*
-IceProxy::jderobot::Pose3DMotorsParams::__newInstance() const
-{
- return new Pose3DMotorsParams;
-}
-
-::Ice::Int
-IceProxy::jderobot::Pose3DMotors::setPose3DMotorsData(const ::jderobot::Pose3DMotorsDataPtr& data, const ::Ice::Context* __ctx)
-{
- int __cnt = 0;
- while(true)
- {
- ::IceInternal::RequestHandlerPtr __handler;
- try
- {
- __checkTwowayOnly(__jderobot__Pose3DMotors__setPose3DMotorsData_name);
- __handler = __getRequestHandler();
- ::IceInternal::Outgoing __outS(__handler.get(), _reference.get(), __jderobot__Pose3DMotors__setPose3DMotorsData_name, ::Ice::Normal, __ctx);
- try
- {
- ::IceInternal::BasicStream* __os = __outS.os();
- __os->write(::Ice::ObjectPtr(::IceInternal::upCast(data.get())));
- __os->writePendingObjects();
- }
- catch(const ::Ice::LocalException& __ex)
- {
- __outS.abort(__ex);
- }
- bool __ok = __outS.invoke();
- try
- {
- if(!__ok)
- {
- __outS.is()->throwUnknownUserException();
- }
- ::Ice::Int __ret;
- ::IceInternal::BasicStream* __is = __outS.is();
- __is->read(__ret);
- return __ret;
- }
- catch(const ::Ice::LocalException& __ex)
- {
- throw ::IceInternal::LocalExceptionWrapper(__ex, false);
- }
-#if defined(_MSC_VER) && defined(_M_ARM) // ARM bug.
- catch(...)
- {
- throw;
- }
-#endif
- }
- catch(const ::IceInternal::LocalExceptionWrapper& __ex)
- {
- __handleExceptionWrapper(__handler, __ex);
- }
- catch(const ::Ice::LocalException& __ex)
- {
- __handleException(__handler, __ex, __cnt);
- }
-#if defined(_MSC_VER) && defined(_M_ARM) // ARM bug.
- catch(...)
- {
- throw;
- }
-#endif
- }
-}
-
-::jderobot::Pose3DMotorsDataPtr
-IceProxy::jderobot::Pose3DMotors::getPose3DMotorsData(const ::Ice::Context* __ctx)
-{
- int __cnt = 0;
- while(true)
- {
- ::IceInternal::RequestHandlerPtr __handler;
- try
- {
- __checkTwowayOnly(__jderobot__Pose3DMotors__getPose3DMotorsData_name);
- __handler = __getRequestHandler();
- ::IceInternal::Outgoing __outS(__handler.get(), _reference.get(), __jderobot__Pose3DMotors__getPose3DMotorsData_name, ::Ice::Idempotent, __ctx);
- bool __ok = __outS.invoke();
- try
- {
- if(!__ok)
- {
- __outS.is()->throwUnknownUserException();
- }
- ::jderobot::Pose3DMotorsDataPtr __ret;
- ::IceInternal::BasicStream* __is = __outS.is();
- __is->read(::jderobot::__patch__Pose3DMotorsDataPtr, &__ret);
- __is->readPendingObjects();
- return __ret;
- }
- catch(const ::Ice::LocalException& __ex)
- {
- throw ::IceInternal::LocalExceptionWrapper(__ex, false);
- }
-#if defined(_MSC_VER) && defined(_M_ARM) // ARM bug.
- catch(...)
- {
- throw;
- }
-#endif
- }
- catch(const ::IceInternal::LocalExceptionWrapper& __ex)
- {
- __handleExceptionWrapperRelaxed(__handler, __ex, __cnt);
- }
- catch(const ::Ice::LocalException& __ex)
- {
- __handleException(__handler, __ex, __cnt);
- }
-#if defined(_MSC_VER) && defined(_M_ARM) // ARM bug.
- catch(...)
- {
- throw;
- }
-#endif
- }
-}
-
-::jderobot::Pose3DMotorsParamsPtr
-IceProxy::jderobot::Pose3DMotors::getPose3DMotorsParams(const ::Ice::Context* __ctx)
-{
- int __cnt = 0;
- while(true)
- {
- ::IceInternal::RequestHandlerPtr __handler;
- try
- {
- __checkTwowayOnly(__jderobot__Pose3DMotors__getPose3DMotorsParams_name);
- __handler = __getRequestHandler();
- ::IceInternal::Outgoing __outS(__handler.get(), _reference.get(), __jderobot__Pose3DMotors__getPose3DMotorsParams_name, ::Ice::Idempotent, __ctx);
- bool __ok = __outS.invoke();
- try
- {
- if(!__ok)
- {
- __outS.is()->throwUnknownUserException();
- }
- ::jderobot::Pose3DMotorsParamsPtr __ret;
- ::IceInternal::BasicStream* __is = __outS.is();
- __is->read(::jderobot::__patch__Pose3DMotorsParamsPtr, &__ret);
- __is->readPendingObjects();
- return __ret;
- }
- catch(const ::Ice::LocalException& __ex)
- {
- throw ::IceInternal::LocalExceptionWrapper(__ex, false);
- }
-#if defined(_MSC_VER) && defined(_M_ARM) // ARM bug.
- catch(...)
- {
- throw;
- }
-#endif
- }
- catch(const ::IceInternal::LocalExceptionWrapper& __ex)
- {
- __handleExceptionWrapperRelaxed(__handler, __ex, __cnt);
- }
- catch(const ::Ice::LocalException& __ex)
- {
- __handleException(__handler, __ex, __cnt);
- }
-#if defined(_MSC_VER) && defined(_M_ARM) // ARM bug.
- catch(...)
- {
- throw;
- }
-#endif
- }
-}
-
-const ::std::string&
-IceProxy::jderobot::Pose3DMotors::ice_staticId()
-{
- return __jderobot__Pose3DMotors_ids[1];
-}
-
-::IceProxy::Ice::Object*
-IceProxy::jderobot::Pose3DMotors::__newInstance() const
-{
- return new Pose3DMotors;
-}
Deleted: trunk/src/stable/components/naoserver/interfaces/cpp/jderobot/pose3dmotors.h
===================================================================
--- trunk/src/stable/components/naoserver/interfaces/cpp/jderobot/pose3dmotors.h 2014-01-25 18:44:50 UTC (rev 1146)
+++ trunk/src/stable/components/naoserver/interfaces/cpp/jderobot/pose3dmotors.h 2014-01-25 20:27:32 UTC (rev 1147)
@@ -1,495 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice-E is licensed to you under the terms described in the
-// ICEE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-// Ice-E version 1.3.0
-// Generated from file `pose3dmotors.ice'
-
-#ifndef ___users_eperdices_GO2012_naoserver_src_interfaces_cpp_jderobot_pose3dmotors_h__
-#define ___users_eperdices_GO2012_naoserver_src_interfaces_cpp_jderobot_pose3dmotors_h__
-
-#include <IceE/ProxyF.h>
-#include <IceE/ObjectF.h>
-#include <IceE/Exception.h>
-#include <IceE/ScopedArray.h>
-#include <IceE/Proxy.h>
-#include <IceE/Object.h>
-#ifndef ICEE_PURE_CLIENT
-# include <IceE/Incoming.h>
-#endif
-#include <IceE/Outgoing.h>
-#include <IceE/UserExceptionFactory.h>
-#include <IceE/FactoryTable.h>
-#include <jderobot/common.h>
-#include <IceE/UndefSysMacros.h>
-
-#ifndef ICEE_IGNORE_VERSION
-# if ICEE_INT_VERSION / 100 != 103
-# error IceE version mismatch!
-# endif
-# if ICEE_INT_VERSION % 100 < 0
-# error IceE patch level mismatch!
-# endif
-#endif
-
-namespace IceProxy
-{
-
-namespace jderobot
-{
-
-class Pose3DMotorsData;
-
-class Pose3DMotorsParams;
-
-class Pose3DMotors;
-
-}
-
-}
-
-namespace jderobot
-{
-
-class Pose3DMotorsData;
-bool operator==(const Pose3DMotorsData&, const Pose3DMotorsData&);
-bool operator<(const Pose3DMotorsData&, const Pose3DMotorsData&);
-
-class Pose3DMotorsParams;
-bool operator==(const Pose3DMotorsParams&, const Pose3DMotorsParams&);
-bool operator<(const Pose3DMotorsParams&, const Pose3DMotorsParams&);
-
-class Pose3DMotors;
-bool operator==(const Pose3DMotors&, const Pose3DMotors&);
-bool operator<(const Pose3DMotors&, const Pose3DMotors&);
-
-}
-
-namespace IceInternal
-{
-
-::Ice::Object* upCast(::jderobot::Pose3DMotorsData*);
-::IceProxy::Ice::Object* upCast(::IceProxy::jderobot::Pose3DMotorsData*);
-
-::Ice::Object* upCast(::jderobot::Pose3DMotorsParams*);
-::IceProxy::Ice::Object* upCast(::IceProxy::jderobot::Pose3DMotorsParams*);
-
-::Ice::Object* upCast(::jderobot::Pose3DMotors*);
-::IceProxy::Ice::Object* upCast(::IceProxy::jderobot::Pose3DMotors*);
-
-}
-
-namespace jderobot
-{
-
-typedef ::IceInternal::Handle< ::jderobot::Pose3DMotorsData> Pose3DMotorsDataPtr;
-typedef ::IceInternal::ProxyHandle< ::IceProxy::jderobot::Pose3DMotorsData> Pose3DMotorsDataPrx;
-
-void __read(::IceInternal::BasicStream*, Pose3DMotorsDataPrx&);
-void __patch__Pose3DMotorsDataPtr(void*, ::Ice::ObjectPtr&);
-
-typedef ::IceInternal::Handle< ::jderobot::Pose3DMotorsParams> Pose3DMotorsParamsPtr;
-typedef ::IceInternal::ProxyHandle< ::IceProxy::jderobot::Pose3DMotorsParams> Pose3DMotorsParamsPrx;
-
-void __read(::IceInternal::BasicStream*, Pose3DMotorsParamsPrx&);
-void __patch__Pose3DMotorsParamsPtr(void*, ::Ice::ObjectPtr&);
-
-typedef ::IceInternal::Handle< ::jderobot::Pose3DMotors> Pose3DMotorsPtr;
-typedef ::IceInternal::ProxyHandle< ::IceProxy::jderobot::Pose3DMotors> Pose3DMotorsPrx;
-
-void __read(::IceInternal::BasicStream*, Pose3DMotorsPrx&);
-void __patch__Pose3DMotorsPtr(void*, ::Ice::ObjectPtr&);
-
-}
-
-namespace jderobot
-{
-
-}
-
-namespace jderobot
-{
-
-class Pose3DMotorsData : virtual public ::Ice::Object
-{
-public:
-
- typedef Pose3DMotorsDataPrx ProxyType;
- typedef Pose3DMotorsDataPtr PointerType;
-
- Pose3DMotorsData() {}
- Pose3DMotorsData(::Ice::Float, ::Ice::Float, ::Ice::Float, ::Ice::Float, ::Ice::Float, ::Ice::Float, ::Ice::Float, ::Ice::Float);
-
- virtual bool ice_isA(const ::std::string&, const ::Ice::Current& = ::Ice::Current()) const;
- virtual ::std::vector< ::std::string> ice_ids(const ::Ice::Current& = ::Ice::Current()) const;
- virtual const ::std::string& ice_id(const ::Ice::Current& = ::Ice::Current()) const;
- static const ::std::string& ice_staticId();
-
-
- virtual void __write(::IceInternal::BasicStream*) const;
- virtual void __read(::IceInternal::BasicStream*, bool);
-
- static const ::Ice::ObjectFactoryPtr& ice_factory();
-
-protected:
-
- virtual ~Pose3DMotorsData() {}
-
-
-public:
-
- ::Ice::Float x;
- ::Ice::Float y;
- ::Ice::Float z;
- ::Ice::Float pan;
- ::Ice::Float tilt;
- ::Ice::Float roll;
- ::Ice::Float panSpeed;
- ::Ice::Float tiltSpeed;
-};
-
-class Pose3DMotorsParams : virtual public ::Ice::Object
-{
-public:
-
- typedef Pose3DMotorsParamsPrx ProxyType;
- typedef Pose3DMotorsParamsPtr PointerType;
-
- Pose3DMotorsParams() {}
- Pose3DMotorsParams(::Ice::Float, ::Ice::Float, ::Ice::Float, ::Ice::Float, ::Ice::Float, ::Ice::Float);
-
- virtual bool ice_isA(const ::std::string&, const ::Ice::Current& = ::Ice::Current()) const;
- virtual ::std::vector< ::std::string> ice_ids(const ::Ice::Current& = ::Ice::Current()) const;
- virtual const ::std::string& ice_id(const ::Ice::Current& = ::Ice::Current()) const;
- static const ::std::string& ice_staticId();
-
-
- virtual void __write(::IceInternal::BasicStream*) const;
- virtual void __read(::IceInternal::BasicStream*, bool);
-
- static const ::Ice::ObjectFactoryPtr& ice_factory();
-
-protected:
-
- virtual ~Pose3DMotorsParams() {}
-
-
-public:
-
- ::Ice::Float maxPan;
- ::Ice::Float minPan;
- ::Ice::Float maxTilt;
- ::Ice::Float minTilt;
- ::Ice::Float maxPanSpeed;
- ::Ice::Float maxTiltSpeed;
-};
-
-class Pose3DMotors : virtual public ::Ice::Object
-{
-public:
-
- typedef Pose3DMotorsPrx ProxyType;
- typedef Pose3DMotorsPtr PointerType;
-
-
- virtual bool ice_isA(const ::std::string&, const ::Ice::Current& = ::Ice::Current()) const;
- virtual ::std::vector< ::std::string> ice_ids(const ::Ice::Current& = ::Ice::Current()) const;
- virtual const ::std::string& ice_id(const ::Ice::Current& = ::Ice::Current()) const;
- static const ::std::string& ice_staticId();
-
- virtual ::Ice::Int setPose3DMotorsData(const ::jderobot::Pose3DMotorsDataPtr&, const ::Ice::Current& = ::Ice::Current()) = 0;
-#ifndef ICEE_PURE_CLIENT
- ::Ice::DispatchStatus ___setPose3DMotorsData(::IceInternal::Incoming&, const ::Ice::Current&);
-#endif // ICEE_PURE_CLIENT
-
- virtual ::jderobot::Pose3DMotorsDataPtr getPose3DMotorsData(const ::Ice::Current& = ::Ice::Current()) = 0;
-#ifndef ICEE_PURE_CLIENT
- ::Ice::DispatchStatus ___getPose3DMotorsData(::IceInternal::Incoming&, const ::Ice::Current&);
-#endif // ICEE_PURE_CLIENT
-
- virtual ::jderobot::Pose3DMotorsParamsPtr getPose3DMotorsParams(const ::Ice::Current& = ::Ice::Current()) = 0;
-#ifndef ICEE_PURE_CLIENT
- ::Ice::DispatchStatus ___getPose3DMotorsParams(::IceInternal::Incoming&, const ::Ice::Current&);
-#endif // ICEE_PURE_CLIENT
-
-#ifndef ICEE_PURE_CLIENT
- virtual ::Ice::DispatchStatus __dispatch(::IceInternal::Incoming&, const ::Ice::Current&);
-#endif // ICEE_PURE_CLIENT
-
- virtual void __write(::IceInternal::BasicStream*) const;
- virtual void __read(::IceInternal::BasicStream*, bool);
-};
-
-}
-
-namespace IceProxy
-{
-
-namespace jderobot
-{
-
-class Pose3DMotorsData : virtual public ::IceProxy::Ice::Object
-{
-public:
-
- ::IceInternal::ProxyHandle<Pose3DMotorsData> ice_context(const ::Ice::Context& __context) const
- {
- return dynamic_cast<Pose3DMotorsData*>(::IceProxy::Ice::Object::ice_context(__context).get());
- }
-
- ::IceInternal::ProxyHandle<Pose3DMotorsData> ice_secure(bool __secure) const
- {
- return dynamic_cast<Pose3DMotorsData*>(::IceProxy::Ice::Object::ice_secure(__secure).get());
- }
-
-#ifdef ICEE_HAS_ROUTER
- ::IceInternal::ProxyHandle<Pose3DMotorsData> ice_router(const ::Ice::RouterPrx& __router) const
- {
- return dynamic_cast<Pose3DMotorsData*>(::IceProxy::Ice::Object::ice_router(__router).get());
- }
-#endif // ICEE_HAS_ROUTER
-
-#ifdef ICEE_HAS_LOCATOR
- ::IceInternal::ProxyHandle<Pose3DMotorsData> ice_locator(const ::Ice::LocatorPrx& __locator) const
- {
- return dynamic_cast<Pose3DMotorsData*>(::IceProxy::Ice::Object::ice_locator(__locator).get());
- }
-
- ::IceInternal::ProxyHandle<Pose3DMotorsData> ice_adapterId(const std::string& __id) const
- {
- return dynamic_cast<Pose3DMotorsData*>(::IceProxy::Ice::Object::ice_adapterId(__id).get());
- }
-#endif // ICEE_HAS_LOCATOR
-
- ::IceInternal::ProxyHandle<Pose3DMotorsData> ice_twoway() const
- {
- return dynamic_cast<Pose3DMotorsData*>(::IceProxy::Ice::Object::ice_twoway().get());
- }
-
- ::IceInternal::ProxyHandle<Pose3DMotorsData> ice_oneway() const
- {
- return dynamic_cast<Pose3DMotorsData*>(::IceProxy::Ice::Object::ice_oneway().get());
- }
-
- ::IceInternal::ProxyHandle<Pose3DMotorsData> ice_batchOneway() const
- {
- return dynamic_cast<Pose3DMotorsData*>(::IceProxy::Ice::Object::ice_batchOneway().get());
- }
-
- ::IceInternal::ProxyHandle<Pose3DMotorsData> ice_datagram() const
- {
- return dynamic_cast<Pose3DMotorsData*>(::IceProxy::Ice::Object::ice_datagram().get());
- }
-
- ::IceInternal::ProxyHandle<Pose3DMotorsData> ice_batchDatagram() const
- {
- return dynamic_cast<Pose3DMotorsData*>(::IceProxy::Ice::Object::ice_batchDatagram().get());
- }
-
- ::IceInternal::ProxyHandle<Pose3DMotorsData> ice_timeout(int __timeout) const
- {
- return dynamic_cast<Pose3DMotorsData*>(::IceProxy::Ice::Object::ice_timeout(__timeout).get());
- }
-
- static const ::std::string& ice_staticId();
-
-private:
-
- virtual ::IceProxy::Ice::Object* __newInstance() const;
-};
-
-class Pose3DMotorsParams : virtual public ::IceProxy::Ice::Object
-{
-public:
-
- ::IceInternal::ProxyHandle<Pose3DMotorsParams> ice_context(const ::Ice::Context& __context) const
- {
- return dynamic_cast<Pose3DMotorsParams*>(::IceProxy::Ice::Object::ice_context(__context).get());
- }
-
- ::IceInternal::ProxyHandle<Pose3DMotorsParams> ice_secure(bool __secure) const
- {
- return dynamic_cast<Pose3DMotorsParams*>(::IceProxy::Ice::Object::ice_secure(__secure).get());
- }
-
-#ifdef ICEE_HAS_ROUTER
- ::IceInternal::ProxyHandle<Pose3DMotorsParams> ice_router(const ::Ice::RouterPrx& __router) const
- {
- return dynamic_cast<Pose3DMotorsParams*>(::IceProxy::Ice::Object::ice_router(__router).get());
- }
-#endif // ICEE_HAS_ROUTER
-
-#ifdef ICEE_HAS_LOCATOR
- ::IceInternal::ProxyHandle<Pose3DMotorsParams> ice_locator(const ::Ice::LocatorPrx& __locator) const
- {
- return dynamic_cast<Pose3DMotorsParams*>(::IceProxy::Ice::Object::ice_locator(__locator).get());
- }
-
- ::IceInternal::ProxyHandle<Pose3DMotorsParams> ice_adapterId(const std::string& __id) const
- {
- return dynamic_cast<Pose3DMotorsParams*>(::IceProxy::Ice::Object::ice_adapterId(__id).get());
- }
-#endif // ICEE_HAS_LOCATOR
-
- ::IceInternal::ProxyHandle<Pose3DMotorsParams> ice_twoway() const
- {
- return dynamic_cast<Pose3DMotorsParams*>(::IceProxy::Ice::Object::ice_twoway().get());
- }
-
- ::IceInternal::ProxyHandle<Pose3DMotorsParams> ice_oneway() const
- {
- return dynamic_cast<Pose3DMotorsParams*>(::IceProxy::Ice::Object::ice_oneway().get());
- }
-
- ::IceInternal::ProxyHandle<Pose3DMotorsParams> ice_batchOneway() const
- {
- return dynamic_cast<Pose3DMotorsParams*>(::IceProxy::Ice::Object::ice_batchOneway().get());
- }
-
- ::IceInternal::ProxyHandle<Pose3DMotorsParams> ice_datagram() const
- {
- return dynamic_cast<Pose3DMotorsParams*>(::IceProxy::Ice::Object::ice_datagram().get());
- }
-
- ::IceInternal::ProxyHandle<Pose3DMotorsParams> ice_batchDatagram() const
- {
- return dynamic_cast<Pose3DMotorsParams*>(::IceProxy::Ice::Object::ice_batchDatagram().get());
- }
-
- ::IceInternal::ProxyHandle<Pose3DMotorsParams> ice_timeout(int __timeout) const
- {
- return dynamic_cast<Pose3DMotorsParams*>(::IceProxy::Ice::Object::ice_timeout(__timeout).get());
- }
-
- static const ::std::string& ice_staticId();
-
-private:
-
- virtual ::IceProxy::Ice::Object* __newInstance() const;
-};
-
-class Pose3DMotors : virtual public ::IceProxy::Ice::Object
-{
-public:
-
- ::Ice::Int setPose3DMotorsData(const ::jderobot::Pose3DMotorsDataPtr& data)
- {
- return setPose3DMotorsData(data, 0);
- }
- ::Ice::Int setPose3DMotorsData(const ::jderobot::Pose3DMotorsDataPtr& data, const ::Ice::Context& __ctx)
- {
- return setPose3DMotorsData(data, &__ctx);
- }
-
-private:
-
- ::Ice::Int setPose3DMotorsData(const ::jderobot::Pose3DMotorsDataPtr&, const ::Ice::Context*);
-
-public:
-
- ::jderobot::Pose3DMotorsDataPtr getPose3DMotorsData()
- {
- return getPose3DMotorsData(0);
- }
- ::jderobot::Pose3DMotorsDataPtr getPose3DMotorsData(const ::Ice::Context& __ctx)
- {
- return getPose3DMotorsData(&__ctx);
- }
-
-private:
-
- ::jderobot::Pose3DMotorsDataPtr getPose3DMotorsData(const ::Ice::Context*);
-
-public:
-
- ::jderobot::Pose3DMotorsParamsPtr getPose3DMotorsParams()
- {
- return getPose3DMotorsParams(0);
- }
- ::jderobot::Pose3DMotorsParamsPtr getPose3DMotorsParams(const ::Ice::Context& __ctx)
- {
- return getPose3DMotorsParams(&__ctx);
- }
-
-private:
-
- ::jderobot::Pose3DMotorsParamsPtr getPose3DMotorsParams(const ::Ice::Context*);
-
-public:
-
- ::IceInternal::ProxyHandle<Pose3DMotors> ice_context(const ::Ice::Context& __context) const
- {
- return dynamic_cast<Pose3DMotors*>(::IceProxy::Ice::Object::ice_context(__context).get());
- }
-
- ::IceInternal::ProxyHandle<Pose3DMotors> ice_secure(bool __secure) const
- {
- return dynamic_cast<Pose3DMotors*>(::IceProxy::Ice::Object::ice_secure(__secure).get());
- }
-
-#ifdef ICEE_HAS_ROUTER
- ::IceInternal::ProxyHandle<Pose3DMotors> ice_router(const ::Ice::RouterPrx& __router) const
- {
- return dynamic_cast<Pose3DMotors*>(::IceProxy::Ice::Object::ice_router(__router).get());
- }
-#endif // ICEE_HAS_ROUTER
-
-#ifdef ICEE_HAS_LOCATOR
- ::IceInternal::ProxyHandle<Pose3DMotors> ice_locator(const ::Ice::LocatorPrx& __locator) const
- {
- return dynamic_cast<Pose3DMotors*>(::IceProxy::Ice::Object::ice_locator(__locator).get());
- }
-
- ::IceInternal::ProxyHandle<Pose3DMotors> ice_adapterId(const std::string& __id) const
- {
- return dynamic_cast<Pose3DMotors*>(::IceProxy::Ice::Object::ice_adapterId(__id).get());
- }
-#endif // ICEE_HAS_LOCATOR
-
- ::IceInternal::ProxyHandle<Pose3DMotors> ice_twoway() const
- {
- return dynamic_cast<Pose3DMotors*>(::IceProxy::Ice::Object::ice_twoway().get());
- }
-
- ::IceInternal::ProxyHandle<Pose3DMotors> ice_oneway() const
- {
- return dynamic_cast<Pose3DMotors*>(::IceProxy::Ice::Object::ice_oneway().get());
- }
-
- ::IceInternal::ProxyHandle<Pose3DMotors> ice_batchOneway() const
- {
- return dynamic_cast<Pose3DMotors*>(::IceProxy::Ice::Object::ice_batchOneway().get());
- }
-
- ::IceInternal::ProxyHandle<Pose3DMotors> ice_datagram() const
- {
- return dynamic_cast<Pose3DMotors*>(::IceProxy::Ice::Object::ice_datagram().get());
- }
-
- ::IceInternal::ProxyHandle<Pose3DMotors> ice_batchDatagram() const
- {
- return dynamic_cast<Pose3DMotors*>(::IceProxy::Ice::Object::ice_batchDatagram().get());
- }
-
- ::IceInternal::ProxyHandle<Pose3DMotors> ice_timeout(int __timeout) const
- {
- return dynamic_cast<Pose3DMotors*>(::IceProxy::Ice::Object::ice_timeout(__timeout).get());
- }
-
- static const ::std::string& ice_staticId();
-
-private:
-
- virtual ::IceProxy::Ice::Object* __newInstance() const;
-};
-
-}
-
-}
-
-#endif
Deleted: trunk/src/stable/components/naoserver/interfaces/slice/jderobot/naofollowball.ice
===================================================================
--- trunk/src/stable/components/naoserver/interfaces/slice/jderobot/naofollowball.ice 2014-01-25 18:44:50 UTC (rev 1146)
+++ trunk/src/stable/components/naoserver/interfaces/slice/jderobot/naofollowball.ice 2014-01-25 20:27:32 UTC (rev 1147)
@@ -1,19 +0,0 @@
-#ifndef NAOFOLLOWBALL_ICE
-#define NAOFOLLOWBALL_ICE
-
-module jderobot {
-
- /**
- * Interface to the Nao follow-ball
- */
- interface NaoFollowBall
- {
- void setParams ( int rMin, int rMax, int gMin, int gMax, int bMin, int bMax );
- void setMinParams ( int rMin, int gMin, int bMin );
- void setMaxParams ( int rMax, int gMax, int bMax );
- void start ();
- void stop ();
- };
-};
-
-#endif // NAOFOLLOWBALL_ICE
Modified: trunk/src/stable/components/naoserver/naoserver.cpp
===================================================================
--- trunk/src/stable/components/naoserver/naoserver.cpp 2014-01-25 18:44:50 UTC (rev 1146)
+++ trunk/src/stable/components/naoserver/naoserver.cpp 2014-01-25 20:27:32 UTC (rev 1147)
@@ -27,8 +27,8 @@
ALModule(broker, name) {
NeckMotors* neckMotors = NeckMotors::getInstance();
neckMotors->init("NeckMotors", getParentBroker(), 1.0, 0.1);
-// NeckSpeed* neckSpeed = NeckSpeed::getInstance();
-// neckSpeed->init("NeckSpeed", getParentBroker(), 1.0, 0.1);
+ NeckSpeed* neckSpeed = NeckSpeed::getInstance();
+ neckSpeed->init("NeckSpeed", getParentBroker(), 1.0, 0.1);
LeftShoulderMotors* lshoulderMotors = LeftShoulderMotors::getInstance();
lshoulderMotors->init("LeftShoulderMotors", getParentBroker(), 1.0, 0.1);
RightShoulderMotors* rshoulderMotors = RightShoulderMotors::getInstance();
@@ -50,11 +50,31 @@
RightAnkleMotors* rankleMotors = RightAnkleMotors::getInstance();
rankleMotors->init("RightAnkleMotors", getParentBroker(), 1.0, 0.1);
-// NaoFollowBall* naofollowball = NaoFollowBall::getInstance();
-// NaoFollowBall->init("NaoFollowBall", getParentBroker(), 1.0, 0.1);
+ NeckEncoders* neckEncoders = NeckEncoders::getInstance();
+ neckEncoders->init("NeckEncoders", getParentBroker());
+ LeftShoulderEncoders* lshoulderEncoders = LeftShoulderEncoders::getInstance();
+ lshoulderEncoders->init("LeftShoulderEncoders", getParentBroker());
+ RightShoulderEncoders* rshoulderEncoders = RightShoulderEncoders::getInstance();
+ rshoulderEncoders->init("RightShoulderEncoders", getParentBroker());
+ LeftElbowEncoders* lelbowEncoders = LeftElbowEncoders::getInstance();
+ lelbowEncoders->init("LeftElbowEncoders", getParentBroker());
+ RightElbowEncoders* relbowEncoders = RightElbowEncoders::getInstance();
+ relbowEncoders->init("RightElbowEncoders", getParentBroker());
+ LeftHipEncoders* lhipEncoders = LeftHipEncoders::getInstance();
+ lhipEncoders->init("LeftHipEncoders", getParentBroker());
+ RightHipEncoders* rhipEncoders = RightHipEncoders::getInstance();
+ rhipEncoders->init("RightHipEncoders", getParentBroker());
+ LeftKneeEncoders* lkneeEncoders = LeftKneeEncoders::getInstance();
+ lkneeEncoders->init("LeftKneeEncoders", getParentBroker());
+ RightKneeEncoders* rkneeEncoders = RightKneeEncoders::getInstance();
+ rkneeEncoders->init("RightKneeEncoders", getParentBroker());
+ LeftAnkleEncoders* lankleEncoders = LeftAnkleEncoders::getInstance();
+ lankleEncoders->init("LeftAnkleEncoders", getParentBroker());
+ RightAnkleEncoders* rankleEncoders = RightAnkleEncoders::getInstance();
+ rankleEncoders->init("RightAnkleEncoders", getParentBroker());
-// NaoServerCamera* naoserverCamera = NaoServerCamera::getInstance();
-// naoserverCamera->init("NaoServerCamera", getParentBroker());
+ NaoServerCamera* naoserverCamera = NaoServerCamera::getInstance();
+ naoserverCamera->init("NaoServerCamera", getParentBroker());
NaoServerMotors* naoserverMotors = NaoServerMotors::getInstance();
naoserverMotors->init("NaoServerMotors", getParentBroker());
NaoServerMotions* naoserverMotions = NaoServerMotions::getInstance();
@@ -91,7 +111,7 @@
Ice::ObjectAdapterPtr adapter = ic->createObjectAdapterWithEndpoints("NaoServerAdapter", endpoint.str());
adapter->add(NeckMotors::getInstance(), ic->stringToIdentity("NeckMotors"));
-// adapter->add(NeckSpeed::getInstance(), ic->stringToIdentity("NeckSpeed"));
+ adapter->add(NeckSpeed::getInstance(), ic->stringToIdentity("NeckSpeed"));
adapter->add(LeftShoulderMotors::getInstance(), ic->stringToIdentity("LeftShoulderMotors"));
adapter->add(RightShoulderMotors::getInstance(), ic->stringToIdentity("RightShoulderMotors"));
adapter->add(LeftElbowMotors::getInstance(), ic->stringToIdentity("LeftElbowMotors"));
@@ -103,9 +123,19 @@
adapter->add(LeftAnkleMotors::getInstance(), ic->stringToIdentity("LeftAnkleMotors"));
adapter->add(RightAnkleMotors::getInstance(), ic->stringToIdentity("RightAnkleMotors"));
-// adapter->add(NaoFollowBall::getInstance(), ic->stringToIdentity("NaoFollowBall"));
+ adapter->add(NeckEncoders::getInstance(), ic->stringToIdentity("NeckEncoders"));
+ adapter->add(LeftShoulderEncoders::getInstance(), ic->stringToIdentity("LeftShoulderEncoders"));
+ adapter->add(RightShoulderEncoders::getInstance(), ic->stringToIdentity("RightShoulderEncoders"));
+ adapter->add(LeftElbowEncoders::getInstance(), ic->stringToIdentity("LeftElbowEncoders"));
+ adapter->add(RightElbowEncoders::getInstance(), ic->stringToIdentity("RightElbowEncoders"));
+ adapter->add(LeftHipEncoders::getInstance(), ic->stringToIdentity("LeftHipEncoders"));
+ adapter->add(RightHipEncoders::getInstance(), ic->stringToIdentity("RightHipEncoders"));
+ adapter->add(LeftKneeEncoders::getInstance(), ic->stringToIdentity("LeftKneeEncoders"));
+ adapter->add(RightKneeEncoders::getInstance(), ic->stringToIdentity("RightKneeEncoders"));
+ adapter->add(LeftAnkleEncoders::getInstance(), ic->stringToIdentity("LeftAnkleEncoders"));
+ adapter->add(RightAnkleEncoders::getInstance(), ic->stringToIdentity("RightAnkleEncoders"));
-// adapter->add(NaoServerCamera::getInstance(), ic->stringToIdentity("Camera"));
+ adapter->add(NaoServerCamera::getInstance(), ic->stringToIdentity("Camera"));
adapter->add(NaoServerMotors::getInstance(), ic->stringToIdentity("Motors"));
adapter->add(NaoServerMotions::getInstance(), ic->stringToIdentity("Motions"));
Modified: trunk/src/stable/components/naoserver/naoserver.h
===================================================================
--- trunk/src/stable/components/naoserver/naoserver.h 2014-01-25 18:44:50 UTC (rev 1146)
+++ trunk/src/stable/components/naoserver/naoserver.h 2014-01-25 20:27:32 UTC (rev 1147)
@@ -37,7 +37,7 @@
#include <IceE/IceE.h>
#include "hinges/NeckMotors.h"
-//#include "hinges/NeckSpeed.h"
+#include "hinges/NeckSpeed.h"
#include "hinges/LeftShoulderMotors.h"
#include "hinges/RightShoulderMotors.h"
#include "hinges/LeftElbowMotors.h"
@@ -48,9 +48,20 @@
#include "hinges/RightKneeMotors.h"
#include "hinges/LeftAnkleMotors.h"
#include "hinges/RightAnkleMotors.h"
-//#include "hinges/NaoFollowBall.h"
-//#include "functions/NaoServerCamera.h"
+#include "hinges/NeckEncoders.h"
+#include "hinges/LeftShoulderEncoders.h"
+#include "hinges/RightShoulderEncoders.h"
+#include "hinges/LeftElbowEncoders.h"
+#include "hinges/RightElbowEncoders.h"
+#include "hinges/LeftHipEncoders.h"
+#include "hinges/RightHipEncoders.h"
+#include "hinges/LeftKneeEncoders.h"
+#include "hinges/RightKneeEncoders.h"
+#include "hinges/LeftAnkleEncoders.h"
+#include "hinges/RightAnkleEncoders.h"
+
+#include "functions/NaoServerCamera.h"
#include "functions/NaoServerMotors.h"
#include "functions/NaoServerMotions.h"
@@ -78,23 +89,5 @@
private:
pthread_t tIce;
int myIcePort;
- /*
- NeckMotors* neckMotors;
- NeckSpeed* neckSpeed;
- LeftShoulderMotors* lshoulderMotors;
- RightShoulderMotors* rshoulderMotors;
- LeftElbowMotors* lelbowMotors;
- RightElbowMotors* relbowMotors;
- LeftHipMotors* lhipMotors;
- RightHipMotors* rhipMotors;
- LeftKneeMotors* lkneeMotors;
- RightKneeMotors* rkneeMotors;
- LeftAnkleMotors* lankleMotors;
- RightAnkleMotors* rankleMotors;
-
- NaoServerCamera* naoserverCamera;
- NaoServerMotors* naoserverMotors;
- NaoServerMotions* naoserverMotions;
- */
};
#endif // NAOSERVER_H
More information about the Jderobot-admin
mailing list