Skip to content

Commit 310f08e

Browse files
Jashan32marcnause
authored andcommitted
fixed Robotic Arm logs navigation
1 parent 43cee53 commit 310f08e

2 files changed

Lines changed: 21 additions & 2 deletions

File tree

lib/view/logged_data_screen.dart

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import '../providers/locator.dart';
2222
import 'accelerometer_screen.dart';
2323
import 'compass_screen.dart';
2424
import 'package:pslab/view/thermometer_screen.dart';
25+
import 'package:pslab/view/robotic_arm_screen.dart';
2526

2627
class LoggedDataScreen extends StatefulWidget {
2728
final List<String> instrumentNames;
@@ -362,7 +363,15 @@ class _LoggedDataScreenState extends State<LoggedDataScreen> {
362363
final data = await _dataService.readDataFromFile(file);
363364
if (mounted) {
364365
if (instrumentName.toLowerCase() == 'robotic arm') {
365-
Navigator.pop(context, data);
366+
Navigator.push(
367+
context,
368+
MaterialPageRoute(
369+
builder: (_) => RoboticArmScreen(
370+
importedData: data,
371+
),
372+
),
373+
);
374+
return;
366375
} else {
367376
final config = _getChartConfig(instrumentName);
368377
Navigator.push(

lib/view/robotic_arm_screen.dart

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,12 @@ import 'package:pslab/view/widgets/guide_widget.dart';
1515
import 'widgets/servo_card.dart';
1616

1717
class RoboticArmScreen extends StatefulWidget {
18-
const RoboticArmScreen({super.key});
18+
final List<List<dynamic>>? importedData;
19+
20+
const RoboticArmScreen({
21+
super.key,
22+
this.importedData,
23+
});
1924

2025
@override
2126
State<RoboticArmScreen> createState() => _RoboticArmScreenState();
@@ -39,6 +44,11 @@ class _RoboticArmScreenState extends State<RoboticArmScreen> {
3944
];
4045
provider = RoboticArmStateProvider();
4146
provider.initialize();
47+
if (widget.importedData != null) {
48+
WidgetsBinding.instance.addPostFrameCallback((_) async {
49+
await provider.importTimelineData(widget.importedData!);
50+
});
51+
}
4252

4353
provider.onPlaybackEnd = () {
4454
showDialog(

0 commit comments

Comments
 (0)