ignore non autoplace dynamics/hairpins in layout autoplace calculations

musescore · Jul 19, 2016 · 8710008 · 8710008
1 parent 38a4b21
commit 8710008
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 40 deletions.
diff --git a/libmscore/hairpin.cpp b/libmscore/hairpin.cpp
@@ -32,7 +32,7 @@ Spatium Hairpin::editHairpinHeight;
 //    return Dynamic at chord e position
 //---------------------------------------------------------
 
-static Dynamic* lookupDynamic(Element* e)
+Dynamic* lookupDynamic(Element* e)
       {
       Dynamic* d = 0;
       Segment* s = 0;
@@ -46,8 +46,12 @@ static Dynamic* lookupDynamic(Element* e)
                         }
                   }
             }
-      if (d)
-            d->layout();
+      if (d) {
+            if (!d->autoplace())
+                  d = 0;
+            else
+                  d->layout();
+            }
       return d;
       }
 
@@ -118,13 +122,15 @@ void HairpinSegment::layout()
                         switch (spannerSegmentType()) {
                               case SpannerSegmentType::SINGLE: {
                                     qreal x = 0.0;
-                                    sd = lookupDynamic(hairpin()->startElement());
-                                    if (sd)
-                                          x = sd->bbox().width();
-                                    ed = lookupDynamic(hairpin()->endElement());
-                                    if (ed) {
-                                          len -= ed->bbox().width();
-                                          ed->rUserXoffset() = _spatium * 4;
+                                    if (autoplace()) {
+                                          sd = lookupDynamic(hairpin()->startElement());
+                                          if (sd)
+                                                x = sd->bbox().width();
+                                          ed = lookupDynamic(hairpin()->endElement());
+                                          if (ed) {
+                                                len -= ed->bbox().width();
+                                                ed->rUserXoffset() = _spatium * 4;
+                                                }
                                           }
                                     l1.setLine(x + circledTipRadius * 2.0, 0.0, len, h1);
                                     l2.setLine(x + circledTipRadius * 2.0, 0.0, len, -h1);
@@ -135,9 +141,11 @@ void HairpinSegment::layout()
 
                               case SpannerSegmentType::BEGIN: {
                                     qreal x = 0.0;
-                                    sd = lookupDynamic(hairpin()->startElement());
-                                    if (sd)
-                                          x = sd->bbox().width();
+                                    if (autoplace()) {
+                                          sd = lookupDynamic(hairpin()->startElement());
+                                          if (sd)
+                                                x = sd->bbox().width();
+                                          }
                                     l1.setLine(x + circledTipRadius * 2.0, 0.0, len, h1);
                                     l2.setLine(x + circledTipRadius * 2.0, 0.0, len, -h1);
                                     circledTip.setX(x + circledTipRadius );
@@ -152,9 +160,11 @@ void HairpinSegment::layout()
                                     break;
 
                               case SpannerSegmentType::END: {
-                                    ed = lookupDynamic(hairpin()->endElement());
-                                    if (ed)
-                                          len -= ed->bbox().width();
+                                    if (autoplace()) {
+                                          ed = lookupDynamic(hairpin()->endElement());
+                                          if (ed)
+                                                len -= ed->bbox().width();
+                                          }
                                     drawCircledTip = false;
                                     l1.setLine(.0,  h2, len, h1);
                                     l2.setLine(.0, -h2, len, -h1);

diff --git a/libmscore/hairpin.h b/libmscore/hairpin.h
@@ -136,6 +136,8 @@ class Hairpin : public TextLine {
       virtual QString accessibleInfo() const override;
       };
 
+extern Dynamic* lookupDynamic(Element* e);
+
 }     // namespace Ms
 
 Q_DECLARE_METATYPE(Ms::Hairpin::Type);

diff --git a/libmscore/layout.cpp b/libmscore/layout.cpp
@@ -56,6 +56,7 @@
 #include "systemdivider.h"
 #include "hook.h"
 #include "ambitus.h"
+#include "hairpin.h"
 
 namespace Ms {
 
@@ -2979,30 +2980,6 @@ static bool notTopBeam(ChordRest* cr)
       return false;
       }
 
-//---------------------------------------------------------
-//   lookupDynamic
-//    return Dynamic at chord e position
-//---------------------------------------------------------
-
-static Dynamic* lookupDynamic(Element* e)
-      {
-      Dynamic* d = 0;
-      Segment* s = 0;
-      if (e && e->isChord())
-            s = toChord(e)->segment();
-      if (s) {
-            for (Element* ee : s->annotations()) {
-                  if (ee->isDynamic() && ee->track() == e->track()) {
-                        d = toDynamic(ee);
-                        break;
-                        }
-                  }
-            }
-      if (d)
-            d->layout();
-      return d;
-      }
-
 //---------------------------------------------------------
 //   collectSystem
 //---------------------------------------------------------