Browse Source

Fix missing signalling

QGC4.4
DonLakeFlyer 4 years ago committed by Don Gagne
parent
commit
ea7f124582
  1. 6
      src/MissionManager/LandingComplexItem.cc
  2. 2
      src/MissionManager/LandingComplexItem.h
  3. 2
      src/MissionManager/LandingComplexItemTest.cc
  4. 4
      src/MissionManager/LandingComplexItemTest.h

6
src/MissionManager/LandingComplexItem.cc

@ -72,11 +72,11 @@ void LandingComplexItem::_init(void) @@ -72,11 +72,11 @@ void LandingComplexItem::_init(void)
connect(landingHeading(), &Fact::valueChanged, this, &LandingComplexItem::_recalcFromHeadingAndDistanceChange);
connect(loiterRadius(), &Fact::valueChanged, this, &LandingComplexItem::_recalcFromRadiusChange);
connect(this, &LandingComplexItem::loiterClockwiseChanged, this, &LandingComplexItem::_recalcFromRadiusChange);
connect(loiterClockwise(), &Fact::rawValueChanged, this, &LandingComplexItem::_recalcFromRadiusChange);
connect(this, &LandingComplexItem::finalApproachCoordinateChanged,this, &LandingComplexItem::_recalcFromCoordinateChange);
connect(this, &LandingComplexItem::landingCoordinateChanged, this, &LandingComplexItem::_recalcFromCoordinateChange);
connect(this, &LandingComplexItem::useLoiterToAltChanged, this, &LandingComplexItem::_recalcFromCoordinateChange);
connect(useLoiterToAlt(), &Fact::rawValueChanged, this, &LandingComplexItem::_recalcFromCoordinateChange);
connect(finalApproachAltitude(), &Fact::valueChanged, this, &LandingComplexItem::_setDirty);
connect(landingAltitude(), &Fact::valueChanged, this, &LandingComplexItem::_setDirty);
@ -89,9 +89,7 @@ void LandingComplexItem::_init(void) @@ -89,9 +89,7 @@ void LandingComplexItem::_init(void)
connect(stopTakingVideo(), &Fact::valueChanged, this, &LandingComplexItem::_setDirty);
connect(this, &LandingComplexItem::finalApproachCoordinateChanged,this, &LandingComplexItem::_setDirty);
connect(this, &LandingComplexItem::landingCoordinateChanged, this, &LandingComplexItem::_setDirty);
connect(this, &LandingComplexItem::loiterClockwiseChanged, this, &LandingComplexItem::_setDirty);
connect(this, &LandingComplexItem::altitudesAreRelativeChanged, this, &LandingComplexItem::_setDirty);
connect(this, &LandingComplexItem::useLoiterToAltChanged, this, &LandingComplexItem::_setDirty);
connect(stopTakingPhotos(), &Fact::valueChanged, this, &LandingComplexItem::_signalLastSequenceNumberChanged);
connect(stopTakingVideo(), &Fact::valueChanged, this, &LandingComplexItem::_signalLastSequenceNumberChanged);

2
src/MissionManager/LandingComplexItem.h

@ -122,8 +122,6 @@ signals: @@ -122,8 +122,6 @@ signals:
void loiterTangentCoordinateChanged (QGeoCoordinate coordinate);
void landingCoordinateChanged (QGeoCoordinate coordinate);
void landingCoordSetChanged (bool landingCoordSet);
void loiterClockwiseChanged (bool loiterClockwise);
void useLoiterToAltChanged (bool useLoiterToAlt);
void altitudesAreRelativeChanged (bool altitudesAreRelative);
void _updateFlightPathSegmentsSignal(void);

2
src/MissionManager/LandingComplexItemTest.cc

@ -40,8 +40,6 @@ void LandingComplexItemTest::init(void) @@ -40,8 +40,6 @@ void LandingComplexItemTest::init(void)
rgSignals[loiterTangentCoordinateChangedIndex] = SIGNAL(loiterTangentCoordinateChanged(QGeoCoordinate));
rgSignals[landingCoordinateChangedIndex] = SIGNAL(landingCoordinateChanged(QGeoCoordinate));
rgSignals[landingCoordSetChangedIndex] = SIGNAL(landingCoordSetChanged(bool));
rgSignals[loiterClockwiseChangedIndex] = SIGNAL(loiterClockwiseChanged(bool));
rgSignals[useLoiterToAltChangedIndex] = SIGNAL(useLoiterToAltChanged(bool));
rgSignals[altitudesAreRelativeChangedIndex] = SIGNAL(altitudesAreRelativeChanged(bool));
rgSignals[_updateFlightPathSegmentsSignalIndex] = SIGNAL(_updateFlightPathSegmentsSignal());

4
src/MissionManager/LandingComplexItemTest.h

@ -39,8 +39,6 @@ private: @@ -39,8 +39,6 @@ private:
loiterTangentCoordinateChangedIndex,
landingCoordinateChangedIndex,
landingCoordSetChangedIndex,
loiterClockwiseChangedIndex,
useLoiterToAltChangedIndex,
altitudesAreRelativeChangedIndex,
_updateFlightPathSegmentsSignalIndex,
maxSignalIndex,
@ -51,8 +49,6 @@ private: @@ -51,8 +49,6 @@ private:
loiterTangentCoordinateChangedMask = 1 << loiterTangentCoordinateChangedIndex,
landingCoordinateChangedMask = 1 << landingCoordinateChangedIndex,
landingCoordSetChangedMask = 1 << landingCoordSetChangedIndex,
loiterClockwiseChangedMask = 1 << loiterClockwiseChangedIndex,
useLoiterToAltChangedMask = 1 << useLoiterToAltChangedIndex,
altitudesAreRelativeChangedMask = 1 << altitudesAreRelativeChangedIndex,
_updateFlightPathSegmentsSignalMask = 1 << _updateFlightPathSegmentsSignalIndex,
};

Loading…
Cancel
Save