Skip to content

Tracking tab optimizations + new dynamic legend widget #179

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 10 commits into from
Oct 28, 2021
Merged

Tracking tab optimizations + new dynamic legend widget #179

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
ee936e8
TrackingSignalsTab - don't recreate series
keithel-qt Oct 19, 2021
6a04bab
New TrackingSignalsTab legend implementation, show it
keithel-qt Oct 25, 2021
3da5cc1
This fixes legend showing in TrackingSignalsTab
keithel-qt Oct 25, 2021
90059fb
Fix formatting issues, clarify IndexError exception
keithel-qt Oct 26, 2021
232c959
Add notify signal to check_labels property and others
keithel-qt Oct 27, 2021
75a9e55
Make the legend borderline nicer
keithel-qt Oct 27, 2021
0b9ac1e
Legend sizing improvements and removal fixes
keithel-qt Oct 28, 2021
ad18e9f
Improve color, layout formatting
keithel-qt Oct 28, 2021
9cdc00a
Formatting fixes from make check-all
keithel-qt Oct 28, 2021
9d7738a
Reduce legend font size
keithel-qt Oct 28, 2021
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
17 changes: 12 additions & 5 deletions resources/Constants/Constants.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ QtObject {
readonly property int staticTableTimerIntervalRate: 10 // 10 Hz
readonly property int staticTimerSlowIntervalRate: 2 // 2 Hz
readonly property string monoSpaceFont: "Courier New"
readonly property string fontFamily: "Roboto"
readonly property real xSmallPointSize: 6
readonly property real smallPointSize: 7
readonly property real mediumPointSize: 8
readonly property real largePointSize: 9
Expand Down Expand Up @@ -450,7 +452,7 @@ QtObject {
readonly property int padding: 10
readonly property int spacing: 5
readonly property int verticalCenterOffset: -1
readonly property color borderColor: "#000000"
readonly property color borderColor: "#7F7F7F"
readonly property int borderWidth: 1
}

Expand All @@ -463,7 +465,7 @@ QtObject {
readonly property real solutionMarkerSize: 5
readonly property real solutionLineWidth: 0.5
readonly property color backgroundColor: "#CDC9C9"
readonly property color areaColor: "#FFFFFF"
readonly property color areaColor: "#F0F0F0"
readonly property color minorGridLineColor: "#CDC9C9"
readonly property color gridLineColor: "#CDC9C9"
readonly property color labelsColor: "#000000"
Expand Down Expand Up @@ -498,11 +500,16 @@ QtObject {

trackingSignals: QtObject {
readonly property string title: "Tracking C/N0"
readonly property color titleColor: "#00006E"
readonly property color titleColor: Qt.darker(swiftOrange, 1.1)
readonly property int titlePointSize: 14
readonly property int legendBottomMargin: 85
readonly property int legendLeftMargin: 60
readonly property int legendTopMargin: 30
readonly property int legendBottomMargin: 74
readonly property int legendLeftMargin: 30
readonly property int legendLabelPointSize: 6
readonly property string legendCellTextSample: "XXX XXXX X+NN XNN"
readonly property int legendShadeHeight: 10
readonly property color legendShadeColor: Qt.lighter(swiftOrange, 1.5)
readonly property int legendShadeSpeed: 350
readonly property string yAxisTitleText: "dB-Hz"
readonly property string xAxisTitleText: "seconds"
readonly property int xAxisMinOffsetFromMaxSeconds: 100
Expand Down
2 changes: 2 additions & 0 deletions resources/TrackingTab.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,11 @@ Item {
currentIndex: trackingBar.currentIndex

TrackingTabComponents.TrackingSignalsTab {
anchors.fill: parent
}

TrackingTabComponents.TrackingSkyPlotTab {
anchors.fill: parent
}

}
Expand Down
227 changes: 157 additions & 70 deletions resources/TrackingTabComponents/TrackingSignalsTab.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,35 +1,28 @@
import "../BaseComponents"
import "../Constants"
import QtCharts 2.3
import QtQuick 2.6
import QtCharts 2.15
import QtQuick 2.15
import QtQuick.Controls 2.15
import QtQuick.Layouts 1.15
import SwiftConsole 1.0

Item {
id: trackingSignalsTab

property variant lines: []
property variant labels: []
property variant colors: []
property variant check_labels: []
property alias all_series: trackingSignalsPoints.all_series
property alias enabled_series: trackingSignalsPoints.enabled_series
property alias check_labels: trackingSignalsPoints.check_labels
property alias num_labels: trackingSignalsPoints.num_labels
property variant check_visibility: []

width: parent.width
height: parent.height
Component.onCompleted: {
}

TrackingSignalsPoints {
id: trackingSignalsPoints
}

ColumnLayout {
id: trackingSignalsArea

width: parent.width
height: parent.height
spacing: 0
anchors.fill: parent

ChartView {
id: trackingSignalsChart
Expand All @@ -40,9 +33,7 @@ Item {
visible: false
title: Constants.trackingSignals.title
titleColor: Constants.trackingSignals.titleColor
width: parent.width
height: parent.height - trackingSignalsCheckboxes.height
backgroundColor: Constants.commonChart.backgroundColor
// backgroundColor: Constants.commonChart.backgroundColor
plotAreaColor: Constants.commonChart.areaColor
legend.visible: false
antialiasing: true
Expand All @@ -57,37 +48,149 @@ Item {
Rectangle {
id: lineLegend

border.color: Constants.commonLegend.borderColor
border.width: Constants.commonLegend.borderWidth
anchors.bottom: trackingSignalsChart.bottom
anchors.left: trackingSignalsChart.left
anchors.bottomMargin: Constants.trackingSignals.legendBottomMargin
anchors.leftMargin: Constants.trackingSignals.legendLeftMargin
implicitHeight: lineLegendRepeater.height
width: lineLegendRepeater.width
property int maximumHeight: parent.height - Constants.trackingSignals.legendTopMargin - Constants.trackingSignals.legendBottomMargin
property int openedHeight: gridView.count < maxCellsPerColumn ? gridView.cellHeight * gridView.count : maximumHeight
property int openCloseSpeed: Constants.trackingSignals.legendShadeSpeed
property int maxCellsPerColumn: maximumHeight / gridView.cellHeight // floor/truncation is desired.

visible: gridView.count > 0
radius: 5
x: Constants.trackingSignals.legendTopMargin
y: Constants.trackingSignals.legendLeftMargin
height: openedHeight
// Size to two cols if there are cells for 2+ cols.
width: gridView.cellWidth * (gridView.count <= maxCellsPerColumn ? 1 : 2)
state: "opened"
states: [
State {
name: "opened"

PropertyChanges {
target: lineLegend
height: lineLegend.openedHeight
}

PropertyChanges {
target: gridView
visible: true
}

},
State {
name: "closed"

PropertyChanges {
target: lineLegend
height: legendHideBar.height + 2
}

PropertyChanges {
target: gridView
visible: false
}

}
]
transitions: [
Transition {
to: "closed"

// reversible property should be what we want here instead of duplicating this,
// but it doesn't seem to work right in this situation.
SequentialAnimation {
SmoothedAnimation {
property: "height"
duration: lineLegend.openCloseSpeed
}

PropertyAction {
property: "visible"
}

}

},
Transition {
to: "opened"

SequentialAnimation {
PropertyAction {
property: "visible"
}

Column {
id: lineLegendRepeater
SmoothedAnimation {
property: "height"
duration: lineLegend.openCloseSpeed
}

anchors.bottom: lineLegend.bottom
}

}
]

Rectangle {
// This rectangle ensures that the border of the legend is painted nicely.
anchors.fill: parent
z: 2
color: "transparent"
radius: parent.radius
border.color: Constants.commonLegend.borderColor
border.width: Constants.commonLegend.borderWidth
}

Repeater {
id: lineLegendRepeaterRows
ColumnLayout {
anchors.fill: parent
spacing: 0

model: labels
Rectangle {
id: legendHideBar

Row {
Component.onCompleted: {
for (var idx in colors) {
if (lineLegendRepeaterRows.itemAt(idx))
lineLegendRepeaterRows.itemAt(idx).children[0].color = colors[idx];
Layout.fillWidth: true
color: Constants.trackingSignals.legendShadeColor
height: Constants.trackingSignals.legendShadeHeight
radius: lineLegend.radius

}
MouseArea {
anchors.fill: parent
onClicked: {
lineLegend.state = lineLegend.state == "opened" ? "closed" : "opened";
}
cursorShape: pressed ? Qt.ClosedHandCursor : Qt.OpenHandCursor
//drag.target: lineLegend
hoverEnabled: true
}

}

GridView {
id: gridView

Layout.fillWidth: true
Layout.fillHeight: true
clip: true
model: enabled_series
flow: GridView.FlowTopToBottom
cellWidth: Constants.commonLegend.markerWidth + legendTextMetrics.width + 4
cellHeight: legendTextMetrics.height + 2
boundsBehavior: Flickable.StopAtBounds

TextMetrics {
id: legendTextMetrics

font.family: Constants.fontFamily
font.pointSize: Constants.xSmallPointSize
text: Constants.trackingSignals.legendCellTextSample
}

delegate: Row {
padding: 1
leftPadding: 4
rightPadding: leftPadding

Rectangle {
id: marker

color: modelData.color
width: Constants.commonLegend.markerWidth
height: Constants.commonLegend.markerHeight
anchors.verticalCenter: parent.verticalCenter
Expand All @@ -96,8 +199,8 @@ Item {
Label {
id: label

text: modelData
font.pointSize: Constants.smallPointSize
text: modelData.name
font: legendTextMetrics.font
anchors.verticalCenter: parent.verticalCenter
anchors.verticalCenterOffset: Constants.commonLegend.verticalCenterOffset
}
Expand Down Expand Up @@ -164,39 +267,23 @@ Item {
if (!trackingTab.visible)
return ;

tracking_signals_model.fill_console_points(trackingSignalsPoints);
if (!trackingSignalsPoints.points.length)
return ;

var points = trackingSignalsPoints.points;
colors = trackingSignalsPoints.colors;
labels = trackingSignalsPoints.labels;
trackingSignalsChart.visible = true;
check_labels = trackingSignalsPoints.check_labels;
for (var idx in labels) {
if (idx < lines.length) {
if (labels[idx] != lines[idx][1]) {
trackingSignalsChart.removeSeries(lines[idx][0]);
var line = trackingSignalsChart.createSeries(ChartView.SeriesTypeLine, labels[idx], trackingSignalsXAxis);
line.color = colors[idx];
line.width = Constants.commonChart.lineWidth;
line.axisYRight = trackingSignalsYAxis;
line.useOpenGL = Globals.useOpenGL;
lines[idx] = [line, labels[idx]];
}
} else {
var line = trackingSignalsChart.createSeries(ChartView.SeriesTypeLine, labels[idx], trackingSignalsXAxis);
line.color = colors[idx];
line.width = Constants.commonChart.lineWidth;
line.axisYRight = trackingSignalsYAxis;
line.useOpenGL = Globals.useOpenGL;
lines.push([line, labels[idx]]);
if (all_series.length < num_labels) {
for (var i = all_series.length; i < num_labels; i++) {
var series = trackingSignalsChart.createSeries(ChartView.SeriesTypeLine, trackingSignalsPoints.getLabel(i), trackingSignalsXAxis);
series.axisYRight = trackingSignalsYAxis;
series.width = Constants.commonChart.lineWidth;
// Color and useOpenGL will be set in Python with fill_all_series call.
// series.color = sourceSeries.color
// series.useOpenGL = sourceSeries.useOpenGL
trackingSignalsPoints.addSeries(series);
}
}
trackingSignalsPoints.fill_series(lines);
var last = points[0][points[0].length - 1];
trackingSignalsXAxis.min = last.x + trackingSignalsPoints.xmin_offset;
trackingSignalsXAxis.max = last.x;
trackingSignalsPoints.fill_all_series(Constants.commonChart.lineWidth, Globals.useOpenGL);
if (all_series.length) {
trackingSignalsChart.visible = true;
trackingSignalsXAxis.min = trackingSignalsPoints.xaxis_min;
trackingSignalsXAxis.max = trackingSignalsPoints.xaxis_max;
}
}
}

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The checkboxes seem to have disappeared for me

Expand Down
Loading