refs #787, using digest signals in load component

This commit is contained in:
Klaus Basan
2016-12-06 02:44:11 +01:00
parent 364725548d
commit 603bfd9dc4
2 changed files with 7 additions and 4 deletions

View File

@@ -57,6 +57,7 @@ namespace BlackGui
connect(ui->tb_SharedReloadDistributors, &QToolButton::pressed, this, &CDbLoadOverviewComponent::ps_refreshSharedPressed); connect(ui->tb_SharedReloadDistributors, &QToolButton::pressed, this, &CDbLoadOverviewComponent::ps_refreshSharedPressed);
connect(sGui->getWebDataServices(), &CWebDataServices::dataRead, this, &CDbLoadOverviewComponent::ps_dataLoaded); connect(sGui->getWebDataServices(), &CWebDataServices::dataRead, this, &CDbLoadOverviewComponent::ps_dataLoaded);
connect(this, &CDbLoadOverviewComponent::ps_triggerDigestGuiUpdate, this, &CDbLoadOverviewComponent::ps_setValues);
} }
CDbLoadOverviewComponent::~CDbLoadOverviewComponent() CDbLoadOverviewComponent::~CDbLoadOverviewComponent()
@@ -255,14 +256,15 @@ namespace BlackGui
sGui->getWebDataServices()->triggerReadOfInfoObjects(); sGui->getWebDataServices()->triggerReadOfInfoObjects();
} }
void CDbLoadOverviewComponent::ps_dataLoaded(CEntityFlags::Entity entity, CEntityFlags::ReadState state, int number) void CDbLoadOverviewComponent::ps_dataLoaded(CEntityFlags::Entity singleEntity, CEntityFlags::ReadState state, int number)
{ {
Q_UNUSED(number); Q_UNUSED(number);
if (!CEntityFlags::anySwiftDbEntity(entity)) { return; } Q_ASSERT_X(CEntityFlags::isSingleEntity(singleEntity), Q_FUNC_INFO, "need single entity");
if (!singleEntity.testFlag(CEntityFlags::InfoObjectEntity) && !CEntityFlags::anySwiftDbEntity(singleEntity)) { return; }
if (state == CEntityFlags::ReadFinished || state == CEntityFlags::ReadFinishedRestricted) if (state == CEntityFlags::ReadFinished || state == CEntityFlags::ReadFinishedRestricted)
{ {
this->m_reloading = false; this->m_reloading = false;
this->ps_setValues(); emit this->ps_triggerDigestGuiUpdate();
} }
} }
} // ns } // ns

View File

@@ -14,6 +14,7 @@
#include "blackgui/blackguiexport.h" #include "blackgui/blackguiexport.h"
#include "blackgui/loadindicator.h" #include "blackgui/loadindicator.h"
#include "blackmisc/digestsignal.h"
#include "blackmisc/network/entityflags.h" #include "blackmisc/network/entityflags.h"
#include <QFrame> #include <QFrame>
#include <QScopedPointer> #include <QScopedPointer>
@@ -95,7 +96,7 @@ namespace BlackGui
void ps_setValues(); void ps_setValues();
//! Data have been loaded //! Data have been loaded
void ps_dataLoaded(BlackMisc::Network::CEntityFlags::Entity entity, BlackMisc::Network::CEntityFlags::ReadState state, int number); void ps_dataLoaded(BlackMisc::Network::CEntityFlags::Entity singleEntity, BlackMisc::Network::CEntityFlags::ReadState state, int number);
}; };
} // ns } // ns
} // ns } // ns