Diff: Screens/ChangeValScreen.cpp

Revision:

26:f57db8d6d79e

Parent:

25:bfff3d661f92

--- a/Screens/ChangeValScreen.cpp	Mon Oct 03 11:33:53 2016 +0200
+++ b/Screens/ChangeValScreen.cpp	Mon Oct 03 12:19:03 2016 +0200
@@ -2,10 +2,10 @@
 
 ChangeValScreen::ChangeValScreen(int *nextScreen, int prevScreen, float *valueToChange, string title) :
   Screen(),
-  _lbTitle(),
+  _lbTitle( SCREEN_W/2, 0, title, Label::CENTER, Font24),
   _btBack( 0, SCREEN_H-30, 100, 30, "Back"),
   _btSave( SCREEN_W-100, SCREEN_H-30, 100, 30, "Save"),
-  _npValue( 0, 48, SCREEN_W, SCREEN_H-83, 6);
+  _npValue( 0, 48, SCREEN_W, SCREEN_H-83),
   _nlbValue(SCREEN_W/2, 26, "%.3f", *valueToChange, Label::CENTER, Font20)
 {
   _nextScreen = nextScreen;
@@ -19,7 +19,7 @@
   _lbTitle.Draw();
   _btBack.Draw();
   _btSave.Draw();
-  _btValue.Draw();
+  _nlbValue.Draw();
   _npValue.Draw();
   _nlbValue.Draw();
 }
@@ -27,22 +27,23 @@
 void ChangeValScreen::Process()
 {
   if( _btBack.Touched() )
-    &_nextScreen = prevScreen;
+    *_nextScreen = _prevScreen;
 
   if( _btSave.Touched() )
   {
     *_value =  _npValue.GetVal();
-    *_nextScreen = prevScreen;
+    *_nextScreen = _prevScreen;
   }
 
   if( _npValue.Touched() )
   {
-    _nlbValue.Draw(".3f",_npValue.GetVal() );
+    _nlbValue.Draw("%.3f",_npValue.GetVal() );
+    Thread::wait(200);
   }
 
-  if( _btSave,Touched() )
+  if( _btSave.Touched() )
   {
     *_value = _npValue.GetVal();
-    *_nextScreen = prevScreen;
+    *_nextScreen = _prevScreen;
   }
 }