projects
/
speedfreak
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added measures.h and measures.cpp files. Changed resultdialog.h, .cpp and measuredial...
[speedfreak]
/
Client
/
carmainwindow.cpp
diff --git
a/Client/carmainwindow.cpp
b/Client/carmainwindow.cpp
index
9b6c57e
..
c698f4c
100644
(file)
--- a/
Client/carmainwindow.cpp
+++ b/
Client/carmainwindow.cpp
@@
-74,15
+74,12
@@
void CarMainWindow::on_listView_clicked(QModelIndex index)
*/
void CarMainWindow::on_autoStartButton_clicked()
{
*/
void CarMainWindow::on_autoStartButton_clicked()
{
- if(measure)
- {
- delete measure;
- measure = NULL;
- measure = new MeasureDialog();
- }
- connect(measure, SIGNAL(speedAchieved()), this, SLOT(openResultView()));
+ delete measure;
+ measure = NULL;
+ measure = new MeasureDialog();
+ connect(measure, SIGNAL(speedAchieved()), this, SLOT(openResultView()));
// Show measure dialog.
measure->show();
}
// Show measure dialog.
measure->show();
}
@@
-119,7
+116,7
@@
void CarMainWindow::setUnitCompoBox(QStringList units)
*/
void CarMainWindow::initSpeedListView()
{
*/
void CarMainWindow::initSpeedListView()
{
- numbers << "0-100 km/h" << "0-1/4 mil" << "0-50 km" << "50-100 mil" << "0-100 m" << "0-50 ft" << "0-50 yrd" << "0-500 in";
+ numbers << "0-40 km/h" << "0-1/4 mil" << "0-50 km" << "50-100 mil" << "0-100 m" << "0-50 ft" << "0-50 yrd" << "0-500 in";
QAbstractItemModel *model = new StringListModel(numbers);
ui->listView->setModel(model);
}
QAbstractItemModel *model = new StringListModel(numbers);
ui->listView->setModel(model);
}
@@
-173,6
+170,7
@@
void CarMainWindow::on_comboBoxTopCategory_activated(QString category)
*/
void CarMainWindow::openResultView()
{
*/
void CarMainWindow::openResultView()
{
+ result->saveMeasuresToArray(measure->measures);
// Show result dialog.
result->show();
}
// Show result dialog.
result->show();
}