rm inheritance from INode

GUI/Model/Device/Instrument.cpp

@@ -35,15 +35,6 @@ void Instrument::setDetector(const IDetector& detector)
     m_detector.reset(detector.clone());
 }
 
-std::vector<const INode*> Instrument::nodeChildren() const
-{
-    std::vector<const INode*> result;
-    result.push_back(m_beam.get());
-    if (m_detector)
-        result.push_back(m_detector.get());
-    return result;
-}
-
 const IDetector* Instrument::getDetector() const
 {
     return m_detector.get();

GUI/Model/Device/Instrument.h

@@ -16,7 +16,6 @@
 #ifndef BORNAGAIN_GUI_MODEL_DEVICE_INSTRUMENT_H
 #define BORNAGAIN_GUI_MODEL_DEVICE_INSTRUMENT_H
 
-#include "Param/Node/INode.h"
 #include <memory>
 
 class Beam;
@@ -24,13 +23,11 @@ class IDetector;
 
 //! Assembles beam, detector and their relative positions with respect to the sample.
 
-class Instrument : public INode {
+class Instrument {
 public:
     Instrument(const Beam& beam, const IDetector& detector);
     Instrument(const Instrument& other);
-    ~Instrument() override;
-
-    std::string className() const final { return "Instrument"; }
+    ~Instrument();
 
     Beam& beam() { return *m_beam; }
     const Beam& beam() const { return *m_beam; }
@@ -43,8 +40,6 @@ public:
     //! Sets the detector (axes can be overwritten later)
     void setDetector(const IDetector& detector);
 
-    std::vector<const INode*> nodeChildren() const override;
-
 protected:
     std::unique_ptr<Beam> m_beam;
     std::unique_ptr<IDetector> m_detector;