Skip to content

remove titles of magnetometer, spectrum analyzer, raw imu [CPP-434] #800

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

Merged
merged 4 commits into from
Oct 27, 2022
Merged

remove titles of magnetometer, spectrum analyzer, raw imu [CPP-434] #800

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9d058c5
remove titles of magnetometer, spectrum analyzer, raw imu
adrian-kong Oct 26, 2022
75c4ff3
removing title constants being used
adrian-kong Oct 26, 2022
a3e68dc
Merge branch 'main' into adrian/remove_titles
Oct 27, 2022
1d673a0
Merge branch 'main' into adrian/remove_titles
Oct 27, 2022
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
2 changes: 0 additions & 2 deletions resources/AdvancedTabComponents/AdvancedImuTab.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@ Item {
Layout.fillHeight: true
Layout.alignment: Qt.AlignTop
visible: true
title: Constants.advancedImu.title
titleColor: Constants.commonChart.titleColor
plotAreaColor: Constants.commonChart.areaColor
backgroundColor: "transparent"
legend.visible: false
Expand Down
2 changes: 0 additions & 2 deletions resources/AdvancedTabComponents/AdvancedMagnetometerTab.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@ Item {
Layout.fillWidth: true
Layout.fillHeight: true
Layout.alignment: Qt.AlignTop
title: Constants.advancedMagnetometer.title
titleColor: Constants.commonChart.titleColor
plotAreaColor: Constants.commonChart.areaColor
backgroundColor: "transparent"
legend.visible: false
Expand Down
2 changes: 0 additions & 2 deletions resources/AdvancedTabComponents/AdvancedSpectrumAnalyzerTab.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@ Item {

Layout.fillWidth: true
Layout.fillHeight: true
title: Constants.advancedSpectrumAnalyzer.title
titleColor: Constants.commonChart.titleColor
plotAreaColor: Constants.commonChart.areaColor
backgroundColor: "transparent"
legend.visible: false
Expand Down
3 changes: 0 additions & 3 deletions resources/Constants/Constants.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,7 +353,6 @@ QtObject {
}

advancedMagnetometer: QtObject {
readonly property string title: "Raw Magnetometer Data"
readonly property var legendLabels: ["Mag. X (uT)", "Mag. Y (uT)", "Mag. Z (uT)"]
readonly property var lineColors: ["#66c2a5", "#fc8d62", "#8da0cb"]
readonly property int xAxisMax: 200
Expand All @@ -368,7 +367,6 @@ QtObject {
}

advancedSpectrumAnalyzer: QtObject {
readonly property string title: "Spectrum Analyzer"
readonly property var lineColors: ["#000000"]
readonly property int xAxisTickCount: 10
readonly property real yAxisTickCount: 2.5
Expand All @@ -385,7 +383,6 @@ QtObject {
}

advancedImu: QtObject {
readonly property string title: "Raw IMU Data"
readonly property var textDataLabels: ["Imu temp:", "Imu conf:", "Rms acc x:", "Rms acc y:", "Rms acc z:"]
readonly property var insStatusLabels: ["GNSS Pos:", "GNSS Vel:", "Wheelticks:", "Wheelspeed:", "nhc:", "Static Detection:"]
readonly property var legendLabels: ["Accn. X", "Accn. Y", "Accn. Z", "Gyro X", "Gyro Y", "Gyro Z"]
Expand Down