Added a setting to change throughput frequency.

[artf492105]
This commit is contained in:
Ziver Koc 2015-02-19 16:03:37 +01:00
parent 0300cf55c1
commit 855da2360e
7 changed files with 83 additions and 7 deletions

View file

@ -21,6 +21,7 @@ import com.ericsson.uecontrol.core.UeControlExecutor;
import com.ericsson.uecontrol.core.UeControlExecutor.ExecutionListener;
import com.ericsson.uecontrol.core.behaviour.UeBehaviourSleep;
import com.ericsson.uecontrol.core.behaviour.UeBehaviourSurfing;
import com.ericsson.uecontrol.core.util.ThroughputCalculator;
import com.ericsson.uecontrol.gui.fragments.BehaviourListFragment;
import com.ericsson.uecontrol.gui.fragments.ExecNotification;
import com.ericsson.uecontrol.gui.fragments.FileBrowserDialog;
@ -75,6 +76,7 @@ public class MainActivity extends FragmentActivity implements OnSharedPreference
log.info("Creating new instance of executor");
executor = new UeControlExecutor();
executor.setDeviceBasedThroughput(Boolean.parseBoolean(prefs.getString("throughput_type", "false")));
executor.setThroughputFrequency(Float.parseFloat(prefs.getString("throughput_average_freq", "" + ThroughputCalculator.UPDATES_PER_SEC)));
File input = new File(this.getFilesDir(), BEHAVIOUR_SAVE_FILE);
if (input.exists()) {
try {
@ -142,6 +144,16 @@ public class MainActivity extends FragmentActivity implements OnSharedPreference
if(executor != null)
executor.setDeviceBasedThroughput(Boolean.parseBoolean(sharedPreferences.getString("throughput_type", "false")));
}
else if(key.equals("throughput_average_freq")){
float frequency = Float.parseFloat(sharedPreferences.getString("throughput_average_freq", ""+ThroughputCalculator.UPDATES_PER_SEC));
log.info("Device Throughput Frequency set to: "+frequency);
if(executor != null)
executor.setThroughputFrequency(frequency);
if(statusFragment != null) {
statusFragment.reset();
statusFragment.updateGraphLength();
}
}
}
@ -305,7 +317,7 @@ public class MainActivity extends FragmentActivity implements OnSharedPreference
}
@Override
protected void onDestroy() {
if(executor != null){
if(executor != null && isFinishing()){
executor.terminateNonBlock();
executor.reset();
executor = null;