Skip to content

fix(filters): stabilize filters, use reported sample rate, support comma values #291

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
o-bagge wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(filters): stabilize filters, use reported sample rate, support comma values #291

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions open_wearable/lib/widgets/sensors/values/sensor_chart.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -641,14 +641,6 @@ class _SensorChartState extends State<SensorChart> {
SensorConfiguration configuration,
SensorConfigurationProvider? sensorConfigurationProvider,
) {
final selectedValue =
sensorConfigurationProvider?.getSelectedConfigurationValue(
configuration,
);
if (selectedValue is SensorFrequencyConfigurationValue) {
return selectedValue;
}

final reportedValue =
sensorConfigurationProvider?.getLastReportedConfigurationValue(
configuration,
Expand All @@ -657,6 +649,14 @@ class _SensorChartState extends State<SensorChart> {
return reportedValue;
}

final selectedValue =
sensorConfigurationProvider?.getSelectedConfigurationValue(
configuration,
);
if (selectedValue is SensorFrequencyConfigurationValue) {
return selectedValue;
}

final dynamic configurationDynamic = configuration;
try {
final currentValue = configurationDynamic.currentValue;
Expand Down
30 changes: 22 additions & 8 deletions open_wearable/lib/widgets/sensors/values/sensor_chart/axis_configuration_sheet.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,10 @@ class _SingleCutoffFieldsState extends State<_SingleCutoffFields> {
void didUpdateWidget(covariant _SingleCutoffFields oldWidget) {
super.didUpdateWidget(oldWidget);
if (widget.frequencyHz != oldWidget.frequencyHz) {
_replaceText(_frequencyController, _formatNumber(widget.frequencyHz));
_replaceFrequencyTextIfChanged(
_frequencyController,
widget.frequencyHz,
);
}
if (widget.order != oldWidget.order) {
_replaceText(_orderController, widget.order.toString());
Expand Down Expand Up @@ -373,7 +376,7 @@ class _SingleCutoffFieldsState extends State<_SingleCutoffFields> {
return;
}
widget.onChanged(
double.parse(_frequencyController.text),
_parseFrequency(_frequencyController.text)!,
int.parse(_orderController.text),
);
}
Expand Down Expand Up @@ -434,10 +437,10 @@ class _NotchFieldsState extends State<_NotchFields> {
void didUpdateWidget(covariant _NotchFields oldWidget) {
super.didUpdateWidget(oldWidget);
if (widget.centerHz != oldWidget.centerHz) {
_replaceText(_centerController, _formatNumber(widget.centerHz));
_replaceFrequencyTextIfChanged(_centerController, widget.centerHz);
}
if (widget.widthHz != oldWidget.widthHz) {
_replaceText(_widthController, _formatNumber(widget.widthHz));
_replaceFrequencyTextIfChanged(_widthController, widget.widthHz);
}
if (widget.order != oldWidget.order) {
_replaceText(_orderController, widget.order.toString());
Expand Down Expand Up @@ -493,8 +496,8 @@ class _NotchFieldsState extends State<_NotchFields> {
return;
}
widget.onChanged(
double.parse(_centerController.text),
double.parse(_widthController.text),
_parseFrequency(_centerController.text)!,
_parseFrequency(_widthController.text)!,
int.parse(_orderController.text),
);
}
Expand Down Expand Up @@ -566,7 +569,7 @@ class _FrequencyInputField extends StatelessWidget {
controller: controller,
keyboardType: const TextInputType.numberWithOptions(decimal: true),
inputFormatters: [
FilteringTextInputFormatter.allow(RegExp(r'[0-9.]')),
FilteringTextInputFormatter.allow(RegExp(r'[0-9.,]')),
],
decoration: _filterInputDecoration(
context,
Expand Down Expand Up @@ -690,13 +693,24 @@ String? _validateNotchOrder(String? value) {
}

double? _parseFrequency(String? value) {
final trimmed = value?.trim();
final trimmed = value?.trim().replaceAll(',', '.');
if (trimmed == null || trimmed.isEmpty) {
return null;
}
return double.tryParse(trimmed);
}

void _replaceFrequencyTextIfChanged(
TextEditingController controller,
double value,
) {
final parsed = _parseFrequency(controller.text);
if (parsed != null && (parsed - value).abs() < 1e-9) {
return;
}
_replaceText(controller, _formatNumber(value));
}

void _replaceText(TextEditingController controller, String value) {
if (controller.text == value) {
return;
Expand Down
12 changes: 12 additions & 0 deletions open_wearable/lib/widgets/sensors/values/sensor_chart/axis_filter_engine.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,10 @@ class _ButterworthFirstOrderStage implements _IirFilterStage {
);
final output =
coefficients.b0 * input + coefficients.b1 * _x1 - coefficients.a1 * _y1;
if (!output.isFinite) {
reset();
return _prime(input);
}
_x1 = input;
_y1 = output;
return output;
Expand Down Expand Up @@ -88,6 +92,10 @@ class _ButterworthBiquadStage implements _IirFilterStage {
coefficients.b2 * _x2 -
coefficients.a1 * _y1 -
coefficients.a2 * _y2;
if (!output.isFinite) {
reset();
return _prime(input);
}
_x2 = _x1;
_x1 = input;
_y2 = _y1;
Expand Down Expand Up @@ -146,6 +154,10 @@ class _NotchBiquadStage implements _IirFilterStage {
coefficients.b2 * _x2 -
coefficients.a1 * _y1 -
coefficients.a2 * _y2;
if (!output.isFinite) {
reset();
return _prime(input);
}
_x2 = _x1;
_x1 = input;
_y2 = _y1;
Expand Down