Skip to content

Commit

Permalink
refactor range select in oscilloscope
Browse files Browse the repository at this point in the history 
fixes fossasia#2099
  • Loading branch information
@marcnause
marcnause committed Sep 22, 2024
1 parent 2fb72d2 commit 5afdf18
Show file tree
Hide file tree
Showing 6 changed files with 496 additions and 449 deletions.
218 changes: 109 additions & 109 deletions app/src/main/java/io/pslab/activity/OscilloscopeActivity.java
View file

Large diffs are not rendered by default.

205 changes: 57 additions & 148 deletions app/src/main/java/io/pslab/fragment/ChannelParametersFragment.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,66 +2,64 @@

import android.Manifest;
import android.app.AlertDialog;
import android.content.DialogInterface;
import android.content.pm.PackageManager;
import android.os.Bundle;

import androidx.annotation.NonNull;
import androidx.core.content.ContextCompat;
import androidx.fragment.app.Fragment;

import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.AdapterView;
import android.widget.ArrayAdapter;
import android.widget.CheckBox;
import android.widget.CompoundButton;
import android.widget.Spinner;

import androidx.annotation.NonNull;
import androidx.core.content.ContextCompat;
import androidx.fragment.app.Fragment;

import com.google.android.material.snackbar.Snackbar;

import io.pslab.DataFormatter;
import io.pslab.R;
import io.pslab.activity.OscilloscopeActivity;
import io.pslab.others.CustomSnackBar;
import io.pslab.others.OscilloscopeAxisScale;

public class ChannelParametersFragment extends Fragment {

private static final int RECORD_AUDIO_REQUEST_CODE = 1;

private CheckBox checkBoxCH1;
private CheckBox checkBoxCH2;
private CheckBox checkBoxCH3;
private static final double[] VOLTAGE_VALUES = {16, 8, 4, 3, 2, 1.5, 1, 500, 160};

private Spinner spinnerRangeCh1;
private Spinner spinnerRangeCh2;
private Spinner spinnerChannelSelect;
private CheckBox builtInMicCheckBox;
private CheckBox pslabMicCheckBox;
private OscilloscopeAxisScale axisScale;

public static ChannelParametersFragment newInstance() {
return new ChannelParametersFragment();
}

@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {

View v = inflater.inflate(R.layout.fragment_channel_parameters, container, false);

final String[] ranges = {"+/-16V", "+/-8V", "+/-4V", "+/-3V", "+/-2V",
"+/-1" + DataFormatter.decSeparator + "5V", "+/-1V", "+/-500mV", "+/-160V"};
final String[] ranges = {"+/-16V", "+/-8V", "+/-4V", "+/-3V", "+/-2V", "+/-1" + DataFormatter.decSeparator + "5V", "+/-1V", "+/-500mV", "+/-160V"};
final String[] channels = {"CH1", "CH2", "CH3", "MIC", "CAP", "RES", "VOL"};
final String[] mics = {"MICROPHONE", "IN-BUILT MIC"};

axisScale = ((OscilloscopeActivity) getActivity()).getAxisScale();

spinnerRangeCh1 = v.findViewById(R.id.spinner_range_ch1_cp);
spinnerRangeCh2 = v.findViewById(R.id.spinner_range_ch2_cp);
spinnerChannelSelect = v.findViewById(R.id.spinner_channel_select_cp);

boolean tabletSize = getResources().getBoolean(R.bool.isTablet);
checkBoxCH1 = v.findViewById(R.id.checkBox_ch1_cp);
checkBoxCH2 = v.findViewById(R.id.checkBox_ch2_cp);
checkBoxCH3 = v.findViewById(R.id.checkBox_ch3_cp);
CheckBox checkBoxCH1 = v.findViewById(R.id.checkBox_ch1_cp);
CheckBox checkBoxCH2 = v.findViewById(R.id.checkBox_ch2_cp);
CheckBox checkBoxCH3 = v.findViewById(R.id.checkBox_ch3_cp);
checkBoxCH3.setText(getString(R.string.ch3_value, 3.3));

builtInMicCheckBox = v.findViewById(R.id.built_in_mic_cb);
Expand Down Expand Up @@ -93,36 +91,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
spinnerRangeCh1.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
@Override
public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
switch (position) {
case 0:
((OscilloscopeActivity) getActivity()).setLeftYAxisScale(16, -16);
break;
case 1:
((OscilloscopeActivity) getActivity()).setLeftYAxisScale(8, -8);
break;
case 2:
((OscilloscopeActivity) getActivity()).setLeftYAxisScale(4, -4);
break;
case 3:
((OscilloscopeActivity) getActivity()).setLeftYAxisScale(3, -3);
break;
case 4:
((OscilloscopeActivity) getActivity()).setLeftYAxisScale(2, -2);
break;
case 5:
((OscilloscopeActivity) getActivity()).setLeftYAxisScale(1.5, -1.5);
break;
case 6:
((OscilloscopeActivity) getActivity()).setLeftYAxisScale(1, -1);
break;
case 7:
((OscilloscopeActivity) getActivity()).setLeftYAxisScale(500, -500);
break;
case 8:
((OscilloscopeActivity) getActivity()).setLeftYAxisScale(160, -160);
openAlertDialogBox("CH1");
break;
}
axisScale.setLeftYAxisScale(VOLTAGE_VALUES[position]);
}

@Override
Expand All @@ -134,36 +103,7 @@ public void onNothingSelected(AdapterView<?> parent) {
spinnerRangeCh2.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
@Override
public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
switch (position) {
case 0:
((OscilloscopeActivity) getActivity()).setRightYAxisScale(16, -16);
break;
case 1:
((OscilloscopeActivity) getActivity()).setRightYAxisScale(8, -8);
break;
case 2:
((OscilloscopeActivity) getActivity()).setRightYAxisScale(4, -4);
break;
case 3:
((OscilloscopeActivity) getActivity()).setRightYAxisScale(3, -3);
break;
case 4:
((OscilloscopeActivity) getActivity()).setRightYAxisScale(2, -2);
break;
case 5:
((OscilloscopeActivity) getActivity()).setRightYAxisScale(1.5, -1.5);
break;
case 6:
((OscilloscopeActivity) getActivity()).setRightYAxisScale(1, -1);
break;
case 7:
((OscilloscopeActivity) getActivity()).setRightYAxisScale(500, -500);
break;
case 8:
((OscilloscopeActivity) getActivity()).setRightYAxisScale(160, -160);
openAlertDialogBox("CH2");
break;
}
axisScale.setRightYAxisScale(VOLTAGE_VALUES[position]);
}

@Override
Expand All @@ -181,31 +121,31 @@ public void onItemSelected(AdapterView<?> parent, View view, int position, long
spinnerRangeCh1.setEnabled(true);
break;
case 1:
((OscilloscopeActivity) getActivity()).setLeftYAxisScale(16, -16);
axisScale.setLeftYAxisScale(16, -16);
((OscilloscopeActivity) getActivity()).setLeftYAxisLabel(spinnerChannelSelect.getSelectedItem().toString());
spinnerRangeCh1.setEnabled(false);
break;
case 2:
((OscilloscopeActivity) getActivity()).setLeftYAxisScale(3, -3);
axisScale.setLeftYAxisScale(3, -3);
((OscilloscopeActivity) getActivity()).setLeftYAxisLabel(spinnerChannelSelect.getSelectedItem().toString());
spinnerRangeCh1.setEnabled(false);
break;
case 3:
((OscilloscopeActivity) getActivity()).setLeftYAxisScale(3, -3);
axisScale.setLeftYAxisScale(3, -3);
((OscilloscopeActivity) getActivity()).setLeftYAxisLabel(spinnerChannelSelect.getSelectedItem().toString());
break;
case 4:
((OscilloscopeActivity) getActivity()).setLeftYAxisScale(3, 0);
axisScale.setLeftYAxisScale(3, 0);
((OscilloscopeActivity) getActivity()).setLeftYAxisLabel(spinnerChannelSelect.getSelectedItem().toString());
spinnerRangeCh1.setEnabled(false);
break;
case 5:
((OscilloscopeActivity) getActivity()).setLeftYAxisScale(3, 0);
axisScale.setLeftYAxisScale(3, 0);
((OscilloscopeActivity) getActivity()).setLeftYAxisLabel(spinnerChannelSelect.getSelectedItem().toString());
spinnerRangeCh1.setEnabled(false);
break;
case 6:
((OscilloscopeActivity) getActivity()).setLeftYAxisScale(3, 0);
axisScale.setLeftYAxisScale(3, 0);
((OscilloscopeActivity) getActivity()).setLeftYAxisLabel(spinnerChannelSelect.getSelectedItem().toString());
spinnerRangeCh1.setEnabled(false);
break;
Expand All @@ -218,63 +158,42 @@ public void onNothingSelected(AdapterView<?> parent) {
}
});

checkBoxCH1.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
((OscilloscopeActivity) getActivity()).isCH1Selected = isChecked;
}
});
checkBoxCH1.setOnCheckedChangeListener((buttonView, isChecked) -> ((OscilloscopeActivity) getActivity()).isCH1Selected = isChecked);

checkBoxCH2.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
((OscilloscopeActivity) getActivity()).isCH2Selected = isChecked;
}
});
checkBoxCH2.setOnCheckedChangeListener((buttonView, isChecked) -> ((OscilloscopeActivity) getActivity()).isCH2Selected = isChecked);

checkBoxCH3.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
((OscilloscopeActivity) getActivity()).isCH3Selected = isChecked;
}
});
builtInMicCheckBox.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
((OscilloscopeActivity) getActivity()).isInBuiltMicSelected = isChecked;
((OscilloscopeActivity) getActivity()).isAudioInputSelected = isChecked;
if (isChecked) {
((OscilloscopeActivity) getActivity()).maxTimebase = 38.4f;
if (pslabMicCheckBox.isChecked()) {
((OscilloscopeActivity) getActivity()).isMICSelected = false;
pslabMicCheckBox.setChecked(false);
((OscilloscopeActivity) getActivity()).isAudioInputSelected = true;
}
if (ContextCompat.checkSelfPermission(getActivity(), Manifest.permission.RECORD_AUDIO) != PackageManager.PERMISSION_GRANTED) {
requestPermissions(new String[]{Manifest.permission.RECORD_AUDIO}, RECORD_AUDIO_REQUEST_CODE);
((OscilloscopeActivity) getActivity()).isAudioInputSelected = false;
}
} else {
((OscilloscopeActivity) getActivity()).maxTimebase = 102.4f;
checkBoxCH3.setOnCheckedChangeListener((buttonView, isChecked) -> ((OscilloscopeActivity) getActivity()).isCH3Selected = isChecked);
builtInMicCheckBox.setOnCheckedChangeListener((buttonView, isChecked) -> {
((OscilloscopeActivity) getActivity()).isInBuiltMicSelected = isChecked;
((OscilloscopeActivity) getActivity()).isAudioInputSelected = isChecked;
if (isChecked) {
((OscilloscopeActivity) getActivity()).maxTimebase = 38.4f;
if (pslabMicCheckBox.isChecked()) {
((OscilloscopeActivity) getActivity()).isMICSelected = false;
pslabMicCheckBox.setChecked(false);
((OscilloscopeActivity) getActivity()).isAudioInputSelected = true;
}
if (ContextCompat.checkSelfPermission(getActivity(), Manifest.permission.RECORD_AUDIO) != PackageManager.PERMISSION_GRANTED) {
requestPermissions(new String[]{Manifest.permission.RECORD_AUDIO}, RECORD_AUDIO_REQUEST_CODE);
((OscilloscopeActivity) getActivity()).isAudioInputSelected = false;
}
} else {
((OscilloscopeActivity) getActivity()).maxTimebase = 102.4f;
}
});

pslabMicCheckBox.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
((OscilloscopeActivity) getActivity()).isMICSelected = isChecked;
((OscilloscopeActivity) getActivity()).isAudioInputSelected = isChecked;
if (isChecked) {
if (builtInMicCheckBox.isChecked()) {
((OscilloscopeActivity) getActivity()).isInBuiltMicSelected = false;
builtInMicCheckBox.setChecked(false);
((OscilloscopeActivity) getActivity()).isAudioInputSelected = true;
}
if (ContextCompat.checkSelfPermission(getActivity(), Manifest.permission.RECORD_AUDIO) != PackageManager.PERMISSION_GRANTED) {
requestPermissions(new String[]{Manifest.permission.RECORD_AUDIO}, RECORD_AUDIO_REQUEST_CODE);
((OscilloscopeActivity) getActivity()).isAudioInputSelected = false;
}
pslabMicCheckBox.setOnCheckedChangeListener((buttonView, isChecked) -> {
((OscilloscopeActivity) getActivity()).isMICSelected = isChecked;
((OscilloscopeActivity) getActivity()).isAudioInputSelected = isChecked;
if (isChecked) {
if (builtInMicCheckBox.isChecked()) {
((OscilloscopeActivity) getActivity()).isInBuiltMicSelected = false;
builtInMicCheckBox.setChecked(false);
((OscilloscopeActivity) getActivity()).isAudioInputSelected = true;
}
if (ContextCompat.checkSelfPermission(getActivity(), Manifest.permission.RECORD_AUDIO) != PackageManager.PERMISSION_GRANTED) {
requestPermissions(new String[]{Manifest.permission.RECORD_AUDIO}, RECORD_AUDIO_REQUEST_CODE);
((OscilloscopeActivity) getActivity()).isAudioInputSelected = false;
}
}
});
Expand All @@ -287,24 +206,14 @@ public void onRequestPermissionsResult(int requestCode, @NonNull String[] permis
if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
((OscilloscopeActivity) getActivity()).isInBuiltMicSelected = true;
} else {
CustomSnackBar.showSnackBar(getActivity().findViewById(android.R.id.content),
"This feature won't work.", null, null, Snackbar.LENGTH_SHORT);
if (builtInMicCheckBox.isChecked())
builtInMicCheckBox.toggle();
CustomSnackBar.showSnackBar(getActivity().findViewById(android.R.id.content), "This feature won't work.", null, null, Snackbar.LENGTH_SHORT);
if (builtInMicCheckBox.isChecked()) builtInMicCheckBox.toggle();
}
}
}

private void openAlertDialogBox(String inputSource) {
new AlertDialog.Builder(getActivity())
.setIcon(android.R.drawable.ic_dialog_alert)
.setTitle("Message")
.setMessage("Connect a 10MOhm resistor with " + inputSource)
.setPositiveButton("OK", new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
}
})
.show();
new AlertDialog.Builder(getActivity()).setIcon(android.R.drawable.ic_dialog_alert).setTitle("Message").setMessage("Connect a 10MOhm resistor with " + inputSource).setPositiveButton("OK", (dialog, which) -> {
}).show();
}
}
Loading

0 comments on commit 5afdf18

Please sign in to comment.