Added measures.h and measures.cpp files. Changed resultdialog.h, .cpp and measuredial...
authorJanne Änäkkälä <Janne_anakkala@hotmail.com>
Thu, 4 Mar 2010 11:09:12 +0000 (13:09 +0200)
committerJanne Änäkkälä <Janne_anakkala@hotmail.com>
Thu, 4 Mar 2010 11:09:12 +0000 (13:09 +0200)
Now measure dialog gets speed and time from accelerometer and when speed is raised to 40km/h
result dialog opens. Result dialog draws now diagram with real values which has got from accelerometer.

Merge branch 'feature/UIcommwithAccele2'

Conflicts:
Client/UI.pro

1  2 
Client/UI.pro
Client/carmainwindow.cpp

diff --cc Client/UI.pro
@@@ -12,18 -12,14 +12,22 @@@ SOURCES += main.cpp 
      measuredialog.cpp \
      calculate.cpp \
      accelerometer.cpp \
 +    loginwindow.cpp \
 +    registration.cpp
+     measures.cpp
++
  HEADERS += carmainwindow.h \
      resultdialog.h \
      stringlistmodel.h \
      measuredialog.h \
      accelerometer.h \
      calculate.h \
 +    loginwindow.h \
 +    registration.h
+     measures.h
++
  FORMS += carmainwindow.ui \
      resultdialog.ui \
 -    measuredialog.ui
 +    measuredialog.ui \
 +    loginwindow.ui \
 +    registration.ui
Simple merge