Permalink
Browse files

sycing between repositories

merging some changes from the im-clever repository into this one
  • Loading branch information...
Juxi committed Mar 31, 2014
1 parent 104523a commit 397b014ecab1ffd08a07685db42fa15b54589e58
View
BIN +12.4 MB Videos/FilterTest.ogv
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
Binary file not shown.
View
Binary file not shown.
View
BIN +12.9 MB Videos/icVision1.ogv
Binary file not shown.
View
Binary file not shown.
View
BIN +5.48 MB Videos/icVision2.ogv
Binary file not shown.
View
BIN +9.08 MB Videos/icVision3.ogv
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
@@ -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 ) {
@@ -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");
);
}
@@ -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

0 comments on commit 397b014

Please sign in to comment.