projects
/
speedfreak
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bugfix: accelerate send result.
[speedfreak]
/
Client
/
mainwindow.cpp
diff --git
a/Client/mainwindow.cpp
b/Client/mainwindow.cpp
index
8dbfc79
..
0b78399
100644
(file)
--- a/
Client/mainwindow.cpp
+++ b/
Client/mainwindow.cpp
@@
-43,7
+43,6
@@
MainWindow::MainWindow(QWidget *parent) :
connect(httpClient->myXmlreader, SIGNAL(receivedTop10List()), this, SLOT(showTop10()));
resultDialog = new ResultDialog;
connect(httpClient->myXmlreader, SIGNAL(receivedTop10List()), this, SLOT(showTop10()));
resultDialog = new ResultDialog;
- connect(resultDialog, SIGNAL(sendresult()), this, SLOT(clientSendResult()));
accstart = NULL;
accstart = NULL;
@@
-128,6
+127,7
@@
void MainWindow::on_pushButtonAccelerate_clicked()
{
if(!accstart)
accstart = new accelerationstart(this);
{
if(!accstart)
accstart = new accelerationstart(this);
+ connect(accstart, SIGNAL(sendresult(QString, double)), this, SLOT(clientSendResult(QString, double)));
accstart->show();
}
accstart->show();
}
@@
-211,11
+211,18
@@
void MainWindow::clientSendRoute()
/**
* This function send acceleration data to server
*/
/**
* This function send acceleration data to server
*/
-void MainWindow::clientSendResult()
+void MainWindow::clientSendResult(QString category, double result)
{
{
- qDebug() << "_clientSendResult";
+ /*QMessageBox msgBox;
+ msgBox.setWindowTitle("client send result!");
+ msgBox.setText("client send result!");
+ msgBox.setDefaultButton(QMessageBox::Ok);
+ msgBox.exec();*/
+
+ qDebug() << "__clientSendResult";
if(accstart) {
qDebug() << "_clientSendResult, calling server";
if(accstart) {
qDebug() << "_clientSendResult, calling server";
- httpClient->sendResultXml(accstart->getMeasureCategory(), resultDialog->getResult());
+ httpClient->sendResultXml(category, result);
+ //httpClient->sendResultXml(accstart->getMeasureCategory(), resultDialog->getResult());
}
}
}
}