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

Feature/mxapi #14

Merged
merged 2 commits into from Jul 20, 2017
Merged

Feature/mxapi #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f245952
Barlines
SemitoneGene Jul 16, 2017
0db9ad6
Add support for reading and writing of endings
SemitoneGene Jul 18, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
22 changes: 20 additions & 2 deletions Sourcecode/mx/api/BarlineData.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,28 +20,46 @@ namespace mx
normal,
lightLight,
lightHeavy,
heavyLight
heavyLight,
dotted,
dashed,
heavy,
heavyHeavy
};

enum class EndingType
{
none,
start,
stop,
discontinue
};


class BarlineData
{
public:
int tickTimePosition;
BarlineType barlineType;
EndingType endingType;
int endingNumber;
HorizontalAlignment location;

BarlineData()
: tickTimePosition{ 0 }
, barlineType{ BarlineType::normal }
, endingType{ EndingType::none }
, endingNumber { 0 }
, location{ HorizontalAlignment::right }
{

}
};

MXAPI_EQUALS_BEGIN( BarlineData )
MXAPI_EQUALS_MEMBER( tickTimePosition )
MXAPI_EQUALS_MEMBER( barlineType )
MXAPI_EQUALS_MEMBER( endingType )
MXAPI_EQUALS_MEMBER( endingNumber )
MXAPI_EQUALS_MEMBER( location )
MXAPI_EQUALS_END;
MXAPI_NOT_EQUALS_AND_VECTORS( BarlineData );
Expand Down
2 changes: 1 addition & 1 deletion Sourcecode/mx/core/elements/MeasureAttributes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ namespace mx
YesNo implicit;
YesNo nonControlling;
TenthsValue width;
const bool hasNumber;
const bool hasNumber;
bool hasImplicit;
bool hasNonControlling;
bool hasWidth;
Expand Down
24 changes: 19 additions & 5 deletions Sourcecode/mx/impl/Converter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,18 +331,18 @@ namespace mx
const std::map<core::BarStyleEnum, api::BarlineType> Converter::barlineMap =
{
std::pair<core::BarStyleEnum, api::BarlineType>{ core::BarStyleEnum::regular, api::BarlineType::normal },
std::pair<core::BarStyleEnum, api::BarlineType>{ core::BarStyleEnum::dotted, api::BarlineType::unsupported },
std::pair<core::BarStyleEnum, api::BarlineType>{ core::BarStyleEnum::dashed, api::BarlineType::unsupported },
std::pair<core::BarStyleEnum, api::BarlineType>{ core::BarStyleEnum::heavy, api::BarlineType::unsupported },
std::pair<core::BarStyleEnum, api::BarlineType>{ core::BarStyleEnum::dotted, api::BarlineType::dotted },
std::pair<core::BarStyleEnum, api::BarlineType>{ core::BarStyleEnum::dashed, api::BarlineType::dashed },
std::pair<core::BarStyleEnum, api::BarlineType>{ core::BarStyleEnum::heavy, api::BarlineType::heavy },
std::pair<core::BarStyleEnum, api::BarlineType>{ core::BarStyleEnum::lightLight, api::BarlineType::lightLight },
std::pair<core::BarStyleEnum, api::BarlineType>{ core::BarStyleEnum::lightHeavy, api::BarlineType::lightHeavy },
std::pair<core::BarStyleEnum, api::BarlineType>{ core::BarStyleEnum::heavyLight, api::BarlineType::heavyLight },
std::pair<core::BarStyleEnum, api::BarlineType>{ core::BarStyleEnum::heavyHeavy, api::BarlineType::unsupported },
std::pair<core::BarStyleEnum, api::BarlineType>{ core::BarStyleEnum::heavyHeavy, api::BarlineType::heavyHeavy },
std::pair<core::BarStyleEnum, api::BarlineType>{ core::BarStyleEnum::tick, api::BarlineType::unsupported },
std::pair<core::BarStyleEnum, api::BarlineType>{ core::BarStyleEnum::short_, api::BarlineType::unsupported },
std::pair<core::BarStyleEnum, api::BarlineType>{ core::BarStyleEnum::none, api::BarlineType::none },
};


const std::map<core::LineEnd, api::LineHook> Converter::lineStopMap =
{
Expand Down Expand Up @@ -372,6 +372,14 @@ namespace mx
};


const std::map<core::StartStopDiscontinue, api::EndingType> Converter::endingMap =
{
std::pair<core::StartStopDiscontinue, api::EndingType>{ core::StartStopDiscontinue::start, api::EndingType::start },
std::pair<core::StartStopDiscontinue, api::EndingType>{ core::StartStopDiscontinue::stop, api::EndingType::stop },
std::pair<core::StartStopDiscontinue, api::EndingType>{ core::StartStopDiscontinue::discontinue, api::EndingType::discontinue }
};


const std::map<core::FermataShape, api::MarkType> Converter::fermataMap =
{
std::pair<core::FermataShape, api::MarkType>{ core::FermataShape::normal, api::MarkType::fermataNormal },
Expand Down Expand Up @@ -1655,6 +1663,12 @@ namespace mx
{
return findCoreItem( barlineMap, core::BarStyleEnum::regular, value );
}


core::StartStopDiscontinue Converter::convert( api::EndingType value ) const
{
return findCoreItem( endingMap, core::StartStopDiscontinue::start, value );
}


api::BarlineType Converter::convert( core::BarStyleEnum value ) const
Expand Down
5 changes: 4 additions & 1 deletion Sourcecode/mx/impl/Converter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,9 @@ namespace mx

core::BarStyleEnum convert( api::BarlineType value ) const;
api::BarlineType convert( core::BarStyleEnum value ) const;


core::StartStopDiscontinue convert( api::EndingType value ) const;

core::RightLeftMiddle convertBarlinePlacement( api::HorizontalAlignment value ) const;
api::HorizontalAlignment convertBarlinePlacement( core::RightLeftMiddle value ) const;

Expand Down Expand Up @@ -133,6 +135,7 @@ namespace mx
const static std::map<core::WedgeType, api::WedgeType> wedgeMap;
const static std::map<core::BarStyleEnum, api::BarlineType> barlineMap;
const static std::map<core::RightLeftMiddle, api::HorizontalAlignment> barlinePlacementMap;
const static std::map<core::StartStopDiscontinue, api::EndingType> endingMap;
const static std::map<core::LineEnd, api::LineHook> lineStopMap;
const static std::map<core::GroupSymbolValue, api::BracketType> bracketMap;
const static std::map<core::FermataShape, api::MarkType> fermataMap;
Expand Down
33 changes: 33 additions & 0 deletions Sourcecode/mx/impl/MeasureReader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
#include "mx/core/elements/Divisions.h"
#include "mx/core/elements/Duration.h"
#include "mx/core/elements/EditorialVoiceGroup.h"
#include "mx/core/elements/Ending.h"
#include "mx/core/elements/Fifths.h"
#include "mx/core/elements/Fifths.h"
#include "mx/core/elements/FiguredBass.h"
Expand Down Expand Up @@ -526,6 +527,8 @@ namespace mx
const auto& attr = *inMxBarline.getAttributes();
auto loc = api::HorizontalAlignment::unspecified;
auto style = api::BarlineType::unspecified;
auto endingType = api::EndingType::none;
auto endingNumber = 0;

if( attr.hasLocation )
{
Expand All @@ -547,8 +550,38 @@ namespace mx
barline.tickTimePosition = myCurrentCursor.tickTimePosition;
}

if( inMxBarline.getHasEnding() )
{
const auto& ending = inMxBarline.getEnding();
const auto& endingAttributes = ending->getAttributes();

switch (endingAttributes->type)
{
case core::StartStopDiscontinue::start:
endingType = api::EndingType::start;
break;

case core::StartStopDiscontinue::stop:
endingType = api::EndingType::stop;
break;

case core::StartStopDiscontinue::discontinue:
endingType = api::EndingType::discontinue;
break;
};

const auto& number = endingAttributes->number;
const auto& numValues = number.getValues();
if (!numValues.empty()) {
const auto iter = numValues.begin();
endingNumber = *iter;
}
}

barline.barlineType = style;
barline.location = loc;
barline.endingType = endingType;
barline.endingNumber = endingNumber;
myOutMeasureData.barlines.emplace_back( std::move( barline ) );
}

Expand Down
14 changes: 14 additions & 0 deletions Sourcecode/mx/impl/MeasureWriter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -601,6 +601,7 @@ namespace mx
}
}


void MeasureWriter::writeDirection( const api::DirectionData& inDirectionData )
{
if( myPropertiesWriter )
Expand Down Expand Up @@ -632,16 +633,29 @@ namespace mx
barlineElement->setHasBarStyle( true );
barlineElement->getBarStyle()->setValue( myConverter.convert( myBarlinesIter->barlineType ) );
}
if( myBarlinesIter->endingType != api::EndingType::none )
{
barlineElement->setHasEnding( true );
auto ending = barlineElement->getEnding();
ending->getAttributes()->type = myConverter.convert( myBarlinesIter->endingType );

if( myBarlinesIter->endingNumber > 0 )
{
ending->getAttributes()->number = std::to_string( myBarlinesIter->endingNumber );
}
}
if( myBarlinesIter->location != api::HorizontalAlignment::unspecified )
{
barlineElement->getAttributes()->hasLocation = true;
barlineElement->getAttributes()->location = myConverter.convertBarlinePlacement( myBarlinesIter->location );
}

myOutMeasure->getMusicDataGroup()->addMusicDataChoice( mdc );
myHistory.log( "writeBarline" );
}
}


void MeasureWriter::History::advanceTickTimePosition( int amount, std::string reason )
{
HistoryRecord record;
Expand Down
80 changes: 0 additions & 80 deletions Xcode/Mx.xcodeproj/xcshareddata/xcschemes/Mx.xcscheme
View file
Open in desktop

This file was deleted.

80 changes: 0 additions & 80 deletions Xcode/Mx.xcodeproj/xcshareddata/xcschemes/dylib-iOS.xcscheme
View file
Open in desktop

This file was deleted.