From 8a37d3fbd63e413b6d0384b87a0ee5b08743fe47 Mon Sep 17 00:00:00 2001 From: David Kekesi Date: Thu, 24 Oct 2024 11:28:32 +0200 Subject: [PATCH] Beam regression fixed --- SpeckleLib/Speckle/Record/Element/Beam.cpp | 2 +- SpeckleLib/Speckle/Record/Element/Beam.h | 2 +- SpeckleLib/Speckle/Record/Element/BeamSegment.h | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/SpeckleLib/Speckle/Record/Element/Beam.cpp b/SpeckleLib/Speckle/Record/Element/Beam.cpp index 1cad612..bb5f21f 100644 --- a/SpeckleLib/Speckle/Record/Element/Beam.cpp +++ b/SpeckleLib/Speckle/Record/Element/Beam.cpp @@ -113,7 +113,7 @@ void Beam::loadMemo(filter_bits filter, std::unique_ptr& memo) const { //Establish the memo filter for this element if (!SegmentedBeam::isMemoLoaded()) filter |= SegmentedBeam::getPartFilter(); - Element::loadMemo(filter, memo); + ModelElement::loadMemo(filter, memo); //Receive the memo data into the element (when available) if (memo) { if (filter & SegmentedBeam::getPartFilter()) diff --git a/SpeckleLib/Speckle/Record/Element/Beam.h b/SpeckleLib/Speckle/Record/Element/Beam.h index 9492301..97af684 100644 --- a/SpeckleLib/Speckle/Record/Element/Beam.h +++ b/SpeckleLib/Speckle/Record/Element/Beam.h @@ -65,7 +65,7 @@ namespace speckle::record::element { Get the BIM application parent table ID @return The BIM table ID */ - virtual database::BIMRecordID getTableID() const override { return Element::getTableID(); } + virtual database::BIMRecordID getTableID() const override { return ModelElement::getTableID(); } /*! Get the element body @return nullptr (Beams don't explicitly have a 3D body - this comes from its child segments) diff --git a/SpeckleLib/Speckle/Record/Element/BeamSegment.h b/SpeckleLib/Speckle/Record/Element/BeamSegment.h index 58020dc..48ed6de 100644 --- a/SpeckleLib/Speckle/Record/Element/BeamSegment.h +++ b/SpeckleLib/Speckle/Record/Element/BeamSegment.h @@ -1,7 +1,7 @@ #ifndef SPECKLE_RECORD_ELEMENT_BEAM_SEGMENT #define SPECKLE_RECORD_ELEMENT_BEAM_SEGMENT -#include "Speckle/Record/Element/Element.h" +#include "Speckle/Record/Element/ModelElement.h" #include "Speckle/Record/Element/Interface/Assembly/Segment.h" namespace speckle::record::element { @@ -11,12 +11,12 @@ namespace speckle::record::element { /*! BIM beam class */ - class BeamSegment : public Element, public assembly::Segment { + class BeamSegment : public ModelElement, public assembly::Segment { public: // MARK: - Types - using base = Element; + using base = ModelElement; ///Unique pointer using Unique = std::unique_ptr; ///Shared pointer