zhaohuwei
/
QG4
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Control renaming 

* QGCCheckListItem -> PreFlightCheckButton
* CheckList -> PreFlightCheckList
QGC4.4
DonLakeFlyer 7 years ago
parent
567ffc4c0c
commit
63c76487e7
8 changed files with 353 additions and 353 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      qgroundcontrol.qrc
  2. 8
      src/FlightDisplay/FlightDisplayView.qml
  3. 24
      src/FlightDisplay/PreFlightCheckList.qml
  4. 2
      src/FlightDisplay/qmldir
  5. 4
      src/QmlControls/PreFlightCheckButton.qml
  6. 2
      src/QmlControls/QGroundControl.Controls.qmldir

4
qgroundcontrol.qrc
Unescape View File

@ -88,8 +88,8 @@
<file alias="QGroundControl/Controls/ParameterEditorDialog.qml">src/QmlControls/ParameterEditorDialog.qml</file> <file alias="QGroundControl/Controls/ParameterEditorDialog.qml">src/QmlControls/ParameterEditorDialog.qml</file>
<file alias="QGroundControl/Controls/PIDTuning.qml">src/QmlControls/PIDTuning.qml</file> <file alias="QGroundControl/Controls/PIDTuning.qml">src/QmlControls/PIDTuning.qml</file>
<file alias="QGroundControl/Controls/PlanToolBar.qml">src/PlanView/PlanToolBar.qml</file> <file alias="QGroundControl/Controls/PlanToolBar.qml">src/PlanView/PlanToolBar.qml</file>
<file alias="QGroundControl/Controls/PreFlightCheckButton.qml">src/QmlControls/PreFlightCheckButton.qml</file>
<file alias="QGroundControl/Controls/QGCButton.qml">src/QmlControls/QGCButton.qml</file> <file alias="QGroundControl/Controls/QGCButton.qml">src/QmlControls/QGCButton.qml</file>
<file alias="QGroundControl/Controls/QGCCheckListItem.qml">src/QmlControls/QGCCheckListItem.qml</file>
<file alias="QGroundControl/Controls/QGCCheckBox.qml">src/QmlControls/QGCCheckBox.qml</file> <file alias="QGroundControl/Controls/QGCCheckBox.qml">src/QmlControls/QGCCheckBox.qml</file>
<file alias="QGroundControl/Controls/QGCColoredImage.qml">src/QmlControls/QGCColoredImage.qml</file> <file alias="QGroundControl/Controls/QGCColoredImage.qml">src/QmlControls/QGCColoredImage.qml</file>
<file alias="QGroundControl/Controls/QGCComboBox.qml">src/QmlControls/QGCComboBox.qml</file> <file alias="QGroundControl/Controls/QGCComboBox.qml">src/QmlControls/QGCComboBox.qml</file>
@ -152,6 +152,7 @@
<file alias="QGroundControl/FlightDisplay/GuidedActionsController.qml">src/FlightDisplay/GuidedActionsController.qml</file> <file alias="QGroundControl/FlightDisplay/GuidedActionsController.qml">src/FlightDisplay/GuidedActionsController.qml</file>
<file alias="QGroundControl/FlightDisplay/GuidedAltitudeSlider.qml">src/FlightDisplay/GuidedAltitudeSlider.qml</file> <file alias="QGroundControl/FlightDisplay/GuidedAltitudeSlider.qml">src/FlightDisplay/GuidedAltitudeSlider.qml</file>
<file alias="QGroundControl/FlightDisplay/MultiVehicleList.qml">src/FlightDisplay/MultiVehicleList.qml</file> <file alias="QGroundControl/FlightDisplay/MultiVehicleList.qml">src/FlightDisplay/MultiVehicleList.qml</file>
<file alias="QGroundControl/FlightDisplay/PreFlightCheckList.qml">src/FlightDisplay/PreFlightCheckList.qml</file>
<file alias="QGroundControl/FlightDisplay/qmldir">src/FlightDisplay/qmldir</file> <file alias="QGroundControl/FlightDisplay/qmldir">src/FlightDisplay/qmldir</file>
<file alias="QGroundControl/FlightMap/CameraTriggerIndicator.qml">src/FlightMap/MapItems/CameraTriggerIndicator.qml</file> <file alias="QGroundControl/FlightMap/CameraTriggerIndicator.qml">src/FlightMap/MapItems/CameraTriggerIndicator.qml</file>
<file alias="QGroundControl/FlightMap/CenterMapDropButton.qml">src/FlightMap/Widgets/CenterMapDropButton.qml</file> <file alias="QGroundControl/FlightMap/CenterMapDropButton.qml">src/FlightMap/Widgets/CenterMapDropButton.qml</file>
@ -195,7 +196,6 @@
<file alias="VibrationPageWidget.qml">src/FlightMap/Widgets/VibrationPageWidget.qml</file> <file alias="VibrationPageWidget.qml">src/FlightMap/Widgets/VibrationPageWidget.qml</file>
<file alias="VideoPageWidget.qml">src/FlightMap/Widgets/VideoPageWidget.qml</file> <file alias="VideoPageWidget.qml">src/FlightMap/Widgets/VideoPageWidget.qml</file>
<file alias="VirtualJoystick.qml">src/FlightDisplay/VirtualJoystick.qml</file> <file alias="VirtualJoystick.qml">src/FlightDisplay/VirtualJoystick.qml</file>
<file alias="QGroundControl/FlightDisplay/CheckList.qml">src/FlightDisplay/CheckList.qml</file>
</qresource> </qresource>
<qresource prefix="/json"> <qresource prefix="/json">
<file alias="CameraCalc.FactMetaData.json">src/MissionManager/CameraCalc.FactMetaData.json</file> <file alias="CameraCalc.FactMetaData.json">src/MissionManager/CameraCalc.FactMetaData.json</file>

8
src/FlightDisplay/FlightDisplayView.qml
Unescape View File

@ -113,8 +113,8 @@ QGCView {
Component.onCompleted: start(true /* flyView */) Component.onCompleted: start(true /* flyView */)
} }
CheckList { PreFlightCheckList {
id: checklist id: preFlightCheckList
} }
Connections { Connections {
@ -729,7 +729,7 @@ QGCView {
opacity : 0.2+0.8*(QGroundControl.multiVehicleManager.vehicles.count > 0) opacity : 0.2+0.8*(QGroundControl.multiVehicleManager.vehicles.count > 0)
tooltip: "Reset the checklist (e.g. after a vehicle reboot)" tooltip: "Reset the checklist (e.g. after a vehicle reboot)"
onClicked: checklist.resetNrClicks() onClicked: preFlightCheckList.resetNrClicks()
Image { source:"/qmlimages/MapSyncBlack.svg" ; anchors.fill: parent } Image { source:"/qmlimages/MapSyncBlack.svg" ; anchors.fill: parent }
} }
@ -739,7 +739,7 @@ QGCView {
// All check list items // All check list items
Repeater { Repeater {
model: checklist.checkListItems model: preFlightCheckList.checkListItems
} }
} // Column } // Column
} //Rectangle } //Rectangle

24
src/FlightDisplay/CheckList.qml → src/FlightDisplay/PreFlightCheckList.qml
Unescape View File

@ -73,12 +73,12 @@ Item {
id: _checkListItems id: _checkListItems
// Standard check list items (group 0) - Available from the start // Standard check list items (group 0) - Available from the start
QGCCheckListItem { PreFlightCheckButton {
id: buttonHardware id: buttonHardware
name: "Hardware" name: "Hardware"
defaulttext: "Props mounted? Wings secured? Tail secured?" defaulttext: "Props mounted? Wings secured? Tail secured?"
} }
QGCCheckListItem { PreFlightCheckButton {
id: buttonBattery id: buttonBattery
name: "Battery" name: "Battery"
pendingtext: "Healthy & charged > 40%. Battery connector firmly plugged?" pendingtext: "Healthy & charged > 40%. Battery connector firmly plugged?"
@ -98,7 +98,7 @@ Item {
} }
} }
} }
QGCCheckListItem { PreFlightCheckButton {
id: buttonSensors id: buttonSensors
name: "Sensors" name: "Sensors"
function updateItem() { function updateItem() {
@ -129,7 +129,7 @@ Item {
} }
} }
} }
QGCCheckListItem { PreFlightCheckButton {
id: buttonRC id: buttonRC
name: "Radio Control" name: "Radio Control"
pendingtext: "Receiving signal. Perform range test & confirm." pendingtext: "Receiving signal. Perform range test & confirm."
@ -146,7 +146,7 @@ Item {
} }
} }
} }
QGCCheckListItem { PreFlightCheckButton {
id: buttonEstimator id: buttonEstimator
name: "Global position estimate" name: "Global position estimate"
function updateItem() { function updateItem() {
@ -164,25 +164,25 @@ Item {
// Check list item group 1 - Require arming // Check list item group 1 - Require arming
QGCLabel {text:qsTr("<i>Please arm the vehicle here.</i>") ; opacity: 0.2+0.8*(QGroundControl.multiVehicleManager.vehicles.count > 0) ; anchors.horizontalCenter:buttonHardware.horizontalCenter ; anchors.topMargin:40 ; anchors.bottomMargin:40;} QGCLabel {text:qsTr("<i>Please arm the vehicle here.</i>") ; opacity: 0.2+0.8*(QGroundControl.multiVehicleManager.vehicles.count > 0) ; anchors.horizontalCenter:buttonHardware.horizontalCenter ; anchors.topMargin:40 ; anchors.bottomMargin:40;}
QGCCheckListItem { PreFlightCheckButton {
id: buttonActuators id: buttonActuators
name: "Actuators" name: "Actuators"
group: 1 group: 1
defaulttext: "Move all control surfaces. Did they work properly?" defaulttext: "Move all control surfaces. Did they work properly?"
} }
QGCCheckListItem { PreFlightCheckButton {
id: buttonMotors id: buttonMotors
name: "Motors" name: "Motors"
group: 1 group: 1
defaulttext: "Propellers free? Then throttle up gently. Working properly?" defaulttext: "Propellers free? Then throttle up gently. Working properly?"
} }
QGCCheckListItem { PreFlightCheckButton {
id: buttonMission id: buttonMission
name: "Mission" name: "Mission"
group: 1 group: 1
defaulttext: "Please confirm mission is valid (waypoints valid, no terrain collision)." defaulttext: "Please confirm mission is valid (waypoints valid, no terrain collision)."
} }
QGCCheckListItem { PreFlightCheckButton {
id: buttonSoundOutput id: buttonSoundOutput
name: "Sound output" name: "Sound output"
group: 1 group: 1
@ -204,21 +204,21 @@ Item {
// Check list item group 2 - Final checks before launch // Check list item group 2 - Final checks before launch
QGCLabel {text:qsTr("<i>Last preparations before launch</i>") ; opacity : 0.2+0.8*(_checkState >= 2); anchors.horizontalCenter:buttonHardware.horizontalCenter} QGCLabel {text:qsTr("<i>Last preparations before launch</i>") ; opacity : 0.2+0.8*(_checkState >= 2); anchors.horizontalCenter:buttonHardware.horizontalCenter}
QGCCheckListItem { PreFlightCheckButton {
id: buttonPayload id: buttonPayload
name: "Payload" name: "Payload"
group: 2 group: 2
defaulttext: "Configured and started?" defaulttext: "Configured and started?"
pendingtext: "Payload lid closed?" pendingtext: "Payload lid closed?"
} }
QGCCheckListItem { PreFlightCheckButton {
id: buttonWeather id: buttonWeather
name: "Wind & weather" name: "Wind & weather"
group: 2 group: 2
defaulttext: "OK for your platform?" defaulttext: "OK for your platform?"
pendingtext: "Launching into the wind?" pendingtext: "Launching into the wind?"
} }
QGCCheckListItem { PreFlightCheckButton {
id: buttonFlightAreaFree id: buttonFlightAreaFree
name: "Flight area" name: "Flight area"
group: 2 group: 2

2
src/FlightDisplay/qmldir
Unescape View File

@ -9,5 +9,5 @@ GuidedActionsController 1.0 GuidedActionsController.qml
GuidedActionList 1.0 GuidedActionList.qml GuidedActionList 1.0 GuidedActionList.qml
GuidedAltitudeSlider 1.0 GuidedAltitudeSlider.qml GuidedAltitudeSlider 1.0 GuidedAltitudeSlider.qml
MultiVehicleList 1.0 MultiVehicleList.qml MultiVehicleList 1.0 MultiVehicleList.qml
CheckList 1.0 CheckList.qml PreFlightCheckList 1.0 PreFlightCheckList.qml

4
src/QmlControls/QGCCheckListItem.qml → src/QmlControls/PreFlightCheckButton.qml
Unescape View File

@ -34,8 +34,8 @@ QGCButton {
property string _text: name + ": " + defaulttext property string _text: name + ": " + defaulttext
property var _activeVehicle: QGroundControl.multiVehicleManager.activeVehicle property var _activeVehicle: QGroundControl.multiVehicleManager.activeVehicle
enabled: (!_activeVehicle || _activeVehicle.connectionLost) ? false : checklist._checkState >= group enabled: (!_activeVehicle || _activeVehicle.connectionLost) ? false : preFlightCheckList._checkState >= group
opacity: (!_activeVehicle || _activeVehicle.connectionLost) ? 0.4 : 0.2 + (0.8 * (checklist._checkState >= group)) opacity: (!_activeVehicle || _activeVehicle.connectionLost) ? 0.4 : 0.2 + (0.8 * (preFlightCheckList._checkState >= group))
width: 40 * ScreenTools.defaultFontPixelWidth width: 40 * ScreenTools.defaultFontPixelWidth
style: ButtonStyle { style: ButtonStyle {

2
src/QmlControls/QGroundControl.Controls.qmldir
Unescape View File

@ -34,8 +34,8 @@ ParameterEditor 1.0 ParameterEditor.qml
ParameterEditorDialog 1.0 ParameterEditorDialog.qml ParameterEditorDialog 1.0 ParameterEditorDialog.qml
PIDTuning 1.0 PIDTuning.qml PIDTuning 1.0 PIDTuning.qml
PlanToolBar 1.0 PlanToolBar.qml PlanToolBar 1.0 PlanToolBar.qml
PreFlightCheckButton 1.0 PreFlightCheckButton.qml
QGCButton 1.0 QGCButton.qml QGCButton 1.0 QGCButton.qml
QGCCheckListItem 1.0 QGCCheckListItem.qml
QGCCheckBox 1.0 QGCCheckBox.qml QGCCheckBox 1.0 QGCCheckBox.qml
QGCColoredImage 1.0 QGCColoredImage.qml QGCColoredImage 1.0 QGCColoredImage.qml
QGCComboBox 1.0 QGCComboBox.qml QGCComboBox 1.0 QGCComboBox.qml

Write Preview
Loading…
Cancel
Save