Browse Source

More usability work

QGC4.4
DonLakeFlyer 8 years ago
parent
commit
09d70c0bd0
  1. 4
      src/MissionManager/MissionSettingsItem.h
  2. 30
      src/PlanView/MissionSettingsEditor.qml

4
src/MissionManager/MissionSettingsItem.h

@ -63,8 +63,8 @@ public:
bool isStandaloneCoordinate (void) const final { return false; } bool isStandaloneCoordinate (void) const final { return false; }
bool specifiesCoordinate (void) const final; bool specifiesCoordinate (void) const final;
bool specifiesAltitudeOnly (void) const final { return false; } bool specifiesAltitudeOnly (void) const final { return false; }
QString commandDescription (void) const final { return "Mission Settings"; } QString commandDescription (void) const final { return "Mission Start"; }
QString commandName (void) const final { return "Mission Settings"; } QString commandName (void) const final { return "Mission Start"; }
QString abbreviation (void) const final { return "H"; } QString abbreviation (void) const final { return "H"; }
QGeoCoordinate coordinate (void) const final { return _plannedHomePositionCoordinate; } QGeoCoordinate coordinate (void) const final { return _plannedHomePositionCoordinate; }
QGeoCoordinate exitCoordinate (void) const final { return _plannedHomePositionCoordinate; } QGeoCoordinate exitCoordinate (void) const final { return _plannedHomePositionCoordinate; }

30
src/PlanView/MissionSettingsEditor.qml

@ -235,11 +235,25 @@ Rectangle {
} // GridLayout } // GridLayout
} }
CameraSection {
id: cameraSection
checked: true
}
QGCLabel {
anchors.left: parent.left
anchors.right: parent.right
text: qsTr("Above camera commands will take affect immediately upon mission start.")
wrapMode: Text.WordWrap
horizontalAlignment: Text.AlignHCenter
font.pointSize: ScreenTools.smallFontPointSize
visible: cameraSection.checked
}
SectionHeader { SectionHeader {
id: missionEndHeader id: missionEndHeader
text: qsTr("Mission End") text: qsTr("Mission End")
checked: true checked: true
showSpacer: false
} }
Column { Column {
@ -254,20 +268,6 @@ Rectangle {
} }
} }
CameraSection {
id: cameraSection
checked: missionItem.cameraSection.settingsSpecified
}
QGCLabel {
anchors.left: parent.left
anchors.right: parent.right
text: qsTr("Above camera commands will take affect immediately upon mission start.")
wrapMode: Text.WordWrap
horizontalAlignment: Text.AlignHCenter
font.pointSize: ScreenTools.smallFontPointSize
visible: cameraSection.checked
}
} // Column } // Column
} // Deferred loader } // Deferred loader
} // Rectangle } // Rectangle

Loading…
Cancel
Save