Menu
▾
▴
robotflow-cvs — CVS changes are sent to this mailing list.
You can subscribe to this list here.
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(59) |
Jun
(40) |
Jul
(59) |
Aug
(81) |
Sep
(14) |
Oct
(9) |
Nov
(22) |
Dec
(1) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
(25) |
Feb
(3) |
Mar
(27) |
Apr
(14) |
May
(15) |
Jun
(112) |
Jul
(44) |
Aug
(7) |
Sep
(18) |
Oct
(34) |
Nov
(17) |
Dec
(20) |
| 2006 |
Jan
(12) |
Feb
|
Mar
(1) |
Apr
|
May
|
Jun
(3) |
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
(11) |
|
From: Dominic L. <ma...@us...> - 2004-06-13 19:32:22
|
Update of /cvsroot/robotflow/RobotFlow/Probes/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28092 Modified Files: ImageProbe.cc Log Message: now able to display 24 bpp images Index: ImageProbe.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Probes/src/ImageProbe.cc,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** ImageProbe.cc 20 Jun 2003 18:25:56 -0000 1.7 --- ImageProbe.cc 13 Jun 2004 19:32:12 -0000 1.8 *************** *** 258,261 **** --- 258,270 ---- } }//pixelsize = 2 + else if (my_image.get_pixelsize() == 3) { + + //get pixbuf image ptr + unsigned char *pixbuf_data = gdk_pixbuf_get_pixels(m_pixbuf); + + //copy data + memcpy(pixbuf_data,my_image.get_data(),my_image.get_width() * my_image.get_height() * my_image.get_pixelsize()); + + } //update canvas. |
|
From: Dominic L. <ma...@us...> - 2004-06-13 19:18:39
|
Update of /cvsroot/robotflow/RobotFlow/Probes/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15779 Modified Files: ImageProbeSDL.cc Log Message: using SDL image properly with different pixel sizes Index: ImageProbeSDL.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Probes/src/ImageProbeSDL.cc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ImageProbeSDL.cc 20 Jun 2003 00:45:42 -0000 1.1 --- ImageProbeSDL.cc 13 Jun 2004 19:18:30 -0000 1.2 *************** *** 95,99 **** //SDL initialize ! if ( SDL_Init(SDL_INIT_AUDIO|SDL_INIT_VIDEO) < 0 ) { char message[256]; sprintf(message, "Impossible d'initialiser SDL: %s\n", SDL_GetError()); --- 95,99 ---- //SDL initialize ! if ( SDL_Init(SDL_INIT_VIDEO) < 0 ) { char message[256]; sprintf(message, "Impossible d'initialiser SDL: %s\n", SDL_GetError()); *************** *** 102,187 **** atexit(SDL_Quit); - - m_screen = SDL_SetVideoMode(m_width, m_height, 15, SDL_SWSURFACE); if ( m_screen == NULL ) { char message[256]; ! sprintf(message, "Impossible de passer en 640x480 en 16 bpp: %s\n", SDL_GetError()); throw new GeneralException(message,__FILE__,__LINE__); } - - - } ! void DrawPixel(SDL_Surface *screen, int x, int y,Uint8 R, Uint8 G, Uint8 B) { ! ! Uint32 color = SDL_MapRGB(screen->format, R, G, B); ! ! if ( SDL_MUSTLOCK(screen) ) { ! if ( SDL_LockSurface(screen) < 0 ) { ! return; ! } } ! switch (screen->format->BytesPerPixel) { ! case 1: { /*On gère le mode 8bpp */ ! Uint8 *bufp; ! bufp = (Uint8 *)screen->pixels + y*screen->pitch + x; ! *bufp = color; ! } ! break; ! case 2: { /* Certainement 15 ou 16 bpp */ ! Uint16 *bufp; ! bufp = (Uint16 *)screen->pixels + y*screen->pitch/2 + x; ! *bufp = color; ! } ! break; ! case 3: { /* 24 bpp lent et généralement pas utilisé */ ! Uint8 *bufp; ! bufp = (Uint8 *)screen->pixels + y*screen->pitch + x * 3; ! if(SDL_BYTEORDER == SDL_LIL_ENDIAN) { ! bufp[0] = color; ! bufp[1] = color >> 8; ! bufp[2] = color >> 16; ! } else { ! bufp[2] = color; ! bufp[1] = color >> 8; ! bufp[0] = color >> 16; ! } ! } ! break; ! case 4: { /* Probablement 32 bpp alors */ ! Uint32 *bufp; ! bufp = (Uint32 *)screen->pixels + y*screen->pitch/4 + x; ! *bufp = color; ! } ! break; ! } ! if ( SDL_MUSTLOCK(screen) ) { ! SDL_UnlockSurface(screen); ! } ! SDL_UpdateRect(screen, x, y, 1, 1); ! } ! void display_image(Image &image) { ! if ( SDL_MUSTLOCK(m_screen) ) { ! if ( SDL_LockSurface(m_screen) < 0 ) { ! return; ! } } - //cerr<<"update"<<endl; - memcpy(m_screen->pixels,image.get_data(),image.get_size()); - - if ( SDL_MUSTLOCK(m_screen) ) { SDL_UnlockSurface(m_screen); --- 102,170 ---- atexit(SDL_Quit); + m_screen = SDL_SetVideoMode(m_width, m_height, 32, SDL_SWSURFACE); if ( m_screen == NULL ) { char message[256]; ! sprintf(message, "SDL init error using 32 bpp: %s\n", SDL_GetError()); throw new GeneralException(message,__FILE__,__LINE__); } } + void display_image(Image &image) { ! if ( SDL_MUSTLOCK(m_screen) ) { ! if ( SDL_LockSurface(m_screen) < 0 ) { ! return; ! } } ! ! //cerr<<"update"<<endl; ! //display image depending of pixel format ! //memcpy(m_screen->pixels,image.get_data(),image.get_size()); ! Uint32 color; ! unsigned int* display_ptr = (unsigned int*) m_screen->pixels; ! unsigned char* image_ptr = image.get_data(); ! unsigned short temp; ! for (int i = 0; i < image.get_width() * image.get_height(); i++) { ! unsigned int R,G,B; ! switch(image.get_pixelsize()) { ! ! case 1: ! R = G = B = *image_ptr; ! break; ! ! case 2: ! temp = (*(unsigned short*)(image_ptr)); ! R = (unsigned char) ((temp >> 7) & 0xF1); ! G = (unsigned char) ((temp >> 2) & 0xF1); ! B = (unsigned char)(temp & 0xF1) << 3; ! break; ! ! case 3: ! R = image_ptr[0]; ! G = image_ptr[1]; ! B = image_ptr[2]; ! break; ! default: ! throw new GeneralException("Unknown image pixelsize",__FILE__,__LINE__); ! break; ! ! } ! color = SDL_MapRGB(m_screen->format, R, G, B); ! //increment SDL image pointer ! *display_ptr++ = color; ! //increment Image pointer ! image_ptr += image.get_pixelsize(); } if ( SDL_MUSTLOCK(m_screen) ) { SDL_UnlockSurface(m_screen); |
|
From: Dominic L. <ma...@us...> - 2004-06-11 20:51:30
|
Update of /cvsroot/robotflow/RobotFlow/Vision/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14992 Modified Files: JPEGSave.cc Log Message: working jpeg compres with lib jpeg Index: JPEGSave.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Vision/src/JPEGSave.cc,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** JPEGSave.cc 10 Jun 2004 19:21:55 -0000 1.3 --- JPEGSave.cc 11 Jun 2004 20:51:21 -0000 1.4 *************** *** 24,28 **** --- 24,32 ---- #include "BufferedNode.h" #include "gdk-pixbuf/gdk-pixbuf.h" + #include <stdio.h> + extern "C" { + #include "jpeglib.h" + } //forward declaration *************** *** 60,71 **** - gboolean pixbuf_save_callback(const gchar *buf, gsize count, GError **error, gpointer data_string) { - - string *my_string = reinterpret_cast<string*>(data_string); ! if (my_string) { ! *my_string += string(buf,count); ! } } --- 64,99 ---- + /* + * Initialize destination --- called by jpeg_start_compress + * before any data is actually written. + */ + METHODDEF(void) + init_destination (j_compress_ptr cinfo) + { + //cerr<<"init_destination"<<endl; + } ! /* ! * Empty the output buffer --- called whenever buffer fills up. ! */ ! ! METHODDEF(boolean) ! empty_output_buffer (j_compress_ptr cinfo) ! { ! //cerr<<"empty output buffer"<<endl; ! return TRUE; ! } ! ! ! /* ! * Terminate destination --- called by jpeg_finish_compress ! * after all data has been written. ! */ ! ! METHODDEF(void) ! term_destination (j_compress_ptr cinfo) ! { ! //cerr<<"term_destination"<<endl; } *************** *** 173,190 **** } //saving pixbuf to memory ! if (write_mem) { ! ! gboolean retval = gdk_pixbuf_save_to_callback (m_pixbuf, ! pixbuf_save_callback, ! &data_string, ! "jpeg", ! NULL, ! "quality", ! m_quality.c_str(),NULL); ! ! if (!retval) { ! throw new GeneralException("JPEGSave : Unable to save JPEG data to memory",__FILE__,__LINE__); ! } ! } --- 201,206 ---- } //saving pixbuf to memory ! if (write_mem) { ! libjpeg_compress(my_image, atoi(m_quality.c_str()), data_string); } *************** *** 227,232 **** --- 243,322 ---- }//calculate + void libjpeg_compress(Image &image, int quality, string &data_string) { + + struct jpeg_compress_struct cinfo; + struct jpeg_error_mgr jerr; + + cinfo.err = jpeg_std_error(&jerr); + jpeg_create_compress(&cinfo); + + /* + FILE * outfile; + if ((outfile = fopen("test.jpg", "wb")) == NULL) { + fprintf(stderr, "can't open %s\n", "test.jpg"); + exit(1); + } + + jpeg_stdio_dest(&cinfo, outfile); + */ + + //set destination to memory + struct jpeg_destination_mgr dest_mgr; + //set function pointers + dest_mgr.init_destination = init_destination; + dest_mgr.empty_output_buffer = empty_output_buffer; + dest_mgr.term_destination = term_destination; + + static unsigned char buffer[320 * 240 * 2]; + + dest_mgr.next_output_byte = &buffer[0]; + + dest_mgr.free_in_buffer = 320 * 240 *2; /* # of byte spaces remaining in buffer */ //320x240x2 + cinfo.dest = &dest_mgr; + + //set other image params + cinfo.image_width = image.get_width(); /* image width and height, in pixels */ + cinfo.image_height = image.get_height(); + cinfo.input_components = 3; /* # of color components per pixel */ + cinfo.in_color_space = JCS_RGB; /* colorspace of input image */ + cinfo.data_precision = 15; //15bPP + jpeg_set_quality(&cinfo,20,TRUE); /* set compression quality */ + jpeg_set_defaults(&cinfo); + /* Make optional parameter settings here */ + + jpeg_start_compress(&cinfo, TRUE); + + JSAMPROW row_pointer[1]; /* pointer to a single row */ + int row_stride; /* physical row width in buffer */ + + row_stride = image.get_width() * image.get_pixelsize(); /* JSAMPLEs per row in image_buffer */ + + unsigned char *image_buffer = image.get_data(); + + + while (cinfo.next_scanline < cinfo.image_height) { + row_pointer[0] = & image_buffer[cinfo.next_scanline * row_stride]; + jpeg_write_scanlines(&cinfo, row_pointer, 1); + } + + jpeg_finish_compress(&cinfo); + + + //output number of free bytes + //cerr<<"total size "<<320 * 240 * 2 - dest_mgr.free_in_buffer; + + //create buffer for jpeg data + data_string.resize(320 * 240 * 2 - dest_mgr.free_in_buffer); + + //copy jpeg data + memcpy(const_cast<char*>(data_string.c_str()),&buffer[0],data_string.size()); + + + jpeg_destroy_compress(&cinfo); + + //fclose(outfile); + } }; |
|
From: Dominic L. <ma...@us...> - 2004-06-10 20:48:02
|
Update of /cvsroot/robotflow/RobotFlow/MARIE/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9382 Modified Files: MarieDataCamera.cpp MarieDataLaser.cpp MarieDataOdometry.cpp MarieDataSonar.cpp Log Message: fixed problems when input is nil Index: MarieDataSonar.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MarieDataSonar.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** MarieDataSonar.cpp 31 May 2004 14:10:09 -0000 1.2 --- MarieDataSonar.cpp 10 Jun 2004 20:47:53 -0000 1.3 *************** *** 71,77 **** void MarieDataSonar::calculate(int output_id, int count, Buffer &out) { ! if (m_isNode) { ! RCPtr<MarieDataSonar> sonarObject = getInput(m_inputID,count); unsigned int size = sonarObject->getNbSonar(); --- 71,79 ---- void MarieDataSonar::calculate(int output_id, int count, Buffer &out) { ! ObjectRef InputValue = getInput(m_inputID,count); ! ! if (m_isNode && !InputValue->isNil()) { ! RCPtr<MarieDataSonar> sonarObject = InputValue; unsigned int size = sonarObject->getNbSonar(); Index: MarieDataOdometry.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MarieDataOdometry.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** MarieDataOdometry.cpp 31 May 2004 14:10:09 -0000 1.2 --- MarieDataOdometry.cpp 10 Jun 2004 20:47:53 -0000 1.3 *************** *** 115,121 **** void MarieDataOdometry::calculate(int output_id, int count, Buffer &out) { ! if (m_isNode) { ! RCPtr<MarieDataOdometry> odometryObject = getInput(m_inputID,count); int x,y,z,yaw,pitch,roll, linspeed, sidespeed,rotspeed; --- 115,125 ---- void MarieDataOdometry::calculate(int output_id, int count, Buffer &out) { ! ! ObjectRef InputValue = getInput(m_inputID,count); ! ! ! if (m_isNode && !InputValue->isNil()) { ! RCPtr<MarieDataOdometry> odometryObject = InputValue; int x,y,z,yaw,pitch,roll, linspeed, sidespeed,rotspeed; Index: MarieDataLaser.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MarieDataLaser.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** MarieDataLaser.cpp 10 Jun 2004 20:34:23 -0000 1.3 --- MarieDataLaser.cpp 10 Jun 2004 20:47:53 -0000 1.4 *************** *** 72,78 **** void MarieDataLaser::calculate(int output_id, int count, Buffer &out) { ! if (m_isNode) { ! RCPtr<MarieDataLaser> dataLaserObject = getInput(m_inputID,count); unsigned int size = dataLaserObject->getNbLaser(); --- 72,81 ---- void MarieDataLaser::calculate(int output_id, int count, Buffer &out) { ! ! ObjectRef InputValue = getInput(m_inputID,count); ! ! if (m_isNode && !InputValue->isNil()) { ! RCPtr<MarieDataLaser> dataLaserObject = InputValue; unsigned int size = dataLaserObject->getNbLaser(); Index: MarieDataCamera.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MarieDataCamera.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** MarieDataCamera.cpp 31 May 2004 14:10:09 -0000 1.2 --- MarieDataCamera.cpp 10 Jun 2004 20:47:53 -0000 1.3 *************** *** 106,112 **** void MarieDataCamera::calculate(int output_id, int count, Buffer &out) { ! if (m_isNode) { ! RCPtr<MarieDataCamera> dataCameraObject = getInput(m_inputID,count); int pan, tilt, zoom; --- 106,114 ---- void MarieDataCamera::calculate(int output_id, int count, Buffer &out) { ! ! ObjectRef InputValue = getInput(m_inputID,count); ! if (m_isNode && !InputValue->isNil()) { ! RCPtr<MarieDataCamera> dataCameraObject = InputValue; int pan, tilt, zoom; |
|
From: Carle C. <car...@us...> - 2004-06-10 20:34:32
|
Update of /cvsroot/robotflow/RobotFlow/MARIE/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26285 Modified Files: MarieDataLaser.cpp Log Message: m_isNode = true batard! Index: MarieDataLaser.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MarieDataLaser.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** MarieDataLaser.cpp 31 May 2004 14:10:09 -0000 1.2 --- MarieDataLaser.cpp 10 Jun 2004 20:34:23 -0000 1.3 *************** *** 63,67 **** MarieDataLaser::MarieDataLaser(string nodeName, ParameterSet params) ! : MarieObject(nodeName,params) { //used as a BufferedNode, create inputs & outputs --- 63,67 ---- MarieDataLaser::MarieDataLaser(string nodeName, ParameterSet params) ! : MarieObject(nodeName,params), m_isNode(true) { //used as a BufferedNode, create inputs & outputs |
|
From: Dominic L. <ma...@us...> - 2004-06-10 19:22:04
|
Update of /cvsroot/robotflow/RobotFlow/Vision/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11316 Modified Files: JPEGSave.cc Makefile.am Added Files: JPEGLoadMemory.cc Log Message: first working JPEG loader from memory --- NEW FILE: JPEGLoadMemory.cc --- /* Copyright (C) 2003 Dominic Letourneau (dom...@us...) This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef _JPEGLOADMEMORY_CC_ #define _JPEGLOADMEMORY_CC_ #include "Object.h" #include "ObjectRef.h" #include "Exception.h" #include "Image.h" #include "BufferedNode.h" #include "gdk-pixbuf/gdk-pixbuf.h" //forward declaration class JPEGLoadMemory; DECLARE_NODE(JPEGLoadMemory) /*Node * @name JPEGLoadMemory * @category RobotFlow:Vision * @description Save a JPEG image * * @input_name INPUT_DATA * @input_type string * @input_description Input image in memory (JPEG format) * * @output_name IMAGE * @output_type Image * @output_description The output image created from data * * @parameter_name IMAGE_WIDTH * @parameter_type int * @parameter_value 320 * @parameter_description the width of the image to create * * @parameter_name IMAGE_HEIGHT * @parameter_type int * @parameter_value 240 * @parameter_description the height of the image to create * END*/ class JPEGLoadMemory : public BufferedNode { private: int m_inputID; int m_imageID; GdkPixbuf *m_pixbuf; int m_width; int m_height; public: JPEGLoadMemory(string nodeName, ParameterSet params) : BufferedNode(nodeName, params), m_pixbuf(NULL) { //input(s) m_inputID = addInput("INPUT_DATA"); //output(s) m_imageID = addOutput("IMAGE"); //parameters(s) m_width = dereference_cast<int>(parameters.get("IMAGE_WIDTH")); m_height = dereference_cast<int>(parameters.get("IMAGE_HEIGHT")); g_type_init(); } Image* create_image_from_data(String &image_data) { Image* output_image = NULL; GdkPixbufLoader* loader = gdk_pixbuf_loader_new_with_type("jpeg",NULL); gdk_pixbuf_loader_set_size(loader,320,240); gdk_pixbuf_loader_write(loader,(const guchar*) image_data.c_str(),image_data.size(),NULL); //close pixbuf loader, no more write gdk_pixbuf_loader_close(loader,NULL); //get pixbuf GdkPixbuf *pixbuf = gdk_pixbuf_loader_get_pixbuf(loader); if (pixbuf) { int num_channels = gdk_pixbuf_get_n_channels(pixbuf); unsigned char* pixbuf_ptr = gdk_pixbuf_get_pixels(pixbuf); unsigned short* image_ptr = NULL; output_image = Image::alloc(m_width,m_height,num_channels); switch(num_channels) { case 1: output_image = Image::alloc(m_width,m_height,1); memcpy(output_image->get_data(),gdk_pixbuf_get_pixels(pixbuf),m_width * m_height * num_channels); break; case 3: output_image = Image::alloc(m_width,m_height,2); image_ptr = (unsigned short*) output_image->get_data(); for (int i = 0; i < m_width * m_height; i++) { //copy RED GREEN BLUE *image_ptr++ = (((unsigned short)pixbuf_ptr[0] & 0xF1) << 8) | (((unsigned short)pixbuf_ptr[1] & 0xF1) << 3) | (((unsigned short)pixbuf_ptr[2]) & 0x1F); //goto next pixel pixbuf_ptr += num_channels; } break; default: throw new GeneralException("JPEGLoadMemory : Unknown image type",__FILE__,__LINE__); break; } } g_object_unref(loader); //delete pixbuf loader & pixbuf ? return output_image; } void calculate(int output_id, int count, Buffer &out) { try { ObjectRef inputValue = getInput(m_inputID, count); if (!inputValue->isNil()) { String &value = object_cast<String>(inputValue); Image *output_image = create_image_from_data(value); if (output_image) { out[count] = ObjectRef(output_image); } else { out[count] = nilObject; } } else { out[count] = nilObject; } }//try catch (BaseException *e) { throw e->add(new NodeException (NULL,"Caught Exception in PixbufProbe (calculate)",__FILE__,__LINE__)); } }//calculate }; #endif Index: Makefile.am =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Vision/src/Makefile.am,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** Makefile.am 31 May 2004 20:15:34 -0000 1.21 --- Makefile.am 10 Jun 2004 19:21:55 -0000 1.22 *************** *** 40,44 **** RGBSplit.cc \ RGBMerge.cc \ ! MultiColorTracker.cc libVision_la_LDFLAGS = -release $(LT_RELEASE) $(PIXBUF_LIBS) $(GNOME_LIB) --- 40,45 ---- RGBSplit.cc \ RGBMerge.cc \ ! MultiColorTracker.cc \ ! JPEGLoadMemory.cc libVision_la_LDFLAGS = -release $(LT_RELEASE) $(PIXBUF_LIBS) $(GNOME_LIB) Index: JPEGSave.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Vision/src/JPEGSave.cc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** JPEGSave.cc 10 Jun 2004 15:18:43 -0000 1.2 --- JPEGSave.cc 10 Jun 2004 19:21:55 -0000 1.3 *************** *** 64,67 **** --- 64,68 ---- string *my_string = reinterpret_cast<string*>(data_string); + if (my_string) { *my_string += string(buf,count); |
|
From: Dominic L. <ma...@us...> - 2004-06-10 15:18:52
|
Update of /cvsroot/robotflow/RobotFlow/Vision/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21337 Modified Files: JPEGSave.cc Log Message: can now save JPEG data with a determined quality to memory (string) Index: JPEGSave.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Vision/src/JPEGSave.cc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** JPEGSave.cc 8 Jul 2003 17:18:20 -0000 1.1 --- JPEGSave.cc 10 Jun 2004 15:18:43 -0000 1.2 *************** *** 44,54 **** * @input_description file name to save probe content (JPEG) * ! * @output_name OUTPUT * @output_type Image * @output_description The same as the input image ! * * END*/ class JPEGSave : public BufferedNode { --- 44,72 ---- * @input_description file name to save probe content (JPEG) * ! * @output_name IMAGE * @output_type Image * @output_description The same as the input image ! * ! * @output_name JPEG_DATA ! * @output_type string ! * @output_description Raw (binary) JPEG data. ! * ! * @parameter_name QUALITY ! * @parameter_type string ! * @parameter_value 80 ! * @parameter_description string to indicate the quality of the compression, [0 to 100] (%) * END*/ + + gboolean pixbuf_save_callback(const gchar *buf, gsize count, GError **error, gpointer data_string) { + + string *my_string = reinterpret_cast<string*>(data_string); + + if (my_string) { + *my_string += string(buf,count); + } + } + class JPEGSave : public BufferedNode { *************** *** 58,63 **** --- 76,83 ---- int m_fileID; int m_outputID; + int m_jpegID; GdkPixbuf *m_pixbuf; + String m_quality; *************** *** 72,76 **** //output(s) ! m_outputID = addOutput("OUTPUT"); g_type_init(); --- 92,100 ---- //output(s) ! m_outputID = addOutput("IMAGE"); ! m_jpegID = addOutput("JPEG_DATA"); ! ! //parameters ! m_quality = object_cast<String>(parameters.get("QUALITY")); g_type_init(); *************** *** 78,87 **** } ! void write_pixbuf(Image &my_image, const String &filename) { //create pixbuf m_pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, my_image.get_width(), my_image.get_height()); - if (my_image.get_pixelsize() == 1) { --- 102,110 ---- } ! void write_pixbuf(Image &my_image, const String &filename, bool write_mem, bool write_file, string &data_string) { //create pixbuf m_pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, my_image.get_width(), my_image.get_height()); if (my_image.get_pixelsize() == 1) { *************** *** 144,153 **** GError *error = & error1; ! //saving pixbuf ! gdk_pixbuf_save (m_pixbuf,filename.c_str(), "jpeg", &error,"quality", "100", NULL); //destroy pixbuf (ref will be decreased and object should be finalized) gdk_pixbuf_unref(m_pixbuf); - } --- 167,193 ---- GError *error = & error1; ! //saving pixbuf to file ! if (write_file) { ! gdk_pixbuf_save (m_pixbuf,filename.c_str(), "jpeg", &error,"quality",m_quality.c_str(), NULL); ! } ! //saving pixbuf to memory ! if (write_mem) { ! ! gboolean retval = gdk_pixbuf_save_to_callback (m_pixbuf, ! pixbuf_save_callback, ! &data_string, ! "jpeg", ! NULL, ! "quality", ! m_quality.c_str(),NULL); ! ! if (!retval) { ! throw new GeneralException("JPEGSave : Unable to save JPEG data to memory",__FILE__,__LINE__); ! } ! ! } //destroy pixbuf (ref will be decreased and object should be finalized) gdk_pixbuf_unref(m_pixbuf); } *************** *** 158,169 **** ObjectRef inputValue = getInput(m_inputID, count); ObjectRef FilenameValue = getInput(m_fileID,count); - - if (!inputValue->isNil() && !FilenameValue->isNil()) { - write_pixbuf(object_cast<Image>(inputValue),object_cast<String>(FilenameValue)); } ! //output the same thing ! out[count] = inputValue; }//try --- 198,221 ---- ObjectRef inputValue = getInput(m_inputID, count); ObjectRef FilenameValue = getInput(m_fileID,count); + String* image_data = new String; + + if (!inputValue->isNil()) { + if (!FilenameValue->isNil()) { + //write JPEG file + write_pixbuf(object_cast<Image>(inputValue),object_cast<String>(FilenameValue), true, true, *image_data); + } + else { + //write JPEG data into memory + write_pixbuf(object_cast<Image>(inputValue),string(""), true, false, *image_data); + } } ! //output the image ! (*outputs[m_outputID].buffer)[count] = inputValue; ! ! ! //output the JPEG data ! (*outputs[m_jpegID].buffer)[count] = ObjectRef (image_data); }//try |
|
From: Dominic L. <ma...@us...> - 2004-06-10 01:00:36
|
Update of /cvsroot/robotflow/RobotFlow/MARIE/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25155 Modified Files: MarieDataNull.cpp Log Message: removed unused input Index: MarieDataNull.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MarieDataNull.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MarieDataNull.cpp 7 Jun 2004 15:10:11 -0000 1.1 --- MarieDataNull.cpp 10 Jun 2004 01:00:22 -0000 1.2 *************** *** 31,39 **** * @name MarieDataNull * @category RobotFlow:MARIE:DATA ! * @description Read content of MarieDataNull ! * ! * @input_name NULL_DATA ! * @input_type MarieDataNull ! * @input_description The Odometry object * * @output_name DATANULL --- 31,35 ---- * @name MarieDataNull * @category RobotFlow:MARIE:DATA ! * @description Return MarieDataNull object * * @output_name DATANULL |
|
From: Dominic L. <ma...@us...> - 2004-06-07 15:10:20
|
Update of /cvsroot/robotflow/RobotFlow/MARIE/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1454/src Modified Files: Makefile.am MarieLoad.cpp Added Files: MarieDataNull.cpp Log Message: added MarieDataNull Index: MarieLoad.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MarieLoad.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** MarieLoad.cpp 31 May 2004 14:10:09 -0000 1.2 --- MarieLoad.cpp 7 Jun 2004 15:10:11 -0000 1.3 *************** *** 44,52 **** * @output_type any * ! END*/ ! MarieLoad::MarieLoad(string nodeName, ParameterSet params) ! : BufferedNode(nodeName, params) { m_outputID = addOutput("OUTPUT"); --- 44,52 ---- * @output_type any * ! END*/ ! MarieLoad::MarieLoad(string nodeName, ParameterSet params) ! : BufferedNode(nodeName, params) { m_outputID = addOutput("OUTPUT"); *************** *** 57,123 **** { ! try { ! //default output to nilObject ! ObjectRef objValue = nilObject; ! //get input stream ! RCPtr<IOStream> input_stream = getInput(m_inputID,count); ! //instruct marie that we are gonna do a "pull" ! (*input_stream) << "<pull>"; ! //make sure we are flushing data ? ! //input_stream->flush(); ! stringstream my_stream; ! while(1) ! { ! char c; ! (*input_stream).read(&c,1); ! ! my_stream << c; ! if (my_stream.str().find("</MARIE>") != string::npos) ! { ! if (my_stream.str().find("<?xml version=\"1.0\"?><!DOCTYPE MARIE []><MARIE>NULL</MARIE>") != string::npos) { ! cerr<<"MarieLoad : Return empty object"<<endl; ! out[count] = nilObject; ! return; ! } ! else { ! break; ! } ! } ! } ! DataAbstract *data = m_factory.createData(my_stream.str()); ! if (data) { ! //create FlowDesigner type object ! objValue = Object::newObject(data->getID()); ! ! //copy data from newly created object type ! RCPtr<MarieObject> marieObjectPtr = objValue; ! ! //copy internal data ! marieObjectPtr->copyDataAbstract(data); ! ! //delete unused data ! delete data; ! } ! ! //output the newly created object ! out[count] = objValue; ! } ! catch (BaseException *e) ! { ! e->print(cerr); ! delete e; ! } ! catch (...) ! { ! cerr<<"MarieLoad : Unknown exception occured"<<endl; ! } } } --- 57,119 ---- { ! try ! { ! //default output to nilObject ! ObjectRef objValue = nilObject; ! //get input stream ! RCPtr<IOStream> input_stream = getInput(m_inputID,count); ! //instruct marie that we are gonna do a "pull" ! (*input_stream) << "<pull>"; ! //make sure we are flushing data ? ! //input_stream->flush(); ! stringstream my_stream; ! while(1) ! { ! char c; ! (*input_stream).read(&c,1); ! ! my_stream << c; ! if (my_stream.str().find("</MARIE>") != string::npos) ! { ! //found a valid MARIE object, exit loop to process it ! break; ! } ! } ! DataAbstract *data = m_factory.createData(my_stream.str()); ! if (data) ! { ! //create FlowDesigner type object ! objValue = Object::newObject(data->getID()); ! ! //copy data from newly created object type ! RCPtr<MarieObject> marieObjectPtr = objValue; ! ! //copy internal data ! marieObjectPtr->copyDataAbstract(data); ! ! //delete unused data ! delete data; ! } ! ! //output the newly created object ! out[count] = objValue; ! } ! catch (BaseException *e) ! { ! e->print(cerr); ! delete e; ! } ! catch (...) ! { ! cerr<<"MarieLoad : Unknown exception occured"<<endl; ! } } } Index: Makefile.am =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/Makefile.am,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Makefile.am 31 May 2004 20:15:33 -0000 1.4 --- Makefile.am 7 Jun 2004 15:10:11 -0000 1.5 *************** *** 13,16 **** --- 13,17 ---- MarieDataCamera.cpp \ MarieDataOdometry.cpp \ + MarieDataNull.cpp \ MarieCommandBehavior.cpp \ MarieCommandCamera.cpp \ --- NEW FILE: MarieDataNull.cpp --- /* * MARIE - Mobile and Autonomous Robotics Integration Environment * Copyright (C) 2004 Carle Cote * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * * You can contact MARIE development team at http://marie.sourceforge.net */ #include "MarieDataNull.h" #include <sstream> #include <string> #include "MarieXMLDataFactory.h" namespace marie { DECLARE_NODE(MarieDataNull) /*Node * * @name MarieDataNull * @category RobotFlow:MARIE:DATA * @description Read content of MarieDataNull * * @input_name NULL_DATA * @input_type MarieDataNull * @input_description The Odometry object * * @output_name DATANULL * @output_description MARIE NullData object * @output_type int * END*/ using namespace std; DECLARE_TYPE2(DataNull::ID,MarieDataNull) MarieDataNull::MarieDataNull() : MarieObject("MarieDataNull",ParameterSet()), m_isNode(false) { } MarieDataNull::MarieDataNull (const DataNull &data) : MarieObject("MarieDataNull",ParameterSet()), DataNull(data), m_isNode(false) { } MarieDataNull::MarieDataNull(string nodeName, ParameterSet params) : MarieObject(nodeName,params), m_isNode(true) { //used as a BufferedNode, create inputs & outputs //output m_dataNullOutID = addOutput("DATANULL"); //create dataNullObject m_dataNullObject = ObjectRef(new MarieDataNull()); } void MarieDataNull::calculate(int output_id, int count, Buffer &out) { if (m_isNode) { out[count] = m_dataNullObject; } else { out[count] = nilObject; } } void MarieDataNull::printOn(ostream &out) const { MarieXMLDataFactory factory; //writing XML data string value = factory.toString((DataNull&) (*this)); out.write(value.c_str(), value.size()); } void MarieDataNull::readFrom(istream &in) { throw new GeneralException("readFrom not supported. Use the MarieLoad Node to read data from the stream.",__FILE__,__LINE__); } void MarieDataNull::copyDataAbstract(DataAbstract *data) { if (data) { DataNull *my_data = dynamic_cast<DataNull*>(data); if (my_data) { //((DataNull*)this)->operator=(*my_data); this->DataNull::operator=(*my_data); } else { throw new GeneralException(string("Unable to cast into DataNull Abstract : ") + data->getID(),__FILE__,__LINE__); } } } } |
|
From: Dominic L. <ma...@us...> - 2004-06-07 15:10:19
|
Update of /cvsroot/robotflow/RobotFlow/MARIE/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1454/include Modified Files: Makefile.am Added Files: MarieDataNull.h Log Message: added MarieDataNull --- NEW FILE: MarieDataNull.h --- /* * MARIE - Mobile and Autonomous Robotics Integration Environment * Copyright (C) 2004 Carle Cote * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * * You can contact MARIE development team at http://marie.sourceforge.net */ // Prevent Multiple Inclusion #ifndef _MARIE_DATA_NULL_H_ #define _MARIE_DATA_NULL_H_ //FlowDesigner include #include "Object.h" #include "MarieObject.h" //MARIE data types include #include "DataNull.h" namespace marie { class MarieDataNull : public MarieObject, public DataNull { public: MarieDataNull(); MarieDataNull(const DataNull &command); //from BufferedNode MarieDataNull(string nodeName, ParameterSet params); virtual void calculate(int output_id, int count, Buffer &out); virtual void printOn(ostream &out) const; virtual void readFrom(istream &in=cin); virtual void copyDataAbstract(DataAbstract *data); //from Object virtual bool isNil() const {return true;} private: bool m_isNode; //outputs int m_dataNullOutID; //same dataNull object ObjectRef m_dataNullObject; }; } #endif Index: Makefile.am =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/Makefile.am,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Makefile.am 30 May 2004 12:34:07 -0000 1.1 --- Makefile.am 7 Jun 2004 15:10:10 -0000 1.2 *************** *** 2,14 **** noinst_HEADERS = MarieCommandBehavior.h \ ! MarieCommandMotor.h \ ! MarieDataLaser.h \ ! MarieDataSonar.h \ ! MarieObject.h \ ! MarieCommandCamera.h \ ! MarieDataCamera.h \ ! MarieDataOdometry.h \ ! MarieLoad.h \ ! MarieSave.h --- 2,15 ---- noinst_HEADERS = MarieCommandBehavior.h \ ! MarieCommandMotor.h \ ! MarieDataLaser.h \ ! MarieDataSonar.h \ ! MarieDataNull.h \ ! MarieObject.h \ ! MarieCommandCamera.h \ ! MarieDataCamera.h \ ! MarieDataOdometry.h \ ! MarieLoad.h \ ! MarieSave.h |
|
From: Dominic L. <ma...@us...> - 2004-06-02 20:52:17
|
Update of /cvsroot/robotflow/RobotFlow/Player/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20329 Modified Files: PlayerPTZ.cc Log Message: still have problems with the camera Index: PlayerPTZ.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Player/src/PlayerPTZ.cc,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** PlayerPTZ.cc 2 Jun 2004 18:39:35 -0000 1.9 --- PlayerPTZ.cc 2 Jun 2004 20:51:55 -0000 1.10 *************** *** 146,230 **** } ! void calculate(int output_id, int count, Buffer &out) ! { ! //must update our readings. ! ObjectRef ClientValue = getInput(m_clientID,count); ! ! if(ClientValue->isNil()) { ! out[count] = nilObject; ! return; } ! ! m_ptzProxy = object_cast<PlayerClientWrap>(ClientValue).getPtzProxy(); ! if (m_ptzProxy == NULL) { ! throw new GeneralException("PlayerPTZ::calculate NULL PTZ proxy",__FILE__,__LINE__); } ! ! if(!m_isInit) { ! m_ptzProxy->SetSpeed(m_panSpeed, m_tiltSpeed); ! m_isInit = true; } ! ! m_panSpeed = dereference_cast<int>(parameters.get("PAN_SPEED")); ! m_tiltSpeed = dereference_cast<int>(parameters.get("TILT_SPEED")); ! ! ! int pan_command = (int)(m_ptzProxy->pan * M_PI / 180.0); ! int tilt_command = (int)(m_ptzProxy->tilt * M_PI / 180.0); ! int zoom_command = (int)(m_ptzProxy->zoom); ! ! //reading & checking validity of inputs. ! ObjectRef RelPanValue = getInput(m_relPanID,count); ! ObjectRef RelTiltValue = getInput(m_relTiltID,count); ! ObjectRef RelZoomValue = getInput(m_relZoomID,count); ! ObjectRef AbsPanValue = getInput(m_absPanID,count); ! ObjectRef AbsTiltValue = getInput(m_absTiltID,count); ! ObjectRef AbsZoomValue = getInput(m_absZoomID,count); ! ! //check for absolute movements ! if (!AbsPanValue->isNil()) { ! pan_command = dereference_cast<int>(AbsPanValue) / 10; } ! if (!AbsTiltValue->isNil()) { ! tilt_command = dereference_cast<int>(AbsTiltValue) / 10; } ! if (!AbsZoomValue->isNil()) { ! zoom_command = dereference_cast<int>(AbsZoomValue); } ! ! //add relative movements ! if (!RelPanValue->isNil()) { ! pan_command += dereference_cast<int>(RelPanValue) / 10; } ! if (!RelTiltValue->isNil()) { ! tilt_command += dereference_cast<int>(RelTiltValue) / 10; } ! if (!RelZoomValue->isNil()) ! { ! zoom_command += dereference_cast<int>(RelZoomValue); } ! //checking camera limits ! pan_command = max(-88,min(pan_command,88)); ! tilt_command = max(-30,min(tilt_command,30)); ! zoom_command = max(0,min(zoom_command,1023)); ! ! //writing ptz command ! m_ptzProxy->SetCam(pan_command,tilt_command,zoom_command); ! ! //output current camera position ! (*outputs[m_panOutID].buffer)[count] = ObjectRef(Int::alloc((int) (m_ptzProxy->pan * 10 * M_PI / 180.0))); ! (*outputs[m_tiltOutID].buffer)[count] = ObjectRef(Int::alloc((int) (m_ptzProxy->tilt * 10 * M_PI / 180.0 ))); ! (*outputs[m_zoomOutID].buffer)[count] = ObjectRef(Int::alloc((int) (m_ptzProxy->zoom * 10))); ! ! } }; --- 146,246 ---- } ! void calculate(int output_id, int count, Buffer &out) ! { ! //must update our readings. ! ObjectRef ClientValue = getInput(m_clientID,count); ! ! if(ClientValue->isNil()) { ! out[count] = nilObject; ! return; } ! ! m_ptzProxy = object_cast<PlayerClientWrap>(ClientValue).getPtzProxy(); ! if (m_ptzProxy == NULL) { ! throw new GeneralException("PlayerPTZ::calculate NULL PTZ proxy",__FILE__,__LINE__); } ! ! if(!m_isInit) { ! m_ptzProxy->SetSpeed(m_panSpeed, m_tiltSpeed); ! m_isInit = true; } ! ! m_panSpeed = dereference_cast<int>(parameters.get("PAN_SPEED")); ! m_tiltSpeed = dereference_cast<int>(parameters.get("TILT_SPEED")); ! ! ! //conversion into rads ! double pan_command = m_ptzProxy->pan; ! double tilt_command = m_ptzProxy->tilt; ! ! //conversion into zoom ratio ! double zoom_command = m_ptzProxy->zoom; ! ! //reading & checking validity of inputs. ! ObjectRef RelPanValue = getInput(m_relPanID,count); ! ObjectRef RelTiltValue = getInput(m_relTiltID,count); ! ObjectRef RelZoomValue = getInput(m_relZoomID,count); ! ObjectRef AbsPanValue = getInput(m_absPanID,count); ! ObjectRef AbsTiltValue = getInput(m_absTiltID,count); ! ObjectRef AbsZoomValue = getInput(m_absZoomID,count); ! ! //check for absolute movements ! if (!AbsPanValue->isNil()) { ! //converting into rads ! pan_command = dereference_cast<int>(AbsPanValue) / 10 * M_PI / 180.0; } ! if (!AbsTiltValue->isNil()) { ! //converting into rads ! tilt_command = dereference_cast<int>(AbsTiltValue) / 10 * M_PI / 180.0; } ! if (!AbsZoomValue->isNil()) { ! //converting into zoom ratio ! zoom_command = (double) dereference_cast<int>(AbsZoomValue); } ! ! //add relative movements ! if (!RelPanValue->isNil()) { ! //converting into rads ! pan_command += (double) dereference_cast<int>(RelPanValue) / 10 * M_PI / 180.0; } ! if (!RelTiltValue->isNil()) { ! //converting into rads ! tilt_command += (double) dereference_cast<int>(RelTiltValue) / 10 * M_PI / 180.0; } ! ! if (!RelZoomValue->isNil()) ! { ! //converting into zoom ratio ! zoom_command += dereference_cast<int>(RelZoomValue); } + + double pan_limit = 88.0 * M_PI / 180.0; + double tilt_limit = 30.0 * M_PI / 180.0; + + + //checking camera limits (rads) + pan_command = max(-pan_limit,min(pan_command,pan_limit)); + tilt_command = max(-tilt_limit,min(tilt_command,tilt_limit)); + zoom_command = max(1,min(zoom_command,24)); + + //writing ptz command + cerr<<"pan "<<pan_command<<" tilt "<<tilt_command<<" zoom command "<<zoom_command<<endl; ! m_ptzProxy->SetCam(pan_command,tilt_command,zoom_command); ! ! //output current camera position ! (*outputs[m_panOutID].buffer)[count] = ObjectRef(Int::alloc((int) (m_ptzProxy->pan * 10 * 180.0 / M_PI))); ! (*outputs[m_tiltOutID].buffer)[count] = ObjectRef(Int::alloc((int) (m_ptzProxy->tilt * 10 * 180.0 / M_PI ))); ! (*outputs[m_zoomOutID].buffer)[count] = ObjectRef(Int::alloc((int) (m_ptzProxy->zoom))); ! ! } }; |
|
From: Dominic L. <ma...@us...> - 2004-06-02 19:49:55
|
Update of /cvsroot/robotflow/RobotFlow/Player/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5785 Modified Files: PlayerSonars.cc Log Message: units changed to meters and rads Index: PlayerSonars.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Player/src/PlayerSonars.cc,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** PlayerSonars.cc 26 Nov 2003 14:31:59 -0000 1.7 --- PlayerSonars.cc 2 Jun 2004 19:49:46 -0000 1.8 *************** *** 163,168 **** //output individual sonars for (int i = 0; i < 16; i++) { ! (*outputs[sonarsID[i]].buffer)[count] = ObjectRef(Float::alloc((float)(*m_sonarProxy)[i])); ! (*all_sonars)[i] = (float) (*m_sonarProxy)[i]; } //output all sonars --- 163,168 ---- //output individual sonars for (int i = 0; i < 16; i++) { ! (*outputs[sonarsID[i]].buffer)[count] = ObjectRef(Float::alloc((float)(*m_sonarProxy)[i] * 1000.0)); ! (*all_sonars)[i] = (float) (*m_sonarProxy)[i] * 1000.0; } //output all sonars |
|
From: Dominic L. <ma...@us...> - 2004-06-02 19:43:17
|
Update of /cvsroot/robotflow/RobotFlow/Player/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4212 Modified Files: PlayerVelocity.cc Log Message: units changed to meters and rads Index: PlayerVelocity.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Player/src/PlayerVelocity.cc,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** PlayerVelocity.cc 2 Jun 2004 19:37:49 -0000 1.10 --- PlayerVelocity.cc 2 Jun 2004 19:43:08 -0000 1.11 *************** *** 153,157 **** (*outputs[m_xposID].buffer)[count] = ObjectRef(Int::alloc((int) m_positionProxy->Xpos())); (*outputs[m_yposID].buffer)[count] = ObjectRef(Int::alloc((int) m_positionProxy->Ypos())); ! (*outputs[m_thetaID].buffer)[count] = ObjectRef(Int::alloc((int) m_positionProxy->Theta())); } --- 153,157 ---- (*outputs[m_xposID].buffer)[count] = ObjectRef(Int::alloc((int) m_positionProxy->Xpos())); (*outputs[m_yposID].buffer)[count] = ObjectRef(Int::alloc((int) m_positionProxy->Ypos())); ! (*outputs[m_thetaID].buffer)[count] = ObjectRef(Int::alloc((int) ((double)m_positionProxy->Theta() * 180.0 / M_PI))); } |
|
From: Dominic L. <ma...@us...> - 2004-06-02 19:37:58
|
Update of /cvsroot/robotflow/RobotFlow/Player/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2669 Modified Files: PlayerVelocity.cc Log Message: units changed to meters and rads Index: PlayerVelocity.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Player/src/PlayerVelocity.cc,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** PlayerVelocity.cc 2 Jun 2004 18:39:35 -0000 1.9 --- PlayerVelocity.cc 2 Jun 2004 19:37:49 -0000 1.10 *************** *** 121,125 **** // write commands to robot if (m_lastVelocity != vel || m_lastHeading != rot){ ! m_positionProxy->SetSpeed(vel,rot); m_lastVelocity = vel; m_lastHeading = rot; --- 121,125 ---- // write commands to robot if (m_lastVelocity != vel || m_lastHeading != rot){ ! m_positionProxy->SetSpeed((double)vel / 1000.0 ,(double) rot * M_PI / 180.0); m_lastVelocity = vel; m_lastHeading = rot; *************** *** 130,134 **** // write commands to robot if (m_lastHeading != rot){ ! m_positionProxy->SetSpeed(0,rot); m_lastHeading = rot; } --- 130,134 ---- // write commands to robot if (m_lastHeading != rot){ ! m_positionProxy->SetSpeed(0,(double)rot * M_PI / 180.0); m_lastHeading = rot; } *************** *** 138,142 **** // write commands to robot if (m_lastVelocity != vel){ ! m_positionProxy->SetSpeed(vel,0); m_lastVelocity = vel; } --- 138,142 ---- // write commands to robot if (m_lastVelocity != vel){ ! m_positionProxy->SetSpeed((double)vel / 1000.0,0); m_lastVelocity = vel; } *************** *** 149,171 **** } } - /**** old - if (!VelocityValue->isNil() && !HeadingValue->isNil()) { - int vel = dereference_cast<int>(VelocityValue); - int rot = dereference_cast<int>(HeadingValue); - // write commands to robot - m_positionProxy->SetSpeed(vel,rot); - } - - else if (VelocityValue->isNil() && !HeadingValue->isNil()) { - int rot = dereference_cast<int>(HeadingValue); - // write commands to robot - m_positionProxy->SetSpeed(0,rot); - } - else if (!VelocityValue->isNil() && HeadingValue->isNil()) { - int vel = dereference_cast<int>(VelocityValue); - // write commands to robot - m_positionProxy->SetSpeed(vel,0); - } - ***/ //write output --- 149,152 ---- |
|
From: Dominic L. <ma...@us...> - 2004-06-02 18:51:14
|
Update of /cvsroot/robotflow/RobotFlow/Player/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24632 Modified Files: PlayerLaser.cc Log Message: compiling version with player 1.5, conversion to mm Index: PlayerLaser.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Player/src/PlayerLaser.cc,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** PlayerLaser.cc 2 Jun 2004 18:39:35 -0000 1.7 --- PlayerLaser.cc 2 Jun 2004 18:51:04 -0000 1.8 *************** *** 107,111 **** //copy range & intensity values for (int i = 0; i < m_laserProxy->RangeCount(); i++) { ! (*rangeVect)[i] = (int)(*m_laserProxy)[i]; (*intensityVect)[i] = m_laserProxy->intensities[i]; } --- 107,111 ---- //copy range & intensity values for (int i = 0; i < m_laserProxy->RangeCount(); i++) { ! (*rangeVect)[i] = (int)(*m_laserProxy)[i] * 1000; (*intensityVect)[i] = m_laserProxy->intensities[i]; } |
|
From: Dominic L. <ma...@us...> - 2004-06-02 18:39:45
|
Update of /cvsroot/robotflow/RobotFlow/Player/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21473 Modified Files: PlayerHeading.cc PlayerLaser.cc PlayerPTZ.cc PlayerVelocity.cc Log Message: compiling version with player 1.5 Index: PlayerLaser.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Player/src/PlayerLaser.cc,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** PlayerLaser.cc 27 May 2004 00:27:39 -0000 1.6 --- PlayerLaser.cc 2 Jun 2004 18:39:35 -0000 1.7 *************** *** 102,111 **** } ! Vector<int> *rangeVect = Vector<int>::alloc(m_laserProxy->range_count); ! Vector<int> *intensityVect = Vector<int>::alloc(m_laserProxy->range_count); //copy range & intensity values ! for (int i = 0; i < m_laserProxy->range_count; i++) { ! (*rangeVect)[i] = m_laserProxy->ranges[i]; (*intensityVect)[i] = m_laserProxy->intensities[i]; } --- 102,111 ---- } ! Vector<int> *rangeVect = Vector<int>::alloc(m_laserProxy->RangeCount()); ! Vector<int> *intensityVect = Vector<int>::alloc(m_laserProxy->RangeCount()); //copy range & intensity values ! for (int i = 0; i < m_laserProxy->RangeCount(); i++) { ! (*rangeVect)[i] = (int)(*m_laserProxy)[i]; (*intensityVect)[i] = m_laserProxy->intensities[i]; } Index: PlayerPTZ.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Player/src/PlayerPTZ.cc,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** PlayerPTZ.cc 27 May 2004 00:27:39 -0000 1.8 --- PlayerPTZ.cc 2 Jun 2004 18:39:35 -0000 1.9 *************** *** 173,179 **** ! int pan_command = m_ptzProxy->pan; ! int tilt_command = m_ptzProxy->tilt; ! int zoom_command = m_ptzProxy->zoom; //reading & checking validity of inputs. --- 173,179 ---- ! int pan_command = (int)(m_ptzProxy->pan * M_PI / 180.0); ! int tilt_command = (int)(m_ptzProxy->tilt * M_PI / 180.0); ! int zoom_command = (int)(m_ptzProxy->zoom); //reading & checking validity of inputs. *************** *** 222,228 **** //output current camera position ! (*outputs[m_panOutID].buffer)[count] = ObjectRef(Int::alloc(m_ptzProxy->pan * 10)); ! (*outputs[m_tiltOutID].buffer)[count] = ObjectRef(Int::alloc(m_ptzProxy->tilt * 10)); ! (*outputs[m_zoomOutID].buffer)[count] = ObjectRef(Int::alloc(m_ptzProxy->zoom * 10)); } --- 222,228 ---- //output current camera position ! (*outputs[m_panOutID].buffer)[count] = ObjectRef(Int::alloc((int) (m_ptzProxy->pan * 10 * M_PI / 180.0))); ! (*outputs[m_tiltOutID].buffer)[count] = ObjectRef(Int::alloc((int) (m_ptzProxy->tilt * 10 * M_PI / 180.0 ))); ! (*outputs[m_zoomOutID].buffer)[count] = ObjectRef(Int::alloc((int) (m_ptzProxy->zoom * 10))); } Index: PlayerHeading.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Player/src/PlayerHeading.cc,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** PlayerHeading.cc 9 Jul 2003 14:25:14 -0000 1.7 --- PlayerHeading.cc 2 Jun 2004 18:39:35 -0000 1.8 *************** *** 93,107 **** ! ! int absolute_heading = m_positionProxy->theta; //getting abs value if (!absHeadingValue->isNil()) { ! absolute_heading= dereference_cast<int>(absHeadingValue); } //adding relative value if (!relHeadingValue->isNil()) { ! absolute_heading += dereference_cast<int>(relHeadingValue); } --- 93,106 ---- ! double absolute_heading = (int)(m_positionProxy->theta); //getting abs value if (!absHeadingValue->isNil()) { ! absolute_heading= (int)((double)dereference_cast<int>(absHeadingValue) * M_PI / 180.0); } //adding relative value if (!relHeadingValue->isNil()) { ! absolute_heading += (int)((double)dereference_cast<int>(relHeadingValue) * M_PI / 180.0); } *************** *** 110,114 **** ! (*outputs[m_HeadingID].buffer)[count] = ObjectRef(Int::alloc(absolute_heading)); } --- 109,113 ---- ! (*outputs[m_HeadingID].buffer)[count] = ObjectRef(Int::alloc((int)absolute_heading)); } Index: PlayerVelocity.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Player/src/PlayerVelocity.cc,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** PlayerVelocity.cc 27 May 2004 00:27:39 -0000 1.8 --- PlayerVelocity.cc 2 Jun 2004 18:39:35 -0000 1.9 *************** *** 170,176 **** //write output ! (*outputs[m_xposID].buffer)[count] = ObjectRef(Int::alloc(m_positionProxy->Xpos())); ! (*outputs[m_yposID].buffer)[count] = ObjectRef(Int::alloc(m_positionProxy->Ypos())); ! (*outputs[m_thetaID].buffer)[count] = ObjectRef(Int::alloc(m_positionProxy->Theta())); } --- 170,176 ---- //write output ! (*outputs[m_xposID].buffer)[count] = ObjectRef(Int::alloc((int) m_positionProxy->Xpos())); ! (*outputs[m_yposID].buffer)[count] = ObjectRef(Int::alloc((int) m_positionProxy->Ypos())); ! (*outputs[m_thetaID].buffer)[count] = ObjectRef(Int::alloc((int) m_positionProxy->Theta())); } |
|
From: Dominic L?t. <ma...@us...> - 2004-05-31 20:18:18
|
Update of /cvsroot/robotflow/RobotFlow/Devices/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20823 Modified Files: EVID30.cc SICKLMS200.cc Log Message: removed warning about list.h Index: SICKLMS200.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Devices/src/SICKLMS200.cc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** SICKLMS200.cc 29 Apr 2002 01:17:15 -0000 1.1 --- SICKLMS200.cc 31 May 2004 20:18:08 -0000 1.2 *************** *** 2,6 **** #include <fcntl.h> ! #include <list.h> #include <pthread.h> #include <signal.h> --- 2,6 ---- #include <fcntl.h> ! #include <list> #include <pthread.h> #include <signal.h> Index: EVID30.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Devices/src/EVID30.cc,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** EVID30.cc 13 Jan 2004 14:01:19 -0000 1.6 --- EVID30.cc 31 May 2004 20:18:08 -0000 1.7 *************** *** 31,37 **** #include <termios.h> #include <stdlib.h> ! #include <list.h> #include <pthread.h> ! #include <string.h> #include <sched.h> #include "pseudosem.h" --- 31,37 ---- #include <termios.h> #include <stdlib.h> ! #include <list> #include <pthread.h> ! #include <string> #include <sched.h> #include "pseudosem.h" |
|
From: Dominic L?t. <ma...@us...> - 2004-05-31 20:16:11
|
Update of /cvsroot/robotflow/RobotFlow/Control/n-files In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20171/Control/n-files Modified Files: Makefile.am Log Message: now working make rpm Index: Makefile.am =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Control/n-files/Makefile.am,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Makefile.am 27 May 2004 00:27:21 -0000 1.2 --- Makefile.am 31 May 2004 20:15:31 -0000 1.3 *************** *** 1,5 **** #AUTOMAKE_OPTIONS = no-dependencies ! toolboxdir = $(OVERFLOW_DATA)/$(PACKAGE) toolbox_DATA = PTZPID.n --- 1,5 ---- #AUTOMAKE_OPTIONS = no-dependencies ! toolboxdir = $(prefix) toolbox_DATA = PTZPID.n |
|
From: Dominic L?t. <ma...@us...> - 2004-05-31 20:16:11
|
Update of /cvsroot/robotflow/RobotFlow/Control/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20171/Control/src Modified Files: Makefile.am Log Message: now working make rpm Index: Makefile.am =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Control/src/Makefile.am,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Makefile.am 27 May 2004 00:27:22 -0000 1.5 --- Makefile.am 31 May 2004 20:15:32 -0000 1.6 *************** *** 4,9 **** #AUTOMAKE_OPTIONS = no-dependencies - #override libdir=$(OVERFLOW_DATA)/$(PACKAGE) - lib_LTLIBRARIES = libControl.la --- 4,7 ---- *************** *** 14,18 **** EVID30_PID.cc - libControl_la_LDFLAGS = -release $(LT_RELEASE) --- 12,15 ---- *************** *** 20,25 **** install-data-local: ! echo "Installing libControl" ! mkdir -p $(OVERFLOW_DATA)/$(PACKAGE) ! (perl $(OVERFLOW_BIN)/info2def.pl $(libControl_la_SOURCES) > $(OVERFLOW_DATA)/$(PACKAGE)/Control.def) ! (rm $(OVERFLOW_DATA)/$(PACKAGE)/Control.tlb; cd $(OVERFLOW_DATA)/$(PACKAGE); ln -s lib/libControl.so Control.tlb) --- 17,22 ---- install-data-local: ! echo "Installing libControl in $(libdir)" ! mkdir -p $(libdir) ! (perl $(OVERFLOW_BIN)/info2def.pl $(libControl_la_SOURCES) > $(prefix)/Control.def) ! (rm $(libdir)/Control.tlb; cd $(libdir); ln -s libControl.so Control.tlb) |
|
From: Dominic L?t. <ma...@us...> - 2004-05-31 20:16:11
|
Update of /cvsroot/robotflow/RobotFlow/Behaviors/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20171/Behaviors/src Modified Files: Makefile.am Log Message: now working make rpm Index: Makefile.am =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Behaviors/src/Makefile.am,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** Makefile.am 27 May 2004 00:27:21 -0000 1.10 --- Makefile.am 31 May 2004 20:15:31 -0000 1.11 *************** *** 4,9 **** #AUTOMAKE_OPTIONS = no-dependencies - #override libdir=$(OVERFLOW_DATA)/$(PACKAGE) - lib_LTLIBRARIES = libBehaviors.la --- 4,7 ---- *************** *** 38,43 **** install-data-local: ! echo "Installing libBehaviors" ! mkdir -p $(OVERFLOW_DATA)/$(PACKAGE) ! (perl $(OVERFLOW_BIN)/info2def.pl $(libBehaviors_la_SOURCES) > $(OVERFLOW_DATA)/$(PACKAGE)/Behaviors.def) ! (rm -f $(OVERFLOW_DATA)/$(PACKAGE)/Behaviors.tlb; cd $(OVERFLOW_DATA)/$(PACKAGE); ln -s lib/libBehaviors.so Behaviors.tlb) --- 36,41 ---- install-data-local: ! echo "Installing libBehaviors in $(libdir)" ! mkdir -p $(libdir) ! (perl $(OVERFLOW_BIN)/info2def.pl $(libBehaviors_la_SOURCES) > $(prefix)/Behaviors.def) ! (rm -f $(libdir)/Behaviors.tlb; cd $(libdir); ln -s libBehaviors.so Behaviors.tlb) |
|
From: Dominic L?t. <ma...@us...> - 2004-05-31 20:16:11
|
Update of /cvsroot/robotflow/RobotFlow In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20171 Modified Files: RobotFlow.spec.in Log Message: now working make rpm Index: RobotFlow.spec.in =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/RobotFlow.spec.in,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** RobotFlow.spec.in 31 May 2004 12:31:40 -0000 1.2 --- RobotFlow.spec.in 31 May 2004 20:15:31 -0000 1.3 *************** *** 2,5 **** --- 2,12 ---- %define ver @VERSION@ %define rel 1 + %define _prefix /usr/lib/flowdesigner/toolbox/RobotFlow + %define _datadir %{_prefix} + %define _bindir %{_prefix}/bin + %define _includedir %{_prefix}/include + %define _libdir %{_prefix}/lib + %define _mandir %{_prefix}/man + %define _sysconfdir %{_prefix}/etc Summary: A Robotics Toolkit for FlowDesigner *************** *** 27,39 **** %prep %setup - %build export CXXFLAGS='-O3 -march=pentium' export CFLAGS='-O3 -march=pentium' ! ./configure --prefix=/usr/lib/flowdesigner/toolbox/RobotFlow --disable-static %{__make} %install ! %makeinstall %post -p /sbin/ldconfig --- 34,60 ---- %prep %setup %build + export CXXFLAGS='-O3 -march=pentium' export CFLAGS='-O3 -march=pentium' ! ! ./configure --prefix=%{_prefix} \ ! --bindir=%{_bindir} \ ! --datadir=%{_datadir} \ ! --includedir=%{_includedir} \ ! --libdir=%{_libdir} \ ! --mandir=%{_mandir} \ ! --sysconfdir=%{_sysconfdir} \ ! --disable-static ! %{__make} %install ! rm -rf %{buildroot} ! make prefix=%{buildroot}%{_prefix} bindir=%{buildroot}%{_bindir} \ ! datadir=%{buildroot}%{_datadir} includedir=%{buildroot}%{_includedir} \ ! libdir=%{buildroot}%{_libdir} mandir=%{buildroot}%{_mandir} \ ! sysconfdir=%{buildroot}%{_sysconfdir} \ ! install %post -p /sbin/ldconfig *************** *** 42,45 **** %files %defattr(-, root, root, 0755) ! /usr/lib/flowdesigner/toolbox/RobotFlow/* --- 63,69 ---- %files %defattr(-, root, root, 0755) ! ! %{_datadir}/* ! %{_libdir}/* ! %{_includedir}/* |
|
From: Dominic L?t. <ma...@us...> - 2004-05-31 20:15:44
|
Update of /cvsroot/robotflow/RobotFlow/Probes/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20171/Probes/src Modified Files: Makefile.am Log Message: now working make rpm Index: Makefile.am =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Probes/src/Makefile.am,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** Makefile.am 30 May 2004 10:19:19 -0000 1.9 --- Makefile.am 31 May 2004 20:15:34 -0000 1.10 *************** *** 28,33 **** install-data-local: ! echo "Installing libProbes" ! mkdir -p $(OVERFLOW_DATA)/$(PACKAGE) ! (perl $(OVERFLOW_BIN)/info2def.pl $(libProbes_la_SOURCES) > $(OVERFLOW_DATA)/$(PACKAGE)/Probes.def) ! (rm -f $(OVERFLOW_DATA)/$(PACKAGE)/Probes.tlb; cd $(OVERFLOW_DATA)/$(PACKAGE); ln -s lib/libProbes.so Probes.tlb) --- 28,33 ---- install-data-local: ! echo "Installing libProbes in $(libdir)" ! mkdir -p $(libdir) ! (perl $(OVERFLOW_BIN)/info2def.pl $(libProbes_la_SOURCES) > $(prefix)/Probes.def) ! (rm -f $(libdir)/Probes.tlb; cd $(libdir); ln -s libProbes.so Probes.tlb) |
|
From: Dominic L?t. <ma...@us...> - 2004-05-31 20:15:43
|
Update of /cvsroot/robotflow/RobotFlow/Pioneer2/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20171/Pioneer2/src Modified Files: Makefile.am Log Message: now working make rpm Index: Makefile.am =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Pioneer2/src/Makefile.am,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Makefile.am 27 May 2004 00:27:24 -0000 1.7 --- Makefile.am 31 May 2004 20:15:33 -0000 1.8 *************** *** 4,9 **** #AUTOMAKE_OPTIONS = no-dependencies - #override libdir=$(OVERFLOW_DATA)/$(PACKAGE) - lib_LTLIBRARIES = libPioneer2.la --- 4,7 ---- *************** *** 29,34 **** install-data-local: ! echo "Installing libPioneer2" ! mkdir -p $(OVERFLOW_DATA)/$(PACKAGE) ! (perl $(OVERFLOW_BIN)/info2def.pl $(libPioneer2_la_SOURCES) > $(OVERFLOW_DATA)/$(PACKAGE)/Pioneer2.def) ! (rm -f $(OVERFLOW_DATA)/$(PACKAGE)/Pioneer2.tlb; cd $(OVERFLOW_DATA)/$(PACKAGE); ln -s lib/libPioneer2.so Pioneer2.tlb) --- 27,32 ---- install-data-local: ! echo "Installing libPioneer2 in $(libdir)" ! mkdir -p $(libdir) ! (perl $(OVERFLOW_BIN)/info2def.pl $(libPioneer2_la_SOURCES) > $(prefix)/Pioneer2.def) ! (rm -f $(libdir)/Pioneer2.tlb; cd $(libdir); ln -s libPioneer2.so Pioneer2.tlb) |
|
From: Dominic L?t. <ma...@us...> - 2004-05-31 20:15:43
|
Update of /cvsroot/robotflow/RobotFlow/Vision/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20171/Vision/src Modified Files: Makefile.am Log Message: now working make rpm Index: Makefile.am =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Vision/src/Makefile.am,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** Makefile.am 27 May 2004 00:27:41 -0000 1.20 --- Makefile.am 31 May 2004 20:15:34 -0000 1.21 *************** *** 4,9 **** #AUTOMAKE_OPTIONS = no-dependencies - #override libdir=$(OVERFLOW_DATA)/$(PACKAGE) - lib_LTLIBRARIES = libVision.la --- 4,7 ---- *************** *** 49,54 **** install-data-local: ! echo "Installing libVision" ! mkdir -p $(OVERFLOW_DATA)/$(PACKAGE) ! (perl $(OVERFLOW_BIN)/info2def.pl $(libVision_la_SOURCES) > $(OVERFLOW_DATA)/$(PACKAGE)/Vision.def) ! (rm -f $(OVERFLOW_DATA)/$(PACKAGE)/Vision.tlb; cd $(OVERFLOW_DATA)/$(PACKAGE); ln -s lib/libVision.so Vision.tlb) --- 47,52 ---- install-data-local: ! echo "Installing libVision in $(libdir)" ! mkdir -p $(libdir) ! (perl $(OVERFLOW_BIN)/info2def.pl $(libVision_la_SOURCES) > $(prefix)/Vision.def) ! (rm -f $(libdir)/Vision.tlb; cd $(libdir); ln -s libVision.so Vision.tlb) |
|
From: Dominic L?t. <ma...@us...> - 2004-05-31 20:15:43
|
Update of /cvsroot/robotflow/RobotFlow/Player/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20171/Player/src Modified Files: Makefile.am Log Message: now working make rpm Index: Makefile.am =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Player/src/Makefile.am,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Makefile.am 27 May 2004 00:27:39 -0000 1.6 --- Makefile.am 31 May 2004 20:15:34 -0000 1.7 *************** *** 4,9 **** #AUTOMAKE_OPTIONS = no-dependencies - #override libdir=$(OVERFLOW_DATA)/$(PACKAGE) - lib_LTLIBRARIES = libPlayerDevices.la --- 4,7 ---- *************** *** 27,32 **** install-data-local: ! echo "Installing libPlayerDevices" ! mkdir -p $(OVERFLOW_DATA)/$(PACKAGE) ! (perl $(OVERFLOW_BIN)/info2def.pl $(libPlayerDevices_la_SOURCES) > $(OVERFLOW_DATA)/$(PACKAGE)/PlayerDevices.def) ! (rm -f $(OVERFLOW_DATA)/$(PACKAGE)/PlayerDevices.tlb; cd $(OVERFLOW_DATA)/$(PACKAGE); ln -s lib/libPlayerDevices.so PlayerDevices.tlb) --- 25,30 ---- install-data-local: ! echo "Installing libPlayerDevices in $(libdir)" ! mkdir -p $(libdir) ! (perl $(OVERFLOW_BIN)/info2def.pl $(libPlayerDevices_la_SOURCES) > $(prefix)/PlayerDevices.def) ! (rm -f $(libdir)/PlayerDevices.tlb; cd $(libdir); ln -s libPlayerDevices.so PlayerDevices.tlb) |
