moved VariableNetworkNode member to AccessorBase class, so the network node...

moved VariableNetworkNode member to AccessorBase class, so the network node information can be accessed also when having only the pointer to the base class

include/Accessor.h

@@ -74,29 +74,25 @@ namespace ChimeraTK {
        *  the connections. There we should instead just obtain the number of elements from the VariableNetworkNode.
        *  Like this, this function might easily be confused with the getNElements() function! */
       virtual size_t getNumberOfElements() const = 0;
-      
-    protected:
 
-      friend class ApplicationModule;
-  };
+      /** Convert into VariableNetworkNode */
+      operator const VariableNetworkNode&() const {
+        return node;
+      }
+      operator VariableNetworkNode&() {
+        return node;
+      }
 
-  /*********************************************************************************************************************/
+      /** Connect with another node */
+      VariableNetworkNode operator>>(VariableNetworkNode other) {
+        return node.operator>>(other);
+      }
 
-  /** An invalid instance which can be used e.g. for optional arguments passed by reference */
-  class InvalidAccessor : public AccessorBase {
-    public:
-      constexpr InvalidAccessor() {}
-      ~InvalidAccessor() {}
-      bool isFeeding() {std::terminate();}
-      bool isInitialised() const {std::terminate();}
-      void useProcessVariable(const boost::shared_ptr<ProcessVariable> &) {std::terminate();}
-      const std::type_info& getValueType() const {std::terminate();}
-      VariableDirection getDirection() const {std::terminate();}
-      UpdateMode getUpdateMode() const {std::terminate();}
-      size_t getNumberOfElements() {std::terminate();}
-      const std::string& getUnit() const {std::terminate();}
-      const std::string& getDescription() const {std::terminate();}
-      const std::string& getName() const {std::terminate();}
+    protected:
+
+      VariableNetworkNode node;
+
+      friend class ApplicationModule;
   };
 
   /*********************************************************************************************************************/
@@ -111,9 +107,10 @@ namespace ChimeraTK {
       Accessor(Module *owner, const std::string &name, VariableDirection direction, std::string unit, size_t nElements,
                UpdateMode mode, const std::string &description)
       : _owner(owner), _name(name), _direction(direction), _unit(unit), _mode(mode), _description(description),
-        _nElements{nElements}, node{*this}
+        _nElements{nElements}
       {
         owner->registerAccessor(this);
+        node = VariableNetworkNode(*this);
       }
 
       VariableDirection getDirection() const {return _direction;}
@@ -129,22 +126,6 @@ namespace ChimeraTK {
       const std::type_info& getValueType() const {
         return typeid(UserType);
       }
-
-      operator const VariableNetworkNode&() const {
-        return node;
-      }
-
-      operator VariableNetworkNode&() {
-        return node;
-      }
-
-      /** Connect with node */
-/*      VariableNetworkNode& operator<<(const VariableNetworkNode &other) {
-        return node.operator<<(other);
-      } */
-      VariableNetworkNode operator>>(VariableNetworkNode other) {
-        return node.operator>>(other);
-      }
       
       size_t getNumberOfElements() const { return _nElements; }
 
@@ -159,8 +140,6 @@ namespace ChimeraTK {
       
       size_t _nElements;
 
-      VariableNetworkNode node;
-
 
   };
 

include/Application.h

@@ -22,7 +22,6 @@ namespace ChimeraTK {
 
   class Module;
   class AccessorBase;
-  class InvalidAccessor;
   class VariableNetwork;
 
   template<typename UserType>
@@ -46,7 +45,6 @@ namespace ChimeraTK {
        *  valid after destroying the Application and must be destroyed as well (or at least no longer used). */
       void shutdown();
 
-      /** Initialise and run the application */
       void run();
 
       /** Instead of running the application, just initialise it and output the published variables to an XML file. */