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: clement r. <kl...@us...> - 2005-09-26 15:42:56
|
Update of /cvsroot/robotflow/RobotFlow/Devices/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6469 Modified Files: Makefile.am Log Message: remove libvisca from build Index: Makefile.am =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Devices/src/Makefile.am,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** Makefile.am 19 Sep 2005 16:06:12 -0000 1.16 --- Makefile.am 26 Sep 2005 15:42:47 -0000 1.17 *************** *** 15,20 **** SNCRZ30.cc \ SNCRZ30RS232.cc \ ! IMU400CC_200.cc \ ! libvisca.c libDevices_la_LDFLAGS = -release $(LT_RELEASE) --- 15,19 ---- SNCRZ30.cc \ SNCRZ30RS232.cc \ ! IMU400CC_200.cc libDevices_la_LDFLAGS = -release $(LT_RELEASE) |
|
From: Dominic L. <ma...@us...> - 2005-09-21 14:38:05
|
Update of /cvsroot/robotflow/RobotFlow/Devices/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4042/Devices/include Modified Files: SNCRZ30.h Log Message: fix with FD namespace Index: SNCRZ30.h =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Devices/include/SNCRZ30.h,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** SNCRZ30.h 4 May 2005 19:22:35 -0000 1.12 --- SNCRZ30.h 21 Sep 2005 14:37:53 -0000 1.13 *************** *** 72,77 **** ! network_socket m_imageSocket; ! network_socket m_dataSocket; --- 72,77 ---- ! FD::network_socket m_imageSocket; ! FD::network_socket m_dataSocket; |
|
From: MagellanPro <mag...@us...> - 2005-09-19 16:06:21
|
Update of /cvsroot/robotflow/RobotFlow/Devices/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21874 Modified Files: Makefile.am SNCRZ30RS232.cc Log Message: converting values properly to 1/10 of degrees Index: Makefile.am =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Devices/src/Makefile.am,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** Makefile.am 15 Aug 2005 19:22:41 -0000 1.15 --- Makefile.am 19 Sep 2005 16:06:12 -0000 1.16 *************** *** 15,19 **** SNCRZ30.cc \ SNCRZ30RS232.cc \ ! IMU400CC_200.cc libDevices_la_LDFLAGS = -release $(LT_RELEASE) --- 15,20 ---- SNCRZ30.cc \ SNCRZ30RS232.cc \ ! IMU400CC_200.cc \ ! libvisca.c libDevices_la_LDFLAGS = -release $(LT_RELEASE) Index: SNCRZ30RS232.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Devices/src/SNCRZ30RS232.cc,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** SNCRZ30RS232.cc 19 Sep 2005 13:38:43 -0000 1.7 --- SNCRZ30RS232.cc 19 Sep 2005 16:06:12 -0000 1.8 *************** *** 59,63 **** * @input_name TILT_ABS_POS * @input_type int ! * @input_description Absolute Tilt of the camera -725 to +425. (1/10 of degrees) * * @input_name PAN_REL_POS --- 59,63 ---- * @input_name TILT_ABS_POS * @input_type int ! * @input_description Absolute Tilt of the camera -575 to +425. (1/10 of degrees) * * @input_name PAN_REL_POS *************** *** 67,71 **** * @input_name TILT_REL_POS * @input_type int ! * @input_description Absolute Tilt of the camera -725 to +425. (1/10 of degrees) * * @parameter_name PAN_SPEED --- 67,71 ---- * @input_name TILT_REL_POS * @input_type int ! * @input_description Absolute Tilt of the camera -575 to +425. (1/10 of degrees) * * @parameter_name PAN_SPEED *************** *** 85,89 **** * @input_name ZOOM_ABS_POS * @input_type int ! * @input_description Absolute Zoom of the camera 0 (1X) to 16384 (24X) * * @input_name ZOOM_REL_POS --- 85,89 ---- * @input_name ZOOM_ABS_POS * @input_type int ! * @input_description Absolute Zoom of the camera 0 (1X) to 16384 (25X) * * @input_name ZOOM_REL_POS *************** *** 93,109 **** * @output_name PAN_POSITION * @output_type int ! * @output_description Returns the current pan position of the Camera * * @output_name TILT_POSITION * @output_type int ! * @output_description Returns the current tilt position of the Camera * * @output_name ZOOM_POSITION * @output_type int ! * @output_description Returns the current zoom position of the Camera * END*/ ! --- 93,110 ---- * @output_name PAN_POSITION * @output_type int ! * @output_description Returns the current pan position of the Camera (1/10 of degrees) * * @output_name TILT_POSITION * @output_type int ! * @output_description Returns the current tilt position of the Camera (1/10 of degrees) * * @output_name ZOOM_POSITION * @output_type int ! * @output_description Returns the current zoom position of the Camera (1/10 of degrees) * END*/ ! #define PAN_TILT_UNIT_CONVERTION_FROM_CAMERA 0.6944 ! #define PAN_TILT_UNIT_CONVERTION_TO_CAMERA 1.44 *************** *** 190,196 **** // Wait for a buffer to be freed up by the cam pseudosem_wait(&m_buffer_empty); ! //cerr<<"Sending...size"<<m_sending.size()<<endl; ! ! if(write(fd, to_send.c_str(),to_send.size()) < 0) { --- 191,195 ---- // Wait for a buffer to be freed up by the cam pseudosem_wait(&m_buffer_empty); ! if(write(fd, to_send.c_str(),to_send.size()) < 0) { *************** *** 308,312 **** m_zoom_position = message[2]<<12 | message[3]<<8 | message[4]<<4 | message[5]; ! cerr<<"Zoom inquiry reply"<<endl; pthread_mutex_unlock(&m_ack_lock); --- 307,311 ---- m_zoom_position = message[2]<<12 | message[3]<<8 | message[4]<<4 | message[5]; ! //cerr<<"Zoom inquiry reply"<<endl; pthread_mutex_unlock(&m_ack_lock); *************** *** 321,337 **** // next 4 are pan ! convpan = message[5]; ! convpan |= (message[4] << 4); ! convpan |= (message[3] << 8); ! convpan |= (message[2] << 12); m_pan_position = max(-1700,min(convpan,1700)); ! // next 4 are tilt ! convtilt = message[9]; ! convtilt |= (message[8] << 4); ! convtilt |= (message[7] << 8); ! convtilt |= (message[6] << 12); ! m_tilt_position= max(-725,min(convtilt,425)); pthread_mutex_unlock(&m_ack_lock); --- 320,345 ---- // next 4 are pan ! convpan = (short) message[5]; ! convpan |= ((short)message[4] << 4); ! convpan |= ((short)message[3] << 8); ! convpan |= ((short)message[2] << 12); ! ! //CONVERSION REQUIRED FROM CAMERA UNITS TO 1/10 OF DEGREES ! convpan = (short) (PAN_TILT_UNIT_CONVERTION_FROM_CAMERA * (float) convpan + 0.5); ! m_pan_position = max(-1700,min(convpan,1700)); ! ! // next 4 are tilt ! convtilt = (short)message[9]; ! convtilt |= ((short)message[8] << 4); ! convtilt |= ((short)message[7] << 8); ! convtilt |= ((short)message[6] << 12); ! ! //CONVERSION REQUIRED FROM CAMERA UNITS TO 1/10 OF DEGREES ! convtilt = (short) (PAN_TILT_UNIT_CONVERTION_FROM_CAMERA * (float) convtilt + 0.5); ! ! m_tilt_position= max(-575,min(convtilt,425)); pthread_mutex_unlock(&m_ack_lock); *************** *** 482,485 **** --- 490,499 ---- } + void cleanup(void) + { + + + } + void init_wb(void) { *************** *** 523,564 **** { - //LIMIT PAN & TILT SPEED VALUES - pan_speed = max(0,min(pan_speed,24)); - tilt_speed = max(0,min(tilt_speed,20)); - pan_position = max(min(pan_position,1700), -1700); - tilt_position = max(min(tilt_position,425), -725); ! //CREATE VISCA COMMAND ! ostringstream my_stream; ! static const unsigned int mask1 = 0x000F; ! static const unsigned int mask2 = 0x00F0; ! static const unsigned int mask3 = 0x0F00; ! static const unsigned int mask4 = 0xF000; ! //header ! my_stream << 0x81; ! my_stream << 0x01; ! my_stream << 0x06; ! my_stream << 0x02; ! //pan & tilt speeds ! my_stream << std::hex<<((mask2 & pan_speed)>>4);//pan speed ! my_stream << std::hex<<((mask1 & pan_speed)); ! my_stream << std::hex<<((mask2 & tilt_speed)>>4);//tilt speed ! my_stream << std::hex<<((mask1 & tilt_speed)); ! //pan & tilt commands ! my_stream << "0"<<std::hex<<((mask4 & pan_position)>>12); //pan position ! my_stream << "0"<<std::hex<<((mask3 & pan_position)>>8); ! my_stream << "0"<<std::hex<<((mask2 & pan_position)>>4); ! my_stream << "0"<<std::hex<<((mask1 & pan_position)); ! my_stream << "0"<<std::hex<<((mask4 & tilt_position)>>12); //tilt position ! my_stream << "0"<<std::hex<<((mask3 & tilt_position)>>8); ! my_stream << "0"<<std::hex<<((mask2 & tilt_position)>>4); ! my_stream << "0"<<std::hex<<((mask1 & tilt_position)); ! my_stream << "FF\r\n"; //end message - // add it to the list - Add_message_to_send(my_stream.str(),false); } --- 537,583 ---- { ! //cerr<<"Abs pan "<<pan_position<<" Abs tilt "<<tilt_position<<endl; ! ! string message; ! ! int Sep1 = 0x000F; ! int Sep2 = 0x00F0; ! int Sep3 = 0x0F00; ! int Sep4 = 0xF000; ! ! message += 0x81; ! message += 0x01; ! message += 0x06; ! message += 0x02; ! ! message += max(0,min(pan_speed,24)); ! message += max(0,min(tilt_speed,20)); ! pan_position = max(min(pan_position,1700), -1700); ! tilt_position = max(min(tilt_position,425), -575); ! //CONVERSION REQUIRED TO CAMERA UNITS ! pan_position = (int) (PAN_TILT_UNIT_CONVERTION_TO_CAMERA * (float) pan_position + 0.5); ! tilt_position = (int) (PAN_TILT_UNIT_CONVERTION_TO_CAMERA * (float) tilt_position + 0.5); ! //pan ! message += (Sep4 & pan_position)>>12; ! message += (Sep3 & pan_position)>>8; ! message += (Sep2 & pan_position)>>4; ! message += (Sep1 & pan_position); ! ! //tilt ! message += (Sep4 & tilt_position)>>12; ! message += (Sep3 & tilt_position)>>8; ! message += (Sep2 & tilt_position)>>4; ! message += (Sep1 & tilt_position); ! ! message += 0xFF; ! ! ! // add it to the list ! Add_message_to_send(message,false); } *************** *** 584,589 **** pan_position = max(min(pan_position,1700), -1700); ! tilt_position = max(min(tilt_position,425), -725); //pan --- 603,611 ---- pan_position = max(min(pan_position,1700), -1700); ! tilt_position = max(min(tilt_position,425), -575); + //CONVERSION REQUIRED TO CAMERA UNITS + pan_position = (int) (PAN_TILT_UNIT_CONVERTION_TO_CAMERA * (float) pan_position + 0.5); + tilt_position = (int) (PAN_TILT_UNIT_CONVERTION_TO_CAMERA * (float) tilt_position + 0.5); //pan *************** *** 813,817 **** cerr << "SNCRZ30RS232 : restoring default camera values" << endl; Absolute_movement(24,20, 0, 0); // put the camera at the neutral position ! //Zoom(0); //sleep? --- 835,839 ---- cerr << "SNCRZ30RS232 : restoring default camera values" << endl; Absolute_movement(24,20, 0, 0); // put the camera at the neutral position ! Zoom(0); //sleep? *************** *** 882,885 **** --- 904,910 ---- void initialize_camera() { + //useful to make camera stop its current command if + //not completed. + cleanup(); // Clear the interface of camera init_clear_if(); |
|
From: Dominic L. <ma...@us...> - 2005-09-19 13:38:52
|
Update of /cvsroot/robotflow/RobotFlow/Devices/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22524 Modified Files: SNCRZ30RS232.cc Log Message: testing pan -tilt abs positions Index: SNCRZ30RS232.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Devices/src/SNCRZ30RS232.cc,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** SNCRZ30RS232.cc 8 Jul 2005 19:58:14 -0000 1.6 --- SNCRZ30RS232.cc 19 Sep 2005 13:38:43 -0000 1.7 *************** *** 523,561 **** { ! ! //cerr<<"Abs pan "<<pan_position<<" Abs tilt "<<tilt_position<<endl; ! ! string message; ! string last; ! int Sep1 = 0x000F; ! int Sep2 = 0x00F0; ! int Sep3 = 0x0F00; ! int Sep4 = 0xF000; ! ! message += 0x81; ! message += 0x01; ! message += 0x06; ! message += 0x02; ! ! message += max(0,min(pan_speed,24)); ! message += max(0,min(tilt_speed,20)); ! pan_position = max(min(pan_position,1700), -1700); tilt_position = max(min(tilt_position,425), -725); ! message += (Sep4 & pan_position)>>12; ! message += (Sep3 & pan_position)>>8; ! message += (Sep2 & pan_position)>>4; ! message += (Sep1 & pan_position); ! ! message += (Sep4 & tilt_position)>>12; ! message += (Sep3 & tilt_position)>>8; ! message += (Sep2 & tilt_position)>>4; ! message += (Sep1 & tilt_position); ! ! message += 0xFF; ! // add it to the list ! Add_message_to_send(message,false); } --- 523,564 ---- { ! //LIMIT PAN & TILT SPEED VALUES ! pan_speed = max(0,min(pan_speed,24)); ! tilt_speed = max(0,min(tilt_speed,20)); pan_position = max(min(pan_position,1700), -1700); tilt_position = max(min(tilt_position,425), -725); ! //CREATE VISCA COMMAND ! ostringstream my_stream; ! static const unsigned int mask1 = 0x000F; ! static const unsigned int mask2 = 0x00F0; ! static const unsigned int mask3 = 0x0F00; ! static const unsigned int mask4 = 0xF000; ! //header ! my_stream << 0x81; ! my_stream << 0x01; ! my_stream << 0x06; ! my_stream << 0x02; ! //pan & tilt speeds ! my_stream << std::hex<<((mask2 & pan_speed)>>4);//pan speed ! my_stream << std::hex<<((mask1 & pan_speed)); ! ! my_stream << std::hex<<((mask2 & tilt_speed)>>4);//tilt speed ! my_stream << std::hex<<((mask1 & tilt_speed)); ! //pan & tilt commands ! my_stream << "0"<<std::hex<<((mask4 & pan_position)>>12); //pan position ! my_stream << "0"<<std::hex<<((mask3 & pan_position)>>8); ! my_stream << "0"<<std::hex<<((mask2 & pan_position)>>4); ! my_stream << "0"<<std::hex<<((mask1 & pan_position)); ! ! my_stream << "0"<<std::hex<<((mask4 & tilt_position)>>12); //tilt position ! my_stream << "0"<<std::hex<<((mask3 & tilt_position)>>8); ! my_stream << "0"<<std::hex<<((mask2 & tilt_position)>>4); ! my_stream << "0"<<std::hex<<((mask1 & tilt_position)); ! ! my_stream << "FF\r\n"; //end message ! // add it to the list ! Add_message_to_send(my_stream.str(),false); } |
|
From: clement r. <kl...@us...> - 2005-09-13 14:10:32
|
Update of /cvsroot/robotflow/RobotFlow/MARIE/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28177/include Removed Files: MarieDataLocalisation.h Log Message: remove useless files --- MarieDataLocalisation.h DELETED --- |
|
From: clement r. <kl...@us...> - 2005-09-12 22:49:10
|
Update of /cvsroot/robotflow/RobotFlow/MARIE/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7478 Added Files: CommandBehavior.n CommandCamera.n CommandJoystick.n CommandMotor.n DataBumper.n DataCamera.n DataIR.n DataLaser.n DataMap.n DataNull.n DataOdometry.n DataRaw.n DataSonar.n RequestSystem.n Log Message: add tests networks for "new" and "extract" nodes for each type from marie --- NEW FILE: DataMap.n --- #!/usr/bin/env batchflow <?xml version="1.0"?> <Document> <Network type="subnet" name="MAIN"> <Node name="node_Catch_1" type="Catch" x="944.000000" y="228.000000"/> <Node name="node_Constant_3" type="Constant" x="224.000000" y="448.000000"> <Parameter name="VALUE" type="string" value="failure of Bool comparison while testing DataMap" description="The value"/> </Node> <Node name="node_NOP_2" type="NOP" x="1115.000000" y="220.000000"/> <Node name="node_MakeComposite_1" type="MakeComposite" x="-680.000000" y="-63.000000"/> <Node name="node_Constant_4" type="Constant" x="-899.000000" y="-85.000000"> <Parameter name="VALUE" type="string" value="412" description="The value"/> </Node> <Node name="node_newMarieDataMap_1" type="newMarieDataMap" x="-524.000000" y="-62.000000"/> <Node name="node_Constant_5" type="Constant" x="-899.000000" y="-58.000000"> <Parameter name="VALUE" type="int" value="413" description="The value"/> </Node> <Node name="node_extractMarieDataMap_1" type="extractMarieDataMap" x="-356.000000" y="-62.000000"/> <Node name="node_GetComposite_1" type="GetComposite" x="-198.000000" y="-62.000000"/> <Node name="node_Equal_1" type="Equal" x="147.000000" y="51.000000"/> <Node name="node_AND_1" type="AND" x="685.000000" y="185.000000"> <Parameter name="PULL_ANYWAY" type="bool" value="false" description="Pull on INPUT2 even if INPUT1 is false"/> </Node> <Node name="node_Equal_2" type="Equal" x="148.000000" y="127.000000"/> <Node name="node_ToInt_1" type="ToInt" x="16.000000" y="113.000000"/> <Node name="node_Constant_6" type="Constant" x="-899.000000" y="-30.000000"> <Parameter name="VALUE" type="float" value="413.123" description="The value"/> </Node> <Node name="node_Constant_7" type="Constant" x="-900.000000" y="-2.000000"> <Parameter name="VALUE" type="bool" value="false" description="The value"/> </Node> <Node name="node_ToFloat_1" type="ToFloat" x="19.000000" y="258.000000"/> <Node name="node_ToBool_1" type="ToBool" x="-3.000000" y="370.000000"/> <Node name="node_AND_2" type="AND" x="815.000000" y="220.000000"> <Parameter name="PULL_ANYWAY" type="bool" value="false" description="Pull on INPUT2 even if INPUT1 is false"/> </Node> <Node name="node_AND_3" type="AND" x="684.000000" y="253.000000"> <Parameter name="PULL_ANYWAY" type="bool" value="false" description="Pull on INPUT2 even if INPUT1 is false"/> </Node> <Node name="node_Equal_3" type="Equal" x="145.000000" y="247.000000"/> <Node name="node_OR_1" type="OR" x="296.000000" y="384.000000"> <Parameter name="PULL_ANYWAY" type="bool" value="false" description="Pull on INPUT2 even if INPUT1 is true"/> </Node> <Node name="node_AND_4" type="AND" x="153.000000" y="344.000000"> <Parameter name="PULL_ANYWAY" type="bool" value="false" description="Pull on INPUT2 even if INPUT1 is false"/> </Node> <Node name="node_NOP_3" type="NOP" x="-1.000000" y="336.000000"/> <Node name="node_OR_2" type="OR" x="137.000000" y="411.000000"> <Parameter name="PULL_ANYWAY" type="bool" value="false" description="Pull on INPUT2 even if INPUT1 is true"/> </Node> <Node name="node_NOT_1" type="NOT" x="188.000000" y="409.000000"/> <Node name="node_IF_1" type="IF" x="423.000000" y="384.000000"> <Parameter name="PULL_ANYWAY" type="bool" value="" description="If true, the IF statement pulls also on the branch not taken"/> </Node> <Node name="node_Throw_2" type="Throw" x="304.000000" y="447.000000"/> <Node name="node_Constant_1" type="Constant" x="221.000000" y="163.000000"> <Parameter name="VALUE" type="string" value="failure of Int comparison while testing DataMap" description="The value"/> </Node> <Node name="node_IF_2" type="IF" x="420.000000" y="128.000000"> <Parameter name="PULL_ANYWAY" type="bool" value="" description="If true, the IF statement pulls also on the branch not taken"/> </Node> <Node name="node_Throw_1" type="Throw" x="301.000000" y="162.000000"/> <Node name="node_Constant_2" type="Constant" x="228.000000" y="277.000000"> <Parameter name="VALUE" type="string" value="failure of Float comparison while testing DataMap" description="The value"/> </Node> <Node name="node_IF_3" type="IF" x="420.000000" y="247.000000"> <Parameter name="PULL_ANYWAY" type="bool" value="" description="If true, the IF statement pulls also on the branch not taken"/> </Node> <Node name="node_Throw_3" type="Throw" x="308.000000" y="276.000000"/> <Node name="node_Constant_8" type="Constant" x="227.000000" y="81.000000"> <Parameter name="VALUE" type="string" value="failure of String comparison while testing DataMap" description="The value"/> </Node> <Node name="node_IF_4" type="IF" x="413.000000" y="50.000000"> <Parameter name="PULL_ANYWAY" type="bool" value="" description="If true, the IF statement pulls also on the branch not taken"/> </Node> <Node name="node_Throw_4" type="Throw" x="307.000000" y="80.000000"/> <Node name="node_NOP_1" type="NOP" x="-728.000000" y="78.000000"/> <Node name="node_NOP_4" type="NOP" x="-729.000000" y="106.000000"/> <Node name="node_NOP_5" type="NOP" x="-728.000000" y="134.000000"/> <Node name="node_NOP_6" type="NOP" x="-727.000000" y="161.000000"/> <Link from="node_Constant_4" output="VALUE" to="node_MakeComposite_1" input="aString"/> <Link from="node_Constant_5" output="VALUE" to="node_MakeComposite_1" input="anInt"/> <Link from="node_Constant_6" output="VALUE" to="node_MakeComposite_1" input="aFloat"/> <Link from="node_Constant_7" output="VALUE" to="node_MakeComposite_1" input="aBool"/> <Link from="node_MakeComposite_1" output="OUTPUT" to="node_newMarieDataMap_1" input="COMPOSITE"/> <Link from="node_newMarieDataMap_1" output="DATA_MAP" to="node_extractMarieDataMap_1" input="DATA_MAP"/> <Link from="node_extractMarieDataMap_1" output="COMPOSITE" to="node_GetComposite_1" input="INPUT"/> <Link from="node_ToInt_1" output="OUTPUT" to="node_Equal_2" input="INPUT1"/> <Link from="node_GetComposite_1" output="aString" to="node_Equal_1" input="INPUT1"/> <Link from="node_GetComposite_1" output="anInt" to="node_ToInt_1" input="INPUT"/> <Link from="node_AND_1" output="OUTPUT" to="node_AND_2" input="INPUT1"/> <Link from="node_AND_3" output="OUTPUT" to="node_AND_2" input="INPUT2"/> <Link from="node_GetComposite_1" output="aFloat" to="node_ToFloat_1" input="INPUT"/> <Link from="node_ToFloat_1" output="OUTPUT" to="node_Equal_3" input="INPUT2"/> <Link from="node_AND_4" output="OUTPUT" to="node_OR_1" input="INPUT1"/> <Link from="node_NOP_3" output="OUTPUT" to="node_AND_4" input="INPUT1"/> <Link from="node_NOT_1" output="OUTPUT" to="node_OR_1" input="INPUT2"/> <Link from="node_OR_2" output="OUTPUT" to="node_NOT_1" input="INPUT"/> <Link from="node_IF_1" output="OUTPUT" to="node_AND_3" input="INPUT2"/> <Link from="node_OR_1" output="OUTPUT" to="node_IF_1" input="COND"/> <Link from="node_OR_1" output="OUTPUT" to="node_IF_1" input="THEN"/> <Link from="node_ToBool_1" output="OUTPUT" to="node_AND_4" input="INPUT2"/> <Link from="node_Constant_3" output="VALUE" to="node_Throw_2" input="INPUT"/> <Link from="node_AND_2" output="OUTPUT" to="node_Catch_1" input="INPUT"/> <Link from="node_Catch_1" output="OUTPUT" to="node_NOP_2" input="INPUT"/> <Link from="node_Throw_2" output="OUTPUT" to="node_IF_1" input="ELSE"/> <Link from="node_Catch_1" output="EXCEPTION" to="node_Catch_1" input="CATCH"/> <Link from="node_GetComposite_1" output="aBool" to="node_ToBool_1" input="INPUT"/> <Link from="node_ToBool_1" output="OUTPUT" to="node_OR_2" input="INPUT2"/> <Link from="node_NOP_3" output="OUTPUT" to="node_OR_2" input="INPUT1"/> <Link from="node_Throw_1" output="OUTPUT" to="node_IF_2" input="ELSE"/> <Link from="node_Constant_1" output="VALUE" to="node_Throw_1" input="INPUT"/> <Link from="node_Throw_3" output="OUTPUT" to="node_IF_3" input="ELSE"/> <Link from="node_Constant_2" output="VALUE" to="node_Throw_3" input="INPUT"/> <Link from="node_Throw_4" output="OUTPUT" to="node_IF_4" input="ELSE"/> <Link from="node_Constant_8" output="VALUE" to="node_Throw_4" input="INPUT"/> <Link from="node_IF_4" output="OUTPUT" to="node_AND_1" input="INPUT1"/> <Link from="node_Equal_1" output="OUTPUT" to="node_IF_4" input="THEN"/> <Link from="node_Equal_1" output="OUTPUT" to="node_IF_4" input="COND"/> <Link from="node_NOP_1" output="OUTPUT" to="node_Equal_1" input="INPUT2"/> <Link from="node_Constant_4" output="VALUE" to="node_NOP_1" input="INPUT"/> <Link from="node_NOP_4" output="OUTPUT" to="node_Equal_2" input="INPUT2"/> <Link from="node_Constant_5" output="VALUE" to="node_NOP_4" input="INPUT"/> <Link from="node_NOP_5" output="OUTPUT" to="node_Equal_3" input="INPUT1"/> <Link from="node_Constant_6" output="VALUE" to="node_NOP_5" input="INPUT"/> <Link from="node_NOP_6" output="OUTPUT" to="node_NOP_3" input="INPUT"/> <Link from="node_Constant_7" output="VALUE" to="node_NOP_6" input="INPUT"/> <Link from="node_IF_3" output="OUTPUT" to="node_AND_3" input="INPUT1"/> <Link from="node_Equal_3" output="OUTPUT" to="node_IF_3" input="COND"/> <Link from="node_Equal_3" output="OUTPUT" to="node_IF_3" input="THEN"/> <Link from="node_IF_2" output="OUTPUT" to="node_AND_1" input="INPUT2"/> <Link from="node_Equal_2" output="OUTPUT" to="node_IF_2" input="COND"/> <Link from="node_Equal_2" output="OUTPUT" to="node_IF_2" input="THEN"/> <NetOutput name="OUTPUT" node="node_NOP_2" terminal="OUTPUT" object_type="any" description="The output = The input"/> <Note x="0" y="0" visible="0" text="Created with FlowDesigner 0.9.0"/> </Network> </Document> --- NEW FILE: CommandCamera.n --- #!/usr/bin/env batchflow <?xml version="1.0"?> <Document> <Network type="subnet" name="MAIN"> <Node name="node_newMarieCommandCamera_1" type="newMarieCommandCamera" x="-420.000000" y="-84.000000"/> <Node name="node_extractMarieCommandCamera_1" type="extractMarieCommandCamera" x="-181.000000" y="-85.000000"/> <Node name="node_Constant_1" type="Constant" x="-919.000000" y="-150.000000"> <Parameter name="VALUE" type="int" value="0" description="The value"/> </Node> <Node name="node_Constant_2" type="Constant" x="-918.000000" y="-125.000000"> <Parameter name="VALUE" type="int" value="-1" description="The value"/> </Node> <Node name="node_Constant_3" type="Constant" x="-919.000000" y="-74.000000"> <Parameter name="VALUE" type="int" value="2" description="The value"/> </Node> <Node name="node_Constant_4" type="Constant" x="-919.000000" y="-99.000000"> <Parameter name="VALUE" type="int" value="1" description="The value"/> </Node> <Node name="node_Constant_5" type="Constant" x="-919.000000" y="-48.000000"> <Parameter name="VALUE" type="int" value="3" description="The value"/> </Node> <Node name="node_NOP_1" type="NOP" x="-498.000000" y="283.000000"/> <Node name="node_NOP_2" type="NOP" x="-498.000000" y="308.000000"/> <Node name="node_NOP_3" type="NOP" x="-498.000000" y="334.000000"/> <Node name="node_NOP_4" type="NOP" x="-497.000000" y="357.000000"/> <Node name="node_NOP_10" type="NOP" x="-498.000000" y="258.000000"/> <Node name="node_Equal_1" type="Equal" x="423.000000" y="104.000000"/> <Node name="node_Constant_11" type="Constant" x="464.000000" y="144.000000"> <Parameter name="VALUE" type="string" value="failure of relative brightness comparison while testing CommandCamera" description="The value"/> </Node> <Node name="node_IF_1" type="IF" x="651.000000" y="119.000000"> <Parameter name="PULL_ANYWAY" type="bool" value="" description="If true, the IF statement pulls also on the branch not taken"/> </Node> <Node name="node_Throw_1" type="Throw" x="544.000000" y="143.000000"/> <Node name="node_Constant_6" type="Constant" x="-919.000000" y="-24.000000"> <Parameter name="VALUE" type="int" value="4" description="The value"/> </Node> <Node name="node_Constant_7" type="Constant" x="-919.000000" y="1.000000"> <Parameter name="VALUE" type="int" value="5" description="The value"/> </Node> <Node name="node_Constant_8" type="Constant" x="-919.000000" y="52.000000"> <Parameter name="VALUE" type="int" value="-10" description="The value"/> </Node> <Node name="node_Constant_9" type="Constant" x="-919.000000" y="27.000000"> <Parameter name="VALUE" type="int" value="32458" description="The value"/> </Node> <Node name="node_Constant_10" type="Constant" x="-919.000000" y="78.000000"> <Parameter name="VALUE" type="int" value="26" description="The value"/> </Node> <Node name="node_NOP_5" type="NOP" x="-498.000000" y="409.000000"/> <Node name="node_NOP_6" type="NOP" x="-498.000000" y="434.000000"/> <Node name="node_NOP_7" type="NOP" x="-498.000000" y="460.000000"/> <Node name="node_NOP_8" type="NOP" x="-497.000000" y="483.000000"/> <Node name="node_NOP_9" type="NOP" x="-497.000000" y="384.000000"/> <Node name="node_Equal_2" type="Equal" x="428.000000" y="181.000000"/> <Node name="node_Constant_12" type="Constant" x="469.000000" y="221.000000"> <Parameter name="VALUE" type="string" value="failure of relative contrast comparison while testing CommandCamera" description="The value"/> </Node> <Node name="node_IF_2" type="IF" x="656.000000" y="196.000000"> <Parameter name="PULL_ANYWAY" type="bool" value="" description="If true, the IF statement pulls also on the branch not taken"/> </Node> <Node name="node_Throw_2" type="Throw" x="549.000000" y="220.000000"/> <Node name="node_Equal_3" type="Equal" x="428.000000" y="257.000000"/> <Node name="node_Constant_13" type="Constant" x="469.000000" y="297.000000"> <Parameter name="VALUE" type="string" value="failure of relative pan comparison while testing CommandCamera" description="The value"/> </Node> <Node name="node_IF_3" type="IF" x="656.000000" y="272.000000"> <Parameter name="PULL_ANYWAY" type="bool" value="" description="If true, the IF statement pulls also on the branch not taken"/> </Node> <Node name="node_Throw_3" type="Throw" x="549.000000" y="296.000000"/> <Node name="node_Equal_4" type="Equal" x="433.000000" y="334.000000"/> <Node name="node_Constant_14" type="Constant" x="474.000000" y="374.000000"> <Parameter name="VALUE" type="string" value="failure of relative tilt comparison while testing CommandCamera" description="The value"/> </Node> <Node name="node_IF_4" type="IF" x="661.000000" y="349.000000"> <Parameter name="PULL_ANYWAY" type="bool" value="" description="If true, the IF statement pulls also on the branch not taken"/> </Node> <Node name="node_Throw_4" type="Throw" x="554.000000" y="373.000000"/> <Node name="node_Equal_5" type="Equal" x="434.000000" y="411.000000"/> <Node name="node_Constant_15" type="Constant" x="475.000000" y="451.000000"> <Parameter name="VALUE" type="string" value="failure of relative zoom comparison while testing CommandCamera" description="The value"/> </Node> <Node name="node_IF_5" type="IF" x="662.000000" y="426.000000"> <Parameter name="PULL_ANYWAY" type="bool" value="" description="If true, the IF statement pulls also on the branch not taken"/> </Node> <Node name="node_Throw_5" type="Throw" x="555.000000" y="450.000000"/> <Node name="node_Equal_6" type="Equal" x="435.000000" y="492.000000"/> <Node name="node_Constant_16" type="Constant" x="476.000000" y="532.000000"> <Parameter name="VALUE" type="string" value="failure of absolute brightness comparison while testing CommandCamera" description="The value"/> </Node> <Node name="node_IF_6" type="IF" x="663.000000" y="507.000000"> <Parameter name="PULL_ANYWAY" type="bool" value="" description="If true, the IF statement pulls also on the branch not taken"/> </Node> <Node name="node_Throw_6" type="Throw" x="556.000000" y="531.000000"/> <Node name="node_Equal_7" type="Equal" x="440.000000" y="569.000000"/> <Node name="node_Constant_17" type="Constant" x="481.000000" y="609.000000"> <Parameter name="VALUE" type="string" value="failure of absolute contrast comparison while testing CommandCamera" description="The value"/> </Node> <Node name="node_IF_7" type="IF" x="668.000000" y="584.000000"> <Parameter name="PULL_ANYWAY" type="bool" value="" description="If true, the IF statement pulls also on the branch not taken"/> </Node> <Node name="node_Throw_7" type="Throw" x="561.000000" y="608.000000"/> <Node name="node_Equal_8" type="Equal" x="440.000000" y="645.000000"/> <Node name="node_Constant_18" type="Constant" x="481.000000" y="685.000000"> <Parameter name="VALUE" type="string" value="failure of absolute pan comparison while testing CommandCamera" description="The value"/> </Node> <Node name="node_IF_8" type="IF" x="668.000000" y="660.000000"> <Parameter name="PULL_ANYWAY" type="bool" value="" description="If true, the IF statement pulls also on the branch not taken"/> </Node> <Node name="node_Throw_8" type="Throw" x="561.000000" y="684.000000"/> <Node name="node_Equal_9" type="Equal" x="445.000000" y="722.000000"/> <Node name="node_Constant_19" type="Constant" x="486.000000" y="762.000000"> <Parameter name="VALUE" type="string" value="failure of absolute tilt comparison while testing CommandCamera" description="The value"/> </Node> <Node name="node_IF_9" type="IF" x="673.000000" y="737.000000"> <Parameter name="PULL_ANYWAY" type="bool" value="" description="If true, the IF statement pulls also on the branch not taken"/> </Node> <Node name="node_Throw_9" type="Throw" x="566.000000" y="761.000000"/> <Node name="node_Equal_10" type="Equal" x="446.000000" y="799.000000"/> <Node name="node_Constant_20" type="Constant" x="487.000000" y="839.000000"> <Parameter name="VALUE" type="string" value="failure of absolute zoom comparison while testing CommandCamera" description="The value"/> </Node> <Node name="node_IF_10" type="IF" x="674.000000" y="814.000000"> <Parameter name="PULL_ANYWAY" type="bool" value="" description="If true, the IF statement pulls also on the branch not taken"/> </Node> <Node name="node_Throw_10" type="Throw" x="567.000000" y="838.000000"/> <Node name="node_AND_1" type="AND" x="795.000000" y="155.000000"> <Parameter name="PULL_ANYWAY" type="bool" value="false" description="Pull on INPUT2 even if INPUT1 is false"/> </Node> <Node name="node_AND_2" type="AND" x="925.000000" y="190.000000"> <Parameter name="PULL_ANYWAY" type="bool" value="false" description="Pull on INPUT2 even if INPUT1 is false"/> </Node> <Node name="node_AND_3" type="AND" x="791.000000" y="314.000000"> <Parameter name="PULL_ANYWAY" type="bool" value="false" description="Pull on INPUT2 even if INPUT1 is false"/> </Node> <Node name="node_AND_4" type="AND" x="791.000000" y="463.000000"> <Parameter name="PULL_ANYWAY" type="bool" value="false" description="Pull on INPUT2 even if INPUT1 is false"/> </Node> <Node name="node_AND_5" type="AND" x="793.000000" y="624.000000"> <Parameter name="PULL_ANYWAY" type="bool" value="false" description="Pull on INPUT2 even if INPUT1 is false"/> </Node> <Node name="node_AND_6" type="AND" x="1056.000000" y="370.000000"> <Parameter name="PULL_ANYWAY" type="bool" value="false" description="Pull on INPUT2 even if INPUT1 is false"/> </Node> <Node name="node_AND_7" type="AND" x="915.000000" y="543.000000"> <Parameter name="PULL_ANYWAY" type="bool" value="false" description="Pull on INPUT2 even if INPUT1 is false"/> </Node> <Node name="node_AND_8" type="AND" x="810.000000" y="769.000000"> <Parameter name="PULL_ANYWAY" type="bool" value="false" description="Pull on INPUT2 even if INPUT1 is false"/> </Node> <Node name="node_AND_9" type="AND" x="1267.000000" y="376.000000"> <Parameter name="PULL_ANYWAY" type="bool" value="false" description="Pull on INPUT2 even if INPUT1 is false"/> </Node> <Node name="node_NOP_11" type="NOP" x="1380.000000" y="376.000000"/> <Link from="node_newMarieCommandCamera_1" output="COMMAND_CAMERA" to="node_extractMarieCommandCamera_1" input="COMMAND_CAMERA"/> <Link from="node_Constant_2" output="VALUE" to="node_NOP_1" input="INPUT"/> <Link from="node_Constant_4" output="VALUE" to="node_NOP_2" input="INPUT"/> <Link from="node_Constant_3" output="VALUE" to="node_NOP_3" input="INPUT"/> <Link from="node_Constant_5" output="VALUE" to="node_NOP_4" input="INPUT"/> <Link from="node_Equal_1" output="OUTPUT" to="node_IF_1" input="COND"/> <Link from="node_Equal_1" output="OUTPUT" to="node_IF_1" input="THEN"/> <Link from="node_Throw_1" output="OUTPUT" to="node_IF_1" input="ELSE"/> <Link from="node_Constant_11" output="VALUE" to="node_Throw_1" input="INPUT"/> <Link from="node_Constant_1" output="VALUE" to="node_NOP_10" input="INPUT"/> <Link from="node_Constant_7" output="VALUE" to="node_NOP_5" input="INPUT"/> <Link from="node_Constant_9" output="VALUE" to="node_NOP_6" input="INPUT"/> <Link from="node_Constant_8" output="VALUE" to="node_NOP_7" input="INPUT"/> <Link from="node_Constant_10" output="VALUE" to="node_NOP_8" input="INPUT"/> <Link from="node_Constant_6" output="VALUE" to="node_NOP_9" input="INPUT"/> <Link from="node_Equal_2" output="OUTPUT" to="node_IF_2" input="COND"/> <Link from="node_Equal_2" output="OUTPUT" to="node_IF_2" input="THEN"/> <Link from="node_Throw_2" output="OUTPUT" to="node_IF_2" input="ELSE"/> <Link from="node_Constant_12" output="VALUE" to="node_Throw_2" input="INPUT"/> <Link from="node_Equal_3" output="OUTPUT" to="node_IF_3" input="COND"/> <Link from="node_Equal_3" output="OUTPUT" to="node_IF_3" input="THEN"/> <Link from="node_Throw_3" output="OUTPUT" to="node_IF_3" input="ELSE"/> <Link from="node_Constant_13" output="VALUE" to="node_Throw_3" input="INPUT"/> <Link from="node_Equal_4" output="OUTPUT" to="node_IF_4" input="COND"/> <Link from="node_Equal_4" output="OUTPUT" to="node_IF_4" input="THEN"/> <Link from="node_Throw_4" output="OUTPUT" to="node_IF_4" input="ELSE"/> <Link from="node_Constant_14" output="VALUE" to="node_Throw_4" input="INPUT"/> <Link from="node_Equal_5" output="OUTPUT" to="node_IF_5" input="COND"/> <Link from="node_Equal_5" output="OUTPUT" to="node_IF_5" input="THEN"/> <Link from="node_Throw_5" output="OUTPUT" to="node_IF_5" input="ELSE"/> <Link from="node_Constant_15" output="VALUE" to="node_Throw_5" input="INPUT"/> <Link from="node_Equal_6" output="OUTPUT" to="node_IF_6" input="COND"/> <Link from="node_Equal_6" output="OUTPUT" to="node_IF_6" input="THEN"/> <Link from="node_Throw_6" output="OUTPUT" to="node_IF_6" input="ELSE"/> <Link from="node_Constant_16" output="VALUE" to="node_Throw_6" input="INPUT"/> <Link from="node_Equal_7" output="OUTPUT" to="node_IF_7" input="COND"/> <Link from="node_Equal_7" output="OUTPUT" to="node_IF_7" input="THEN"/> <Link from="node_Throw_7" output="OUTPUT" to="node_IF_7" input="ELSE"/> <Link from="node_Constant_17" output="VALUE" to="node_Throw_7" input="INPUT"/> <Link from="node_Equal_8" output="OUTPUT" to="node_IF_8" input="COND"/> <Link from="node_Equal_8" output="OUTPUT" to="node_IF_8" input="THEN"/> <Link from="node_Throw_8" output="OUTPUT" to="node_IF_8" input="ELSE"/> <Link from="node_Constant_18" output="VALUE" to="node_Throw_8" input="INPUT"/> <Link from="node_Equal_9" output="OUTPUT" to="node_IF_9" input="COND"/> <Link from="node_Equal_9" output="OUTPUT" to="node_IF_9" input="THEN"/> <Link from="node_Throw_9" output="OUTPUT" to="node_IF_9" input="ELSE"/> <Link from="node_Constant_19" output="VALUE" to="node_Throw_9" input="INPUT"/> <Link from="node_Equal_10" output="OUTPUT" to="node_IF_10" input="COND"/> <Link from="node_Equal_10" output="OUTPUT" to="node_IF_10" input="THEN"/> <Link from="node_Throw_10" output="OUTPUT" to="node_IF_10" input="ELSE"/> <Link from="node_Constant_20" output="VALUE" to="node_Throw_10" input="INPUT"/> <Link from="node_NOP_10" output="OUTPUT" to="node_Equal_1" input="INPUT1"/> <Link from="node_NOP_1" output="OUTPUT" to="node_Equal_2" input="INPUT1"/> <Link from="node_NOP_2" output="OUTPUT" to="node_Equal_3" input="INPUT1"/> <Link from="node_NOP_3" output="OUTPUT" to="node_Equal_4" input="INPUT1"/> <Link from="node_NOP_4" output="OUTPUT" to="node_Equal_5" input="INPUT1"/> <Link from="node_NOP_9" output="OUTPUT" to="node_Equal_6" input="INPUT1"/> <Link from="node_NOP_5" output="OUTPUT" to="node_Equal_7" input="INPUT1"/> <Link from="node_NOP_6" output="OUTPUT" to="node_Equal_8" input="INPUT1"/> <Link from="node_NOP_7" output="OUTPUT" to="node_Equal_9" input="INPUT1"/> <Link from="node_NOP_8" output="OUTPUT" to="node_Equal_10" input="INPUT1"/> <Link from="node_extractMarieCommandCamera_1" output="REL_BRIGHTNESS" to="node_Equal_1" input="INPUT2"/> <Link from="node_extractMarieCommandCamera_1" output="REL_CONTRAST" to="node_Equal_2" input="INPUT2"/> <Link from="node_extractMarieCommandCamera_1" output="REL_PAN" to="node_Equal_3" input="INPUT2"/> <Link from="node_extractMarieCommandCamera_1" output="REL_TILT" to="node_Equal_4" input="INPUT2"/> <Link from="node_extractMarieCommandCamera_1" output="REL_ZOOM" to="node_Equal_5" input="INPUT2"/> <Link from="node_extractMarieCommandCamera_1" output="ABS_BRIGHTNESS" to="node_Equal_6" input="INPUT2"/> <Link from="node_extractMarieCommandCamera_1" output="ABS_CONTRAST" to="node_Equal_7" input="INPUT2"/> <Link from="node_extractMarieCommandCamera_1" output="ABS_PAN" to="node_Equal_8" input="INPUT2"/> <Link from="node_extractMarieCommandCamera_1" output="ABS_TILT" to="node_Equal_9" input="INPUT2"/> <Link from="node_extractMarieCommandCamera_1" output="ABS_ZOOM" to="node_Equal_10" input="INPUT2"/> <Link from="node_Constant_1" output="VALUE" to="node_newMarieCommandCamera_1" input="REL_BRIGHTNESS"/> <Link from="node_Constant_2" output="VALUE" to="node_newMarieCommandCamera_1" input="REL_CONTRAST"/> <Link from="node_Constant_4" output="VALUE" to="node_newMarieCommandCamera_1" input="REL_PAN"/> <Link from="node_Constant_3" output="VALUE" to="node_newMarieCommandCamera_1" input="REL_TILT"/> <Link from="node_Constant_5" output="VALUE" to="node_newMarieCommandCamera_1" input="REL_ZOOM"/> <Link from="node_Constant_6" output="VALUE" to="node_newMarieCommandCamera_1" input="ABS_BRIGHTNESS"/> <Link from="node_Constant_7" output="VALUE" to="node_newMarieCommandCamera_1" input="ABS_CONTRAST"/> <Link from="node_Constant_9" output="VALUE" to="node_newMarieCommandCamera_1" input="ABS_PAN"/> <Link from="node_Constant_8" output="VALUE" to="node_newMarieCommandCamera_1" input="ABS_TILT"/> <Link from="node_Constant_10" output="VALUE" to="node_newMarieCommandCamera_1" input="ABS_ZOOM"/> <Link from="node_AND_1" output="OUTPUT" to="node_AND_2" input="INPUT1"/> <Link from="node_AND_3" output="OUTPUT" to="node_AND_2" input="INPUT2"/> <Link from="node_AND_2" output="OUTPUT" to="node_AND_6" input="INPUT1"/> <Link from="node_AND_7" output="OUTPUT" to="node_AND_6" input="INPUT2"/> <Link from="node_AND_4" output="OUTPUT" to="node_AND_7" input="INPUT1"/> <Link from="node_AND_5" output="OUTPUT" to="node_AND_7" input="INPUT2"/> <Link from="node_IF_1" output="OUTPUT" to="node_AND_1" input="INPUT1"/> <Link from="node_IF_2" output="OUTPUT" to="node_AND_1" input="INPUT2"/> <Link from="node_IF_3" output="OUTPUT" to="node_AND_3" input="INPUT1"/> <Link from="node_IF_4" output="OUTPUT" to="node_AND_3" input="INPUT2"/> <Link from="node_IF_5" output="OUTPUT" to="node_AND_4" input="INPUT1"/> <Link from="node_IF_6" output="OUTPUT" to="node_AND_4" input="INPUT2"/> <Link from="node_IF_7" output="OUTPUT" to="node_AND_5" input="INPUT1"/> <Link from="node_IF_8" output="OUTPUT" to="node_AND_5" input="INPUT2"/> <Link from="node_IF_9" output="OUTPUT" to="node_AND_8" input="INPUT1"/> <Link from="node_IF_10" output="OUTPUT" to="node_AND_8" input="INPUT2"/> <Link from="node_AND_8" output="OUTPUT" to="node_AND_9" input="INPUT2"/> <Link from="node_AND_6" output="OUTPUT" to="node_AND_9" input="INPUT1"/> <Link from="node_AND_9" output="OUTPUT" to="node_NOP_11" input="INPUT"/> <NetOutput name="OUTPUT" node="node_NOP_11" terminal="OUTPUT" object_type="any" description="The output = The input"/> <Note x="0" y="0" visible="0" text="Created with FlowDesigner 0.9.0"/> </Network> </Document> --- NEW FILE: DataSonar.n --- #!/usr/bin/env batchflow <?xml version="1.0"?> <Document> <Network type="subnet" name="MAIN"> <Node name="node_NOP_1" type="NOP" x="50.000000" y="199.000000"/> <Node name="node_Equal_1" type="Equal" x="372.000000" y="191.000000"/> <Node name="node_Constant_5" type="Constant" x="386.000000" y="232.000000"> <Parameter name="VALUE" type="string" value="failure of RANGES comparison while testing DataSonar" description="The value"/> </Node> <Node name="node_IF_1" type="IF" x="573.000000" y="207.000000"> <Parameter name="PULL_ANYWAY" type="bool" value="" description="If true, the IF statement pulls also on the branch not taken"/> </Node> <Node name="node_Throw_1" type="Throw" x="466.000000" y="231.000000"/> <Node name="node_NOP_2" type="NOP" x="657.000000" y="206.000000"/> <Node name="node_Constant_6" type="Constant" x="-145.000000" y="133.000000"> <Parameter name="VALUE" type="object" value="<Vector<int> 1 2 3 4 >" description="The value"/> </Node> <Node name="node_extractMarieDataSonar_1" type="extractMarieDataSonar" x="183.000000" y="132.000000"/> <Node name="node_newMarieDataSonar_1" type="newMarieDataSonar" x="16.000000" y="132.000000"/> <Link from="node_Equal_1" output="OUTPUT" to="node_IF_1" input="COND"/> <Link from="node_Equal_1" output="OUTPUT" to="node_IF_1" input="THEN"/> <Link from="node_Throw_1" output="OUTPUT" to="node_IF_1" input="ELSE"/> <Link from="node_Constant_5" output="VALUE" to="node_Throw_1" input="INPUT"/> <Link from="node_NOP_1" output="OUTPUT" to="node_Equal_1" input="INPUT2"/> <Link from="node_Constant_6" output="VALUE" to="node_NOP_1" input="INPUT"/> <Link from="node_IF_1" output="OUTPUT" to="node_NOP_2" input="INPUT"/> <Link from="node_Constant_6" output="VALUE" to="node_newMarieDataSonar_1" input="RANGES"/> <Link from="node_extractMarieDataSonar_1" output="RANGES" to="node_Equal_1" input="INPUT1"/> <Link from="node_newMarieDataSonar_1" output="DATA_SONAR" to="node_extractMarieDataSonar_1" input="DATA_SONAR"/> <NetOutput name="OUTPUT" node="node_NOP_2" terminal="OUTPUT" object_type="any" description="The output = The input"/> <Note x="0" y="0" visible="0" text="Created with FlowDesigner 0.9.0"/> </Network> </Document> --- NEW FILE: DataOdometry.n --- #!/usr/bin/env batchflow <?xml version="1.0"?> <Document> <Network type="subnet" name="MAIN"> <Node name="node_extractMarieDataOdometry_1" type="extractMarieDataOdometry" x="-288.000000" y="-86.000000"/> <Node name="node_newMarieDataOdometry_1" type="newMarieDataOdometry" x="-503.000000" y="-87.000000"/> <Node name="node_Constant_1" type="Constant" x="-860.000000" y="-148.000000"> <Parameter name="VALUE" type="float" value="0" description="The value"/> </Node> <Node name="node_Constant_2" type="Constant" x="-859.000000" y="-123.000000"> <Parameter name="VALUE" type="float" value="-1" description="The value"/> </Node> <Node name="node_Constant_3" type="Constant" x="-860.000000" y="-72.000000"> <Parameter name="VALUE" type="float" value="2" description="The value"/> </Node> <Node name="node_Constant_4" type="Constant" x="-860.000000" y="-97.000000"> <Parameter name="VALUE" type="float" value="1" description="The value"/> </Node> <Node name="node_Constant_5" type="Constant" x="-860.000000" y="-46.000000"> <Parameter name="VALUE" type="float" value="3" description="The value"/> </Node> <Node name="node_NOP_1" type="NOP" x="-549.000000" y="282.000000"/> <Node name="node_NOP_2" type="NOP" x="-549.000000" y="307.000000"/> <Node name="node_NOP_3" type="NOP" x="-549.000000" y="333.000000"/> <Node name="node_NOP_4" type="NOP" x="-548.000000" y="356.000000"/> <Node name="node_NOP_5" type="NOP" x="-549.000000" y="257.000000"/> <Node name="node_Equal_1" type="Equal" x="175.500000" y="109.000000"/> <Node name="node_Constant_6" type="Constant" x="216.500000" y="149.000000"> <Parameter name="VALUE" type="string" value="failure of XPOS comparison while testing DataOdometry" description="The value"/> </Node> <Node name="node_IF_1" type="IF" x="403.500000" y="124.000000"> <Parameter name="PULL_ANYWAY" type="bool" value="" description="If true, the IF statement pulls also on the branch not taken"/> </Node> <Node name="node_Throw_1" type="Throw" x="296.500000" y="148.000000"/> <Node name="node_Constant_7" type="Constant" x="-860.000000" y="-22.000000"> <Parameter name="VALUE" type="float" value="4" description="The value"/> </Node> <Node name="node_Constant_8" type="Constant" x="-860.000000" y="3.000000"> <Parameter name="VALUE" type="float" value="5" description="The value"/> </Node> <Node name="node_Constant_9" type="Constant" x="-860.000000" y="54.000000"> <Parameter name="VALUE" type="float" value="-10" description="The value"/> </Node> <Node name="node_Constant_10" type="Constant" x="-860.000000" y="29.000000"> <Parameter name="VALUE" type="float" value="32458" description="The value"/> </Node> <Node name="node_NOP_6" type="NOP" x="-549.000000" y="408.000000"/> <Node name="node_NOP_7" type="NOP" x="-549.000000" y="433.000000"/> <Node name="node_NOP_8" type="NOP" x="-549.000000" y="459.000000"/> <Node name="node_NOP_10" type="NOP" x="-548.000000" y="383.000000"/> <Node name="node_Equal_2" type="Equal" x="180.500000" y="186.000000"/> <Node name="node_Constant_12" type="Constant" x="221.500000" y="226.000000"> <Parameter name="VALUE" type="string" value="failure of YPOS comparison while testing DataOdometry" description="The value"/> </Node> <Node name="node_IF_2" type="IF" x="408.500000" y="201.000000"> <Parameter name="PULL_ANYWAY" type="bool" value="" description="If true, the IF statement pulls also on the branch not taken"/> </Node> <Node name="node_Throw_2" type="Throw" x="301.500000" y="225.000000"/> <Node name="node_Equal_3" type="Equal" x="180.500000" y="262.000000"/> <Node name="node_Constant_13" type="Constant" x="221.500000" y="302.000000"> <Parameter name="VALUE" type="string" value="failure of ZPOS comparison while testing DataOdometry" description="The value"/> </Node> <Node name="node_IF_3" type="IF" x="408.500000" y="277.000000"> <Parameter name="PULL_ANYWAY" type="bool" value="" description="If true, the IF statement pulls also on the branch not taken"/> </Node> <Node name="node_Throw_3" type="Throw" x="301.500000" y="301.000000"/> <Node name="node_Equal_4" type="Equal" x="185.500000" y="339.000000"/> <Node name="node_Constant_14" type="Constant" x="226.500000" y="379.000000"> <Parameter name="VALUE" type="string" value="failure of YAW comparison while testing DataOdometry" description="The value"/> </Node> <Node name="node_IF_4" type="IF" x="413.500000" y="354.000000"> <Parameter name="PULL_ANYWAY" type="bool" value="" description="If true, the IF statement pulls also on the branch not taken"/> </Node> <Node name="node_Throw_4" type="Throw" x="306.500000" y="378.000000"/> <Node name="node_Equal_5" type="Equal" x="186.500000" y="416.000000"/> <Node name="node_Constant_15" type="Constant" x="227.500000" y="456.000000"> <Parameter name="VALUE" type="string" value="failure of PITCH comparison while testing DataOdometry" description="The value"/> </Node> <Node name="node_IF_5" type="IF" x="414.500000" y="431.000000"> <Parameter name="PULL_ANYWAY" type="bool" value="" description="If true, the IF statement pulls also on the branch not taken"/> </Node> <Node name="node_Throw_5" type="Throw" x="307.500000" y="455.000000"/> <Node name="node_Equal_6" type="Equal" x="187.500000" y="497.000000"/> <Node name="node_Constant_16" type="Constant" x="228.500000" y="537.000000"> <Parameter name="VALUE" type="string" value="failure of ROLL comparison while testing DataOdometry" description="The value"/> </Node> <Node name="node_IF_6" type="IF" x="415.500000" y="512.000000"> <Parameter name="PULL_ANYWAY" type="bool" value="" description="If true, the IF statement pulls also on the branch not taken"/> </Node> <Node name="node_Throw_6" type="Throw" x="308.500000" y="536.000000"/> <Node name="node_Equal_7" type="Equal" x="192.500000" y="574.000000"/> <Node name="node_Constant_17" type="Constant" x="233.500000" y="614.000000"> <Parameter name="VALUE" type="string" value="failure of LINEAR_SPEED comparison while testing DataOdometry" description="The value"/> </Node> <Node name="node_IF_7" type="IF" x="420.500000" y="589.000000"> <Parameter name="PULL_ANYWAY" type="bool" value="" description="If true, the IF statement pulls also on the branch not taken"/> </Node> <Node name="node_Throw_7" type="Throw" x="313.500000" y="613.000000"/> <Node name="node_Equal_8" type="Equal" x="192.500000" y="650.000000"/> <Node name="node_Constant_18" type="Constant" x="233.500000" y="690.000000"> <Parameter name="VALUE" type="string" value="failure of SIDE_SPEED comparison while testing DataOdometry" description="The value"/> </Node> <Node name="node_IF_8" type="IF" x="420.500000" y="665.000000"> <Parameter name="PULL_ANYWAY" type="bool" value="" description="If true, the IF statement pulls also on the branch not taken"/> </Node> <Node name="node_Throw_8" type="Throw" x="313.500000" y="689.000000"/> <Node name="node_Equal_9" type="Equal" x="197.500000" y="727.000000"/> <Node name="node_Constant_19" type="Constant" x="238.500000" y="767.000000"> <Parameter name="VALUE" type="string" value="failure of ROTATION_SPEED comparison while testing DataOdometry" description="The value"/> </Node> <Node name="node_IF_9" type="IF" x="425.500000" y="742.000000"> <Parameter name="PULL_ANYWAY" type="bool" value="" description="If true, the IF statement pulls also on the branch not taken"/> </Node> <Node name="node_Throw_9" type="Throw" x="318.500000" y="766.000000"/> <Node name="node_AND_1" type="AND" x="547.500000" y="160.000000"> <Parameter name="PULL_ANYWAY" type="bool" value="false" description="Pull on INPUT2 even if INPUT1 is false"/> </Node> <Node name="node_AND_2" type="AND" x="677.500000" y="195.000000"> <Parameter name="PULL_ANYWAY" type="bool" value="false" description="Pull on INPUT2 even if INPUT1 is false"/> </Node> <Node name="node_AND_3" type="AND" x="543.500000" y="319.000000"> <Parameter name="PULL_ANYWAY" type="bool" value="false" description="Pull on INPUT2 even if INPUT1 is false"/> </Node> <Node name="node_AND_4" type="AND" x="543.500000" y="468.000000"> <Parameter name="PULL_ANYWAY" type="bool" value="false" description="Pull on INPUT2 even if INPUT1 is false"/> </Node> <Node name="node_AND_5" type="AND" x="545.500000" y="629.000000"> <Parameter name="PULL_ANYWAY" type="bool" value="false" description="Pull on INPUT2 even if INPUT1 is false"/> </Node> <Node name="node_AND_6" type="AND" x="808.500000" y="375.000000"> <Parameter name="PULL_ANYWAY" type="bool" value="false" description="Pull on INPUT2 even if INPUT1 is false"/> </Node> <Node name="node_AND_7" type="AND" x="667.500000" y="548.000000"> <Parameter name="PULL_ANYWAY" type="bool" value="false" description="Pull on INPUT2 even if INPUT1 is false"/> </Node> <Node name="node_AND_9" type="AND" x="1019.500000" y="381.000000"> <Parameter name="PULL_ANYWAY" type="bool" value="false" description="Pull on INPUT2 even if INPUT1 is false"/> </Node> <Node name="node_NOP_11" type="NOP" x="1132.500000" y="381.000000"/> <Link from="node_newMarieDataOdometry_1" output="DATA_ODOMETRY" to="node_extractMarieDataOdometry_1" input="DATA_ODOMETRY"/> <Link from="node_Constant_2" output="VALUE" to="node_NOP_1" input="INPUT"/> <Link from="node_Constant_4" output="VALUE" to="node_NOP_2" input="INPUT"/> <Link from="node_Constant_3" output="VALUE" to="node_NOP_3" input="INPUT"/> <Link from="node_Constant_5" output="VALUE" to="node_NOP_4" input="INPUT"/> <Link from="node_Constant_1" output="VALUE" to="node_NOP_5" input="INPUT"/> <Link from="node_NOP_5" output="OUTPUT" to="node_Equal_1" input="INPUT1"/> <Link from="node_Equal_1" output="OUTPUT" to="node_IF_1" input="COND"/> <Link from="node_Equal_1" output="OUTPUT" to="node_IF_1" input="THEN"/> <Link from="node_Throw_1" output="OUTPUT" to="node_IF_1" input="ELSE"/> <Link from="node_Constant_6" output="VALUE" to="node_Throw_1" input="INPUT"/> <Link from="node_Constant_8" output="VALUE" to="node_NOP_6" input="INPUT"/> <Link from="node_Constant_10" output="VALUE" to="node_NOP_7" input="INPUT"/> <Link from="node_Constant_9" output="VALUE" to="node_NOP_8" input="INPUT"/> <Link from="node_Constant_7" output="VALUE" to="node_NOP_10" input="INPUT"/> <Link from="node_NOP_1" output="OUTPUT" to="node_Equal_2" input="INPUT1"/> <Link from="node_Equal_2" output="OUTPUT" to="node_IF_2" input="COND"/> <Link from="node_Equal_2" output="OUTPUT" to="node_IF_2" input="THEN"/> <Link from="node_Throw_2" output="OUTPUT" to="node_IF_2" input="ELSE"/> <Link from="node_Constant_12" output="VALUE" to="node_Throw_2" input="INPUT"/> <Link from="node_NOP_2" output="OUTPUT" to="node_Equal_3" input="INPUT1"/> <Link from="node_Equal_3" output="OUTPUT" to="node_IF_3" input="COND"/> <Link from="node_Equal_3" output="OUTPUT" to="node_IF_3" input="THEN"/> <Link from="node_Throw_3" output="OUTPUT" to="node_IF_3" input="ELSE"/> <Link from="node_Constant_13" output="VALUE" to="node_Throw_3" input="INPUT"/> <Link from="node_NOP_3" output="OUTPUT" to="node_Equal_4" input="INPUT1"/> <Link from="node_Equal_4" output="OUTPUT" to="node_IF_4" input="COND"/> <Link from="node_Equal_4" output="OUTPUT" to="node_IF_4" input="THEN"/> <Link from="node_Throw_4" output="OUTPUT" to="node_IF_4" input="ELSE"/> <Link from="node_Constant_14" output="VALUE" to="node_Throw_4" input="INPUT"/> <Link from="node_NOP_4" output="OUTPUT" to="node_Equal_5" input="INPUT1"/> <Link from="node_Equal_5" output="OUTPUT" to="node_IF_5" input="COND"/> <Link from="node_Equal_5" output="OUTPUT" to="node_IF_5" input="THEN"/> <Link from="node_Throw_5" output="OUTPUT" to="node_IF_5" input="ELSE"/> <Link from="node_Constant_15" output="VALUE" to="node_Throw_5" input="INPUT"/> <Link from="node_NOP_10" output="OUTPUT" to="node_Equal_6" input="INPUT1"/> <Link from="node_Equal_6" output="OUTPUT" to="node_IF_6" input="COND"/> <Link from="node_Equal_6" output="OUTPUT" to="node_IF_6" input="THEN"/> <Link from="node_Throw_6" output="OUTPUT" to="node_IF_6" input="ELSE"/> <Link from="node_Constant_16" output="VALUE" to="node_Throw_6" input="INPUT"/> <Link from="node_NOP_6" output="OUTPUT" to="node_Equal_7" input="INPUT1"/> <Link from="node_Equal_7" output="OUTPUT" to="node_IF_7" input="COND"/> <Link from="node_Equal_7" output="OUTPUT" to="node_IF_7" input="THEN"/> <Link from="node_Throw_7" output="OUTPUT" to="node_IF_7" input="ELSE"/> <Link from="node_Constant_17" output="VALUE" to="node_Throw_7" input="INPUT"/> <Link from="node_NOP_7" output="OUTPUT" to="node_Equal_8" input="INPUT1"/> <Link from="node_Equal_8" output="OUTPUT" to="node_IF_8" input="COND"/> <Link from="node_Equal_8" output="OUTPUT" to="node_IF_8" input="THEN"/> <Link from="node_Throw_8" output="OUTPUT" to="node_IF_8" input="ELSE"/> <Link from="node_Constant_18" output="VALUE" to="node_Throw_8" input="INPUT"/> <Link from="node_NOP_8" output="OUTPUT" to="node_Equal_9" input="INPUT1"/> <Link from="node_Equal_9" output="OUTPUT" to="node_IF_9" input="COND"/> <Link from="node_Equal_9" output="OUTPUT" to="node_IF_9" input="THEN"/> <Link from="node_Throw_9" output="OUTPUT" to="node_IF_9" input="ELSE"/> <Link from="node_Constant_19" output="VALUE" to="node_Throw_9" input="INPUT"/> <Link from="node_IF_1" output="OUTPUT" to="node_AND_1" input="INPUT1"/> <Link from="node_IF_2" output="OUTPUT" to="node_AND_1" input="INPUT2"/> <Link from="node_AND_1" output="OUTPUT" to="node_AND_2" input="INPUT1"/> <Link from="node_AND_3" output="OUTPUT" to="node_AND_2" input="INPUT2"/> <Link from="node_IF_3" output="OUTPUT" to="node_AND_3" input="INPUT1"/> <Link from="node_IF_4" output="OUTPUT" to="node_AND_3" input="INPUT2"/> <Link from="node_IF_5" output="OUTPUT" to="node_AND_4" input="INPUT1"/> <Link from="node_IF_6" output="OUTPUT" to="node_AND_4" input="INPUT2"/> <Link from="node_IF_7" output="OUTPUT" to="node_AND_5" input="INPUT1"/> <Link from="node_IF_8" output="OUTPUT" to="node_AND_5" input="INPUT2"/> <Link from="node_AND_2" output="OUTPUT" to="node_AND_6" input="INPUT1"/> <Link from="node_AND_7" output="OUTPUT" to="node_AND_6" input="INPUT2"/> <Link from="node_AND_4" output="OUTPUT" to="node_AND_7" input="INPUT1"/> <Link from="node_AND_5" output="OUTPUT" to="node_AND_7" input="INPUT2"/> <Link from="node_AND_6" output="OUTPUT" to="node_AND_9" input="INPUT1"/> <Link from="node_AND_9" output="OUTPUT" to="node_NOP_11" input="INPUT"/> <Link from="node_Constant_1" output="VALUE" to="node_newMarieDataOdometry_1" input="XPOS"/> <Link from="node_Constant_2" output="VALUE" to="node_newMarieDataOdometry_1" input="YPOS"/> <Link from="node_Constant_4" output="VALUE" to="node_newMarieDataOdometry_1" input="ZPOS"/> <Link from="node_Constant_3" output="VALUE" to="node_newMarieDataOdometry_1" input="YAW"/> <Link from="node_Constant_5" output="VALUE" to="node_newMarieDataOdometry_1" input="PITCH"/> <Link from="node_Constant_7" output="VALUE" to="node_newMarieDataOdometry_1" input="ROLL"/> <Link from="node_Constant_8" output="VALUE" to="node_newMarieDataOdometry_1" input="LINEAR_SPEED"/> <Link from="node_Constant_10" output="VALUE" to="node_newMarieDataOdometry_1" input="SIDE_SPEED"/> <Link from="node_Constant_9" output="VALUE" to="node_newMarieDataOdometry_1" input="ROTATION_SPEED"/> <Link from="node_IF_9" output="OUTPUT" to="node_AND_9" input="INPUT2"/> <Link from="node_extractMarieDataOdometry_1" output="XPOS" to="node_Equal_1" input="INPUT2"/> <Link from="node_extractMarieDataOdometry_1" output="YPOS" to="node_Equal_2" input="INPUT2"/> <Link from="node_extractMarieDataOdometry_1" output="ZPOS" to="node_Equal_3" input="INPUT2"/> <Link from="node_extractMarieDataOdometry_1" output="YAW" to="node_Equal_4" input="INPUT2"/> <Link from="node_extractMarieDataOdometry_1" output="PITCH" to="node_Equal_5" input="INPUT2"/> <Link from="node_extractMarieDataOdometry_1" output="ROLL" to="node_Equal_6" input="INPUT2"/> <Link from="node_extractMarieDataOdometry_1" output="LINEAR_SPEED" to="node_Equal_7" input="INPUT2"/> <Link from="node_extractMarieDataOdometry_1" output="SIDE_SPEED" to="node_Equal_8" input="INPUT2"/> <Link from="node_extractMarieDataOdometry_1" output="ROTATION_SPEED" to="node_Equal_9" input="INPUT2"/> <NetOutput name="OUTPUT" node="node_NOP_11" terminal="OUTPUT" object_type="any" description="The output = The input"/> <Note x="0" y="0" visible="0" text="Created with FlowDesigner 0.9.0"/> </Network> </Document> --- NEW FILE: CommandJoystick.n --- #!/usr/bin/env batchflow <?xml version="1.0"?> <Document> <Network type="subnet" name="MAIN"> <Node name="node_Constant_1" type="Constant" x="-629.000000" y="-156.000000"> <Parameter name="VALUE" type="int" value="0" description="The value"/> </Node> <Node name="node_Constant_2" type="Constant" x="-628.000000" y="-131.000000"> <Parameter name="VALUE" type="int" value="-1" description="The value"/> </Node> <Node name="node_Constant_3" type="Constant" x="-629.000000" y="-80.000000"> <Parameter name="VALUE" type="int" value="2" description="The value"/> </Node> <Node name="node_Constant_4" type="Constant" x="-629.000000" y="-105.000000"> <Parameter name="VALUE" type="int" value="1" description="The value"/> </Node> <Node name="node_Constant_5" type="Constant" x="-629.000000" y="-54.000000"> <Parameter name="VALUE" type="int" value="3" description="The value"/> </Node> <Node name="node_NOP_1" type="NOP" x="-385.000000" y="133.000000"/> <Node name="node_NOP_2" type="NOP" x="-385.000000" y="158.000000"/> <Node name="node_NOP_3" type="NOP" x="-385.000000" y="184.000000"/> <Node name="node_NOP_4" type="NOP" x="-384.000000" y="207.000000"/> <Node name="node_NOP_5" type="NOP" x="-385.000000" y="108.000000"/> <Node name="node_Equal_1" type="Equal" x="433.000000" y="114.000000"/> <Node name="node_Constant_6" type="Constant" x="474.000000" y="154.000000"> <Parameter name="VALUE" type="string" value="failure of X comparison while testing CommandCamera" description="The value"/> </Node> <Node name="node_IF_1" type="IF" x="661.000000" y="129.000000"> <Parameter name="PULL_ANYWAY" type="bool" value="" description="If true, the IF statement pulls also on the branch not taken"/> </Node> <Node name="node_Throw_1" type="Throw" x="554.000000" y="153.000000"/> <Node name="node_Constant_7" type="Constant" x="-629.000000" y="-30.000000"> <Parameter name="VALUE" type="int" value="4" description="The value"/> </Node> <Node name="node_Constant_8" type="Constant" x="-629.000000" y="-5.000000"> <Parameter name="VALUE" type="int" value="5" description="The value"/> </Node> <Node name="node_Constant_10" type="Constant" x="-629.000000" y="21.000000"> <Parameter name="VALUE" type="int" value="32458" description="The value"/> </Node> <Node name="node_NOP_6" type="NOP" x="-385.000000" y="259.000000"/> <Node name="node_NOP_7" type="NOP" x="-385.000000" y="284.000000"/> <Node name="node_NOP_10" type="NOP" x="-384.000000" y="234.000000"/> <Node name="node_Equal_2" type="Equal" x="438.000000" y="191.000000"/> <Node name="node_Constant_12" type="Constant" x="479.000000" y="231.000000"> <Parameter name="VALUE" type="string" value="failure of Y comparison while testing CommandCamera" description="The value"/> </Node> <Node name="node_IF_2" type="IF" x="666.000000" y="206.000000"> <Parameter name="PULL_ANYWAY" type="bool" value="" description="If true, the IF statement pulls also on the branch not taken"/> </Node> <Node name="node_Throw_2" type="Throw" x="559.000000" y="230.000000"/> <Node name="node_Equal_3" type="Equal" x="438.000000" y="267.000000"/> <Node name="node_Constant_13" type="Constant" x="479.000000" y="307.000000"> <Parameter name="VALUE" type="string" value="failure of XMIN comparison while testing CommandCamera" description="The value"/> </Node> <Node name="node_IF_3" type="IF" x="666.000000" y="282.000000"> <Parameter name="PULL_ANYWAY" type="bool" value="" description="If true, the IF statement pulls also on the branch not taken"/> </Node> <Node name="node_Throw_3" type="Throw" x="559.000000" y="306.000000"/> <Node name="node_Equal_4" type="Equal" x="443.000000" y="344.000000"/> <Node name="node_Constant_14" type="Constant" x="484.000000" y="384.000000"> <Parameter name="VALUE" type="string" value="failure of YMIN comparison while testing CommandCamera" description="The value"/> </Node> <Node name="node_IF_4" type="IF" x="671.000000" y="359.000000"> <Parameter name="PULL_ANYWAY" type="bool" value="" description="If true, the IF statement pulls also on the branch not taken"/> </Node> <Node name="node_Throw_4" type="Throw" x="564.000000" y="383.000000"/> <Node name="node_Equal_5" type="Equal" x="444.000000" y="421.000000"/> <Node name="node_Constant_15" type="Constant" x="485.000000" y="461.000000"> <Parameter name="VALUE" type="string" value="failure of XMAX comparison while testing CommandCamera" description="The value"/> </Node> <Node name="node_IF_5" type="IF" x="672.000000" y="436.000000"> <Parameter name="PULL_ANYWAY" type="bool" value="" description="If true, the IF statement pulls also on the branch not taken"/> </Node> <Node name="node_Throw_5" type="Throw" x="565.000000" y="460.000000"/> <Node name="node_Equal_6" type="Equal" x="445.000000" y="502.000000"/> <Node name="node_Constant_16" type="Constant" x="486.000000" y="542.000000"> <Parameter name="VALUE" type="string" value="failure of YMAX comparison while testing CommandCamera" description="The value"/> </Node> <Node name="node_IF_6" type="IF" x="673.000000" y="517.000000"> <Parameter name="PULL_ANYWAY" type="bool" value="" description="If true, the IF statement pulls also on the branch not taken"/> </Node> <Node name="node_Throw_6" type="Throw" x="566.000000" y="541.000000"/> <Node name="node_Equal_7" type="Equal" x="450.000000" y="579.000000"/> <Node name="node_Constant_17" type="Constant" x="491.000000" y="619.000000"> <Parameter name="VALUE" type="string" value="failure of NBBUTTONS comparison while testing CommandCamera" description="The value"/> </Node> <Node name="node_IF_7" type="IF" x="678.000000" y="594.000000"> <Parameter name="PULL_ANYWAY" type="bool" value="" description="If true, the IF statement pulls also on the branch not taken"/> </Node> <Node name="node_Throw_7" type="Throw" x="571.000000" y="618.000000"/> <Node name="node_Equal_8" type="Equal" x="450.000000" y="655.000000"/> <Node name="node_Constant_18" type="Constant" x="491.000000" y="695.000000"> <Parameter name="VALUE" type="string" value="failure of BUTTONSTATE comparison while testing CommandCamera" description="The value"/> </Node> <Node name="node_IF_8" type="IF" x="678.000000" y="670.000000"> <Parameter name="PULL_ANYWAY" type="bool" value="" description="If true, the IF statement pulls also on the branch not taken"/> </Node> <Node name="node_Throw_8" type="Throw" x="571.000000" y="694.000000"/> <Node name="node_AND_1" type="AND" x="805.000000" y="165.000000"> <Parameter name="PULL_ANYWAY" type="bool" value="false" description="Pull on INPUT2 even if INPUT1 is false"/> </Node> <Node name="node_AND_2" type="AND" x="935.000000" y="200.000000"> <Parameter name="PULL_ANYWAY" type="bool" value="false" description="Pull on INPUT2 even if INPUT1 is false"/> </Node> <Node name="node_AND_3" type="AND" x="801.000000" y="324.000000"> <Parameter name="PULL_ANYWAY" type="bool" value="false" description="Pull on INPUT2 even if INPUT1 is false"/> </Node> <Node name="node_AND_4" type="AND" x="801.000000" y="473.000000"> <Parameter name="PULL_ANYWAY" type="bool" value="false" description="Pull on INPUT2 even if INPUT1 is false"/> </Node> <Node name="node_AND_5" type="AND" x="803.000000" y="634.000000"> <Parameter name="PULL_ANYWAY" type="bool" value="false" description="Pull on INPUT2 even if INPUT1 is false"/> </Node> <Node name="node_AND_6" type="AND" x="1066.000000" y="380.000000"> <Parameter name="PULL_ANYWAY" type="bool" value="false" description="Pull on INPUT2 even if INPUT1 is false"/> </Node> <Node name="node_AND_7" type="AND" x="925.000000" y="553.000000"> <Parameter name="PULL_ANYWAY" type="bool" value="false" description="Pull on INPUT2 even if INPUT1 is false"/> </Node> <Node name="node_NOP_11" type="NOP" x="1165.000000" y="381.000000"/> <Node name="node_extractMarieCommandJoystick_1" type="extractMarieCommandJoystick" x="-62.000000" y="-103.000000"/> <Node name="node_newMarieCommandJoystick_1" type="newMarieCommandJoystick" x="-292.000000" y="-102.000000"/> <Link from="node_Constant_2" output="VALUE" to="node_NOP_1" input="INPUT"/> <Link from="node_Constant_4" output="VALUE" to="node_NOP_2" input="INPUT"/> <Link from="node_Constant_3" output="VALUE" to="node_NOP_3" input="INPUT"/> <Link from="node_Constant_5" output="VALUE" to="node_NOP_4" input="INPUT"/> <Link from="node_Constant_1" output="VALUE" to="node_NOP_5" input="INPUT"/> <Link from="node_NOP_5" output="OUTPUT" to="node_Equal_1" input="INPUT1"/> <Link from="node_Equal_1" output="OUTPUT" to="node_IF_1" input="COND"/> <Link from="node_Equal_1" output="OUTPUT" to="node_IF_1" input="THEN"/> <Link from="node_Throw_1" output="OUTPUT" to="node_IF_1" input="ELSE"/> <Link from="node_Constant_6" output="VALUE" to="node_Throw_1" input="INPUT"/> <Link from="node_Constant_8" output="VALUE" to="node_NOP_6" input="INPUT"/> <Link from="node_Constant_10" output="VALUE" to="node_NOP_7" input="INPUT"/> <Link from="node_Constant_7" output="VALUE" to="node_NOP_10" input="INPUT"/> <Link from="node_NOP_1" output="OUTPUT" to="node_Equal_2" input="INPUT1"/> <Link from="node_Equal_2" output="OUTPUT" to="node_IF_2" input="COND"/> <Link from="node_Equal_2" output="OUTPUT" to="node_IF_2" input="THEN"/> <Link from="node_Throw_2" output="OUTPUT" to="node_IF_2" input="ELSE"/> <Link from="node_Constant_12" output="VALUE" to="node_Throw_2" input="INPUT"/> <Link from="node_NOP_2" output="OUTPUT" to="node_Equal_3" input="INPUT1"/> <Link from="node_Equal_3" output="OUTPUT" to="node_IF_3" input="COND"/> <Link from="node_Equal_3" output="OUTPUT" to="node_IF_3" input="THEN"/> <Link from="node_Throw_3" output="OUTPUT" to="node_IF_3" input="ELSE"/> <Link from="node_Constant_13" output="VALUE" to="node_Throw_3" input="INPUT"/> <Link from="node_NOP_3" output="OUTPUT" to="node_Equal_4" input="INPUT1"/> <Link from="node_Equal_4" output="OUTPUT" to="node_IF_4" input="COND"/> <Link from="node_Equal_4" output="OUTPUT" to="node_IF_4" input="THEN"/> <Link from="node_Throw_4" output="OUTPUT" to="node_IF_4" input="ELSE"/> <Link from="node_Constant_14" output="VALUE" to="node_Throw_4" input="INPUT"/> <Link from="node_NOP_4" output="OUTPUT" to="node_Equal_5" input="INPUT1"/> <Link from="node_Equal_5" output="OUTPUT" to="node_IF_5" input="COND"/> <Link from="node_Equal_5" output="OUTPUT" to="node_IF_5" input="THEN"/> <Link from="node_Throw_5" output="OUTPUT" to="node_IF_5" input="ELSE"/> <Link from="node_Constant_15" output="VALUE" to="node_Throw_5" input="INPUT"/> <Link from="node_NOP_10" output="OUTPUT" to="node_Equal_6" input="INPUT1"/> <Link from="node_Equal_6" output="OUTPUT" to="node_IF_6" input="COND"/> <Link from="node_Equal_6" output="OUTPUT" to="node_IF_6" input="THEN"/> <Link from="node_Throw_6" output="OUTPUT" to="node_IF_6" input="ELSE"/> <Link from="node_Constant_16" output="VALUE" to="node_Throw_6" input="INPUT"/> <Link from="node_NOP_6" output="OUT... [truncated message content] |
|
From: clement r. <kl...@us...> - 2005-09-12 22:45:21
|
Update of /cvsroot/robotflow/RobotFlow/MARIE/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6643/include Removed Files: MarieCommandBehavior.h MarieCommandCamera.h MarieCommandJoystick.h MarieCommandMotor.h MarieDataBumper.h MarieDataCamera.h MarieDataIR.h MarieDataLaser.h MarieDataMap.h MarieDataNull.h MarieDataOdometry.h MarieDataRaw.h MarieDataSonar.h MarieRequestSystem.h Log Message: remove no more pertinent files --- MarieDataBumper.h DELETED --- --- MarieCommandMotor.h DELETED --- --- MarieCommandJoystick.h DELETED --- --- MarieCommandBehavior.h DELETED --- --- MarieDataNull.h DELETED --- --- MarieDataSonar.h DELETED --- --- MarieCommandCamera.h DELETED --- --- MarieDataIR.h DELETED --- --- MarieDataCamera.h DELETED --- --- MarieDataLaser.h DELETED --- --- MarieDataOdometry.h DELETED --- --- MarieDataMap.h DELETED --- --- MarieRequestSystem.h DELETED --- --- MarieDataRaw.h DELETED --- |
|
From: clement r. <kl...@us...> - 2005-09-12 22:45:21
|
Update of /cvsroot/robotflow/RobotFlow/MARIE/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6643/src Removed Files: MarieCommandBehavior.cpp MarieCommandCamera.cpp MarieCommandJoystick.cpp MarieCommandMotor.cpp MarieDataBumper.cpp MarieDataCamera.cpp MarieDataIR.cpp MarieDataLaser.cpp MarieDataLocalisation.cpp MarieDataMap.cpp MarieDataNull.cpp MarieDataOdometry.cpp MarieDataRaw.cpp MarieDataSonar.cpp Log Message: remove no more pertinent files --- MarieDataCamera.cpp DELETED --- --- MarieDataIR.cpp DELETED --- --- MarieCommandCamera.cpp DELETED --- --- MarieCommandMotor.cpp DELETED --- --- MarieDataSonar.cpp DELETED --- --- MarieCommandBehavior.cpp DELETED --- --- MarieDataOdometry.cpp DELETED --- --- MarieDataLaser.cpp DELETED --- --- MarieDataMap.cpp DELETED --- --- MarieCommandJoystick.cpp DELETED --- --- MarieDataBumper.cpp DELETED --- --- MarieDataNull.cpp DELETED --- --- MarieDataLocalisation.cpp DELETED --- --- MarieDataRaw.cpp DELETED --- |
|
From: clement r. <kl...@us...> - 2005-09-12 22:44:24
|
Update of /cvsroot/robotflow/RobotFlow/MARIE/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6543/include Modified Files: Makefile.am Log Message: remove useless files entries Index: Makefile.am =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/Makefile.am,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** Makefile.am 12 Sep 2005 21:31:19 -0000 1.15 --- Makefile.am 12 Sep 2005 22:44:16 -0000 1.16 *************** *** 4,23 **** MariePeek.h \ MariePush.h - # MarieCommandBehavior.h \ - # MarieCommandMotor.h \ - # MarieDataLaser.h \ - # MarieDataIR.h \ - # MarieDataBumper.h \ - # MarieDataSonar.h \ - # MarieDataNull.h \ - # MarieCommandCamera.h \ - # MarieDataCamera.h \ - # MarieDataOdometry.h \ - # MarieDataRaw.h \ - # MarieCommandJoystick.h \ - # MarieDataMap.h \ - # MarieRequestSystem.h - - include_HEADERS = MarieObject.h \ - MarieDataLocalisation.h --- 4,7 ---- MariePeek.h \ MariePush.h + include_HEADERS = MarieObject.h |
|
From: clement r. <kl...@us...> - 2005-09-12 22:43:59
|
Update of /cvsroot/robotflow/RobotFlow/MARIE/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6402/src Modified Files: Makefile.am Log Message: remove useless files entries Index: Makefile.am =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/Makefile.am,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** Makefile.am 12 Sep 2005 21:31:19 -0000 1.28 --- Makefile.am 12 Sep 2005 22:43:47 -0000 1.29 *************** *** 29,33 **** newMarieCommandMotor.cpp \ newMarieCommandJoystick.cpp \ - newMarieDataNull.cpp \ extractMarieDataLaser.cpp \ extractMarieDataLocalisation.cpp \ --- 29,32 ---- *************** *** 45,64 **** extractMarieCommandJoystick.cpp \ isMarieDataNull.cpp - # MarieDataLaser.cpp \ - # MarieDataLocalisation.cpp \ - # MarieDataSonar.cpp \ - # MarieDataCamera.cpp \ - # MarieDataOdometry.cpp \ - # MarieDataNull.cpp \ - # MarieDataRaw.cpp \ - # MarieDataIR.cpp \ - # MarieDataBumper.cpp \ - # MarieDataMap.cpp \ - # MarieCommandBehavior.cpp \ - # MarieCommandCamera.cpp \ - # MarieCommandMotor.cpp \ - # MarieCommandJoystick.cpp \ - # MarieRequestSystem.cpp \ - # install-data-local: --- 44,47 ---- |
|
From: clement r. <kl...@us...> - 2005-09-12 22:43:18
|
Update of /cvsroot/robotflow/RobotFlow/MARIE/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6197/src Modified Files: newMarieDataNull.cpp Log Message: Remove useless Flowdesigner types for MARIE. Add MarieObject as a dataAbstract container. Remove multiple inheritance. Index: newMarieDataNull.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/newMarieDataNull.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** newMarieDataNull.cpp 12 Sep 2005 13:17:32 -0000 1.1 --- newMarieDataNull.cpp 12 Sep 2005 22:43:05 -0000 1.2 *************** *** 20,24 **** */ #include "MarieObject.h" ! #include "MarieDataNull.h" #include "BufferedNode.h" #include <sstream> --- 20,24 ---- */ #include "MarieObject.h" ! #include "DataNull.h" #include "BufferedNode.h" #include <sstream> *************** *** 65,71 **** { //create new DataNull ! MarieDataNull *dNull = new MarieDataNull(); ! out[count] = ObjectRef(dNull); } };//class newMarieDataNull --- 65,71 ---- { //create new DataNull ! DataNull *dNull = new DataNull(); ! out[count] = ObjectRef(new MarieObject(dNull)); } };//class newMarieDataNull |
Update of /cvsroot/robotflow/RobotFlow/MARIE/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18474/src Modified Files: Makefile.am MarieCommandBehavior.cpp MarieCommandCamera.cpp MarieCommandJoystick.cpp MarieCommandMotor.cpp MarieDataBumper.cpp MarieDataCamera.cpp MarieDataIR.cpp MarieDataLaser.cpp MarieDataLocalisation.cpp MarieDataMap.cpp MarieDataOdometry.cpp MarieDataRaw.cpp MarieDataSonar.cpp MarieObject.cpp MariePeek.cpp MariePull.cpp MariePush.cpp MarieRequestSystem.cpp extractMarieCommandBehavior.cpp extractMarieCommandCamera.cpp extractMarieCommandJoystick.cpp extractMarieCommandMotor.cpp extractMarieDataBumper.cpp extractMarieDataCamera.cpp extractMarieDataIR.cpp extractMarieDataLaser.cpp extractMarieDataLocalisation.cpp extractMarieDataMap.cpp extractMarieDataOdometry.cpp extractMarieDataRaw.cpp extractMarieDataSonar.cpp extractMarieRequestSystem.cpp isMarieDataNull.cpp newMarieCommandBehavior.cpp newMarieCommandCamera.cpp newMarieCommandJoystick.cpp newMarieCommandMotor.cpp newMarieDataBumper.cpp newMarieDataCamera.cpp newMarieDataIR.cpp newMarieDataLaser.cpp newMarieDataLocalisation.cpp newMarieDataMap.cpp newMarieDataOdometry.cpp newMarieDataRaw.cpp newMarieDataSonar.cpp newMarieRequestSystem.cpp Log Message: Remove useless Flowdesigner types for MARIE. Add MarieObject as a dataAbstract container. Remove multiple inheritance. Index: MarieDataCamera.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MarieDataCamera.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** MarieDataCamera.cpp 7 Sep 2005 21:12:48 -0000 1.8 --- MarieDataCamera.cpp 12 Sep 2005 21:31:19 -0000 1.9 *************** *** 30,78 **** namespace marie { ! DECLARE_TYPE2(DataCamera::ID,MarieDataCamera) ! ! using namespace std; ! ! MarieDataCamera::MarieDataCamera() ! { ! ! } ! ! MarieDataCamera::MarieDataCamera (const DataCamera &data) ! : DataCamera(data) ! { ! ! } ! ! void MarieDataCamera::printOn(ostream &out) const ! { ! MarieXMLDataFactory factory; ! ! //writing XML data ! string value = factory.toString((DataCamera) (*this)); ! ! out.write(value.c_str(), value.size()); ! } ! ! void MarieDataCamera::readFrom(istream &in) ! { ! throw new GeneralException("readFrom not supported. Use the MarieLoad Node to read data from the stream.",__FILE__,__LINE__); ! } ! ! void MarieDataCamera::copyDataAbstract(DataAbstract *data) ! { ! if (data) ! { ! DataCamera *my_data = dynamic_cast<DataCamera*>(data); ! if (my_data) ! { ! //((DataCamera*)this)->operator=(*my_data); ! this->DataCamera::operator=(*my_data); ! } ! else ! { ! throw new GeneralException(string("Unable to cast into DataCamera Abstract : ") + data->getID(),__FILE__,__LINE__); ! } ! } ! } } --- 30,78 ---- namespace marie { ! // DECLARE_TYPE2(DataCamera::ID,MarieDataCamera) ! // ! // using namespace std; ! // ! // MarieDataCamera::MarieDataCamera() ! // { ! // ! // } ! // ! // MarieDataCamera::MarieDataCamera (const DataCamera &data) ! // : DataCamera(data) ! // { ! // ! // } ! // ! // void MarieDataCamera::printOn(ostream &out) const ! // { ! // MarieXMLDataFactory factory; ! // ! // //writing XML data ! // string value = factory.toString((DataCamera) (*this)); ! // ! // out.write(value.c_str(), value.size()); ! // } ! // ! // void MarieDataCamera::readFrom(istream &in) ! // { ! // throw new GeneralException("readFrom not supported. Use the MarieLoad Node to read data from the stream.",__FILE__,__LINE__); ! // } ! // ! // void MarieDataCamera::copyDataAbstract(DataAbstract *data) ! // { ! // if (data) ! // { ! // DataCamera *my_data = dynamic_cast<DataCamera*>(data); ! // if (my_data) ! // { ! // //((DataCamera*)this)->operator=(*my_data); ! // this->DataCamera::operator=(*my_data); ! // } ! // else ! // { ! // throw new GeneralException(string("Unable to cast into DataCamera Abstract : ") + data->getID(),__FILE__,__LINE__); ! // } ! // } ! // } } Index: extractMarieDataIR.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/extractMarieDataIR.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** extractMarieDataIR.cpp 29 Mar 2005 15:20:43 -0000 1.4 --- extractMarieDataIR.cpp 12 Sep 2005 21:31:19 -0000 1.5 *************** *** 22,30 **** #include <sstream> #include <string> - #include "MarieDataIR.h" - #include "MarieXMLDataFactory.h" - #include "Behavior.h" #include "Vector.h" ! #include "MarieDataNull.h" using namespace std; --- 22,29 ---- #include <sstream> #include <string> #include "Vector.h" ! #include "BufferedNode.h" ! #include "MarieObject.h" ! #include "DataIR.h" using namespace std; *************** *** 33,110 **** namespace marie { ! //forward declaration ! class extractMarieDataIR; ! ! DECLARE_NODE(extractMarieDataIR) ! /*Node * * @name extractMarieDataIR * @category RobotFlow:MARIE:DATA ! * @description Extract data in the FlowDesigner format from MarieDataIR * * @input_name DATA_IR ! * @input_type MarieDataIR ! * @input_description MarieDataIR object * * @output_name RANGES ! * @output_description Range contained in the MarieDataIR object * @output_type Vector<int> ! * ! END*/ ! ! ! using namespace std; ! ! class extractMarieDataIR : public BufferedNode ! { ! ! private: ! //intputs ! int m_dataIRID; ! ! //outputs ! int m_rangesID; ! ! public: ! ! ! extractMarieDataIR(string nodeName, ParameterSet params) ! : BufferedNode(nodeName,params) ! { ! //inputs ! m_dataIRID = addInput("DATA_IR"); ! //outputs ! m_rangesID = addOutput("RANGES"); ! } ! ! void calculate(int output_id, int count, Buffer &out) ! { ! try { ! //get input ! RCPtr<MarieDataIR> data = getInput(m_dataIRID,count); ! ! unsigned int size = data->getNbIR(); ! const unsigned int *ranges = data->getRanges(); ! ! //copy range data into a vector ! Vector<int> *vect = Vector<int>::alloc(size); ! ! for (unsigned int i = 0; i < size; i++) ! { ! (*vect)[i] = (int) ranges[i]; ! } ! ! //output vector ! out[count] = ObjectRef(vect); } ! catch (BaseException *e) { ! e->print(cerr); ! e->add(new GeneralException("Unable to process",__FILE__,__LINE__)); ! throw e; } - } };//class extractMarieDataIR }//namespace marie --- 32,115 ---- namespace marie { ! //forward declaration ! class extractMarieDataIR; ! ! DECLARE_NODE(extractMarieDataIR) ! /*Node * * @name extractMarieDataIR * @category RobotFlow:MARIE:DATA ! * @description Extract data in the FlowDesigner format from MarieObject * * @input_name DATA_IR ! * @input_type MarieObject ! * @input_description input MarieObject object containing a DataIR * * @output_name RANGES ! * @output_description Range contained in the DataIR object * @output_type Vector<int> ! * ! END*/ ! ! using namespace std; ! ! class extractMarieDataIR : public BufferedNode ! { ! ! private: ! //intputs ! int m_dataIRID; ! //outputs ! int m_rangesID; ! ! public: ! ! extractMarieDataIR(string nodeName, ParameterSet params) ! : BufferedNode(nodeName,params) { ! //inputs ! m_dataIRID = addInput("DATA_IR"); ! ! //outputs ! m_rangesID = addOutput("RANGES"); } ! ! void calculate(int output_id, int count, Buffer &out) { ! try ! { ! //get input ! RCPtr<MarieObject> dataPtr = getInput(m_dataIRID,count); ! DataIR *dataIR = dynamic_cast<DataIR*>(dataPtr->getData()); ! if (dataIR != NULL) ! { ! unsigned int size = dataIR->getNbIR(); ! const unsigned int *ranges = dataIR->getRanges(); ! ! //copy range data into a vector ! Vector<int> *vect = Vector<int>::alloc(size); ! ! for (unsigned int i = 0; i < size; i++) ! { ! (*vect)[i] = (int) ranges[i]; ! } ! ! //output vector ! out[count] = ObjectRef(vect); ! } ! else ! { ! std::cerr << "FD::extractMarieCommandCamera -> MarieObject received data not of CommandCamera type" << std::endl; ! out[count] = nilObject; ! } ! } ! catch (BaseException *e) ! { ! e->print(cerr); ! e->add(new GeneralException("Unable to process",__FILE__,__LINE__)); ! throw e; ! } } };//class extractMarieDataIR }//namespace marie Index: Makefile.am =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/Makefile.am,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** Makefile.am 12 Sep 2005 13:17:32 -0000 1.27 --- Makefile.am 12 Sep 2005 21:31:19 -0000 1.28 *************** *** 13,31 **** MariePush.cpp \ MariePeek.cpp \ ! MarieDataLaser.cpp \ ! MarieDataLocalisation.cpp \ ! MarieDataSonar.cpp \ ! MarieDataCamera.cpp \ ! MarieDataOdometry.cpp \ ! MarieDataNull.cpp \ ! MarieDataRaw.cpp \ ! MarieDataIR.cpp \ ! MarieDataBumper.cpp \ ! MarieDataMap.cpp \ ! MarieCommandBehavior.cpp \ ! MarieCommandCamera.cpp \ ! MarieCommandMotor.cpp \ ! MarieCommandJoystick.cpp \ ! MarieRequestSystem.cpp \ newMarieDataLaser.cpp \ newMarieDataLocalisation.cpp \ --- 13,17 ---- MariePush.cpp \ MariePeek.cpp \ ! MarieObject.cpp \ newMarieDataLaser.cpp \ newMarieDataLocalisation.cpp \ *************** *** 43,46 **** --- 29,33 ---- newMarieCommandMotor.cpp \ newMarieCommandJoystick.cpp \ + newMarieDataNull.cpp \ extractMarieDataLaser.cpp \ extractMarieDataLocalisation.cpp \ *************** *** 58,62 **** extractMarieCommandJoystick.cpp \ isMarieDataNull.cpp ! install-data-local: --- 45,64 ---- extractMarieCommandJoystick.cpp \ isMarieDataNull.cpp ! # MarieDataLaser.cpp \ ! # MarieDataLocalisation.cpp \ ! # MarieDataSonar.cpp \ ! # MarieDataCamera.cpp \ ! # MarieDataOdometry.cpp \ ! # MarieDataNull.cpp \ ! # MarieDataRaw.cpp \ ! # MarieDataIR.cpp \ ! # MarieDataBumper.cpp \ ! # MarieDataMap.cpp \ ! # MarieCommandBehavior.cpp \ ! # MarieCommandCamera.cpp \ ! # MarieCommandMotor.cpp \ ! # MarieCommandJoystick.cpp \ ! # MarieRequestSystem.cpp \ ! # install-data-local: Index: MarieDataBumper.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MarieDataBumper.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** MarieDataBumper.cpp 7 Sep 2005 21:12:48 -0000 1.7 --- MarieDataBumper.cpp 12 Sep 2005 21:31:19 -0000 1.8 *************** *** 32,78 **** using namespace std; ! DECLARE_TYPE2(DataBumper::ID,MarieDataBumper) ! ! MarieDataBumper::MarieDataBumper() ! { ! ! } ! ! MarieDataBumper::MarieDataBumper (const DataBumper &command) ! :DataBumper(command) ! { ! ! } ! ! void MarieDataBumper::printOn(ostream &out) const ! { ! MarieXMLDataFactory factory; ! ! //writing XML data ! string value = factory.toString((DataBumper) (*this)); ! ! out.write(value.c_str(), value.size()); ! } ! ! void MarieDataBumper::readFrom(istream &in) ! { ! throw new GeneralException("readFrom not supported. Use the MarieLoad Node to read data from the stream.",__FILE__,__LINE__); ! } ! ! void MarieDataBumper::copyDataAbstract(DataAbstract *data) ! { ! if (data) ! { ! DataBumper *command = dynamic_cast<DataBumper*>(data); ! if (command) ! { ! //((DataBumper*)this)->operator=(*command); ! this->DataBumper::operator=(*command); ! } ! else ! { ! throw new GeneralException(string("Unable to cast into DataBumper Abstract : ") + data->getID(),__FILE__,__LINE__); ! } ! } ! } } --- 32,78 ---- using namespace std; ! // DECLARE_TYPE2(DataBumper::ID,MarieDataBumper) ! // ! // MarieDataBumper::MarieDataBumper() ! // { ! // ! // } ! // ! // MarieDataBumper::MarieDataBumper (const DataBumper &command) ! // :DataBumper(command) ! // { ! // ! // } ! // ! // void MarieDataBumper::printOn(ostream &out) const ! // { ! // MarieXMLDataFactory factory; ! // ! // //writing XML data ! // string value = factory.toString((DataBumper) (*this)); ! // ! // out.write(value.c_str(), value.size()); ! // } ! // ! // void MarieDataBumper::readFrom(istream &in) ! // { ! // throw new GeneralException("readFrom not supported. Use the MarieLoad Node to read data from the stream.",__FILE__,__LINE__); ! // } ! // ! // void MarieDataBumper::copyDataAbstract(DataAbstract *data) ! // { ! // if (data) ! // { ! // DataBumper *command = dynamic_cast<DataBumper*>(data); ! // if (command) ! // { ! // //((DataBumper*)this)->operator=(*command); ! // this->DataBumper::operator=(*command); ! // } ! // else ! // { ! // throw new GeneralException(string("Unable to cast into DataBumper Abstract : ") + data->getID(),__FILE__,__LINE__); ! // } ! // } ! // } } Index: MarieRequestSystem.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MarieRequestSystem.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** MarieRequestSystem.cpp 7 Sep 2005 21:12:48 -0000 1.6 --- MarieRequestSystem.cpp 12 Sep 2005 21:31:19 -0000 1.7 *************** *** 28,77 **** using namespace FD; ! namespace marie ! { ! DECLARE_TYPE2(RequestSystem::ID,MarieRequestSystem) ! ! using namespace std; ! ! MarieRequestSystem::MarieRequestSystem() ! { ! ! } ! ! MarieRequestSystem::MarieRequestSystem (const RequestSystem &data) ! :RequestSystem(data) ! { ! ! } ! ! void MarieRequestSystem::printOn(ostream &out) const ! { ! MarieXMLDataFactory factory; ! ! //writing XML data ! string value = factory.toString((RequestSystem) (*this)); ! ! out.write(value.c_str(), value.size()); ! } ! ! void MarieRequestSystem::readFrom(istream &in) ! { ! throw new GeneralException("readFrom not supported. Use the MarieLoad Node to read data from the stream.",__FILE__,__LINE__); ! } ! ! void MarieRequestSystem::copyDataAbstract(DataAbstract *data) ! { ! if (data) ! { ! RequestSystem *my_data = dynamic_cast<RequestSystem*>(data); ! if (my_data) ! { ! this->RequestSystem::operator=(*my_data); ! } ! else ! { ! throw new GeneralException(string("Unable to cast into RequestSystem Abstract : ") + data->getID(),__FILE__,__LINE__); ! } ! } ! } ! } --- 28,77 ---- using namespace FD; ! // namespace marie ! // { ! // DECLARE_TYPE2(RequestSystem::ID,MarieRequestSystem) ! // ! // using namespace std; ! // ! // MarieRequestSystem::MarieRequestSystem() ! // { ! // ! // } ! // ! // MarieRequestSystem::MarieRequestSystem (const RequestSystem &data) ! // :RequestSystem(data) ! // { ! // ! // } ! // ! // void MarieRequestSystem::printOn(ostream &out) const ! // { ! // MarieXMLDataFactory factory; ! // ! // //writing XML data ! // string value = factory.toString((RequestSystem) (*this)); ! // ! // out.write(value.c_str(), value.size()); ! // } ! // ! // void MarieRequestSystem::readFrom(istream &in) ! // { ! // throw new GeneralException("readFrom not supported. Use the MarieLoad Node to read data from the stream.",__FILE__,__LINE__); ! // } ! // ! // void MarieRequestSystem::copyDataAbstract(DataAbstract *data) ! // { ! // if (data) ! // { ! // RequestSystem *my_data = dynamic_cast<RequestSystem*>(data); ! // if (my_data) ! // { ! // this->RequestSystem::operator=(*my_data); ! // } ! // else ! // { ! // throw new GeneralException(string("Unable to cast into RequestSystem Abstract : ") + data->getID(),__FILE__,__LINE__); ! // } ! // } ! // } ! // } Index: MarieDataSonar.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MarieDataSonar.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** MarieDataSonar.cpp 7 Sep 2005 21:12:48 -0000 1.8 --- MarieDataSonar.cpp 12 Sep 2005 21:31:19 -0000 1.9 *************** *** 29,79 **** using namespace FD; ! namespace marie ! { ! DECLARE_TYPE2(DataSonar::ID,MarieDataSonar) ! ! using namespace std; ! ! MarieDataSonar::MarieDataSonar() ! { ! ! } ! ! MarieDataSonar::MarieDataSonar (const DataSonar &data) ! :DataSonar(data) ! { ! ! } ! ! void MarieDataSonar::printOn(ostream &out) const ! { ! MarieXMLDataFactory factory; ! ! //writing XML data ! string value = factory.toString((DataSonar) (*this)); ! ! out.write(value.c_str(), value.size()); ! } ! ! void MarieDataSonar::readFrom(istream &in) ! { ! throw new GeneralException("readFrom not supported. Use the MarieLoad Node to read data from the stream.",__FILE__,__LINE__); ! } ! ! void MarieDataSonar::copyDataAbstract(DataAbstract *data) ! { ! if (data) ! { ! DataSonar *my_data = dynamic_cast<DataSonar*>(data); ! if (my_data) ! { ! //((DataSonar*)this)->operator=(*my_data); ! this->DataSonar::operator=(*my_data); ! } ! else ! { ! throw new GeneralException(string("Unable to cast into DataSonar Abstract : ") + data->getID(),__FILE__,__LINE__); ! } ! } ! } ! } --- 29,79 ---- using namespace FD; ! // namespace marie ! // { ! // DECLARE_TYPE2(DataSonar::ID,MarieDataSonar) ! // ! // using namespace std; ! // ! // MarieDataSonar::MarieDataSonar() ! // { ! // ! // } ! // ! // MarieDataSonar::MarieDataSonar (const DataSonar &data) ! // :DataSonar(data) ! // { ! // ! // } ! // ! // void MarieDataSonar::printOn(ostream &out) const ! // { ! // MarieXMLDataFactory factory; ! // ! // //writing XML data ! // string value = factory.toString((DataSonar) (*this)); ! // ! // out.write(value.c_str(), value.size()); ! // } ! // ! // void MarieDataSonar::readFrom(istream &in) ! // { ! // throw new GeneralException("readFrom not supported. Use the MarieLoad Node to read data from the stream.",__FILE__,__LINE__); ! // } ! // ! // void MarieDataSonar::copyDataAbstract(DataAbstract *data) ! // { ! // if (data) ! // { ! // DataSonar *my_data = dynamic_cast<DataSonar*>(data); ! // if (my_data) ! // { ! // //((DataSonar*)this)->operator=(*my_data); ! // this->DataSonar::operator=(*my_data); ! // } ! // else ! // { ! // throw new GeneralException(string("Unable to cast into DataSonar Abstract : ") + data->getID(),__FILE__,__LINE__); ! // } ! // } ! // } ! // } Index: MarieObject.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MarieObject.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MarieObject.cpp 30 May 2004 12:34:07 -0000 1.1 --- MarieObject.cpp 12 Sep 2005 21:31:19 -0000 1.2 *************** *** 31,35 **** --- 31,90 ---- // + #include "MarieObject.h" + #include "MarieXMLDataFactory.h" + #include <string> + #include <iostream> + namespace marie { + MarieObject::MarieObject(DataAbstract *data) + : m_data(data) + { + + } + + void MarieObject::printOn(std::ostream &out) const + { + MarieXMLDataFactory factory; + + //writing XML data + std::string value = factory.toString((*m_data)); + + out.write(value.c_str(), value.size()); + } + + MarieObject::~MarieObject() + { + if (m_data != NULL) + { + delete m_data; + } + } + + DataAbstract* MarieObject::getData() + { + return(m_data); + } + + void MarieObject::readFrom(std::istream &in) + { + throw new FD::GeneralException("readFrom not supported for type : " + m_data->getID() + " Use the MariePull Node to read data from the stream.",__FILE__,__LINE__); + } + + // virtual void MarieObject::copyDataAbstract(DataAbstract *data) + // { + // if (data) + // { + // C *marieObjectPtr = dynamic_cast<C*>(data); + // if (marieObjectPtr) + // { + // this->C::operator=(*marieObjectPtr); + // } + // else + // { + // throw new GeneralException(string("Unable to cast into" + C::ID + " Abstract : ") + data->getID(),__FILE__,__LINE__); + // } + // } + // } + } Index: extractMarieCommandJoystick.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/extractMarieCommandJoystick.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** extractMarieCommandJoystick.cpp 29 Mar 2005 15:20:43 -0000 1.3 --- extractMarieCommandJoystick.cpp 12 Sep 2005 21:31:19 -0000 1.4 *************** *** 22,30 **** #include <sstream> #include <string> ! #include "MarieCommandJoystick.h" ! #include "MarieXMLDataFactory.h" ! #include "Behavior.h" ! #include "Vector.h" ! #include "MarieDataNull.h" using namespace std; --- 22,28 ---- #include <sstream> #include <string> ! #include "BufferedNode.h" ! #include "MarieObject.h" ! #include "CommandJoystick.h" using namespace std; *************** *** 33,49 **** namespace marie { ! //forward declaration ! class extractMarieCommandJoystick; ! ! DECLARE_NODE(extractMarieCommandJoystick) ! /*Node * * @name extractMarieCommandJoystick * @category RobotFlow:MARIE:COMMAND ! * @description Extract data in the FlowDesigner format from MarieCommandJoystick * * @input_name COMMAND_JOYSTICK ! * @input_type MarieCommandJoystick ! * @input_description The MarieCommandJoystick object * * @output_name X --- 31,47 ---- namespace marie { ! //forward declaration ! class extractMarieCommandJoystick; ! ! DECLARE_NODE(extractMarieCommandJoystick) ! /*Node * * @name extractMarieCommandJoystick * @category RobotFlow:MARIE:COMMAND ! * @description Extract data in the FlowDesigner format from MarieObject * * @input_name COMMAND_JOYSTICK ! * @input_type MarieObject ! * @input_description The MarieObject object containing a CommandJoystick * * @output_name X *************** *** 79,156 **** * @output_description output button state, nilObject if not used * ! END*/ ! ! ! using namespace std; ! ! class extractMarieCommandJoystick : public BufferedNode ! { ! ! private: ! ! //intputs ! int m_commandInID; ! ! //outputs ! int m_xOutID; ! int m_yOutID; ! int m_xminOutID; ! int m_yminOutID; ! int m_xmaxOutID; ! int m_ymaxOutID; ! int m_nbButtonsOutID; ! int m_buttonStateOutID; ! ! public: ! ! ! extractMarieCommandJoystick(string nodeName, ParameterSet params) ! : BufferedNode(nodeName,params) ! { ! //inputs ! m_commandInID = addInput("COMMAND_JOYSTICK"); ! //outputs ! m_xOutID = addOutput("X"); ! m_yOutID = addOutput("Y"); ! m_xminOutID = addOutput("XMIN"); ! m_yminOutID = addOutput("YMIN"); ! m_xmaxOutID = addOutput("XMAX"); ! m_ymaxOutID = addOutput("YMAX"); ! m_nbButtonsOutID = addOutput("NBBUTTONS"); ! m_buttonStateOutID = addOutput("BUTTONSTATE"); ! } ! ! void calculate(int output_id, int count, Buffer &out) ! { ! try ! { ! RCPtr<MarieCommandJoystick> command = getInput(m_commandInID,count); ! ! int x, y, xmin, ymin, xmax, ymax, nbButtons, buttonState = 0; ! ! command->getXY(x, y); ! command->getMinXY(xmin, ymin); ! command->getMaxXY(xmax, ymax); ! nbButtons = command->getNbButtons(); ! buttonState = command->getButtonState(); ! ! //output data ! (*outputs[m_xOutID].buffer)[count] = ObjectRef(Int::alloc(x)); ! (*outputs[m_yOutID].buffer)[count] = ObjectRef(Int::alloc(y)); ! (*outputs[m_xminOutID].buffer)[count] = ObjectRef(Int::alloc(xmin)); ! (*outputs[m_yminOutID].buffer)[count] = ObjectRef(Int::alloc(ymin)); ! (*outputs[m_xmaxOutID].buffer)[count] = ObjectRef(Int::alloc(xmax)); ! (*outputs[m_ymaxOutID].buffer)[count] = ObjectRef(Int::alloc(ymax)); ! (*outputs[m_nbButtonsOutID].buffer)[count] = ObjectRef(Int::alloc(nbButtons)); ! (*outputs[m_buttonStateOutID].buffer)[count] = ObjectRef(Int::alloc(buttonState)); } ! catch (BaseException *e) { ! e->print(cerr); ! e->add(new GeneralException("Unable to process",__FILE__,__LINE__)); ! throw e; } - } };//class extractMarieCommandJoystick }//namespace marie --- 77,160 ---- * @output_description output button state, nilObject if not used * ! END*/ ! ! using namespace std; ! ! class extractMarieCommandJoystick : public BufferedNode ! { ! ! private: ! ! //intputs ! int m_commandInID; ! //outputs ! int m_xOutID; ! int m_yOutID; ! int m_xminOutID; ! int m_yminOutID; ! int m_xmaxOutID; ! int m_ymaxOutID; ! int m_nbButtonsOutID; ! int m_buttonStateOutID; ! ! public: ! ! extractMarieCommandJoystick(string nodeName, ParameterSet params) ! : BufferedNode(nodeName,params) ! { ! //inputs ! m_commandInID = addInput("COMMAND_JOYSTICK"); ! ! //outputs ! m_xOutID = addOutput("X"); ! m_yOutID = addOutput("Y"); ! m_xminOutID = addOutput("XMIN"); ! m_yminOutID = addOutput("YMIN"); ! m_xmaxOutID = addOutput("XMAX"); ! m_ymaxOutID = addOutput("YMAX"); ! m_nbButtonsOutID = addOutput("NBBUTTONS"); ! m_buttonStateOutID = addOutput("BUTTONSTATE"); } ! ! void calculate(int output_id, int count, Buffer &out) { ! try ! { ! RCPtr<MarieObject> dataPtr = getInput(m_commandInID,count); ! CommandJoystick *commandJoystick = dynamic_cast<CommandJoystick*>(dataPtr->getData()); ! if (commandJoystick != NULL) ! { ! int x, y, xmin, ymin, xmax, ymax, nbButtons, buttonState = 0; ! ! commandJoystick->getXY(x, y); ! commandJoystick->getMinXY(xmin, ymin); ! commandJoystick->getMaxXY(xmax, ymax); ! nbButtons = commandJoystick->getNbButtons(); ! buttonState = commandJoystick->getButtonState(); ! ! //output data ! (*outputs[m_xOutID].buffer)[count] = ObjectRef(Int::alloc(x)); ! (*outputs[m_yOutID].buffer)[count] = ObjectRef(Int::alloc(y)); ! (*outputs[m_xminOutID].buffer)[count] = ObjectRef(Int::alloc(xmin)); ! (*outputs[m_yminOutID].buffer)[count] = ObjectRef(Int::alloc(ymin)); ! (*outputs[m_xmaxOutID].buffer)[count] = ObjectRef(Int::alloc(xmax)); ! (*outputs[m_ymaxOutID].buffer)[count] = ObjectRef(Int::alloc(ymax)); ! (*outputs[m_nbButtonsOutID].buffer)[count] = ObjectRef(Int::alloc(nbButtons)); ! (*outputs[m_buttonStateOutID].buffer)[count] = ObjectRef(Int::alloc(buttonState)); ! } ! else // commandJoystick == NULL ! { ! std::cerr << "FD::extractMarieCommandJoystick -> MarieObject received data not of CommandJoystick type" << std::endl; ! out[count] = nilObject; ! } ! } ! catch (BaseException *e) ! { ! e->print(cerr); ! e->add(new GeneralException("Unable to process",__FILE__,__LINE__)); ! throw e; ! } } };//class extractMarieCommandJoystick }//namespace marie Index: MarieDataOdometry.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MarieDataOdometry.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** MarieDataOdometry.cpp 7 Sep 2005 21:12:48 -0000 1.8 --- MarieDataOdometry.cpp 12 Sep 2005 21:31:19 -0000 1.9 *************** *** 28,78 **** using namespace FD; ! namespace marie ! { ! using namespace std; ! ! DECLARE_TYPE2(DataOdometry::ID,MarieDataOdometry) ! ! MarieDataOdometry::MarieDataOdometry() ! { ! ! } ! ! MarieDataOdometry::MarieDataOdometry (const DataOdometry &data) ! :DataOdometry(data) ! { ! ! } ! ! void MarieDataOdometry::printOn(ostream &out) const ! { ! MarieXMLDataFactory factory; ! ! //writing XML data ! string value = factory.toString((DataOdometry) (*this)); ! ! out.write(value.c_str(), value.size()); ! } ! ! void MarieDataOdometry::readFrom(istream &in) ! { ! throw new GeneralException("readFrom not supported. Use the MarieLoad Node to read data from the stream.",__FILE__,__LINE__); ! } ! ! void MarieDataOdometry::copyDataAbstract(DataAbstract *data) ! { ! if (data) ! { ! DataOdometry *my_data = dynamic_cast<DataOdometry*>(data); ! if (my_data) ! { ! //((DataOdometry*)this)->operator=(*my_data); ! this->DataOdometry::operator=(*my_data); ! } ! else ! { ! throw new GeneralException(string("Unable to cast into DataOdometry Abstract : ") + data->getID(),__FILE__,__LINE__); ! } ! } ! } ! } --- 28,78 ---- using namespace FD; ! // namespace marie ! // { ! // using namespace std; ! // ! // DECLARE_TYPE2(DataOdometry::ID,MarieDataOdometry) ! // ! // MarieDataOdometry::MarieDataOdometry() ! // { ! // ! // } ! // ! // MarieDataOdometry::MarieDataOdometry (const DataOdometry &data) ! // :DataOdometry(data) ! // { ! // ! // } ! // ! // void MarieDataOdometry::printOn(ostream &out) const ! // { ! // MarieXMLDataFactory factory; ! // ! // //writing XML data ! // string value = factory.toString((DataOdometry) (*this)); ! // ! // out.write(value.c_str(), value.size()); ! // } ! // ! // void MarieDataOdometry::readFrom(istream &in) ! // { ! // throw new GeneralException("readFrom not supported. Use the MarieLoad Node to read data from the stream.",__FILE__,__LINE__); ! // } ! // ! // void MarieDataOdometry::copyDataAbstract(DataAbstract *data) ! // { ! // if (data) ! // { ! // DataOdometry *my_data = dynamic_cast<DataOdometry*>(data); ! // if (my_data) ! // { ! // //((DataOdometry*)this)->operator=(*my_data); ! // this->DataOdometry::operator=(*my_data); ! // } ! // else ! // { ! // throw new GeneralException(string("Unable to cast into DataOdometry Abstract : ") + data->getID(),__FILE__,__LINE__); ! // } ! // } ! // } ! // } Index: MarieDataRaw.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MarieDataRaw.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** MarieDataRaw.cpp 7 Sep 2005 21:12:48 -0000 1.8 --- MarieDataRaw.cpp 12 Sep 2005 21:31:19 -0000 1.9 *************** *** 29,79 **** using namespace FD; ! namespace marie ! { ! DECLARE_TYPE2(DataRaw::ID,MarieDataRaw) ! ! using namespace std; ! ! MarieDataRaw::MarieDataRaw() ! { ! ! } ! ! MarieDataRaw::MarieDataRaw (const DataRaw &data) ! :DataRaw(data) ! { ! ! } ! ! void MarieDataRaw::printOn(ostream &out) const ! { ! MarieXMLDataFactory factory; ! ! //writing XML data ! string value = factory.toString((DataRaw) (*this)); ! ! out.write(value.c_str(), value.size()); ! } ! ! void MarieDataRaw::readFrom(istream &in) ! { ! throw new GeneralException("readFrom not supported. Use the MarieLoad Node to read data from the stream.",__FILE__,__LINE__); ! } ! ! void MarieDataRaw::copyDataAbstract(DataAbstract *data) ! { ! if (data) ! { ! DataRaw *my_data = dynamic_cast<DataRaw*>(data); ! if (my_data) ! { ! //((DataRaw*)this)->operator=(*my_data); ! this->DataRaw::operator=(*my_data); ! } ! else ! { ! throw new GeneralException(string("Unable to cast into DataRaw Abstract : ") + data->getID(),__FILE__,__LINE__); ! } ! } ! } ! } --- 29,79 ---- using namespace FD; ! // namespace marie ! // { ! // DECLARE_TYPE2(DataRaw::ID,MarieDataRaw) ! // ! // using namespace std; ! // ! // MarieDataRaw::MarieDataRaw() ! // { ! // ! // } ! // ! // MarieDataRaw::MarieDataRaw (const DataRaw &data) ! // :DataRaw(data) ! // { ! // ! // } ! // ! // void MarieDataRaw::printOn(ostream &out) const ! // { ! // MarieXMLDataFactory factory; ! // ! // //writing XML data ! // string value = factory.toString((DataRaw) (*this)); ! // ! // out.write(value.c_str(), value.size()); ! // } ! // ! // void MarieDataRaw::readFrom(istream &in) ! // { ! // throw new GeneralException("readFrom not supported. Use the MarieLoad Node to read data from the stream.",__FILE__,__LINE__); ! // } ! // ! // void MarieDataRaw::copyDataAbstract(DataAbstract *data) ! // { ! // if (data) ! // { ! // DataRaw *my_data = dynamic_cast<DataRaw*>(data); ! // if (my_data) ! // { ! // //((DataRaw*)this)->operator=(*my_data); ! // this->DataRaw::operator=(*my_data); ! // } ! // else ! // { ! // throw new GeneralException(string("Unable to cast into DataRaw Abstract : ") + data->getID(),__FILE__,__LINE__); ! // } ! // } ! // } ! // } Index: MarieCommandJoystick.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MarieCommandJoystick.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** MarieCommandJoystick.cpp 7 Sep 2005 21:12:48 -0000 1.8 --- MarieCommandJoystick.cpp 12 Sep 2005 21:31:19 -0000 1.9 *************** *** 31,78 **** { using namespace std; ! ! DECLARE_TYPE2(CommandJoystick::ID,MarieCommandJoystick) ! ! MarieCommandJoystick::MarieCommandJoystick() ! { ! ! } ! ! MarieCommandJoystick::MarieCommandJoystick (const CommandJoystick &command) ! :CommandJoystick(command) ! { ! ! } ! ! void MarieCommandJoystick::printOn(ostream &out) const ! { ! MarieXMLDataFactory factory; ! ! //writing XML data ! string value = factory.toString((CommandJoystick) (*this)); ! ! out.write(value.c_str(), value.size()); ! } ! ! void MarieCommandJoystick::readFrom(istream &in) ! { ! throw new GeneralException("readFrom not supported. Use the MarieLoad Node to read data from the stream.",__FILE__,__LINE__); ! } ! ! void MarieCommandJoystick::copyDataAbstract(DataAbstract *data) ! { ! if (data) ! { ! CommandJoystick *command = dynamic_cast<CommandJoystick*>(data); ! if (command) ! { ! //((CommandJoystick*)this)->operator=(*command); ! this->CommandJoystick::operator=(*command); ! } ! else ! { ! throw new GeneralException(string("Unable to cast into CommandJoystick Abstract : ") + data->getID(),__FILE__,__LINE__); ! } ! } ! } } --- 31,78 ---- { using namespace std; ! // ! // DECLARE_TYPE2(CommandJoystick::ID,MarieCommandJoystick) ! // ! // MarieCommandJoystick::MarieCommandJoystick() ! // { ! // ! // } ! // ! // MarieCommandJoystick::MarieCommandJoystick (const CommandJoystick &command) ! // :CommandJoystick(command) ! // { ! // ! // } ! // ! // void MarieCommandJoystick::printOn(ostream &out) const ! // { ! // MarieXMLDataFactory factory; ! // ! // //writing XML data ! // string value = factory.toString((CommandJoystick) (*this)); ! // ! // out.write(value.c_str(), value.size()); ! // } ! // ! // void MarieCommandJoystick::readFrom(istream &in) ! // { ! // throw new GeneralException("readFrom not supported. Use the MarieLoad Node to read data from the stream.",__FILE__,__LINE__); ! // } ! // ! // void MarieCommandJoystick::copyDataAbstract(DataAbstract *data) ! // { ! // if (data) ! // { ! // CommandJoystick *command = dynamic_cast<CommandJoystick*>(data); ! // if (command) ! // { ! // //((CommandJoystick*)this)->operator=(*command); ! // this->CommandJoystick::operator=(*command); ! // } ! // else ! // { ! // throw new GeneralException(string("Unable to cast into CommandJoystick Abstract : ") + data->getID(),__FILE__,__LINE__); ! // } ! // } ! // } } Index: extractMarieDataOdometry.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/extractMarieDataOdometry.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** extractMarieDataOdometry.cpp 29 Mar 2005 15:20:43 -0000 1.3 --- extractMarieDataOdometry.cpp 12 Sep 2005 21:31:19 -0000 1.4 *************** *** 22,30 **** #include <sstream> #include <string> ! #include "MarieDataOdometry.h" ! #include "MarieXMLDataFactory.h" ! #include "Behavior.h" ! #include "Vector.h" ! #include "MarieDataNull.h" using namespace std; --- 22,28 ---- #include <sstream> #include <string> ! #include "BufferedNode.h" ! #include "MarieObject.h" ! #include "DataOdometry.h" using namespace std; *************** *** 33,54 **** namespace marie { ! //forward declaration ! class extractMarieDataOdometry; ! ! DECLARE_NODE(extractMarieDataOdometry) ! /*Node * * @name extractMarieDataOdometry * @category RobotFlow:MARIE:DATA ! * @description Extract data in the FlowDesigner format from MarieDataOdometry * * @input_name DATA_ODOMETRY ! * @input_type MarieDataOdometry ! * @input_description MarieDataOdometry object * * @output_name XPOS * @output_description X axis position * @output_type int ! * * @output_name YPOS * @output_description Y axis position --- 31,52 ---- namespace marie { ! //forward declaration ! class extractMarieDataOdometry; ! ! DECLARE_NODE(extractMarieDataOdometry) ! /*Node * * @name extractMarieDataOdometry * @category RobotFlow:MARIE:DATA ! * @description Extract data in the FlowDesigner format from MarieObject * * @input_name DATA_ODOMETRY ! * @input_type MarieObject ! * @input_description input MarieObject object containing a DataOdometry * * @output_name XPOS * @output_description X axis position * @output_type int ! * * @output_name YPOS * @output_description Y axis position *************** *** 60,70 **** * * @output_name YAW ! * @output_description YAW angle * @output_type int * * @output_name PITCH ! * @output_description PITCH angle * @output_type int ! * * @output_name ROLL * @output_description ROLL angle --- 58,68 ---- * * @output_name YAW ! * @output_description YAW angle * @output_type int * * @output_name PITCH ! * @output_description PITCH angle * @output_type int ! * * @output_name ROLL * @output_description ROLL angle *************** *** 74,78 **** * @output_description linear speed (X-Y) * @output_type int ! * * @output_name SIDE_SPEED * @output_description translational speed (X-Y) --- 72,76 ---- * @output_description linear speed (X-Y) * @output_type int ! * * @output_name SIDE_SPEED * @output_description translational speed (X-Y) *************** *** 82,162 **** * @output_description rotation speed (X-Y) * @output_type int ! * ! END*/ ! ! ! using namespace std; ! ! class extractMarieDataOdometry : public BufferedNode ! { ! ! private: ! //intputs ! int m_dataOdometryID; ! ! //outputs ! int m_XposID; ! int m_YposID; ! int m_ZposID; ! int m_yawID; ! int m_pitchID; ! int m_rollID; ! int m_linSpeedID; ! int m_sideSpeedID; ! int m_rotSpeedID; ! ! public: ! ! ! extractMarieDataOdometry(string nodeName, ParameterSet params) ! : BufferedNode(nodeName,params) ! { ! //inputs ! m_dataOdometryID = addInput("DATA_ODOMETRY"); ! //outputs ! m_XposID = addOutput("XPOS"); ! m_YposID = addOutput("YPOS"); ! m_ZposID = addOutput("ZPOS"); ! m_yawID = addOutput("YAW"); ! m_pitchID = addOutput("PITCH"); ! m_rollID = addOutput("ROLL"); ! m_linSpeedID = addOutput("LINEAR_SPEED"); ! m_sideSpeedID = addOutput("SIDE_SPEED"); ! m_rotSpeedID = addOutput("ROTATION_SPEED"); ! } ! ! void calculate(int output_id, int count, Buffer &out) ! { ! try { ! //get input ! RCPtr<MarieDataOdometry> data = getInput(m_dataOdometryID,count); ! ! ! int x,y,z,yaw,pitch,roll, linspeed, sidespeed,rotspeed; ! data->getPosition(x,y,z); ! data->getOrientation(yaw,pitch,roll); ! data->getSpeed(linspeed,sidespeed,rotspeed); ! ! //output data ! (*outputs[m_XposID].buffer)[count] = ObjectRef(Int::alloc(x)); ! (*outputs[m_YposID].buffer)[count] = ObjectRef(Int::alloc(y)); ! (*outputs[m_ZposID].buffer)[count] = ObjectRef(Int::alloc(z)); ! (*outputs[m_yawID].buffer)[count] = ObjectRef(Int::alloc(yaw)); ! (*outputs[m_pitchID].buffer)[count] = ObjectRef(Int::alloc(pitch)); ! (*outputs[m_rollID].buffer)[count] = ObjectRef(Int::alloc(roll)); ! (*outputs[m_linSpeedID].buffer)[count] = ObjectRef(Int::alloc(linspeed)); ! (*outputs[m_sideSpeedID].buffer)[count] = ObjectRef(Int::alloc(sidespeed)); ! (*outputs[m_rotSpeedID].buffer)[count] = ObjectRef(Int::alloc(rotspeed)); } ! catch (BaseException *e) { ! e->print(cerr); ! e->add(new GeneralException("Unable to process",__FILE__,__LINE__)); ! throw e; } ! } ! };//class extractMarieDataOdometry }//namespace marie --- 80,166 ---- * @output_description rotation speed (X-Y) * @output_type int ! * ! END*/ ! ! using namespace std; ! ! class extractMarieDataOdometry : public BufferedNode ! { ! ! private: ! //intputs ! int m_dataOdometryID; ! //outputs ! int m_XposID; ! int m_YposID; ! int m_ZposID; ! int m_yawID; ! int m_pitchID; ! int m_rollID; ! int m_linSpeedID; ! int m_sideSpeedID; ! int m_rotSpeedID; ! ! public: ! ! extractMarieDataOdometry(string nodeName, ParameterSet params) ! : BufferedNode(nodeName,params) { ! //inputs ! m_dataOdometryID = addInput("DATA_ODOMETRY"); ! ! //outputs ! m_XposID = addOutput("XPOS"); ! m_YposID = addOutput("YPOS"); ! m_ZposID = addOutput("ZPOS"); ! m_yawID = addOutput("YAW"); ! m_pitchID = addOutput("PITCH"); ! m_rollID = addOutput("ROLL"); ! m_linSpeedID = addOutput("LINEAR_SPEED"); ! m_sideSpeedID = addOutput("SIDE_SPEED"); ! m_rotSpeedID = addOutput("ROTATION_SPEED"); } ! ! void calculate(int output_id, int count, Buffer &out) { ! try ! { ! //get input ! RCPtr<MarieObject> dataPtr = getInput(m_dataOdometryID,count); ! DataOdometry *dataOdometry = dynamic_cast<DataOdometry*>(dataPtr->getData()); ! if (dataOdometry != NULL) ! { ! ! int x,y,z,yaw,pitch,roll, linspeed, sidespeed,rotspeed; ! dataOdometry->getPosition(x,y,z); ! dataOdometry->getOrientation(yaw,pitch,roll); ! dataOdometry->getSpeed(linspeed,sidespeed,rotspeed); ! ! //output data ! (*outputs[m_XposID].buffer)[count] = ObjectRef(Int::alloc(x)); ! (*outputs[m_YposID].buffer)[count] = ObjectRef(Int::alloc(y)); ! (*outputs[m_ZposID].buffer)[count] = ObjectRef(Int::alloc(z)); ! (*outputs[m_yawID].buffer)[count] = ObjectRef(Int::alloc(yaw)); ! (*outputs[m_pitchID].buffer)[count] = ObjectRef(Int::alloc(pitch)); ! (*outputs[m_rollID].buffer)[count] = ObjectRef(Int::alloc(roll)); ! (*outputs[m_linSpeedID].buffer)[count] = ObjectRef(Int::alloc(linspeed)); ! (*outputs[m_sideSpeedID].buffer)[count] = ObjectRef(Int::alloc(sidespeed)); ! (*outputs[m_rotSpeedID].buffer)[count] = ObjectRef(Int::alloc(rotspeed)); ! } ! else ! { ! std::cerr << "FD::extractMarieDataOdometry -> MarieObject received data not of DataOdometry type" << std::endl; ! out[count] = nilObject; ! } ! } ! catch (BaseException *e) ! { ! e->print(cerr); ! e->add(new GeneralException("Unable to process",__FILE__,__LINE__)); ! throw e; ! } } ! };//class extractMarieDataOdometry }//namespace marie Index: extractMarieDataCamera.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/extractMarieDataCamera.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** extractMarieDataCamera.cpp 29 Mar 2005 15:20:43 -0000 1.3 --- extractMarieDataCamera.cpp 12 Sep 2005 21:31:19 -0000 1.4 *************** *** 22,30 **** #include <sstream> #include <string> ! #include "MarieDataCamera.h" ! #include "MarieXMLDataFactory.h" ! #include "Behavior.h" ! #include "Vector.h" ! #include "MarieDataNull.h" using namespace std; --- 22,28 ---- #include <sstream> #include <string> ! #include "BufferedNode.h" ! #include "MarieObject.h" ! #include "DataCamera.h" using namespace std; *************** *** 33,49 **** namespace marie { ! //forward declaration ! class extractMarieDataCamera; ! ! DECLARE_NODE(extractMarieDataCamera) ! /*Node * * @name extractMarieDataCamera * @category RobotFlow:MARIE:DATA ! * @description Extract data in the FlowDesigner format from MarieDataCamera * * @input_name DATA_CAMERA ! * @input_type MarieDataCamera ! * @input_description MarieDataCamera object * * @output_name PAN --- 31,47 ---- namespace marie { ! //forward declaration ! class extractMarieDataCamera; ! ! DECLARE_NODE(extractMarieDataCamera) ! /*Node * * @name extractMarieDataCamera * @category RobotFlow:MARIE:DATA ! * @description Extract data in the FlowDesigner format from MarieObject * * @input_name DATA_CAMERA ! * @input_type MarieObject ! * @input_description input MarieObject object containing a DataCamera * * @output_name PAN *************** *** 75,151 **** * @output_type Image * ! END*/ ! ! ! using namespace std; ! ! class extractMarieDataCamera : public BufferedNode ! { ! ! private: ! ! //inputs ! int m_inputID; ! ! //outputs ! int m_panID; ! int m_tiltID; ! int m_zoomID; ! int m_imageWidthID; ! int m_imageHeightID; ! int m_imageID; ! int m_imageFormatID; ! ! public: ! ! ! extractMarieDataCamera(string nodeName, ParameterSet params) ! : BufferedNode(nodeName,params) ! { //inputs ! m_inputID = addInput("DATA_CAMERA"); //outputs ! m_panID = addOutput("PAN"); ! m_tiltID = addOutput("TILT"); ! m_zoomID = addOutput("ZOOM"); ! m_imageWidthID = addOutput("IMAGE_WIDTH"); ! m_imageHeightID = addOutput("IMAGE_HEIGHT"); ! m_imageID = addOutput("IMAGE"); ! m_imageFormatID = addOutput("IMAGE_FORMAT"); ! } ! ! void calculate(int output_id, int count, Buffer &out) ! { ! try ! { ! RCPtr<MarieDataCamera> dataCameraObject = getInput(m_inputID,count); ! ! int pan, tilt, zoom; ! dataCameraObject->getPTZ(pan,tilt,zoom); ! unsigned int width,height; ! dataCameraObject->getImageSize(width,height); ! ! (*outputs[m_panID].buffer)[count] = ObjectRef(Int::alloc(pan)); ! (*outputs[m_tiltID].buffer)[count] = ObjectRef(Int::alloc(tilt)); ! (*outputs[m_zoomID].buffer)[count] = ObjectRef(Int::alloc(zoom)); ! ! (*outputs[m_imageWidthID].buffer)[count] = ObjectRef(Int::alloc(width)); ! (*outputs[m_imageHeightID].buffer)[count] = ObjectRef(Int::alloc(height)); ! ! (*outputs[m_imageFormatID].buffer)[count] = ObjectRef(new String(dataCameraObject->getImageFormat())); ! ! //TODO output image ! (*outputs[m_imageID].buffer)[count] = nilObject; } ! catch (BaseException *e) { ! e->print(cerr); ! e->add(new GeneralException("Unable to process",__FILE__,__LINE__)); ! throw e; } ! } ! };//class extractMarieDataCamera }//namespace marie - --- 73,154 ---- * @output_type Image * ! END*/ ! ! using namespace std; ! ! class extractMarieDataCamera : public BufferedNode ! { ! ! private: ! //inputs ! int m_inputID; //outputs ! int m_panID; ! int m_tiltID; ! int m_zoomID; ! int m_imageWidthID; ! int m_imageHeightID; ! int m_imageID; ! int m_imageFormatID; ! ! public: ! ! extractMarieDataCamera(string nodeName, ParameterSet params) ! : BufferedNode(nodeName,params) ! { ! //inputs ! m_inputID = addInput("DATA_CAMERA"); ! //outputs ! m_panID = addOutput("PAN"); ! m_tiltID = addOutput("TILT"); ! m_zoomID = addOutput("ZOOM"); ! m_imageWidthID = addOutput("IMAGE_WIDTH"); ! m_imageHeightID = addOutput("IMAGE_HEIGHT"); ! m_imageID = addOutput("IMAGE"); ! m_imageFormatID = addOutput("IMAGE_FORMAT"); } ! ! void calculate(int output_id, int count, Buffer &out) { ! try ! { ! RCPtr<MarieObject> dataPtr = getInput(m_inputID,count); ! DataCamera *dataCamera = dynamic_cast<DataCamera*>(dataPtr->getData()); ! if (dataCamera != NULL) ! { ! int pan, tilt, zoom; ! dataCamera->getPTZ(pan,tilt,zoom); ! ! unsigned int width,height; ! dataCamera->getImageSize(width,height); ! ! (*outputs[m_panID].buffer)[count] = ObjectRef(Int::alloc(pan)); ! (*outputs[m_tiltID].buffer)[count] = ObjectRef(Int::alloc(tilt)); ! (*outputs[m_zoomID].buffer)[count] = ObjectRef(Int::alloc(zoom)); ! ! (*outputs[m_imageWidthID].buffer)[count] = ObjectRef(Int::alloc(width)); ! (*outputs[m_imageHeightID].buffer)[count] = ObjectRef(Int::alloc(height)); ! ! (*outputs[m_imageFormatID].buffer)[count] = ObjectRef(new String(dataCamera->getImageFormat())); ! ! //TODO output image ! (*outputs[m_imageID].buffer)[count] = nilObject; ! } ! else ! { ! std::cerr << "FD::extractMarieDataCamera -> MarieObject received data not of DataCamera type" << std::endl; ! out[count] = nilObject; ! } ! } ! catch (BaseException *e) ! { ! e->print(cerr); ! e->add(new GeneralException("Unable to process",__FILE__,__LINE__)); ! throw e; ! } } ! };//class extractMarieDataCamera }//namespace marie Index: newMarieDataBumper.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/newMarieDataBumper.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** newMarieDataBumper.cpp 29 Mar 2005 15:20:43 -0000 1.3 --- newMarieDataBumper.cpp 12 Sep 2005 21:31:19 -0000 1.4 *************** *** 22,30 **** #include <sstream> #include <string> ! #include "MarieDataBumper.h" ! #include "MarieXMLDataFactory.h" ! #include "Behavior.h" ! #include "Vector.h" ! #include "MarieDataNull.h" using namespace std; --- 22,28 ---- #include <sstream> #include <string> ! #include "BufferedNode.h" ! #include "MarieObject.h" ! #include "DataBumper.h" using namespace std; *************** *** 33,111 **** namespace marie { ! //forward declaration ! class newMarieDataBumper; ! ! DECLARE_NODE(newMarieDataBumper) ! /*Node * * @name newMarieDataBumper * @category RobotFlow:MARIE:DATA ! * @description Create an object of type MarieDataBumper * * @input_name NBBUMPERS ! * @input_type int * @input_description input nb buttons, nilObject if not used * * @input_name BUMPERSTATE * @input_type int ! * @input_description input bumper state, nilObject if not used * * @output_name DATA_BUMPER ! * @output_type MarieDataBumper ! * @output_description Output DataBumper * ! END*/ ! ! ! using namespace std; ! ! class newMarieDataBumper : public BufferedNode ! { ! ! private: ! //inputs ! int m_nbBumpersInID; ! int m_bumperStateInID; ! ! //outputs ! int m_dataBumperOutID; ! ! public: ! ! ! newMarieDataBumper(string nodeName, ParameterSet params) ! : BufferedNode(nodeName,params) ! { //inputs ! m_nbBumpersInID = addInput("NBBUMPERS"); ! m_bumperStateInID = addInput("BUMPERSTATE"); //outputs ! m_dataBumperOutID = addOutput("DATA_BUMPER"); ! } ! ! void calculate(int output_id, int count, Buffer &out) ! { ! try ! { ! RCPtr<Int> nbBumpers = getInput(m_nbBumpersInID,count); ! RCPtr<Int> bumperState = getInput(m_bumperStateInID,count); ! MarieDataBumper *data = new MarieDataBumper(); ! ! //set the data ! data->setNbBumpers(*nbBumpers); ! data->setBumperState(*bumperState); ! ! //output object ! out[count] = ObjectRef(data); } ! catch (BaseException *e) { ! e->print(cerr); ! e->add(new GeneralException("Unable to process",__FILE__,__LINE__)); ! throw e; } ! } ! };//class newMarieDataBumper }//namespace marie - --- 31,106 ---- namespace marie { ! //forward declaration ! class newMarieDataBumper; ! ! DECLARE_NODE(newMarieDataBumper) ! /*Node * * @name newMarieDataBumper * @category RobotFlow:MARIE:DATA ! * @description Create an object of type MarieObject containing a DataBumper data * * @input_name NBBUMPERS ! * @input_type int * @input_description input nb buttons, nilObject if not used * * @input_name BUMPERSTATE * @input_type int ! * @input_description input bumper state, nilObject if not used * * @output_name DATA_BUMPER ! * @output_description Output MarieObject containing a DataBumper data ! * @output_type MarieObject * ! END*/ ! ! using namespace std; ! ! class newMarieDataBumper : public BufferedNode ! { ! ! private: //inputs ! int m_nbBumpersInID; ! int m_bumperStateInID; //outputs ! int m_dataBumperOutID; ! ! public: ! ! newMarieDataBumper(string nodeName, ParameterSet params) ! : BufferedNode(nodeName,params) ! { ! //inputs ! m_nbBumpersInID = addInput("NBBUMPERS"); ! m_bumperStateInID = addInput("BUMPERSTATE"); ! ! //outputs ! m_dataBumperOutID = addOutput("DATA_BUMPER"); } ! ! void calculate(int output_id, int count, Buffer &out) { ! try ! { ! RCPtr<Int> nbBumpers = getInput(m_nbBumpersInID,count); ! RCPtr<Int> bumperState = getInput(m_bumperStateInID,count); ! DataBumper *data = new DataBumper(); ! ! //set the data ! data->setNbBumpers(*nbBumpers); ! data->setBumperState(*bumperState); ! ! //output object ! out[count] = ObjectRef(new MarieObject(data)); ! } ! catch (BaseException *e) ! { ! e->print(cerr); ! e->add(new GeneralException("Unable to process",__FILE__,__LINE__)); ! throw e; ! } } ! };//class newMarieDataBumper }//namespace marie Index: MariePush.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MariePush.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** MariePush.cpp 29 Mar 2005 15:20:42 -0000 1.3 --- MariePush.cpp 12 Sep 2005 21:31:19 -0000 1.4 *************** *** 25,28 **** --- 25,29 ---- #include "operators.h" #include <sstream> + #include "MarieObject.h" #include "MarieXMLDataFactory.h" *************** *** 70,87 **** ObjectRef val = getInput(m_inputID,count); RCPtr<OStream> my_stream = ... [truncated message content] |
Update of /cvsroot/robotflow/RobotFlow/MARIE/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18474/include Modified Files: Makefile.am MarieCommandBehavior.h MarieCommandCamera.h MarieCommandJoystick.h MarieCommandMotor.h MarieDataBumper.h MarieDataCamera.h MarieDataIR.h MarieDataLaser.h MarieDataLocalisation.h MarieDataMap.h MarieDataNull.h MarieDataOdometry.h MarieDataRaw.h MarieDataSonar.h MarieObject.h MarieRequestSystem.h Log Message: Remove useless Flowdesigner types for MARIE. Add MarieObject as a dataAbstract container. Remove multiple inheritance. Index: MarieDataBumper.h =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MarieDataBumper.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** MarieDataBumper.h 7 Sep 2005 21:12:48 -0000 1.4 --- MarieDataBumper.h 12 Sep 2005 21:31:19 -0000 1.5 *************** *** 32,47 **** namespace marie { ! class MarieDataBumper : public MarieObject, public DataBumper { ! ! public: ! ! MarieDataBumper(); ! MarieDataBumper(const DataBumper &command); ! ! //from MarieObject ! virtual void printOn(std::ostream &out) const; ! virtual void readFrom(std::istream &in=std::cin); ! virtual void copyDataAbstract(DataAbstract *data); ! }; } #endif --- 32,47 ---- namespace marie { ! // class MarieDataBumper : public MarieObject, public DataBumper { ! // ! // public: ! // ! // MarieDataBumper(); ! // MarieDataBumper(const DataBumper &command); ! // ! // //from MarieObject ! // virtual void printOn(std::ostream &out) const; ! // virtual void readFrom(std::istream &in=std::cin); ! // virtual void copyDataAbstract(DataAbstract *data); ! // }; } #endif Index: MarieCommandMotor.h =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MarieCommandMotor.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** MarieCommandMotor.h 7 Sep 2005 21:12:48 -0000 1.4 --- MarieCommandMotor.h 12 Sep 2005 21:31:19 -0000 1.5 *************** *** 32,47 **** namespace marie { ! class MarieCommandMotor : public MarieObject, public CommandMotor { ! ! public: ! ! MarieCommandMotor(); ! MarieCommandMotor(const CommandMotor &command); ! ! //from MarieObject ! virtual void printOn(std::ostream &out) const; ! virtual void readFrom(std::istream &in=std::cin); ! virtual void copyDataAbstract(DataAbstract *data); ! }; } --- 32,47 ---- namespace marie { ! // class MarieCommandMotor : public MarieObject, public CommandMotor { ! // ! // public: ! // ! // MarieCommandMotor(); ! // MarieCommandMotor(const CommandMotor &command); ! // ! // //from MarieObject ! // virtual void printOn(std::ostream &out) const; ! // virtual void readFrom(std::istream &in=std::cin); ! // virtual void copyDataAbstract(DataAbstract *data); ! // }; } Index: MarieCommandJoystick.h =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MarieCommandJoystick.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** MarieCommandJoystick.h 7 Sep 2005 21:12:48 -0000 1.4 --- MarieCommandJoystick.h 12 Sep 2005 21:31:19 -0000 1.5 *************** *** 32,48 **** namespace marie { ! class MarieCommandJoystick : public MarieObject, public CommandJoystick { ! ! public: ! ! MarieCommandJoystick(); ! MarieCommandJoystick(const CommandJoystick &command); ! ! //from MarieObject ! virtual void printOn(std::ostream &out) const; ! virtual void readFrom(std::istream &in=std::cin); ! virtual void copyDataAbstract(DataAbstract *data); ! ! }; } #endif --- 32,48 ---- namespace marie { ! // class MarieCommandJoystick : public MarieObject, public CommandJoystick { ! // ! // public: ! // ! // MarieCommandJoystick(); ! // MarieCommandJoystick(const CommandJoystick &command); ! // ! // //from MarieObject ! // virtual void printOn(std::ostream &out) const; ! // virtual void readFrom(std::istream &in=std::cin); ! // virtual void copyDataAbstract(DataAbstract *data); ! // ! // }; } #endif Index: MarieCommandBehavior.h =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MarieCommandBehavior.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** MarieCommandBehavior.h 7 Sep 2005 21:12:48 -0000 1.6 --- MarieCommandBehavior.h 12 Sep 2005 21:31:19 -0000 1.7 *************** *** 31,47 **** namespace marie { ! class MarieCommandBehavior : public MarieObject, public CommandBehavior { ! ! public: ! ! MarieCommandBehavior(); ! MarieCommandBehavior(const CommandBehavior &command); ! ! //from MarieObject ! virtual void printOn(std::ostream &out) const; ! virtual void readFrom(std::istream &in=std::cin); ! virtual void copyDataAbstract(DataAbstract *data); ! ! }; } #endif --- 31,49 ---- namespace marie { ! // typedef MarieObject<CommandBehavior> MarieCommandBehavior; ! ! // class MarieCommandBehavior : public MarieObject, public CommandBehavior { ! // ! // public: ! // ! // MarieCommandBehavior(); ! // MarieCommandBehavior(const CommandBehavior &command); ! // ! // //from MarieObject ! // virtual void printOn(std::ostream &out) const; ! // virtual void readFrom(std::istream &in=std::cin); ! // virtual void copyDataAbstract(DataAbstract *data); ! // ! // }; } #endif Index: MarieObject.h =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MarieObject.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** MarieObject.h 7 Sep 2005 21:12:48 -0000 1.4 --- MarieObject.h 12 Sep 2005 21:31:19 -0000 1.5 *************** *** 38,50 **** #include "DataAbstract.h" - namespace marie { ! class MarieObject : public FD::Object{ public: MarieObject() {}; ! virtual void copyDataAbstract(DataAbstract *data) = 0; }; } --- 38,98 ---- #include "DataAbstract.h" namespace marie { ! class MarieObject : public FD::Object ! { public: MarieObject() {}; ! MarieObject(DataAbstract *data); ! ~MarieObject(); ! ! DataAbstract* getData(); ! ! virtual void printOn(std::ostream &out) const; ! virtual void readFrom(std::istream &in=std::cin); ! // virtual void copyDataAbstract(DataAbstract *data); ! ! ! protected: ! DataAbstract *m_data; ! // MarieObject(const C &marieObject) ! // : C(marieObject) ! // { ! // ! // } ! // ! // virtual void MarieObject::printOn(std::ostream &out) const ! // { ! // MarieXMLDataFactory factory; ! // ! // //writing XML data ! // string value = factory.toString((CommandBehavior) (*this)); ! // ! // out.write(value.c_str(), value.size()); ! // } ! // ! // virtual void readFrom(std::istream &in=std::cin) ! // { ! // throw new GeneralException("readFrom not supported for type : " + C::ID + " Use the MariePull Node to read data from the stream.",__FILE__,__LINE__); ! // } ! // ! // virtual void copyDataAbstract(DataAbstract *data) ! // { ! // if (data) ! // { ! // C *marieObjectPtr = dynamic_cast<C*>(data); ! // if (marieObjectPtr) ! // { ! // this->C::operator=(*marieObjectPtr); ! // } ! // else ! // { ! // throw new GeneralException(string("Unable to cast into" + C::ID + " Abstract : ") + data->getID(),__FILE__,__LINE__); ! // } ! // } ! // } ! }; } Index: MarieDataSonar.h =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MarieDataSonar.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** MarieDataSonar.h 7 Sep 2005 21:12:48 -0000 1.4 --- MarieDataSonar.h 12 Sep 2005 21:31:19 -0000 1.5 *************** *** 31,46 **** namespace marie { ! class MarieDataSonar : public MarieObject, public DataSonar { ! ! public: ! ! MarieDataSonar(); ! MarieDataSonar (const DataSonar &data); ! ! //from MarieObject ! virtual void printOn(std::ostream &out) const; ! virtual void readFrom(std::istream &in=std::cin); ! virtual void copyDataAbstract(DataAbstract *data); ! }; } #endif --- 31,46 ---- namespace marie { ! // class MarieDataSonar : public MarieObject, public DataSonar { ! // ! // public: ! // ! // MarieDataSonar(); ! // MarieDataSonar (const DataSonar &data); ! // ! // //from MarieObject ! // virtual void printOn(std::ostream &out) const; ! // virtual void readFrom(std::istream &in=std::cin); ! // virtual void copyDataAbstract(DataAbstract *data); ! // }; } #endif Index: MarieCommandCamera.h =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MarieCommandCamera.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** MarieCommandCamera.h 7 Sep 2005 21:12:48 -0000 1.5 --- MarieCommandCamera.h 12 Sep 2005 21:31:19 -0000 1.6 *************** *** 32,47 **** namespace marie { ! class MarieCommandCamera : public MarieObject, public CommandCamera { ! ! public: ! ! MarieCommandCamera(); ! MarieCommandCamera(const CommandCamera &command); ! ! //from MarieObject ! virtual void printOn(std::ostream &out) const; ! virtual void readFrom(std::istream &in=std::cin); ! virtual void copyDataAbstract(DataAbstract *data); ! }; } #endif --- 32,47 ---- namespace marie { ! // class MarieCommandCamera : public MarieObject, public CommandCamera { ! // ! // public: ! // ! // MarieCommandCamera(); ! // MarieCommandCamera(const CommandCamera &command); ! // ! // //from MarieObject ! // virtual void printOn(std::ostream &out) const; ! // virtual void readFrom(std::istream &in=std::cin); ! // virtual void copyDataAbstract(DataAbstract *data); ! // }; } #endif Index: MarieDataIR.h =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MarieDataIR.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** MarieDataIR.h 7 Sep 2005 21:12:48 -0000 1.4 --- MarieDataIR.h 12 Sep 2005 21:31:19 -0000 1.5 *************** *** 32,47 **** namespace marie { ! class MarieDataIR : public MarieObject, public DataIR { ! ! public: ! ! MarieDataIR(); ! MarieDataIR (const DataIR &data); ! ! //from MarieObject ! virtual void printOn(std::ostream &out) const; ! virtual void readFrom(std::istream &in=std::cin); ! virtual void copyDataAbstract(DataAbstract *data); ! }; } #endif --- 32,47 ---- namespace marie { ! // class MarieDataIR : public MarieObject, public DataIR { ! // ! // public: ! // ! // MarieDataIR(); ! // MarieDataIR (const DataIR &data); ! // ! // //from MarieObject ! // virtual void printOn(std::ostream &out) const; ! // virtual void readFrom(std::istream &in=std::cin); ! // virtual void copyDataAbstract(DataAbstract *data); ! // }; } #endif Index: MarieDataCamera.h =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MarieDataCamera.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** MarieDataCamera.h 7 Sep 2005 21:12:48 -0000 1.4 --- MarieDataCamera.h 12 Sep 2005 21:31:19 -0000 1.5 *************** *** 32,47 **** namespace marie { ! class MarieDataCamera : public MarieObject, public DataCamera { ! ! public: ! ! MarieDataCamera(); ! MarieDataCamera(const DataCamera &data); ! ! //from MarieObject ! virtual void printOn(std::ostream &out) const; ! virtual void readFrom(std::istream &in=std::cin); ! virtual void copyDataAbstract(DataAbstract *data); ! }; } #endif --- 32,47 ---- namespace marie { ! // class MarieDataCamera : public MarieObject, public DataCamera { ! // ! // public: ! // ! // MarieDataCamera(); ! // MarieDataCamera(const DataCamera &data); ! // ! // //from MarieObject ! // virtual void printOn(std::ostream &out) const; ! // virtual void readFrom(std::istream &in=std::cin); ! // virtual void copyDataAbstract(DataAbstract *data); ! // }; } #endif Index: MarieDataLaser.h =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MarieDataLaser.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** MarieDataLaser.h 7 Sep 2005 21:12:48 -0000 1.4 --- MarieDataLaser.h 12 Sep 2005 21:31:19 -0000 1.5 *************** *** 32,47 **** namespace marie { ! class MarieDataLaser : public MarieObject, public DataLaser { ! ! public: ! ! MarieDataLaser(); ! MarieDataLaser (const DataLaser &data); ! ! //from MarieObject ! virtual void printOn(std::ostream &out) const; ! virtual void readFrom(std::istream &in=std::cin); ! virtual void copyDataAbstract(DataAbstract *data); ! }; } #endif --- 32,47 ---- namespace marie { ! // class MarieDataLaser : public MarieObject, public DataLaser { ! // ! // public: ! // ! // MarieDataLaser(); ! // MarieDataLaser (const DataLaser &data); ! // ! // //from MarieObject ! // virtual void printOn(std::ostream &out) const; ! // virtual void readFrom(std::istream &in=std::cin); ! // virtual void copyDataAbstract(DataAbstract *data); ! // }; } #endif Index: MarieDataOdometry.h =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MarieDataOdometry.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** MarieDataOdometry.h 7 Sep 2005 21:12:48 -0000 1.4 --- MarieDataOdometry.h 12 Sep 2005 21:31:19 -0000 1.5 *************** *** 31,46 **** namespace marie { ! class MarieDataOdometry : public MarieObject, public DataOdometry { ! ! public: ! ! MarieDataOdometry(); ! MarieDataOdometry (const DataOdometry &data); ! ! //from MarieObject ! virtual void printOn(std::ostream &out) const; ! virtual void readFrom(std::istream &in=std::cin); ! virtual void copyDataAbstract(DataAbstract *data); ! }; } #endif --- 31,46 ---- namespace marie { ! // class MarieDataOdometry : public MarieObject, public DataOdometry { ! // ! // public: ! // ! // MarieDataOdometry(); ! // MarieDataOdometry (const DataOdometry &data); ! // ! // //from MarieObject ! // virtual void printOn(std::ostream &out) const; ! // virtual void readFrom(std::istream &in=std::cin); ! // virtual void copyDataAbstract(DataAbstract *data); ! // }; } #endif Index: MarieDataNull.h =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MarieDataNull.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** MarieDataNull.h 7 Sep 2005 21:12:48 -0000 1.4 --- MarieDataNull.h 12 Sep 2005 21:31:19 -0000 1.5 *************** *** 32,50 **** namespace marie { ! class MarieDataNull : public MarieObject, public DataNull { ! ! public: ! ! MarieDataNull(); ! MarieDataNull(const DataNull &command); ! ! //from MarieObject ! virtual void printOn(std::ostream &out) const; ! virtual void readFrom(std::istream &in=std::cin); ! virtual void copyDataAbstract(DataAbstract *data); ! ! //from Object ! virtual bool isNil() const {return true;} ! }; } #endif --- 32,50 ---- namespace marie { ! // class MarieDataNull : public MarieObject, public DataNull { ! // ! // public: ! // ! // MarieDataNull(); ! // MarieDataNull(const DataNull &command); ! // ! // //from MarieObject ! // virtual void printOn(std::ostream &out) const; ! // virtual void readFrom(std::istream &in=std::cin); ! // virtual void copyDataAbstract(DataAbstract *data); ! // ! // //from Object ! // virtual bool isNil() const {return true;} ! // }; } #endif Index: MarieDataLocalisation.h =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MarieDataLocalisation.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** MarieDataLocalisation.h 7 Sep 2005 21:12:48 -0000 1.4 --- MarieDataLocalisation.h 12 Sep 2005 21:31:19 -0000 1.5 *************** *** 32,47 **** namespace marie { ! class MarieDataLocalisation : public MarieObject, public DataLocalisation { ! ! public: ! ! MarieDataLocalisation(); ! MarieDataLocalisation(const DataLocalisation &command); ! ! //from MarieObject ! virtual void printOn(std::ostream &out) const; ! virtual void readFrom(std::istream &in=std::cin); ! virtual void copyDataAbstract(DataAbstract *data); ! }; } #endif --- 32,47 ---- namespace marie { ! // class MarieDataLocalisation : public MarieObject, public DataLocalisation { ! // ! // public: ! // ! // MarieDataLocalisation(); ! // MarieDataLocalisation(const DataLocalisation &command); ! // ! // //from MarieObject ! // virtual void printOn(std::ostream &out) const; ! // virtual void readFrom(std::istream &in=std::cin); ! // virtual void copyDataAbstract(DataAbstract *data); ! // }; } #endif Index: MarieRequestSystem.h =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MarieRequestSystem.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** MarieRequestSystem.h 7 Sep 2005 21:12:48 -0000 1.4 --- MarieRequestSystem.h 12 Sep 2005 21:31:19 -0000 1.5 *************** *** 32,47 **** namespace marie { ! class MarieRequestSystem : public MarieObject, public RequestSystem { ! ! public: ! ! MarieRequestSystem(); ! MarieRequestSystem (const RequestSystem &data); ! ! //from MarieObject ! virtual void printOn(std::ostream &out) const; ! virtual void readFrom(std::istream &in=std::cin); ! virtual void copyDataAbstract(DataAbstract *data); ! }; } #endif --- 32,47 ---- namespace marie { ! // class MarieRequestSystem : public MarieObject, public RequestSystem { ! // ! // public: ! // ! // MarieRequestSystem(); ! // MarieRequestSystem (const RequestSystem &data); ! // ! // //from MarieObject ! // virtual void printOn(std::ostream &out) const; ! // virtual void readFrom(std::istream &in=std::cin); ! // virtual void copyDataAbstract(DataAbstract *data); ! // }; } #endif Index: MarieDataRaw.h =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MarieDataRaw.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** MarieDataRaw.h 7 Sep 2005 21:12:48 -0000 1.4 --- MarieDataRaw.h 12 Sep 2005 21:31:19 -0000 1.5 *************** *** 32,47 **** namespace marie { ! class MarieDataRaw : public MarieObject, public DataRaw { ! ! public: ! ! MarieDataRaw(); ! MarieDataRaw (const DataRaw &data); ! ! //from MarieObject ! virtual void printOn(std::ostream &out) const; ! virtual void readFrom(std::istream &in=std::cin); ! virtual void copyDataAbstract(DataAbstract *data); ! }; } #endif --- 32,47 ---- namespace marie { ! // class MarieDataRaw : public MarieObject, public DataRaw { ! // ! // public: ! // ! // MarieDataRaw(); ! // MarieDataRaw (const DataRaw &data); ! // ! // //from MarieObject ! // virtual void printOn(std::ostream &out) const; ! // virtual void readFrom(std::istream &in=std::cin); ! // virtual void copyDataAbstract(DataAbstract *data); ! // }; } #endif Index: MarieDataMap.h =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MarieDataMap.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** MarieDataMap.h 7 Sep 2005 21:12:48 -0000 1.5 --- MarieDataMap.h 12 Sep 2005 21:31:19 -0000 1.6 *************** *** 31,46 **** namespace marie { ! class MarieDataMap : public MarieObject, public DataAssociativeMap { ! ! public: ! ! MarieDataMap(); ! MarieDataMap (const DataAssociativeMap &data); ! ! //from MarieObject ! virtual void printOn(std::ostream &out) const; ! virtual void readFrom(std::istream &in=std::cin); ! virtual void copyDataAbstract(DataAbstract *data); ! }; } #endif --- 31,46 ---- namespace marie { ! // class MarieDataMap : public MarieObject, public DataAssociativeMap { ! // ! // public: ! // ! // MarieDataMap(); ! // MarieDataMap (const DataAssociativeMap &data); ! // ! // //from MarieObject ! // virtual void printOn(std::ostream &out) const; ! // virtual void readFrom(std::istream &in=std::cin); ! // virtual void copyDataAbstract(DataAbstract *data); ! // }; } #endif Index: Makefile.am =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/Makefile.am,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** Makefile.am 7 Sep 2005 21:12:48 -0000 1.14 --- Makefile.am 12 Sep 2005 21:31:19 -0000 1.15 *************** *** 1,21 **** AUTOMAKE_OPTIONS = no-dependencies ! noinst_HEADERS = MarieCommandBehavior.h \ ! MarieCommandMotor.h \ ! MarieDataLaser.h \ ! MarieDataIR.h \ ! MarieDataBumper.h \ ! MarieDataSonar.h \ ! MarieDataNull.h \ ! MarieCommandCamera.h \ ! MarieDataCamera.h \ ! MarieDataOdometry.h \ ! MariePull.h \ MariePeek.h \ ! MariePush.h \ ! MarieDataRaw.h \ ! MarieCommandJoystick.h \ ! MarieDataMap.h \ ! MarieRequestSystem.h include_HEADERS = MarieObject.h \ --- 1,21 ---- AUTOMAKE_OPTIONS = no-dependencies ! noinst_HEADERS = MariePull.h \ MariePeek.h \ ! MariePush.h ! # MarieCommandBehavior.h \ ! # MarieCommandMotor.h \ ! # MarieDataLaser.h \ ! # MarieDataIR.h \ ! # MarieDataBumper.h \ ! # MarieDataSonar.h \ ! # MarieDataNull.h \ ! # MarieCommandCamera.h \ ! # MarieDataCamera.h \ ! # MarieDataOdometry.h \ ! # MarieDataRaw.h \ ! # MarieCommandJoystick.h \ ! # MarieDataMap.h \ ! # MarieRequestSystem.h include_HEADERS = MarieObject.h \ |
|
From: Carle C. <car...@us...> - 2005-09-12 13:17:41
|
Update of /cvsroot/robotflow/RobotFlow/MARIE/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24516/MARIE/src Modified Files: Makefile.am Added Files: newMarieDataNull.cpp Log Message: add newMarieDataNull Index: Makefile.am =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/Makefile.am,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** Makefile.am 7 Sep 2005 21:12:48 -0000 1.26 --- Makefile.am 12 Sep 2005 13:17:32 -0000 1.27 *************** *** 37,40 **** --- 37,41 ---- newMarieDataBumper.cpp \ newMarieDataMap.cpp \ + newMarieDataNull.cpp \ newMarieRequestSystem.cpp \ newMarieCommandBehavior.cpp \ --- NEW FILE: newMarieDataNull.cpp --- /* * MARIE - Mobile and Autonomous Robotics Integration Environment * Copyright (C) 2004 Dominic Letourneau * * 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 "MarieObject.h" #include "MarieDataNull.h" #include "BufferedNode.h" #include <sstream> #include <string> using namespace std; using namespace FD; namespace marie { class newMarieDataNull; DECLARE_NODE(newMarieDataNull) /*Node * * @name newMarieDataNull * @category RobotFlow:MARIE:DATA * @description Create an object of type MarieObject containing a DataNull data * * @output_name DATA_NULL * @output_description Output MarieObject containing a DataNull data * @output_type MarieObject * END*/ using namespace std; class newMarieDataNull : public BufferedNode { private: int m_outputID; public: newMarieDataNull(string nodeName, ParameterSet params) : BufferedNode(nodeName,params) { //outputs m_outputID = addOutput("DATA_NULL"); } void calculate(int output_id, int count, Buffer &out) { //create new DataNull MarieDataNull *dNull = new MarieDataNull(); out[count] = ObjectRef(dNull); } };//class newMarieDataNull }//namespace marie |
|
From: Carle C. <car...@us...> - 2005-09-12 13:16:35
|
Update of /cvsroot/robotflow/RobotFlow/MARIE/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24362/MARIE/src Modified Files: extractMarieRequestSystem.cpp newMarieRequestSystem.cpp Log Message: change getID method call for the newest methods Index: newMarieRequestSystem.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/newMarieRequestSystem.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** newMarieRequestSystem.cpp 7 Sep 2005 21:12:48 -0000 1.7 --- newMarieRequestSystem.cpp 12 Sep 2005 13:16:27 -0000 1.8 *************** *** 111,115 **** request->setCommand(*commandString); request->setData(*dataString); ! request->setID(*requestID); request->setState(*stateString); --- 111,115 ---- request->setCommand(*commandString); request->setData(*dataString); ! request->setRequestID(*requestID); request->setState(*stateString); Index: extractMarieRequestSystem.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/extractMarieRequestSystem.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** extractMarieRequestSystem.cpp 7 Sep 2005 21:12:48 -0000 1.4 --- extractMarieRequestSystem.cpp 12 Sep 2005 13:16:27 -0000 1.5 *************** *** 98,102 **** (*outputs[m_commandID].buffer)[count] = ObjectRef(new String(request->getCommand())); (*outputs[m_dataID].buffer)[count] = ObjectRef(new String(request->getData())); ! (*outputs[m_requestIDID].buffer)[count] = ObjectRef(Int::alloc(request->getID())); (*outputs[m_stateID].buffer)[count] = ObjectRef(new String(request->getState())); } --- 98,102 ---- (*outputs[m_commandID].buffer)[count] = ObjectRef(new String(request->getCommand())); (*outputs[m_dataID].buffer)[count] = ObjectRef(new String(request->getData())); ! (*outputs[m_requestIDID].buffer)[count] = ObjectRef(Int::alloc(request->getRequestID())); (*outputs[m_stateID].buffer)[count] = ObjectRef(new String(request->getState())); } |
|
From: Dominic L. <ma...@us...> - 2005-09-08 11:57:26
|
Update of /cvsroot/robotflow/RobotFlow/MARIE/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv389 Removed Files: MarieLoad.cpp MarieSave.cpp Log Message: unused --- MarieLoad.cpp DELETED --- --- MarieSave.cpp DELETED --- |
Update of /cvsroot/robotflow/RobotFlow/MARIE/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19723/src Modified Files: Makefile.am MarieCommandBehavior.cpp MarieCommandCamera.cpp MarieCommandJoystick.cpp MarieCommandMotor.cpp MarieDataBumper.cpp MarieDataCamera.cpp MarieDataIR.cpp MarieDataLaser.cpp MarieDataLocalisation.cpp MarieDataMap.cpp MarieDataNull.cpp MarieDataOdometry.cpp MarieDataRaw.cpp MarieDataSonar.cpp MarieRequestSystem.cpp extractMarieRequestSystem.cpp newMarieCommandBehavior.cpp newMarieCommandCamera.cpp newMarieDataMap.cpp newMarieRequestSystem.cpp Log Message: remove useless inheritance of BuffuredNode by MarieObject Index: MarieDataCamera.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MarieDataCamera.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** MarieDataCamera.cpp 22 Aug 2005 21:21:07 -0000 1.7 --- MarieDataCamera.cpp 7 Sep 2005 21:12:48 -0000 1.8 *************** *** 30,178 **** namespace marie { ! DECLARE_NODE(MarieDataCamera) ! /*Node ! * ! * @name MarieDataCamera ! * @category RobotFlow:MARIE:zdeprecated ! * @description Save an object ! * ! * @input_name DATA_CAMERA ! * @input_type MarieDataCamera ! * @input_description MarieDataCamera Object ! * ! * @output_name PAN ! * @output_description Pan of the camera ! * @output_type int ! * ! * @output_name TILT ! * @output_description Tilt of the camera ! * @output_type int ! * ! * @output_name ZOOM ! * @output_description Zoom of the camera ! * @output_type int ! * ! * @output_name IMAGE_WIDTH ! * @output_description image width from the camera ! * @output_type int ! * ! * @output_name IMAGE_HEIGHT ! * @output_description image height from the camera ! * @output_type int ! * ! * @output_name IMAGE_FORMAT ! * @output_description format of the image ! * @output_type string ! * ! * @output_name IMAGE ! * @output_description the image data ! * @output_type Image ! * ! END*/ ! ! DECLARE_TYPE2(DataCamera::ID,MarieDataCamera) ! ! using namespace std; ! ! MarieDataCamera::MarieDataCamera() ! : MarieObject("MarieDataCamera",ParameterSet()), m_isNode(false) ! { ! ! } ! ! MarieDataCamera::MarieDataCamera (const DataCamera &data) ! : MarieObject("MarieDataCamera",ParameterSet()), DataCamera(data), ! m_isNode(false) ! { ! } ! ! MarieDataCamera::MarieDataCamera(string nodeName, ParameterSet params) ! : MarieObject(nodeName,params), m_isNode(true) ! { ! //used as a BufferedNode, create inputs & outputs ! ! //inputs ! m_inputID = addInput("DATA_CAMERA"); ! ! //outputs ! m_panID = addOutput("PAN"); ! m_tiltID = addOutput("TILT"); ! m_zoomID = addOutput("ZOOM"); ! m_imageWidthID = addOutput("IMAGE_WIDTH"); ! m_imageHeightID = addOutput("IMAGE_HEIGHT"); ! m_imageID = addOutput("IMAGE"); ! m_imageFormatID = addOutput("IMAGE_FORMAT"); ! ! } ! ! 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; ! dataCameraObject->getPTZ(pan,tilt,zoom); ! ! unsigned int width,height; ! dataCameraObject->getImageSize(width,height); ! ! (*outputs[m_panID].buffer)[count] = ObjectRef(Int::alloc(pan)); ! (*outputs[m_tiltID].buffer)[count] = ObjectRef(Int::alloc(tilt)); ! (*outputs[m_zoomID].buffer)[count] = ObjectRef(Int::alloc(zoom)); ! ! (*outputs[m_imageWidthID].buffer)[count] = ObjectRef(Int::alloc(width)); ! (*outputs[m_imageHeightID].buffer)[count] = ObjectRef(Int::alloc(height)); ! ! (*outputs[m_imageFormatID].buffer)[count] = ObjectRef(new String(dataCameraObject->getImageFormat())); ! ! //TODO output image ! (*outputs[m_imageID].buffer)[count] = nilObject; ! } ! else ! { ! out[count] = nilObject; ! } ! } ! ! void MarieDataCamera::printOn(ostream &out) const ! { ! MarieXMLDataFactory factory; ! ! //writing XML data ! string value = factory.toString((DataCamera) (*this)); ! ! out.write(value.c_str(), value.size()); ! ! } ! ! ! void MarieDataCamera::readFrom(istream &in) ! { ! throw new GeneralException("readFrom not supported. Use the MarieLoad Node to read data from the stream.",__FILE__,__LINE__); ! } ! ! void MarieDataCamera::copyDataAbstract(DataAbstract *data) ! { ! ! if (data) ! { ! DataCamera *my_data = dynamic_cast<DataCamera*>(data); ! if (my_data) ! { ! //((DataCamera*)this)->operator=(*my_data); ! this->DataCamera::operator=(*my_data); ! } ! else ! { ! throw new GeneralException(string("Unable to cast into DataCamera Abstract : ") + data->getID(),__FILE__,__LINE__); ! } ! } ! ! ! } } --- 30,78 ---- namespace marie { ! DECLARE_TYPE2(DataCamera::ID,MarieDataCamera) ! using namespace std; ! ! MarieDataCamera::MarieDataCamera() ! { ! } ! ! MarieDataCamera::MarieDataCamera (const DataCamera &data) ! : DataCamera(data) ! { ! ! } ! ! void MarieDataCamera::printOn(ostream &out) const ! { ! MarieXMLDataFactory factory; ! ! //writing XML data ! string value = factory.toString((DataCamera) (*this)); ! ! out.write(value.c_str(), value.size()); ! } ! ! void MarieDataCamera::readFrom(istream &in) ! { ! throw new GeneralException("readFrom not supported. Use the MarieLoad Node to read data from the stream.",__FILE__,__LINE__); ! } ! ! void MarieDataCamera::copyDataAbstract(DataAbstract *data) ! { ! if (data) ! { ! DataCamera *my_data = dynamic_cast<DataCamera*>(data); ! if (my_data) ! { ! //((DataCamera*)this)->operator=(*my_data); ! this->DataCamera::operator=(*my_data); ! } ! else ! { ! throw new GeneralException(string("Unable to cast into DataCamera Abstract : ") + data->getID(),__FILE__,__LINE__); ! } ! } ! } } Index: MarieDataMap.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MarieDataMap.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** MarieDataMap.cpp 22 Aug 2005 21:21:07 -0000 1.6 --- MarieDataMap.cpp 7 Sep 2005 21:12:48 -0000 1.7 *************** *** 31,156 **** namespace marie { ! DECLARE_NODE(MarieDataMap) ! /*Node ! * ! * @name MarieDataMap ! * @category RobotFlow:MARIE:zdeprecated ! * @description Read MARIE data maps ! * ! * @input_name DATA_MAP ! * @input_type MarieDataMap ! * @input_description MarieDataMap Object ! * ! * @output_name COMPOSITE ! * @output_description FlowDesigner CompositeType object (equivalent to DataMap) ! * @output_type CompositeType ! * ! END*/ ! ! DECLARE_TYPE2(DataAssociativeMap::ID,MarieDataMap) ! ! using namespace std; ! ! MarieDataMap::MarieDataMap() ! : MarieObject("MarieDataMap",ParameterSet()), m_isNode(false) ! { ! ! } ! ! MarieDataMap::MarieDataMap (const DataAssociativeMap &data) ! : MarieObject("MarieDataMap",ParameterSet()), DataAssociativeMap(data), ! m_isNode(false) ! { ! } ! ! MarieDataMap::MarieDataMap(string nodeName, ParameterSet params) ! : MarieObject(nodeName,params), m_isNode(true) ! { ! //used as a BufferedNode, create inputs & outputs ! ! //inputs ! m_inputID = addInput("DATA_MAP"); ! ! //outputs ! m_outputID = addOutput("COMPOSITE"); ! ! } ! ! void MarieDataMap::calculate(int output_id, int count, Buffer &out) ! { ! ! ObjectRef InputValue = getInput(m_inputID,count); ! if (m_isNode && !InputValue->isNil()) ! { ! RCPtr<MarieDataMap> dataMapObject = InputValue; ! ! const std::map<std::string, std::string> my_map = dataMapObject->getValues(); ! ! CompositeType *cType = new CompositeType(); ! ! for (map<string,string>::const_iterator iter = my_map.begin(); ! iter != my_map.end(); iter++) { ! ! stringstream key((*iter).first); ! stringstream value((*iter).second); ! ! try { ! //try to read FlowDesigner object ! ObjectRef ObjectValue; ! ! value >> ObjectValue; ! ! cType->addField(key.str(), ObjectValue); ! } ! catch(...) { ! //unable to read FlowDesigner Object ! //output standard string ! ObjectRef ObjectValue(new String(value.str())); ! cType->addField(key.str(),ObjectValue); ! } ! } ! ! //output Composite type ! out[count] = ObjectRef(cType); ! } ! else ! { ! out[count] = nilObject; ! } ! } ! ! void MarieDataMap::printOn(ostream &out) const ! { ! MarieXMLDataFactory factory; ! ! //writing XML data ! string value = factory.toString((DataAssociativeMap) (*this)); ! ! out.write(value.c_str(), value.size()); ! ! } ! ! ! void MarieDataMap::readFrom(istream &in) ! { ! throw new GeneralException("readFrom not supported. Use the MarieLoad Node to read data from the stream.",__FILE__,__LINE__); ! } ! ! void MarieDataMap::copyDataAbstract(DataAbstract *data) ! { ! if (data) ! { ! DataAssociativeMap *my_data = dynamic_cast<DataAssociativeMap*>(data); ! if (my_data) ! { ! this->DataAssociativeMap::operator=(*my_data); ! } ! else ! { ! throw new GeneralException(string("Unable to cast into DataAssociativeMap Abstract : ") + data->getID(),__FILE__,__LINE__); ! } ! } ! } } --- 31,78 ---- namespace marie { ! DECLARE_TYPE2(DataAssociativeMap::ID,MarieDataMap) ! using namespace std; ! ! MarieDataMap::MarieDataMap() ! { ! } ! ! MarieDataMap::MarieDataMap (const DataAssociativeMap &data) ! :DataAssociativeMap(data) ! { ! ! } ! ! void MarieDataMap::printOn(ostream &out) const ! { ! MarieXMLDataFactory factory; ! ! //writing XML data ! string value = factory.toString((DataAssociativeMap) (*this)); ! ! out.write(value.c_str(), value.size()); ! } ! ! void MarieDataMap::readFrom(istream &in) ! { ! throw new GeneralException("readFrom not supported. Use the MarieLoad Node to read data from the stream.",__FILE__,__LINE__); ! } ! ! void MarieDataMap::copyDataAbstract(DataAbstract *data) ! { ! if (data) ! { ! DataAssociativeMap *my_data = dynamic_cast<DataAssociativeMap*>(data); ! if (my_data) ! { ! this->DataAssociativeMap::operator=(*my_data); ! } ! else ! { ! throw new GeneralException(string("Unable to cast into DataAssociativeMap Abstract : ") + data->getID(),__FILE__,__LINE__); ! } ! } ! } } Index: Makefile.am =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/Makefile.am,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** Makefile.am 27 Jun 2005 17:43:20 -0000 1.25 --- Makefile.am 7 Sep 2005 21:12:48 -0000 1.26 *************** *** 9,14 **** lib_LTLIBRARIES = libRFMarie.la ! libRFMarie_la_SOURCES = MarieLoad.cpp \ ! MarieSave.cpp \ MariePull.cpp \ MariePush.cpp \ --- 9,13 ---- lib_LTLIBRARIES = libRFMarie.la ! libRFMarie_la_SOURCES = \ MariePull.cpp \ MariePush.cpp \ Index: newMarieCommandCamera.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/newMarieCommandCamera.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** newMarieCommandCamera.cpp 28 Jun 2005 20:40:32 -0000 1.5 --- newMarieCommandCamera.cpp 7 Sep 2005 21:12:48 -0000 1.6 *************** *** 20,23 **** --- 20,24 ---- */ #include "MarieCommandCamera.h" + #include "BufferedNode.h" #include "MarieDataNull.h" #include <sstream> Index: MarieDataIR.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MarieDataIR.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** MarieDataIR.cpp 22 Aug 2005 21:21:07 -0000 1.5 --- MarieDataIR.cpp 7 Sep 2005 21:12:48 -0000 1.6 *************** *** 31,140 **** namespace marie { ! DECLARE_NODE(MarieDataIR) ! /*Node ! * ! * @name MarieDataIR ! * @category RobotFlow:MARIE:zdeprecated ! * @description Save an object ! * ! * @input_name DATA_IR ! * @input_type MarieDataIR ! * @input_description MarieDataIR object ! * ! * @output_name RANGES ! * @output_description Range contained in the MarieDataIR object ! * @output_type Vector<int> ! * ! END*/ ! ! DECLARE_TYPE2(DataIR::ID,MarieDataIR) ! ! using namespace std; ! ! MarieDataIR::MarieDataIR() ! : MarieObject("MarieDataIR",ParameterSet()), m_isNode(false) ! { ! ! } ! ! MarieDataIR::MarieDataIR (const DataIR &data) ! : MarieObject("MarieDataIR",ParameterSet()), DataIR(data), ! m_isNode(false) ! { ! ! } ! ! MarieDataIR::MarieDataIR(string nodeName, ParameterSet params) ! : MarieObject(nodeName,params), m_isNode(true) ! { ! //used as a BufferedNode, create inputs & outputs ! m_inputID = addInput("DATA_IR"); ! m_outputID = addOutput("RANGES"); ! } ! ! void MarieDataIR::calculate(int output_id, int count, Buffer &out) ! { ! ! ObjectRef InputValue = getInput(m_inputID,count); ! ! if (m_isNode && !InputValue->isNil()) ! { ! RCPtr<MarieDataIR> dataIRObject = InputValue; ! ! unsigned int size = dataIRObject->getNbIR(); ! const unsigned int *ranges = dataIRObject->getRanges(); ! ! //copy range data into a vector ! Vector<int> *vect = Vector<int>::alloc(size); ! ! for (unsigned int i = 0; i < size; i++) ! { ! (*vect)[i] = (int) ranges[i]; ! } ! ! //output vector ! out[count] = ObjectRef(vect); ! } ! else ! { ! out[count] = nilObject; ! } ! } ! ! void MarieDataIR::printOn(ostream &out) const ! { ! MarieXMLDataFactory factory; ! ! //writing XML data ! string value = factory.toString((DataIR) (*this)); ! ! out.write(value.c_str(), value.size()); ! ! } ! ! ! void MarieDataIR::readFrom(istream &in) ! { ! throw new GeneralException("readFrom not supported. Use the MarieLoad Node to read data from the stream.",__FILE__,__LINE__); ! } ! ! void MarieDataIR::copyDataAbstract(DataAbstract *data) ! { ! ! if (data) ! { ! DataIR *my_data = dynamic_cast<DataIR*>(data); ! if (my_data) ! { ! //((DataIR*)this)->operator=(*my_data); ! this->DataIR::operator=(*my_data); ! } ! else ! { ! throw new GeneralException(string("Unable to cast into DataIR Abstract : ") + data->getID(),__FILE__,__LINE__); ! } ! } ! ! } } --- 31,80 ---- namespace marie { ! DECLARE_TYPE2(DataIR::ID,MarieDataIR) ! ! using namespace std; ! ! MarieDataIR::MarieDataIR() ! { ! } ! ! MarieDataIR::MarieDataIR (const DataIR &data) ! :DataIR(data) ! { ! ! } ! ! void MarieDataIR::printOn(ostream &out) const ! { ! MarieXMLDataFactory factory; ! ! //writing XML data ! string value = factory.toString((DataIR) (*this)); ! ! out.write(value.c_str(), value.size()); ! } ! ! ! void MarieDataIR::readFrom(istream &in) ! { ! throw new GeneralException("readFrom not supported. Use the MarieLoad Node to read data from the stream.",__FILE__,__LINE__); ! } ! ! void MarieDataIR::copyDataAbstract(DataAbstract *data) ! { ! if (data) ! { ! DataIR *my_data = dynamic_cast<DataIR*>(data); ! if (my_data) ! { ! //((DataIR*)this)->operator=(*my_data); ! this->DataIR::operator=(*my_data); ! } ! else ! { ! throw new GeneralException(string("Unable to cast into DataIR Abstract : ") + data->getID(),__FILE__,__LINE__); ! } ! } ! } } Index: newMarieRequestSystem.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/newMarieRequestSystem.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** newMarieRequestSystem.cpp 29 Mar 2005 15:20:43 -0000 1.6 --- newMarieRequestSystem.cpp 7 Sep 2005 21:12:48 -0000 1.7 *************** *** 20,23 **** --- 20,24 ---- */ #include "MarieRequestSystem.h" + #include "BufferedNode.h" #include <sstream> #include <string> Index: MarieCommandCamera.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MarieCommandCamera.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** MarieCommandCamera.cpp 22 Aug 2005 21:35:01 -0000 1.11 --- MarieCommandCamera.cpp 7 Sep 2005 21:12:48 -0000 1.12 *************** *** 31,439 **** namespace marie { ! DECLARE_NODE(MarieCommandCamera) ! /*Node ! * ! * @name MarieCommandCamera ! * @category RobotFlow:MARIE:zdeprecated ! * @description Read & Create MarieCommandCamera data object ! * ! * @input_name COMMAND_CAMERA ! * @input_type Input MarieCommandCamera ! * @input_description input CommandCamera, nilObject if not used ! * ! * @input_name REL_BRIGHTNESS ! * @input_type int ! * @input_description input brightness, nilObject if not used ! * ! * @input_name REL_CONTRAST ! * @input_type int ! * @input_description input contrast, nilObject if not used ! * ! * @input_name REL_PAN ! * @input_type int ! * @input_description input pan, nilObject if not used ! * ! * @input_name REL_TILT ! * @input_type int ! * @input_description input tilt, nilObject if not used ! * ! * @input_name REL_ZOOM ! * @input_type int ! * @input_description input zoom, nilObject if not used ! * ! * @input_name ABS_BRIGHTNESS ! * @input_type int ! * @input_description input brightness, nilObject if not used ! * ! * @input_name ABS_CONTRAST ! * @input_type int ! * @input_description input contrast, nilObject if not used ! * ! * @input_name ABS_PAN ! * @input_type int ! * @input_description input pan, nilObject if not used ! * ! * @input_name ABS_TILT ! * @input_type int ! * @input_description input tilt, nilObject if not used ! * ! * @input_name ABS_ZOOM ! * @input_type int ! * @input_description input zoom, nilObject if not used ! * ! * @output_name COMMAND_CAMERA ! * @output_type MarieCommandCamera ! * @output_description Output CommandCamera (with new pan,tilt,zoom, brightness, contrast) ! * ! * @output_name REL_BRIGHTNESS ! * @output_type int ! * @output_description output brightness ! * ! * @output_name REL_CONTRAST ! * @output_type int ! * @output_description output contrast ! * ! * @output_name REL_PAN ! * @output_type int ! * @output_description output pan ! * ! * @output_name REL_TILT ! * @output_type int ! * @output_description output tilt ! * ! * @output_name REL_ZOOM ! * @output_type int ! * @output_description output zoom ! * ! * @output_name ABS_BRIGHTNESS ! * @output_type int ! * @output_description output brightness ! * ! * @output_name ABS_CONTRAST ! * @output_type int ! * @output_description output contrast ! * ! * @output_name ABS_PAN ! * @output_type int ! * @output_description output pan ! * ! * @output_name ABS_TILT ! * @output_type int ! * @output_description output tilt ! * ! * @output_name ABS_ZOOM ! * @output_type int ! * @output_description output zoom ! * ! END*/ ! ! ! using namespace std; ! ! DECLARE_TYPE2(CommandCamera::ID,MarieCommandCamera) ! ! MarieCommandCamera::MarieCommandCamera() ! : MarieObject("MarieCommandCamera",ParameterSet()), m_isNode(false) ! { ! ! } ! ! MarieCommandCamera::MarieCommandCamera (const CommandCamera &command) ! : MarieObject("MarieCommandCamera",ParameterSet()), CommandCamera(command), ! m_isNode(false) ! { ! ! } ! ! MarieCommandCamera::MarieCommandCamera(string nodeName, ParameterSet params) ! : MarieObject(nodeName,params), m_isNode(true) ! { ! //used as a BufferedNode, create inputs & outputs ! ! //inputs ! m_commandInID = addInput("COMMAND_CAMERA"); ! m_relBrightnessInID = addInput("REL_BRIGHTNESS"); ! m_relContrastInID = addInput("REL_CONTRAST"); ! m_relPanInID = addInput("REL_PAN"); ! m_relTiltInID = addInput("REL_TILT"); ! m_relZoomInID = addInput("REL_ZOOM"); ! ! m_absBrightnessInID = addInput("ABS_BRIGHTNESS"); ! m_absContrastInID = addInput("ABS_CONTRAST"); ! m_absPanInID = addInput("ABS_PAN"); ! m_absTiltInID = addInput("ABS_TILT"); ! m_absZoomInID = addInput("ABS_ZOOM"); ! ! //outputs ! m_commandOutID = addOutput("COMMAND_CAMERA"); ! m_relBrightnessOutID = addOutput("REL_BRIGHTNESS"); ! m_relContrastOutID = addOutput("REL_CONTRAST"); ! m_relPanOutID = addOutput("REL_PAN"); ! m_relTiltOutID = addOutput("REL_TILT"); ! m_relZoomOutID = addOutput("REL_ZOOM"); ! ! m_absBrightnessOutID = addOutput("ABS_BRIGHTNESS"); ! m_absContrastOutID = addOutput("ABS_CONTRAST"); ! m_absPanOutID = addOutput("ABS_PAN"); ! m_absTiltOutID = addOutput("ABS_TILT"); ! m_absZoomOutID = addOutput("ABS_ZOOM"); ! } ! ! void MarieCommandCamera::calculate(int output_id, int count, Buffer &out) ! { ! if (m_isNode) ! { ! MarieCommandCamera *command = NULL; ! int relPan = 0; ! int relTilt = 0; ! int relZoom = 0; ! int relContrast = 0; ! int relBrightness = 0; ! int absPan = 0; ! int absTilt = 0; ! int absZoom = 0; ! int absContrast = 0; ! int absBrightness = 0; ! ! std::bitset<10> state; ! ! //get all inputs ! ObjectRef commandInValue = getInput(m_commandInID,count); ! ObjectRef relBrightnessInValue = getInput(m_relBrightnessInID,count); ! ObjectRef relContrastInValue = getInput(m_relContrastInID,count); ! ObjectRef relPanInValue = getInput(m_relPanInID,count); ! ObjectRef relTiltInValue = getInput(m_relTiltInID,count); ! ObjectRef relZoomInValue = getInput(m_relZoomInID,count); ! ObjectRef absBrightnessInValue = getInput(m_absBrightnessInID,count); ! ObjectRef absContrastInValue = getInput(m_absContrastInID,count); ! ObjectRef absPanInValue = getInput(m_absPanInID,count); ! ObjectRef absTiltInValue = getInput(m_absTiltInID,count); ! ObjectRef absZoomInValue = getInput(m_absZoomInID,count); ! //create command object ! if (!commandInValue->isNil()) { ! RCPtr<MarieCommandCamera> inputCommand = commandInValue; ! //copy input command ! command = new MarieCommandCamera(*inputCommand); ! ! relPan = command->getRelativePan(); ! relTilt = command->getRelativeTilt(); ! relZoom = command->getRelativeZoom(); ! relContrast = command->getRelativeContrast(); ! relBrightness = command->getRelativeBrightness(); ! ! absPan = command->getAbsolutePan(); ! absTilt = command->getAbsoluteTilt(); ! absZoom = command->getAbsoluteZoom(); ! absContrast = command->getAbsoluteContrast(); ! absBrightness = command->getAbsoluteBrightness(); ! } else { ! if (!relBrightnessInValue->isNil() || !relContrastInValue->isNil() || ! !relPanInValue->isNil() || !relTiltInValue->isNil() || !relZoomInValue->isNil() || ! !absBrightnessInValue->isNil() || !absContrastInValue->isNil() || ! !absPanInValue->isNil() || !absTiltInValue->isNil() || !absZoomInValue->isNil()) ! ! ! { ! command = new MarieCommandCamera(); ! ! //get pan ! if (!relPanInValue->isNil()) ! { ! RCPtr<Int> relPanPtr = relPanInValue; ! relPan = *relPanPtr; ! command->setRelativePan(relPan); ! } ! //get tilt ! if (!relTiltInValue->isNil()) ! { ! RCPtr<Int> relTiltPtr = relTiltInValue; ! relTilt = *relTiltPtr; ! command->setRelativeTilt(relTilt); ! } ! //get zoom ! if (!relZoomInValue->isNil()) ! { ! RCPtr<Int> relZoomPtr = relZoomInValue; ! relZoom = *relZoomPtr; ! command->setRelativeZoom(relZoom); ! } ! //get contrast ! if (!relContrastInValue->isNil()) ! { ! RCPtr<Int> relContrastPtr = relContrastInValue; ! relContrast = *relContrastPtr; ! command->setRelativeContrast(relContrast); ! } ! //get brightness ! if (!relBrightnessInValue->isNil()) ! { ! RCPtr<Int> relBrightnessPtr = relBrightnessInValue; ! relBrightness = *relBrightnessPtr; ! command->setRelativeBrightness(relBrightness); ! } ! ! //get pan ! if (!absPanInValue->isNil()) ! { ! RCPtr<Int> absPanPtr = absPanInValue; ! absPan = *absPanPtr; ! command->setAbsolutePan(absPan); ! } ! //get tilt ! if (!absTiltInValue->isNil()) ! { ! RCPtr<Int> absTiltPtr = absTiltInValue; ! absTilt = *absTiltPtr; ! command->setAbsoluteTilt(absTilt); ! } ! //get zoom ! if (!absZoomInValue->isNil()) ! { ! RCPtr<Int> absZoomPtr = absZoomInValue; ! absZoom = *absZoomPtr; ! command->setAbsoluteZoom(absZoom); ! } ! //get contrast ! if (!absContrastInValue->isNil()) ! { ! RCPtr<Int> absContrastPtr = absContrastInValue; ! absContrast = *absContrastPtr; ! command->setAbsoluteContrast(absContrast); ! } ! //get brightness ! if (!absBrightnessInValue->isNil()) ! { ! RCPtr<Int> absBrightnessPtr = absBrightnessInValue; ! absBrightness = *absBrightnessPtr; ! command->setAbsoluteBrightness(absBrightness); ! } ! } } - - - - //set PTZ - if (command) - { - state = command->getState(); - //output values - (*outputs[m_commandOutID].buffer)[count] = ObjectRef(command); - - - if(state[CommandCamera::REL_PAN] == 1) - { - (*outputs[m_relPanOutID].buffer)[count] = ObjectRef(Int::alloc(relPan)); - } - else if(state[CommandCamera::REL_PAN] == 0) - { - (*outputs[m_relPanOutID].buffer)[count] = nilObject; - } - - if(state[CommandCamera::REL_TILT] == 1) - (*outputs[m_relTiltOutID].buffer)[count] = ObjectRef(Int::alloc(relTilt)); - else - (*outputs[m_relTiltOutID].buffer)[count] = nilObject; - - if(state[CommandCamera::REL_ZOOM] == 1) - (*outputs[m_relZoomOutID].buffer)[count] = ObjectRef(Int::alloc(relZoom)); - else - (*outputs[m_relZoomOutID].buffer)[count] = nilObject; - - if(state[CommandCamera::REL_BRIGHTNESS] == 1) - (*outputs[m_relBrightnessOutID].buffer)[count] = ObjectRef(Int::alloc(relBrightness)); - else - (*outputs[m_relBrightnessOutID].buffer)[count] = nilObject; - - if(state[CommandCamera::REL_CONTRAST] == 1) - (*outputs[m_relContrastOutID].buffer)[count] = ObjectRef(Int::alloc(relContrast)); - else - (*outputs[m_relContrastOutID].buffer)[count] = nilObject; - - if(state[CommandCamera::ABS_PAN] == 1) - (*outputs[m_absPanOutID].buffer)[count] = ObjectRef(Int::alloc(absPan)); - else - (*outputs[m_absPanOutID].buffer)[count] = nilObject; - - if(state[CommandCamera::ABS_TILT] == 1) - (*outputs[m_absTiltOutID].buffer)[count] = ObjectRef(Int::alloc(absTilt)); - else - (*outputs[m_absTiltOutID].buffer)[count] = nilObject; - - if(state[CommandCamera::ABS_ZOOM] == 1) - (*outputs[m_absZoomOutID].buffer)[count] = ObjectRef(Int::alloc(absZoom)); - else - (*outputs[m_absZoomOutID].buffer)[count] = nilObject; - - if(state[CommandCamera::ABS_BRIGHTNESS] == 1) - (*outputs[m_absBrightnessOutID].buffer)[count] = ObjectRef(Int::alloc(absBrightness)); - else - (*outputs[m_absBrightnessOutID].buffer)[count] = nilObject; - - if(state[CommandCamera::ABS_CONTRAST] == 1) - (*outputs[m_absContrastOutID].buffer)[count] = ObjectRef(Int::alloc(absContrast)); - else - (*outputs[m_absContrastOutID].buffer)[count] = nilObject; - } - else - { - //output values - (*outputs[m_relBrightnessOutID].buffer)[count] = nilObject; - (*outputs[m_commandOutID].buffer)[count] = nilObject; - (*outputs[m_relContrastOutID].buffer)[count] = nilObject; - (*outputs[m_relPanOutID].buffer)[count] = nilObject; - (*outputs[m_relTiltOutID].buffer)[count] = nilObject; - (*outputs[m_relZoomOutID].buffer)[count] = nilObject; - (*outputs[m_absBrightnessOutID].buffer)[count] = nilObject; - (*outputs[m_absContrastOutID].buffer)[count] = nilObject; - (*outputs[m_absPanOutID].buffer)[count] = nilObject; - (*outputs[m_absTiltOutID].buffer)[count] = nilObject; - (*outputs[m_absZoomOutID].buffer)[count] = nilObject; - } } ! else ! { ! out[count] = nilObject; ! } ! } ! ! void MarieCommandCamera::printOn(ostream &out) const ! { ! MarieXMLDataFactory factory; ! ! //writing XML data ! string value = factory.toString((CommandCamera) (*this)); ! ! out.write(value.c_str(), value.size()); ! ! } ! ! ! void MarieCommandCamera::readFrom(istream &in) ! { ! throw new GeneralException("readFrom not supported. Use the MarieLoad Node to read data from the stream.",__FILE__,__LINE__); ! } ! ! void MarieCommandCamera::copyDataAbstract(DataAbstract *data) ! { ! ! if (data) ! { ! CommandCamera *command = dynamic_cast<CommandCamera*>(data); ! if (command) ! { ! //((CommandCamera*)this)->operator=(*command); ! this->CommandCamera::operator=(*command); ! } ! else ! { ! throw new GeneralException(string("Unable to cast into CommandCamera Abstract : ") + data->getID(),__FILE__,__LINE__); ! } ! } ! ! } } --- 31,79 ---- namespace marie { ! using namespace std; ! ! DECLARE_TYPE2(CommandCamera::ID,MarieCommandCamera) ! ! MarieCommandCamera::MarieCommandCamera() ! { ! } ! ! MarieCommandCamera::MarieCommandCamera (const CommandCamera &command) ! :CommandCamera(command) ! { ! ! } ! ! void MarieCommandCamera::printOn(ostream &out) const ! { ! MarieXMLDataFactory factory; ! ! //writing XML data ! string value = factory.toString((CommandCamera) (*this)); ! ! out.write(value.c_str(), value.size()); ! } ! ! void MarieCommandCamera::readFrom(istream &in) ! { ! throw new GeneralException("readFrom not supported. Use the MarieLoad Node to read data from the stream.",__FILE__,__LINE__); ! } ! ! void MarieCommandCamera::copyDataAbstract(DataAbstract *data) ! { ! if (data) ! { ! CommandCamera *command = dynamic_cast<CommandCamera*>(data); ! if (command) { ! //((CommandCamera*)this)->operator=(*command); ! this->CommandCamera::operator=(*command); } else { ! throw new GeneralException(string("Unable to cast into CommandCamera Abstract : ") + data->getID(),__FILE__,__LINE__); } } ! } } Index: MarieCommandMotor.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MarieCommandMotor.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** MarieCommandMotor.cpp 22 Aug 2005 21:35:01 -0000 1.9 --- MarieCommandMotor.cpp 7 Sep 2005 21:12:48 -0000 1.10 *************** *** 30,198 **** namespace marie { ! DECLARE_NODE(MarieCommandMotor) ! /*Node ! * ! * @name MarieCommandMotor ! * @category RobotFlow:MARIE:zdeprecated ! * @description Save an object ! * ! * @input_name COMMAND_MOTOR ! * @input_type MarieCommandMotor ! * @input_description CommandMotor data structure input ! * ! * @input_name VELOCITY ! * @input_type int ! * @input_description input velocity ! * ! * @input_name ROTATION ! * @input_type int ! * @input_description input rotation ! * ! * @output_name COMMAND_MOTOR ! * @output_type MarieCommandMotor ! * @output_description CommandMotor data structure output ! * ! * @output_name VELOCITY ! * @output_type int ! * @output_description output velocity ! * ! * @output_name ROTATION ! * @output_type int ! * @output_description output rotation ! * ! END*/ ! ! ! using namespace std; ! ! DECLARE_TYPE2(CommandMotor::ID,MarieCommandMotor) ! ! ! MarieCommandMotor::MarieCommandMotor() ! : MarieObject("MarieCommandMotor",ParameterSet()), m_isNode(false) ! { ! ! } ! ! MarieCommandMotor::MarieCommandMotor (const CommandMotor &command) ! : MarieObject("MarieCommandMotor",ParameterSet()), CommandMotor(command), m_isNode(false) ! { ! ! } ! ! MarieCommandMotor::MarieCommandMotor(string nodeName, ParameterSet params) ! : MarieObject(nodeName,params), m_isNode(true) ! { ! //used as a BufferedNode, create inputs & outputs ! ! //inputs ! m_commandInID = addInput("COMMAND_MOTOR"); ! m_velocityInID = addInput("VELOCITY"); ! m_rotationInID = addInput("ROTATION"); ! ! //outputs ! m_commandOutID = addOutput("COMMAND_MOTOR"); ! m_velocityOutID = addOutput("VELOCITY"); ! m_rotationOutID = addOutput("ROTATION"); ! } ! ! void MarieCommandMotor::calculate(int output_id, int count, Buffer &out) ! { ! if (m_isNode) ! { ! MarieCommandMotor *command = NULL; ! int velocity = 0; ! int rotation = 0; ! ! //get all inputs ! ObjectRef commandInValue = getInput(m_commandInID,count); ! ObjectRef velocityInValue = getInput(m_velocityInID,count); ! ObjectRef rotationInValue = getInput(m_rotationInID,count); ! ! //initialize new CommandMotor ! if(!commandInValue->isNil()) ! { ! RCPtr<MarieCommandMotor> commandPtr = commandInValue; ! command = new MarieCommandMotor(*commandPtr); ! velocity = command->getVelocity(); ! rotation = command->getRotation(); ! } ! else ! { ! if (!velocityInValue->isNil() && !rotationInValue->isNil()) ! { ! command = new MarieCommandMotor(); ! } ! } ! ! //get velocity ! if (!velocityInValue->isNil()) ! { ! RCPtr<Int> velocityPtr = velocityInValue; ! velocity = *velocityPtr; ! } ! ! //get rotation ! if (!rotationInValue->isNil()) ! { ! RCPtr<Int> rotationPtr = rotationInValue; ! rotation = *rotationPtr; ! } ! ! ! //set new rotation & velocity ! if (command) ! { ! command->setVelocity(velocity); ! command->setRotation(rotation); ! (*outputs[m_commandOutID].buffer)[count] = ObjectRef(command); ! (*outputs[m_velocityOutID].buffer)[count] = ObjectRef(Int::alloc(velocity)); ! (*outputs[m_rotationOutID].buffer)[count] = ObjectRef(Int::alloc(rotation)); ! } ! else ! { ! (*outputs[m_commandOutID].buffer)[count] = nilObject; ! (*outputs[m_velocityOutID].buffer)[count] = nilObject; ! (*outputs[m_rotationOutID].buffer)[count] = nilObject; ! } ! } ! else //not a node... ! { ! out[count] = nilObject; ! } ! } ! ! void MarieCommandMotor::printOn(ostream &out) const ! { ! MarieXMLDataFactory factory; ! ! //writing XML data ! string value = factory.toString((CommandMotor) (*this)); ! ! out.write(value.c_str(), value.size()); ! } ! ! ! void MarieCommandMotor::readFrom(istream &in) ! { ! throw new GeneralException("readFrom not supported. Use the MarieLoad Node to read data from the stream.",__FILE__,__LINE__); ! } ! ! void MarieCommandMotor::copyDataAbstract(DataAbstract *data) ! { ! if (data) ! { ! CommandMotor *command = dynamic_cast<CommandMotor*>(data); ! if (command) ! { ! //((CommandMotor*)this)->operator=(*command); ! this->CommandMotor::operator=(*command); ! } ! else ! { ! throw new GeneralException(string("Unable to cast into CommanMotor Abstract : ") + data->getID(),__FILE__,__LINE__); ! } ! } ! } } --- 30,79 ---- namespace marie { ! using namespace std; ! ! DECLARE_TYPE2(CommandMotor::ID,MarieCommandMotor) ! ! ! MarieCommandMotor::MarieCommandMotor() ! { ! } ! ! MarieCommandMotor::MarieCommandMotor (const CommandMotor &command) ! :CommandMotor(command) ! { ! ! } ! ! void MarieCommandMotor::printOn(ostream &out) const ! { ! MarieXMLDataFactory factory; ! ! //writing XML data ! string value = factory.toString((CommandMotor) (*this)); ! ! out.write(value.c_str(), value.size()); ! } ! ! void MarieCommandMotor::readFrom(istream &in) ! { ! throw new GeneralException("readFrom not supported. Use the MarieLoad Node to read data from the stream.",__FILE__,__LINE__); ! } ! ! void MarieCommandMotor::copyDataAbstract(DataAbstract *data) ! { ! if (data) ! { ! CommandMotor *command = dynamic_cast<CommandMotor*>(data); ! if (command) ! { ! //((CommandMotor*)this)->operator=(*command); ! this->CommandMotor::operator=(*command); ! } ! else ! { ! throw new GeneralException(string("Unable to cast into CommanMotor Abstract : ") + data->getID(),__FILE__,__LINE__); ! } ! } ! } } Index: MarieDataSonar.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MarieDataSonar.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** MarieDataSonar.cpp 22 Aug 2005 21:21:07 -0000 1.7 --- MarieDataSonar.cpp 7 Sep 2005 21:12:48 -0000 1.8 *************** *** 31,137 **** namespace marie { ! DECLARE_NODE(MarieDataSonar) ! /*Node ! * ! * @name MarieDataSonar ! * @category RobotFlow:MARIE:zdeprecated ! * @description Save an object ! * ! * @input_name DATA_SONAR ! * @input_type MarieDataLaser ! * @input_description MarieDataLaser object ! * ! * @output_name RANGES ! * @output_description Range contained in the MarieDataSonar object ! * @output_type Vector<int> ! * ! END*/ ! ! DECLARE_TYPE2(DataSonar::ID,MarieDataSonar) ! ! using namespace std; ! ! MarieDataSonar::MarieDataSonar() ! : MarieObject("MarieDataSonar",ParameterSet()), m_isNode(false) ! { ! ! } ! ! MarieDataSonar::MarieDataSonar (const DataSonar &data) ! : MarieObject("MarieDataSonar",ParameterSet()), DataSonar(data), ! m_isNode(false) ! { ! ! } ! ! MarieDataSonar::MarieDataSonar(string nodeName, ParameterSet params) ! : MarieObject(nodeName,params), m_isNode(true) ! { ! //used as a BufferedNode, create inputs & outputs ! m_inputID = addInput("DATA_SONAR"); ! m_rangeID = addOutput("RANGES"); ! } ! ! 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(); ! const unsigned int *ranges = sonarObject->getRanges(); ! ! //copy range data into a vector ! Vector<int> *vect = Vector<int>::alloc(size); ! ! for (unsigned int i = 0; i < size; i++) ! { ! (*vect)[i] = (int) ranges[i]; ! } ! ! //output vector ! out[count] = ObjectRef(vect); ! } ! else ! { ! out[count] = nilObject; ! } ! } ! ! void MarieDataSonar::printOn(ostream &out) const ! { ! MarieXMLDataFactory factory; ! ! //writing XML data ! string value = factory.toString((DataSonar) (*this)); ! ! out.write(value.c_str(), value.size()); ! } ! ! ! void MarieDataSonar::readFrom(istream &in) ! { ! throw new GeneralException("readFrom not supported. Use the MarieLoad Node to read data from the stream.",__FILE__,__LINE__); ! } ! ! void MarieDataSonar::copyDataAbstract(DataAbstract *data) { ! ! if (data) ! { ! DataSonar *my_data = dynamic_cast<DataSonar*>(data); ! if (my_data) ! { ! //((DataSonar*)this)->operator=(*my_data); ! this->DataSonar::operator=(*my_data); ! } ! else ! { ! throw new GeneralException(string("Unable to cast into DataSonar Abstract : ") + data->getID(),__FILE__,__LINE__); ! } ! } ! ! } } --- 31,79 ---- namespace marie { ! DECLARE_TYPE2(DataSonar::ID,MarieDataSonar) ! ! using namespace std; ! ! MarieDataSonar::MarieDataSonar() ! { ! } ! ! MarieDataSonar::MarieDataSonar (const DataSonar &data) ! :DataSonar(data) ! { ! ! } ! ! void MarieDataSonar::printOn(ostream &out) const ! { ! MarieXMLDataFactory factory; ! ! //writing XML data ! string value = factory.toString((DataSonar) (*this)); ! ! out.write(value.c_str(), value.size()); ! } ! ! void MarieDataSonar::readFrom(istream &in) ! { ! throw new GeneralException("readFrom not supported. Use the MarieLoad Node to read data from the stream.",__FILE__,__LINE__); ! } ! ! void MarieDataSonar::copyDataAbstract(DataAbstract *data) ! { ! if (data) ! { ! DataSonar *my_data = dynamic_cast<DataSonar*>(data); ! if (my_data) ! { ! //((DataSonar*)this)->operator=(*my_data); ! this->DataSonar::operator=(*my_data); ! } ! else ! { ! throw new GeneralException(string("Unable to cast into DataSonar Abstract : ") + data->getID(),__FILE__,__LINE__); ! } ! } ! } } Index: newMarieDataMap.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/newMarieDataMap.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** newMarieDataMap.cpp 29 Mar 2005 15:20:43 -0000 1.4 --- newMarieDataMap.cpp 7 Sep 2005 21:12:48 -0000 1.5 *************** *** 20,23 **** --- 20,24 ---- */ #include "MarieDataMap.h" + #include "BufferedNode.h" #include <sstream> #include <string> Index: MarieCommandBehavior.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MarieCommandBehavior.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** MarieCommandBehavior.cpp 22 Aug 2005 21:35:01 -0000 1.9 --- MarieCommandBehavior.cpp 7 Sep 2005 21:12:48 -0000 1.10 *************** *** 33,208 **** namespace marie { ! DECLARE_NODE(MarieCommandBehavior) ! /*Node ! * ! * @name MarieCommandBehavior ! * @category RobotFlow:MARIE:zdeprecated ! * @description Save an object ! * ! * @input_name BEHAVIOR_COMMAND ! * @input_type MarieCommandBehavior ! * @input_description Input BehaviorCommand data object ! * ! * @input_name BEHAVIOR_NAME ! * @input_type String ! * @input_description The behavior name that will be activated/deactivated ! * ! * @input_name BEHAVIOR_ACTIVATION ! * @input_type Bool ! * @input_description true if the specified behavior is activated ! * ! * @input_name BEHAVIOR_RESULTS ! * @input_type String ! * @input_description Results in string format separated by space ! * ! * @output_name BEHAVIOR_COMMAND ! * @output_description Output BehaviorCommand data object ! * @output_type MarieCommandBahavior ! * ! * @output_name ROBOTFLOW_ACTIVATION ! * @output_description RobotFlow activation vector ! * @output_type Vector<int> ! * ! * @output_name ROBOTFLOW_EXPLOITATION ! * @output_description RobotFlow exploitation vector ! * @output_type Vector<int> ! * ! END*/ ! ! ! using namespace std; ! ! DECLARE_TYPE2(CommandBehavior::ID,MarieCommandBehavior) ! ! MarieCommandBehavior::MarieCommandBehavior() ! : MarieObject("MarieCommandBehavior",ParameterSet()), m_isNode(false) ! { ! ! } ! ! MarieCommandBehavior::MarieCommandBehavior (const CommandBehavior &command) ! : MarieObject("MarieCommandBehavior",ParameterSet()), CommandBehavior(command), ! m_isNode(false) ! { ! ! } ! ! MarieCommandBehavior::MarieCommandBehavior(string nodeName, ParameterSet params) ! : MarieObject(nodeName,params), m_isNode(true) ! { ! //used as a BufferedNode, create inputs & outputs ! ! //inputs ! m_commandInID = addInput("BEHAVIOR_COMMAND"); ! m_behaviorNameInID = addInput("BEHAVIOR_NAME"); ! m_behaviorActivationInID = addInput("BEHAVIOR_ACTIVATION"); ! m_behaviorExploitationInID = addInput("BEHAVIOR_EXPLOITATION"); ! m_behaviorResultsInID = addInput("BEHAVIOR_RESULTS"); ! ! //outputs ! m_commandOutID = addOutput("BEHAVIOR_COMMAND"); ! m_RobotFlowActivationOutID = addOutput("ROBOTFLOW_ACTIVATION"); ! } ! ! void MarieCommandBehavior::calculate(int output_id, int count, Buffer &out) ! { ! if (m_isNode) ! { ! MarieCommandBehavior *command = NULL; ! ! ObjectRef commandInValue = getInput(m_commandInID,count); ! ObjectRef behaviorNameValue = getInput(m_behaviorNameInID,count); ! ObjectRef behaviorActivationValue = getInput(m_behaviorActivationInID,count); ! ObjectRef behaviorExploitationValue = getInput(m_behaviorExploitationInID,count); ! ObjectRef behaviorResultsValue = getInput(m_behaviorResultsInID,count); ! ! //create command object ! if (!commandInValue->isNil()) { ! RCPtr<MarieCommandBehavior> behaviorPtr = getInput(m_commandInID,count); ! command = new MarieCommandBehavior(*behaviorPtr); } else { ! command = new MarieCommandBehavior(); ! } ! ! //look for activation for the desired behavior ! if (!behaviorNameValue->isNil() && !behaviorActivationValue->isNil()) ! { ! RCPtr<String> behaviorNamePtr = behaviorNameValue; ! RCPtr<Bool> behaviorActivationPtr = behaviorActivationValue; ! command->setActivation(*behaviorNamePtr,*behaviorActivationPtr); ! } ! ! //look for activation for the desired behavior ! if (!behaviorNameValue->isNil() && !behaviorExploitationValue->isNil()) ! { ! RCPtr<String> behaviorNamePtr = behaviorNameValue; ! RCPtr<Bool> behaviorExploitationPtr = behaviorExploitationValue; ! command->setActivation(*behaviorNamePtr,*behaviorExploitationPtr); ! } ! ! //look for activation for the desired behavior ! if (!behaviorNameValue->isNil() && !behaviorResultsValue->isNil()) ! { ! RCPtr<String> behaviorNamePtr = behaviorNameValue; ! RCPtr<String> behaviorResultsPtr = behaviorResultsValue; ! command->setResults(*behaviorNamePtr,*behaviorResultsPtr); ! } ! ! //create behavior activation vector (RobotFlow) ! Vector<int> *vect = Vector<int>::alloc(Behavior::get_behavior_size()); ! ! //get known behavior names ! vector<string>& behaviorNames = Behavior::get_behaviors(); ! ! //initialize to false (not activated) ! for (unsigned int i = 0; i < vect->size(); i++) ! { ! //TODO check if behavior exists ! (*vect)[i] = (int) command->getActivation(behaviorNames[i]); ! } ! ! (*outputs[m_commandOutID].buffer)[count] = ObjectRef(command); ! (*outputs[m_RobotFlowActivationOutID].buffer)[count] = ObjectRef(vect); ! } ! } ! ! void MarieCommandBehavior::printOn(ostream &out) const ! { ! ! MarieXMLDataFactory factory; ! ! //writing XML data ! string value = factory.toString((CommandBehavior) (*this)); ! ! out.write(value.c_str(), value.size()); ! } ! ! ! void MarieCommandBehavior::readFrom(istream &in) ! { ! throw new GeneralException("readFrom not supported. Use the MarieLoad Node to read data from the stream.",__FILE__,__LINE__); ! } ! ! void MarieCommandBehavior::copyDataAbstract(DataAbstract *data) ! { ! ! if (data) ! { ! CommandBehavior *command = dynamic_cast<CommandBehavior*>(data); ! if (command) ! { ! //((CommandBehavior*)this)->operator=(*command); ! this->CommandBehavior::operator=(*command); ! } ! else ! { ! throw new GeneralException(string("Unable to cast into CommandBehavior Abstract : ") + data->getID(),__FILE__,__LINE__); ! } ! } ! ! } } --- 33,82 ---- namespace marie { ! using namespace std; ! ! DECLARE_TYPE2(CommandBehavior::ID,MarieCommandBehavior) ! ! MarieCommandBehavior::MarieCommandBehavior() ! { ! ! } ! ! MarieCommandBehavior::MarieCommandBehavior (const CommandBehavior &command) ! :CommandBehavior(command) ! { ! ! } ! ! void MarieCommandBehavior::printOn(ostream &out) const ! { ! MarieXMLDataFactory factory; ! ! //writing XML data ! string value = factory.toString((CommandBehavior) (*this)); ! ! out.write(value.c_str(), value.size()); ! } ! ! void MarieCommandBehavior::readFrom(istream &in) ! { ! throw new GeneralException("readFrom not supported. Use the MarieLoad Node to read data from the stream.",__FILE__,__LINE__); ! } ! ! void MarieCommandBehavior::copyDataAbstract(DataAbstract *data) ! { ! if (data) ! { ! CommandBehavior *command = dynamic_cast<CommandBehavior*>(data); ! if (command) { ! //((CommandBehavior*)this)->operator=(*command); ! this->CommandBehavior::operator=(*command); } else { ! throw new GeneralException(string("Unable to cast into CommandBehavior Abstract : ") + data->getID(),__FILE__,__LINE__); ! } ! } ! } } Index: MarieDataOdometry.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MarieDataOdometry.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** MarieDataOdometry.cpp 22 Aug 2005 21:21:07 -0000 1.7 --- MarieDataOdometry.cpp 7 Sep 2005 21:12:48 -0000 1.8 *************** *** 30,187 **** namespace marie { ! DECLARE_NODE(MarieDataOdometry) ! /*Node ! * ! * @name MarieDataOdometry ! * @category RobotFlow:MARIE:zdeprecated ! * @description Read content of MarieDataOdometry ! * ! * @input_name ODOMETRY_DATA ! * @input_type MarieDataOdometry ! * @input_description The Odometry object ! * ! * @output_name XPOS ! * @output_description X axis position ! * @output_type int ! * ! * @output_name YPOS ! * @output_description Y axis position ! * @output_type int ! * ! * @output_name ZPOS ! * @output_description Z axis position ! * @output_type int ! * ! * @output_name YAW ! * @output_description YAW angle ! * @output_type int ! * ! * @output_name PITCH ! * @output_description PITCH angle ! * @output_type int ! * ! * @output_name ROLL ! * @output_description ROLL angle ! * @output_type int ! * ! * @output_name LINEAR_SPEED ! * @output_description linear speed (X-Y) ! * @output_type int ! * ! * @output_name SIDE_SPEED ! * @output_description translational speed (X-Y) ! * @output_type int ! * ! * @output_name ROTATION_SPEED ! * @output_description rotation speed (X-Y) ! * @output_type int ! * ! END*/ ! ! ! using namespace std; ! ! DECLARE_TYPE2(DataOdometry::ID,MarieDataOdometry) ! ! MarieDataOdometry::MarieDataOdometry() ! : MarieObject("MarieDataOdometry",ParameterSet()), m_isNode(false) ! { ! ! } ! ! MarieDataOdometry::MarieDataOdometry (const DataOdometry &data) ! : MarieObject("MarieDataOdometry",ParameterSet()), DataOdometry(data), ! m_isNode(false) ! { ! ! } ! ! MarieDataOdometry::MarieDataOdometry(string nodeName, ParameterSet params) ! : MarieObject(nodeName,params), m_isNode(true) ! { ! //used as a BufferedNode, create inputs & outputs ! ! //input ! m_inputID = addInput("ODOMETRY_DATA"); ! ! //outputs ! m_XposID = addOutput("XPOS"); ! m_YposID = addOutput("YPOS"); ! m_ZposID = addOutput("ZPOS"); ! m_yawID = addOutput("YAW"); ! m_pitchID = addOutput("PITCH"); ! m_rollID = addOutput("ROLL"); ! m_linSpeedID = addOutput("LINEAR_SPEED"); ! m_sideSpeedID = addOutput("SIDE_SPEED"); ! m_rotSpeedID = addOutput("ROTATION_SPEED"); ! } ! ! 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; ! odometryObject->getPosition(x,y,z); ! odometryObject->getOrientation(yaw,pitch,roll); ! odometryObject->getSpeed(linspeed,sidespeed,rotspeed); ! ! //output data ! (*outputs[m_XposID].buffer)[count] = ObjectRef(Int::alloc(x)); ! (*outputs[m_YposID].buffer)[count] = ObjectRef(Int::alloc(y)); ! (*outputs[m_ZposID].buffer)[count] = ObjectRef(Int::alloc(z)); ! (*outputs[m_yawID].buffer)[count] = ObjectRef(Int::alloc(yaw)); ! (*outputs[m_pitchID].buffer)[count] = ObjectRef(Int::alloc(pitch)); ! (*outputs[m_rollID].buffer)[count] = ObjectRef(Int::alloc(roll)); ! (*outputs[m_linSpeedID].buffer)[count] = ObjectRef(Int::alloc(linspeed)); ! (*outputs[m_sideSpeedID].buffer)[count] = ObjectRef(Int::alloc(sidespeed)); ! (*outputs[m_rotSpeedID].buffer)[count] = ObjectRef(Int::alloc(rotspeed)); ! } ! else ! { ! out[count] = nilObject; ! } ! } ! ! void MarieDataOdometry::printOn(ostream &out) const ! { ! MarieXMLDataFactory factory; ! ! //writing XML data ! string value = factory.toString((DataOdometry) (*this)); ! ! out.write(value.c_str(), value.size()); ! ! } ! ! ! void MarieDataOdometry::readFrom(istream &in) ! { ! throw new GeneralException("readFrom not supported. Use the MarieLoad Node to read data from the stream.",__FILE__,__LINE__); ! } ! ! void MarieDataOdometry::copyDataAbstract(DataAbstract *data) ! { ! if (data) ! { ! DataOdometry *my_data = dynamic_cast<DataOdometry*>(data); ! if (my_data) ! { ! //((DataOdometry*)this)->operator=(*my_data); ! this->DataOdometry::operator=(*my_data); ! } ! else ! { ! throw new GeneralException(string("Unable to cast into DataOdometry Abstract : ") + data->getID(),__FILE__,__LINE__); ! } ! } ! ! } } --- 30,78 ---- namespace marie { ! using namespace std; ! ! DECLARE_TYPE2(DataOdometry::ID,MarieDataOdometry) ! ! MarieDataOdometry::MarieDataOdometry() ! { ! } ! MarieDataOdometry::MarieDataOdometry (const DataOdometry &data) ! :DataOdometry(data) ! { ! ! } ! ! void MarieDataOdometry::printOn(ostream &out) const ! { ! MarieXMLDataFactory factory; ! ! //writing XML data ! string value = factory.toString((DataOdometry) (*this)); ! ! out.write(value.c_str(), value.size()); ! } ! ! void MarieDataOdometry::readFrom(istream &in) ! { ! throw new GeneralException("readFrom not supported. Use the MarieLoad Node to read data from the stream.",__FILE__,__LINE__); ! } ! ! void MarieDataOdometry::copyDataAbstract(DataAbstract *data) ! { ! if (data) ! { ! DataOdometry *my_data = dynamic_cast<DataOdometry*>(data); ! if (my_data) ! { ! //((DataOdometry*)this)->operator=(*my_data); ! this->DataOdometry::operator=(*my_data); ! } ! else ! { ! throw new GeneralException(string("Unable to cast into DataOdometry Abstract : ") + data->getID(),__FILE__,__LINE__); ! } ! } ! } } Index: MarieDataLaser.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MarieDataLaser.cpp,v retrieving revision 1.8 retrieving revision 1.... [truncated message content] |
Update of /cvsroot/robotflow/RobotFlow/MARIE/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19723/include Modified Files: Makefile.am MarieCommandBehavior.h MarieCommandCamera.h MarieCommandJoystick.h MarieCommandMotor.h MarieDataBumper.h MarieDataCamera.h MarieDataIR.h MarieDataLaser.h MarieDataLocalisation.h MarieDataMap.h MarieDataNull.h MarieDataOdometry.h MarieDataRaw.h MarieDataSonar.h MarieObject.h MarieRequestSystem.h Log Message: remove useless inheritance of BuffuredNode by MarieObject Index: MarieDataBumper.h =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MarieDataBumper.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** MarieDataBumper.h 29 Mar 2005 15:20:41 -0000 1.3 --- MarieDataBumper.h 7 Sep 2005 21:12:48 -0000 1.4 *************** *** 25,29 **** //FlowDesigner include - #include "Object.h" #include "MarieObject.h" --- 25,28 ---- *************** *** 36,64 **** public: ! MarieDataBumper(); MarieDataBumper(const DataBumper &command); ! //from BufferedNode ! MarieDataBumper(std::string nodeName, FD::ParameterSet params); ! virtual void calculate(int output_id, int count, FD::Buffer &out); virtual void printOn(std::ostream &out) const; virtual void readFrom(std::istream &in=std::cin); virtual void copyDataAbstract(DataAbstract *data); - - private: - - bool m_isNode; - - //inputs - int m_commandInID; - int m_nbBumpersInID; - int m_bumperStateInID; - - //outputs - int m_commandOutID; - int m_nbBumpersOutID; - int m_bumperStateOutID; - }; } --- 35,46 ---- public: ! MarieDataBumper(); MarieDataBumper(const DataBumper &command); ! //from MarieObject virtual void printOn(std::ostream &out) const; virtual void readFrom(std::istream &in=std::cin); virtual void copyDataAbstract(DataAbstract *data); }; } Index: MarieCommandJoystick.h =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MarieCommandJoystick.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** MarieCommandJoystick.h 29 Mar 2005 15:20:41 -0000 1.3 --- MarieCommandJoystick.h 7 Sep 2005 21:12:48 -0000 1.4 *************** *** 25,29 **** //FlowDesigner include - #include "Object.h" #include "MarieObject.h" --- 25,28 ---- *************** *** 36,76 **** public: ! ! MarieCommandJoystick(); MarieCommandJoystick(const CommandJoystick &command); ! //from BufferedNode ! MarieCommandJoystick(std::string nodeName, FD::ParameterSet params); ! virtual void calculate(int output_id, int count, FD::Buffer &out); virtual void printOn(std::ostream &out) const; virtual void readFrom(std::istream &in=std::cin); virtual void copyDataAbstract(DataAbstract *data); - private: - - bool m_isNode; - - //inputs - int m_commandInID; - int m_xInID; - int m_yInID; - int m_xminInID; - int m_yminInID; - int m_xmaxInID; - int m_ymaxInID; - int m_nbButtonsInID; - int m_buttonStateInID; - - //outputs - int m_commandOutID; - int m_xOutID; - int m_yOutID; - int m_xminOutID; - int m_yminOutID; - int m_xmaxOutID; - int m_ymaxOutID; - int m_nbButtonsOutID; - int m_buttonStateOutID; - }; } --- 35,47 ---- public: ! ! MarieCommandJoystick(); MarieCommandJoystick(const CommandJoystick &command); ! //from MarieObject virtual void printOn(std::ostream &out) const; virtual void readFrom(std::istream &in=std::cin); virtual void copyDataAbstract(DataAbstract *data); }; } Index: MarieDataNull.h =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MarieDataNull.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** MarieDataNull.h 29 Mar 2005 15:20:41 -0000 1.3 --- MarieDataNull.h 7 Sep 2005 21:12:48 -0000 1.4 *************** *** 25,29 **** //FlowDesigner include - #include "Object.h" #include "MarieObject.h" --- 25,28 ---- *************** *** 40,46 **** MarieDataNull(const DataNull &command); ! //from BufferedNode ! MarieDataNull(std::string nodeName, FD::ParameterSet params); ! virtual void calculate(int output_id, int count, FD::Buffer &out); virtual void printOn(std::ostream &out) const; virtual void readFrom(std::istream &in=std::cin); --- 39,43 ---- MarieDataNull(const DataNull &command); ! //from MarieObject virtual void printOn(std::ostream &out) const; virtual void readFrom(std::istream &in=std::cin); *************** *** 49,63 **** //from Object virtual bool isNil() const {return true;} - - private: - - bool m_isNode; - - //outputs - int m_dataNullOutID; - - //same dataNull object - FD::ObjectRef m_dataNullObject; - }; } --- 46,49 ---- Index: MarieDataLaser.h =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MarieDataLaser.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** MarieDataLaser.h 29 Mar 2005 15:20:41 -0000 1.3 --- MarieDataLaser.h 7 Sep 2005 21:12:48 -0000 1.4 *************** *** 25,29 **** //FlowDesigner include - #include "Object.h" #include "MarieObject.h" --- 25,28 ---- *************** *** 40,55 **** MarieDataLaser (const DataLaser &data); ! //from BufferedNode ! MarieDataLaser(std::string nodeName, FD::ParameterSet params); ! virtual void calculate(int output_id, int count, FD::Buffer &out); virtual void printOn(std::ostream &out) const; virtual void readFrom(std::istream &in=std::cin); virtual void copyDataAbstract(DataAbstract *data); - - private: - - int m_inputID; - int m_outputID; - bool m_isNode; }; } --- 39,46 ---- MarieDataLaser (const DataLaser &data); ! //from MarieObject virtual void printOn(std::ostream &out) const; virtual void readFrom(std::istream &in=std::cin); virtual void copyDataAbstract(DataAbstract *data); }; } Index: MarieDataRaw.h =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MarieDataRaw.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** MarieDataRaw.h 29 Mar 2005 15:20:41 -0000 1.3 --- MarieDataRaw.h 7 Sep 2005 21:12:48 -0000 1.4 *************** *** 25,29 **** //FlowDesigner include - #include "Object.h" #include "MarieObject.h" --- 25,28 ---- *************** *** 40,59 **** MarieDataRaw (const DataRaw &data); ! //from BufferedNode ! MarieDataRaw(std::string nodeName, FD::ParameterSet params); ! virtual void calculate(int output_id, int count, FD::Buffer &out); virtual void printOn(std::ostream &out) const; virtual void readFrom(std::istream &in=std::cin); virtual void copyDataAbstract(DataAbstract *data); - - private: - - int m_rawMarieInID; - int m_rawMarieOutID; - int m_objRefInID; - int m_customIDOutID; - int m_objRefOutID; - int m_customIDInID; - bool m_isNode; }; } --- 39,46 ---- MarieDataRaw (const DataRaw &data); ! //from MarieObject virtual void printOn(std::ostream &out) const; virtual void readFrom(std::istream &in=std::cin); virtual void copyDataAbstract(DataAbstract *data); }; } Index: MarieDataMap.h =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MarieDataMap.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** MarieDataMap.h 29 Mar 2005 15:20:41 -0000 1.4 --- MarieDataMap.h 7 Sep 2005 21:12:48 -0000 1.5 *************** *** 24,28 **** //FlowDesigner include - #include "Object.h" #include "MarieObject.h" --- 24,27 ---- *************** *** 38,58 **** MarieDataMap(); MarieDataMap (const DataAssociativeMap &data); ! ! //from BufferedNode ! MarieDataMap(std::string nodeName, FD::ParameterSet params); ! virtual void calculate(int output_id, int count, FD::Buffer &out); virtual void printOn(std::ostream &out) const; virtual void readFrom(std::istream &in=std::cin); virtual void copyDataAbstract(DataAbstract *data); - - private: - - bool m_isNode; - - //inputs - int m_inputID; - - //outputs - int m_outputID; }; } --- 37,45 ---- MarieDataMap(); MarieDataMap (const DataAssociativeMap &data); ! ! //from MarieObject virtual void printOn(std::ostream &out) const; virtual void readFrom(std::istream &in=std::cin); virtual void copyDataAbstract(DataAbstract *data); }; } Index: Makefile.am =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/Makefile.am,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** Makefile.am 28 Jun 2005 00:44:48 -0000 1.13 --- Makefile.am 7 Sep 2005 21:12:48 -0000 1.14 *************** *** 11,16 **** MarieDataCamera.h \ MarieDataOdometry.h \ - MarieLoad.h \ - MarieSave.h \ MariePull.h \ MariePeek.h \ --- 11,14 ---- Index: MarieObject.h =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MarieObject.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** MarieObject.h 29 Mar 2005 15:20:41 -0000 1.3 --- MarieObject.h 7 Sep 2005 21:12:48 -0000 1.4 *************** *** 19,23 **** * You can contact MARIE development team at http://marie.sourceforge.net */ ! // Prevent Multiple Inclusion // // C++ Interface: MARIEObject --- 19,23 ---- * You can contact MARIE development team at http://marie.sourceforge.net */ ! // // C++ Interface: MARIEObject *************** *** 31,46 **** // // #ifndef _MARIE_OBJECT_H_ #define _MARIE_OBJECT_H_ - //#include "MarieDataLaser.h" - //#include "MarieDataSonar.h" - //#include "MarieDataCamera.h" - //#include "MarieDataOdometry.h" - //#include "MarieCommandBehavior.h" - //#include "MarieCommandCamera.h" - //#include "MarieCommandMotor.h" - - #include "BufferedNode.h" #include "Object.h" #include "DataAbstract.h" --- 31,38 ---- // // + // Prevent Multiple Inclusion #ifndef _MARIE_OBJECT_H_ #define _MARIE_OBJECT_H_ #include "Object.h" #include "DataAbstract.h" *************** *** 49,62 **** namespace marie { ! class MarieObject : public FD::BufferedNode { ! ! public: ! ! MarieObject(std::string nodeName, FD::ParameterSet params) : FD::BufferedNode(nodeName,params) {} ! virtual void copyDataAbstract(DataAbstract *data) = 0; ! private: ! ! }; } #endif --- 41,51 ---- namespace marie { ! class MarieObject : public FD::Object{ ! public: ! ! MarieObject() {}; ! virtual void copyDataAbstract(DataAbstract *data) = 0; ! }; } #endif Index: MarieDataCamera.h =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MarieDataCamera.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** MarieDataCamera.h 29 Mar 2005 15:20:41 -0000 1.3 --- MarieDataCamera.h 7 Sep 2005 21:12:48 -0000 1.4 *************** *** 25,29 **** //FlowDesigner include - #include "Object.h" #include "MarieObject.h" --- 25,28 ---- *************** *** 38,66 **** MarieDataCamera(); ! MarieDataCamera (const DataCamera &data); ! ! //from BufferedNode ! MarieDataCamera(std::string nodeName, FD::ParameterSet params); ! virtual void calculate(int output_id, int count, FD::Buffer &out); virtual void printOn(std::ostream &out) const; virtual void readFrom(std::istream &in=std::cin); virtual void copyDataAbstract(DataAbstract *data); - - private: - - bool m_isNode; - - //inputs - int m_inputID; - - //outputs - int m_panID; - int m_tiltID; - int m_zoomID; - int m_imageWidthID; - int m_imageHeightID; - int m_imageID; - int m_imageFormatID; - }; } --- 37,46 ---- MarieDataCamera(); ! MarieDataCamera(const DataCamera &data); ! ! //from MarieObject virtual void printOn(std::ostream &out) const; virtual void readFrom(std::istream &in=std::cin); virtual void copyDataAbstract(DataAbstract *data); }; } Index: MarieDataOdometry.h =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MarieDataOdometry.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** MarieDataOdometry.h 29 Mar 2005 15:20:41 -0000 1.3 --- MarieDataOdometry.h 7 Sep 2005 21:12:48 -0000 1.4 *************** *** 24,28 **** //FlowDesigner include - #include "Object.h" #include "MarieObject.h" --- 24,27 ---- *************** *** 39,66 **** MarieDataOdometry (const DataOdometry &data); ! //from BufferedNode ! MarieDataOdometry(std::string nodeName, FD::ParameterSet params); ! virtual void calculate(int output_id, int count, FD::Buffer &out); virtual void printOn(std::ostream &out) const; virtual void readFrom(std::istream &in=std::cin); virtual void copyDataAbstract(DataAbstract *data); - - private: - - bool m_isNode; - - //input - int m_inputID; - - //outputs - int m_XposID; - int m_YposID; - int m_ZposID; - int m_yawID; - int m_pitchID; - int m_rollID; - int m_linSpeedID; - int m_sideSpeedID; - int m_rotSpeedID; }; } --- 38,45 ---- MarieDataOdometry (const DataOdometry &data); ! //from MarieObject virtual void printOn(std::ostream &out) const; virtual void readFrom(std::istream &in=std::cin); virtual void copyDataAbstract(DataAbstract *data); }; } Index: MarieDataLocalisation.h =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MarieDataLocalisation.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** MarieDataLocalisation.h 27 Jun 2005 17:43:18 -0000 1.3 --- MarieDataLocalisation.h 7 Sep 2005 21:12:48 -0000 1.4 *************** *** 25,29 **** //FlowDesigner include - #include "Object.h" #include "MarieObject.h" --- 25,28 ---- *************** *** 40,63 **** MarieDataLocalisation(const DataLocalisation &command); ! //from BufferedNode ! MarieDataLocalisation(std::string nodeName, FD::ParameterSet params); ! virtual void calculate(int output_id, int count, FD::Buffer &out); virtual void printOn(std::ostream &out) const; virtual void readFrom(std::istream &in=std::cin); virtual void copyDataAbstract(DataAbstract *data); - - private: - - bool m_isNode; - - //inputs - int m_dataInID; - int m_vectorInID; - - //outputs - int m_dataOutID; - int m_vectorOutID; - - }; } --- 39,46 ---- MarieDataLocalisation(const DataLocalisation &command); ! //from MarieObject virtual void printOn(std::ostream &out) const; virtual void readFrom(std::istream &in=std::cin); virtual void copyDataAbstract(DataAbstract *data); }; } Index: MarieDataIR.h =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MarieDataIR.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** MarieDataIR.h 29 Mar 2005 15:20:41 -0000 1.3 --- MarieDataIR.h 7 Sep 2005 21:12:48 -0000 1.4 *************** *** 25,29 **** //FlowDesigner include - #include "Object.h" #include "MarieObject.h" --- 25,28 ---- *************** *** 40,55 **** MarieDataIR (const DataIR &data); ! //from BufferedNode ! MarieDataIR(std::string nodeName, FD::ParameterSet params); ! virtual void calculate(int output_id, int count, FD::Buffer &out); virtual void printOn(std::ostream &out) const; virtual void readFrom(std::istream &in=std::cin); virtual void copyDataAbstract(DataAbstract *data); - - private: - - int m_inputID; - int m_outputID; - bool m_isNode; }; } --- 39,46 ---- MarieDataIR (const DataIR &data); ! //from MarieObject virtual void printOn(std::ostream &out) const; virtual void readFrom(std::istream &in=std::cin); virtual void copyDataAbstract(DataAbstract *data); }; } Index: MarieCommandBehavior.h =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MarieCommandBehavior.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** MarieCommandBehavior.h 9 Jun 2005 20:37:20 -0000 1.5 --- MarieCommandBehavior.h 7 Sep 2005 21:12:48 -0000 1.6 *************** *** 24,28 **** //FlowDesigner include - #include "Object.h" #include "MarieObject.h" --- 24,27 ---- *************** *** 39,63 **** MarieCommandBehavior(const CommandBehavior &command); ! //from BufferedNode ! MarieCommandBehavior(std::string nodeName, FD::ParameterSet params); ! virtual void calculate(int output_id, int count, FD::Buffer &out); virtual void printOn(std::ostream &out) const; ! virtual void readFrom(std::istream &in=std::cin); virtual void copyDataAbstract(DataAbstract *data); - private: - - bool m_isNode; - - //inputs - int m_commandInID; - int m_behaviorNameInID; - int m_behaviorActivationInID; - int m_behaviorExploitationInID; - int m_behaviorResultsInID; - - //outputs - int m_commandOutID; - int m_RobotFlowActivationOutID; }; } --- 38,46 ---- MarieCommandBehavior(const CommandBehavior &command); ! //from MarieObject virtual void printOn(std::ostream &out) const; ! virtual void readFrom(std::istream &in=std::cin); virtual void copyDataAbstract(DataAbstract *data); }; } Index: MarieRequestSystem.h =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MarieRequestSystem.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** MarieRequestSystem.h 29 Mar 2005 15:20:41 -0000 1.3 --- MarieRequestSystem.h 7 Sep 2005 21:12:48 -0000 1.4 *************** *** 25,29 **** //FlowDesigner include - #include "Object.h" #include "MarieObject.h" --- 25,28 ---- *************** *** 39,62 **** MarieRequestSystem(); MarieRequestSystem (const RequestSystem &data); ! ! //from BufferedNode ! MarieRequestSystem(std::string nodeName, FD::ParameterSet params); ! virtual void calculate(int output_id, int count, FD::Buffer &out); virtual void printOn(std::ostream &out) const; virtual void readFrom(std::istream &in=std::cin); virtual void copyDataAbstract(DataAbstract *data); - - private: - - bool m_isNode; - - //inputs - int m_inputID; - - //outputs - int m_commandID; - int m_dataID; - int m_requestIDID; - int m_stateID; }; } --- 38,46 ---- MarieRequestSystem(); MarieRequestSystem (const RequestSystem &data); ! ! //from MarieObject virtual void printOn(std::ostream &out) const; virtual void readFrom(std::istream &in=std::cin); virtual void copyDataAbstract(DataAbstract *data); }; } Index: MarieCommandMotor.h =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MarieCommandMotor.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** MarieCommandMotor.h 29 Mar 2005 15:20:41 -0000 1.3 --- MarieCommandMotor.h 7 Sep 2005 21:12:48 -0000 1.4 *************** *** 25,29 **** //FlowDesigner include - #include "Object.h" #include "MarieObject.h" --- 25,28 ---- *************** *** 37,63 **** public: - MarieCommandMotor(); MarieCommandMotor(const CommandMotor &command); ! //from BufferedNode ! MarieCommandMotor(std::string nodeName, FD::ParameterSet params); ! virtual void calculate(int output_id, int count, FD::Buffer &out); virtual void printOn(std::ostream &out) const; virtual void readFrom(std::istream &in=std::cin); virtual void copyDataAbstract(DataAbstract *data); - - private: - bool m_isNode; - - //inputs - int m_commandInID; - int m_velocityInID; - int m_rotationInID; - - //outputs - int m_commandOutID; - int m_velocityOutID; - int m_rotationOutID; }; } --- 36,46 ---- public: MarieCommandMotor(); MarieCommandMotor(const CommandMotor &command); ! //from MarieObject virtual void printOn(std::ostream &out) const; virtual void readFrom(std::istream &in=std::cin); virtual void copyDataAbstract(DataAbstract *data); }; } Index: MarieDataSonar.h =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MarieDataSonar.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** MarieDataSonar.h 29 Mar 2005 15:20:41 -0000 1.3 --- MarieDataSonar.h 7 Sep 2005 21:12:48 -0000 1.4 *************** *** 24,28 **** //FlowDesigner include - #include "Object.h" #include "MarieObject.h" --- 24,27 ---- *************** *** 39,55 **** MarieDataSonar (const DataSonar &data); ! //from BufferedNode ! MarieDataSonar(std::string nodeName, FD::ParameterSet params); ! virtual void calculate(int output_id, int count, FD::Buffer &out); virtual void printOn(std::ostream &out) const; virtual void readFrom(std::istream &in=std::cin); virtual void copyDataAbstract(DataAbstract *data); - - private: - - int m_inputID; - int m_rangeID; - bool m_isNode; - }; } --- 38,45 ---- MarieDataSonar (const DataSonar &data); ! //from MarieObject virtual void printOn(std::ostream &out) const; virtual void readFrom(std::istream &in=std::cin); virtual void copyDataAbstract(DataAbstract *data); }; } Index: MarieCommandCamera.h =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MarieCommandCamera.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** MarieCommandCamera.h 29 Mar 2005 15:20:41 -0000 1.4 --- MarieCommandCamera.h 7 Sep 2005 21:12:48 -0000 1.5 *************** *** 25,29 **** //FlowDesigner include - #include "Object.h" #include "MarieObject.h" --- 25,28 ---- *************** *** 37,80 **** public: ! MarieCommandCamera(); MarieCommandCamera(const CommandCamera &command); ! //from BufferedNode ! MarieCommandCamera(std::string nodeName, FD::ParameterSet params); ! virtual void calculate(int output_id, int count, FD::Buffer &out); virtual void printOn(std::ostream &out) const; virtual void readFrom(std::istream &in=std::cin); virtual void copyDataAbstract(DataAbstract *data); - - private: - - bool m_isNode; - - //inputs - int m_commandInID; - int m_relBrightnessInID; - int m_relContrastInID; - int m_relPanInID; - int m_relTiltInID; - int m_relZoomInID; - int m_absBrightnessInID; - int m_absContrastInID; - int m_absPanInID; - int m_absTiltInID; - int m_absZoomInID; - - //outputs - int m_commandOutID; - int m_relBrightnessOutID; - int m_relContrastOutID; - int m_relPanOutID; - int m_relTiltOutID; - int m_relZoomOutID; - int m_absBrightnessOutID; - int m_absContrastOutID; - int m_absPanOutID; - int m_absTiltOutID; - int m_absZoomOutID; - }; } --- 36,46 ---- public: ! MarieCommandCamera(); MarieCommandCamera(const CommandCamera &command); ! //from MarieObject virtual void printOn(std::ostream &out) const; virtual void readFrom(std::istream &in=std::cin); virtual void copyDataAbstract(DataAbstract *data); }; } |
|
From: Carle C. <car...@us...> - 2005-08-22 21:35:12
|
Update of /cvsroot/robotflow/RobotFlow/MARIE/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31382/MARIE/src Modified Files: MarieCommandBehavior.cpp MarieCommandCamera.cpp MarieCommandJoystick.cpp MarieCommandMotor.cpp MarieDataBumper.cpp MarieDataLocalisation.cpp MariePeek.cpp MariePull.cpp newMarieCommandBehavior.cpp newMarieCommandJoystick.cpp newMarieDataLocalisation.cpp Log Message: correct gcc4.0.1 warnings Index: MarieCommandCamera.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MarieCommandCamera.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** MarieCommandCamera.cpp 22 Aug 2005 21:21:07 -0000 1.10 --- MarieCommandCamera.cpp 22 Aug 2005 21:35:01 -0000 1.11 *************** *** 185,190 **** { MarieCommandCamera *command = NULL; ! int relPan, relTilt, relZoom, relContrast, relBrightness = 0; ! int absPan, absTilt, absZoom, absContrast, absBrightness = 0; std::bitset<10> state; --- 185,199 ---- { MarieCommandCamera *command = NULL; ! int relPan = 0; ! int relTilt = 0; ! int relZoom = 0; ! int relContrast = 0; ! int relBrightness = 0; ! int absPan = 0; ! int absTilt = 0; ! int absZoom = 0; ! int absContrast = 0; ! int absBrightness = 0; ! std::bitset<10> state; Index: newMarieCommandJoystick.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/newMarieCommandJoystick.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** newMarieCommandJoystick.cpp 29 Mar 2005 15:20:43 -0000 1.3 --- newMarieCommandJoystick.cpp 22 Aug 2005 21:35:01 -0000 1.4 *************** *** 138,142 **** MarieCommandJoystick *command = new MarieCommandJoystick(); ! int x, y, xmin, ymin, xmax, ymax, nbButtons, buttonState = 0; //get x --- 138,149 ---- MarieCommandJoystick *command = new MarieCommandJoystick(); ! int x = 0; ! int y = 0; ! int xmin = 0; ! int ymin = 0; ! int xmax = 0; ! int ymax = 0; ! int nbButtons = 0; ! int buttonState = 0; //get x Index: newMarieDataLocalisation.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/newMarieDataLocalisation.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** newMarieDataLocalisation.cpp 27 Jun 2005 22:43:36 -0000 1.2 --- newMarieDataLocalisation.cpp 22 Aug 2005 21:35:01 -0000 1.3 *************** *** 94,98 **** data = new MarieDataLocalisation(); ! for(int i = 0; i < inputData->size(); i++) { RCPtr<SourceInfo> sourceInfoData = inputData->getIndex(i); --- 94,98 ---- data = new MarieDataLocalisation(); ! for(unsigned int i = 0; i < inputData->size(); i++) { RCPtr<SourceInfo> sourceInfoData = inputData->getIndex(i); Index: MarieCommandBehavior.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MarieCommandBehavior.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** MarieCommandBehavior.cpp 22 Aug 2005 21:21:07 -0000 1.8 --- MarieCommandBehavior.cpp 22 Aug 2005 21:35:01 -0000 1.9 *************** *** 159,163 **** //initialize to false (not activated) ! for (int i = 0; i < vect->size(); i++) { //TODO check if behavior exists --- 159,163 ---- //initialize to false (not activated) ! for (unsigned int i = 0; i < vect->size(); i++) { //TODO check if behavior exists Index: MariePull.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MariePull.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** MariePull.cpp 29 Mar 2005 15:20:42 -0000 1.6 --- MariePull.cpp 22 Aug 2005 21:35:01 -0000 1.7 *************** *** 93,97 **** } } ! int pos = my_string.find("<?xml version=\"1.0\"?>"); if (pos != 0 && pos != string::npos) --- 93,97 ---- } } ! unsigned int pos = my_string.find("<?xml version=\"1.0\"?>"); if (pos != 0 && pos != string::npos) Index: MarieCommandMotor.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MarieCommandMotor.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** MarieCommandMotor.cpp 22 Aug 2005 21:21:07 -0000 1.8 --- MarieCommandMotor.cpp 22 Aug 2005 21:35:01 -0000 1.9 *************** *** 102,106 **** { MarieCommandMotor *command = NULL; ! int velocity, rotation = 0; //get all inputs --- 102,107 ---- { MarieCommandMotor *command = NULL; ! int velocity = 0; ! int rotation = 0; //get all inputs Index: MarieCommandJoystick.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MarieCommandJoystick.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** MarieCommandJoystick.cpp 22 Aug 2005 21:21:07 -0000 1.6 --- MarieCommandJoystick.cpp 22 Aug 2005 21:35:01 -0000 1.7 *************** *** 162,166 **** { MarieCommandJoystick *command = NULL; ! int x, y, xmin, ymin, xmax, ymax, nbButtons, buttonState = 0; //get all inputs --- 162,173 ---- { MarieCommandJoystick *command = NULL; ! int x = 0; ! int y = 0; ! int xmin = 0; ! int ymin = 0; ! int xmax = 0; ! int ymax = 0; ! int nbButtons = 0; ! int buttonState = 0; //get all inputs Index: MarieDataBumper.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MarieDataBumper.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** MarieDataBumper.cpp 22 Aug 2005 21:21:07 -0000 1.5 --- MarieDataBumper.cpp 22 Aug 2005 21:35:01 -0000 1.6 *************** *** 102,106 **** { MarieDataBumper *command = NULL; ! int nbBumpers, bumperState = 0; //get all inputs --- 102,107 ---- { MarieDataBumper *command = NULL; ! int nbBumpers = 0; ! int bumperState = 0; //get all inputs Index: newMarieCommandBehavior.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/newMarieCommandBehavior.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** newMarieCommandBehavior.cpp 9 Jun 2005 20:37:22 -0000 1.7 --- newMarieCommandBehavior.cpp 22 Aug 2005 21:35:01 -0000 1.8 *************** *** 91,95 **** MarieCommandBehavior *cb = new MarieCommandBehavior(); ! for(int i = 0; i < (*vector).size(); i++) { ObjectRef elementPtr = (*vector)[i]; --- 91,95 ---- MarieCommandBehavior *cb = new MarieCommandBehavior(); ! for(unsigned int i = 0; i < (*vector).size(); i++) { ObjectRef elementPtr = (*vector)[i]; Index: MarieDataLocalisation.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MarieDataLocalisation.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** MarieDataLocalisation.cpp 22 Aug 2005 21:21:07 -0000 1.6 --- MarieDataLocalisation.cpp 22 Aug 2005 21:35:01 -0000 1.7 *************** *** 145,149 **** vector = new Vector<ObjectRef>(*inputData); ! for(int i = 0; i < vector->size(); i++) { RCPtr<SourceInfo> sourceInfoData = vector->getIndex(i); --- 145,149 ---- vector = new Vector<ObjectRef>(*inputData); ! for(unsigned int i = 0; i < vector->size(); i++) { RCPtr<SourceInfo> sourceInfoData = vector->getIndex(i); Index: MariePeek.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MariePeek.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** MariePeek.cpp 29 Mar 2005 15:20:42 -0000 1.6 --- MariePeek.cpp 22 Aug 2005 21:35:01 -0000 1.7 *************** *** 94,98 **** } ! int pos = my_string.find("<?xml version=\"1.0\"?>"); if (pos != 0 && pos != string::npos) --- 94,98 ---- } ! unsigned int pos = my_string.find("<?xml version=\"1.0\"?>"); if (pos != 0 && pos != string::npos) |
|
From: Carle C. <car...@us...> - 2005-08-22 21:21:15
|
Update of /cvsroot/robotflow/RobotFlow/MARIE/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28882/MARIE/src Modified Files: MarieCommandBehavior.cpp MarieCommandCamera.cpp MarieCommandJoystick.cpp MarieCommandMotor.cpp MarieDataBumper.cpp MarieDataCamera.cpp MarieDataIR.cpp MarieDataLaser.cpp MarieDataLocalisation.cpp MarieDataMap.cpp MarieDataNull.cpp MarieDataOdometry.cpp MarieDataRaw.cpp MarieDataSonar.cpp MarieRequestSystem.cpp Log Message: remove reference from "this" cast in printOn function as gcc4.0.1 don't behave correctly with it (seemed to refer at a new object pointer instead of the class itself..to be verified) Index: MarieDataCamera.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MarieDataCamera.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** MarieDataCamera.cpp 29 Mar 2005 15:20:42 -0000 1.6 --- MarieDataCamera.cpp 22 Aug 2005 21:21:07 -0000 1.7 *************** *** 145,149 **** //writing XML data ! string value = factory.toString((DataCamera&) (*this)); out.write(value.c_str(), value.size()); --- 145,149 ---- //writing XML data ! string value = factory.toString((DataCamera) (*this)); out.write(value.c_str(), value.size()); Index: MarieDataIR.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MarieDataIR.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** MarieDataIR.cpp 29 Mar 2005 15:20:42 -0000 1.4 --- MarieDataIR.cpp 22 Aug 2005 21:21:07 -0000 1.5 *************** *** 108,112 **** //writing XML data ! string value = factory.toString((DataIR&) (*this)); out.write(value.c_str(), value.size()); --- 108,112 ---- //writing XML data ! string value = factory.toString((DataIR) (*this)); out.write(value.c_str(), value.size()); Index: MarieCommandCamera.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MarieCommandCamera.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** MarieCommandCamera.cpp 29 Mar 2005 15:20:42 -0000 1.9 --- MarieCommandCamera.cpp 22 Aug 2005 21:21:07 -0000 1.10 *************** *** 398,402 **** //writing XML data ! string value = factory.toString((CommandCamera&) (*this)); out.write(value.c_str(), value.size()); --- 398,402 ---- //writing XML data ! string value = factory.toString((CommandCamera) (*this)); out.write(value.c_str(), value.size()); Index: MarieCommandMotor.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MarieCommandMotor.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** MarieCommandMotor.cpp 29 Mar 2005 15:20:42 -0000 1.7 --- MarieCommandMotor.cpp 22 Aug 2005 21:21:07 -0000 1.8 *************** *** 168,172 **** //writing XML data ! string value = factory.toString((CommandMotor&) (*this)); out.write(value.c_str(), value.size()); --- 168,172 ---- //writing XML data ! string value = factory.toString((CommandMotor) (*this)); out.write(value.c_str(), value.size()); Index: MarieDataSonar.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MarieDataSonar.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** MarieDataSonar.cpp 29 Mar 2005 15:20:42 -0000 1.6 --- MarieDataSonar.cpp 22 Aug 2005 21:21:07 -0000 1.7 *************** *** 107,111 **** //writing XML data ! string value = factory.toString((DataSonar&) (*this)); out.write(value.c_str(), value.size()); --- 107,111 ---- //writing XML data ! string value = factory.toString((DataSonar) (*this)); out.write(value.c_str(), value.size()); Index: MarieCommandBehavior.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MarieCommandBehavior.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** MarieCommandBehavior.cpp 9 Jun 2005 20:37:22 -0000 1.7 --- MarieCommandBehavior.cpp 22 Aug 2005 21:21:07 -0000 1.8 *************** *** 176,180 **** //writing XML data ! string value = factory.toString((CommandBehavior&) (*this)); out.write(value.c_str(), value.size()); --- 176,180 ---- //writing XML data ! string value = factory.toString((CommandBehavior) (*this)); out.write(value.c_str(), value.size()); Index: MarieDataOdometry.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MarieDataOdometry.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** MarieDataOdometry.cpp 29 Mar 2005 15:20:42 -0000 1.6 --- MarieDataOdometry.cpp 22 Aug 2005 21:21:07 -0000 1.7 *************** *** 155,159 **** //writing XML data ! string value = factory.toString((DataOdometry&) (*this)); out.write(value.c_str(), value.size()); --- 155,159 ---- //writing XML data ! string value = factory.toString((DataOdometry) (*this)); out.write(value.c_str(), value.size()); Index: MarieDataLaser.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MarieDataLaser.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** MarieDataLaser.cpp 29 Mar 2005 15:20:42 -0000 1.7 --- MarieDataLaser.cpp 22 Aug 2005 21:21:07 -0000 1.8 *************** *** 108,112 **** //writing XML data ! string value = factory.toString((DataLaser&) (*this)); out.write(value.c_str(), value.size()); --- 108,112 ---- //writing XML data ! string value = factory.toString((DataLaser) (*this)); out.write(value.c_str(), value.size()); Index: MarieDataMap.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MarieDataMap.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** MarieDataMap.cpp 29 Mar 2005 15:20:42 -0000 1.5 --- MarieDataMap.cpp 22 Aug 2005 21:21:07 -0000 1.6 *************** *** 127,131 **** //writing XML data ! string value = factory.toString((DataAssociativeMap&) (*this)); out.write(value.c_str(), value.size()); --- 127,131 ---- //writing XML data ! string value = factory.toString((DataAssociativeMap) (*this)); out.write(value.c_str(), value.size()); Index: MarieCommandJoystick.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MarieCommandJoystick.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** MarieCommandJoystick.cpp 29 Mar 2005 15:20:42 -0000 1.5 --- MarieCommandJoystick.cpp 22 Aug 2005 21:21:07 -0000 1.6 *************** *** 295,299 **** //writing XML data ! string value = factory.toString((CommandJoystick&) (*this)); out.write(value.c_str(), value.size()); --- 295,299 ---- //writing XML data ! string value = factory.toString((CommandJoystick) (*this)); out.write(value.c_str(), value.size()); Index: MarieDataRaw.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MarieDataRaw.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** MarieDataRaw.cpp 29 Mar 2005 15:20:42 -0000 1.6 --- MarieDataRaw.cpp 22 Aug 2005 21:21:07 -0000 1.7 *************** *** 164,168 **** //writing XML data ! string value = factory.toString((DataRaw&) (*this)); out.write(value.c_str(), value.size()); --- 164,168 ---- //writing XML data ! string value = factory.toString((DataRaw) (*this)); out.write(value.c_str(), value.size()); Index: MarieDataBumper.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MarieDataBumper.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** MarieDataBumper.cpp 29 Mar 2005 15:20:42 -0000 1.4 --- MarieDataBumper.cpp 22 Aug 2005 21:21:07 -0000 1.5 *************** *** 170,174 **** //writing XML data ! string value = factory.toString((DataBumper&) (*this)); out.write(value.c_str(), value.size()); --- 170,174 ---- //writing XML data ! string value = factory.toString((DataBumper) (*this)); out.write(value.c_str(), value.size()); Index: MarieDataNull.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MarieDataNull.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** MarieDataNull.cpp 29 Mar 2005 15:20:42 -0000 1.4 --- MarieDataNull.cpp 22 Aug 2005 21:21:07 -0000 1.5 *************** *** 93,97 **** //writing XML data ! string value = factory.toString((DataNull&) (*this)); out.write(value.c_str(), value.size()); --- 93,97 ---- //writing XML data ! string value = factory.toString((DataNull) (*this)); out.write(value.c_str(), value.size()); Index: MarieDataLocalisation.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MarieDataLocalisation.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** MarieDataLocalisation.cpp 27 Jun 2005 22:43:35 -0000 1.5 --- MarieDataLocalisation.cpp 22 Aug 2005 21:21:07 -0000 1.6 *************** *** 186,190 **** //writing XML data ! string value = factory.toString((DataLocalisation&) (*this)); out.write(value.c_str(), value.size()); --- 186,190 ---- //writing XML data ! string value = factory.toString((DataLocalisation) (*this)); out.write(value.c_str(), value.size()); Index: MarieRequestSystem.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MarieRequestSystem.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** MarieRequestSystem.cpp 29 Mar 2005 15:20:42 -0000 1.4 --- MarieRequestSystem.cpp 22 Aug 2005 21:21:07 -0000 1.5 *************** *** 117,121 **** //writing XML data ! string value = factory.toString((RequestSystem&) (*this)); out.write(value.c_str(), value.size()); --- 117,121 ---- //writing XML data ! string value = factory.toString((RequestSystem) (*this)); out.write(value.c_str(), value.size()); |
|
From: Carle C. <car...@us...> - 2005-08-15 19:22:48
|
Update of /cvsroot/robotflow/RobotFlow/Devices/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16653/Devices/src Modified Files: Makefile.am Log Message: Remove missing .cc dependance Index: Makefile.am =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Devices/src/Makefile.am,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** Makefile.am 28 Jul 2005 13:32:25 -0000 1.14 --- Makefile.am 15 Aug 2005 19:22:41 -0000 1.15 *************** *** 15,19 **** SNCRZ30.cc \ SNCRZ30RS232.cc \ - SNCRZ30TCP.cc \ IMU400CC_200.cc --- 15,18 ---- |
|
From: Dominic L. <ma...@us...> - 2005-08-03 19:53:03
|
Update of /cvsroot/robotflow/RobotFlow/Probes/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25543/Probes/src Modified Files: Makefile.am Log Message: testing pkg-config scripts, fixed Probes compilation Index: Makefile.am =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Probes/src/Makefile.am,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** Makefile.am 31 Jul 2005 18:52:59 -0000 1.15 --- Makefile.am 3 Aug 2005 19:52:54 -0000 1.16 *************** *** 35,39 **** INCLUDES = -I../include $(OVERFLOW_INCLUDE) $(GNOME_INCLUDE) \ -I../../Vision/include -I ../../OpenCV/include \ ! $(SDL_INCLUDE) -I$(OVERFLOW_DATA)/HMM $(OPENCV_INCLUDES) LDADD = $(SDL_LIB) --- 35,39 ---- INCLUDES = -I../include $(OVERFLOW_INCLUDE) $(GNOME_INCLUDE) \ -I../../Vision/include -I ../../OpenCV/include \ ! $(SDL_INCLUDE) -I$(OVERFLOW_DATA)/HMM $(OPENCV_CFLAGS) LDADD = $(SDL_LIB) |
|
From: Dominic L. <ma...@us...> - 2005-08-03 19:53:03
|
Update of /cvsroot/robotflow/RobotFlow In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25543 Modified Files: configure.in Makefile.am Added Files: RobotFlow.pc.in Log Message: testing pkg-config scripts, fixed Probes compilation Index: Makefile.am =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Makefile.am,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** Makefile.am 28 Jul 2005 15:01:15 -0000 1.21 --- Makefile.am 3 Aug 2005 19:52:54 -0000 1.22 *************** *** 18,21 **** --- 18,26 ---- SUBDIRS = Pioneer2 Generic Behaviors Audio Vision Control Devices Probes FSM $(MARIE_DIR) $(OPENCV_DIR) + # create the pkg-config entries + pkgconfigdir = $(libdir)/pkgconfig + pkgconfig_DATA = RobotFlow.pc + + rpm: dist rpmbuild -ta ${PACKAGE}-${VERSION}.tar.gz Index: configure.in =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/configure.in,v retrieving revision 1.53 retrieving revision 1.54 diff -C2 -d -r1.53 -r1.54 *** configure.in 3 Aug 2005 18:41:37 -0000 1.53 --- configure.in 3 Aug 2005 19:52:54 -0000 1.54 *************** *** 7,10 **** --- 7,13 ---- #AC_INIT([RobotFlow], [0.2.5cvs], [rob...@li...]) + + AC_PREREQ(2.53) + ROBOTFLOW_MAJOR_VERSION=0 ROBOTFLOW_MINOR_VERSION=2 *************** *** 211,214 **** --- 214,218 ---- if test "$OPENCV_FOUND" = "yes"; then AC_MSG_RESULT([Using OpenCV lib : $OPENCV_LIBS]) + AC_MSG_RESULT([Using OpenCV cflags : $OPENCV_CFLAGS]) AM_CONDITIONAL(WITH_OPENCV,true) else *************** *** 217,222 **** fi - #AC_SUBST(ACE_LIBS) - #AC_SUBST(ACE_INCLUDES) AC_SUBST(MARIE_LIBS) AC_SUBST(MARIE_INCLUDES) --- 221,224 ---- *************** *** 315,319 **** OpenCV/src/Makefile \ OpenCV/n-files/Makefile \ ! RobotFlow.spec) --- 317,322 ---- OpenCV/src/Makefile \ OpenCV/n-files/Makefile \ ! RobotFlow.spec \ ! RobotFlow.pc) *************** *** 342,346 **** AC_MSG_RESULT([$PACKAGE will build MARIE based blocks]) else ! AC_MSG_RESULT([$PACKAGE will NOT build MARIE based blocks (forgot --with-MARIE=<path> and --with-ACE=<path> args?)]) fi --- 345,349 ---- AC_MSG_RESULT([$PACKAGE will build MARIE based blocks]) else ! AC_MSG_RESULT([$PACKAGE will NOT build MARIE based blocks (forgot --with-MARIE=<path>]) fi --- NEW FILE: RobotFlow.pc.in --- Name: robotflow Description: RobotFlow toolkit for FlowDesigner Version: @VERSION@ Requires: Libs: -L${prefix}/lib Cflags: -I${prefix}/include @OVERFLOW_INCLUDES@ |
|
From: Dominic L. <ma...@us...> - 2005-08-03 18:41:46
|
Update of /cvsroot/robotflow/RobotFlow/OpenCV/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8729/OpenCV/src Modified Files: Makefile.am Log Message: checking for proper version of opencv Index: Makefile.am =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/OpenCV/src/Makefile.am,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Makefile.am 28 Jul 2005 14:59:47 -0000 1.1 --- Makefile.am 3 Aug 2005 18:41:37 -0000 1.2 *************** *** 31,35 **** libRFOpenCV_la_LDFLAGS = -release $(LT_RELEASE) $(OPENCV_LIBS) ! INCLUDES = -I../include $(OVERFLOW_INCLUDE) -I$(OVERFLOW_DATA)/HMM $(PIXBUF_INCLUDE) $(JPEG_INCLUDE) $(OPENCV_INCLUDES) \ -I../../Vision/include --- 31,35 ---- libRFOpenCV_la_LDFLAGS = -release $(LT_RELEASE) $(OPENCV_LIBS) ! INCLUDES = -I../include $(OVERFLOW_INCLUDE) -I$(OVERFLOW_DATA)/HMM $(PIXBUF_INCLUDE) $(JPEG_INCLUDE) $(OPENCV_CFLAGS) \ -I../../Vision/include |
|
From: Dominic L. <ma...@us...> - 2005-08-03 18:41:45
|
Update of /cvsroot/robotflow/RobotFlow In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8729 Modified Files: configure.in Log Message: checking for proper version of opencv Index: configure.in =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/configure.in,v retrieving revision 1.52 retrieving revision 1.53 diff -C2 -d -r1.52 -r1.53 *** configure.in 28 Jul 2005 15:01:15 -0000 1.52 --- configure.in 3 Aug 2005 18:41:37 -0000 1.53 *************** *** 44,47 **** --- 44,48 ---- AC_PROG_LN_S AC_PROG_MAKE_SET + PKG_PROG_PKG_CONFIG AC_CANONICAL_HOST AC_DISABLE_STATIC *************** *** 205,219 **** fi - dnl detection of OpenCV image library ! OPENCV_INCLUDES=`pkg-config --cflags opencv --silence-errors` ! OPENCV_LIBS=`pkg-config --libs opencv --silence-errors` ! OPENCV_FOUND="" ! if test -n "$OPENCV_INCLUDES"; then AC_MSG_RESULT([Using OpenCV lib : $OPENCV_LIBS]) AM_CONDITIONAL(WITH_OPENCV,true) - OPENCV_FOUND="yes" else ! AC_MSG_RESULT([OpenCV not found, disabled]) AM_CONDITIONAL(WITH_OPENCV,false) fi --- 206,217 ---- fi dnl detection of OpenCV image library ! PKG_CHECK_MODULES(OPENCV, opencv >= 0.9.6,[OPENCV_FOUND="yes"],[OPENCV_FOUND="no"]) ! ! if test "$OPENCV_FOUND" = "yes"; then AC_MSG_RESULT([Using OpenCV lib : $OPENCV_LIBS]) AM_CONDITIONAL(WITH_OPENCV,true) else ! AC_MSG_RESULT([OpenCV >= 0.9.6 not found, disabled]) AM_CONDITIONAL(WITH_OPENCV,false) fi *************** *** 223,227 **** AC_SUBST(MARIE_LIBS) AC_SUBST(MARIE_INCLUDES) ! AC_SUBST(OPENCV_INCLUDES) AC_SUBST(OPENCV_LIBS) --- 221,225 ---- AC_SUBST(MARIE_LIBS) AC_SUBST(MARIE_INCLUDES) ! AC_SUBST(OPENCV_CFLAGS) AC_SUBST(OPENCV_LIBS) |
