Fix position of mensural dots at the end of a system

Fixes #3524
rism-digital · Sep 30, 2023 · 6fb5fdf · 6fb5fdf
1 parent 69b92ef
commit 6fb5fdf
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/include/vrv/preparedatafunctor.h b/include/vrv/preparedatafunctor.h
@@ -620,14 +620,15 @@ class PreparePointersByLayerFunctor : public Functor {
     /*
      * Abstract base implementation
      */
-    bool ImplementsEndInterface() const override { return false; }
+    bool ImplementsEndInterface() const override { return true; }
 
     /*
      * Functor interface
      */
     ///@{
     FunctorCode VisitDot(Dot *dot) override;
     FunctorCode VisitLayerElement(LayerElement *layerElement) override;
+    FunctorCode VisitMeasureEnd(Measure *measure) override;
     ///@}
 
 protected:

diff --git a/src/preparedatafunctor.cpp b/src/preparedatafunctor.cpp
@@ -960,6 +960,16 @@ FunctorCode PreparePointersByLayerFunctor::VisitLayerElement(LayerElement *layer
     return FUNCTOR_CONTINUE;
 }
 
+FunctorCode PreparePointersByLayerFunctor::VisitMeasureEnd(Measure *measure)
+{
+    if (m_lastDot) {
+        m_lastDot->m_drawingNextElement = measure->GetRightBarLine();
+        m_lastDot = NULL;
+    }
+
+    return FUNCTOR_CONTINUE;
+}
+
 //----------------------------------------------------------------------------
 // PrepareLyricsFunctor
 //----------------------------------------------------------------------------