From e8d6109f0d83327a8de1b78fe128942a8fd203d7 Mon Sep 17 00:00:00 2001 From: Sam Lewis Date: Wed, 19 Jan 2022 14:47:12 +1100 Subject: [PATCH 1/2] Fix time axis of IMU and magnetometer plots [CPP-602] Flips the x axis labels of IMU messages, so that the most recent sample is labelled 0 and the oldest is labelled 200. Previously, this was vice-versa. --- console_backend/src/advanced_imu_tab.rs | 2 +- console_backend/src/advanced_magnetometer_tab.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/console_backend/src/advanced_imu_tab.rs b/console_backend/src/advanced_imu_tab.rs index 4f7c3c0d0..21ec18bf0 100644 --- a/console_backend/src/advanced_imu_tab.rs +++ b/console_backend/src/advanced_imu_tab.rs @@ -141,7 +141,7 @@ impl AdvancedImuTab { let mut point_val_idx = tab_points.reborrow().init(idx as u32, NUM_POINTS as u32); for (idx, point) in points.enumerate() { let mut point_val = point_val_idx.reborrow().get(idx as u32); - point_val.set_x(idx as f64); + point_val.set_x((NUM_POINTS - idx) as f64); point_val.set_y(*point); } } diff --git a/console_backend/src/advanced_magnetometer_tab.rs b/console_backend/src/advanced_magnetometer_tab.rs index f20e62a8a..eb29e5b76 100644 --- a/console_backend/src/advanced_magnetometer_tab.rs +++ b/console_backend/src/advanced_magnetometer_tab.rs @@ -76,7 +76,7 @@ impl AdvancedMagnetometerTab { let mut point_val_idx = tab_points.reborrow().init(idx as u32, NUM_POINTS as u32); for (idx, point) in points.enumerate() { let mut point_val = point_val_idx.reborrow().get(idx as u32); - point_val.set_x(idx as f64); + point_val.set_x((NUM_POINTS - idx) as f64); point_val.set_y(*point); } } From 32d79fdf3665a71725afff6b4abe10b15de87ec4 Mon Sep 17 00:00:00 2001 From: Sam Lewis Date: Wed, 19 Jan 2022 18:24:41 +1100 Subject: [PATCH 2/2] Reverse X axis --- resources/AdvancedTabComponents/AdvancedImuTab.qml | 1 + resources/AdvancedTabComponents/AdvancedMagnetometerTab.qml | 1 + 2 files changed, 2 insertions(+) diff --git a/resources/AdvancedTabComponents/AdvancedImuTab.qml b/resources/AdvancedTabComponents/AdvancedImuTab.qml index b51af2672..94c246f56 100644 --- a/resources/AdvancedTabComponents/AdvancedImuTab.qml +++ b/resources/AdvancedTabComponents/AdvancedImuTab.qml @@ -109,6 +109,7 @@ Item { labelFormat: "%d" min: Constants.advancedImu.xAxisMin max: Constants.advancedImu.xAxisMax + reverse: true } SwiftValueAxis { diff --git a/resources/AdvancedTabComponents/AdvancedMagnetometerTab.qml b/resources/AdvancedTabComponents/AdvancedMagnetometerTab.qml index 492d1b56a..6141418c2 100644 --- a/resources/AdvancedTabComponents/AdvancedMagnetometerTab.qml +++ b/resources/AdvancedTabComponents/AdvancedMagnetometerTab.qml @@ -110,6 +110,7 @@ Item { tickInterval: Constants.advancedMagnetometer.xAxisTickCount tickType: ValueAxis.TicksDynamic labelFormat: "%d" + reverse: true } SwiftValueAxis {