Skip to content

Commit

Permalink
Final touches to coloured grating task
Browse files Browse the repository at this point in the history
  • Loading branch information
@jamesbutler01
jamesbutler01 committed Jun 15, 2021
1 parent 47c78fe commit bb1580d
Show file tree
Hide file tree
Showing 3 changed files with 60 additions and 38 deletions.
Binary file modified Behavioural Testing Unit (Android)/Mymou/app/build/outputs/apk/debug/app-debug.apk
View file
Binary file not shown.
96 changes: 59 additions & 37 deletions ...Unit (Android)/Mymou/app/src/main/java/mymou/preferences/PrefsFragTaskColoredGrating.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,47 +23,69 @@ public void onCreatePreferences(Bundle bundle, String rootKey) {
setPreferencesFromResource(R.xml.preferences_task_coloredgrating, rootKey);

// Set ontouchlisteners for the seekbars to allow users to manually input values
// SeekBarPreferenceCustom[] seekBarPreferences = new SeekBarPreferenceCustom[7];
// seekBarPreferences[0] = (SeekBarPreferenceCustom) findPreference(getString(R.string.preftag_colgrat_min_radius));
// seekBarPreferences[1] = (SeekBarPreferenceCustom) findPreference(getString(R.string.preftag_colgrat_max_radius));
// seekBarPreferences[2] = (SeekBarPreferenceCustom) findPreference(getString(R.string.preftag_colgrat_initial_reward));
SeekBarPreferenceCustom[] seekBarPreferences = new SeekBarPreferenceCustom[25];
seekBarPreferences[0] = (SeekBarPreferenceCustom) findPreference(getString(R.string.preftag_colgrat_rt_limit));
seekBarPreferences[1] = (SeekBarPreferenceCustom) findPreference(getString(R.string.preftag_colgrat_catchtrialfreq));
seekBarPreferences[2] = (SeekBarPreferenceCustom) findPreference(getString(R.string.preftag_colgrat_fixation_time_mi));
seekBarPreferences[3] = (SeekBarPreferenceCustom) findPreference(getString(R.string.preftag_colgrat_fixation_time_ma));
seekBarPreferences[4] = (SeekBarPreferenceCustom) findPreference(getString(R.string.preftag_colgrat_cue_time_mi));
seekBarPreferences[5] = (SeekBarPreferenceCustom) findPreference(getString(R.string.preftag_colgrat_cue_time_ma));
seekBarPreferences[6] = (SeekBarPreferenceCustom) findPreference(getString(R.string.preftag_colgrat_stimulus_time_mi));
seekBarPreferences[7] = (SeekBarPreferenceCustom) findPreference(getString(R.string.preftag_colgrat_stimulus_time_ma));
seekBarPreferences[8] = (SeekBarPreferenceCustom) findPreference(getString(R.string.preftag_colgrat_dim_time_mi));
seekBarPreferences[9] = (SeekBarPreferenceCustom) findPreference(getString(R.string.preftag_colgrat_dim_time_ma));
seekBarPreferences[10] = (SeekBarPreferenceCustom) findPreference(getString(R.string.preftag_colgrat_start_dim));
seekBarPreferences[11] = (SeekBarPreferenceCustom) findPreference(getString(R.string.preftag_colgrat_end_dim));
seekBarPreferences[12] = (SeekBarPreferenceCustom) findPreference(getString(R.string.preftag_colgrat_target_shape));
seekBarPreferences[13] = (SeekBarPreferenceCustom) findPreference(getString(R.string.preftag_colgrat_sizecolcue));
seekBarPreferences[14] = (SeekBarPreferenceCustom) findPreference(getString(R.string.preftag_colgrat_sizefixcue));
seekBarPreferences[15] = (SeekBarPreferenceCustom) findPreference(getString(R.string.preftag_colgrat_sizeindicatorcue));
seekBarPreferences[16] = (SeekBarPreferenceCustom) findPreference(getString(R.string.preftag_colgrat_red_x));
seekBarPreferences[17] = (SeekBarPreferenceCustom) findPreference(getString(R.string.preftag_colgrat_red_y));
seekBarPreferences[18] = (SeekBarPreferenceCustom) findPreference(getString(R.string.preftag_colgrat_green_x));
seekBarPreferences[19] = (SeekBarPreferenceCustom) findPreference(getString(R.string.preftag_colgrat_green_y));
seekBarPreferences[20] = (SeekBarPreferenceCustom) findPreference(getString(R.string.preftag_colgrat_blue_x));
seekBarPreferences[21] = (SeekBarPreferenceCustom) findPreference(getString(R.string.preftag_colgrat_blue_y));
seekBarPreferences[22] = (SeekBarPreferenceCustom) findPreference(getString(R.string.preftag_colgrat_sizestripes));
seekBarPreferences[23] = (SeekBarPreferenceCustom) findPreference(getString(R.string.preftag_colgrat_numstripes));
seekBarPreferences[24] = (SeekBarPreferenceCustom) findPreference(getString(R.string.preftag_colgrat_grateoffset));

// for (int i = 0; i < seekBarPreferences.length; i++) {
// final int i_final = i;
// seekBarPreferences[i].setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
// @Override
// public boolean onPreferenceClick(Preference preference) {
// // Number dialog
// Log.d(TAG, "setting seekbar"+i_final);
// AlertDialog.Builder alert = new AlertDialog.Builder(getContext());
// alert.setTitle("Input number");
// final EditText input = new EditText(getContext());
// input.setInputType(InputType.TYPE_CLASS_NUMBER);
// input.setRawInputType(Configuration.KEYBOARD_12KEY);
// alert.setView(input);
// alert.setPositiveButton("Ok", new DialogInterface.OnClickListener() {
// public void onClick(DialogInterface dialog, int whichButton) {
// try {
//
// int value = Integer.valueOf(input.getText().toString());
// if (value < seekBarPreferences[i_final].getMax()) {
// seekBarPreferences[i_final].setValue(value);
// } else {
// Toast.makeText(getContext(), "Value too high", Toast.LENGTH_LONG).show();
// }
for (int i = 0; i < seekBarPreferences.length; i++) {
final int i_final = i;
seekBarPreferences[i].setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
@Override
public boolean onPreferenceClick(Preference preference) {
// Number dialog
Log.d(TAG, "setting seekbar"+i_final);
AlertDialog.Builder alert = new AlertDialog.Builder(getContext());
alert.setTitle("Input number");
final EditText input = new EditText(getContext());
input.setInputType(InputType.TYPE_CLASS_NUMBER);
input.setRawInputType(Configuration.KEYBOARD_12KEY);
alert.setView(input);
alert.setPositiveButton("Ok", new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int whichButton) {
try {

// } catch (NumberFormatException e) {
// Toast.makeText(getContext(), "Invalid number", Toast.LENGTH_LONG).show();
// }
int value = Integer.valueOf(input.getText().toString());
if (value < seekBarPreferences[i_final].getMax()) {
seekBarPreferences[i_final].setValue(value);
} else {
Toast.makeText(getContext(), "Value too high", Toast.LENGTH_LONG).show();
}

// }
// });
// alert.show();
// return false;
// }
// });
} catch (NumberFormatException e) {
Toast.makeText(getContext(), "Invalid number", Toast.LENGTH_LONG).show();
}

// }
}
});
alert.show();
return false;
}
});

}
}

}
2 changes: 1 addition & 1 deletion Behavioural Testing Unit (Android)/Mymou/app/src/main/res/values/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
<item>Subjects are given choices between two cues that lie on a 10x10 value grid made up of probability and magnitude dimensions. For example, the cue at (1, 1) will give 10% reward 10% of the time. They can then pick either cue are given the corresponding reward along with a secondary reinforcer to indicate whether it was better or worse than the counterfactual option.</item>
<item>Two sounds are displayed followed by a go cue. This is followed by two further sounds and another go cue. Sounds in the first and second sequence can be within the same context or in different contexts.</item>
<item>Implementation of Wald\'s Sequential Probability Ratio test as described in Kira, Yang, Shadlen (2015) Neuron.</item>
<item>Colored grating task</item>
<item>Implementation of Coloured Grating task as described in van Kempen et al. (2021) Neuron</item>
</string-array>

<string name="default_startuptime">0700</string>
Expand Down

0 comments on commit bb1580d

Please sign in to comment.