apoorva/greenhouse
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added TcpRequest tool (ask a running find_object to process an image and wait results over TCP)

Browse Source 
Refactored CameraTcpClient to CameraTcpServer (to send images we connect to find_object, instead of connecting find_object to an image server), removed parameter CameraIP

git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@364 620bd6b2-0a58-f614-fd9a-1bd335dccda9
This commit is contained in:
matlabbe
2014-08-02 06:09:27 +00:00
parent b28ca440e8
commit 167aeee4bc
18 changed files with 359 additions and 250 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/main.cpp
+5 -15
View File
@@ -240,8 +240,7 @@ int main(int argc, char* argv[])
}
if(!QFile::exists(configPath))
{
UERROR("Configuration file doesn't exist : %s", configPath.toStdString().c_str());
showUsage();
UWARN("Configuration file \"%s\" doesn't exist, it will be created with default values...", configPath.toStdString().c_str());
}
}
else
@@ -292,7 +291,7 @@ int main(int argc, char* argv[])
UINFO(" Scene path: \"%s\"", scenePath.toStdString().c_str());
UINFO(" Settings path: \"%s\"", configPath.toStdString().c_str());
#ifdef WITH_JSONCPP
UINFO(" JSON path: \"%s\"", configPath.toStdString().c_str());
UINFO(" JSON path: \"%s\"", jsonPath.toStdString().c_str());
#endif
//////////////////////////
@@ -355,7 +354,7 @@ int main(int argc, char* argv[])
QCoreApplication app(argc, argv);
TcpServer tcpServer(Settings::getGeneral_port());
printf("IP: %s\nport: %d\n", tcpServer.getHostAddress().toString().toStdString().c_str(), tcpServer.getPort());
UINFO("Detection sent on port: %d (IP=%s)", tcpServer.getPort(), tcpServer.getHostAddress().toString().toStdString().c_str());
// connect stuff:
// [FindObject] ---ObjectsDetected---> [TcpServer]
@@ -384,17 +383,8 @@ int main(int argc, char* argv[])
// start processing!
while(running && !camera.start())
{
if(Settings::getCamera_6useTcpCamera())
{
UWARN("Camera initialization failed! (with server %s:%d) Trying again in 1 second...",
Settings::getCamera_7IP().toStdString().c_str(), Settings::getCamera_8port());
Sleep(1000);
}
else
{
UERROR("Camera initialization failed!");
running = false;
}
UERROR("Camera initialization failed!");
running = false;
}
if(running)
{