diff --git a/src/AnalyzeView/GeoTagPage.qml b/src/AnalyzeView/GeoTagPage.qml index dbaa678792cba5f29d3c9a91de898843a5e344bd..d4f4386f074ddfd71c5a2526bf3c3349e73b7bff 100644 --- a/src/AnalyzeView/GeoTagPage.qml +++ b/src/AnalyzeView/GeoTagPage.qml @@ -110,7 +110,7 @@ AnalyzePage { } QGCLabel { - text: geoController.saveDirectory != "" ? geoController.saveDirectory : "/TAGGED folder in your image folder" + text: geoController.saveDirectory !== "" ? geoController.saveDirectory : "/TAGGED folder in your image folder" anchors.verticalCenter: parent.verticalCenter } } diff --git a/src/AutoPilotPlugins/Common/MotorComponent.qml b/src/AutoPilotPlugins/Common/MotorComponent.qml index dc36a82987cdf1a0d009b3c8c518a15771887561..a964c547f88d72650d379157d5c8c69c0733211c 100644 --- a/src/AutoPilotPlugins/Common/MotorComponent.qml +++ b/src/AutoPilotPlugins/Common/MotorComponent.qml @@ -55,7 +55,7 @@ SetupPage { property real _lastValue: 0 onTriggered: { - if (_lastValue != slider.value) { + if (_lastValue !== slider.value) { controller.vehicle.motorTest(index + 1, slider.value, 1) } } diff --git a/src/AutoPilotPlugins/Common/RadioComponent.qml b/src/AutoPilotPlugins/Common/RadioComponent.qml index c5fb6c91006c4c7578341727650f582d3a562a0b..c4f6b57ea7c731da98df445e891536b9dc77cb96 100644 --- a/src/AutoPilotPlugins/Common/RadioComponent.qml +++ b/src/AutoPilotPlugins/Common/RadioComponent.qml @@ -379,7 +379,7 @@ SetupPage { text: qsTr("Calibrate") onClicked: { - if (text == qsTr("Calibrate")) { + if (text === qsTr("Calibrate")) { showDialog(zeroTrimsDialogComponent, dialogTitle, radioPage.showDialogDefaultWidth, StandardButton.Ok | StandardButton.Cancel) } else { controller.nextButtonClicked() diff --git a/src/AutoPilotPlugins/PX4/AirframeComponent.qml b/src/AutoPilotPlugins/PX4/AirframeComponent.qml index a0920cf22a47e2f9abb70edfea5a7f74a873f182..3d14454af217afd28efdbb22ba2229cbd4005ec9 100644 --- a/src/AutoPilotPlugins/PX4/AirframeComponent.qml +++ b/src/AutoPilotPlugins/PX4/AirframeComponent.qml @@ -202,12 +202,12 @@ Your vehicle will also be restarted in order to complete the process.") QGCCheckBox { // Although this item is invisible we still use it to manage state id: airframeCheckBox - checked: modelData.name == controller.currentAirframeType + checked: modelData.name === controller.currentAirframeType exclusiveGroup: airframeTypeExclusive visible: false onCheckedChanged: { - if (checked && combo.currentIndex != -1) { + if (checked && combo.currentIndex !== -1) { console.log("check box change", combo.currentIndex) controller.autostartId = modelData.airframes[combo.currentIndex].autostartId } diff --git a/src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml b/src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml index 5dd0f980caabef13f91f11fcf49c821b36815852..1adf6162fa099f12ecaf13f17d0ab02c23fa70e8 100644 --- a/src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml +++ b/src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml @@ -37,7 +37,7 @@ FactPanel { VehicleSummaryRow { labelText: qsTr("Firmware Version:") - valueText: activeVehicle.firmwareMajorVersion == -1 ? qsTr("Unknown") : activeVehicle.firmwareMajorVersion + "." + activeVehicle.firmwareMinorVersion + "." + activeVehicle.firmwarePatchVersion + activeVehicle.firmwareVersionTypeString + valueText: activeVehicle.firmwareMajorVersion === -1 ? qsTr("Unknown") : activeVehicle.firmwareMajorVersion + "." + activeVehicle.firmwareMinorVersion + "." + activeVehicle.firmwarePatchVersion + activeVehicle.firmwareVersionTypeString } } } diff --git a/src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml b/src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml index e58bc7e97c21077d19c1ee35cb0f4a2b95bf7138..3755d61a2197ddc7e2840117d019a514527fd01b 100644 --- a/src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml +++ b/src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml @@ -18,7 +18,7 @@ FactPanel { property Fact _nullFact property Fact _rcMapFltmode: controller.parameterExists(-1, "RC_MAP_FLTMODE") ? controller.getParameterFact(-1, "RC_MAP_FLTMODE") : _nullFact property Fact _rcMapModeSw: controller.getParameterFact(-1, "RC_MAP_MODE_SW") - property bool _simpleMode: _rcMapFltmode.value > 0 || _rcMapModeSw.value == 0 + property bool _simpleMode: _rcMapFltmode.value > 0 || _rcMapModeSw.value === 0 Loader { anchors.fill: parent diff --git a/src/AutoPilotPlugins/PX4/PX4FlightModes.qml b/src/AutoPilotPlugins/PX4/PX4FlightModes.qml index 68472e8f37340a5d7fba13f28dcce7608c7aa8c6..952d81fa2e1e4982916c02070686fd71f5886a92 100644 --- a/src/AutoPilotPlugins/PX4/PX4FlightModes.qml +++ b/src/AutoPilotPlugins/PX4/PX4FlightModes.qml @@ -39,7 +39,7 @@ SetupPage { property bool _rcMapFltmodeExists: controller.parameterExists(-1, "RC_MAP_FLTMODE") property Fact _rcMapFltmode: _rcMapFltmodeExists ? controller.getParameterFact(-1, "RC_MAP_FLTMODE") : _nullFact property Fact _rcMapModeSw: controller.getParameterFact(-1, "RC_MAP_MODE_SW") - property bool _simpleMode: _rcMapFltmodeExists ? _rcMapFltmode.value > 0 || _rcMapModeSw.value == 0 : false + property bool _simpleMode: _rcMapFltmodeExists ? _rcMapFltmode.value > 0 || _rcMapModeSw.value === 0 : false FactPanelController { id: controller diff --git a/src/AutoPilotPlugins/PX4/PX4SimpleFlightModes.qml b/src/AutoPilotPlugins/PX4/PX4SimpleFlightModes.qml index 78d057646314e3cb05e14639bdd22e04674b40cc..48e3f8cb1c4ad7c6e69ae92a2251fe391c8c06fd 100644 --- a/src/AutoPilotPlugins/PX4/PX4SimpleFlightModes.qml +++ b/src/AutoPilotPlugins/PX4/PX4SimpleFlightModes.qml @@ -145,7 +145,7 @@ Item { QGCLabel { anchors.baseline: returnCombo.baseline text: qsTr("Return switch:") - color: parent.fact.value == 0 ? qgcPal.text : (controller.rcChannelValues[parent.fact.value - 1] >= 1500 ? "yellow" : qgcPal.text) + color: parent.fact.value === 0 ? qgcPal.text : (controller.rcChannelValues[parent.fact.value - 1] >= 1500 ? "yellow" : qgcPal.text) } FactComboBox { @@ -164,7 +164,7 @@ Item { QGCLabel { anchors.baseline: killCombo.baseline text: qsTr("Kill switch:") - color: parent.fact.value == 0 ? qgcPal.text : (controller.rcChannelValues[parent.fact.value - 1] >= 1500 ? "yellow" : qgcPal.text) + color: parent.fact.value === 0 ? qgcPal.text : (controller.rcChannelValues[parent.fact.value - 1] >= 1500 ? "yellow" : qgcPal.text) } FactComboBox { @@ -183,7 +183,7 @@ Item { QGCLabel { anchors.baseline: offboardCombo.baseline text: qsTr("Offboard switch:") - color: parent.fact.value == 0 ? qgcPal.text : (controller.rcChannelValues[parent.fact.value - 1] >= 1500 ? "yellow" : qgcPal.text) + color: parent.fact.value === 0 ? qgcPal.text : (controller.rcChannelValues[parent.fact.value - 1] >= 1500 ? "yellow" : qgcPal.text) } FactComboBox { @@ -203,7 +203,7 @@ Item { QGCLabel { anchors.baseline: vtolCombo.baseline text: qsTr("VTOL mode switch:") - color: parent.fact.value == 0 ? qgcPal.text : (controller.rcChannelValues[parent.fact.value - 1] >= 1500 ? "yellow" : qgcPal.text) + color: parent.fact.value === 0 ? qgcPal.text : (controller.rcChannelValues[parent.fact.value - 1] >= 1500 ? "yellow" : qgcPal.text) } FactComboBox { diff --git a/src/AutoPilotPlugins/PX4/PowerComponent.qml b/src/AutoPilotPlugins/PX4/PowerComponent.qml index 91419392fd0b78dd43eb87efb7cbd5d6298327ce..ef0f665be9cfbd1b18fb417120bf14495ec207db 100644 --- a/src/AutoPilotPlugins/PX4/PowerComponent.qml +++ b/src/AutoPilotPlugins/PX4/PowerComponent.qml @@ -143,7 +143,7 @@ SetupPage { onClicked: { var measuredVoltageValue = parseFloat(measuredVoltage.text) - if (measuredVoltageValue == 0 || isNaN(measuredVoltageValue)) { + if (measuredVoltageValue === 0 || isNaN(measuredVoltageValue)) { return } var newVoltageDivider = (measuredVoltageValue * battVoltageDivider.value) / controller.vehicle.battery.voltage.value @@ -201,7 +201,7 @@ SetupPage { onClicked: { var measuredCurrentValue = parseFloat(measuredCurrent.text) - if (measuredCurrentValue == 0) { + if (measuredCurrentValue === 0) { return } var newAmpsPerVolt = (measuredCurrentValue * battAmpsPerVolt.value) / controller.vehicle.battery.current.value @@ -379,7 +379,7 @@ SetupPage { QGCCheckBox { id: showUAVCAN text: qsTr("Show UAVCAN Settings") - checked: uavcanEnable.rawValue != 0 + checked: uavcanEnable ? uavcanEnable.rawValue !== 0 : false } QGCGroupBox { diff --git a/src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml b/src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml index 4c88877005727e51af8d30400c8198ec81c31b25..4670bbe3d4da60666096b9fceb9b3c2438194d35 100644 --- a/src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml +++ b/src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml @@ -25,8 +25,8 @@ FactPanel { property Fact airspeedDisabledFact: controller.getParameterFact(-1, "FW_ARSP_MODE") property Fact airspeedBreakerFact: controller.getParameterFact(-1, "CBRK_AIRSPD_CHK") - property bool _airspeedVisible: airspeedDisabledFact.value == false && airspeedBreakerFact.value != 162128 - property bool _airspeedCalRequired: _airspeedVisible && dpressOffFact.value == 0 + property bool _airspeedVisible: airspeedDisabledFact.value === false && airspeedBreakerFact.value !== 162128 + property bool _airspeedCalRequired: _airspeedVisible && dpressOffFact.value === 0 Column { anchors.fill: parent diff --git a/src/AutoPilotPlugins/PX4/SensorsSetup.qml b/src/AutoPilotPlugins/PX4/SensorsSetup.qml index f3cc472d6bf57c407ad12d0e4b71e84b064f99c6..fdbca17573a97decdf398d44dd6875cddf8adcac 100644 --- a/src/AutoPilotPlugins/PX4/SensorsSetup.qml +++ b/src/AutoPilotPlugins/PX4/SensorsSetup.qml @@ -352,7 +352,7 @@ Item { id: compassButton width: _buttonWidth text: qsTr("Compass") - indicatorGreen: cal_mag0_id.value != 0 + indicatorGreen: cal_mag0_id.value !== 0 visible: QGroundControl.corePlugin.options.showSensorCalibrationCompass && showSensorCalibrationCompass onClicked: { @@ -366,7 +366,7 @@ Item { id: gyroButton width: _buttonWidth text: qsTr("Gyroscope") - indicatorGreen: cal_gyro0_id.value != 0 + indicatorGreen: cal_gyro0_id.value !== 0 visible: QGroundControl.corePlugin.options.showSensorCalibrationGyro && showSensorCalibrationGyro onClicked: { @@ -380,7 +380,7 @@ Item { id: accelButton width: _buttonWidth text: qsTr("Accelerometer") - indicatorGreen: cal_acc0_id.value != 0 + indicatorGreen: cal_acc0_id.value !== 0 visible: QGroundControl.corePlugin.options.showSensorCalibrationAccel && showSensorCalibrationAccel onClicked: { @@ -394,8 +394,8 @@ Item { id: levelButton width: _buttonWidth text: qsTr("Level Horizon") - indicatorGreen: sens_board_x_off.value != 0 || sens_board_y_off.value != 0 | sens_board_z_off.value != 0 - enabled: cal_acc0_id.value != 0 && cal_gyro0_id.value != 0 + indicatorGreen: sens_board_x_off.value !== 0 || sens_board_y_off.value !== 0 | sens_board_z_off.value !== 0 + enabled: cal_acc0_id.value !== 0 && cal_gyro0_id.value !== 0 visible: QGroundControl.corePlugin.options.showSensorCalibrationLevel && showSensorCalibrationLevel onClicked: { @@ -410,11 +410,11 @@ Item { width: _buttonWidth text: qsTr("Airspeed") visible: (controller.vehicle.fixedWing || controller.vehicle.vtol) && - controller.getParameterFact(-1, "FW_ARSP_MODE").value == false && - controller.getParameterFact(-1, "CBRK_AIRSPD_CHK").value != 162128 && + controller.getParameterFact(-1, "FW_ARSP_MODE").value === false && + controller.getParameterFact(-1, "CBRK_AIRSPD_CHK").value !== 162128 && QGroundControl.corePlugin.options.showSensorCalibrationAirspeed && showSensorCalibrationAirspeed - indicatorGreen: sens_dpres_off.value != 0 + indicatorGreen: sens_dpres_off.value !== 0 onClicked: { preCalibrationDialogType = "airspeed" diff --git a/src/FactSystem/FactControls/FactBitmask.qml b/src/FactSystem/FactControls/FactBitmask.qml index 11efcba86fc5f1621082af8ef30ca732e7a76536..517ce6a4bf5a4b2361454e6117c3e0f95fbc02ac 100644 --- a/src/FactSystem/FactControls/FactBitmask.qml +++ b/src/FactSystem/FactControls/FactBitmask.qml @@ -33,10 +33,12 @@ Flow { checked: fact.value & fact.bitmaskValues[index] onClicked: { + var i; + var otherCheckbox; if (checked) { if (firstEntryIsAll && index == 0) { - for (var i=1; i 2) { - for (var i=0; i 2) { - for (var i=0; i<_geoFenceController.mapPolygon.path.count; i++) { + for (i = 0; i < _geoFenceController.mapPolygon.path.count; i++) { coordList.push(_geoFenceController.mapPolygon.path[i]) } } diff --git a/src/FlightMap/Widgets/ValuePageWidget.qml b/src/FlightMap/Widgets/ValuePageWidget.qml index 789cfc225f448c2033abf54abf9ffe9ccd2fd3f6..b68146cddc25713a12f2b5ac78d3dc5a79987aa1 100644 --- a/src/FlightMap/Widgets/ValuePageWidget.qml +++ b/src/FlightMap/Widgets/ValuePageWidget.qml @@ -174,8 +174,8 @@ Column { anchors.right: parent.right sourceComponent: factGroupList - property var factGroup: _activeVehicle - property var factGroupName: "Vehicle" + property var factGroup: _activeVehicle + property string factGroupName: "Vehicle" } } } diff --git a/src/PlanView/CameraCalc.qml b/src/PlanView/CameraCalc.qml index 1143a8184f0b2ca162b5a7889803b6b59e0ee320..6f0d33e45b9ec966e36050fc3af9fb0e9b070ee1 100644 --- a/src/PlanView/CameraCalc.qml +++ b/src/PlanView/CameraCalc.qml @@ -39,7 +39,7 @@ Column { } gridTypeCombo.model = _cameraList var knownCameraIndex = gridTypeCombo.find(cameraCalc.cameraName) - if (knownCameraIndex != -1) { + if (knownCameraIndex !== -1) { gridTypeCombo.currentIndex = knownCameraIndex } else { console.log("Internal error: Known camera not found", cameraCalc.cameraName) diff --git a/src/PlanView/CameraSection.qml b/src/PlanView/CameraSection.qml index bdbba8bc2d91fbfe147810c967fbdb0c88a3e61d..b91cd52b5e8d0413969f4bf1140185fb3b5cb3c8 100644 --- a/src/PlanView/CameraSection.qml +++ b/src/PlanView/CameraSection.qml @@ -46,7 +46,7 @@ Column { anchors.left: parent.left anchors.right: parent.right spacing: ScreenTools.defaultFontPixelWidth - visible: _camera.cameraAction.rawValue == 1 + visible: _camera.cameraAction.rawValue === 1 QGCLabel { text: qsTr("Time") @@ -62,7 +62,7 @@ Column { anchors.left: parent.left anchors.right: parent.right spacing: ScreenTools.defaultFontPixelWidth - visible: _camera.cameraAction.rawValue == 2 + visible: _camera.cameraAction.rawValue === 2 QGCLabel { text: qsTr("Distance") diff --git a/src/PlanView/GeoFenceEditor.qml b/src/PlanView/GeoFenceEditor.qml index dd592b5fe6ef150d52a78da19cbf77468424d466..8cf3cb745a4a3eded03811ca3ffd91b9fa31e400 100644 --- a/src/PlanView/GeoFenceEditor.qml +++ b/src/PlanView/GeoFenceEditor.qml @@ -154,7 +154,7 @@ QGCFlickable { QGCLabel { text: qsTr("None") - visible: polygonSection.checked && myGeoFenceController.polygons.count == 0 + visible: polygonSection.checked && myGeoFenceController.polygons.count === 0 } GridLayout { @@ -239,7 +239,7 @@ QGCFlickable { QGCLabel { text: qsTr("None") - visible: circleSection.checked && myGeoFenceController.circles.count == 0 + visible: circleSection.checked && myGeoFenceController.circles.count === 0 } GridLayout { diff --git a/src/PlanView/MissionItemEditor.qml b/src/PlanView/MissionItemEditor.qml index dd643588f178fbdf9122e36d73082e24af2d6b52..18083de522dc4814967d09be7cf3d9312f2bc0ce 100644 --- a/src/PlanView/MissionItemEditor.qml +++ b/src/PlanView/MissionItemEditor.qml @@ -89,7 +89,7 @@ Rectangle { height: _hamburgerSize sourceSize.height: _hamburgerSize source: "qrc:/qmlimages/Hamburger.svg" - visible: missionItem.isCurrentItem && missionItem.sequenceNumber != 0 + visible: missionItem.isCurrentItem && missionItem.sequenceNumber !== 0 color: qgcPal.windowShade } diff --git a/src/PlanView/PlanToolBar.qml b/src/PlanView/PlanToolBar.qml index ffc92a4b862019f72c68d62951f466e54442b1af..d51f346d9c035c9087e600c82c5bb8f56cdc064c 100644 --- a/src/PlanView/PlanToolBar.qml +++ b/src/PlanView/PlanToolBar.qml @@ -32,13 +32,13 @@ Rectangle { property real missionMaxTelemetry: _controllerValid ? planMasterController.missionController.missionMaxTelemetry : NaN property bool missionDirty: _controllerValid ? planMasterController.missionController.dirty : false - property bool _controllerValid: planMasterController != undefined + property bool _controllerValid: planMasterController !== undefined property bool _controllerOffline: _controllerValid ? planMasterController.offline : true property var _controllerDirty: _controllerValid ? planMasterController.dirty : false property var _controllerSyncInProgress: _controllerValid ? planMasterController.syncInProgress : false - property bool _statusValid: currentMissionItem != undefined - property bool _missionValid: missionItems != undefined + property bool _statusValid: currentMissionItem !== undefined + property bool _missionValid: missionItems !== undefined property real _dataFontSize: ScreenTools.defaultFontPointSize property real _largeValueWidth: ScreenTools.defaultFontPixelWidth * 8 diff --git a/src/PlanView/PlanView.qml b/src/PlanView/PlanView.qml index 3e6f94494dd434f639a93f977b5e33653c9b2bb7..16b4209f0a0cb4f949939d6d8052b91d5f757684 100644 --- a/src/PlanView/PlanView.qml +++ b/src/PlanView/PlanView.qml @@ -238,7 +238,7 @@ QGCView { QGCFileDialog { id: fileDialog qgcView: _qgcView - property var plan: true + property bool plan: true folder: QGroundControl.settingsManager.appSettings.missionSavePath fileExtension: QGroundControl.settingsManager.appSettings.planFileExtension fileExtension2: QGroundControl.settingsManager.appSettings.missionFileExtension @@ -263,7 +263,7 @@ QGCView { function accept() { var toIndex = toCombo.currentIndex - if (toIndex == 0) { + if (toIndex === 0) { toIndex = 1 } _missionController.moveMissionItem(_moveDialogMissionItemIndex, toIndex) diff --git a/src/PlanView/RallyPointItemEditor.qml b/src/PlanView/RallyPointItemEditor.qml index 775f322a65e46c8cefbabb1cc142ddc7caa8c488..a85c84b7395e8898ab4dff84c681e420f8bb921c 100644 --- a/src/PlanView/RallyPointItemEditor.qml +++ b/src/PlanView/RallyPointItemEditor.qml @@ -17,7 +17,7 @@ Rectangle { property var rallyPoint ///< RallyPoint object associated with editor property var controller ///< RallyPointController - property bool _currentItem: rallyPoint ? rallyPoint == controller.currentRallyPoint : false + property bool _currentItem: rallyPoint ? rallyPoint === controller.currentRallyPoint : false property color _outerTextColor: _currentItem ? "black" : qgcPal.text readonly property real _margin: ScreenTools.defaultFontPixelWidth / 2 diff --git a/src/PlanView/RallyPointMapVisuals.qml b/src/PlanView/RallyPointMapVisuals.qml index 57c2f5a3d229cf678d6644f3f21094dd103f191d..e4adb46da72de7d3db54dfed21b526a9eddfdc64 100644 --- a/src/PlanView/RallyPointMapVisuals.qml +++ b/src/PlanView/RallyPointMapVisuals.qml @@ -45,7 +45,7 @@ Item { MissionItemIndicatorDrag { itemCoordinate: rallyPointObject.coordinate - visible: rallyPointObject == myRallyPointController.currentRallyPoint + visible: rallyPointObject === myRallyPointController.currentRallyPoint property var rallyPointObject @@ -67,7 +67,7 @@ Item { sourceItem: MissionItemIndexLabel { id: itemIndexLabel label: qsTr("R", "rally point map item label") - checked: _editingLayer == _layerRallyPoints ? rallyPointObject == myRallyPointController.currentRallyPoint : false + checked: _editingLayer == _layerRallyPoints ? rallyPointObject === myRallyPointController.currentRallyPoint : false onClicked: myRallyPointController.currentRallyPoint = rallyPointObject } diff --git a/src/PlanView/SimpleItemEditor.qml b/src/PlanView/SimpleItemEditor.qml index 23106868791f0a2bfe6153d04a31d1625ae946fd..75c6da4f306b64596bffc941babfa7e0cee4a3a3 100644 --- a/src/PlanView/SimpleItemEditor.qml +++ b/src/PlanView/SimpleItemEditor.qml @@ -44,7 +44,7 @@ Rectangle { QGCLabel { text: object.name - visible: object.name != "" + visible: object.name !== "" Layout.column: 0 Layout.row: index } diff --git a/src/PlanView/SurveyItemEditor.qml b/src/PlanView/SurveyItemEditor.qml index 58fad1c1e11da3041c653ee2d49faf9f3a57185b..ad47d11ebe470df2c7fc302f299d25c37763517c 100644 --- a/src/PlanView/SurveyItemEditor.qml +++ b/src/PlanView/SurveyItemEditor.qml @@ -46,7 +46,7 @@ Rectangle { } else { var index = -1 for (index=0; index<_cameraList.length; index++) { - if (_cameraList[index] == missionItem.camera.value) { + if (_cameraList[index] === missionItem.camera.value) { break; } } @@ -243,7 +243,7 @@ Rectangle { anchors.left: parent.left anchors.right: parent.right spacing: _margin - visible: missionItem.manualGrid.value == true + visible: missionItem.manualGrid.value QGCCheckBox { id: cameraTriggerDistanceCheckBox @@ -273,7 +273,7 @@ Rectangle { anchors.left: parent.left anchors.right: parent.right spacing: _margin - visible: gridTypeCombo.currentIndex != _gridTypeManual + visible: gridTypeCombo.currentIndex !== _gridTypeManual Row { spacing: _margin @@ -443,7 +443,7 @@ Rectangle { id: windRoseButton anchors.verticalCenter: angleText.verticalCenter iconSource: qgcPal.globalTheme === QGCPalette.Light ? "/res/wind-roseBlack.svg" : "/res/wind-rose.svg" - visible: _vehicle.fixedWing + visible: _vehicle ? _vehicle.fixedWing : false onClicked: { windRosePie.angle = Number(gridAngleText.text) @@ -522,7 +522,7 @@ Rectangle { SectionHeader { id: manualGridHeader text: qsTr("Grid") - visible: gridTypeCombo.currentIndex == _gridTypeManual + visible: gridTypeCombo.currentIndex === _gridTypeManual } GridLayout { @@ -547,7 +547,7 @@ Rectangle { anchors.verticalCenter: manualAngleText.verticalCenter Layout.columnSpan: 1 iconSource: qgcPal.globalTheme === QGCPalette.Light ? "/res/wind-roseBlack.svg" : "/res/wind-rose.svg" - visible: _vehicle.fixedWing + visible: _vehicle ? _vehicle.fixedWing : false onClicked: { var cords = manualWindRoseButton.mapToItem(_root, 0, 0) diff --git a/src/PlanView/SurveyMapVisual.qml b/src/PlanView/SurveyMapVisual.qml index 08a52be380aa7cfa768bb91fd59eed983fe0a5c1..7a10c98eee99af5a7b4ab531c95f6b4793716598 100644 --- a/src/PlanView/SurveyMapVisual.qml +++ b/src/PlanView/SurveyMapVisual.qml @@ -90,6 +90,7 @@ Item { QGCMapPolygonVisuals { id: mapPolygonVisuals + qgcView: _root.qgcView mapControl: map mapPolygon: _mapPolygon interactive: _missionItem.isCurrentItem diff --git a/src/QmlControls/DropButton.qml b/src/QmlControls/DropButton.qml index ceb0cf48a81bc5aeb7934a343e2a103efedd6d3d..7815ffed7f4b211e5f60ae675592c233995817bc 100644 --- a/src/QmlControls/DropButton.qml +++ b/src/QmlControls/DropButton.qml @@ -175,9 +175,9 @@ Item { id: arrowCanvas anchors.fill: parent - property var arrowPoint: Qt.point(0, 0) - property var arrowBase1: Qt.point(0, 0) - property var arrowBase2: Qt.point(0, 0) + property point arrowPoint: Qt.point(0, 0) + property point arrowBase1: Qt.point(0, 0) + property point arrowBase2: Qt.point(0, 0) onPaint: { var context = getContext("2d") diff --git a/src/QmlControls/DropPanel.qml b/src/QmlControls/DropPanel.qml index 11c00e99ab808926b5709f4d84adfc0dac92c19e..91fe3dcc58206c681f06b75c3d2f3d36a5dab191 100644 --- a/src/QmlControls/DropPanel.qml +++ b/src/QmlControls/DropPanel.qml @@ -124,9 +124,9 @@ Item { id: arrowCanvas anchors.fill: parent - property var arrowPoint: Qt.point(0, 0) - property var arrowBase1: Qt.point(0, 0) - property var arrowBase2: Qt.point(0, 0) + property point arrowPoint: Qt.point(0, 0) + property point arrowBase1: Qt.point(0, 0) + property point arrowBase2: Qt.point(0, 0) onPaint: { var context = getContext("2d") diff --git a/src/QmlControls/FlightModeMenu.qml b/src/QmlControls/FlightModeMenu.qml index 9b553a3951dc291673923c9c39b5cad861674c7c..c46df0acafdd4008f865225720eb2330df86d3a1 100644 --- a/src/QmlControls/FlightModeMenu.qml +++ b/src/QmlControls/FlightModeMenu.qml @@ -37,13 +37,14 @@ QGCLabel { function updateFlightModesMenu() { if (activeVehicle && activeVehicle.flightModeSetAvailable) { + var i; // Remove old menu items - for (var i = 0; i < flightModesMenuItems.length; i++) { + for (i = 0; i < flightModesMenuItems.length; i++) { flightModesMenu.removeItem(flightModesMenuItems[i]) } flightModesMenuItems.length = 0 // Add new items - for (var i = 0; i < activeVehicle.flightModes.length; i++) { + for (i = 0; i < activeVehicle.flightModes.length; i++) { var menuItem = flightModeMenuItemComponent.createObject(null, { "text": activeVehicle.flightModes[i] }) flightModesMenuItems.push(menuItem) flightModesMenu.insertItem(i, menuItem) diff --git a/src/QmlControls/MissionCommandDialog.qml b/src/QmlControls/MissionCommandDialog.qml index 5320d69f3b17b781b61a6180c233451086beafa4..03532af91f9ca3b8e9809b9182db7fa70e27a95d 100644 --- a/src/QmlControls/MissionCommandDialog.qml +++ b/src/QmlControls/MissionCommandDialog.qml @@ -68,7 +68,7 @@ QGCViewDialog { color: qgcPal.button property var mavCmdInfo: modelData - property var textColor: qgcPal.buttonText + property color textColor: qgcPal.buttonText Column { id: commandColumn diff --git a/src/QmlControls/ParameterEditor.qml b/src/QmlControls/ParameterEditor.qml index 2d9c667c912dd558502eafdbf108c2a06caa831d..c09e3546efa3aca8ea9a11f4a00057bb5a206c17 100644 --- a/src/QmlControls/ParameterEditor.qml +++ b/src/QmlControls/ParameterEditor.qml @@ -253,7 +253,7 @@ QGCView { id: valueLabel width: ScreenTools.defaultFontPixelWidth * 20 color: factRow.modelFact.defaultValueAvailable ? (factRow.modelFact.valueEqualsDefault ? __qgcPal.text : __qgcPal.warningText) : __qgcPal.text - text: factRow.modelFact.enumStrings.length == 0 ? factRow.modelFact.valueString + " " + factRow.modelFact.units : factRow.modelFact.enumStringValue + text: factRow.modelFact.enumStrings.length === 0 ? factRow.modelFact.valueString + " " + factRow.modelFact.units : factRow.modelFact.enumStringValue clip: true } diff --git a/src/QmlControls/ParameterEditorDialog.qml b/src/QmlControls/ParameterEditorDialog.qml index 3a1f5e436ab24f1d89eb8ed53022952a2023b3de..4a97a174dcc4dbef0a1254f67f63f10028ad9236 100644 --- a/src/QmlControls/ParameterEditorDialog.qml +++ b/src/QmlControls/ParameterEditorDialog.qml @@ -116,7 +116,7 @@ QGCViewDialog { QGCTextField { id: valueField text: validate ? validateValue : fact.valueString - visible: fact.enumStrings.length == 0 || validate || manualEntry.checked + visible: fact.enumStrings.length === 0 || validate || manualEntry.checked unitsLabel: fact.units showUnits: fact.units != "" Layout.fillWidth: true @@ -145,7 +145,7 @@ QGCViewDialog { visible: _showCombo model: fact.enumStrings - property bool _showCombo: fact.enumStrings.length != 0 && fact.bitmaskStrings.length == 0 && !validate + property bool _showCombo: fact.enumStrings.length !== 0 && fact.bitmaskStrings.length === 0 && !validate Component.onCompleted: { // We can't bind directly to fact.enumIndex since that would add an unknown value diff --git a/src/QmlControls/QGCFileDialog.qml b/src/QmlControls/QGCFileDialog.qml index e770bc714a84cae3927d74c58a6842a8de062825..ecd0782ca9a2b8bdf997e3832c328266f2d8d852 100644 --- a/src/QmlControls/QGCFileDialog.qml +++ b/src/QmlControls/QGCFileDialog.qml @@ -144,7 +144,7 @@ Item { QGCLabel { text: qsTr("No files") - visible: fileList.model.length == 0 + visible: fileList.model.length === 0 } } } diff --git a/src/QmlControls/QGCFlickableHorizontalIndicator.qml b/src/QmlControls/QGCFlickableHorizontalIndicator.qml index b1ac454f77b018ea8cad3808b10ab5959936daa0..41f89653a1b9a6ebaa15bbd79dfcc998ba7f8751 100644 --- a/src/QmlControls/QGCFlickableHorizontalIndicator.qml +++ b/src/QmlControls/QGCFlickableHorizontalIndicator.qml @@ -11,9 +11,9 @@ Rectangle { color: parent.indicatorColor visible: showIndicator - property bool showIndicator: (parent.flickableDirection == Flickable.AutoFlickDirection || - parent.flickableDirection == Flickable.HorizontalFlick || - parent.flickableDirection == Flickable.HorizontalAndVerticalFlick) && + property bool showIndicator: (parent.flickableDirection === Flickable.AutoFlickDirection || + parent.flickableDirection === Flickable.HorizontalFlick || + parent.flickableDirection === Flickable.HorizontalAndVerticalFlick) && (parent.contentWidth > parent.width) Component.onCompleted: animateOpacity.restart() diff --git a/src/QmlControls/QGCFlickableVerticalIndicator.qml b/src/QmlControls/QGCFlickableVerticalIndicator.qml index 67f220d6bef7e9b452c6fc2108887a0cb2e8e81c..9ab426f437718f59c15982c385df03197983ce24 100644 --- a/src/QmlControls/QGCFlickableVerticalIndicator.qml +++ b/src/QmlControls/QGCFlickableVerticalIndicator.qml @@ -11,9 +11,9 @@ Rectangle { color: parent.indicatorColor visible: showIndicator - property bool showIndicator: (parent.flickableDirection == Flickable.AutoFlickDirection || - parent.flickableDirection == Flickable.VerticalFlick || - parent.flickableDirection == Flickable.HorizontalAndVerticalFlick) && + property bool showIndicator: (parent.flickableDirection === Flickable.AutoFlickDirection || + parent.flickableDirection === Flickable.VerticalFlick || + parent.flickableDirection === Flickable.HorizontalAndVerticalFlick) && (parent.contentHeight > parent.height) Component.onCompleted: animateOpacity.restart() diff --git a/src/QmlControls/QGCPipable.qml b/src/QmlControls/QGCPipable.qml index a15e22180837b25c3ae767b4fb6c829b476fe478..e832eda65969147491ec966b9eb4c51db1725da3 100644 --- a/src/QmlControls/QGCPipable.qml +++ b/src/QmlControls/QGCPipable.qml @@ -51,8 +51,8 @@ Item { anchors.right: parent.right height: ScreenTools.minTouchPixels width: height - property var initialX: 0 - property var initialWidth: 0 + property real initialX: 0 + property real initialWidth: 0 onClicked: { // TODO propagate @@ -98,7 +98,7 @@ Item { } // Resize pip window if necessary when main window is resized - property var pipLock: 2 + property int pipLock: 2 Connections { target: pip.parent diff --git a/src/QmlControls/QGCView.qml b/src/QmlControls/QGCView.qml index 1591822b8b57329369d28c5650a28a1a99cfb09b..b50ac571e77367df7375af4404b21f47676c0939 100644 --- a/src/QmlControls/QGCView.qml +++ b/src/QmlControls/QGCView.qml @@ -58,7 +58,7 @@ FactPanel { console.log("Error loading QGCViewDialogContainer.qml: ", dialogComponent.errorString()) return } - var dialogWidth = charWidth == showDialogFullWidth ? parent.width : ScreenTools.defaultFontPixelWidth * charWidth + var dialogWidth = charWidth === showDialogFullWidth ? parent.width : ScreenTools.defaultFontPixelWidth * charWidth var dialog = dialogComponent.createObject(_rootItem, { "anchors.fill": _rootItem, diff --git a/src/QmlControls/QGCViewDialog.qml b/src/QmlControls/QGCViewDialog.qml index 982b5fed748278d3c9180274a14a3a0b597a96d8..0c1e02b1c23ad98b26bc6d6daa8bc78a2b1b63e1 100644 --- a/src/QmlControls/QGCViewDialog.qml +++ b/src/QmlControls/QGCViewDialog.qml @@ -27,10 +27,10 @@ FactPanel { signal hideDialog Keys.onReleased: { - if (event.key == Qt.Key_Escape) { + if (event.key === Qt.Key_Escape) { reject() event.accepted = true - } else if (event.key == Qt.Key_Return || event.key == Qt.Key_Enter) { + } else if (event.key === Qt.Key_Return || event.key === Qt.Key_Enter) { accept() event.accepted = true } diff --git a/src/QmlControls/QmlTest.qml b/src/QmlControls/QmlTest.qml index 92193f776be0b0f52361f5bcc2252a0b721dbbc6..830352630c7fb9eb0635863da2858a78faeed40c 100644 --- a/src/QmlControls/QmlTest.qml +++ b/src/QmlControls/QmlTest.qml @@ -138,7 +138,7 @@ Rectangle { // Header row Loader { sourceComponent: rowHeader - property var text: "" + property string text: "" } Text { width: 80 @@ -172,7 +172,7 @@ Rectangle { // window Loader { sourceComponent: rowHeader - property var text: "window" + property string text: "window" } ClickableColor { property var palette: QGCPalette { colorGroupEnabled: false } @@ -204,7 +204,7 @@ Rectangle { // windowShade Loader { sourceComponent: rowHeader - property var text: "windowShade" + property string text: "windowShade" } ClickableColor { property var palette: QGCPalette { colorGroupEnabled: false } @@ -236,7 +236,7 @@ Rectangle { // windowShadeDark Loader { sourceComponent: rowHeader - property var text: "windowShadeDark" + property string text: "windowShadeDark" } ClickableColor { property var palette: QGCPalette { colorGroupEnabled: false } @@ -268,7 +268,7 @@ Rectangle { // text Loader { sourceComponent: rowHeader - property var text: "text" + property string text: "text" } ClickableColor { property var palette: QGCPalette { colorGroupEnabled: false } @@ -300,7 +300,7 @@ Rectangle { // button Loader { sourceComponent: rowHeader - property var text: "button" + property string text: "button" } ClickableColor { property var palette: QGCPalette { colorGroupEnabled: false } @@ -332,7 +332,7 @@ Rectangle { // buttonText Loader { sourceComponent: rowHeader - property var text: "buttonText" + property string text: "buttonText" } ClickableColor { property var palette: QGCPalette { colorGroupEnabled: false } @@ -364,7 +364,7 @@ Rectangle { // buttonHighlight Loader { sourceComponent: rowHeader - property var text: "buttonHighlight" + property string text: "buttonHighlight" } ClickableColor { property var palette: QGCPalette { colorGroupEnabled: false } @@ -396,7 +396,7 @@ Rectangle { // buttonHighlightText Loader { sourceComponent: rowHeader - property var text: "buttonHighlightText" + property string text: "buttonHighlightText" } ClickableColor { property var palette: QGCPalette { colorGroupEnabled: false } @@ -428,7 +428,7 @@ Rectangle { // primaryButton Loader { sourceComponent: rowHeader - property var text: "primaryButton" + property string text: "primaryButton" } ClickableColor { property var palette: QGCPalette { colorGroupEnabled: false } @@ -460,7 +460,7 @@ Rectangle { // primaryButtonText Loader { sourceComponent: rowHeader - property var text: "primaryButtonText" + property string text: "primaryButtonText" } ClickableColor { property var palette: QGCPalette { colorGroupEnabled: false } @@ -492,7 +492,7 @@ Rectangle { // textField Loader { sourceComponent: rowHeader - property var text: "textField" + property string text: "textField" } ClickableColor { property var palette: QGCPalette { colorGroupEnabled: false } @@ -524,7 +524,7 @@ Rectangle { // textFieldText Loader { sourceComponent: rowHeader - property var text: "textFieldText" + property string text: "textFieldText" } ClickableColor { property var palette: QGCPalette { colorGroupEnabled: false } @@ -556,7 +556,7 @@ Rectangle { // warningText Loader { sourceComponent: rowHeader - property var text: "warningText" + property string text: "warningText" } ClickableColor { property var palette: QGCPalette { colorGroupEnabled: false } @@ -588,7 +588,7 @@ Rectangle { // colorGreen Loader { sourceComponent: rowHeader - property var text: "colorGreen" + property string text: "colorGreen" } ClickableColor { property var palette: QGCPalette { colorGroupEnabled: false } @@ -620,7 +620,7 @@ Rectangle { // colorOrange Loader { sourceComponent: rowHeader - property var text: "colorOrange" + property string text: "colorOrange" } ClickableColor { property var palette: QGCPalette { colorGroupEnabled: false } @@ -652,7 +652,7 @@ Rectangle { // colorRed Loader { sourceComponent: rowHeader - property var text: "colorRed" + property string text: "colorRed" } ClickableColor { property var palette: QGCPalette { colorGroupEnabled: false } @@ -684,7 +684,7 @@ Rectangle { // colorGrey Loader { sourceComponent: rowHeader - property var text: "colorGrey" + property string text: "colorGrey" } ClickableColor { property var palette: QGCPalette { colorGroupEnabled: false } @@ -716,7 +716,7 @@ Rectangle { // colorBlue Loader { sourceComponent: rowHeader - property var text: "colorBlue" + property string text: "colorBlue" } ClickableColor { property var palette: QGCPalette { colorGroupEnabled: false } @@ -748,7 +748,7 @@ Rectangle { // alertBackground Loader { sourceComponent: rowHeader - property var text: "alertBackground" + property string text: "alertBackground" } ClickableColor { property var palette: QGCPalette { colorGroupEnabled: false } @@ -780,7 +780,7 @@ Rectangle { // alertBorder Loader { sourceComponent: rowHeader - property var text: "alertBorder" + property string text: "alertBorder" } ClickableColor { property var palette: QGCPalette { colorGroupEnabled: false } @@ -812,7 +812,7 @@ Rectangle { // alertText Loader { sourceComponent: rowHeader - property var text: "alertText" + property string text: "alertText" } ClickableColor { property var palette: QGCPalette { colorGroupEnabled: false } @@ -868,7 +868,7 @@ Rectangle { // Header row Loader { sourceComponent: ctlRowHeader - property var text: "" + property string text: "" } Text { width: 100 @@ -888,7 +888,7 @@ Rectangle { // QGCLabel Loader { sourceComponent: ctlRowHeader - property var text: "QGCLabel" + property string text: "QGCLabel" } QGCLabel { width: 100 @@ -905,7 +905,7 @@ Rectangle { // QGCButton Loader { sourceComponent: ctlRowHeader - property var text: "QGCButton" + property string text: "QGCButton" } QGCButton { width: 100 @@ -922,7 +922,7 @@ Rectangle { // QGCButton - primary Loader { sourceComponent: ctlRowHeader - property var text: "QGCButton(primary)" + property string text: "QGCButton(primary)" } QGCButton { width: 100 @@ -941,7 +941,7 @@ Rectangle { // QGCButton - menu Loader { sourceComponent: ctlRowHeader - property var text: "QGCButton(menu)" + property string text: "QGCButton(menu)" } Menu { id: buttonMenu @@ -972,7 +972,7 @@ Rectangle { // QGCRadioButton Loader { sourceComponent: ctlRowHeader - property var text: "QGCRadioButton" + property string text: "QGCRadioButton" } QGCRadioButton { width: 100 @@ -989,7 +989,7 @@ Rectangle { // QGCCheckBox Loader { sourceComponent: ctlRowHeader - property var text: "QGCCheckBox" + property string text: "QGCCheckBox" } QGCCheckBox { width: 100 @@ -1006,7 +1006,7 @@ Rectangle { // QGCTextField Loader { sourceComponent: ctlRowHeader - property var text: "QGCTextField" + property string text: "QGCTextField" } QGCTextField { width: 100 @@ -1023,7 +1023,7 @@ Rectangle { // QGCComboBox Loader { sourceComponent: ctlRowHeader - property var text: "QGCComboBox" + property string text: "QGCComboBox" } QGCComboBox { width: 100 @@ -1040,7 +1040,7 @@ Rectangle { // SubMenuButton Loader { sourceComponent: ctlRowHeader - property var text: "SubMenuButton" + property string text: "SubMenuButton" } SubMenuButton { width: 100 @@ -1079,15 +1079,15 @@ Rectangle { spacing: 10 anchors.horizontalCenter: parent.horizontalCenter Loader { - property var backgroundColor: qgcPal.window + property color backgroundColor: qgcPal.window sourceComponent: arbBox } Loader { - property var backgroundColor: qgcPal.windowShade + property color backgroundColor: qgcPal.windowShade sourceComponent: arbBox } Loader { - property var backgroundColor: qgcPal.windowShadeDark + property color backgroundColor: qgcPal.windowShadeDark sourceComponent: arbBox } } diff --git a/src/VehicleSetup/FirmwareUpgrade.qml b/src/VehicleSetup/FirmwareUpgrade.qml index 35a4fdf8816a8409515893cc17f0c5f242d40da2..646bfcce3218d25381242ea58b7e8234fb56ab27 100644 --- a/src/VehicleSetup/FirmwareUpgrade.qml +++ b/src/VehicleSetup/FirmwareUpgrade.qml @@ -56,7 +56,7 @@ SetupPage { readonly property int _defaultFimwareTypeAPM: 3 property var _defaultFirmwareFact: QGroundControl.settingsManager.appSettings.defaultFirmwareType - property bool _defaultFirmwareIsPX4: _defaultFirmwareFact.rawValue == _defaultFimwareTypePX4 + property bool _defaultFirmwareIsPX4: _defaultFirmwareFact.rawValue === _defaultFimwareTypePX4 property string firmwareWarningMessage property bool controllerCompleted: false @@ -354,13 +354,13 @@ SetupPage { onActivated: { controller.selectedFirmwareType = index - if (model.get(index).firmwareType == FirmwareUpgradeController.BetaFirmware) { + if (model.get(index).firmwareType === FirmwareUpgradeController.BetaFirmware) { firmwareVersionWarningLabel.visible = true firmwareVersionWarningLabel.text = qsTr("WARNING: BETA FIRMWARE. ") + qsTr("This firmware version is ONLY intended for beta testers. ") + qsTr("Although it has received FLIGHT TESTING, it represents actively changed code. ") + qsTr("Do NOT use for normal operation.") - } else if (model.get(index).firmwareType == FirmwareUpgradeController.DeveloperFirmware) { + } else if (model.get(index).firmwareType === FirmwareUpgradeController.DeveloperFirmware) { firmwareVersionWarningLabel.visible = true firmwareVersionWarningLabel.text = qsTr("WARNING: CONTINUOUS BUILD FIRMWARE. ") + qsTr("This firmware has NOT BEEN FLIGHT TESTED. ") + diff --git a/src/VehicleSetup/VehicleSummary.qml b/src/VehicleSetup/VehicleSummary.qml index cb4a7dc2ff12ecedb00cb1905f3bc24646a9a83d..60286d44d063d3ec50cf9030b7a23a83ef755e3b 100644 --- a/src/VehicleSetup/VehicleSummary.qml +++ b/src/VehicleSetup/VehicleSummary.qml @@ -128,12 +128,12 @@ Rectangle { height: width radius: width / 2 color: modelData.setupComplete ? "#00d932" : "red" - visible: modelData.requiresSetup && modelData.setupSource != "" + visible: modelData.requiresSetup && modelData.setupSource !== "" } onClicked : { console.log(modelData.setupSource) - if (modelData.setupSource != "") { + if (modelData.setupSource !== "") { setupView.showVehicleComponentPanel(modelData) } } diff --git a/src/ViewWidgets/ViewWidget.qml b/src/ViewWidgets/ViewWidget.qml index 04c0c2f14308a63ade1b35f850e717155a8c38a2..0eef437883e717a412cce3a44f84dd1ad2ffde01 100644 --- a/src/ViewWidgets/ViewWidget.qml +++ b/src/ViewWidgets/ViewWidget.qml @@ -2,8 +2,10 @@ import QtQuick 2.3 import QtQuick.Controls 1.2 import QtQuick.Controls.Styles 1.4 -import QGroundControl.Palette 1.0 -import QGroundControl.Controllers 1.0 +import QGroundControl 1.0 +import QGroundControl.Controls 1.0 +import QGroundControl.Controllers 1.0 +import QGroundControl.Palette 1.0 Rectangle { property Component connectedComponent: __componentConnected