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

Small visual tweaks and fixups for patterns

QGC4.4
DoinLakeFlyer 5 years ago
parent
c38c26ed83
commit
e6e812d67d
10 changed files with 34 additions and 54 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. 13
      src/FactSystem/FactControls/AltitudeFactTextField.qml
  2. 2
      src/MissionManager/CameraCalc.cc
  3. 7
      src/MissionManager/CameraCalc.h
  4. 4
      src/MissionManager/MissionSettingsItem.cc
  5. 2
      src/MissionManager/TransectStyle.SettingsGroup.json
  6. 5
      src/PlanView/CameraCalcCamera.qml
  7. 20
      src/PlanView/CameraCalcGrid.qml
  8. 9
      src/PlanView/CorridorScanEditor.qml
  9. 7
      src/PlanView/StructureScanEditor.qml
  10. 19
      src/PlanView/SurveyItemEditor.qml

13
src/FactSystem/FactControls/AltitudeFactTextField.qml
Unescape View File

@ -16,12 +16,13 @@ import QGroundControl.Controls 1.0 @@ -16,12 +16,13 @@ import QGroundControl.Controls 1.0
import QGroundControl.ScreenTools 1.0
FactTextField {
unitsLabel: fact ? fact.units : ""
extraUnitsLabel: fact ? _altitudeModeExtraUnits : ""
showUnits: true
showHelp: true
unitsLabel: fact ? fact.units : ""
extraUnitsLabel: fact ? _altitudeModeExtraUnits : ""
showUnits: true
showHelp: true
property int altitudeMode: QGroundControl.AltitudeModeNone
property int altitudeMode: QGroundControl.AltitudeModeNone
property bool showAboveTerrainWarning: true
readonly property string _altModeNoneExtraUnits: ""
readonly property string _altModeRelativeExtraUnits: qsTr("(Rel)")
@ -44,7 +45,7 @@ FactTextField { @@ -44,7 +45,7 @@ FactTextField {
_altitudeModeExtraUnits = _altModeAbsoluteExtraUnits
} else if (altitudeMode === QGroundControl.AltitudeModeAboveTerrain) {
_altitudeModeExtraUnits = _altModeAboveTerrainExtraUnits
if (!_aboveTerrainWarning.rawValue) {
if (!_aboveTerrainWarning.rawValue && showAboveTerrainWarning) {
mainWindow.showComponentDialog(aboveTerrainWarning, qsTr("Warning"), mainWindow.showDialogDefaultWidth, StandardButton.Ok)
}
} else if (missionItem.altitudeMode === QGroundControl.AltitudeModeTerrainFrame) {

2
src/MissionManager/CameraCalc.cc
Unescape View File

@ -29,7 +29,7 @@ const char* CameraCalc::_jsonCameraSpecTypeKey = "CameraSpecType"; @@ -29,7 +29,7 @@ const char* CameraCalc::_jsonCameraSpecTypeKey = "CameraSpecType";
CameraCalc::CameraCalc(PlanMasterController* masterController, const QString& settingsGroup, QObject* parent)
: CameraSpec (settingsGroup, parent)
, _dirty (masterController)
, _dirty (false)
, _disableRecalc (false)
, _distanceToSurfaceRelative (true)
, _metaDataMap (FactMetaData::createMapFromJsonFile(QStringLiteral(":/json/CameraCalc.FactMetaData.json"), this))

7
src/MissionManager/CameraCalc.h
Unescape View File

@ -33,6 +33,13 @@ public: @@ -33,6 +33,13 @@ public:
Q_PROPERTY(Fact* sideOverlap READ sideOverlap CONSTANT)
Q_PROPERTY(Fact* adjustedFootprintSide READ adjustedFootprintSide CONSTANT) ///< Side footprint adjusted down for overlap
Q_PROPERTY(Fact* adjustedFootprintFrontal READ adjustedFootprintFrontal CONSTANT) ///< Frontal footprint adjusted down for overlap
// When we are creating a manual grid we still use CameraCalc to store the manual grid information. It's a bastardization of what
// CameraCalc is meant for but it greatly simplifies code and persistance of manual grids.
// grid altitude - distanceToSurface
// grid altitude mode - distanceToSurfaceRelative
// trigger distance - adjustedFootprintFrontal
// transect spacing - adjustedFootprintSide
Q_PROPERTY(bool distanceToSurfaceRelative READ distanceToSurfaceRelative WRITE setDistanceToSurfaceRelative NOTIFY distanceToSurfaceRelativeChanged)
// The following values are calculated from the camera properties

4
src/MissionManager/MissionSettingsItem.cc
Unescape View File

@ -190,7 +190,9 @@ void MissionSettingsItem::_setCoordinateWorker(const QGeoCoordinate& coordinate) @@ -190,7 +190,9 @@ void MissionSettingsItem::_setCoordinateWorker(const QGeoCoordinate& coordinate)
_plannedHomePositionCoordinate = coordinate;
emit coordinateChanged(coordinate);
emit exitCoordinateChanged(coordinate);
_plannedHomePositionAltitudeFact.setRawValue(coordinate.altitude());
if (_plannedHomePositionFromVehicle) {
_plannedHomePositionAltitudeFact.setRawValue(coordinate.altitude());
}
}
}

2
src/MissionManager/TransectStyle.SettingsGroup.json
Unescape View File

@ -37,7 +37,7 @@ @@ -37,7 +37,7 @@
},
{
"name": "TerrainAdjustTolerance",
"shortDescription": "If adjacent terrain waypoints are within this tolerence they will be removed.",
"shortDescription": "Additional waypoints within the transect will be added if the terrain altitude difference grows larger than this tolerance.",
"type": "double",
"decimalPlaces": 2,
"min": 0,

5
src/PlanView/CameraCalcCamera.qml
Unescape View File

@ -15,11 +15,6 @@ Column { @@ -15,11 +15,6 @@ Column {
spacing: _margin
property var cameraCalc
property bool vehicleFlightIsFrontal: true
property string distanceToSurfaceLabel
property int distanceToSurfaceAltitudeMode: QGroundControl.AltitudeModeNone
property string frontalDistanceLabel
property string sideDistanceLabel
property real _margin: ScreenTools.defaultFontPixelWidth / 2
property string _cameraName: cameraCalc.cameraName.value

20
src/PlanView/CameraCalcGrid.qml
Unescape View File

@ -87,21 +87,24 @@ Column { @@ -87,21 +87,24 @@ Column {
QGCRadioButton {
id: fixedDistanceRadio
leftPadding: 0
text: distanceToSurfaceLabel
checked: !!cameraCalc.valueSetIsDistance.value
onClicked: cameraCalc.valueSetIsDistance.value = 1
}
AltitudeFactTextField {
fact: cameraCalc.distanceToSurface
altitudeMode: distanceToSurfaceAltitudeMode
enabled: fixedDistanceRadio.checked
Layout.fillWidth: true
fact: cameraCalc.distanceToSurface
altitudeMode: distanceToSurfaceAltitudeMode
showAboveTerrainWarning: false
enabled: fixedDistanceRadio.checked
Layout.fillWidth: true
}
QGCRadioButton {
id: fixedImageDensityRadio
text: qsTr("Ground Res")
leftPadding: 0
text: qsTr("Grnd Res")
checked: !cameraCalc.valueSetIsDistance.value
onClicked: cameraCalc.valueSetIsDistance.value = 0
}
@ -125,9 +128,10 @@ Column { @@ -125,9 +128,10 @@ Column {
QGCLabel { text: distanceToSurfaceLabel }
AltitudeFactTextField {
fact: cameraCalc.distanceToSurface
altitudeMode: distanceToSurfaceAltitudeMode
Layout.fillWidth: true
fact: cameraCalc.distanceToSurface
altitudeMode: distanceToSurfaceAltitudeMode
showAboveTerrainWarning: false
Layout.fillWidth: true
}
QGCLabel { text: frontalDistanceLabel }

9
src/PlanView/CorridorScanEditor.qml
Unescape View File

@ -252,14 +252,7 @@ Rectangle { @@ -252,14 +252,7 @@ Rectangle {
visible: tabBar.currentIndex == 1
CameraCalcCamera {
cameraCalc: missionItem.cameraCalc
vehicleFlightIsFrontal: true
distanceToSurfaceLabel: qsTr("Altitude")
distanceToSurfaceAltitudeMode: missionItem.followTerrain ?
QGroundControl.AltitudeModeAboveTerrain :
missionItem.cameraCalc.distanceToSurfaceRelative
frontalDistanceLabel: qsTr("Trigger Dist")
sideDistanceLabel: qsTr("Spacing")
cameraCalc: missionItem.cameraCalc
}
}
}

7
src/PlanView/StructureScanEditor.qml
Unescape View File

@ -247,12 +247,7 @@ Rectangle { @@ -247,12 +247,7 @@ Rectangle {
visible: tabBar.currentIndex == 1
CameraCalcCamera {
cameraCalc: missionItem.cameraCalc
vehicleFlightIsFrontal: false
distanceToSurfaceLabel: qsTr("Scan Distance")
distanceToSurfaceAltitudeMode: QGroundControl.AltitudeModeNone
frontalDistanceLabel: qsTr("Layer Height")
sideDistanceLabel: qsTr("Trigger Distance")
cameraCalc: missionItem.cameraCalc
}
}
}

19
src/PlanView/SurveyItemEditor.qml
Unescape View File

@ -280,16 +280,6 @@ Rectangle { @@ -280,16 +280,6 @@ Rectangle {
spacing: _margin
visible: transectsHeader.checked
/*
Temporarily removed due to bug https://github.com/mavlink/qgroundcontrol/issues/7005
FactCheckBox {
text: qsTr("Split concave polygons")
fact: _splitConcave
visible: _splitConcave.visible
property Fact _splitConcave: missionItem.splitConcavePolygons
}
*/
QGCOptionsComboBox {
Layout.fillWidth: true
@ -405,14 +395,7 @@ Rectangle { @@ -405,14 +395,7 @@ Rectangle {
visible: tabBar.currentIndex == 1
CameraCalcCamera {
cameraCalc: missionItem.cameraCalc
vehicleFlightIsFrontal: true
distanceToSurfaceLabel: qsTr("Altitude")
distanceToSurfaceAltitudeMode: missionItem.followTerrain ?
QGroundControl.AltitudeModeAboveTerrain :
missionItem.cameraCalc.distanceToSurfaceRelative
frontalDistanceLabel: qsTr("Trigger Dist")
sideDistanceLabel: qsTr("Spacing")
cameraCalc: missionItem.cameraCalc
}
} // Camera Column

Write Preview
Loading…
Cancel
Save