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

Added acknowledge to CameraTcpServer (a client must wait a response before sending images)

Browse Source 
git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@378 620bd6b2-0a58-f614-fd9a-1bd335dccda9
This commit is contained in:
matlabbe
2014-08-06 03:00:17 +00:00
parent 072f6cc8f5
commit da4ee8637b
4 changed files with 55 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/CameraTcpServer.cpp
+10 -12
View File
@@ -17,14 +17,11 @@ CameraTcpServer::CameraTcpServer(quint16 port, QObject *parent) :
QTcpServer(parent),
blockSize_(0)
{
this->setMaxPendingConnections(1);
if (!this->listen(QHostAddress::Any, port))
{
UERROR("Unable to start the Camera TCP server: %s", this->errorString().toStdString().c_str());
return;
}
connect(this, SIGNAL(newConnection()), this, SLOT(addClient()));
}
cv::Mat CameraTcpServer::getImage()
@@ -83,22 +80,23 @@ quint16 CameraTcpServer::getPort() const
return this->serverPort();
}
void CameraTcpServer::addClient()
void CameraTcpServer::incomingConnection(int socketDescriptor)
{
QTcpSocket * client = this->nextPendingConnection();
QList<QTcpSocket*> clients = this->findChildren<QTcpSocket*>();
if(clients.size() > 1)
if(clients.size() >= 1)
{
UWARN("A client is already connected. Only one connection allowed at the same time.");
client->close();
client->deleteLater();
QTcpSocket socket;
socket.setSocketDescriptor(socketDescriptor);
}
else
{
connect(client, SIGNAL(readyRead()), this, SLOT(readReceivedData()));
connect(client, SIGNAL(error(QAbstractSocket::SocketError)), this, SLOT(displayError(QAbstractSocket::SocketError)));
connect(client, SIGNAL(disconnected()), this, SLOT(connectionLost()));
QTcpSocket * socket = new QTcpSocket(this);
connect(socket, SIGNAL(readyRead()), this, SLOT(readReceivedData()));
connect(socket, SIGNAL(error(QAbstractSocket::SocketError)), this, SLOT(displayError(QAbstractSocket::SocketError)));
connect(socket, SIGNAL(disconnected()), this, SLOT(connectionLost()));
socket->setSocketDescriptor(socketDescriptor);
socket->write(QByteArray("1"));
}
}
src/CameraTcpServer.h
+3 -3
View File
@@ -23,14 +23,14 @@ public:
QHostAddress getHostAddress() const;
quint16 getPort() const;
protected:
virtual void incomingConnection ( int socketDescriptor );
private Q_SLOTS:
void readReceivedData();
void displayError(QAbstractSocket::SocketError socketError);
void connectionLost();
private Q_SLOTS:
void addClient();
private:
quint64 blockSize_;
QVector<cv::Mat> images_;