From 10a737e90c352f0248a3b68f6dbda606a94138fa Mon Sep 17 00:00:00 2001 From: Nav Date: Sat, 4 Sep 2021 18:07:12 +0100 Subject: [PATCH] Moved refreshing of target pin states, upon an IO port update event, to target package widget class. Functionality for the target package widget is now completely contained within the TargetPackageWidget class (and derivations). --- .../Widgets/TargetWidgets/TargetPackageWidget.cpp | 12 ++++-------- .../Widgets/TargetWidgets/TargetPackageWidget.hpp | 4 ++++ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/TargetPackageWidget.cpp b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/TargetPackageWidget.cpp index 032d747e..1cfce8ec 100644 --- a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/TargetPackageWidget.cpp +++ b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/TargetPackageWidget.cpp @@ -23,15 +23,11 @@ TargetPackageWidget::TargetPackageWidget( this->connect( &(this->insightWorker), - &InsightWorker::targetPinStatesUpdated, + &InsightWorker::targetIoPortsUpdated, this, - [this] (int variantId, const Targets::TargetPinStateMappingType& pinStatesByNumber) { - if (variantId == this->targetVariant.id) { - this->updatePinStates(pinStatesByNumber); - - if (this->targetState == TargetState::STOPPED && !this->isEnabled()) { - this->setDisabled(false); - } + [this] { + if (this->targetState == TargetState::STOPPED) { + this->refreshPinStates(); } } ); diff --git a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/TargetPackageWidget.hpp b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/TargetPackageWidget.hpp index 236996a5..c99f0366 100644 --- a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/TargetPackageWidget.hpp +++ b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/TargetPackageWidget.hpp @@ -33,5 +33,9 @@ namespace Bloom::Widgets::InsightTargetWidgets public: TargetPackageWidget(Targets::TargetVariant targetVariant, InsightWorker& insightWorker, QWidget* parent); virtual void refreshPinStates(std::optional> callback = std::nullopt); + + virtual void setTargetState(Targets::TargetState targetState) { + this->targetState = targetState; + } }; }