projects
/
speedfreak
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Conflict
[speedfreak]
/
Client
/
accelerometer.cpp
diff --git
a/Client/accelerometer.cpp
b/Client/accelerometer.cpp
index
ecde13d
..
c2f0bab
100644
(file)
--- a/
Client/accelerometer.cpp
+++ b/
Client/accelerometer.cpp
@@
-24,6
+24,7
@@
Accelerometer::Accelerometer()
{
initValues();
Accelerometer::Accelerometer()
{
initValues();
+ calibrateDialog = NULL;
}
/**
}
/**
@@
-32,6
+33,8
@@
Accelerometer::Accelerometer()
*/
Accelerometer::~Accelerometer()
{
*/
Accelerometer::~Accelerometer()
{
+ if(calibrateDialog)
+ delete calibrateDialog;
}
/**
}
/**
@@
-61,6
+64,7
@@
void Accelerometer::calibrate(void)
calibrateDialog = new CalibrateDialog();
calibrateDialog->show();
calibrateDialog->resetProgressValue();
calibrateDialog = new CalibrateDialog();
calibrateDialog->show();
calibrateDialog->resetProgressValue();
+ calibrateDialog->setMaxValue( kIterations + 1 );
do {
calibrateDialog->setProgressValue(iteration);
do {
calibrateDialog->setProgressValue(iteration);
@@
-79,7
+83,7
@@
void Accelerometer::calibrate(void)
calibrationY = calibrationY/kIterations;
calibrationZ = calibrationZ/kIterations;
calibrationY = calibrationY/kIterations;
calibrationZ = calibrationZ/kIterations;
- calibrateDialog->hide();
+ calibrateDialog->close();
}
/**
}
/**