From b9d4f6e24faffda8e4b1d93c6973d27bba9ac7d8 Mon Sep 17 00:00:00 2001
From: vargheseg <19566373+vargheseg@users.noreply.github.com>
Date: Wed, 6 May 2020 10:23:24 +0200
Subject: [PATCH] Implement DoocsIfff constructor without history
---
include/DoocsIfff.h | 1 +
src/DoocsIfff.cc | 38 +++++++++++++++++++++-----------------
2 files changed, 22 insertions(+), 17 deletions(-)
diff --git a/include/DoocsIfff.h b/include/DoocsIfff.h
index c97227a..3c01069 100644
--- a/include/DoocsIfff.h
+++ b/include/DoocsIfff.h
@@ -37,6 +37,7 @@ namespace ChimeraTK {
void updateAppToDoocs(TransferElementID& elementId);
void sendToApplication();
void registerVariable(const ChimeraTK::TransferElementAbstractor& var);
+ void registerIfffSources();
boost::shared_ptr<NDRegisterAccessor<int>> _i1Value;
boost::shared_ptr<NDRegisterAccessor<float>> _f1Value;
diff --git a/src/DoocsIfff.cc b/src/DoocsIfff.cc
index bef7041..ecb95c9 100644
--- a/src/DoocsIfff.cc
+++ b/src/DoocsIfff.cc
@@ -12,26 +12,30 @@ namespace ChimeraTK {
boost::shared_ptr<NDRegisterAccessor<float>> const& f2Value,
boost::shared_ptr<NDRegisterAccessor<float>> const& f3Value, DoocsUpdater& updater)
: D_ifff(eqFct, doocsPropertyName), _i1Value(i1Value), _f1Value(f1Value), _f2Value(f2Value), _f3Value(f3Value),
- _updater(updater), _eqFct(eqFct) {
- auto registerSource = [&](const ChimeraTK::TransferElementAbstractor& var) {
- if(var.isReadable()) {
- updater.addVariable(var, eqFct, std::bind(&DoocsIfff::updateAppToDoocs, this, var.getId()));
- _consistencyGroup.add(var);
- }
- };
+ _updater(updater), _eqFct(eqFct), isWriteable(_i1Value->isWriteable() && _f1Value->isWriteable() &&
+ _f2Value->isWriteable() && _f3Value->isWriteable()) {
+ registerIfffSources();
+ }
+
+ // Constructor without history
+ DoocsIfff::DoocsIfff(std::string const& doocsPropertyName, EqFct* eqFct,
+ boost::shared_ptr<NDRegisterAccessor<int>> const& i1Value,
+ boost::shared_ptr<NDRegisterAccessor<float>> const& f1Value,
+ boost::shared_ptr<NDRegisterAccessor<float>> const& f2Value,
+ boost::shared_ptr<NDRegisterAccessor<float>> const& f3Value, DoocsUpdater& updater)
+ : D_ifff(doocsPropertyName, eqFct), _i1Value(i1Value), _f1Value(f1Value), _f2Value(f2Value), _f3Value(f3Value),
+ _updater(updater), _eqFct(eqFct), isWriteable(_i1Value->isWriteable() && _f1Value->isWriteable() &&
+ _f2Value->isWriteable() && _f3Value->isWriteable()) {
+ registerIfffSources();
+ }
+ void DoocsIfff::registerIfffSources() {
// FIXME: What if not all 4 are readable? is it still valid to add
// all to a consistency group then?
- registerSource(OneDRegisterAccessor<int>(_i1Value));
- registerSource(OneDRegisterAccessor<float>(_f1Value));
- registerSource(OneDRegisterAccessor<float>(_f2Value));
- registerSource(OneDRegisterAccessor<float>(_f3Value));
-
- // FIXME: get this from a constructor parameter isReadOnly so this can be turned off
- isWriteable = true;
- if(!_i1Value->isWriteable() || !_f1Value->isWriteable() || !_f2Value->isWriteable() || !_f3Value->isWriteable()) {
- isWriteable = false;
- }
+ registerVariable(OneDRegisterAccessor<int>(_i1Value));
+ registerVariable(OneDRegisterAccessor<float>(_f1Value));
+ registerVariable(OneDRegisterAccessor<float>(_f2Value));
+ registerVariable(OneDRegisterAccessor<float>(_f3Value));
}
void DoocsIfff::updateAppToDoocs(TransferElementID& elementId) {
--
GitLab