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

Fix missing missionItem property set

QGC4.4
DonLakeFlyer 5 years ago
parent
7146e5fe44
commit
ed9e7e271c
1 changed files with 46 additions and 44 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 90
      src/PlanView/SurveyItemEditor.qml

90
src/PlanView/SurveyItemEditor.qml
Unescape View File

@ -27,23 +27,24 @@ Rectangle { @@ -27,23 +27,24 @@ Rectangle {
property real _margin: ScreenTools.defaultFontPixelWidth / 2
property real _fieldWidth: ScreenTools.defaultFontPixelWidth * 10.5
property var _vehicle: QGroundControl.multiVehicleManager.activeVehicle ? QGroundControl.multiVehicleManager.activeVehicle : QGroundControl.multiVehicleManager.offlineEditingVehicle
property real _cameraMinTriggerInterval: missionItem.cameraCalc.minTriggerInterval.rawValue
property real _cameraMinTriggerInterval: _missionItem.cameraCalc.minTriggerInterval.rawValue
property bool _polygonDone: false
property string _doneAdjusting: qsTr("Done")
property bool _presetsAvailable: missionItem.presetNames.length !== 0
property var _missionItem: missionItem
property bool _presetsAvailable: _missionItem.presetNames.length !== 0
function polygonCaptureStarted() {
missionItem.clearPolygon()
_missionItem.clearPolygon()
}
function polygonCaptureFinished(coordinates) {
for (var i=0; i<coordinates.length; i++) {
missionItem.addPolygonCoordinate(coordinates[i])
_missionItem.addPolygonCoordinate(coordinates[i])
}
}
function polygonAdjustVertex(vertexIndex, vertexCoordinate) {
missionItem.adjustPolygonCoordinate(vertexIndex, vertexCoordinate)
_missionItem.adjustPolygonCoordinate(vertexIndex, vertexCoordinate)
}
function polygonAdjustStarted() { }
@ -63,7 +64,7 @@ Rectangle { @@ -63,7 +64,7 @@ Rectangle {
anchors.left: parent.left
anchors.right: parent.right
spacing: _margin
visible: !missionItem.surveyAreaPolygon.isValid || missionItem.wizardMode
visible: !_missionItem.surveyAreaPolygon.isValid || _missionItem.wizardMode
ColumnLayout {
Layout.fillWidth: true
@ -104,16 +105,16 @@ Rectangle { @@ -104,16 +105,16 @@ Rectangle {
text: qsTr("WARNING: Photo interval is below minimum interval (%1 secs) supported by camera.").arg(_cameraMinTriggerInterval.toFixed(1))
wrapMode: Text.WordWrap
color: qgcPal.warningText
visible: missionItem.cameraShots > 0 && _cameraMinTriggerInterval !== 0 && _cameraMinTriggerInterval > missionItem.timeBetweenShots
visible: _missionItem.cameraShots > 0 && _cameraMinTriggerInterval !== 0 && _cameraMinTriggerInterval > _missionItem.timeBetweenShots
}
CameraCalcGrid {
cameraCalc: missionItem.cameraCalc
cameraCalc: _missionItem.cameraCalc
vehicleFlightIsFrontal: true
distanceToSurfaceLabel: qsTr("Altitude")
distanceToSurfaceAltitudeMode: missionItem.followTerrain ?
distanceToSurfaceAltitudeMode: _missionItem.followTerrain ?
QGroundControl.AltitudeModeAboveTerrain :
(missionItem.cameraCalc.distanceToSurfaceRelative ? QGroundControl.AltitudeModeRelative : QGroundControl.AltitudeModeAbsolute)
(_missionItem.cameraCalc.distanceToSurfaceRelative ? QGroundControl.AltitudeModeRelative : QGroundControl.AltitudeModeAbsolute)
frontalDistanceLabel: qsTr("Trigger Dist")
sideDistanceLabel: qsTr("Spacing")
}
@ -135,9 +136,9 @@ Rectangle { @@ -135,9 +136,9 @@ Rectangle {
QGCLabel { text: qsTr("Angle") }
FactTextField {
fact: missionItem.gridAngle
fact: _missionItem.gridAngle
Layout.fillWidth: true
onUpdated: angleSlider.value = missionItem.gridAngle.value
onUpdated: angleSlider.value = _missionItem.gridAngle.value
}
QGCSlider {
@ -149,8 +150,8 @@ Rectangle { @@ -149,8 +150,8 @@ Rectangle {
Layout.fillWidth: true
Layout.columnSpan: 2
Layout.preferredHeight: ScreenTools.defaultFontPixelHeight * 1.5
onValueChanged: missionItem.gridAngle.value = value
Component.onCompleted: value = missionItem.gridAngle.value
onValueChanged: _missionItem.gridAngle.value = value
Component.onCompleted: value = _missionItem.gridAngle.value
updateValueWhileDragging: true
}
@ -158,14 +159,14 @@ Rectangle { @@ -158,14 +159,14 @@ Rectangle {
text: qsTr("Turnaround dist")
}
FactTextField {
fact: missionItem.turnAroundDistance
fact: _missionItem.turnAroundDistance
Layout.fillWidth: true
}
}
QGCButton {
text: qsTr("Rotate Entry Point")
onClicked: missionItem.rotateEntryPoint();
onClicked: _missionItem.rotateEntryPoint();
}
ColumnLayout {
@ -180,40 +181,40 @@ Rectangle { @@ -180,40 +181,40 @@ Rectangle {
model: [
{
text: qsTr("Hover and capture image"),
fact: missionItem.hoverAndCapture,
enabled: !missionItem.followTerrain,
visible: missionItem.hoverAndCaptureAllowed
fact: _missionItem.hoverAndCapture,
enabled: !_missionItem.followTerrain,
visible: _missionItem.hoverAndCaptureAllowed
},
{
text: qsTr("Refly at 90 deg offset"),
fact: missionItem.refly90Degrees,
enabled: !missionItem.followTerrain,
fact: _missionItem.refly90Degrees,
enabled: !_missionItem.followTerrain,
visible: true
},
{
text: qsTr("Images in turnarounds"),
fact: missionItem.cameraTriggerInTurnAround,
enabled: missionItem.hoverAndCaptureAllowed ? !missionItem.hoverAndCapture.rawValue : true,
fact: _missionItem.cameraTriggerInTurnAround,
enabled: _missionItem.hoverAndCaptureAllowed ? !_missionItem.hoverAndCapture.rawValue : true,
visible: true
},
{
text: qsTr("Fly alternate transects"),
fact: missionItem.flyAlternateTransects,
fact: _missionItem.flyAlternateTransects,
enabled: true,
visible: _vehicle ? (_vehicle.fixedWing || _vehicle.vtol) : false
},
{
text: qsTr("Relative altitude"),
enabled: missionItem.cameraCalc.isManualCamera && !missionItem.followTerrain,
visible: QGroundControl.corePlugin.options.showMissionAbsoluteAltitude || (!missionItem.cameraCalc.distanceToSurfaceRelative && !missionItem.followTerrain),
checked: missionItem.cameraCalc.distanceToSurfaceRelative
enabled: _missionItem.cameraCalc.isManualCamera && !_missionItem.followTerrain,
visible: QGroundControl.corePlugin.options.showMissionAbsoluteAltitude || (!_missionItem.cameraCalc.distanceToSurfaceRelative && !_missionItem.followTerrain),
checked: _missionItem.cameraCalc.distanceToSurfaceRelative
}
]
onItemClicked: {
if (index == 4) {
missionItem.cameraCalc.distanceToSurfaceRelative = !missionItem.cameraCalc.distanceToSurfaceRelative
console.log(missionItem.cameraCalc.distanceToSurfaceRelative)
_missionItem.cameraCalc.distanceToSurfaceRelative = !_missionItem.cameraCalc.distanceToSurfaceRelative
console.log(_missionItem.cameraCalc.distanceToSurfaceRelative)
}
}
}
@ -241,7 +242,7 @@ Rectangle { @@ -241,7 +242,7 @@ Rectangle {
visible: tabBar.currentIndex === 1
CameraCalcCamera {
cameraCalc: missionItem.cameraCalc
cameraCalc: _missionItem.cameraCalc
}
} // Camera Column
@ -251,6 +252,7 @@ Rectangle { @@ -251,6 +252,7 @@ Rectangle {
anchors.right: parent.right
spacing: _margin
visible: tabBar.currentIndex === 2
missionItem: _missionItem
}
// Presets Tab
@ -269,7 +271,7 @@ Rectangle { @@ -269,7 +271,7 @@ Rectangle {
QGCComboBox {
id: presetCombo
Layout.fillWidth: true
model: missionItem.presetNames
model: _missionItem.presetNames
}
RowLayout {
@ -278,14 +280,14 @@ Rectangle { @@ -278,14 +280,14 @@ Rectangle {
QGCButton {
Layout.fillWidth: true
text: qsTr("Apply Preset")
enabled: missionItem.presetNames.length != 0
onClicked: missionItem.loadPreset(presetCombo.textAt(presetCombo.currentIndex))
enabled: _missionItem.presetNames.length != 0
onClicked: _missionItem.loadPreset(presetCombo.textAt(presetCombo.currentIndex))
}
QGCButton {
Layout.fillWidth: true
text: qsTr("Delete Preset")
enabled: missionItem.presetNames.length != 0
enabled: _missionItem.presetNames.length != 0
onClicked: mainWindow.showComponentDialog(deletePresetMessage, qsTr("Delete Preset"), mainWindow.showDialogDefaultWidth, StandardButton.Yes | StandardButton.No)
Component {
@ -294,7 +296,7 @@ Rectangle { @@ -294,7 +296,7 @@ Rectangle {
message: qsTr("Are you sure you want to delete '%1' preset?").arg(presetName)
property string presetName: presetCombo.textAt(presetCombo.currentIndex)
function accept() {
missionItem.deletePreset(presetName)
_missionItem.deletePreset(presetName)
hideDialog()
}
}
@ -326,9 +328,9 @@ Rectangle { @@ -326,9 +328,9 @@ Rectangle {
QGCLabel { text: qsTr("Angle") }
FactTextField {
fact: missionItem.gridAngle
fact: _missionItem.gridAngle
Layout.fillWidth: true
onUpdated: presetsAngleSlider.value = missionItem.gridAngle.value
onUpdated: presetsAngleSlider.value = _missionItem.gridAngle.value
}
QGCSlider {
@ -340,8 +342,8 @@ Rectangle { @@ -340,8 +342,8 @@ Rectangle {
Layout.fillWidth: true
Layout.columnSpan: 2
Layout.preferredHeight: ScreenTools.defaultFontPixelHeight * 1.5
onValueChanged: missionItem.gridAngle.value = value
Component.onCompleted: value = missionItem.gridAngle.value
onValueChanged: _missionItem.gridAngle.value = value
Component.onCompleted: value = _missionItem.gridAngle.value
updateValueWhileDragging: true
}
@ -349,7 +351,7 @@ Rectangle { @@ -349,7 +351,7 @@ Rectangle {
Layout.columnSpan: 2
Layout.fillWidth: true
text: qsTr("Rotate Entry Point")
onClicked: missionItem.rotateEntryPoint();
onClicked: _missionItem.rotateEntryPoint();
}
}
@ -372,7 +374,7 @@ Rectangle { @@ -372,7 +374,7 @@ Rectangle {
QGCViewDialog {
function accept() {
if (presetNameField.text != "") {
missionItem.savePreset(presetNameField.text)
_missionItem.savePreset(presetNameField.text)
hideDialog()
}
}
@ -407,9 +409,9 @@ Rectangle { @@ -407,9 +409,9 @@ Rectangle {
selectExisting: true
onAcceptedForLoad: {
missionItem.surveyAreaPolygon.loadKMLOrSHPFile(file)
missionItem.resetState = false
//editorMap.mapFitFunctions.fitMapViewportToMissionItems()
_missionItem.surveyAreaPolygon.loadKMLOrSHPFile(file)
_missionItem.resetState = false
//editorMap.mapFitFunctions.fitMapViewportTo_missionItems()
close()
}
}

Write Preview
Loading…
Cancel
Save