Berechnung

src/ch/spherIC/recurvebowsight/RBSMainActivity.java

@@ -113,6 +113,7 @@ public class RBSMainActivity extends Activity implements ChooseArcherySetupDlgDi
     private boolean showInfoMenu;
     private IArcherySetup selectedArcherySetup;
     private Double startAngle;
+    private String selectedHeVS;
 
     private AlertDialog calculationAlert;
 
@@ -163,6 +164,8 @@ public class RBSMainActivity extends Activity implements ChooseArcherySetupDlgDi
         if (savedInstanceState.containsKey("SelectedArcherySetup")) {
             this.selectedArcherySetup = ArcherySetupDao.getInstance().loadById(savedInstanceState.getLong("SelectedArcherySetup"));
         }
+        this.startAngle = savedInstanceState.getDouble("StartAngle", 0);
+        this.selectedHeVS = savedInstanceState.getString("SelectedHeVS");
 
         deactivateAllXTextView();
         switch (selView) {
@@ -185,7 +188,15 @@ public class RBSMainActivity extends Activity implements ChooseArcherySetupDlgDi
     protected void onSaveInstanceState(final Bundle outState) {
         super.onSaveInstanceState(outState);
         outState.putInt("ViewFlipper.SelectedView", this.viewFlipper.getDisplayedChild());
-        outState.putLong("SelectedArcherySetup", this.selectedArcherySetup.getId());
+        if (this.selectedArcherySetup != null) {
+            outState.putLong("SelectedArcherySetup", this.selectedArcherySetup.getId());
+        }
+        if (this.startAngle != null) {
+            outState.putDouble("StartAngle", this.startAngle);
+        }
+        if (this.scHeVSSpinner.getSelectedItem() != null) {
+            outState.putString("SelectedHeVS", this.scHeVSSpinner.getSelectedItem().toString());
+        }
     }
 
     private void initializeComponents() {
@@ -277,11 +288,14 @@ public class RBSMainActivity extends Activity implements ChooseArcherySetupDlgDi
                         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.setSelection(0);
-                        if (RBSMainActivity.this.selectedArcherySetup != null
-                            && RBSMainActivity.this.selectedArcherySetup.getSight().getId() == sight.getId()) {
-                            RBSMainActivity.this.scHeVSSpinner.setSelectionByVal(DF.format(RBSMainActivity.this.selectedArcherySetup
-                                                                                           .getSightHorSetting()));
+                        if (RBSMainActivity.this.selectedHeVS == null) {
+                            if (RBSMainActivity.this.selectedArcherySetup != null
+                                && RBSMainActivity.this.selectedArcherySetup.getSight().getId() == sight.getId()) {
+                                RBSMainActivity.this.scHeVSSpinner.setSelectionByVal(DF.format(RBSMainActivity.this.selectedArcherySetup
+                                                                                               .getSightHorSetting()));
+                            }
+                        } else {
+                            RBSMainActivity.this.scHeVSSpinner.setSelectionByVal(RBSMainActivity.this.selectedHeVS);
                         }
                         RBSMainActivity.this.scaVTxtFld.setText(DF.format(sight.getAV()));
                         RBSMainActivity.this.scaHTxtFld.setText(DF.format(sight.getAH()));
@@ -762,7 +776,7 @@ public class RBSMainActivity extends Activity implements ChooseArcherySetupDlgDi
      */
     private void calculateSettings() {
 
-        if (allSightParamFieldsValid()) {
+        if (allSightParamFieldsValid() && this.selectedArcherySetup != null && this.startAngle != null) {
             Double x0;
             Double y0;
             Double x1;

src/ch/spherIC/recurvebowsight/components/XSpinner.java

@@ -65,12 +65,14 @@ public class XSpinner extends Spinner {
      */
     public void setSelectionByVal(final String value) {
 
-        int count = getAdapter().getCount();
+        if (value != null) {
+            int count = getCount();
 
-        for (int i = 0; i < count; i++) {
-            if (getAdapter().getItem(i).toString().equals(value)) {
-                setSelection(i);
-                break;
+            for (int i = 0; i < count; i++) {
+                if (getItemAtPosition(i).toString().equals(value)) {
+                    setSelection(i);
+                    break;
+                }
             }
         }
     }