From 83d2035fbe596b89971e72b8fafef5620b024c53 Mon Sep 17 00:00:00 2001 From: DonLakeFlyer Date: Tue, 19 Jun 2018 09:49:56 -0700 Subject: [PATCH] Fix last sequence number signalling --- src/MissionManager/StructureScanComplexItem.cc | 7 ++++--- src/MissionManager/StructureScanComplexItem.h | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/MissionManager/StructureScanComplexItem.cc b/src/MissionManager/StructureScanComplexItem.cc index 4c8aac495..100896efb 100644 --- a/src/MissionManager/StructureScanComplexItem.cc +++ b/src/MissionManager/StructureScanComplexItem.cc @@ -63,9 +63,11 @@ StructureScanComplexItem::StructureScanComplexItem(Vehicle* vehicle, bool flyVie connect(&_altitudeFact, &Fact::valueChanged, this, &StructureScanComplexItem::_updateCoordinateAltitudes); connect(&_structurePolygon, &QGCMapPolygon::dirtyChanged, this, &StructureScanComplexItem::_polygonDirtyChanged); - connect(&_structurePolygon, &QGCMapPolygon::countChanged, this, &StructureScanComplexItem::_polygonCountChanged); connect(&_structurePolygon, &QGCMapPolygon::pathChanged, this, &StructureScanComplexItem::_rebuildFlightPolygon); + connect(&_structurePolygon, &QGCMapPolygon::countChanged, this, &StructureScanComplexItem::_updateLastSequenceNumber); + connect(&_layersFact, &Fact::valueChanged, this, &StructureScanComplexItem::_updateLastSequenceNumber); + connect(&_flightPolygon, &QGCMapPolygon::pathChanged, this, &StructureScanComplexItem::_flightPathChanged); connect(_cameraCalc.distanceToSurface(), &Fact::valueChanged, this, &StructureScanComplexItem::_rebuildFlightPolygon); @@ -108,9 +110,8 @@ void StructureScanComplexItem::_clearInternal(void) emit lastSequenceNumberChanged(lastSequenceNumber()); } -void StructureScanComplexItem::_polygonCountChanged(int count) +void StructureScanComplexItem::_updateLastSequenceNumber(void) { - Q_UNUSED(count); emit lastSequenceNumberChanged(lastSequenceNumber()); } diff --git a/src/MissionManager/StructureScanComplexItem.h b/src/MissionManager/StructureScanComplexItem.h index 904f57e4c..068b8a406 100644 --- a/src/MissionManager/StructureScanComplexItem.h +++ b/src/MissionManager/StructureScanComplexItem.h @@ -107,13 +107,13 @@ signals: private slots: void _setDirty(void); void _polygonDirtyChanged (bool dirty); - void _polygonCountChanged (int count); void _flightPathChanged (void); void _clearInternal (void); void _updateCoordinateAltitudes (void); void _rebuildFlightPolygon (void); void _recalcCameraShots (void); void _recalcLayerInfo (void); + void _updateLastSequenceNumber (void); private: void _setExitCoordinate(const QGeoCoordinate& coordinate); -- 2.22.0