Initial state of pattern prefs, plus set defaults when pattern chages. Generate event when settings completed. Handle change of state of save/upload prefs.

philip-lamb · philip-lamb · commit 3c87c83d969d · 2023-08-25T01:06:53.000+12:00
diff --git a/Android/app/src/main/java/org/artoolkitx/utilities/cameracalibration/CameraCalibrationActivity.java b/Android/app/src/main/java/org/artoolkitx/utilities/cameracalibration/CameraCalibrationActivity.java
@@ -25,16 +25,13 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
         findViewById(R.id.btn_cancel).setOnClickListener(view -> {
-            CameraCalibrationActivity.handleBackButton();
+            CameraCalibrationJNI.handleBackButton();
         });
         findViewById(R.id.btn_add).setOnClickListener(view -> {
-            CameraCalibrationActivity.handleAddButton();
+            CameraCalibrationJNI.handleAddButton();
         });
     }
 
-    public static native void handleBackButton();
-    public static native void handleAddButton();
-
     @Override
     public boolean onOptionsItemSelected(@NonNull MenuItem item) {
         switch (item.getItemId()) {
@@ -49,7 +46,7 @@ public boolean onOptionsItemSelected(@NonNull MenuItem item) {
                 try
                 {
                     PrintDocumentAdapter printAdapter = null;
-                    if (getSharedPreferences("cameracalibrationsettings", MODE_PRIVATE).getString("print_paper_size", "a4") == "usletter") {
+                    if (getSharedPreferences( getPackageName() + "_preferences", MODE_PRIVATE).getString("print_paper_size", "a4").equals("usletter")) {
                         printAdapter = new PdfDocumentAdapter(this, R.raw.printusletter, "Calibration chessboard (US Letter)", 1);
                     } else {
                         // Assume A4.
diff --git a/Android/app/src/main/java/org/artoolkitx/utilities/cameracalibration/CameraCalibrationJNI.java b/Android/app/src/main/java/org/artoolkitx/utilities/cameracalibration/CameraCalibrationJNI.java
@@ -0,0 +1,9 @@
+package org.artoolkitx.utilities.cameracalibration;
+
+public class CameraCalibrationJNI {
+
+    public static native void handleBackButton();
+    public static native void handleAddButton();
+
+    public static native void sendPreferencesChangedEvent();
+}
diff --git a/Android/app/src/main/java/org/artoolkitx/utilities/cameracalibration/CameraCalibrationSettingsFragment.java b/Android/app/src/main/java/org/artoolkitx/utilities/cameracalibration/CameraCalibrationSettingsFragment.java
@@ -1,18 +1,21 @@
 package org.artoolkitx.utilities.cameracalibration;
 
+import android.content.SharedPreferences;
 import android.graphics.Color;
 import android.os.Bundle;
 import android.text.InputType;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.BaseAdapter;
 import android.widget.EditText;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.preference.EditTextPreference;
 import androidx.preference.ListPreference;
+import androidx.preference.Preference;
 import androidx.preference.PreferenceFragmentCompat;
 import androidx.preference.SwitchPreferenceCompat;
 
@@ -22,28 +25,48 @@
 import java.util.ArrayList;
 import java.util.List;
 
-public class CameraCalibrationSettingsFragment extends PreferenceFragmentCompat {
+public class CameraCalibrationSettingsFragment extends PreferenceFragmentCompat implements SharedPreferences.OnSharedPreferenceChangeListener {
 
-    static final String LOGTAG = "CameraCalibrationSettingsFragment";
+    static final String TAG = "CameraCalibrationSettingsFragment";
     @Override
     @SuppressWarnings("ConstantConditions")
     public void onCreatePreferences(Bundle savedInstanceState, @Nullable String rootKey) {
+
+        // Init the pattern prefs on first run.
+        if (!getPreferenceManager().getSharedPreferences().contains("pattern")) {
+            SharedPreferences.Editor editor = getPreferenceManager().getSharedPreferences().edit();
+            editor.putString("pattern", "chessboard");
+            editor.putString("pattern_width", "7");
+            editor.putString("pattern_height", "5");
+            editor.putString("pattern_spacing", "30.0");
+            editor.apply();
+        }
+
         setPreferencesFromResource(R.xml.cameracalibrationsettings, rootKey);
 
         final ListPreference camera = (ListPreference)findPreference("camera");
         setCameraInputList(camera);
 
         // Toggle fields on or off.
+        final SwitchPreferenceCompat save = (SwitchPreferenceCompat)findPreference("save");
         final SwitchPreferenceCompat upload_canonical = (SwitchPreferenceCompat)findPreference("upload_canonical");
         final SwitchPreferenceCompat upload_user = (SwitchPreferenceCompat)findPreference("upload_user");
         final EditTextPreference upload_user_csuu = (EditTextPreference)findPreference("upload_user_csuu");
         final EditTextPreference upload_user_csat= (EditTextPreference)findPreference("upload_user_csat");
         if (Config.ARTOOLKITX_CSAT.isEmpty() || Config.ARTOOLKITX_CSUU.isEmpty()) {
             upload_canonical.setVisible(false);
+            if (!upload_user.isChecked()) {
+                save.setChecked(true);
+                save.setEnabled(false);
+            }
             upload_user.setVisible(true);
             upload_user_csuu.setVisible(true);
             upload_user_csat.setVisible(true);
         } else {
+            if (!upload_canonical.isChecked()) {
+                save.setChecked(true);
+                save.setEnabled(false);
+            }
             upload_canonical.setVisible(true);
             upload_user.setVisible(false);
             upload_user_csuu.setVisible(false);
@@ -73,6 +96,7 @@ public void onBindEditText(@NonNull EditText editText) {
         pattern_width.setOnBindEditTextListener(numbersOnly);
         pattern_height.setOnBindEditTextListener(numbersOnly);
         pattern_spacing.setOnBindEditTextListener(numbersDecimalOnly);
+
     }
 
     @NonNull
@@ -87,22 +111,70 @@ protected static void setCameraInputList(ListPreference lp) {
         List<String> entriesList = new ArrayList<>();
         List<String> entryValuesList = new ArrayList<>();
         int cameraCount = ARX_jni.arwCreateVideoSourceInfoList("-module=Android");
-        Log.d(LOGTAG, "setCameraInputList: cameraCount=" + cameraCount);
+        Log.d(TAG, "setCameraInputList: cameraCount=" + cameraCount);
         for (int i = 0; i < cameraCount; i++) {
             String[] name = new String[1];
             String[] model = new String[1];
             String[] UID = new String[1];
             int[] flags = new int[1];
             String[] openToken = new String[1];
             if (ARX_jni.arwGetVideoSourceInfoListEntry(i, name, model, UID, flags, openToken)) {
-                Log.d(LOGTAG, "setCameraInputList: Entry " + i + " name=" + name[0] + ", model='" + model[0] + "', UID='"+ UID[0] + "', flags=0x" + Integer.toHexString(flags[0]) + ", openToken='"+ openToken[0] + "'.");
+                Log.d(TAG, "setCameraInputList: Entry " + i + " name=" + name[0] + ", model='" + model[0] + "', UID='"+ UID[0] + "', flags=0x" + Integer.toHexString(flags[0]) + ", openToken='"+ openToken[0] + "'.");
                 entriesList.add(name[0]);
                 entryValuesList.add(openToken[0]);
             } else {
-                Log.e(LOGTAG, "setCameraInputList: arwGetVideoSourceInfoListEntry error.\n");
+                Log.e(TAG, "setCameraInputList: arwGetVideoSourceInfoListEntry error.\n");
             }
         }
         lp.setEntries(entriesList.toArray(new String[0]));
         lp.setEntryValues(entryValuesList.toArray(new String[0]));
     }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        getPreferenceManager().getSharedPreferences().registerOnSharedPreferenceChangeListener(this);
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        getPreferenceManager().getSharedPreferences().unregisterOnSharedPreferenceChangeListener(this);
+        CameraCalibrationJNI.sendPreferencesChangedEvent();
+    }
+
+    @Override
+    public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
+        if (key.equals("pattern")) {
+            String val = sharedPreferences.getString(key, "");
+            final EditTextPreference pattern_width = getPreferenceManager().findPreference("pattern_width");
+            final EditTextPreference pattern_height = getPreferenceManager().findPreference("pattern_height");
+            final EditTextPreference pattern_spacing = getPreferenceManager().findPreference("pattern_spacing");
+            if (val.equals("circles")) {
+                pattern_width.setText("0");
+                pattern_height.setText("0");
+                pattern_spacing.setText("0.0");
+            } else if (val.equals("asymmetriccircles")) {
+                pattern_width.setText("4");
+                pattern_height.setText("11");
+                pattern_spacing.setText("20.0");
+            } else { // "chessboard" or default.
+                pattern_width.setText("7");
+                pattern_height.setText("5");
+                pattern_spacing.setText("30.0");
+            }
+        } else if (key.equals("upload_canonical") || key.equals("upload_user")) {
+            boolean val = sharedPreferences.getBoolean(key, true);
+            final SwitchPreferenceCompat save = getPreferenceManager().findPreference("save");
+            if (!val) {
+                if (!sharedPreferences.getBoolean("save", false)) {
+                    save.setChecked(true);
+                }
+                save.setEnabled(false);
+            } else {
+                save.setEnabled(true);
+            }
+        }
+    }
+
 }
diff --git a/calib_camera.cpp b/calib_camera.cpp
@@ -1451,7 +1451,7 @@ static void saveParam(const ARParam *param, ARdouble err_min, ARdouble err_avg,
 
 #ifdef ANDROID
 #include <jni.h>
-#define JNIFUNCTION_CC(sig) Java_org_artoolkitx_utilities_cameracalibration_CameraCalibrationActivity_##sig
+#define JNIFUNCTION_CC(sig) Java_org_artoolkitx_utilities_cameracalibration_CameraCalibrationJNI_##sig
 
 extern "C" JNIEXPORT void JNICALL JNIFUNCTION_CC(handleBackButton(void))
 {
@@ -1463,5 +1463,16 @@ extern "C" JNIEXPORT void JNICALL JNIFUNCTION_CC(handleAddButton(void))
     flowHandleEvent(EVENT_TOUCH);
 }
 
+extern "C" JNIEXPORT void JNICALL JNIFUNCTION_CC(sendPreferencesChangedEvent(void))
+{
+    SDL_Event event;
+    SDL_zero(event);
+    event.type = gSDLEventPreferencesChanged;
+    event.user.code = (Sint32)0;
+    event.user.data1 = NULL;
+    event.user.data2 = NULL;
+    SDL_PushEvent(&event);
+}
+
 #endif
 
