robotflow-cvs — CVS changes are sent to this mailing list.

[Robotflow-cvs] RobotFlow/MARIE/src Makefile.am,1.3,1.4

[Dominic L?t. <ma...@us...>]

Update of /cvsroot/robotflow/RobotFlow/MARIE/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20171/MARIE/src

Modified Files:
	Makefile.am 
Log Message:
now working make rpm

Index: Makefile.am
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Makefile.am	31 May 2004 14:58:16 -0000	1.3
--- Makefile.am	31 May 2004 20:15:33 -0000	1.4
***************
*** 18,25 ****
  
  install-data-local:
! 	echo "Installing libRFMarie FlowDesigner toolbox"
! 	mkdir -p $(OVERFLOW_DATA)/$(PACKAGE)
! 	(perl $(OVERFLOW_BIN)/info2def.pl $(libRFMarie_la_SOURCES) > $(OVERFLOW_DATA)/$(PACKAGE)/RFMarie.def)
! 	(cd $(OVERFLOW_DATA)/$(PACKAGE); rm -f RFMarie.tlb; ln -s lib/libRFMarie.so RFMarie.tlb)
  
  
--- 18,25 ----
  
  install-data-local:
! 	echo "Installing libRFMarie FlowDesigner toolbox in $(libdir)"
! 	mkdir -p $(libdir)
! 	(perl $(OVERFLOW_BIN)/info2def.pl $(libRFMarie_la_SOURCES) > $(prefix)/RFMarie.def)
! 	(cd $(libdir); rm -f RFMarie.tlb; ln -s libRFMarie.so RFMarie.tlb)
  
  

[Robotflow-cvs] RobotFlow/Generic/src Makefile.am,1.3,1.4

[Dominic L?t. <ma...@us...>]

Update of /cvsroot/robotflow/RobotFlow/Generic/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20171/Generic/src

Modified Files:
	Makefile.am 
Log Message:
now working make rpm

Index: Makefile.am
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/Generic/src/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Makefile.am	27 May 2004 00:27:23 -0000	1.3
--- Makefile.am	31 May 2004 20:15:33 -0000	1.4
***************
*** 4,9 ****
  #AUTOMAKE_OPTIONS = no-dependencies
  
- #override libdir=$(OVERFLOW_DATA)/$(PACKAGE)
- 
  lib_LTLIBRARIES = libRF_Generic.la
  
--- 4,7 ----
***************
*** 21,26 ****
  
  install-data-local:
! 	echo "Installing libRF_Generic"
! 	mkdir -p $(OVERFLOW_DATA)/$(PACKAGE)
! 	(perl $(OVERFLOW_BIN)/info2def.pl $(libRF_Generic_la_SOURCES) > $(OVERFLOW_DATA)/$(PACKAGE)/RF_Generic.def)
! 	(rm -f $(OVERFLOW_DATA)/$(PACKAGE)/RF_Generic.tlb; cd $(OVERFLOW_DATA)/$(PACKAGE); ln -s lib/libRF_Generic.so RF_Generic.tlb)
--- 19,24 ----
  
  install-data-local:
! 	echo "Installing libRF_Generic in $(libdir)"
! 	mkdir -p $(libdir)
! 	(perl $(OVERFLOW_BIN)/info2def.pl $(libRF_Generic_la_SOURCES) > $(prefix)/RF_Generic.def)
! 	(rm -f $(libdir)/RF_Generic.tlb; cd $(libdir); ln -s libRF_Generic.so RF_Generic.tlb)

[Robotflow-cvs] RobotFlow/Generic/n-files Makefile.am,1.3,1.4

[Dominic L?t. <ma...@us...>]

Update of /cvsroot/robotflow/RobotFlow/Generic/n-files
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20171/Generic/n-files

Modified Files:
	Makefile.am 
Log Message:
now working make rpm

Index: Makefile.am
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/Generic/n-files/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Makefile.am	27 May 2004 00:27:23 -0000	1.3
--- Makefile.am	31 May 2004 20:15:33 -0000	1.4
***************
*** 1,5 ****
  #AUTOMAKE_OPTIONS = no-dependencies
  
! toolboxdir = $(OVERFLOW_DATA)/$(PACKAGE)
  
  toolbox_DATA = RobotSonars.n RobotConnect.n RobotPTZ.n
--- 1,5 ----
  #AUTOMAKE_OPTIONS = no-dependencies
  
! toolboxdir = $(prefix)
  
  toolbox_DATA = RobotSonars.n RobotConnect.n RobotPTZ.n

[Robotflow-cvs] RobotFlow/FSM/src Makefile.am,1.7,1.8

[Dominic L?t. <ma...@us...>]

Update of /cvsroot/robotflow/RobotFlow/FSM/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20171/FSM/src

Modified Files:
	Makefile.am 
Log Message:
now working make rpm

Index: Makefile.am
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/FSM/src/Makefile.am,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Makefile.am	27 May 2004 00:27:23 -0000	1.7
--- Makefile.am	31 May 2004 20:15:32 -0000	1.8
***************
*** 18,23 ****
  
  install-data-local:
! 	echo "Installing libRF_FSM"
! 	mkdir -p $(OVERFLOW_DATA)/$(PACKAGE)
! 	(perl $(OVERFLOW_BIN)/info2def.pl $(libRF_FSM_la_SOURCES) > $(OVERFLOW_DATA)/$(PACKAGE)/RF_FSM.def)
! 	(rm -f $(OVERFLOW_DATA)/$(PACKAGE)/RF_FSM.tlb; cd $(OVERFLOW_DATA)/$(PACKAGE); ln -s lib/libRF_FSM.so RF_FSM.tlb)
--- 18,23 ----
  
  install-data-local:
! 	echo "Installing libRF_FSM in $(libdir)"
! 	mkdir -p $(libdir)
! 	(perl $(OVERFLOW_BIN)/info2def.pl $(libRF_FSM_la_SOURCES) > $(prefix)/RF_FSM.def)
! 	(rm -f $(libdir)/RF_FSM.tlb; cd $(libdir); ln -s libRF_FSM.so RF_FSM.tlb)

[Robotflow-cvs] RobotFlow/Devices/src Makefile.am,1.9,1.10

[Dominic L?t. <ma...@us...>]

Update of /cvsroot/robotflow/RobotFlow/Devices/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20171/Devices/src

Modified Files:
	Makefile.am 
Log Message:
now working make rpm

Index: Makefile.am
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/Devices/src/Makefile.am,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Makefile.am	27 May 2004 00:27:22 -0000	1.9
--- Makefile.am	31 May 2004 20:15:32 -0000	1.10
***************
*** 4,10 ****
  #AUTOMAKE_OPTIONS = no-dependencies
  
- 
- #override libdir=$(OVERFLOW_DATA)/$(PACKAGE)
- 
  lib_LTLIBRARIES = libDevices.la
  
--- 4,7 ----
***************
*** 23,28 ****
  
  install-data-local:
! 	echo "Installing libDevices"
! 	mkdir -p $(OVERFLOW_DATA)/$(PACKAGE)
! 	(perl $(OVERFLOW_BIN)/info2def.pl $(libDevices_la_SOURCES) > $(OVERFLOW_DATA)/$(PACKAGE)/Devices.def)
! 	(rm -f $(OVERFLOW_DATA)/$(PACKAGE)/Devices.tlb; cd $(OVERFLOW_DATA)/$(PACKAGE); ln -s lib/libDevices.so Devices.tlb)
--- 20,25 ----
  
  install-data-local:
! 	echo "Installing libDevices in $(libdir)"
! 	mkdir -p $(libdir)
! 	(perl $(OVERFLOW_BIN)/info2def.pl $(libDevices_la_SOURCES) > $(prefix)/Devices.def)
! 	(rm -f $(libdir)/Devices.tlb; cd $(libdir); ln -s libDevices.so Devices.tlb)

[Robotflow-cvs] RobotFlow/MARIE/src Makefile.am,1.2,1.3

[Dominic L?t. <ma...@us...>]

Update of /cvsroot/robotflow/RobotFlow/MARIE/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18910/MARIE/src

Modified Files:
	Makefile.am 
Log Message:
auto-detection of player properly

Index: Makefile.am
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Makefile.am	30 May 2004 14:18:31 -0000	1.2
--- Makefile.am	31 May 2004 14:58:16 -0000	1.3
***************
*** 21,25 ****
  	mkdir -p $(OVERFLOW_DATA)/$(PACKAGE)
  	(perl $(OVERFLOW_BIN)/info2def.pl $(libRFMarie_la_SOURCES) > $(OVERFLOW_DATA)/$(PACKAGE)/RFMarie.def)
! 	(cd $(OVERFLOW_DATA)/$(PACKAGE); rm -f RFMarie.tlb; ln -s libRFMarie.so RFMarie.tlb)
  
  
--- 21,25 ----
  	mkdir -p $(OVERFLOW_DATA)/$(PACKAGE)
  	(perl $(OVERFLOW_BIN)/info2def.pl $(libRFMarie_la_SOURCES) > $(OVERFLOW_DATA)/$(PACKAGE)/RFMarie.def)
! 	(cd $(OVERFLOW_DATA)/$(PACKAGE); rm -f RFMarie.tlb; ln -s lib/libRFMarie.so RFMarie.tlb)
  
  

[Robotflow-cvs] RobotFlow configure.in,1.40,1.41

[Dominic L?t. <ma...@us...>]

Update of /cvsroot/robotflow/RobotFlow
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18910

Modified Files:
	configure.in 
Log Message:
auto-detection of player properly

Index: configure.in
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/configure.in,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** configure.in	31 May 2004 14:02:29 -0000	1.40
--- configure.in	31 May 2004 14:58:15 -0000	1.41
***************
*** 120,128 ****
  	AM_CONDITIONAL(WITH_PLAYER,true)
  else
! 	dnl test for player with prefix
! 	if test -e "$prefix/bin/player"; then
! 		AC_MSG_RESULT("found in $prefix")  
! 		PLAYER_LIBS="-L$prefix/lib -lplayerc -lplayercclient -lplayerclient -lplayerpacket -lplayerqueue"
!     	PLAYER_INCLUDES="-I$prefix/include"
      	PLAYER_FOUND="yes"
      	AM_CONDITIONAL(WITH_PLAYER,true)	
--- 120,130 ----
  	AM_CONDITIONAL(WITH_PLAYER,true)
  else
! 
! 	dnl test for player with prefix & PATH
! 	AC_PATH_PROG(PLAYER_BIN,player,no,$PATH:$prefix/bin:$prefix/player/bin)
!     if test "$PLAYER_BIN" != no; then
! 		PLAYER_DIR=`which $PLAYER_BIN | sed 's/bin\/player$//' `
! 		PLAYER_LIBS="-L$PLAYER_DIR/lib -lplayerc -lplayercclient -lplayerclient -lplayerpacket -lplayerqueue"
!     	PLAYER_INCLUDES="-I$PLAYER_DIR/include"
      	PLAYER_FOUND="yes"
      	AM_CONDITIONAL(WITH_PLAYER,true)	
***************
*** 165,169 ****
  if test -n "$ACE_FOUND" && test -n "$MARIE_DIR"; then
  	AC_MSG_RESULT("Using MARIE in $MARIE_DIR")	
! 	MARIE_LIBS="-L$MARIE_DIR/lib -lmariedata"
  	MARIE_INCLUDES="-I$MARIE_DIR/include"
  	MARIE_FOUND="yes"
--- 167,171 ----
  if test -n "$ACE_FOUND" && test -n "$MARIE_DIR"; then
  	AC_MSG_RESULT("Using MARIE in $MARIE_DIR")	
! 	MARIE_LIBS="-L$MARIE_DIR/lib -lmariedata -lmariecommon"
  	MARIE_INCLUDES="-I$MARIE_DIR/include"
  	MARIE_FOUND="yes"

[Robotflow-cvs] RobotFlow/MARIE/src MarieCommandBehavior.cpp,1.1,1.2 MarieCommandCamera.cpp,1.1,1.2 MarieCommandMotor.cpp,1.1,1.2 MarieDataCamera.cpp,1.1,1.2 MarieDataLaser.cpp,1.1,1.2 MarieDataOdometry.cpp,1.1,1.2 MarieDataSonar.cpp,1.1,1.2 MarieLoad.cpp,1.1,1.2 MarieSave.cpp,1.1,1.2

[Dominic L?t. <ma...@us...>]

Update of /cvsroot/robotflow/RobotFlow/MARIE/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9591

Modified Files:
	MarieCommandBehavior.cpp MarieCommandCamera.cpp 
	MarieCommandMotor.cpp MarieDataCamera.cpp MarieDataLaser.cpp 
	MarieDataOdometry.cpp MarieDataSonar.cpp MarieLoad.cpp 
	MarieSave.cpp 
Log Message:
fixed category for MARIE blocks

Index: MarieDataSonar.cpp
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MarieDataSonar.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MarieDataSonar.cpp	30 May 2004 12:34:07 -0000	1.1
--- MarieDataSonar.cpp	31 May 2004 14:10:09 -0000	1.2
***************
*** 31,35 ****
     *
     * @name MarieDataSonar
!    * @category MARIE:DATA
     * @description Save an object
     *
--- 31,35 ----
     *
     * @name MarieDataSonar
!    * @category RobotFlow:MARIE:DATA
     * @description Save an object
     *

Index: MarieLoad.cpp
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MarieLoad.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MarieLoad.cpp	30 May 2004 12:34:07 -0000	1.1
--- MarieLoad.cpp	31 May 2004 14:10:09 -0000	1.2
***************
*** 33,37 ****
     *
     * @name MarieLoad
!    * @category MARIE:IO
     * @description Save an object
     *
--- 33,37 ----
     *
     * @name MarieLoad
!    * @category RobotFlow:MARIE:IO
     * @description Save an object
     *

Index: MarieDataOdometry.cpp
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MarieDataOdometry.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MarieDataOdometry.cpp	30 May 2004 12:34:07 -0000	1.1
--- MarieDataOdometry.cpp	31 May 2004 14:10:09 -0000	1.2
***************
*** 30,34 ****
     *
     * @name MarieDataOdometry
!    * @category MARIE:DATA
     * @description Read content of MarieDataOdometry
     *
--- 30,34 ----
     *
     * @name MarieDataOdometry
!    * @category RobotFlow:MARIE:DATA
     * @description Read content of MarieDataOdometry
     *

Index: MarieDataLaser.cpp
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MarieDataLaser.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MarieDataLaser.cpp	30 May 2004 12:34:07 -0000	1.1
--- MarieDataLaser.cpp	31 May 2004 14:10:09 -0000	1.2
***************
*** 32,36 ****
     *
     * @name MarieDataLaser
!    * @category MARIE:DATA
     * @description Save an object
     *
--- 32,36 ----
     *
     * @name MarieDataLaser
!    * @category RobotFlow:MARIE:DATA
     * @description Save an object
     *

Index: MarieSave.cpp
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MarieSave.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MarieSave.cpp	30 May 2004 12:34:07 -0000	1.1
--- MarieSave.cpp	31 May 2004 14:10:09 -0000	1.2
***************
*** 33,37 ****
     *
     * @name MarieSave
!    * @category MARIE:IO
     * @description Save an object
     *
--- 33,37 ----
     *
     * @name MarieSave
!    * @category RobotFlow:MARIE:IO
     * @description Save an object
     *

Index: MarieCommandMotor.cpp
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MarieCommandMotor.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MarieCommandMotor.cpp	30 May 2004 12:34:07 -0000	1.1
--- MarieCommandMotor.cpp	31 May 2004 14:10:09 -0000	1.2
***************
*** 31,35 ****
     *
     * @name MarieCommandMotor
!    * @category MARIE:COMMAND
     * @description Save an object
     *
--- 31,35 ----
     *
     * @name MarieCommandMotor
!    * @category RobotFlow:MARIE:COMMAND
     * @description Save an object
     *

Index: MarieCommandCamera.cpp
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MarieCommandCamera.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MarieCommandCamera.cpp	30 May 2004 12:34:07 -0000	1.1
--- MarieCommandCamera.cpp	31 May 2004 14:10:09 -0000	1.2
***************
*** 31,35 ****
     *
     * @name MarieCommandCamera
!    * @category MARIE:COMMAND
     * @description Read & Create MarieCommandCamera data object
     *
--- 31,35 ----
     *
     * @name MarieCommandCamera
!    * @category RobotFlow:MARIE:COMMAND
     * @description Read & Create MarieCommandCamera data object
     *

Index: MarieCommandBehavior.cpp
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MarieCommandBehavior.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MarieCommandBehavior.cpp	30 May 2004 12:34:07 -0000	1.1
--- MarieCommandBehavior.cpp	31 May 2004 14:10:09 -0000	1.2
***************
*** 33,37 ****
     *
     * @name MarieCommandBehavior
!    * @category MARIE:COMMAND
     * @description Save an object
     *
--- 33,37 ----
     *
     * @name MarieCommandBehavior
!    * @category RobotFlow:MARIE:COMMAND
     * @description Save an object
     *

Index: MarieDataCamera.cpp
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MarieDataCamera.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MarieDataCamera.cpp	30 May 2004 12:34:07 -0000	1.1
--- MarieDataCamera.cpp	31 May 2004 14:10:09 -0000	1.2
***************
*** 31,35 ****
     *
     * @name MarieDataCamera
!    * @category MARIE:DATA
     * @description Save an object
     *
--- 31,35 ----
     *
     * @name MarieDataCamera
!    * @category RobotFlow:MARIE:DATA
     * @description Save an object
     *

[Robotflow-cvs] RobotFlow configure.in,1.39,1.40

[Dominic L?t. <ma...@us...>]

Update of /cvsroot/robotflow/RobotFlow
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7986

Modified Files:
	configure.in 
Log Message:
fixed player configuration with prefix

Index: configure.in
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/configure.in,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** configure.in	31 May 2004 13:55:47 -0000	1.39
--- configure.in	31 May 2004 14:02:29 -0000	1.40
***************
*** 123,127 ****
  	if test -e "$prefix/bin/player"; then
  		AC_MSG_RESULT("found in $prefix")  
! 		PLAYER_LIBS="-L$/lib prefix -lplayerc -lplayercclient -lplayerclient -lplayerpacket -lplayerqueue"
      	PLAYER_INCLUDES="-I$prefix/include"
      	PLAYER_FOUND="yes"
--- 123,127 ----
  	if test -e "$prefix/bin/player"; then
  		AC_MSG_RESULT("found in $prefix")  
! 		PLAYER_LIBS="-L$prefix/lib -lplayerc -lplayercclient -lplayerclient -lplayerpacket -lplayerqueue"
      	PLAYER_INCLUDES="-I$prefix/include"
      	PLAYER_FOUND="yes"

[Robotflow-cvs] RobotFlow configure.in,1.38,1.39

[Dominic L?t. <ma...@us...>]

Update of /cvsroot/robotflow/RobotFlow
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6647

Modified Files:
	configure.in 
Log Message:
using new marie-config script

Index: configure.in
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/configure.in,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** configure.in	31 May 2004 12:53:27 -0000	1.38
--- configure.in	31 May 2004 13:55:47 -0000	1.39
***************
*** 170,177 ****
  	AM_CONDITIONAL(WITH_MARIE,true)
  else
! 	AC_MSG_RESULT("MARIE disabled.")	
! 	MARIE_LIBS=""
! 	MARIE_INCLUDES=""
! 	AM_CONDITIONAL(WITH_MARIE,false)
  fi
  
--- 170,186 ----
  	AM_CONDITIONAL(WITH_MARIE,true)
  else
! 
! 	AC_PATH_PROG(MARIE_CONFIG,marie-config,no,$PATH:$prefix/bin:$prefix/marie/bin)
! 	if test "$MARIE_CONFIG" != no; then
! 		MARIE_LIBS=`$MARIE_CONFIG --libs libmariedata libmariecommon`
! 		MARIE_INCLUDES=`$MARIE_CONFIG --cflags libmariedata libmariecommon`
! 		MARIE_FOUND="yes"
! 		AM_CONDITIONAL(WITH_MARIE,true)
! 	else
! 		AC_MSG_RESULT("MARIE disabled.")	
! 		MARIE_LIBS=""
! 		MARIE_INCLUDES=""
! 		AM_CONDITIONAL(WITH_MARIE,false)
! 	fi
  fi
  

[Robotflow-cvs] RobotFlow configure.in,1.37,1.38

[Dominic L?t. <ma...@us...>]

Update of /cvsroot/robotflow/RobotFlow
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27114

Modified Files:
	configure.in 
Log Message:
detecting player in prefix

Index: configure.in
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/configure.in,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** configure.in	31 May 2004 12:31:41 -0000	1.37
--- configure.in	31 May 2004 12:53:27 -0000	1.38
***************
*** 114,118 ****
  dnl test which PLAYER_DIR
  if test -n "$PLAYER_DIR"; then
! 	AC_MSG_RESULT(found in $PLAYER_DIR)
  	PLAYER_LIBS="-L$PLAYER_DIR/lib -lplayerc -lplayercclient -lplayerclient -lplayerpacket -lplayerqueue"	
  	PLAYER_INCLUDES="-I$PLAYER_DIR/include"
--- 114,118 ----
  dnl test which PLAYER_DIR
  if test -n "$PLAYER_DIR"; then
! 	AC_MSG_RESULT("found in $PLAYER_DIR")
  	PLAYER_LIBS="-L$PLAYER_DIR/lib -lplayerc -lplayercclient -lplayerclient -lplayerpacket -lplayerqueue"	
  	PLAYER_INCLUDES="-I$PLAYER_DIR/include"
***************
*** 120,124 ****
  	AM_CONDITIONAL(WITH_PLAYER,true)
  else
! 	AM_CONDITIONAL(WITH_PLAYER,false)
  fi
  
--- 120,133 ----
  	AM_CONDITIONAL(WITH_PLAYER,true)
  else
! 	dnl test for player with prefix
! 	if test -e "$prefix/bin/player"; then
! 		AC_MSG_RESULT("found in $prefix")  
! 		PLAYER_LIBS="-L$/lib prefix -lplayerc -lplayercclient -lplayerclient -lplayerpacket -lplayerqueue"
!     	PLAYER_INCLUDES="-I$prefix/include"
!     	PLAYER_FOUND="yes"
!     	AM_CONDITIONAL(WITH_PLAYER,true)	
!     else
! 		AM_CONDITIONAL(WITH_PLAYER,false)
! 	fi
  fi
  

[Robotflow-cvs] RobotFlow RobotFlow.spec.in,1.1,1.2 configure.in,1.36,1.37

[Dominic L?t. <ma...@us...>]

Update of /cvsroot/robotflow/RobotFlow
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23844

Modified Files:
	RobotFlow.spec.in configure.in 
Log Message:
using the prefix specified by the user

Index: RobotFlow.spec.in
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/RobotFlow.spec.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** RobotFlow.spec.in	30 May 2004 10:19:19 -0000	1.1
--- RobotFlow.spec.in	31 May 2004 12:31:40 -0000	1.2
***************
*** 31,35 ****
  export CXXFLAGS='-O3 -march=pentium'
  export CFLAGS='-O3 -march=pentium'
! ./configure --prefix=/usr --disable-static
  %{__make}
  
--- 31,35 ----
  export CXXFLAGS='-O3 -march=pentium'
  export CFLAGS='-O3 -march=pentium'
! ./configure --prefix=/usr/lib/flowdesigner/toolbox/RobotFlow --disable-static
  %{__make}
  

Index: configure.in
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/configure.in,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** configure.in	30 May 2004 14:13:57 -0000	1.36
--- configure.in	31 May 2004 12:31:41 -0000	1.37
***************
*** 195,199 ****
  XML2_LIB=`$XML2_CONFIG --libs`
  
! prefix=$OVERFLOW_DATA/$PACKAGE
  
  AC_SUBST(GNOME_LIB)
--- 195,206 ----
  XML2_LIB=`$XML2_CONFIG --libs`
  
! 
! dnl Look for prefix, if not specified, use FlowDesigner default toolbox prefix
! if test "x$prefix" = "xNONE"; then
!   prefix=$OVERFLOW_DATA/$PACKAGE                      
! else
!   dnl this will work, but we should maybe change the variable name
!   OVERFLOW_DATA=$prefix
! fi
  
  AC_SUBST(GNOME_LIB)
***************
*** 277,278 ****
--- 284,287 ----
  fi
  
+ AC_MSG_RESULT([$PACKAGE will be installed in : $prefix])
+ 

[Robotflow-cvs] RobotFlow/MARIE/src Makefile.am,1.1,1.2

[Dominic L?t. <ma...@us...>]

Update of /cvsroot/robotflow/RobotFlow/MARIE/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4133/MARIE/src

Modified Files:
	Makefile.am 
Log Message:
detecting MARIE properly, fixed FlowDesigner includes

Index: Makefile.am
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Makefile.am	30 May 2004 12:34:07 -0000	1.1
--- Makefile.am	30 May 2004 14:18:31 -0000	1.2
***************
*** 3,7 ****
  #AUTOMAKE_OPTIONS = no-dependencies
  
! INCLUDES = $(ACE_INCLUDES) $(FLOWDESIGNER_INCLUDE) $(MARIE_INCLUDES) -I../include -I../../Behaviors/include
  
  lib_LTLIBRARIES = libRFMarie.la 
--- 3,7 ----
  #AUTOMAKE_OPTIONS = no-dependencies
  
! INCLUDES = $(ACE_INCLUDES) $(OVERFLOW_INCLUDE) $(MARIE_INCLUDES) -I../include -I../../Behaviors/include
  
  lib_LTLIBRARIES = libRFMarie.la 

[Robotflow-cvs] RobotFlow configure.in,1.35,1.36

[Dominic L?t. <ma...@us...>]

Update of /cvsroot/robotflow/RobotFlow
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3449

Modified Files:
	configure.in 
Log Message:
detecting MARIE properly

Index: configure.in
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/configure.in,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** configure.in	30 May 2004 12:47:50 -0000	1.35
--- configure.in	30 May 2004 14:13:57 -0000	1.36
***************
*** 127,131 ****
  ACE_FOUND=""
  
! AC_ARG_WITH(ACE, [  --with-ACE              Where ACE is installed (/usr/local)], ACE_DIR="$withval";ACE_BASE=$withval)
  
  dnl test which ACE_DIR, std way
--- 127,131 ----
  ACE_FOUND=""
  
! AC_ARG_WITH(ACE, [  --with-ACE              Where ACE is installed (/usr/local)], ACE_DIR="$withval")
  
  dnl test which ACE_DIR, std way
***************
*** 134,148 ****
  	ACE_INCLUDES="-I$ACE_DIR/include"
  	AC_MSG_RESULT("found ACE_wrappers in $ACE_DIR")	
! 	ACE_FOUND = "yes"
  fi
  
  dnl test with ACE_ROOT 
! if test -n "$ACE_FOUND" && test -n "$ACE_ROOT"; then
  	dnl Now attempting in a ACE_wrappers style.	
  	AC_MSG_RESULT("found ACE_wrappers in $ACE_ROOT")
- 	ACE_INCLUDE="$ACE_BASE"	
  	ACE_LIBS="-L$ACE_ROOT/ace -lACE"
  	ACE_INCLUDES="-I$ACE_ROOT"
! 	ACE_FOUND = "yes"
  fi
  
--- 134,147 ----
  	ACE_INCLUDES="-I$ACE_DIR/include"
  	AC_MSG_RESULT("found ACE_wrappers in $ACE_DIR")	
! 	ACE_FOUND="yes"
  fi
  
  dnl test with ACE_ROOT 
! if test -z "$ACE_FOUND" && test -n "$ACE_ROOT"; then
  	dnl Now attempting in a ACE_wrappers style.	
  	AC_MSG_RESULT("found ACE_wrappers in $ACE_ROOT")
  	ACE_LIBS="-L$ACE_ROOT/ace -lACE"
  	ACE_INCLUDES="-I$ACE_ROOT"
! 	ACE_FOUND="yes"
  fi
  
***************
*** 152,156 ****
  MARIE_FOUND=""
  
! AC_ARG_WITH(ACE, [  --with-MARIE              Where MARIE is installed (/usr/local)], MARIE_DIR="$withval";MARIE_BASE=$withval)
  
  dnl Test for MARIE (Dominic Letourneau)
--- 151,155 ----
  MARIE_FOUND=""
  
! AC_ARG_WITH(MARIE, [  --with-MARIE              Where MARIE is installed (/usr/local)], MARIE_DIR="$withval")
  
  dnl Test for MARIE (Dominic Letourneau)
***************
*** 159,163 ****
  	MARIE_LIBS="-L$MARIE_DIR/lib -lmariedata"
  	MARIE_INCLUDES="-I$MARIE_DIR/include"
! 	MARIE_FOUND = "yes"
  	AM_CONDITIONAL(WITH_MARIE,true)
  else
--- 158,162 ----
  	MARIE_LIBS="-L$MARIE_DIR/lib -lmariedata"
  	MARIE_INCLUDES="-I$MARIE_DIR/include"
! 	MARIE_FOUND="yes"
  	AM_CONDITIONAL(WITH_MARIE,true)
  else

[Robotflow-cvs] RobotFlow configure.in,1.34,1.35

[Dominic L?t. <ma...@us...>]

Update of /cvsroot/robotflow/RobotFlow
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22425

Modified Files:
	configure.in 
Log Message:
updated configure to detect Player properly

Index: configure.in
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/configure.in,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** configure.in	30 May 2004 12:34:07 -0000	1.34
--- configure.in	30 May 2004 12:47:50 -0000	1.35
***************
*** 114,123 ****
  dnl test which PLAYER_DIR
  if test -n "$PLAYER_DIR"; then
!       AC_MSG_RESULT(found in $PLAYER_DIR)
!       PLAYER_LIBS="-L$PLAYER_DIR/lib -lplayerc -lplayercclient -lplayerclient -lplayerpacket -lplayerqueue"
!       PLAYER_INCLUDES="-I$PLAYER_DIR/include"
! 	  AM_CONDITIONAL(WITH_PLAYER,true)
  else
! 	  AM_CONDITIONAL(WITH_PLAYER,false)
  fi
  
--- 114,124 ----
  dnl test which PLAYER_DIR
  if test -n "$PLAYER_DIR"; then
! 	AC_MSG_RESULT(found in $PLAYER_DIR)
! 	PLAYER_LIBS="-L$PLAYER_DIR/lib -lplayerc -lplayercclient -lplayerclient -lplayerpacket -lplayerqueue"	
! 	PLAYER_INCLUDES="-I$PLAYER_DIR/include"
! 	PLAYER_FOUND="yes"
! 	AM_CONDITIONAL(WITH_PLAYER,true)
  else
! 	AM_CONDITIONAL(WITH_PLAYER,false)
  fi
  
***************
*** 150,153 ****
--- 151,155 ----
  
  MARIE_FOUND=""
+ 
  AC_ARG_WITH(ACE, [  --with-MARIE              Where MARIE is installed (/usr/local)], MARIE_DIR="$withval";MARIE_BASE=$withval)
  

[Robotflow-cvs] RobotFlow/MARIE/src Makefile.am,NONE,1.1 MarieCommandBehavior.cpp,NONE,1.1 MarieCommandCamera.cpp,NONE,1.1 MarieCommandMotor.cpp,NONE,1.1 MarieDataCamera.cpp,NONE,1.1 MarieDataLaser.cpp,NONE,1.1 MarieDataOdometry.cpp,NONE,1.1 MarieDataSonar.cpp,NONE,1.1 MarieLoad.cpp,NONE,1.1 MarieObject.cpp,NONE,1.1 MarieSave.cpp,NONE,1.1

[Dominic L?t. <ma...@us...>]

Update of /cvsroot/robotflow/RobotFlow/MARIE/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19834/MARIE/src

Added Files:
	Makefile.am MarieCommandBehavior.cpp MarieCommandCamera.cpp 
	MarieCommandMotor.cpp MarieDataCamera.cpp MarieDataLaser.cpp 
	MarieDataOdometry.cpp MarieDataSonar.cpp MarieLoad.cpp 
	MarieObject.cpp MarieSave.cpp 
Log Message:
first MARIE blocks merged, fixed configure to support MARIE

--- NEW FILE: MarieCommandCamera.cpp ---
/*
*    MARIE - Mobile and Autonomous Robotics Integration Environment
*    Copyright (C) 2004 Carle Cote
*
*    This library is free software; you can redistribute it and/or
*    modify it under the terms of the GNU Lesser General Public
*    License as published by the Free Software Foundation; either
*    version 2.1 of the License, or (at your option) any later version.
*
*    This library is distributed in the hope that it will be useful,
*    but WITHOUT ANY WARRANTY; without even the implied warranty of
*    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
*    Lesser General Public License for more details.
*
*    You should have received a copy of the GNU Lesser General Public
*    License along with this library; if not, write to the Free Software
*    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
*    You can contact MARIE development team at http://marie.sourceforge.net
*/
#include "MarieCommandCamera.h"
#include <sstream>
#include <string>

#include "MarieXMLDataFactory.h"

namespace marie
{
  DECLARE_NODE(MarieCommandCamera)
  /*Node
   *
   * @name MarieCommandCamera
   * @category MARIE:COMMAND
   * @description Read & Create MarieCommandCamera data object
   *
   * @input_name COMMAND_CAMERA
   * @input_type Input MarieCommandCamera
   * @input_description input ComandCamera, nilObject if not used
   *
   * @input_name BRIGHTNESS
   * @input_type int
   * @input_description input brightness, nilObject if not used
   *
   * @input_name CONTRAST
   * @input_type int
   * @input_description input contrast, nilObject if not used
   * 
   * @input_name PAN
   * @input_type int 
   * @input_description input pan, nilObject if not used
   *
   * @input_name TILT
   * @input_type int
   * @input_description input tilt, nilObject if not used
   *
   * @input_name ZOOM
   * @input_type input zoom, nilObject if not used
   * @input_description 
   * 
   * @output_name COMMAND_CAMERA
   * @output_type MarieCommandCamera
   * @output_description Output CommandCamera (with new pan,tilt,zoom, brightness, contrast)
   *
   * @output_name BRIGHTNESS
   * @output_type int
   * @output_description output brightness
   *
   * @output_name CONTRAST
   * @output_type int 
   * @output_description output contrast
   * 
   * @output_name PAN
   * @output_type int
   * @output_description output pan
   *
   * @output_name TILT
   * @output_type int
   * @output_description output tilt
   *
   * @output_name ZOOM
   * @output_type zoom
   * @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_brightnessInID = addInput("BRIGHTNESS");
     m_contrastInID = addInput("CONTRAST");
     m_panInID = addInput("PAN");
     m_tiltInID = addInput("TILT");
     m_zoomInID = addInput("ZOOM");
     
     //outputs
     m_commandOutID = addOutput("COMMAND_CAMERA");
     m_brightnessOutID = addOutput("BRIGHTNESS");   
     m_contrastOutID = addOutput("CONTRAST");
     m_panOutID = addOutput("PAN");
     m_tiltOutID = addOutput("TILT");
     m_zoomOutID = addOutput("ZOOM");     
  }
  
  void MarieCommandCamera::calculate(int output_id, int count, Buffer &out)
  {
      if (m_isNode)
      {
         MarieCommandCamera *command = NULL;
         int pan, tilt, zoom, contrast, brightness;
         
         //get all inputs       
         ObjectRef commandInValue = getInput(m_commandInID,count);
         ObjectRef brightnessInValue = getInput(m_brightnessInID,count);
         ObjectRef contrastInValue = getInput(m_contrastInID,count);
         ObjectRef panInValue = getInput(m_panInID,count);
         ObjectRef tiltInValue = getInput(m_tiltInID,count);
         ObjectRef zoomInValue = getInput(m_zoomInID,count);
      
         //create command object
         if (!commandInValue->isNil())
         {
            RCPtr<MarieCommandCamera> inputCommand = commandInValue;
            //copy input command
            command = new MarieCommandCamera(*inputCommand);
            command->getPTZ(pan,tilt,zoom);
            brightness = command->getBrightness();
            contrast = command->getContrast();
         }
         else
         {
            command = new MarieCommandCamera();
            pan = tilt = zoom = contrast = brightness = -1;
         }
         
         //get pan
         if (!panInValue->isNil())
         {
            RCPtr<Int> panPtr = panInValue;
            pan = *panPtr;
         }       
         //get tilt
         if (!tiltInValue->isNil())
         {
            RCPtr<Int> tiltPtr = tiltInValue;
            tilt = *tiltPtr;
         }
         //get zoom
         if (!zoomInValue->isNil())
         {
            RCPtr<Int> zoomPtr = zoomInValue;
            zoom = *zoomPtr;
         }
         //get contrast
         if (!contrastInValue->isNil())
         {
            RCPtr<Int> contrastPtr = contrastInValue;
            contrast = *contrastPtr;
         }
         //get brightness
         if (!brightnessInValue->isNil())
         {
            RCPtr<Int> brightnessPtr = brightnessInValue;
            brightness = *brightnessPtr;
         }
         
         //set PTZ
         command->setPTZ(pan,tilt,zoom);
         //set contrast
         command->setContrast(contrast);
         //cet brightness
         command->setBrightness(brightness);
         
         //output values
         (*outputs[m_brightnessOutID].buffer)[count] = ObjectRef(Int::alloc(brightness));
         (*outputs[m_commandOutID].buffer)[count] = ObjectRef(command); 
         (*outputs[m_contrastOutID].buffer)[count] = ObjectRef(Int::alloc(contrast));    
         (*outputs[m_panOutID].buffer)[count] = ObjectRef(Int::alloc(pan)); 
         (*outputs[m_tiltOutID].buffer)[count] = ObjectRef(Int::alloc(tilt)); 
         (*outputs[m_zoomOutID].buffer)[count] = ObjectRef(Int::alloc(zoom)); 
      }
      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__);
        }         
     }
           
  }
}

--- NEW FILE: MarieCommandBehavior.cpp ---
/*
*    MARIE - Mobile and Autonomous Robotics Integration Environment
*    Copyright (C) 2004 Carle Cote
*
*    This library is free software; you can redistribute it and/or
*    modify it under the terms of the GNU Lesser General Public
*    License as published by the Free Software Foundation; either
*    version 2.1 of the License, or (at your option) any later version.
*
*    This library is distributed in the hope that it will be useful,
*    but WITHOUT ANY WARRANTY; without even the implied warranty of
*    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
*    Lesser General Public License for more details.
*
*    You should have received a copy of the GNU Lesser General Public
*    License along with this library; if not, write to the Free Software
*    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
*    You can contact MARIE development team at http://marie.sourceforge.net
*/
#include "MarieCommandBehavior.h"
#include <sstream>
#include <string>

#include "MarieXMLDataFactory.h"
#include "Behavior.h"
#include "Vector.h"

namespace marie
{
  DECLARE_NODE(MarieCommandBehavior)
  /*Node
   *
   * @name MarieCommandBehavior
   * @category MARIE:COMMAND
   * @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
   *
   * @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>
   * 
  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");
     
     //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);
     
         //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);
         }
                                      
         //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 (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__);
        }      
     }
    
  }
}


--- NEW FILE: MarieDataSonar.cpp ---
/*
*    MARIE - Mobile and Autonomous Robotics Integration Environment
*    Copyright (C) 2004 Carle Cote
*
*    This library is free software; you can redistribute it and/or
*    modify it under the terms of the GNU Lesser General Public
*    License as published by the Free Software Foundation; either
*    version 2.1 of the License, or (at your option) any later version.
*
*    This library is distributed in the hope that it will be useful,
*    but WITHOUT ANY WARRANTY; without even the implied warranty of
*    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
*    Lesser General Public License for more details.
*
*    You should have received a copy of the GNU Lesser General Public
*    License along with this library; if not, write to the Free Software
*    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
*    You can contact MARIE development team at http://marie.sourceforge.net
*/
#include "MarieDataSonar.h"
#include <sstream>
#include <string>
#include "Vector.h"

#include "MarieXMLDataFactory.h"
namespace marie
{
  DECLARE_NODE(MarieDataSonar)
  /*Node
   *
   * @name MarieDataSonar
   * @category MARIE:DATA
   * @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)
  {
     if (m_isNode)
     {
        RCPtr<MarieDataSonar> sonarObject = getInput(m_inputID,count);
     
        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__);
        }      
     }
           
  }
}

--- NEW FILE: MarieObject.cpp ---
/*
*    MARIE - Mobile and Autonomous Robotics Integration Environment
*    Copyright (C) 2004 Carle Cote
*
*    This library is free software; you can redistribute it and/or
*    modify it under the terms of the GNU Lesser General Public
*    License as published by the Free Software Foundation; either
*    version 2.1 of the License, or (at your option) any later version.
*
*    This library is distributed in the hope that it will be useful,
*    but WITHOUT ANY WARRANTY; without even the implied warranty of
*    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
*    Lesser General Public License for more details.
*
*    You should have received a copy of the GNU Lesser General Public
*    License along with this library; if not, write to the Free Software
*    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
*    You can contact MARIE development team at http://marie.sourceforge.net
*/
//
// C++ Implementation: MarieObject
//
// Description: 
//
//
// Author: Dominic Letourneau <do...@la...>, (C) 2004
//
// Copyright: See COPYING file that comes with this distribution
//
//

namespace marie
{
}

--- NEW FILE: MarieLoad.cpp ---
/*
*    MARIE - Mobile and Autonomous Robotics Integration Environment
*    Copyright (C) 2004 Carle Cote
*
*    This library is free software; you can redistribute it and/or
*    modify it under the terms of the GNU Lesser General Public
*    License as published by the Free Software Foundation; either
*    version 2.1 of the License, or (at your option) any later version.
*
*    This library is distributed in the hope that it will be useful,
*    but WITHOUT ANY WARRANTY; without even the implied warranty of
*    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
*    Lesser General Public License for more details.
*
*    You should have received a copy of the GNU Lesser General Public
*    License along with this library; if not, write to the Free Software
*    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
*    You can contact MARIE development team at http://marie.sourceforge.net
*/
#include "MarieLoad.h"
#include "BufferedNode.h"
#include "Buffer.h"
#include "operators.h"
#include <sstream>
#include "Stream.h"
#include "MarieObject.h"

namespace marie
{ 
  DECLARE_NODE(MarieLoad)
  /*Node
   *
   * @name MarieLoad
   * @category MARIE:IO
   * @description Save an object
   *
   * @input_name STREAM
   * @input_type Stream
   * @input_description The input stream
   *
   * @output_name OUTPUT
   * @output_description Object
   * @output_type any
   *
  END*/


  MarieLoad::MarieLoad(string nodeName, ParameterSet params)
    : BufferedNode(nodeName, params)
  {
    m_outputID = addOutput("OUTPUT");
    m_inputID = addInput("STREAM");
  }
  
  void MarieLoad::calculate(int output_id, int count, Buffer &out)
  {  
  
     try {
     
        //default output to nilObject
        ObjectRef objValue = nilObject;
        
        //get input stream
        RCPtr<IOStream> input_stream = getInput(m_inputID,count);
        
        //instruct marie that we are gonna do a "pull"
        (*input_stream) << "<pull>";
        
        //make sure we are flushing data ?
        //input_stream->flush();
                       
        stringstream my_stream;
        
        while(1)
        {
           char c;                           
           (*input_stream).read(&c,1);
           
           my_stream << c;
           if (my_stream.str().find("</MARIE>") != string::npos) 
           {  
       if (my_stream.str().find("<?xml version=\"1.0\"?><!DOCTYPE MARIE []><MARIE>NULL</MARIE>") != string::npos) {
         cerr<<"MarieLoad : Return empty object"<<endl;
         out[count] = nilObject;
         return;
       }
       else {
              break;
       }
           }  
        }
                                                     
        DataAbstract *data = m_factory.createData(my_stream.str());
                                                  
        if (data) {                
           //create FlowDesigner type object
           objValue = Object::newObject(data->getID());         
                             
           //copy data from newly created object type
           RCPtr<MarieObject> marieObjectPtr = objValue;
           
           //copy internal data         
           marieObjectPtr->copyDataAbstract(data);                  
           
           //delete unused data
           delete data;         
        }
                          
        //output the newly created object
        out[count] = objValue;   
     }
     catch (BaseException *e)
     {
        e->print(cerr);
        delete e;
     }
     catch (...)
     {
        cerr<<"MarieLoad : Unknown exception occured"<<endl;
     }      
  }
}

--- NEW FILE: MarieDataOdometry.cpp ---
/*
*    MARIE - Mobile and Autonomous Robotics Integration Environment
*    Copyright (C) 2004 Carle Cote
*
*    This library is free software; you can redistribute it and/or
*    modify it under the terms of the GNU Lesser General Public
*    License as published by the Free Software Foundation; either
*    version 2.1 of the License, or (at your option) any later version.
*
*    This library is distributed in the hope that it will be useful,
*    but WITHOUT ANY WARRANTY; without even the implied warranty of
*    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
*    Lesser General Public License for more details.
*
*    You should have received a copy of the GNU Lesser General Public
*    License along with this library; if not, write to the Free Software
*    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
*    You can contact MARIE development team at http://marie.sourceforge.net
*/
#include "MarieDataOdometry.h"
#include <sstream>
#include <string>

#include "MarieXMLDataFactory.h"
namespace marie
{
  DECLARE_NODE(MarieDataOdometry)
  /*Node
   *
   * @name MarieDataOdometry
   * @category MARIE:DATA
   * @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)
  {
     if (m_isNode)
     {
        RCPtr<MarieDataOdometry> odometryObject = getInput(m_inputID,count);
        
        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__);
        }      
     }
           
  }
}

--- NEW FILE: MarieDataLaser.cpp ---
/*
*    MARIE - Mobile and Autonomous Robotics Integration Environment
*    Copyright (C) 2004 Carle Cote
*
*    This library is free software; you can redistribute it and/or
*    modify it under the terms of the GNU Lesser General Public
*    License as published by the Free Software Foundation; either
*    version 2.1 of the License, or (at your option) any later version.
*
*    This library is distributed in the hope that it will be useful,
*    but WITHOUT ANY WARRANTY; without even the implied warranty of
*    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
*    Lesser General Public License for more details.
*
*    You should have received a copy of the GNU Lesser General Public
*    License along with this library; if not, write to the Free Software
*    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
*    You can contact MARIE development team at http://marie.sourceforge.net
*/

#include "MarieDataLaser.h"
#include <sstream>
#include <string>
#include "MarieXMLDataFactory.h"
#include "Vector.h"

namespace marie
{
  DECLARE_NODE(MarieDataLaser)
  /*Node
   *
   * @name MarieDataLaser
   * @category MARIE:DATA
   * @description Save an object
   *
   * @input_name DATA_LASER
   * @input_type MarieDataLaser
   * @input_description MarieDataLaser object
   *
   * @output_name RANGES
   * @output_description  Range contained in the MarieDataLaser object
   * @output_type Vector<int>
   *
  END*/
  
  DECLARE_TYPE2(DataLaser::ID,MarieDataLaser)

  using namespace std;

  MarieDataLaser::MarieDataLaser()
    : MarieObject("MarieDataLaser",ParameterSet()), m_isNode(false) 
  {
  
  }
  
  MarieDataLaser::MarieDataLaser (const DataLaser &data)
    : MarieObject("MarieDataLaser",ParameterSet()), DataLaser(data),
    m_isNode(false)
  {
  
  }
  
  MarieDataLaser::MarieDataLaser(string nodeName, ParameterSet params)
    : MarieObject(nodeName,params) 
  {
    //used as a BufferedNode, create inputs & outputs
    m_inputID = addInput("DATA_LASER");
    m_outputID = addOutput("RANGES");  
  }
  
  void MarieDataLaser::calculate(int output_id, int count, Buffer &out)
  {
     if (m_isNode) 
     {
        RCPtr<MarieDataLaser> dataLaserObject = getInput(m_inputID,count);
     
        unsigned int size = dataLaserObject->getNbLaser();
        const unsigned int *ranges = dataLaserObject->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 MarieDataLaser::printOn(ostream &out) const 
  {
      
     MarieXMLDataFactory factory;
     
     //writing XML data
     string value = factory.toString((DataLaser&) (*this));
     
     out.write(value.c_str(), value.size());
  
  }
  
  
  void MarieDataLaser::readFrom(istream &in) 
  {
    throw new GeneralException("readFrom not supported. Use the MarieLoad Node to read data from the stream.",__FILE__,__LINE__);
  }
  
  void MarieDataLaser::copyDataAbstract(DataAbstract *data)
  {
     
     if (data)
     {
        DataLaser *my_data = dynamic_cast<DataLaser*>(data);
        if (my_data)
        {
           //((DataLaser*)this)->operator=(*my_data);
           this->DataLaser::operator=(*my_data);
        }
        else
        {
           throw new GeneralException(string("Unable to cast into DataLaser Abstract : ") + data->getID(),__FILE__,__LINE__);
        }      
     }
                
  }
}

--- NEW FILE: MarieSave.cpp ---
/*
*    MARIE - Mobile and Autonomous Robotics Integration Environment
*    Copyright (C) 2004 Carle Cote
*
*    This library is free software; you can redistribute it and/or
*    modify it under the terms of the GNU Lesser General Public
*    License as published by the Free Software Foundation; either
*    version 2.1 of the License, or (at your option) any later version.
*
*    This library is distributed in the hope that it will be useful,
*    but WITHOUT ANY WARRANTY; without even the implied warranty of
*    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
*    Lesser General Public License for more details.
*
*    You should have received a copy of the GNU Lesser General Public
*    License along with this library; if not, write to the Free Software
*    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
*    You can contact MARIE development team at http://marie.sourceforge.net
*/
#include "MarieSave.h"

#include "BufferedNode.h"
#include "Buffer.h"
#include "operators.h"
#include <sstream>
#include "MarieXMLDataFactory.h"

namespace marie
{
  DECLARE_NODE(MarieSave)
  /*Node
   *
   * @name MarieSave
   * @category MARIE:IO
   * @description Save an object
   *
   * @input_name INPUT
   * @input_description Object
   * @input_type any
   *
   * @input_name STREAM
   * @input_description Stream to write to
   * @input_type Stream
   *
   * @output_name OUTPUT
   * @output_description Same Object
   * @output_type any
   *
  END*/


  MarieSave::MarieSave(string nodeName, ParameterSet params)
    : BufferedNode(nodeName, params)
  {
    // inputs
    m_inputID = addInput("INPUT");
    m_streamID = addInput("STREAM");
    
    // outputs
    m_outputID = addOutput("OUTPUT");
    
  }
  
  void MarieSave::calculate(int output_id, int count, Buffer &out)
  {
    ObjectRef val = getInput(m_inputID,count);
    RCPtr<OStream> my_stream = getInput(m_streamID,count);
       
    //write data (XML format) to the stream
    MarieXMLDataFactory factory;
    
    DataAbstract *valPtr = dynamic_cast<DataAbstract*>(val.get());
    
    if (valPtr) 
    {    
       string val = factory.toString(*valPtr);
       (*my_stream).write(val.c_str(), val.size());
    }
    else
    {
       throw new GeneralException("Not a valid DataAbstract",__FILE__,__LINE__);   
    }
    
    //output the same object
    out[count] = val;
  }
}

--- NEW FILE: MarieCommandMotor.cpp ---
/*
*    MARIE - Mobile and Autonomous Robotics Integration Environment
*    Copyright (C) 2004 Carle Cote
*
*    This library is free software; you can redistribute it and/or
*    modify it under the terms of the GNU Lesser General Public
*    License as published by the Free Software Foundation; either
*    version 2.1 of the License, or (at your option) any later version.
*
*    This library is distributed in the hope that it will be useful,
*    but WITHOUT ANY WARRANTY; without even the implied warranty of
*    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
*    Lesser General Public License for more details.
*
*    You should have received a copy of the GNU Lesser General Public
*    License along with this library; if not, write to the Free Software
*    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
*    You can contact MARIE development team at http://marie.sourceforge.net
*/
#include "MarieCommandMotor.h"
#include <sstream>
#include <string>

#include "MarieXMLDataFactory.h"

namespace marie
{
  DECLARE_NODE(MarieCommandMotor)
  /*Node
   *
   * @name MarieCommandMotor
   * @category MARIE:COMMAND
   * @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, rotation;
     
        //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
        {
           command = new MarieCommandMotor();
           velocity = rotation = -1;
        }
        
        //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
        command->setVelocity(velocity);
        command->setRotation(rotation);
        
        //output result
        (*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
     {
        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__);
        }      
     }
  }
}

--- NEW FILE: Makefile.am ---
## Process this file with automake to produce Makefile.in. -*-Makefile-*-
# Disable automatic dependency tracking if using other tools than gcc and gmake
#AUTOMAKE_OPTIONS = no-dependencies

INCLUDES = $(ACE_INCLUDES) $(FLOWDESIGNER_INCLUDE) $(MARIE_INCLUDES) -I../include -I../../Behaviors/include

lib_LTLIBRARIES = libRFMarie.la 

libRFMarie_la_SOURCES = MarieLoad.cpp \
	MarieSave.cpp \
	MarieDataLaser.cpp \
	MarieDataSonar.cpp \
	MarieDataCamera.cpp \
	MarieDataOdometry.cpp \
	MarieCommandBehavior.cpp \
	MarieCommandCamera.cpp \
	MarieCommandMotor.cpp 

install-data-local:
	echo "Installing libRFMarie FlowDesigner toolbox"
	mkdir -p $(OVERFLOW_DATA)/$(PACKAGE)
	(perl $(OVERFLOW_BIN)/info2def.pl $(libRFMarie_la_SOURCES) > $(OVERFLOW_DATA)/$(PACKAGE)/RFMarie.def)
	(cd $(OVERFLOW_DATA)/$(PACKAGE); rm -f RFMarie.tlb; ln -s libRFMarie.so RFMarie.tlb)


libRFMarie_la_LDFLAGS = -release $(LT_RELEASE) $(ACE_LIBS) $(FLOWDESIGNER_LIB) \
	$(XML2_LIB) $(MARIE_LIBS)


--- NEW FILE: MarieDataCamera.cpp ---
/*
*    MARIE - Mobile and Autonomous Robotics Integration Environment
*    Copyright (C) 2004 Carle Cote
*
*    This library is free software; you can redistribute it and/or
*    modify it under the terms of the GNU Lesser General Public
*    License as published by the Free Software Foundation; either
*    version 2.1 of the License, or (at your option) any later version.
*
*    This library is distributed in the hope that it will be useful,
*    but WITHOUT ANY WARRANTY; without even the implied warranty of
*    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
*    Lesser General Public License for more details.
*
*    You should have received a copy of the GNU Lesser General Public
*    License along with this library; if not, write to the Free Software
*    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
*    You can contact MARIE development team at http://marie.sourceforge.net
*/
#include "MarieDataCamera.h"
#include <sstream>
#include <string>

#include "MarieXMLDataFactory.h"

namespace marie
{
  DECLARE_NODE(MarieDataCamera)
  /*Node
   *
   * @name MarieDataCamera
   * @category MARIE:DATA
   * @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)
  {
     if (m_isNode)
     {   
        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;
     }
     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__);
        }      
     }
     
     
  }
}

[Robotflow-cvs] RobotFlow/MARIE/include Makefile.am,NONE,1.1 MarieCommandBehavior.h,NONE,1.1 MarieCommandCamera.h,NONE,1.1 MarieCommandMotor.h,NONE,1.1 MarieDataCamera.h,NONE,1.1 MarieDataLaser.h,NONE,1.1 MarieDataOdometry.h,NONE,1.1 MarieDataSonar.h,NONE,1.1 MarieLoad.h,NONE,1.1 MarieObject.h,NONE,1.1 MarieSave.h,NONE,1.1

[Dominic L?t. <ma...@us...>]

Update of /cvsroot/robotflow/RobotFlow/MARIE/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19834/MARIE/include

Added Files:
	Makefile.am MarieCommandBehavior.h MarieCommandCamera.h 
	MarieCommandMotor.h MarieDataCamera.h MarieDataLaser.h 
	MarieDataOdometry.h MarieDataSonar.h MarieLoad.h MarieObject.h 
	MarieSave.h 
Log Message:
first MARIE blocks merged, fixed configure to support MARIE

--- NEW FILE: MarieCommandMotor.h ---
/*
*    MARIE - Mobile and Autonomous Robotics Integration Environment
*    Copyright (C) 2004 Carle Cote
*
*    This library is free software; you can redistribute it and/or
*    modify it under the terms of the GNU Lesser General Public
*    License as published by the Free Software Foundation; either
*    version 2.1 of the License, or (at your option) any later version.
*
*    This library is distributed in the hope that it will be useful,
*    but WITHOUT ANY WARRANTY; without even the implied warranty of
*    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
*    Lesser General Public License for more details.
*
*    You should have received a copy of the GNU Lesser General Public
*    License along with this library; if not, write to the Free Software
*    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
*    You can contact MARIE development team at http://marie.sourceforge.net
*/
// Prevent Multiple Inclusion
#ifndef _MARIE_COMMAND_MOTOR_H_
#define _MARIE_COMMAND_MOTOR_H_


//FlowDesigner include
#include "Object.h"
#include "MarieObject.h"

//MARIE data types include
#include "CommandMotor.h"

namespace marie
{
  class MarieCommandMotor : public MarieObject, public CommandMotor {
     
     public:
     
       
     MarieCommandMotor();    
     MarieCommandMotor(const CommandMotor &command);
     
     //from BufferedNode   
     MarieCommandMotor(string nodeName, ParameterSet params);
     virtual void calculate(int output_id, int count, Buffer &out);        
     virtual void printOn(ostream &out) const;
     virtual void readFrom(istream &in=cin);
     virtual void copyDataAbstract(DataAbstract *data);   
     
     private:
     bool m_isNode;
     
     //inputs
     int m_commandInID;
     int m_velocityInID;
     int m_rotationInID;
              
     //outputs
     int m_commandOutID;
     int m_velocityOutID;
     int m_rotationOutID;
  };
}

#endif


--- NEW FILE: MarieLoad.h ---
/*
*    MARIE - Mobile and Autonomous Robotics Integration Environment
*    Copyright (C) 2004 Carle Cote
*
*    This library is free software; you can redistribute it and/or
*    modify it under the terms of the GNU Lesser General Public
*    License as published by the Free Software Foundation; either
*    version 2.1 of the License, or (at your option) any later version.
*
*    This library is distributed in the hope that it will be useful,
*    but WITHOUT ANY WARRANTY; without even the implied warranty of
*    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
*    Lesser General Public License for more details.
*
*    You should have received a copy of the GNU Lesser General Public
*    License along with this library; if not, write to the Free Software
*    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
*    You can contact MARIE development team at http://marie.sourceforge.net
*/
// Prevent Multiple Inclusion
#ifndef _MARIE_LOAD_H_
#define _MARIE_LOAD_H_

#include "BufferedNode.h"
#include "MarieXMLDataFactory.h"

namespace marie
{
  class MarieLoad : public BufferedNode {
  
  private: 
     
     int m_inputID;  
     int m_outputID;
     
     MarieXMLDataFactory m_factory;
     
  public:
  
     MarieLoad(string nodeName, ParameterSet params);
     void calculate(int output_id, int count, Buffer &out);   
  };
}
#endif

--- NEW FILE: MarieObject.h ---
/*
*    MARIE - Mobile and Autonomous Robotics Integration Environment
*    Copyright (C) 2004 Carle Cote
*
*    This library is free software; you can redistribute it and/or
*    modify it under the terms of the GNU Lesser General Public
*    License as published by the Free Software Foundation; either
*    version 2.1 of the License, or (at your option) any later version.
*
*    This library is distributed in the hope that it will be useful,
*    but WITHOUT ANY WARRANTY; without even the implied warranty of
*    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
*    Lesser General Public License for more details.
*
*    You should have received a copy of the GNU Lesser General Public
*    License along with this library; if not, write to the Free Software
*    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
*    You can contact MARIE development team at http://marie.sourceforge.net
*/
// Prevent Multiple Inclusion
//
// C++ Interface: MARIEObject
//
// Description: 
//
//
// Author: Dominic Letourneau <do...@la...>, (C) 2004
//
// Copyright: See COPYING file that comes with this distribution
//
//
#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"


namespace marie
{
  class MarieObject : public BufferedNode {
  
   public:
     
     MarieObject(string nodeName, ParameterSet params) : BufferedNode(nodeName,params) {}
     virtual void copyDataAbstract(DataAbstract *data) = 0;
      
   private:
  
  };
}
#endif

--- NEW FILE: MarieDataSonar.h ---
/*
*    MARIE - Mobile and Autonomous Robotics Integration Environment
*    Copyright (C) 2004 Carle Cote
*
*    This library is free software; you can redistribute it and/or
*    modify it under the terms of the GNU Lesser General Public
*    License as published by the Free Software Foundation; either
*    version 2.1 of the License, or (at your option) any later version.
*
*    This library is distributed in the hope that it will be useful,
*    but WITHOUT ANY WARRANTY; without even the implied warranty of
*    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
*    Lesser General Public License for more details.
*
*    You should have received a copy of the GNU Lesser General Public
*    License along with this library; if not, write to the Free Software
*    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
*    You can contact MARIE development team at http://marie.sourceforge.net
*/
// Prevent Multiple Inclusion
#ifndef _MARIE_DATA_SONAR_H_
#define _MARIE_DATA_SONAR_H_

//FlowDesigner include
#include "Object.h"
#include "MarieObject.h"

//MARIE data types include
#include "DataSonar.h"

namespace marie
{
  class MarieDataSonar : public MarieObject, public DataSonar {
     
     public:
       
     MarieDataSonar();  
     MarieDataSonar (const DataSonar &data);  
     
     //from BufferedNode
     MarieDataSonar(string nodeName, ParameterSet params);
     virtual void calculate(int output_id, int count, Buffer &out);       
     virtual void printOn(ostream &out) const;
     virtual void readFrom(istream &in=cin);
     virtual void copyDataAbstract(DataAbstract *data); 
        
     private:
        
     int m_inputID;
     int m_rangeID;
     bool m_isNode;
        
  };
}
#endif

--- NEW FILE: MarieCommandCamera.h ---
/*
*    MARIE - Mobile and Autonomous Robotics Integration Environment
*    Copyright (C) 2004 Carle Cote
*
*    This library is free software; you can redistribute it and/or
*    modify it under the terms of the GNU Lesser General Public
*    License as published by the Free Software Foundation; either
*    version 2.1 of the License, or (at your option) any later version.
*
*    This library is distributed in the hope that it will be useful,
*    but WITHOUT ANY WARRANTY; without even the implied warranty of
*    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
*    Lesser General Public License for more details.
*
*    You should have received a copy of the GNU Lesser General Public
*    License along with this library; if not, write to the Free Software
*    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
*    You can contact MARIE development team at http://marie.sourceforge.net
*/
// Prevent Multiple Inclusion
#ifndef _MARIE_COMMAND_CAMERA_H_
#define _MARIE_COMMAND_CAMERA_H_


//FlowDesigner include
#include "Object.h"
#include "MarieObject.h"

//MARIE data types include
#include "CommandCamera.h"            

namespace marie
{
  class MarieCommandCamera : public MarieObject, public CommandCamera {
     
     public:
       
     MarieCommandCamera();  
     MarieCommandCamera(const CommandCamera &command);
     
     //from BufferedNode   
     MarieCommandCamera(string nodeName, ParameterSet params);
     virtual void calculate(int output_id, int count, Buffer &out);        
     virtual void printOn(ostream &out) const;
     virtual void readFrom(istream &in=cin);
     virtual void copyDataAbstract(DataAbstract *data);
     
     private:
     
     bool m_isNode;
        
     //inputs
     int m_commandInID;   
     int m_brightnessInID;
     int m_contrastInID;
     int m_panInID;
     int m_tiltInID;
     int m_zoomInID;
     
     //outputs
     int m_commandOutID;
     int m_brightnessOutID;
     int m_contrastOutID;
     int m_panOutID;
     int m_tiltOutID;
     int m_zoomOutID;
                
  };
}
#endif

--- NEW FILE: MarieCommandBehavior.h ---
/*
*    MARIE - Mobile and Autonomous Robotics Integration Environment
*    Copyright (C) 2004 Carle Cote
*
*    This library is free software; you can redistribute it and/or
*    modify it under the terms of the GNU Lesser General Public
*    License as published by the Free Software Foundation; either
*    version 2.1 of the License, or (at your option) any later version.
*
*    This library is distributed in the hope that it will be useful,
*    but WITHOUT ANY WARRANTY; without even the implied warranty of
*    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
*    Lesser General Public License for more details.
*
*    You should have received a copy of the GNU Lesser General Public
*    License along with this library; if not, write to the Free Software
*    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
*    You can contact MARIE development team at http://marie.sourceforge.net
*/
// Prevent Multiple Inclusion
#ifndef _MARIE_COMMAND_BEHAVIOR_H_
#define _MARIE_COMMAND_BEHAVIOR_H_

//FlowDesigner include
#include "Object.h"
#include "MarieObject.h"

//MARIE data types include
#include "CommandBehavior.h"            

namespace marie
{
  class MarieCommandBehavior : public MarieObject, public CommandBehavior {
     
     public:
     
     MarieCommandBehavior();
     MarieCommandBehavior(const CommandBehavior &command);  
     
     //from BufferedNode   
     MarieCommandBehavior(string nodeName, ParameterSet params);
     virtual void calculate(int output_id, int count, Buffer &out);    
     virtual void printOn(ostream &out) const;
     virtual void readFrom(istream &in=cin);  
     virtual void copyDataAbstract(DataAbstract *data);
     
     private:
     
     bool m_isNode;
        
     //inputs
     int m_commandInID;
     int m_behaviorNameInID;
     int m_behaviorActivationInID;
     
     //outputs
     int m_commandOutID;
     int m_RobotFlowActivationOutID;
  };
}
#endif

--- NEW FILE: MarieDataCamera.h ---
/*
*    MARIE - Mobile and Autonomous Robotics Integration Environment
*    Copyright (C) 2004 Carle Cote
*
*    This library is free software; you can redistribute it and/or
*    modify it under the terms of the GNU Lesser General Public
*    License as published by the Free Software Foundation; either
*    version 2.1 of the License, or (at your option) any later version.
*
*    This library is distributed in the hope that it will be useful,
*    but WITHOUT ANY WARRANTY; without even the implied warranty of
*    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
*    Lesser General Public License for more details.
*
*    You should have received a copy of the GNU Lesser General Public
*    License along with this library; if not, write to the Free Software
*    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
*    You can contact MARIE development team at http://marie.sourceforge.net
*/
// Prevent Multiple Inclusion
#ifndef _MARIE_DATA_CAMERA_H_
#define _MARIE_DATA_CAMERA_H_


//FlowDesigner include
#include "Object.h"
#include "MarieObject.h"

//MARIE data types include
#include "DataCamera.h"            

namespace marie
{
  class MarieDataCamera : public MarieObject, public DataCamera {
     
     public:
                 
     MarieDataCamera();  
     MarieDataCamera (const DataCamera &data);
         
     //from BufferedNode   
     MarieDataCamera(string nodeName, ParameterSet params);
     virtual void calculate(int output_id, int count, Buffer &out); 
     virtual void printOn(ostream &out) const;
     virtual void readFrom(istream &in=cin);
     virtual void copyDataAbstract(DataAbstract *data);   
     
     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;
     
  };
}
#endif


--- NEW FILE: MarieDataLaser.h ---
/*
*    MARIE - Mobile and Autonomous Robotics Integration Environment
*    Copyright (C) 2004 Carle Cote
*
*    This library is free software; you can redistribute it and/or
*    modify it under the terms of the GNU Lesser General Public
*    License as published by the Free Software Foundation; either
*    version 2.1 of the License, or (at your option) any later version.
*
*    This library is distributed in the hope that it will be useful,
*    but WITHOUT ANY WARRANTY; without even the implied warranty of
*    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
*    Lesser General Public License for more details.
*
*    You should have received a copy of the GNU Lesser General Public
*    License along with this library; if not, write to the Free Software
*    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
*    You can contact MARIE development team at http://marie.sourceforge.net
*/
// Prevent Multiple Inclusion
#ifndef _MARIE_DATA_LASER_H_
#define _MARIE_DATA_LASER_H_


//FlowDesigner include
#include "Object.h"
#include "MarieObject.h"

//MARIE data types include
#include "DataLaser.h"

namespace marie
{
  class MarieDataLaser : public MarieObject, public DataLaser {
     
     public:
     
     MarieDataLaser();
     MarieDataLaser (const DataLaser &data);
     
     //from BufferedNode
     MarieDataLaser(string nodeName, ParameterSet params);
     virtual void calculate(int output_id, int count, Buffer &out);       
     virtual void printOn(ostream &out) const;
     virtual void readFrom(istream &in=cin);
     virtual void copyDataAbstract(DataAbstract *data);  
     
     private:
     
     int m_inputID;
     int m_outputID;
     bool m_isNode;  
  };
}
#endif

--- NEW FILE: MarieDataOdometry.h ---
/*
*    MARIE - Mobile and Autonomous Robotics Integration Environment
*    Copyright (C) 2004 Carle Cote
*
*    This library is free software; you can redistribute it and/or
*    modify it under the terms of the GNU Lesser General Public
*    License as published by the Free Software Foundation; either
*    version 2.1 of the License, or (at your option) any later version.
*
*    This library is distributed in the hope that it will be useful,
*    but WITHOUT ANY WARRANTY; without even the implied warranty of
*    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
*    Lesser General Public License for more details.
*
*    You should have received a copy of the GNU Lesser General Public
*    License along with this library; if not, write to the Free Software
*    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
*    You can contact MARIE development team at http://marie.sourceforge.net
*/
// Prevent Multiple Inclusion
#ifndef _MARIE_DATA_ODOMETRY_H_
#define _MARIE_DATA_ODOMETRY_H_

//FlowDesigner include
#include "Object.h"
#include "MarieObject.h"

//MARIE data types include
#include "DataOdometry.h"

namespace marie
{
  class MarieDataOdometry : public MarieObject, public DataOdometry {
     
     public:
       
     MarieDataOdometry();  
     MarieDataOdometry (const DataOdometry &data);  
     
     //from BufferedNode
     MarieDataOdometry(string nodeName, ParameterSet params);
     virtual void calculate(int output_id, int count, Buffer &out);   
     virtual void printOn(ostream &out) const;
     virtual void readFrom(istream &in=cin);   
     virtual void copyDataAbstract(DataAbstract *data); 
     
     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;
  };
}
#endif

--- NEW FILE: Makefile.am ---
AUTOMAKE_OPTIONS = no-dependencies

noinst_HEADERS = MarieCommandBehavior.h \
		 MarieCommandMotor.h \
		 MarieDataLaser.h \
	     	 MarieDataSonar.h \
		 MarieObject.h \
		 MarieCommandCamera.h \
	      	 MarieDataCamera.h \
	      	 MarieDataOdometry.h \
		 MarieLoad.h \
	    	 MarieSave.h



--- NEW FILE: MarieSave.h ---
/*
*    MARIE - Mobile and Autonomous Robotics Integration Environment
*    Copyright (C) 2004 Carle Cote
*
*    This library is free software; you can redistribute it and/or
*    modify it under the terms of the GNU Lesser General Public
*    License as published by the Free Software Foundation; either
*    version 2.1 of the License, or (at your option) any later version.
*
*    This library is distributed in the hope that it will be useful,
*    but WITHOUT ANY WARRANTY; without even the implied warranty of
*    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
*    Lesser General Public License for more details.
*
*    You should have received a copy of the GNU Lesser General Public
*    License along with this library; if not, write to the Free Software
*    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
*    You can contact MARIE development team at http://marie.sourceforge.net
*/
// Prevent Multiple Inclusion
#ifndef _MARIE_SAVE_H_
#define _MARIE_SAVE_H_

#include "BufferedNode.h"

namespace marie
{
  class MarieSave : public BufferedNode {
     
     int m_inputID;
     int m_streamID;
     int m_outputID;
      
  public:
  
     MarieSave(string nodeName, ParameterSet params);
  
     void calculate(int output_id, int count, Buffer &out);
       
  };
}
#endif

[Robotflow-cvs] RobotFlow Makefile.am,1.17,1.18 configure.in,1.33,1.34

[Dominic L?t. <ma...@us...>]

Update of /cvsroot/robotflow/RobotFlow
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19834

Modified Files:
	Makefile.am configure.in 
Log Message:
first MARIE blocks merged, fixed configure to support MARIE

Index: Makefile.am
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/Makefile.am,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** Makefile.am	30 May 2004 10:30:34 -0000	1.17
--- Makefile.am	30 May 2004 12:34:07 -0000	1.18
***************
*** 6,12 ****
  endif
  
  EXTRA_DIST = RobotFlow.spec RobotFlow.spec.in
  
! SUBDIRS = Generic Pioneer2 Behaviors Vision Control Devices Probes FSM $(PLAYER_DIR)
  
  rpm: 	dist
--- 6,16 ----
  endif
  
+ if WITH_MARIE
+ MARIE_DIR = MARIE
+ endif
+ 
  EXTRA_DIST = RobotFlow.spec RobotFlow.spec.in
  
! SUBDIRS = Generic Pioneer2 Behaviors Vision Control Devices Probes FSM $(PLAYER_DIR) $(MARIE_DIR)
  
  rpm: 	dist

Index: configure.in
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/configure.in,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** configure.in	30 May 2004 10:19:19 -0000	1.33
--- configure.in	30 May 2004 12:34:07 -0000	1.34
***************
*** 71,75 ****
  AC_CHECK_FUNCS(getcwd getwd putenv strdup)
  
! dnl overflow-config test (Yannick Brosseau)
  
  AC_PATH_PROG(OVERFLOW_CONFIG,flowdesigner-config,no,$PATH:$FLOWDESIGNER_HOME/bin:$prefix/bin)
--- 71,75 ----
  AC_CHECK_FUNCS(getcwd getwd putenv strdup)
  
! dnl overflow-config test (Yannick Brosseau & Dominic Letourneau)
  
  AC_PATH_PROG(OVERFLOW_CONFIG,flowdesigner-config,no,$PATH:$FLOWDESIGNER_HOME/bin:$prefix/bin)
***************
*** 79,89 ****
--- 79,95 ----
   	if test "$OVERFLOW_CONFIG" = no; then
      		AC_MSG_ERROR( Cannot find overflow-config)
+ 		exit
   	fi
  fi
  
+ SDL_FOUND=""
  AC_PATH_PROG(SDL_CONFIG,sdl-config,no,$PATH)
  if test "$SDL_CONFIG" = no; then
  	AC_MSG_ERROR( Cannot find sdl-config, disabling SDL)	
+ else
+ 	SDL_FOUND="yes"
  fi
+ 
+ 
  AM_CONDITIONAL(WITH_SDL, test -n "$SDL_CONFIG")	
  
***************
*** 91,94 ****
--- 97,101 ----
  if test "$PKG_CONFIG" = no; then
  	AC_MSG_ERROR( Cannot find pkg-config)
+ 	exit
  fi
  
***************
*** 96,99 ****
--- 103,107 ----
  if test "$XML2_CONFIG" = no; then
  	AC_MSG_ERROR( Cannot find xml2-config)
+ 	exit
  fi
  
***************
*** 113,116 ****
--- 121,174 ----
  	  AM_CONDITIONAL(WITH_PLAYER,false)
  fi
+ 
+ dnl Test for ACE (Yannick Brosseau & Dominic Letourneau)
+ AC_MSG_CHECKING(for ACE)
+ ACE_FOUND=""
+ 
+ AC_ARG_WITH(ACE, [  --with-ACE              Where ACE is installed (/usr/local)], ACE_DIR="$withval";ACE_BASE=$withval)
+ 
+ dnl test which ACE_DIR, std way
+ if test -n "$ACE_DIR"; then
+ 	ACE_LIBS="-L$ACE_DIR/lib -lACE"
+ 	ACE_INCLUDES="-I$ACE_DIR/include"
+ 	AC_MSG_RESULT("found ACE_wrappers in $ACE_DIR")	
+ 	ACE_FOUND = "yes"
+ fi
+ 
+ dnl test with ACE_ROOT 
+ if test -n "$ACE_FOUND" && test -n "$ACE_ROOT"; then
+ 	dnl Now attempting in a ACE_wrappers style.	
+ 	AC_MSG_RESULT("found ACE_wrappers in $ACE_ROOT")
+ 	ACE_INCLUDE="$ACE_BASE"	
+ 	ACE_LIBS="-L$ACE_ROOT/ace -lACE"
+ 	ACE_INCLUDES="-I$ACE_ROOT"
+ 	ACE_FOUND = "yes"
+ fi
+ 
+ AC_SUBST(ACE_LIBS)
+ AC_SUBST(ACE_INCLUDES)
+ 
+ MARIE_FOUND=""
+ AC_ARG_WITH(ACE, [  --with-MARIE              Where MARIE is installed (/usr/local)], MARIE_DIR="$withval";MARIE_BASE=$withval)
+ 
+ dnl Test for MARIE (Dominic Letourneau)
+ if test -n "$ACE_FOUND" && test -n "$MARIE_DIR"; then
+ 	AC_MSG_RESULT("Using MARIE in $MARIE_DIR")	
+ 	MARIE_LIBS="-L$MARIE_DIR/lib -lmariedata"
+ 	MARIE_INCLUDES="-I$MARIE_DIR/include"
+ 	MARIE_FOUND = "yes"
+ 	AM_CONDITIONAL(WITH_MARIE,true)
+ else
+ 	AC_MSG_RESULT("MARIE disabled.")	
+ 	MARIE_LIBS=""
+ 	MARIE_INCLUDES=""
+ 	AM_CONDITIONAL(WITH_MARIE,false)
+ fi
+ 
+ AC_SUBST(MARIE_LIBS)
+ AC_SUBST(MARIE_INCLUDES)
+ 
+ 
+ 
  VERSION=$ROBOTFLOW_VERSION
  AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define)
***************
*** 185,188 ****
--- 243,249 ----
  	Generic/src/Makefile \
  	Generic/n-files/Makefile \
+ 	MARIE/Makefile \
+ 	MARIE/include/Makefile \
+ 	MARIE/src/Makefile \
  	RobotFlow.spec)
  
***************
*** 197,213 ****
  AC_MSG_RESULT([])
  
! AC_MSG_RESULT([$WITH_PLAYER - $WITH_SDL])
! 
! if test "$WITH_PLAYER" = "true"; then
  	AC_MSG_RESULT([$PACKAGE will build Player based blocks])
  else
! 	AC_MSG_RESULT([$PACKAGE will NOT build Player based blocks])
  fi
  
! 
! 
! if test "$WITH_SDL" = "true"; then
  	AC_MSG_RESULT([$PACKAGE will build SDL based blocks])
  else
  	AC_MSG_RESULT([$PACKAGE will NOT build SDL based blocks])
  fi
--- 258,277 ----
  AC_MSG_RESULT([])
  
! if test "$PLAYER_FOUND" = "yes"; then
  	AC_MSG_RESULT([$PACKAGE will build Player based blocks])
  else
! 	AC_MSG_RESULT([$PACKAGE will NOT build Player based blocks (forgot --with-player=<path> arg?)])
  fi
  
! if test "$SDL_FOUND" = "yes"; then
  	AC_MSG_RESULT([$PACKAGE will build SDL based blocks])
  else
  	AC_MSG_RESULT([$PACKAGE will NOT build SDL based blocks])
  fi
+ 
+ if test "$MARIE_FOUND" = "yes"; then
+ 	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
+ 

[Robotflow-cvs] RobotFlow/MARIE Makefile.am,NONE,1.1

[Dominic L?t. <ma...@us...>]

Update of /cvsroot/robotflow/RobotFlow/MARIE
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19834/MARIE

Added Files:
	Makefile.am 
Log Message:
first MARIE blocks merged, fixed configure to support MARIE

--- NEW FILE: Makefile.am ---
## Process this file with automake to produce Makefile.in. -*-Makefile-*-
# Disable automatic dependency tracking if using other tools than gcc and gmake
#AUTOMAKE_OPTIONS = no-dependencies

SUBDIRS = src include

[Robotflow-cvs] RobotFlow/MARIE/src - New directory

[Dominic L?t. <ma...@us...>]

Update of /cvsroot/robotflow/RobotFlow/MARIE/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1390/src

Log Message:
Directory /cvsroot/robotflow/RobotFlow/MARIE/src added to the repository

[Robotflow-cvs] RobotFlow/MARIE/include - New directory

[Dominic L?t. <ma...@us...>]

Update of /cvsroot/robotflow/RobotFlow/MARIE/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1390/include

Log Message:
Directory /cvsroot/robotflow/RobotFlow/MARIE/include added to the repository

[Robotflow-cvs] RobotFlow/MARIE - New directory

[Dominic L?t. <ma...@us...>]

Update of /cvsroot/robotflow/RobotFlow/MARIE
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1220/MARIE

Log Message:
Directory /cvsroot/robotflow/RobotFlow/MARIE added to the repository

[Robotflow-cvs] RobotFlow Makefile.am,1.16,1.17

[Dominic L?t. <ma...@us...>]

Update of /cvsroot/robotflow/RobotFlow
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26916

Modified Files:
	Makefile.am 
Log Message:
now we are able to make rpms

Index: Makefile.am
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/Makefile.am,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** Makefile.am	30 May 2004 10:19:08 -0000	1.16
--- Makefile.am	30 May 2004 10:30:34 -0000	1.17
***************
*** 6,9 ****
--- 6,11 ----
  endif
  
+ EXTRA_DIST = RobotFlow.spec RobotFlow.spec.in
+ 
  SUBDIRS = Generic Pioneer2 Behaviors Vision Control Devices Probes FSM $(PLAYER_DIR)
  

[Robotflow-cvs] RobotFlow/Probes/src Makefile.am,1.8,1.9

[Dominic L?t. <ma...@us...>]

Update of /cvsroot/robotflow/RobotFlow/Probes/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24933/Probes/src

Modified Files:
	Makefile.am 
Log Message:
updated configure scripts to compile Player blocks if requested

Index: Makefile.am
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/Probes/src/Makefile.am,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Makefile.am	27 May 2004 00:27:40 -0000	1.8
--- Makefile.am	30 May 2004 10:19:19 -0000	1.9
***************
*** 8,11 ****
--- 8,15 ----
  lib_LTLIBRARIES = libProbes.la
  
+ if WITH_SDL
+ IMAGEPROBE_SDL_SOURCE = ImageProbeSDL.cc
+ endif
+ 
  # Sources for compilation in the library
  libProbes_la_SOURCES = ImageProbe.cc \
***************
*** 13,21 ****
  	VirtualJoystick.cc \
  	ColorTrain.cc \
! 	PTZControl.cc
  
- if WITH_SDL
- libProbes_la_SOURCES += ImageProbeSDL.cc
- endif
  
  libProbes_la_LDFLAGS = -release $(LT_RELEASE) $(SDL_LIB)
--- 17,22 ----
  	VirtualJoystick.cc \
  	ColorTrain.cc \
! 	PTZControl.cc $(IMAGEPROBE_SDL_SOURCE)
  
  
  libProbes_la_LDFLAGS = -release $(LT_RELEASE) $(SDL_LIB)

[Robotflow-cvs] RobotFlow RobotFlow.spec.in,NONE,1.1 Makefile.am,1.15,1.16 configure.in,1.32,1.33 RobotFlow.spec,1.2,NONE

[Dominic L?t. <ma...@us...>]

Update of /cvsroot/robotflow/RobotFlow
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24933

Modified Files:
	Makefile.am configure.in 
Added Files:
	RobotFlow.spec.in 
Removed Files:
	RobotFlow.spec 
Log Message:
updated configure scripts to compile Player blocks if requested

--- RobotFlow.spec DELETED ---

--- NEW FILE: RobotFlow.spec.in ---
%define name     @PACKAGE@
%define ver      @VERSION@
%define rel      1

Summary: A Robotics Toolkit for FlowDesigner
Name: %name
Version: %ver
Release: %rel
Copyright: GPL/LGPL
Group: Application/Devel
Source: http://download.sourceforge.net/robotflow/%{name}-%{ver}.tar.gz
URL: http://robotflow.sourceforge.net/
Vendor: Laborius
Packager: Dominic Letourneau (dom...@us...)

BuildRoot: %{_tmppath}/root-%{name}-%{version}
Prefix: %{_prefix}

%description
RobotFlow is a mobile robotics tookit based on the  FlowDesigner project.
FlowDesigner is a data-flow oriented architecture, similar to Simulink (Matlab)
or Labview that is free (LGPL) and versatile. The visual programming interface
provided in the FlowDesigner project will help people to better visualize &
understand what is really happening in the robot's control loops, sensors,
actuators, by using graphical probes and debugging in real-time.

%prep
%setup

%build
export CXXFLAGS='-O3 -march=pentium'
export CFLAGS='-O3 -march=pentium'
./configure --prefix=/usr --disable-static
%{__make}

%install
%makeinstall

%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig

%files
%defattr(-, root, root, 0755)
/usr/lib/flowdesigner/toolbox/RobotFlow/*


Index: Makefile.am
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/Makefile.am,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** Makefile.am	27 May 2004 02:29:11 -0000	1.15
--- Makefile.am	30 May 2004 10:19:08 -0000	1.16
***************
*** 2,12 ****
  # Disable automatic dependency tracking if using other tools than gcc and gmake
  #AUTOMAKE_OPTIONS = no-dependencies
- 
  if WITH_PLAYER
! SUBDIRS = Generic Pioneer2 Behaviors Vision Control Devices Player Probes FSM
! else
! SUBDIRS = Generic Pioneer2 Behaviors Vision Control Devices Probes FSM
  endif
  
  rpm: 	dist
  	rpmbuild -ta ${PACKAGE}-${VERSION}.tar.gz
--- 2,11 ----
  # Disable automatic dependency tracking if using other tools than gcc and gmake
  #AUTOMAKE_OPTIONS = no-dependencies
  if WITH_PLAYER
! PLAYER_DIR =  Player
  endif
  
+ SUBDIRS = Generic Pioneer2 Behaviors Vision Control Devices Probes FSM $(PLAYER_DIR)
+ 
  rpm: 	dist
  	rpmbuild -ta ${PACKAGE}-${VERSION}.tar.gz

Index: configure.in
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/configure.in,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** configure.in	27 May 2004 02:29:11 -0000	1.32
--- configure.in	30 May 2004 10:19:19 -0000	1.33
***************
*** 184,188 ****
  	Generic/include/Makefile \
  	Generic/src/Makefile \
! 	Generic/n-files/Makefile)
  
  
--- 184,189 ----
  	Generic/include/Makefile \
  	Generic/src/Makefile \
! 	Generic/n-files/Makefile \
! 	RobotFlow.spec)