Skip to content

Q
qgroundcontrol
Unverified Commit 4d97eebf authored by Don Gagne's avatar Don Gagne Committed by GitHub
Browse files
Options

Merge pull request #6531 from DonLakeFlyer/CameraMinTriggerInterval 

cameraMinTriggerInterval now comes from CameraCalc
parents 0746b628 3fed439c
Hide whitespace changes
Inline Side-by-side
Showing with 19 additions and 27 deletions
src/MissionManager/StructureScanComplexItem.cc
View file @ 4d97eebf
...@@ -40,7 +40,6 @@ StructureScanComplexItem::StructureScanComplexItem(Vehicle* vehicle, bool flyVie ...@@ -40,7 +40,6 @@ StructureScanComplexItem::StructureScanComplexItem(Vehicle* vehicle, bool flyVie
, _ignoreRecalc (false) , _ignoreRecalc (false)
, _scanDistance (0.0) , _scanDistance (0.0)
, _cameraShots (0) , _cameraShots (0)
, _cameraMinTriggerInterval (0)
, _cameraCalc (vehicle, settingsGroup) , _cameraCalc (vehicle, settingsGroup)
, _altitudeFact (settingsGroup, _metaDataMap[altitudeName]) , _altitudeFact (settingsGroup, _metaDataMap[altitudeName])
, _structureHeightFact (settingsGroup, _metaDataMap[structureHeightName]) , _structureHeightFact (settingsGroup, _metaDataMap[structureHeightName])
......
src/MissionManager/StructureScanComplexItem.h
View file @ 4d97eebf
...@@ -34,7 +34,6 @@ public: ...@@ -34,7 +34,6 @@ public:
Q_PROPERTY(bool altitudeRelative READ altitudeRelative WRITE setAltitudeRelative NOTIFY altitudeRelativeChanged) Q_PROPERTY(bool altitudeRelative READ altitudeRelative WRITE setAltitudeRelative NOTIFY altitudeRelativeChanged)
Q_PROPERTY(int cameraShots READ cameraShots NOTIFY cameraShotsChanged) Q_PROPERTY(int cameraShots READ cameraShots NOTIFY cameraShotsChanged)
Q_PROPERTY(double timeBetweenShots READ timeBetweenShots NOTIFY timeBetweenShotsChanged) Q_PROPERTY(double timeBetweenShots READ timeBetweenShots NOTIFY timeBetweenShotsChanged)
Q_PROPERTY(double cameraMinTriggerInterval MEMBER _cameraMinTriggerInterval NOTIFY cameraMinTriggerIntervalChanged)
Q_PROPERTY(QGCMapPolygon* structurePolygon READ structurePolygon CONSTANT) Q_PROPERTY(QGCMapPolygon* structurePolygon READ structurePolygon CONSTANT)
Q_PROPERTY(QGCMapPolygon* flightPolygon READ flightPolygon CONSTANT) Q_PROPERTY(QGCMapPolygon* flightPolygon READ flightPolygon CONSTANT)
...@@ -100,7 +99,6 @@ public: ...@@ -100,7 +99,6 @@ public:
signals: signals:
void cameraShotsChanged (int cameraShots); void cameraShotsChanged (int cameraShots);
void timeBetweenShotsChanged (void); void timeBetweenShotsChanged (void);
void cameraMinTriggerIntervalChanged(double cameraMinTriggerInterval);
void altitudeRelativeChanged (bool altitudeRelative); void altitudeRelativeChanged (bool altitudeRelative);
private slots: private slots:
...@@ -133,7 +131,6 @@ private: ...@@ -133,7 +131,6 @@ private:
double _scanDistance; double _scanDistance;
int _cameraShots; int _cameraShots;
double _timeBetweenShots; double _timeBetweenShots;
double _cameraMinTriggerInterval;
double _cruiseSpeed; double _cruiseSpeed;
CameraCalc _cameraCalc; CameraCalc _cameraCalc;
......
src/MissionManager/TransectStyleComplexItem.cc
View file @ 4d97eebf
...@@ -46,7 +46,6 @@ TransectStyleComplexItem::TransectStyleComplexItem(Vehicle* vehicle, bool flyVie ...@@ -46,7 +46,6 @@ TransectStyleComplexItem::TransectStyleComplexItem(Vehicle* vehicle, bool flyVie
, _ignoreRecalc (false) , _ignoreRecalc (false)
, _complexDistance (0) , _complexDistance (0)
, _cameraShots (0) , _cameraShots (0)
, _cameraMinTriggerInterval (0)
, _cameraCalc (vehicle, settingsGroup) , _cameraCalc (vehicle, settingsGroup)
, _followTerrain (false) , _followTerrain (false)
, _loadedMissionItemsParent (NULL) , _loadedMissionItemsParent (NULL)
......
src/MissionManager/TransectStyleComplexItem.h
View file @ 4d97eebf
...@@ -37,7 +37,6 @@ public: ...@@ -37,7 +37,6 @@ public:
Q_PROPERTY(int cameraShots READ cameraShots NOTIFY cameraShotsChanged) Q_PROPERTY(int cameraShots READ cameraShots NOTIFY cameraShotsChanged)
Q_PROPERTY(double timeBetweenShots READ timeBetweenShots NOTIFY timeBetweenShotsChanged) Q_PROPERTY(double timeBetweenShots READ timeBetweenShots NOTIFY timeBetweenShotsChanged)
Q_PROPERTY(double coveredArea READ coveredArea NOTIFY coveredAreaChanged) Q_PROPERTY(double coveredArea READ coveredArea NOTIFY coveredAreaChanged)
Q_PROPERTY(double cameraMinTriggerInterval READ cameraMinTriggerInterval NOTIFY cameraMinTriggerIntervalChanged)
Q_PROPERTY(bool hoverAndCaptureAllowed READ hoverAndCaptureAllowed CONSTANT) Q_PROPERTY(bool hoverAndCaptureAllowed READ hoverAndCaptureAllowed CONSTANT)
Q_PROPERTY(QVariantList visualTransectPoints READ visualTransectPoints NOTIFY visualTransectPointsChanged) Q_PROPERTY(QVariantList visualTransectPoints READ visualTransectPoints NOTIFY visualTransectPointsChanged)
...@@ -60,7 +59,6 @@ public: ...@@ -60,7 +59,6 @@ public:
int cameraShots (void) const { return _cameraShots; } int cameraShots (void) const { return _cameraShots; }
double coveredArea (void) const; double coveredArea (void) const;
double cameraMinTriggerInterval(void) const { return _cameraMinTriggerInterval; }
bool hoverAndCaptureAllowed (void) const; bool hoverAndCaptureAllowed (void) const;
bool followTerrain (void) const { return _followTerrain; } bool followTerrain (void) const { return _followTerrain; }
...@@ -120,7 +118,6 @@ public: ...@@ -120,7 +118,6 @@ public:
signals: signals:
void cameraShotsChanged (void); void cameraShotsChanged (void);
void timeBetweenShotsChanged (void); void timeBetweenShotsChanged (void);
void cameraMinTriggerIntervalChanged(double cameraMinTriggerInterval);
void visualTransectPointsChanged (void); void visualTransectPointsChanged (void);
void coveredAreaChanged (void); void coveredAreaChanged (void);
void followTerrainChanged (bool followTerrain); void followTerrainChanged (bool followTerrain);
...@@ -172,7 +169,6 @@ protected: ...@@ -172,7 +169,6 @@ protected:
double _complexDistance; double _complexDistance;
int _cameraShots; int _cameraShots;
double _timeBetweenShots; double _timeBetweenShots;
double _cameraMinTriggerInterval;
double _cruiseSpeed; double _cruiseSpeed;
CameraCalc _cameraCalc; CameraCalc _cameraCalc;
bool _followTerrain; bool _followTerrain;
......
src/MissionManager/TransectStyleComplexItemTest.cc
View file @ 4d97eebf
...@@ -34,7 +34,6 @@ void TransectStyleComplexItemTest::init(void) ...@@ -34,7 +34,6 @@ void TransectStyleComplexItemTest::init(void)
_rgSignals[cameraShotsChangedIndex] = SIGNAL(cameraShotsChanged()); _rgSignals[cameraShotsChangedIndex] = SIGNAL(cameraShotsChanged());
_rgSignals[timeBetweenShotsChangedIndex] = SIGNAL(timeBetweenShotsChanged()); _rgSignals[timeBetweenShotsChangedIndex] = SIGNAL(timeBetweenShotsChanged());
_rgSignals[cameraMinTriggerIntervalChangedIndex] = SIGNAL(cameraMinTriggerIntervalChanged(double));
_rgSignals[visualTransectPointsChangedIndex] = SIGNAL(visualTransectPointsChanged()); _rgSignals[visualTransectPointsChangedIndex] = SIGNAL(visualTransectPointsChanged());
_rgSignals[coveredAreaChangedIndex] = SIGNAL(coveredAreaChanged()); _rgSignals[coveredAreaChangedIndex] = SIGNAL(coveredAreaChanged());
_rgSignals[dirtyChangedIndex] = SIGNAL(dirtyChanged(bool)); _rgSignals[dirtyChangedIndex] = SIGNAL(dirtyChanged(bool));
......
src/MissionManager/TransectStyleComplexItemTest.h
View file @ 4d97eebf
...@@ -42,7 +42,6 @@ private: ...@@ -42,7 +42,6 @@ private:
// These signals are from TransectStyleComplexItem // These signals are from TransectStyleComplexItem
cameraShotsChangedIndex = 0, cameraShotsChangedIndex = 0,
timeBetweenShotsChangedIndex, timeBetweenShotsChangedIndex,
cameraMinTriggerIntervalChangedIndex,
visualTransectPointsChangedIndex, visualTransectPointsChangedIndex,
coveredAreaChangedIndex, coveredAreaChangedIndex,
// These signals are from ComplexItem // These signals are from ComplexItem
...@@ -59,7 +58,6 @@ private: ...@@ -59,7 +58,6 @@ private:
// These signals are from TransectStyleComplexItem // These signals are from TransectStyleComplexItem
cameraShotsChangedMask = 1 << cameraShotsChangedIndex, cameraShotsChangedMask = 1 << cameraShotsChangedIndex,
timeBetweenShotsChangedMask = 1 << timeBetweenShotsChangedIndex, timeBetweenShotsChangedMask = 1 << timeBetweenShotsChangedIndex,
cameraMinTriggerIntervalChangedMask = 1 << cameraMinTriggerIntervalChangedIndex,
visualTransectPointsChangedMask = 1 << visualTransectPointsChangedIndex, visualTransectPointsChangedMask = 1 << visualTransectPointsChangedIndex,
coveredAreaChangedMask = 1 << coveredAreaChangedIndex, coveredAreaChangedMask = 1 << coveredAreaChangedIndex,
// These signals are from ComplexItem // These signals are from ComplexItem
......
src/PlanView/CorridorScanEditor.qml
View file @ 4d97eebf
...@@ -24,9 +24,10 @@ Rectangle { ...@@ -24,9 +24,10 @@ Rectangle {
//property real availableWidth ///< Width for control //property real availableWidth ///< Width for control
//property var missionItem ///< Mission Item for editor //property var missionItem ///< Mission Item for editor
property real _margin: ScreenTools.defaultFontPixelWidth / 2 property real _margin: ScreenTools.defaultFontPixelWidth / 2
property real _fieldWidth: ScreenTools.defaultFontPixelWidth * 10.5 property real _fieldWidth: ScreenTools.defaultFontPixelWidth * 10.5
property var _vehicle: QGroundControl.multiVehicleManager.activeVehicle ? QGroundControl.multiVehicleManager.activeVehicle : QGroundControl.multiVehicleManager.offlineEditingVehicle property var _vehicle: QGroundControl.multiVehicleManager.activeVehicle ? QGroundControl.multiVehicleManager.activeVehicle : QGroundControl.multiVehicleManager.offlineEditingVehicle
property real _cameraMinTriggerInterval: missionItem.cameraCalc.minTriggerInterval.rawValue
function polygonCaptureStarted() { function polygonCaptureStarted() {
missionItem.clearPolygon() missionItem.clearPolygon()
...@@ -58,12 +59,13 @@ Rectangle { ...@@ -58,12 +59,13 @@ Rectangle {
QGCLabel { QGCLabel {
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
text: qsTr("WARNING: Photo interval is below minimum interval (%1 secs) supported by camera.").arg(missionItem.cameraMinTriggerInterval.toFixed(1)) text: qsTr("WARNING: Photo interval is below minimum interval (%1 secs) supported by camera.").arg(_cameraMinTriggerInterval.toFixed(1))
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
color: qgcPal.warningText color: qgcPal.warningText
visible: missionItem.cameraShots > 0 && missionItem.cameraMinTriggerInterval !== 0 && missionItem.cameraMinTriggerInterval > missionItem.timeBetweenShots visible: missionItem.cameraShots > 0 && _cameraMinTriggerInterval !== 0 && _cameraMinTriggerInterval > missionItem.timeBetweenShots
} }
CameraCalc { CameraCalc {
cameraCalc: missionItem.cameraCalc cameraCalc: missionItem.cameraCalc
vehicleFlightIsFrontal: true vehicleFlightIsFrontal: true
......
src/PlanView/StructureScanEditor.qml
View file @ 4d97eebf
...@@ -25,9 +25,10 @@ Rectangle { ...@@ -25,9 +25,10 @@ Rectangle {
//property real availableWidth ///< Width for control //property real availableWidth ///< Width for control
//property var missionItem ///< Mission Item for editor //property var missionItem ///< Mission Item for editor
property real _margin: ScreenTools.defaultFontPixelWidth / 2 property real _margin: ScreenTools.defaultFontPixelWidth / 2
property real _fieldWidth: ScreenTools.defaultFontPixelWidth * 10.5 property real _fieldWidth: ScreenTools.defaultFontPixelWidth * 10.5
property var _vehicle: QGroundControl.multiVehicleManager.activeVehicle ? QGroundControl.multiVehicleManager.activeVehicle : QGroundControl.multiVehicleManager.offlineEditingVehicle property var _vehicle: QGroundControl.multiVehicleManager.activeVehicle ? QGroundControl.multiVehicleManager.activeVehicle : QGroundControl.multiVehicleManager.offlineEditingVehicle
property real _cameraMinTriggerInterval: missionItem.cameraCalc.minTriggerInterval.rawValue
function polygonCaptureStarted() { function polygonCaptureStarted() {
missionItem.clearPolygon() missionItem.clearPolygon()
...@@ -67,10 +68,10 @@ Rectangle { ...@@ -67,10 +68,10 @@ Rectangle {
QGCLabel { QGCLabel {
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
text: qsTr("WARNING: Photo interval is below minimum interval (%1 secs) supported by camera.").arg(missionItem.cameraMinTriggerInterval.toFixed(1)) text: qsTr("WARNING: Photo interval is below minimum interval (%1 secs) supported by camera.").arg(_cameraMinTriggerInterval.toFixed(1))
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
color: qgcPal.warningText color: qgcPal.warningText
visible: missionItem.cameraShots > 0 && missionItem.cameraMinTriggerInterval !== 0 && missionItem.cameraMinTriggerInterval > missionItem.timeBetweenShots visible: missionItem.cameraShots > 0 && _cameraMinTriggerInterval !== 0 && _cameraMinTriggerInterval > missionItem.timeBetweenShots
} }
CameraCalc { CameraCalc {
......
src/PlanView/SurveyItemEditor.qml
View file @ 4d97eebf
...@@ -24,9 +24,10 @@ Rectangle { ...@@ -24,9 +24,10 @@ Rectangle {
//property real availableWidth ///< Width for control //property real availableWidth ///< Width for control
//property var missionItem ///< Mission Item for editor //property var missionItem ///< Mission Item for editor
property real _margin: ScreenTools.defaultFontPixelWidth / 2 property real _margin: ScreenTools.defaultFontPixelWidth / 2
property real _fieldWidth: ScreenTools.defaultFontPixelWidth * 10.5 property real _fieldWidth: ScreenTools.defaultFontPixelWidth * 10.5
property var _vehicle: QGroundControl.multiVehicleManager.activeVehicle ? QGroundControl.multiVehicleManager.activeVehicle : QGroundControl.multiVehicleManager.offlineEditingVehicle property var _vehicle: QGroundControl.multiVehicleManager.activeVehicle ? QGroundControl.multiVehicleManager.activeVehicle : QGroundControl.multiVehicleManager.offlineEditingVehicle
property real _cameraMinTriggerInterval: missionItem.cameraCalc.minTriggerInterval.rawValue
function polygonCaptureStarted() { function polygonCaptureStarted() {
missionItem.clearPolygon() missionItem.clearPolygon()
...@@ -58,10 +59,10 @@ Rectangle { ...@@ -58,10 +59,10 @@ Rectangle {
QGCLabel { QGCLabel {
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
text: qsTr("WARNING: Photo interval is below minimum interval (%1 secs) supported by camera.").arg(missionItem.cameraMinTriggerInterval.toFixed(1)) text: qsTr("WARNING: Photo interval is below minimum interval (%1 secs) supported by camera.").arg(_cameraMinTriggerInterval.toFixed(1))
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
color: qgcPal.warningText color: qgcPal.warningText
visible: missionItem.cameraShots > 0 && missionItem.cameraMinTriggerInterval !== 0 && missionItem.cameraMinTriggerInterval > missionItem.timeBetweenShots visible: missionItem.cameraShots > 0 && _cameraMinTriggerInterval !== 0 && _cameraMinTriggerInterval > missionItem.timeBetweenShots
} }
CameraCalc { CameraCalc {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment