sycing between repositories

merging some changes from the im-clever repository into this one
Juxi · Mar 31, 2014 · 397b014 · 397b014
1 parent 104523a
commit 397b014
Show file tree

Hide file tree

Showing 15 changed files with 13 additions and 5 deletions.
diff --git a/Videos/FilterTest.ogv b/Videos/FilterTest.ogv
diff --git a/Videos/MovingBlueCup.ogv b/Videos/MovingBlueCup.ogv
diff --git a/Videos/MovingBlueCup1.ogv b/Videos/MovingBlueCup1.ogv
diff --git a/Videos/TeaBoxFilter working starts at 50s.m4v b/Videos/TeaBoxFilter working starts at 50s.m4v
diff --git a/Videos/TeaBoxFilter working.ogv b/Videos/TeaBoxFilter working.ogv
diff --git a/Videos/icVision1.ogv b/Videos/icVision1.ogv
diff --git a/Videos/icVision1a.ogv b/Videos/icVision1a.ogv
diff --git a/Videos/icVision2.ogv b/Videos/icVision2.ogv
diff --git a/Videos/icVision3.ogv b/Videos/icVision3.ogv
diff --git a/Videos/icVision_Glass.ogv b/Videos/icVision_Glass.ogv
diff --git a/Videos/icub-PlaceObject1.ogv b/Videos/icub-PlaceObject1.ogv
diff --git a/Videos/icub-PlaceObject2.ogv b/Videos/icub-PlaceObject2.ogv
diff --git a/src/core/core_module.cpp b/src/core/core_module.cpp
@@ -1,4 +1,4 @@
-// Copyright: (C) 2011-2012 Juxi Leitner
+// Copyright: (C) 2011-2014 Juxi Leitner
 // Author: Juxi Leitner <juxi.leitner@gmail.com>
 // find more information at http://Juxi.net/projects/icVision/
 // CopyPolicy: Released under the terms of the GNU GPL v2.0.
@@ -370,6 +370,7 @@ bool CoreModule::respond(const yarp::os::Bottle& command, yarp::os::Bottle& repl
         bool getall = false;
 
         reply.clear();
+        reply.addString("OK");
 
 		if( command.size() < 2 ) {
 //			reply.addString("ERROR: The syntax should be:");
@@ -389,7 +390,7 @@ bool CoreModule::respond(const yarp::os::Bottle& command, yarp::os::Bottle& repl
 	if( command.get(0).asString() == "list" || command.get(0).asString() == "ls" ){
 
 		reply.clear();
-		reply.addString("list");
+		reply.addString("OK");
 
 		std::vector<ModuleInfo>::iterator itr;
 		for ( itr = listOfModules.begin(); itr != listOfModules.end(); ++itr ) {

diff --git a/src/icFilterModule/icEvolvedFilterModule.cpp b/src/icFilterModule/icEvolvedFilterModule.cpp
@@ -1,4 +1,4 @@
-// Copyright: (C) 2011-2012 Juxi Leitner
+// Copyright: (C) 2011-2014 Juxi Leitner
 // Author: Juxi Leitner <juxi.leitner@gmail.com>
 // find more information at http://Juxi.net/projects/icVision/
 // CopyPolicy: Released under the terms of the GNU GPL v2.0.
@@ -28,6 +28,7 @@ EvolvedFilterModule::EvolvedFilterModule() :
 	setName("EvolvedFilter");
 	gray = red = green = blue =	h =	s = v = NULL;
 
+    m_MoBeEObjectName = "cup1";
 	inDebugMode = false;
 
 	m_ImageWidth = 640;
@@ -615,7 +616,12 @@ bool EvolvedFilterModule::writePositionBottle(const CvPoint fp1, const CvPoint f
 		// TODO sanity check
 		Bottle *pos3d = in.get(2).asList();
 		if(!pos3d->isNull())
-			setWorldPositionOfObject(pos3d->get(0).asDouble(), pos3d->get(1).asDouble(), pos3d->get(2).asDouble(), "cup1"); // "cup1");
+//			setWorldPositionOfObject(pos3d->get(0).asDouble(), pos3d->get(1).asDouble(), pos3d->get(2).asDouble(), "cup1"); // "cup1");
+ 			setWorldPositionOfObject(
+                 pos3d->get(0).asDouble(), pos3d->get(1).asDouble(), pos3d->get(2).asDouble(),
+                 m_MoBeEObjectName.c_str()   // "cup1");
+             );
+
 
 	}
 

diff --git a/src/icFilterModule/icEvolvedFilterModule.h b/src/icFilterModule/icEvolvedFilterModule.h
@@ -1,4 +1,4 @@
-// Copyright: (C) 2011-2012 Juxi Leitner
+// Copyright: (C) 2011-2014 Juxi Leitner
 // Author: Juxi Leitner <juxi.leitner@gmail.com>
 // CopyPolicy: Released under the terms of the GNU GPL v2.0.
 
@@ -30,6 +30,7 @@ class EvolvedFilterModule : public icFilterModule {
 	// member vars
 	bool m_outOfSyncWarning;
 	int m_ImageWidth, m_ImageHeight;
+	std::string m_MoBeEObjectName;  // "cup1"
 
 
 	// for evolved filter