Merge pull request #25813 from rettinghaus/mei/places

[MEI] simplify setting of direction
musescore · Dec 15, 2024 · 470f0af · 470f0af
2 parents df4fd74 + b35a1c4
commit 470f0af
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 19 deletions.
diff --git a/src/importexport/mei/internal/meiconverter.cpp b/src/importexport/mei/internal/meiconverter.cpp
@@ -1246,10 +1246,7 @@ void Convert::dynamFromMEI(engraving::Dynamic* dynamic, const StringList& meiLin
     warning = false;
 
     // @place
-    if (meiDynam.HasPlace()) {
-        dynamic->setProperty(engraving::Pid::DIRECTION,
-                             meiDynam.GetPlace() == libmei::STAFFREL_above ? engraving::DirectionV::UP : engraving::DirectionV::DOWN);
-    }
+    dynamic->setProperty(engraving::Pid::DIRECTION, Convert::directionFromMEI(meiDynam.GetPlace()));
 
     // @label
     if (meiDynam.HasLabel()) {
@@ -1308,9 +1305,7 @@ libmei::Dynam Convert::dynamToMEI(const engraving::Dynamic* dynamic, StringList&
     libmei::Dynam meiDynam;
 
     // @place
-    if (dynamic->getProperty(engraving::Pid::DIRECTION) != dynamic->propertyDefault(engraving::Pid::DIRECTION)) {
-        meiDynam.SetPlace(Convert::directionToMEI(dynamic->direction()));
-    }
+    meiDynam.SetPlace(Convert::directionToMEI(dynamic->direction()));
 
     // @layer
     Convert::layerIdentToMEI(dynamic, meiDynam);
@@ -1628,10 +1623,7 @@ void Convert::hairpinFromMEI(engraving::Hairpin* hairpin, const libmei::Hairpin&
     warning = false;
 
     // @place
-    if (meiHairpin.HasPlace()) {
-        hairpin->setProperty(engraving::Pid::DIRECTION, meiHairpin.GetPlace()
-                             == libmei::STAFFREL_above ? engraving::DirectionV::UP : engraving::DirectionV::DOWN);
-    }
+    hairpin->setProperty(engraving::Pid::DIRECTION, Convert::directionFromMEI(meiHairpin.GetPlace()));
 
     // @form
     if (meiHairpin.GetForm() == libmei::hairpinLog_FORM_cres) {
@@ -1660,9 +1652,7 @@ libmei::Hairpin Convert::hairpinToMEI(const engraving::Hairpin* hairpin)
     libmei::Hairpin meiHairpin;
 
     // @place
-    if (hairpin->getProperty(engraving::Pid::DIRECTION) != hairpin->propertyDefault(engraving::Pid::DIRECTION)) {
-        meiHairpin.SetPlace(Convert::directionToMEI(hairpin->direction()));
-    }
+    meiHairpin.SetPlace(Convert::directionToMEI(hairpin->direction()));
 
     // @form
     if (hairpin->hairpinType() == engraving::HairpinType::CRESC_HAIRPIN) {
@@ -2646,9 +2636,8 @@ libmei::data_STAFFREL Convert::placeToMEI(engraving::PlacementV place)
     }
 }
 
-engraving::DirectionV Convert::directionFromMEI(const libmei::data_STAFFREL meiPlace, bool& warning)
+engraving::DirectionV Convert::directionFromMEI(const libmei::data_STAFFREL meiPlace)
 {
-    warning = false;
     switch (meiPlace) {
     case (libmei::STAFFREL_above): return engraving::DirectionV::UP;
     case (libmei::STAFFREL_below): return engraving::DirectionV::DOWN;
@@ -2663,7 +2652,7 @@ libmei::data_STAFFREL Convert::directionToMEI(engraving::DirectionV direction)
     case (engraving::DirectionV::UP): return libmei::STAFFREL_above;
     case (engraving::DirectionV::DOWN): return libmei::STAFFREL_below;
     default:
-        return libmei::STAFFREL_above;
+        return libmei::STAFFREL_NONE;
     }
 }
 

diff --git a/src/importexport/mei/internal/meiconverter.h b/src/importexport/mei/internal/meiconverter.h
@@ -275,7 +275,7 @@ class Convert
     static engraving::PlacementV placeFromMEI(const libmei::data_STAFFREL meiPlace, bool& warning);
     static libmei::data_STAFFREL placeToMEI(engraving::PlacementV place);
 
-    static engraving::DirectionV directionFromMEI(const libmei::data_STAFFREL meiPlace, bool& warning);
+    static engraving::DirectionV directionFromMEI(const libmei::data_STAFFREL meiPlace);
     static libmei::data_STAFFREL directionToMEI(engraving::DirectionV direction);
 
     static void slurFromMEI(engraving::SlurTie* slur, const libmei::Slur& meiSlur, bool& warning);

diff --git a/src/importexport/mei/tests/data/dynamic-01.mei b/src/importexport/mei/tests/data/dynamic-01.mei
@@ -59,7 +59,7 @@
                      <dynam xml:id="d1hg5le3" label="mp" staff="1" startid="#n6si3n7">mp</dynam>
                      <dynam xml:id="d1n0kf96" label="sffz" staff="1" startid="#n7c44ti">sffz</dynam>
                      <dynam xml:id="d1btxom9" label="sfz" layer="1" staff="1" startid="#nvtsktx">sfz</dynam>
-                     <dynam xml:id="d1rbma6l" label="pp" staff="1" startid="#ns8t4tw">pp</dynam>
+                     <dynam xml:id="d1rbma6l" label="pp" staff="1" startid="#ns8t4tw" place="below">pp</dynam>
                   </measure>
                   <measure xml:id="m428gem" right="end" n="2">
                      <staff xml:id="m2s1" n="1">

diff --git a/src/importexport/mei/tests/data/dynamic-01.mscx b/src/importexport/mei/tests/data/dynamic-01.mscx
@@ -126,6 +126,7 @@
           <Dynamic>
             <subtype>pp</subtype>
             <velocity>33</velocity>
+            <direction>down</direction>
             </Dynamic>
           <Chord>
             <durationType>whole</durationType>