gitsvn 12 лет назад
Родитель
Сommit
f59b12db15

+ 40
- 44
src/ch/spherIC/recurvebowsight/DialogFactory.java Просмотреть файл

*/ */
public final class DialogFactory { public final class DialogFactory {
public static final int DLG_CHOOSE_ARCHERYSETUP = 0;
public static final int DLG_USERGUIDE_PARAMS = 1;
public static final int DLG_USERGUIDE_PARAMS_2 = 2;
public static final int DLG_USERGUIDE_RISER_CFG = 3;
public static final int DLG_USERGUIDE_SIGHT_CFG = 4;
public static final int DLG_USERGUIDE_AS_CFG = 5;
public static final int DLG_ABOUT = 6;
/** /**
* Static main method to initialize classes * Static main method to initialize classes
* *
switch (dlgCode) { switch (dlgCode) {
case RBSMainActivity.DLG_CHOOSE_ARCHERYSETUP:
case DLG_CHOOSE_ARCHERYSETUP:
dlg = createChooseArcherySetupDialog(parent); dlg = createChooseArcherySetupDialog(parent);
break; break;
case RBSMainActivity.DLG_ABOUT:
case DLG_ABOUT:
dlg = createAboutDialog(parent); dlg = createAboutDialog(parent);
break; break;
case RBSMainActivity.DLG_USERGUIDE_PARAMS_SIGHT:
if (parent.getIntent().getExtras().containsKey("ActiveTabIndex") && parent.getIntent().getExtras().getInt("ActiveTabIndex") == 0) {
dlg = createUserguideParamsDialog(parent);
} else if (parent.getIntent().getExtras().containsKey("ActiveTabIndex") && parent.getIntent().getExtras().getInt("ActiveTabIndex") == 2) {
dlg = createUserguideParams2Dialog(parent);
} else {
dlg = null;
}
case DLG_USERGUIDE_PARAMS:
dlg = createUserguideParamsDialog(parent);
break;
case DLG_USERGUIDE_PARAMS_2:
dlg = createUserguideParams2Dialog(parent);
break; break;
case RBSMainActivity.DLG_USERGUIDE_RISER_CFG:
case DLG_USERGUIDE_RISER_CFG:
dlg = createUserguideRiserDialog(parent); dlg = createUserguideRiserDialog(parent);
break; break;
case RBSMainActivity.DLG_USERGUIDE_SIGHT_CFG:
case DLG_USERGUIDE_SIGHT_CFG:
dlg = createUserguideSightDialog(parent); dlg = createUserguideSightDialog(parent);
break; break;
case RBSMainActivity.DLG_USERGUIDE_AS_CFG:
case DLG_USERGUIDE_AS_CFG:
dlg = createUserguideArcherySetupDialog(parent); dlg = createUserguideArcherySetupDialog(parent);
break; break;
String html = String.format(parent.getResources().getText(R.string.caption_UserguideParams).toString(), String html = String.format(parent.getResources().getText(R.string.caption_UserguideParams).toString(),
parent.getResources().getString(R.string.arrowNockHeightLbl), parent.getResources().getString(R.string.arrowNockHeightLbl),
parent.getResources().getString(R.string.targetCenterHeightLbl), parent.getResources().getString(R.string.targetCenterHeightLbl),
parent.getResources().getString(R.string.shootingDistanzLbl),
parent.getResources().getString(R.string.ashNA),
parent.getResources().getString(R.string.bowPulloutLbl),
parent.getResources().getString(R.string.asNockRaising),
parent.getResources().getString(R.string.asBraceHeight),
parent.getResources().getString(R.string.deltaTimeLbl),
parent.getResources().getString(R.string.shootingDistanzLbl), parent.getResources().getString(R.string.ashNA),
parent.getResources().getString(R.string.bowPulloutLbl), parent.getResources().getString(R.string.asNockRaising),
parent.getResources().getString(R.string.asBraceHeight), parent.getResources().getString(R.string.deltaTimeLbl),
parent.getResources().getString(R.string.ug_UserguideParams_Add1), parent.getResources().getString(R.string.ug_UserguideParams_Add1),
parent.getResources().getString(R.string.calcPrecisionLbl), parent.getResources().getString(R.string.calcPrecisionLbl),
parent.getResources().getString(R.string.ug_UserguideParams_Add2)).replaceAll("\n",
"<br>");
parent.getResources().getString(R.string.ug_UserguideParams_Add2)).replaceAll("\n", "<br>");
text.setText(Html.fromHtml(html)); text.setText(Html.fromHtml(html));
((Button) dialog.findViewById(R.id.btn_ugClose)).setOnClickListener(new OnClickListener() { ((Button) dialog.findViewById(R.id.btn_ugClose)).setOnClickListener(new OnClickListener() {
StringTokenizer st = new StringTokenizer(parent.getResources().getString(R.string.scaVLbl), "/"); StringTokenizer st = new StringTokenizer(parent.getResources().getString(R.string.scaVLbl), "/");
String aVStr = st.nextToken(); String aVStr = st.nextToken();
String aHStr = st.nextToken(); String aHStr = st.nextToken();
String html = String.format(parent.getResources().getText(R.string.caption_UserguideParams2).toString(), //
aVStr.trim(),
aHStr.trim(),
parent.getResources().getString(R.string.ug_UserguideSightParams_Add1),
parent.getResources().getString(R.string.scHeVSLbl), //
parent.getResources().getString(R.string.ug_UserguideSightParams_Add2), //
String html = String.format(parent.getResources().getText(R.string.caption_UserguideParams2).toString(), //
aVStr.trim(), aHStr.trim(), parent.getResources().getString(R.string.ug_UserguideSightParams_Add1),
parent.getResources().getString(R.string.scHeVSLbl), //
parent.getResources().getString(R.string.ug_UserguideSightParams_Add2), //
parent.getResources().getString(R.string.scVertScaleRngMinLbl), parent.getResources().getString(R.string.scVertScaleRngMinLbl),
parent.getResources().getString(R.string.scVertScaleRngMaxLbl), parent.getResources().getString(R.string.scVertScaleRngMaxLbl),
parent.getResources().getString(R.string.scVertSkalaMiddleLbl), parent.getResources().getString(R.string.scVertSkalaMiddleLbl),
parent.getResources().getString(R.string.scEvSLbl),
parent.getResources().getString(R.string.rcVvisVLbl), //
parent.getResources().getString(R.string.rcVvisHLbl), //
parent.getResources().getString(R.string.ug_UserguideRiserParams_Add1)).replaceAll("\n",
"<br>");
parent.getResources().getString(R.string.scEvSLbl), parent.getResources().getString(R.string.rcVvisVLbl), //
parent.getResources().getString(R.string.rcVvisHLbl), //
parent.getResources().getString(R.string.ug_UserguideRiserParams_Add1)).replaceAll("\n", "<br>");
text.setText(Html.fromHtml(html)); text.setText(Html.fromHtml(html));
((Button) dialog.findViewById(R.id.btn_ugClose)).setOnClickListener(new OnClickListener() { ((Button) dialog.findViewById(R.id.btn_ugClose)).setOnClickListener(new OnClickListener() {
parent.getResources().getString(R.string.rcVvisHLbl), // parent.getResources().getString(R.string.rcVvisHLbl), //
parent.getResources().getString(R.string.ug_UserguideRiserParams_Add1), parent.getResources().getString(R.string.ug_UserguideRiserParams_Add1),
parent.getResources().getString(R.string.ug_UserguideRiserParams_Add2), // parent.getResources().getString(R.string.ug_UserguideRiserParams_Add2), //
parent.getResources().getString(R.string.ug_UserguideRiserParams_Add3),
createButtonsGuideString(parent, true)).replaceAll("\n", "<br>");
parent.getResources().getString(R.string.ug_UserguideRiserParams_Add3), createButtonsGuideString(parent, true))
.replaceAll("\n", "<br>");
text.setText(Html.fromHtml(html)); text.setText(Html.fromHtml(html));
((Button) dialog.findViewById(R.id.btn_ugClose)).setOnClickListener(new OnClickListener() { ((Button) dialog.findViewById(R.id.btn_ugClose)).setOnClickListener(new OnClickListener() {
StringTokenizer st = new StringTokenizer(parent.getResources().getString(R.string.scaVLbl), "/"); StringTokenizer st = new StringTokenizer(parent.getResources().getString(R.string.scaVLbl), "/");
String aVStr = st.nextToken(); String aVStr = st.nextToken();
String aHStr = st.nextToken(); String aHStr = st.nextToken();
String html = String.format(parent.getResources().getText(R.string.caption_UserguideSightParams).toString(), //
aVStr.trim(),
aHStr.trim(),
parent.getResources().getString(R.string.ug_UserguideSightParams_Add1),
parent.getResources().getString(R.string.scHeVSLbl), //
parent.getResources().getString(R.string.ug_UserguideSightParams_Add2), //
String html = String.format(parent.getResources().getText(R.string.caption_UserguideSightParams).toString(), //
aVStr.trim(), aHStr.trim(), parent.getResources().getString(R.string.ug_UserguideSightParams_Add1),
parent.getResources().getString(R.string.scHeVSLbl), //
parent.getResources().getString(R.string.ug_UserguideSightParams_Add2), //
parent.getResources().getString(R.string.scVertScaleRngMinLbl), parent.getResources().getString(R.string.scVertScaleRngMinLbl),
parent.getResources().getString(R.string.scVertScaleRngMaxLbl), parent.getResources().getString(R.string.scVertScaleRngMaxLbl),
parent.getResources().getString(R.string.scVertSkalaMiddleLbl), parent.getResources().getString(R.string.scVertSkalaMiddleLbl),
parent.getResources().getString(R.string.scEvSLbl),
createButtonsGuideString(parent, true)).replaceAll("\n", "<br>");
parent.getResources().getString(R.string.scEvSLbl), createButtonsGuideString(parent, true)).replaceAll("\n",
"<br>");
text.setText(Html.fromHtml(html)); text.setText(Html.fromHtml(html));
((Button) dialog.findViewById(R.id.btn_ugClose)).setOnClickListener(new OnClickListener() { ((Button) dialog.findViewById(R.id.btn_ugClose)).setOnClickListener(new OnClickListener() {
String str8 = createButtonsGuideString(parent, true); String str8 = createButtonsGuideString(parent, true);
String html = parent.getResources().getString(R.string.caption_UserguideArcherySetupParams, str1, str2, str3,
str4, str5, str6, str7, str8).replaceAll("\n", "<br>");
String html = parent.getResources().getString(R.string.caption_UserguideArcherySetupParams, str1, str2, str3, str4, str5, str6, str7, str8)
.replaceAll("\n", "<br>");
text.setText(Html.fromHtml(html)); text.setText(Html.fromHtml(html));

+ 39
- 45
src/ch/spherIC/recurvebowsight/RBSMainActivity.java Просмотреть файл

public static final DecimalFormat DF_1 = new DecimalFormat("0.00"); public static final DecimalFormat DF_1 = new DecimalFormat("0.00");
public static final DecimalFormat DF_EVS = new DecimalFormat("0.#"); public static final DecimalFormat DF_EVS = new DecimalFormat("0.#");
public static final int DLG_CHOOSE_ARCHERYSETUP = 0;
public static final int DLG_USERGUIDE_PARAMS_SIGHT = 1;
public static final int DLG_USERGUIDE_RISER_CFG = 2;
public static final int DLG_USERGUIDE_SIGHT_CFG = 3;
public static final int DLG_USERGUIDE_AS_CFG = 4;
public static final int DLG_ABOUT = 5;
private static final Double ANGLE_90 = 90d;
private static final int MIN_DISTANCE = 50; private static final int MIN_DISTANCE = 50;
private static final double CENTI = 0.01; private static final double CENTI = 0.01;
private static final double MILLI = 0.001; private static final double MILLI = 0.001;
addValueChangeListeners(); addValueChangeListeners();
xTextViewUp(this.txtViewParams); xTextViewUp(this.txtViewParams);
getIntent().putExtra("ActiveTabIndex", 0);
this.calcTimeIntervalCboBox.setAdapter(new FontArrayAdapter<String>(this, R.layout.rbs_spinner, this.calcTimeIntervalCboBox.setAdapter(new FontArrayAdapter<String>(this, R.layout.rbs_spinner,
getResources().getStringArray(R.array.CalculationTimeIntervals), getResources().getStringArray(R.array.CalculationTimeIntervals),
IRiser selectedRiser = this.scRiserSpinner.getSelectedRiser(); IRiser selectedRiser = this.scRiserSpinner.getSelectedRiser();
List<IRiser> risers = RiserDao.getInstance().loadAll(); List<IRiser> risers = RiserDao.getInstance().loadAll();
risers.add(0, new Riser(-999, getResources().getString(R.string.caption_NoSelection), "", null, null, null)); risers.add(0, new Riser(-999, getResources().getString(R.string.caption_NoSelection), "", null, null, null));
this.scRiserSpinner.setAdapter(new FontArrayAdapter<IRiser>(this, R.layout.rbs_spinner, risers,
this.scRiserSpinner));
this.scRiserSpinner.setAdapter(new FontArrayAdapter<IRiser>(this, R.layout.rbs_spinner, risers, this.scRiserSpinner));
if (selectedRiser != null) { if (selectedRiser != null) {
this.scRiserSpinner.setSelectedRiser(selectedRiser); this.scRiserSpinner.setSelectedRiser(selectedRiser);
} }
private void loadSightSpinner() { private void loadSightSpinner() {
ISight selectedSight = this.scSightSpinner.getSelectedSight(); ISight selectedSight = this.scSightSpinner.getSelectedSight();
List<ISight> sights = SightDao.getInstance().loadAll(); List<ISight> sights = SightDao.getInstance().loadAll();
sights.add(0,
new Sight(-999, getResources().getString(R.string.caption_NoSelection), "", null, null, "", null, null));
this.scSightSpinner.setAdapter(new FontArrayAdapter<ISight>(this, R.layout.rbs_spinner, sights,
this.scSightSpinner));
sights.add(0, new Sight(-999, getResources().getString(R.string.caption_NoSelection), "", null, null, "", null, null));
this.scSightSpinner.setAdapter(new FontArrayAdapter<ISight>(this, R.layout.rbs_spinner, sights, this.scSightSpinner));
if (selectedSight != null) { if (selectedSight != null) {
this.scSightSpinner.setSelectedSight(selectedSight); this.scSightSpinner.setSelectedSight(selectedSight);
} }
} }
RBSMainActivity.this.scHeVSTxtFld.setVisibility(View.INVISIBLE); RBSMainActivity.this.scHeVSTxtFld.setVisibility(View.INVISIBLE);
RBSMainActivity.this.scHeVSTxtFld.setLayoutParams(new LinearLayout.LayoutParams(RBSMainActivity.this.scHeVSTxtFld.getLayoutParams().width,
RBSMainActivity.this.scHeVSTxtFld.getLayoutParams().height,
0f));
RBSMainActivity.this.scHeVSTxtFld.setLayoutParams(new LinearLayout.LayoutParams(RBSMainActivity.this.scHeVSTxtFld
.getLayoutParams().width,
RBSMainActivity.this.scHeVSTxtFld
.getLayoutParams().height, 0f));
RBSMainActivity.this.scHeVSSpinner.setVisibility(View.VISIBLE); RBSMainActivity.this.scHeVSSpinner.setVisibility(View.VISIBLE);
LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(RBSMainActivity.this.scHeVSSpinner.getLayoutParams().width, LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(RBSMainActivity.this.scHeVSSpinner.getLayoutParams().width,
1f); 1f);
params.gravity = Gravity.FILL_VERTICAL; params.gravity = Gravity.FILL_VERTICAL;
RBSMainActivity.this.scHeVSSpinner.setLayoutParams(params); RBSMainActivity.this.scHeVSSpinner.setLayoutParams(params);
RBSMainActivity.this.scHeVSSpinner.setAdapter(new FontArrayAdapter<String>(RBSMainActivity.this,
R.layout.rbs_spinner,
listHeVis,
RBSMainActivity.this.scHeVSSpinner));
RBSMainActivity.this.scHeVSSpinner.setAdapter(new FontArrayAdapter<String>(RBSMainActivity.this, R.layout.rbs_spinner,
listHeVis, RBSMainActivity.this.scHeVSSpinner));
if (RBSMainActivity.this.selectedHeVS == null) { if (RBSMainActivity.this.selectedHeVS == null) {
if (RBSMainActivity.this.selectedArcherySetup != null if (RBSMainActivity.this.selectedArcherySetup != null
&& RBSMainActivity.this.selectedArcherySetup.getSight().getId() == sight.getId()) { && RBSMainActivity.this.selectedArcherySetup.getSight().getId() == sight.getId()) {
RBSMainActivity.this.scHeVSSpinner.setSelectionByVal(DF.format(RBSMainActivity.this.selectedArcherySetup.getSightHorzSetting()));
RBSMainActivity.this.scHeVSSpinner.setSelectionByVal(DF.format(RBSMainActivity.this.selectedArcherySetup
.getSightHorzSetting()));
} }
} else { } else {
RBSMainActivity.this.scHeVSSpinner.setSelectionByVal(RBSMainActivity.this.selectedHeVS); RBSMainActivity.this.scHeVSSpinner.setSelectionByVal(RBSMainActivity.this.selectedHeVS);
+ DF.format(sight.getVertSkalaRangeMax())); + DF.format(sight.getVertSkalaRangeMax()));
} else { } else {
RBSMainActivity.this.scHeVSSpinner.setVisibility(View.INVISIBLE); RBSMainActivity.this.scHeVSSpinner.setVisibility(View.INVISIBLE);
RBSMainActivity.this.scHeVSSpinner.setLayoutParams(new LinearLayout.LayoutParams(RBSMainActivity.this.scHeVSSpinner.getLayoutParams().width,
RBSMainActivity.this.scHeVSSpinner.getLayoutParams().height,
0f));
RBSMainActivity.this.scHeVSSpinner.setLayoutParams(new LinearLayout.LayoutParams(RBSMainActivity.this.scHeVSSpinner
.getLayoutParams().width,
RBSMainActivity.this.scHeVSSpinner
.getLayoutParams().height, 0f));
RBSMainActivity.this.scHeVSTxtFld.setVisibility(View.VISIBLE); RBSMainActivity.this.scHeVSTxtFld.setVisibility(View.VISIBLE);
RBSMainActivity.this.scHeVSTxtFld.setLayoutParams(new LinearLayout.LayoutParams(RBSMainActivity.this.scHeVSTxtFld.getLayoutParams().width,
RBSMainActivity.this.scHeVSTxtFld.getLayoutParams().height,
1f));
RBSMainActivity.this.scHeVSSpinner.setAdapter(new FontArrayAdapter<String>(RBSMainActivity.this,
R.layout.rbs_spinner,
RBSMainActivity.this.scHeVSTxtFld.setLayoutParams(new LinearLayout.LayoutParams(RBSMainActivity.this.scHeVSTxtFld
.getLayoutParams().width,
RBSMainActivity.this.scHeVSTxtFld
.getLayoutParams().height, 1f));
RBSMainActivity.this.scHeVSSpinner.setAdapter(new FontArrayAdapter<String>(RBSMainActivity.this, R.layout.rbs_spinner,
new ArrayList<String>(), new ArrayList<String>(),
RBSMainActivity.this.scHeVSSpinner)); RBSMainActivity.this.scHeVSSpinner));
RBSMainActivity.this.scaVTxtFld.setText(""); RBSMainActivity.this.scaVTxtFld.setText("");
if (v == RBSMainActivity.this.txtViewParams) { if (v == RBSMainActivity.this.txtViewParams) {
if (RBSMainActivity.this.viewFlipper.getDisplayedChild() != 0) { if (RBSMainActivity.this.viewFlipper.getDisplayedChild() != 0) {
RBSMainActivity.this.viewFlipper.setDisplayedChild(0); RBSMainActivity.this.viewFlipper.setDisplayedChild(0);
getIntent().putExtra("ActiveTabIndex", 0);
} }
} else if (v == RBSMainActivity.this.txtViewResults) { } else if (v == RBSMainActivity.this.txtViewResults) {
if (RBSMainActivity.this.viewFlipper.getDisplayedChild() != 1) { if (RBSMainActivity.this.viewFlipper.getDisplayedChild() != 1) {
RBSMainActivity.this.viewFlipper.setDisplayedChild(1); RBSMainActivity.this.viewFlipper.setDisplayedChild(1);
getIntent().putExtra("ActiveTabIndex", 1);
} }
} else { } else {
if (RBSMainActivity.this.viewFlipper.getDisplayedChild() != 2) { if (RBSMainActivity.this.viewFlipper.getDisplayedChild() != 2) {
RBSMainActivity.this.viewFlipper.setDisplayedChild(2); RBSMainActivity.this.viewFlipper.setDisplayedChild(2);
getIntent().putExtra("ActiveTabIndex", 2);
} }
} }
switch (item.getItemId()) { switch (item.getItemId()) {
case R.id.chooseConfiguration: case R.id.chooseConfiguration:
showDialog(DLG_CHOOSE_ARCHERYSETUP);
showDialog(DialogFactory.DLG_CHOOSE_ARCHERYSETUP);
return true; return true;
case R.id.doCalculation: case R.id.doCalculation:
}); });
return true; return true;
case R.id.itemAbout: case R.id.itemAbout:
showDialog(DLG_ABOUT);
showDialog(DialogFactory.DLG_ABOUT);
return true; return true;
case R.id.itemUserGuide: case R.id.itemUserGuide:
showDialog(DLG_USERGUIDE_PARAMS_SIGHT);
if (RBSMainActivity.this.viewFlipper.getDisplayedChild() == 0) {
showDialog(DialogFactory.DLG_USERGUIDE_PARAMS);
} else if (RBSMainActivity.this.viewFlipper.getDisplayedChild() == 2) {
showDialog(DialogFactory.DLG_USERGUIDE_PARAMS_2);
}
return true; return true;
default: default:
this.flightCurveChart.getDataSet().removeSeries(0); this.flightCurveChart.getDataSet().removeSeries(0);
this.flightCurveChart.getDataSet().addSeries(0, serie); this.flightCurveChart.getDataSet().addSeries(0, serie);
this.flightCurveChart.updateRendererAfterCalculation(flightCurve[flightCurve.length - 1][TrajectoryCalculator.IDX_X],
flightCurve);
this.flightCurveChart.updateRendererAfterCalculation(flightCurve[flightCurve.length - 1][TrajectoryCalculator.IDX_X], flightCurve);
} }
Double vVh = Double.valueOf(this.scVvisHTxtFld.getText().toString()) + Double.valueOf(this.scaHTxtFld.getText().toString()); Double vVh = Double.valueOf(this.scVvisHTxtFld.getText().toString()) + Double.valueOf(this.scaHTxtFld.getText().toString());
Double vVv = Double.valueOf(this.scVvisVTxtFld.getText().toString()) + Double.valueOf(this.scaVTxtFld.getText().toString()); Double vVv = Double.valueOf(this.scVvisVTxtFld.getText().toString()) + Double.valueOf(this.scaVTxtFld.getText().toString());
Double a = Double.valueOf(this.bowPulloutTxtFld.getText().toString()) * 10; Double a = Double.valueOf(this.bowPulloutTxtFld.getText().toString()) * 10;
Double heVs = this.scHeVSSpinner.getVisibility() == View.VISIBLE ? Double.valueOf(this.scHeVSSpinner.getSelectedItem().toString()) : Double.valueOf(this.scHeVSTxtFld.getText().toString());
Double heVs = this.scHeVSSpinner.getVisibility() == View.VISIBLE ? Double.valueOf(this.scHeVSSpinner.getSelectedItem().toString())
: Double.valueOf(this.scHeVSTxtFld.getText().toString());
Double lhNA = this.selectedArcherySetup.getHNA(); Double lhNA = this.selectedArcherySetup.getHNA();
Double dltH = (Double.valueOf(this.targetCenterHeightTxtFld.getText().toString()) Double dltH = (Double.valueOf(this.targetCenterHeightTxtFld.getText().toString())
- Double.valueOf(this.arrowNockHeightTxtFld.getText().toString())) * Math.pow(10, 3); - Double.valueOf(this.arrowNockHeightTxtFld.getText().toString())) * Math.pow(10, 3);
Double ldistH = Double.valueOf(this.shootingDistanzTxtFld.getText().toString()) * Math.pow(10, 3); Double ldistH = Double.valueOf(this.shootingDistanzTxtFld.getText().toString()) * Math.pow(10, 3);
Double minSkala = this.scVertScaleRngTxtFld.getText().toString().contains("-") ? Double.valueOf(this.scVertScaleRngTxtFld.getText().toString().substring(0,
this.scVertScaleRngTxtFld.getText().toString().indexOf('-'))) : 0d;
Double maxSkala = this.scVertScaleRngTxtFld.getText().toString().contains("-") ? Double.valueOf(this.scVertScaleRngTxtFld.getText().toString().substring(this.scVertScaleRngTxtFld.getText().toString().indexOf('-') + 1,
this.scVertScaleRngTxtFld.getText().toString().length())) : 0d;
Double minSkala = this.scVertScaleRngTxtFld.getText().toString().contains("-")
? Double.valueOf(this.scVertScaleRngTxtFld.getText().toString().substring(0,
this.scVertScaleRngTxtFld.getText().toString()
.indexOf('-'))) : 0d;
Double maxSkala = this.scVertScaleRngTxtFld.getText().toString().contains("-")
? Double.valueOf(this.scVertScaleRngTxtFld.getText().toString().substring(this.scVertScaleRngTxtFld.getText().toString()
.indexOf('-') + 1,
this.scVertScaleRngTxtFld.getText().toString()
.length())) : 0d;
Double nockRaising = Double.valueOf(this.nockRaisingTxtFld.getText().toString()) Double nockRaising = Double.valueOf(this.nockRaisingTxtFld.getText().toString())
- Double.valueOf(this.arrowDiameterTxtFld.getText().toString()); - Double.valueOf(this.arrowDiameterTxtFld.getText().toString());
Double braceHeight = Double.valueOf(this.braceHeightTxtFld.getText().toString()); Double braceHeight = Double.valueOf(this.braceHeightTxtFld.getText().toString());

+ 2
- 3
src/ch/spherIC/recurvebowsight/configuration/ArcherySetupConfigurationActivity.java Просмотреть файл

import ch.spherIC.recurvebowsight.DialogFactory; import ch.spherIC.recurvebowsight.DialogFactory;
import ch.spherIC.recurvebowsight.R; import ch.spherIC.recurvebowsight.R;
import ch.spherIC.recurvebowsight.RBSMainActivity;
import ch.spherIC.recurvebowsight.components.FontArrayAdapter; import ch.spherIC.recurvebowsight.components.FontArrayAdapter;
import ch.spherIC.recurvebowsight.components.RiserSpinner; import ch.spherIC.recurvebowsight.components.RiserSpinner;
import ch.spherIC.recurvebowsight.components.SightSpinner; import ch.spherIC.recurvebowsight.components.SightSpinner;
switch (item.getItemId()) { switch (item.getItemId()) {
case R.id.itemAbout: case R.id.itemAbout:
showDialog(RBSMainActivity.DLG_ABOUT);
showDialog(DialogFactory.DLG_ABOUT);
return true; return true;
case R.id.itemUserGuide: case R.id.itemUserGuide:
showDialog(RBSMainActivity.DLG_USERGUIDE_AS_CFG);
showDialog(DialogFactory.DLG_USERGUIDE_AS_CFG);
return true; return true;
default: default:

+ 1
- 2
src/ch/spherIC/recurvebowsight/configuration/MainConfigurationActivity.java Просмотреть файл

import ch.spherIC.recurvebowsight.DialogFactory; import ch.spherIC.recurvebowsight.DialogFactory;
import ch.spherIC.recurvebowsight.R; import ch.spherIC.recurvebowsight.R;
import ch.spherIC.recurvebowsight.RBSMainActivity;
import ch.spherIC.recurvebowsight.components.MainConfigurationArrayAdapter; import ch.spherIC.recurvebowsight.components.MainConfigurationArrayAdapter;
import ch.spherIC.recurvebowsight.utilities.CompatibilityUtil; import ch.spherIC.recurvebowsight.utilities.CompatibilityUtil;
switch (item.getItemId()) { switch (item.getItemId()) {
case R.id.itemAbout: case R.id.itemAbout:
showDialog(RBSMainActivity.DLG_ABOUT);
showDialog(DialogFactory.DLG_ABOUT);
return true; return true;
default: default:

+ 3
- 5
src/ch/spherIC/recurvebowsight/configuration/RiserConfigurationActivity.java Просмотреть файл

import ch.spherIC.recurvebowsight.DialogFactory; import ch.spherIC.recurvebowsight.DialogFactory;
import ch.spherIC.recurvebowsight.R; import ch.spherIC.recurvebowsight.R;
import ch.spherIC.recurvebowsight.RBSMainActivity;
import ch.spherIC.recurvebowsight.components.FontArrayAdapter; import ch.spherIC.recurvebowsight.components.FontArrayAdapter;
import ch.spherIC.recurvebowsight.components.RiserSpinner; import ch.spherIC.recurvebowsight.components.RiserSpinner;
import ch.spherIC.recurvebowsight.database.dao.RiserDao; import ch.spherIC.recurvebowsight.database.dao.RiserDao;
private void loadRiserSpinner() { private void loadRiserSpinner() {
List<IRiser> risers = RiserDao.getInstance().loadAll(); List<IRiser> risers = RiserDao.getInstance().loadAll();
this.rcRiserSpinner.setAdapter(new FontArrayAdapter<IRiser>(this, R.layout.rbs_spinner, risers,
this.rcRiserSpinner));
this.rcRiserSpinner.setAdapter(new FontArrayAdapter<IRiser>(this, R.layout.rbs_spinner, risers, this.rcRiserSpinner));
} }
private void initializeComponents() { private void initializeComponents() {
switch (item.getItemId()) { switch (item.getItemId()) {
case R.id.itemAbout: case R.id.itemAbout:
showDialog(RBSMainActivity.DLG_ABOUT);
showDialog(DialogFactory.DLG_ABOUT);
return true; return true;
case R.id.itemUserGuide: case R.id.itemUserGuide:
showDialog(RBSMainActivity.DLG_USERGUIDE_RISER_CFG);
showDialog(DialogFactory.DLG_USERGUIDE_RISER_CFG);
return true; return true;
default: default:

+ 3
- 5
src/ch/spherIC/recurvebowsight/configuration/SightConfigurationActivity.java Просмотреть файл

import ch.spherIC.recurvebowsight.DialogFactory; import ch.spherIC.recurvebowsight.DialogFactory;
import ch.spherIC.recurvebowsight.R; import ch.spherIC.recurvebowsight.R;
import ch.spherIC.recurvebowsight.RBSMainActivity;
import ch.spherIC.recurvebowsight.components.FontArrayAdapter; import ch.spherIC.recurvebowsight.components.FontArrayAdapter;
import ch.spherIC.recurvebowsight.components.SightSpinner; import ch.spherIC.recurvebowsight.components.SightSpinner;
import ch.spherIC.recurvebowsight.database.dao.SightDao; import ch.spherIC.recurvebowsight.database.dao.SightDao;
private void loadSightSpinner() { private void loadSightSpinner() {
List<ISight> sights = SightDao.getInstance().loadAll(); List<ISight> sights = SightDao.getInstance().loadAll();
this.scSightSpinner.setAdapter(new FontArrayAdapter<ISight>(this, R.layout.rbs_spinner, sights,
this.scSightSpinner));
this.scSightSpinner.setAdapter(new FontArrayAdapter<ISight>(this, R.layout.rbs_spinner, sights, this.scSightSpinner));
} }
private void initializeComponents() { private void initializeComponents() {
switch (item.getItemId()) { switch (item.getItemId()) {
case R.id.itemAbout: case R.id.itemAbout:
showDialog(RBSMainActivity.DLG_ABOUT);
showDialog(DialogFactory.DLG_ABOUT);
return true; return true;
case R.id.itemUserGuide: case R.id.itemUserGuide:
showDialog(RBSMainActivity.DLG_USERGUIDE_SIGHT_CFG);
showDialog(DialogFactory.DLG_USERGUIDE_SIGHT_CFG);
return true; return true;
default: default:

Загрузка…
Отмена
Сохранить