Browse Source

Changes to improve readability

QGC4.4
DonLakeFlyer 5 years ago
parent
commit
32cb174d35
  1. 2
      src/MissionManager/CorridorScanComplexItem.cc
  2. 2
      src/MissionManager/SimpleMissionItem.cc
  3. 6
      src/MissionManager/StructureScanComplexItem.cc
  4. 2
      src/MissionManager/StructureScanComplexItem.h
  5. 2
      src/MissionManager/SurveyComplexItem.cc

2
src/MissionManager/CorridorScanComplexItem.cc

@ -353,7 +353,7 @@ CorridorScanComplexItem::ReadyForSaveState CorridorScanComplexItem::readyForSave
double CorridorScanComplexItem::timeBetweenShots(void) double CorridorScanComplexItem::timeBetweenShots(void)
{ {
return _cruiseSpeed == 0 ? 0 : _cameraCalc.adjustedFootprintFrontal()->rawValue().toDouble() / _cruiseSpeed; return _vehicleSpeed == 0 ? 0 : _cameraCalc.adjustedFootprintFrontal()->rawValue().toDouble() / _vehicleSpeed;
} }
double CorridorScanComplexItem::_calcTransectSpacing(void) const double CorridorScanComplexItem::_calcTransectSpacing(void) const

2
src/MissionManager/SimpleMissionItem.cc

@ -935,7 +935,7 @@ void SimpleMissionItem::applyNewAltitude(double newAltitude)
void SimpleMissionItem::setMissionFlightStatus(MissionController::MissionFlightStatus_t& missionFlightStatus) void SimpleMissionItem::setMissionFlightStatus(MissionController::MissionFlightStatus_t& missionFlightStatus)
{ {
// If user has not already set speed/gimbal, set defaults from previous items. // If speed and/or gimbal are not specifically set on this item. Then use the flight status values as initial defaults should a user turn them on.
VisualMissionItem::setMissionFlightStatus(missionFlightStatus); VisualMissionItem::setMissionFlightStatus(missionFlightStatus);
if (_speedSection->available() && !_speedSection->specifyFlightSpeed() && !qFuzzyCompare(_speedSection->flightSpeed()->rawValue().toDouble(), missionFlightStatus.vehicleSpeed)) { if (_speedSection->available() && !_speedSection->specifyFlightSpeed() && !qFuzzyCompare(_speedSection->flightSpeed()->rawValue().toDouble(), missionFlightStatus.vehicleSpeed)) {
_speedSection->flightSpeed()->setRawValue(missionFlightStatus.vehicleSpeed); _speedSection->flightSpeed()->setRawValue(missionFlightStatus.vehicleSpeed);

6
src/MissionManager/StructureScanComplexItem.cc

@ -474,8 +474,8 @@ int StructureScanComplexItem::cameraShots(void) const
void StructureScanComplexItem::setMissionFlightStatus(MissionController::MissionFlightStatus_t& missionFlightStatus) void StructureScanComplexItem::setMissionFlightStatus(MissionController::MissionFlightStatus_t& missionFlightStatus)
{ {
ComplexMissionItem::setMissionFlightStatus(missionFlightStatus); ComplexMissionItem::setMissionFlightStatus(missionFlightStatus);
if (!qFuzzyCompare(_cruiseSpeed, missionFlightStatus.vehicleSpeed)) { if (!qFuzzyCompare(_vehicleSpeed, missionFlightStatus.vehicleSpeed)) {
_cruiseSpeed = missionFlightStatus.vehicleSpeed; _vehicleSpeed = missionFlightStatus.vehicleSpeed;
emit timeBetweenShotsChanged(); emit timeBetweenShotsChanged();
} }
} }
@ -499,7 +499,7 @@ void StructureScanComplexItem::_polygonDirtyChanged(bool dirty)
double StructureScanComplexItem::timeBetweenShots(void) double StructureScanComplexItem::timeBetweenShots(void)
{ {
return _cruiseSpeed == 0 ? 0 : _cameraCalc.adjustedFootprintSide()->rawValue().toDouble() / _cruiseSpeed; return _vehicleSpeed == 0 ? 0 : _cameraCalc.adjustedFootprintSide()->rawValue().toDouble() / _vehicleSpeed;
} }
QGeoCoordinate StructureScanComplexItem::coordinate(void) const QGeoCoordinate StructureScanComplexItem::coordinate(void) const

2
src/MissionManager/StructureScanComplexItem.h

@ -151,7 +151,7 @@ private:
double _scanDistance; double _scanDistance;
int _cameraShots; int _cameraShots;
double _timeBetweenShots; double _timeBetweenShots;
double _cruiseSpeed; double _vehicleSpeed;
CameraCalc _cameraCalc; CameraCalc _cameraCalc;

2
src/MissionManager/SurveyComplexItem.cc

@ -1416,7 +1416,7 @@ void SurveyComplexItem::rotateEntryPoint(void)
double SurveyComplexItem::timeBetweenShots(void) double SurveyComplexItem::timeBetweenShots(void)
{ {
return _cruiseSpeed == 0 ? 0 : triggerDistance() / _cruiseSpeed; return _vehicleSpeed == 0 ? 0 : triggerDistance() / _vehicleSpeed;
} }
double SurveyComplexItem::additionalTimeDelay (void) const double SurveyComplexItem::additionalTimeDelay (void) const

Loading…
Cancel
Save