Skip to content

Commit fc23dc3

Browse files
kpetrykinkpetrykin
committed
BatteryIndicator: Added fake list of batteries in Dronepoint by clicking on battery indicator
1 parent 9dca770 commit fc23dc3

File tree

1 file changed

+141
-1
lines changed

1 file changed

+141
-1
lines changed

‎src/ui/toolbar/BatteryIndicator.qml‎

Lines changed: 141 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ Item {
7373

7474
QGCLabel {
7575
id: battLabel
76-
text: qsTr("Battery Status")
76+
text: (activeVehicle.vehicleTypeName() != "Charging station") ? qsTr("Battery Status") : qsTr("Battery #1 Status")
7777
font.family: ScreenTools.demiboldFontFamily
7878
anchors.horizontalCenter: parent.horizontalCenter
7979
}
@@ -90,6 +90,146 @@ Item {
9090
QGCLabel { text: qsTr("Accumulated Consumption:") }
9191
QGCLabel { text: (activeVehicle && activeVehicle.battery.mahConsumed.value !== -1) ? (activeVehicle.battery.mahConsumed.valueString + " " + activeVehicle.battery.mahConsumed.units) : "N/A" }
9292
}
93+
94+
QGCLabel {
95+
visible: activeVehicle.vehicleTypeName() == "Charging station"
96+
text: qsTr("Battery #2 Status")
97+
font.family: ScreenTools.demiboldFontFamily
98+
anchors.horizontalCenter: parent.horizontalCenter
99+
}
100+
101+
GridLayout {
102+
visible: activeVehicle.vehicleTypeName() == "Charging station"
103+
anchors.margins: ScreenTools.defaultFontPixelHeight
104+
columnSpacing: ScreenTools.defaultFontPixelWidth
105+
columns: 2
106+
anchors.horizontalCenter: parent.horizontalCenter
107+
108+
QGCLabel { text: qsTr("Voltage:") }
109+
QGCLabel { text: (activeVehicle && activeVehicle.battery.voltage.value !== -1) ? (activeVehicle.battery.voltage.valueString + " " + activeVehicle.battery.voltage.units) : "N/A" }
110+
QGCLabel { text: qsTr("Accumulated Consumption:") }
111+
QGCLabel { text: (activeVehicle && activeVehicle.battery.mahConsumed.value !== -1) ? (activeVehicle.battery.mahConsumed.valueString + " " + activeVehicle.battery.mahConsumed.units) : "N/A" }
112+
}
113+
114+
QGCLabel {
115+
visible: activeVehicle.vehicleTypeName() == "Charging station"
116+
text: qsTr("Battery #3 Status")
117+
font.family: ScreenTools.demiboldFontFamily
118+
anchors.horizontalCenter: parent.horizontalCenter
119+
}
120+
121+
GridLayout {
122+
visible: activeVehicle.vehicleTypeName() == "Charging station"
123+
anchors.margins: ScreenTools.defaultFontPixelHeight
124+
columnSpacing: ScreenTools.defaultFontPixelWidth
125+
columns: 2
126+
anchors.horizontalCenter: parent.horizontalCenter
127+
128+
QGCLabel { text: qsTr("Voltage:") }
129+
QGCLabel { text: (activeVehicle && activeVehicle.battery.voltage.value !== -1) ? (activeVehicle.battery.voltage.valueString + " " + activeVehicle.battery.voltage.units) : "N/A" }
130+
QGCLabel { text: qsTr("Accumulated Consumption:") }
131+
QGCLabel { text: (activeVehicle && activeVehicle.battery.mahConsumed.value !== -1) ? (activeVehicle.battery.mahConsumed.valueString + " " + activeVehicle.battery.mahConsumed.units) : "N/A" }
132+
}
133+
134+
QGCLabel {
135+
visible: activeVehicle.vehicleTypeName() == "Charging station"
136+
text: qsTr("Battery #4 Status")
137+
font.family: ScreenTools.demiboldFontFamily
138+
anchors.horizontalCenter: parent.horizontalCenter
139+
}
140+
141+
GridLayout {
142+
visible: activeVehicle.vehicleTypeName() == "Charging station"
143+
anchors.margins: ScreenTools.defaultFontPixelHeight
144+
columnSpacing: ScreenTools.defaultFontPixelWidth
145+
columns: 2
146+
anchors.horizontalCenter: parent.horizontalCenter
147+
148+
QGCLabel { text: qsTr("Voltage:") }
149+
QGCLabel { text: (activeVehicle && activeVehicle.battery.voltage.value !== -1) ? (activeVehicle.battery.voltage.valueString + " " + activeVehicle.battery.voltage.units) : "N/A" }
150+
QGCLabel { text: qsTr("Accumulated Consumption:") }
151+
QGCLabel { text: (activeVehicle && activeVehicle.battery.mahConsumed.value !== -1) ? (activeVehicle.battery.mahConsumed.valueString + " " + activeVehicle.battery.mahConsumed.units) : "N/A" }
152+
}
153+
154+
QGCLabel {
155+
visible: activeVehicle.vehicleTypeName() == "Charging station"
156+
text: qsTr("Battery #5 Status")
157+
font.family: ScreenTools.demiboldFontFamily
158+
anchors.horizontalCenter: parent.horizontalCenter
159+
}
160+
161+
GridLayout {
162+
visible: activeVehicle.vehicleTypeName() == "Charging station"
163+
anchors.margins: ScreenTools.defaultFontPixelHeight
164+
columnSpacing: ScreenTools.defaultFontPixelWidth
165+
columns: 2
166+
anchors.horizontalCenter: parent.horizontalCenter
167+
168+
QGCLabel { text: qsTr("Voltage:") }
169+
QGCLabel { text: (activeVehicle && activeVehicle.battery.voltage.value !== -1) ? (activeVehicle.battery.voltage.valueString + " " + activeVehicle.battery.voltage.units) : "N/A" }
170+
QGCLabel { text: qsTr("Accumulated Consumption:") }
171+
QGCLabel { text: (activeVehicle && activeVehicle.battery.mahConsumed.value !== -1) ? (activeVehicle.battery.mahConsumed.valueString + " " + activeVehicle.battery.mahConsumed.units) : "N/A" }
172+
}
173+
174+
QGCLabel {
175+
visible: activeVehicle.vehicleTypeName() == "Charging station"
176+
text: qsTr("Battery #6 Status")
177+
font.family: ScreenTools.demiboldFontFamily
178+
anchors.horizontalCenter: parent.horizontalCenter
179+
}
180+
181+
GridLayout {
182+
visible: activeVehicle.vehicleTypeName() == "Charging station"
183+
anchors.margins: ScreenTools.defaultFontPixelHeight
184+
columnSpacing: ScreenTools.defaultFontPixelWidth
185+
columns: 2
186+
anchors.horizontalCenter: parent.horizontalCenter
187+
188+
QGCLabel { text: qsTr("Voltage:") }
189+
QGCLabel { text: (activeVehicle && activeVehicle.battery.voltage.value !== -1) ? (activeVehicle.battery.voltage.valueString + " " + activeVehicle.battery.voltage.units) : "N/A" }
190+
QGCLabel { text: qsTr("Accumulated Consumption:") }
191+
QGCLabel { text: (activeVehicle && activeVehicle.battery.mahConsumed.value !== -1) ? (activeVehicle.battery.mahConsumed.valueString + " " + activeVehicle.battery.mahConsumed.units) : "N/A" }
192+
}
193+
194+
QGCLabel {
195+
visible: activeVehicle.vehicleTypeName() == "Charging station"
196+
text: qsTr("Battery #7 Status")
197+
font.family: ScreenTools.demiboldFontFamily
198+
anchors.horizontalCenter: parent.horizontalCenter
199+
}
200+
201+
GridLayout {
202+
visible: activeVehicle.vehicleTypeName() == "Charging station"
203+
anchors.margins: ScreenTools.defaultFontPixelHeight
204+
columnSpacing: ScreenTools.defaultFontPixelWidth
205+
columns: 2
206+
anchors.horizontalCenter: parent.horizontalCenter
207+
208+
QGCLabel { text: qsTr("Voltage:") }
209+
QGCLabel { text: (activeVehicle && activeVehicle.battery.voltage.value !== -1) ? (activeVehicle.battery.voltage.valueString + " " + activeVehicle.battery.voltage.units) : "N/A" }
210+
QGCLabel { text: qsTr("Accumulated Consumption:") }
211+
QGCLabel { text: (activeVehicle && activeVehicle.battery.mahConsumed.value !== -1) ? (activeVehicle.battery.mahConsumed.valueString + " " + activeVehicle.battery.mahConsumed.units) : "N/A" }
212+
}
213+
214+
QGCLabel {
215+
visible: activeVehicle.vehicleTypeName() == "Charging station"
216+
text: qsTr("Battery #8 Status")
217+
font.family: ScreenTools.demiboldFontFamily
218+
anchors.horizontalCenter: parent.horizontalCenter
219+
}
220+
221+
GridLayout {
222+
visible: activeVehicle.vehicleTypeName() == "Charging station"
223+
anchors.margins: ScreenTools.defaultFontPixelHeight
224+
columnSpacing: ScreenTools.defaultFontPixelWidth
225+
columns: 2
226+
anchors.horizontalCenter: parent.horizontalCenter
227+
228+
QGCLabel { text: qsTr("Voltage:") }
229+
QGCLabel { text: (activeVehicle && activeVehicle.battery.voltage.value !== -1) ? (activeVehicle.battery.voltage.valueString + " " + activeVehicle.battery.voltage.units) : "N/A" }
230+
QGCLabel { text: qsTr("Accumulated Consumption:") }
231+
QGCLabel { text: (activeVehicle && activeVehicle.battery.mahConsumed.value !== -1) ? (activeVehicle.battery.mahConsumed.valueString + " " + activeVehicle.battery.mahConsumed.units) : "N/A" }
232+
}
93233
}
94234
}
95235
}

0 commit comments

Comments
 (0)