andrius
/
s20
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Move input handling to another thread and enable event loop.

This commit is contained in:
Andrius Štikonas 2015-01-31 18:12:20 +00:00
parent 06aeb187d5
commit 748ad8cb91
7 changed files with 136 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -4,5 +4,5 @@ project(s20)
add_definitions(-std=gnu++11)
find_package(Qt5 REQUIRED Core Network)
add_executable(s20 main.cpp socket.cpp)
add_executable(s20 main.cpp socket.cpp consolereader.cpp)
target_link_libraries(s20 Qt5::Core Qt5::Network)

80
consolereader.cpp Normal file
View File

@ -0,0 +1,80 @@
/*************************************************************************
* Copyright (C) 2015 by Andrius Štikonas <andrius@stikonas.eu> *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 3 of the License, or *
* (at your option) any later version. *
* *
* This program 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 General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
* along with this program. If not, see <http://www.gnu.org/licenses/>.*
*************************************************************************/
#include <iostream>
#include "consolereader.h"
ConsoleReader::ConsoleReader(std::vector<Socket> *sockets_vector)
{
sockets = sockets_vector;
}
ConsoleReader::~ConsoleReader()
{
//
}
void ConsoleReader::run()
{
char command;
unsigned int number = 0;
bool cont = true;
while (cont)
{
listSockets();
std::cout << "d - update table data\nn - change socket name\ns - pick another socket (default is 1)\np - toggle power state\nq - quit" << std::endl;
std::cin >> command;
switch (command)
{
case 'd':
(*sockets)[number].tableData();
break;
case 'n':
// std::cout << "Enter new name (max 16 characters)" << std::endl;
// string name;
// std::cin >> name;
(*sockets)[number].changeSocketName();
break;
case 'p':
(*sockets)[number].toggle();
break;
case 'q':
cont = false;
emit(QCoreApplication::quit());
break;
case 's':
std::cin >> number;
--number; // count from 0
break;
default:
std::cout << "Invalid command" << std::endl;
}
}
}
void ConsoleReader::listSockets()
{
for (std::vector<Socket>::const_iterator i = sockets->begin() ; i != sockets->end(); ++i)
{
std::cout << "___________________________________________________________________________\n" << std::endl;
std::cout << "IP Address: " << i->ip.toString().toStdString() << "\t MAC Address: " << i->mac.toHex().toStdString() << "\t Power: " << (i->powered ? "On" : "Off") << std::endl;
std::cout << "Socket Name: " << i->name.toStdString() << "\t Remote Password: " << i->remotePassword.toStdString() << std::endl;
}
std::cout << "___________________________________________________________________________\n" << std::endl;
}

38
consolereader.h Normal file
View File

@ -0,0 +1,38 @@
/*************************************************************************
* Copyright (C) 2015 by Andrius Štikonas <andrius@stikonas.eu> *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 3 of the License, or *
* (at your option) any later version. *
* *
* This program 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 General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
* along with this program. If not, see <http://www.gnu.org/licenses/>.*
*************************************************************************/
#ifndef CONSOLEREADER_H
#define CONSOLEREADER_H
#include <QCoreApplication>
#include <QThread>
#include "socket.h"
class ConsoleReader : public QThread
{
public:
ConsoleReader(std::vector<Socket> *sockets_vector);
~ConsoleReader();
void run ();
private:
void listSockets();
std::vector<Socket> *sockets;
};
#endif /* CONSOLEREADER_H */

6
discover.h
View File

@ -19,7 +19,7 @@
QByteArray discover = QByteArray::fromHex("68 64 00 06 71 61");
void readDiscoverDatagrams(QUdpSocket *udpSocketGet, std::vector<Socket> &sockets)
void readDiscoverDatagrams(QUdpSocket *udpSocketGet, std::vector<Socket> *sockets)
{
while (udpSocketGet->waitForReadyRead(500)) // 500ms
{
@ -35,7 +35,7 @@ void readDiscoverDatagrams(QUdpSocket *udpSocketGet, std::vector<Socket> &socket
if (datagramGet != discover && datagramGet.left(2) == QByteArray::fromHex("68 64"))
{
bool duplicate = false;
for(std::vector<Socket>::const_iterator i = sockets.begin() ; i != sockets.end(); ++i)
for(std::vector<Socket>::const_iterator i = sockets->begin() ; i != sockets->end(); ++i)
{
if (i->ip == sender)
duplicate = true;
@ -43,7 +43,7 @@ void readDiscoverDatagrams(QUdpSocket *udpSocketGet, std::vector<Socket> &socket
if(!duplicate)
{
const Socket socket(sender, datagramGet);
sockets.push_back(socket);
sockets->push_back(socket);
}
}
}

55
main.cpp
View File

@ -18,13 +18,15 @@
#include <iostream>
#include <vector>
#include "consolereader.h"
#include "discover.h"
void readDiscoverDatagrams(QUdpSocket *udpSocketGet, std::vector<Socket> &sockets);
void listSockets(std::vector<Socket> const &sockets);
int main(int argc, char *argv[])
{
QCoreApplication app(argc, argv);
QUdpSocket *udpSocketSend = new QUdpSocket();
QUdpSocket *udpSocketGet = new QUdpSocket();
@ -34,54 +36,15 @@ int main(int argc, char *argv[])
udpSocketSend->write(discover);
udpSocketSend->disconnectFromHost();
delete udpSocketSend;
std::vector<Socket> sockets;
std::vector<Socket> *sockets = new std::vector<Socket>;
readDiscoverDatagrams(udpSocketGet, sockets);
delete udpSocketGet;
char command;
unsigned int number = 0;
bool cont=true;
while (cont)
{
listSockets(sockets);
std::cout << "d - update table data\nn - change socket name\ns - pick another socket (default is 1)\np - toggle power state\nq - quit" << std::endl;
std::cin >> command;
switch (command)
{
case 'd':
sockets[number].tableData();
break;
case 'n':
// std::cout << "Enter new name (max 16 characters)" << std::endl;
// string name;
// std::cin >> name;
sockets[number].changeSocketName();
break;
case 'p':
sockets[number].toggle();
break;
case 'q':
cont = false;
break;
case 's':
std::cin >> number;
--number; // count from 0
break;
default:
std::cout << "Invalid command" << std::endl;
}
}
return 0;
}
ConsoleReader reader(sockets);
reader.start();
void listSockets(std::vector<Socket> const &sockets)
{
for (std::vector<Socket>::const_iterator i = sockets.begin() ; i != sockets.end(); ++i)
{
std::cout << "___________________________________________________________________________\n" << std::endl;
std::cout << "IP Address: " << i->ip.toString().toStdString() << "\t MAC Address: " << i->mac.toHex().toStdString() << "\t Power: " << (i->powered ? "On" : "Off") << std::endl;
std::cout << "Socket Name: " << i->name.toStdString() << "\t Remote Password: " << i->remotePassword.toStdString() << std::endl;
}
std::cout << "___________________________________________________________________________\n" << std::endl;
int exitCode = app.exec();
reader.wait();
return exitCode;
}

3
socket.cpp
View File

File diff suppressed because one or more lines are too long

5
socket.h
View File

@ -15,6 +15,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.*
*************************************************************************/
#ifndef SOCKET_H
#define SOCKET_H
#include <QByteArray>
#include <QHostAddress>
#include <QUdpSocket>
@ -53,3 +56,5 @@ private:
QUdpSocket *udpSocketSend, *udpSocketGet;
};
#endif /* SOCKET_H */