-
Notifications
You must be signed in to change notification settings - Fork 186
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #3693 from rettinghaus/develop-quilisma
add basic support for oriscus and quilisma
- Loading branch information
Showing
9 changed files
with
333 additions
and
10 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,56 @@ | ||
| ///////////////////////////////////////////////////////////////////////////// | ||
| // Name: oriscus.h | ||
| // Author: Klaus Rettinghaus | ||
| // Created: 2024 | ||
| // Copyright (c) Authors and others. All rights reserved. | ||
| ///////////////////////////////////////////////////////////////////////////// | ||
|
|
||
| #ifndef __VRV_oriscus_H__ | ||
| #define __VRV_oriscus_H__ | ||
|
|
||
| #include "atts_analytical.h" | ||
| #include "atts_shared.h" | ||
| #include "layerelement.h" | ||
| #include "pitchinterface.h" | ||
| #include "positioninterface.h" | ||
|
|
||
| namespace vrv { | ||
|
|
||
| //---------------------------------------------------------------------------- | ||
| // oriscus | ||
| //---------------------------------------------------------------------------- | ||
|
|
||
| class Oriscus : public LayerElement, public PitchInterface, public PositionInterface, public AttColor { | ||
| public: | ||
| /** | ||
| * @name Constructors, destructors, and other standard methods | ||
| * Reset method resets all attribute classes | ||
| */ | ||
| ///@{ | ||
| Oriscus(); | ||
| virtual ~Oriscus(); | ||
| virtual Object *Clone() const { return new Oriscus(*this); } | ||
| virtual void Reset(); | ||
| virtual std::string GetClassName() const { return "oriscus"; } | ||
| ///@} | ||
|
|
||
| /** | ||
| * @name Getter to interfaces | ||
| */ | ||
| ///@{ | ||
| virtual PitchInterface *GetPitchInterface() { return dynamic_cast<PitchInterface *>(this); } | ||
| ///@} | ||
|
|
||
| /** Override the method since alignment is required */ | ||
| virtual bool HasToBeAligned() const { return true; } | ||
|
|
||
| private: | ||
| // | ||
| public: | ||
| // | ||
| private: | ||
| }; | ||
|
|
||
| } // namespace vrv | ||
|
|
||
| #endif |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,56 @@ | ||
| ///////////////////////////////////////////////////////////////////////////// | ||
| // Name: quilisma.h | ||
| // Author: Klaus Rettinghaus | ||
| // Created: 2024 | ||
| // Copyright (c) Authors and others. All rights reserved. | ||
| ///////////////////////////////////////////////////////////////////////////// | ||
|
|
||
| #ifndef __VRV_quilisma_H__ | ||
| #define __VRV_quilisma_H__ | ||
|
|
||
| #include "atts_analytical.h" | ||
| #include "atts_shared.h" | ||
| #include "layerelement.h" | ||
| #include "pitchinterface.h" | ||
| #include "positioninterface.h" | ||
|
|
||
| namespace vrv { | ||
|
|
||
| //---------------------------------------------------------------------------- | ||
| // quilisma | ||
| //---------------------------------------------------------------------------- | ||
|
|
||
| class Quilisma : public LayerElement, public PitchInterface, public PositionInterface, public AttColor { | ||
| public: | ||
| /** | ||
| * @name Constructors, destructors, and other standard methods | ||
| * Reset method resets all attribute classes | ||
| */ | ||
| ///@{ | ||
| Quilisma(); | ||
| virtual ~Quilisma(); | ||
| virtual Object *Clone() const { return new Quilisma(*this); } | ||
| virtual void Reset(); | ||
| virtual std::string GetClassName() const { return "quilisma"; } | ||
| ///@} | ||
|
|
||
| /** | ||
| * @name Getter to interfaces | ||
| */ | ||
| ///@{ | ||
| virtual PitchInterface *GetPitchInterface() { return dynamic_cast<PitchInterface *>(this); } | ||
| ///@} | ||
|
|
||
| /** Override the method since alignment is required */ | ||
| virtual bool HasToBeAligned() const { return true; } | ||
|
|
||
| private: | ||
| // | ||
| public: | ||
| // | ||
| private: | ||
| }; | ||
|
|
||
| } // namespace vrv | ||
|
|
||
| #endif |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -238,8 +238,10 @@ enum ClassId : uint16_t { | |
| NC, | ||
| NOTE, | ||
| NEUME, | ||
| ORISCUS, | ||
| PLICA, | ||
| PROPORT, | ||
| QUILISMA, | ||
| REST, | ||
| SPACE, | ||
| STEM, | ||
|
|
||
Oops, something went wrong.