Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Chords and Mensuration Sign's Orientation and Loc #3790

Merged
merged 10 commits into from
Sep 19, 2024
+86 −1
Merged

Chords and Mensuration Sign's Orientation and Loc #3790

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b869418
Add orientation for mensuration signs in cmme
martha-thomae Sep 19, 2024
7bc738a
Fix for cases where there is no mensuration sign or orientation
martha-thomae Sep 19, 2024
45b80ec
Add support for cmme chords
martha-thomae Sep 19, 2024
f851aef
Add num and numbase in mensur
martha-thomae Sep 19, 2024
76c0a21
Add support for StaffLoc in mensur
martha-thomae Sep 19, 2024
f4884ca
Add lines for readibility
martha-thomae Sep 19, 2024
6105ae7
Make a map for orientation
martha-thomae Sep 19, 2024
3931d22
Add dur info to chords on CMME import
DILewis Sep 19, 2024
983132c
Add comment about how to get Num and Den into cmme
martha-thomae Sep 19, 2024
083c7bb
Merge and add comment for num and den
martha-thomae Sep 19, 2024
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Make a map for orientation
  • Loading branch information
@martha-thomae
martha-thomae committed Sep 19, 2024
commit 6105ae750b1b6e41f2e08c9fbf3fbe281ef8d6db
19 changes: 7 additions & 12 deletions src/iocmme.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -618,19 +618,14 @@ void CmmeInput::CreateMensuration(pugi::xml_node mensurationNode)
}

/// Mensuration/Sign/Orientation to @orient
martha-thomae marked this conversation as resolved.
Show resolved Hide resolved
static const std::map<std::string, data_ORIENTATION> orientationMap{
{ "Reversed", ORIENTATION_reversed }, //
{ "90CW", ORIENTATION_90CW }, //
{ "90CCW", ORIENTATION_90CCW } //
};
std::string orientation = this->ChildAsString(signNode, "Orientation");
if (orientation == "Reversed") {
mensur->SetOrient(ORIENTATION_reversed);
}
else if (orientation == "90CW") {
mensur->SetOrient(ORIENTATION_90CW);
}
else if (orientation == "90CCW") {
mensur->SetOrient(ORIENTATION_90CCW);
}
else if (orientation != "") {
LogWarning("Unsupported mesuration orientation in CMME (not 'Reversed' or '90CW' or '90CCW')");
}
data_ORIENTATION orient = orientationMap.contains(orientation) ? orientationMap.at(orientation) : ORIENTATION_NONE;
mensur->SetOrient(orient);

/// Mensuration/Number/Num to @num and Number/Den to @numbase
pugi::xml_node numberNode = mensurationNode.child("Number");
Expand Down