@@ -92,7 +92,7 @@ public Fragment getSensorFragment() {
9292 @ Override
9393 public void getDataFromDataLogger () {
9494 if (getIntent ().getExtras () != null && getIntent ().getExtras ().getBoolean (KEY_LOG )) {
95- // playingData = true;
95+ playingData = true ;
9696 viewingData = true ;
9797 recordedAccelerometerData = LocalDataLog .with ()
9898 .getBlockOfAccelerometerRecords (getIntent ().getExtras ().getLong (DATA_BLOCK ));
@@ -115,19 +115,8 @@ private void reinstateConfigurations() {
115115 accelerometerConfigurations = PreferenceManager .getDefaultSharedPreferences (getBaseContext ());
116116 locationEnabled = accelerometerConfigurations .getBoolean (AccelerometerSettingsFragment .KEY_INCLUDE_LOCATION , true );
117117 AccelerometerDataFragment .setParameters (
118- getValueFromText (accelerometerConfigurations .getString (AccelerometerSettingsFragment .KEY_HIGH_LIMIT , "2000" ),
119- 10 , 10000 ),
120- getValueFromText (accelerometerConfigurations .getString (AccelerometerSettingsFragment .KEY_UPDATE_PERIOD , "1000" ),
121- 100 , 1000 ),
122- accelerometerConfigurations .getString (AccelerometerSettingsFragment .KEY_ACCELEROMETER_SENSOR_TYPE , "0" ),
118+ Float .valueOf (accelerometerConfigurations .getString (AccelerometerSettingsFragment .KEY_HIGH_LIMIT , "20" )),
119+ Integer .valueOf (accelerometerConfigurations .getString (AccelerometerSettingsFragment .KEY_UPDATE_PERIOD , "1000" )),
123120 accelerometerConfigurations .getString (AccelerometerSettingsFragment .KEY_ACCELEROMETER_SENSOR_GAIN , "1" ));
124121 }
125-
126- private int getValueFromText (String strValue , int lowerBound , int upperBound ) {
127- if (strValue .isEmpty ()) return lowerBound ;
128- int value = Integer .parseInt (strValue );
129- if (value > upperBound ) return upperBound ;
130- else if (value < lowerBound ) return lowerBound ;
131- else return value ;
132- }
133122}
0 commit comments