Skip to content

Commit 24bb304

Browse files
authored
Use alias for observationTableModel instead of copying it. (#735)
This reduces a copy by using an aliased property instead of a var property.
1 parent 15262e0 commit 24bb304

File tree

1 file changed

+15
-11
lines changed

1 file changed

+15
-11
lines changed

resources/ObservationTabComponents/ObservationTable.qml

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import SwiftConsole
88
ColumnLayout {
99
id: observationTable
1010

11-
property var observationTableModel: null
12-
property bool populated: observationTableModel ? observationTableModel.row_count > 0 : false
11+
property alias observationTableModel: innerTable.model
12+
property bool populated: _modelValid() ? observationTableModel.row_count > 0 : false
1313
property variant avgWidth: parent.width / 8
1414
property variant columnWidths: [parent.width / 8, parent.width / 8, parent.width / 8, parent.width / 8, parent.width / 8, parent.width / 8, parent.width / 16, 3 * parent.width / 16]
1515
property variant columnNames: ["PRN", "Pseudorange [m]", "Carrier Phase [cycles]", "C/N0 [dB-Hz]", "Meas. Doppler [Hz]", "Comp. Doppler [Hz]", "Lock", "Flags"]
@@ -20,6 +20,10 @@ ColumnLayout {
2020
observationTableModel.update();
2121
}
2222

23+
function _modelValid() {
24+
return observationTableModel != 0;
25+
}
26+
2327
spacing: 0
2428
onWidthChanged: {
2529
innerTable.forceLayout();
@@ -46,7 +50,7 @@ ColumnLayout {
4650
Label {
4751
id: weekValue
4852

49-
text: observationTableModel ? observationTableModel.week : ""
53+
text: _modelValid() ? observationTableModel.week : ""
5054
padding: parent.textPadding
5155
}
5256

@@ -61,7 +65,7 @@ ColumnLayout {
6165
Label {
6266
id: towValue
6367

64-
text: observationTableModel ? observationTableModel.padFloat(observationTableModel.tow, 2) : ""
68+
text: _modelValid() ? observationTableModel.padFloat(observationTableModel.tow, 2) : ""
6569
padding: parent.textPadding
6670
}
6771

@@ -76,7 +80,7 @@ ColumnLayout {
7680
Label {
7781
id: totalValue
7882

79-
text: observationTableModel ? observationTableModel.row_count : ""
83+
text: _modelValid() ? observationTableModel.row_count : ""
8084
padding: parent.textPadding
8185
}
8286
}
@@ -85,27 +89,27 @@ ColumnLayout {
8589
spacing: 3
8690

8791
ObservationFilterColumn {
88-
codes: observationTableModel ? observationTableModel.gps_codes : 0
92+
codes: _modelValid() ? observationTableModel.gps_codes : 0
8993
}
9094

9195
ObservationFilterColumn {
92-
codes: observationTableModel ? observationTableModel.glo_codes : 0
96+
codes: _modelValid() ? observationTableModel.glo_codes : 0
9397
}
9498

9599
ObservationFilterColumn {
96-
codes: observationTableModel ? observationTableModel.bds_codes : 0
100+
codes: _modelValid() ? observationTableModel.bds_codes : 0
97101
}
98102

99103
ObservationFilterColumn {
100-
codes: observationTableModel ? observationTableModel.gal_codes : 0
104+
codes: _modelValid() ? observationTableModel.gal_codes : 0
101105
}
102106

103107
ObservationFilterColumn {
104-
codes: observationTableModel ? observationTableModel.qzs_codes : 0
108+
codes: _modelValid() ? observationTableModel.qzs_codes : 0
105109
}
106110

107111
ObservationFilterColumn {
108-
codes: observationTableModel ? observationTableModel.sbas_codes : 0
112+
codes: _modelValid() ? observationTableModel.sbas_codes : 0
109113
}
110114
}
111115

0 commit comments

Comments
 (0)