hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use the new conversion utilities for delays. This fixes the problems with Plugged delays showing up as large numbers.

Browse Source
This commit is contained in:
Kevin Ruland 2012-06-22 02:12:48 +00:00
parent 513e5ed9d1
commit b72e425d6d
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
android/src/net/sf/openrocket/android/motor/MotorDelayDialogFragment.java
View File

@ -1,8 +1,9 @@
package net.sf.openrocket.android.motor; package net.sf.openrocket.android.motor;
import java.util.ArrayList; import java.util.List;
import net.sf.openrocket.R; import net.sf.openrocket.R;
import net.sf.openrocket.android.db.ConversionUtils;
import android.app.AlertDialog; import android.app.AlertDialog;
import android.app.Dialog; import android.app.Dialog;
import android.os.Bundle; import android.os.Bundle;
@ -43,7 +44,7 @@ implements View.OnClickListener, TextView.OnEditorActionListener {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
String s = ((TextView)v).getText().toString(); String s = ((TextView)v).getText().toString();
long value = Long.parseLong(s); double value = ConversionUtils.stringToDelay(s);
if ( delaySelectedListener != null ) { if ( delaySelectedListener != null ) {
delaySelectedListener.onDelaySelected(value); delaySelectedListener.onDelaySelected(value);
} }
@ -72,10 +73,7 @@ implements View.OnClickListener, TextView.OnEditorActionListener {
savedInstanceState = getArguments(); savedInstanceState = getArguments();
} }
double[] delays = savedInstanceState.getDoubleArray(delaysArg); double[] delays = savedInstanceState.getDoubleArray(delaysArg);
ArrayList<Long> delayList = new ArrayList<Long>(delays.length); List<String> delayList = ConversionUtils.delaysToStringList(delays);
for( int i =0; i< delays.length; i++ ) {
delayList.add( Math.round(delays[i]) );
}
AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
builder.setTitle("Enter or Choose Delay"); builder.setTitle("Enter or Choose Delay");
@ -84,7 +82,7 @@ implements View.OnClickListener, TextView.OnEditorActionListener {
View v = li.inflate(R.layout.motor_config_delay_dialog, null); View v = li.inflate(R.layout.motor_config_delay_dialog, null);
builder.setView(v); builder.setView(v);
ArrayAdapter<Long> listAdapter = new ArrayAdapter<Long>(getActivity(),android.R.layout.simple_list_item_1,delayList) { ArrayAdapter<String> listAdapter = new ArrayAdapter<String>(getActivity(),android.R.layout.simple_list_item_1,delayList) {
@Override @Override
public View getView(int position, View convertView, ViewGroup parent) { public View getView(int position, View convertView, ViewGroup parent) {
@ -92,7 +90,7 @@ implements View.OnClickListener, TextView.OnEditorActionListener {
convertView = getActivity().getLayoutInflater().inflate( android.R.layout.simple_list_item_1, null); convertView = getActivity().getLayoutInflater().inflate( android.R.layout.simple_list_item_1, null);
} }
TextView tv = (TextView) convertView.findViewById(android.R.id.text1); TextView tv = (TextView) convertView.findViewById(android.R.id.text1);
tv.setText( String.valueOf(getItem(position)) ); tv.setText( getItem(position) );
tv.setOnClickListener( MotorDelayDialogFragment.this ); tv.setOnClickListener( MotorDelayDialogFragment.this );
return convertView; return convertView;
} }