feat: added remaining Oscilloscope functionality #2750
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Reviewer's GuideImplements remaining Oscilloscope functionality—auto-scale, run/pause controls, recording UI, and automated measurements—by refactoring the screen UI for provider-driven state, extending the state provider with scaling and measurement logic, adding supporting models/widgets, and adjusting analytics FFT handling. Entity relationship diagram for Oscilloscope channel measurementserDiagram
OSCILLOSCOPE_MEASUREMENTS {
string channel
double frequency
double period
double amplitude
double positivePeak
double negativePeak
}
OSCILLOSCOPE_MEASUREMENTS ||--o{ CHANNEL : has
CHANNEL {
string name
}
Class diagram for Oscilloscope measurements and state managementclassDiagram
class OscilloscopeStateProvider {
+bool isRunning
+bool isMeasurementsChecked
+List<List<FlSpot>> dataEntries
+List<String> dataParamsChannels
+bool autoScale()
+notifyListeners()
...
}
class OscilloscopeMeasurements {
+static Map<String, Map<ChannelMeasurements, double>> channel
}
class MeasurementsList {
+List<String> dataParamsChannels
}
OscilloscopeStateProvider --> OscilloscopeMeasurements : updates
MeasurementsList --> OscilloscopeMeasurements : reads
OscilloscopeStateProvider --> MeasurementsList : provides dataParamsChannels
File-Level Changes
Assessment against linked issues
Possibly linked issues
Tips and commandsInteracting with Sourcery
Customizing Your ExperienceAccess your dashboard to:
Getting Help
|
![sourcery-ai[bot]](https://avatars.githubusercontent.com/in/48477?s=60&v=4){kind=small}
There was a problem hiding this comment.
Hey @AsCress - I've reviewed your changes - here's some feedback:
- Consider refactoring the measurement/calculation logic into a shared helper or service rather than duplicating it in both
_getDataandautoScaleto improve maintainability. - Avoid using
setStateto toggle provider fields (isRunning,isMeasurementsChecked)—instead update the provider and callnotifyListenersso the UI rebuilds consistently through the ChangeNotifier. - The static
OscilloscopeMeasurements.channelmap introduces global mutable state; move measurement storage into the provider instance to prevent cross-component interference and improve testability.
Prompt for AI Agents
Please address the comments from this code review:
## Overall Comments
- Consider refactoring the measurement/calculation logic into a shared helper or service rather than duplicating it in both `_getData` and `autoScale` to improve maintainability.
- Avoid using `setState` to toggle provider fields (`isRunning`, `isMeasurementsChecked`)—instead update the provider and call `notifyListeners` so the UI rebuilds consistently through the ChangeNotifier.
- The static `OscilloscopeMeasurements.channel` map introduces global mutable state; move measurement storage into the provider instance to prevent cross-component interference and improve testability.
## Individual Comments
### Comment 1
<location> `lib/providers/oscilloscope_state_provider.dart:614` </location>
<code_context>
}
+ bool autoScale() {
+ double minY = double.maxFinite;
+ double maxY = double.minPositive;
+ double maxPeriod = -1 * double.minPositive;
+ double yRange;
</code_context>
<issue_to_address>
Initialization of maxY and maxPeriod may not handle negative values correctly.
minPositive only works for positive values. Use -double.maxFinite for initialization to handle negative data correctly.
</issue_to_address>
### Comment 2
<location> `lib/view/widgets/measurements_list.dart:18` </location>
<code_context>
+
+class _MeasurementsListState extends State<MeasurementsList> {
+ String formatFrequency(double? freq) {
+ return freq! >= 1000
+ ? '${(freq / 1000).toStringAsFixed(2)} kHz'
+ : '${freq.toStringAsFixed(2)} Hz';
+ }
+
</code_context>
<issue_to_address>
Potential null dereference in formatFrequency.
Handle cases where freq is null to prevent runtime exceptions from force-unwrapping.
</issue_to_address>Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.
|
Build successful. APKs to test: https://github.com/fossasia/pslab-android/actions/runs/15936483509/artifacts/3422646133 |
marcnause
added
the
Status: Review Required
marcnause
approved these changes
Jun 27, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #2745.
Adds the following remaining functionality to the Oscilloscope:
Screenshots/Recordings
Screen_recording_20250622_193304.mp4
@marcnause Would you like to test these additions ?
Summary by Sourcery
Add missing Oscilloscope features: automatic axis scaling, acquisition run control, and an overlay for automated channel measurements.
New Features:
Enhancements:
Documentation: