isabell
/
Labcontrol
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Reformat HelpMessageSender

Browse Source
remotes/origin/HEAD
markuspg 6 years ago
parent f423daf50c
commit bc345ff4d3
3 changed files with 69 additions and 49 deletions
Show Stats Download Patch File Download Diff File

100
src/helpmessagesender/helpmessagewindow.cpp
Unescape Escape View File

@ -2,35 +2,42 @@
#include <iostream>
lcHelpMessageWindow::lcHelpMessageWindow( const QString &argServerIP, const unsigned short int &argServerPort, QWidget *argParent ) :
QMainWindow{ argParent },
helpMessageSocket { new QTcpSocket{ this } },
serverPort{ argServerPort },
serverAddress{ argServerIP },
ui{ new Ui::HelpMessageWindow }
lcHelpMessageWindow::lcHelpMessageWindow(const QString &argServerIP,
const unsigned short int &argServerPort,
QWidget *argParent) :
QMainWindow{argParent},
helpMessageSocket {new QTcpSocket{this}},
serverPort{argServerPort},
serverAddress{argServerIP},
ui{new Ui::HelpMessageWindow}
{
ui->setupUi( this );
connect( ui->PBAskForHelp, &QPushButton::clicked, this, &lcHelpMessageWindow::RequestHelp );
connect( helpMessageSocket, &QTcpSocket::readyRead, this, &lcHelpMessageWindow::ReadHelpReply );
connect( helpMessageSocket, SIGNAL( error( QAbstractSocket::SocketError ) ),
this, SLOT( DisplayError( QAbstractSocket::SocketError ) ) );
ui->setupUi(this);
connect(ui->PBAskForHelp, &QPushButton::clicked,
this, &lcHelpMessageWindow::RequestHelp);
connect(helpMessageSocket, &QTcpSocket::readyRead,
this, &lcHelpMessageWindow::ReadHelpReply);
connect(helpMessageSocket, SIGNAL(error(QAbstractSocket::SocketError)),
this, SLOT(DisplayError(QAbstractSocket::SocketError)));
QNetworkConfigurationManager manager;
if ( manager.capabilities() & QNetworkConfigurationManager::NetworkSessionRequired ) {
if (manager.capabilities() & QNetworkConfigurationManager::NetworkSessionRequired) {
// Get saved network configuration
QSettings settings{ QSettings::UserScope, QLatin1String{ "QtProject" } };
settings.beginGroup( QLatin1String{ "QtNetwork" } );
const QString id = settings.value( QLatin1String{ "DefaultNetworkConfiguration" } ).toString();
QSettings settings{QSettings::UserScope, QLatin1String{"QtProject"}};
settings.beginGroup(QLatin1String{"QtNetwork"});
const QString id
= settings.value(QLatin1String{"DefaultNetworkConfiguration"}).toString();
settings.endGroup();
// If the saved network configuration is not currently discovered use the system default
QNetworkConfiguration config = manager.configurationFromIdentifier( id );
if ( ( config.state() & QNetworkConfiguration::Discovered ) != QNetworkConfiguration::Discovered ) {
if ((config.state() & QNetworkConfiguration::Discovered)
!= QNetworkConfiguration::Discovered) {
config = manager.defaultConfiguration();
}
networkSession = new QNetworkSession{ config, this };
connect( networkSession, &QNetworkSession::opened, this, &lcHelpMessageWindow::OpenedSession );
networkSession = new QNetworkSession{config, this};
connect(networkSession, &QNetworkSession::opened,
this, &lcHelpMessageWindow::OpenedSession);
networkSession->open();
}
@ -40,68 +47,77 @@ lcHelpMessageWindow::~lcHelpMessageWindow() {
delete ui;
}
void lcHelpMessageWindow::DisplayError( QAbstractSocket::SocketError socketError ) {
void lcHelpMessageWindow::DisplayError(QAbstractSocket::SocketError socketError) {
QString errorMessage;
switch ( socketError ) {
switch (socketError) {
case QAbstractSocket::RemoteHostClosedError:
return;
case QAbstractSocket::HostNotFoundError:
errorMessage = tr( "An error occurred: The server could not be found for error reporting:\n" );
errorMessage = tr("An error occurred: The server could not be found for"
" error reporting:\n");
break;
case QAbstractSocket::ConnectionRefusedError:
errorMessage = tr( "An error occurred: The connection was refused by the laboratory server:\n" );
errorMessage = tr("An error occurred: The connection was refused by the"
" laboratory server:\n");
break;
default:
errorMessage = tr( "The following error occured:\n" );
errorMessage = tr("The following error occured:\n");
}
errorMessage.append( tr("%1").arg( helpMessageSocket->errorString() ) );
errorMessage.append( "\n\nPlease raise your hand to notify the experimenters." );
ui->LSendingSuccess->setText( errorMessage );
errorMessage.append(tr("%1").arg(helpMessageSocket->errorString()));
errorMessage.append("\n\nPlease raise your hand to notify the experimenters.");
ui->LSendingSuccess->setText(errorMessage);
}
void lcHelpMessageWindow::OpenedSession() {
// Save the used configuration
QNetworkConfiguration config = networkSession->configuration();
QString id;
if ( config.type() == QNetworkConfiguration::UserChoice )
id = networkSession->sessionProperty( QLatin1String{ "UserChoiceConfiguration" } ).toString();
else
if (config.type() == QNetworkConfiguration::UserChoice) {
id = networkSession->sessionProperty(
QLatin1String{"UserChoiceConfiguration"}).toString();
} else {
id = config.identifier();
}
QSettings settings{ QSettings::UserScope, QLatin1String{ "QtProject" } };
settings.beginGroup( QLatin1String{ "QtNetwork" } );
settings.setValue( QLatin1String{ "DefaultNetworkConfiguration" }, id );
QSettings settings{QSettings::UserScope, QLatin1String{"QtProject"}};
settings.beginGroup(QLatin1String{"QtNetwork"});
settings.setValue(QLatin1String{"DefaultNetworkConfiguration"}, id);
settings.endGroup();
}
void lcHelpMessageWindow::ReadHelpReply() {
QDataStream in( helpMessageSocket );
in.setVersion( QDataStream::Qt_5_2 );
QDataStream in(helpMessageSocket);
in.setVersion(QDataStream::Qt_5_2);
if ( blockSize == 0 ) {
if ( helpMessageSocket->bytesAvailable() < ( int )sizeof( quint16 ) )
if (blockSize == 0) {
if (helpMessageSocket->bytesAvailable() < (int)sizeof(quint16)) {
return;
}
in >> blockSize;
}
if ( helpMessageSocket->bytesAvailable() < blockSize ) {
if (helpMessageSocket->bytesAvailable() < blockSize) {
return;
}
QString serverAnswer;
in >> serverAnswer;
if ( serverAnswer == "Help demand retrieved." ) {
ui->LSendingSuccess->setText( tr( "Help message successfully sent.\nPlease wait for the experimenter to show up at your booth." ) );
ui->PBAskForHelp->setEnabled( false );
if (serverAnswer == "Help demand retrieved.") {
ui->LSendingSuccess->setText(tr("Help message successfully"
" sent.\nPlease wait for the"
" experimenter to show up at your booth."));
ui->PBAskForHelp->setEnabled(false);
} else {
ui->LSendingSuccess->setText( tr( "An error occurred sending the help message. Please raise your arm.\n\n'%1'" ).arg( serverAnswer ) );
ui->LSendingSuccess->setText(tr("An error occurred sending the help"
" message. Please raise your"
" arm.\n\n'%1'").arg(serverAnswer));
}
}
void lcHelpMessageWindow::RequestHelp() {
blockSize = 0;
helpMessageSocket->abort();
helpMessageSocket->connectToHost( serverAddress, serverPort );
helpMessageSocket->connectToHost(serverAddress, serverPort);
}

8
src/helpmessagesender/helpmessagewindow.h
Unescape Escape View File

@ -9,14 +9,16 @@
namespace Ui {
class HelpMessageWindow;
}
} // namespace Ui
class lcHelpMessageWindow : public QMainWindow
{
Q_OBJECT
public:
explicit lcHelpMessageWindow( const QString &argServerIP, const unsigned short int &argServerPort, QWidget *argParent = nullptr );
explicit lcHelpMessageWindow(const QString &argServerIP,
const unsigned short int &argServerPort,
QWidget *argParent = nullptr);
~lcHelpMessageWindow();
private:
@ -30,7 +32,7 @@ private:
private slots:
void RequestHelp();
void ReadHelpReply();
void DisplayError( QAbstractSocket::SocketError socketError );
void DisplayError(QAbstractSocket::SocketError socketError);
void OpenedSession();
};

10
src/helpmessagesender/main.cpp
Unescape Escape View File

@ -1,11 +1,13 @@
#include "helpmessagewindow.h"
#include <QApplication>
int main( int argc, char *argv[] )
int main(int argc, char *argv[])
{
QApplication a( argc, argv );
QSettings labSettings{ "Economic Laboratory", "Labcontrol" };
lcHelpMessageWindow w{ labSettings.value( "server_ip", "127.0.0.1" ).toString(), labSettings.value( "client_help_server_port", "0" ).toUInt() };
QApplication a(argc, argv);
QSettings labSettings{"Economic Laboratory", "Labcontrol"};
lcHelpMessageWindow w{labSettings.value("server_ip", "127.0.0.1").toString(),
labSettings.value("client_help_server_port", "0").toUInt()};
w.show();
return a.exec();

Write Preview
Loading…
Cancel
Save