microtherion/VocalEasel
1
0
Fork 0
mirror of https://github.com/microtherion/VocalEasel.git synced 2025-01-13 05:33:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Implement Insert Measure

Browse Source
This commit is contained in:
Matthias Neeracher 2011-09-08 04:10:49 +02:00
parent c5ad6c9ba6
commit f3acce05fa
5 changed files with 225 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

233
English.lproj/MainMenu.xib
View File

@ -2,10 +2,10 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
<data>
<int key="IBDocument.SystemTarget">1070</int>
<string key="IBDocument.SystemVersion">11B26</string>
<string key="IBDocument.SystemVersion">11C48</string>
<string key="IBDocument.InterfaceBuilderVersion">1617</string>
<string key="IBDocument.AppKitVersion">1138</string>
<string key="IBDocument.HIToolboxVersion">566.00</string>
<string key="IBDocument.AppKitVersion">1138.18</string>
<string key="IBDocument.HIToolboxVersion">567.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="NS.object.0">1617</string>
@ -417,6 +417,15 @@
<reference key="NSMixedImage" ref="142438761"/>
<int key="NSTag">3</int>
</object>
<object class="NSMenuItem" id="942206905">
<reference key="NSMenu" ref="383789391"/>
<string key="NSTitle">Insert Measure</string>
<string key="NSKeyEquiv">i</string>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="881694922"/>
<reference key="NSMixedImage" ref="142438761"/>
</object>
<object class="NSMenuItem" id="229031589">
<reference key="NSMenu" ref="383789391"/>
<string key="NSTitle">Delete</string>
@ -2173,6 +2182,14 @@
</object>
<int key="connectionID">100332</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">insertMeasure:</string>
<reference key="source" ref="442015262"/>
<reference key="destination" ref="942206905"/>
</object>
<int key="connectionID">100334</int>
</object>
</array>
<object class="IBMutableOrderedSet" key="objectRecords">
<array key="orderedObjects">
@ -2491,6 +2508,7 @@
<reference ref="284751940"/>
<reference ref="900673898"/>
<reference ref="597100205"/>
<reference ref="942206905"/>
</array>
<reference key="parent" ref="980938855"/>
</object>
@ -3132,6 +3150,11 @@
<reference key="object" ref="759934289"/>
<reference key="parent" ref="629346318"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">100333</int>
<reference key="object" ref="942206905"/>
<reference key="parent" ref="383789391"/>
</object>
</array>
</object>
<dictionary class="NSMutableDictionary" key="flattenedProperties">
@ -3197,6 +3220,7 @@
<string key="100328.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="100329.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="100330.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="100333.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="103.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="106.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="111.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@ -3293,7 +3317,7 @@
<nil key="activeLocalization"/>
<dictionary class="NSMutableDictionary" key="localizations"/>
<nil key="sourceID"/>
<int key="maxID">100332</int>
<int key="maxID">100334</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<array class="NSMutableArray" key="referencedPartialClassDescriptions">
@ -3501,60 +3525,41 @@
<object class="IBPartialClassDescription">
<string key="className">VLDocument</string>
<string key="superclassName">NSDocument</string>
<dictionary class="NSMutableDictionary" key="actions">
<string key="adjustTempo:">id</string>
<string key="dump:">id</string>
<string key="play:">id</string>
<string key="playMusic:">id</string>
<string key="playStop:">id</string>
<string key="showLog:">id</string>
<string key="showOutput:">id</string>
<string key="stop:">id</string>
<string key="togglePlayElements:">id</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="actionInfosByName">
<object class="IBActionInfo" key="adjustTempo:">
<string key="name">adjustTempo:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo" key="dump:">
<object class="NSMutableDictionary" key="actions">
<string key="NS.key.0">dump:</string>
<string key="NS.object.0">id</string>
</object>
<object class="NSMutableDictionary" key="actionInfosByName">
<string key="NS.key.0">dump:</string>
<object class="IBActionInfo" key="NS.object.0">
<string key="name">dump:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo" key="play:">
<string key="name">play:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo" key="playMusic:">
<string key="name">playMusic:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo" key="playStop:">
<string key="name">playStop:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo" key="showLog:">
<string key="name">showLog:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo" key="showOutput:">
<string key="name">showOutput:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo" key="stop:">
<string key="name">stop:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo" key="togglePlayElements:">
<string key="name">togglePlayElements:</string>
<string key="candidateClassName">id</string>
</object>
</dictionary>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/VLDocument.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">VLLogWindow</string>
<string key="superclassName">NSWindowController</string>
<object class="NSMutableDictionary" key="outlets">
<string key="NS.key.0">log</string>
<string key="NS.object.0">id</string>
</object>
<object class="NSMutableDictionary" key="toOneOutletInfosByName">
<string key="NS.key.0">log</string>
<object class="IBToOneOutletInfo" key="NS.object.0">
<string key="name">log</string>
<string key="candidateClassName">id</string>
</object>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/VLLogWindow.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">VLMirrorWindow</string>
<string key="superclassName">NSWindowController</string>
@ -3574,6 +3579,28 @@
<string key="minorKey">./Classes/VLMirrorWindow.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">VLPDFWindow</string>
<string key="superclassName">NSWindowController</string>
<dictionary class="NSMutableDictionary" key="outlets">
<string key="pdfView">PDFView</string>
<string key="sheetWin">NSWindowController</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
<object class="IBToOneOutletInfo" key="pdfView">
<string key="name">pdfView</string>
<string key="candidateClassName">PDFView</string>
</object>
<object class="IBToOneOutletInfo" key="sheetWin">
<string key="name">sheetWin</string>
<string key="candidateClassName">NSWindowController</string>
</object>
</dictionary>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/VLPDFWindow.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">VLSheetView</string>
<string key="superclassName">NSView</string>
@ -3581,13 +3608,13 @@
<string key="copy:">id</string>
<string key="cut:">id</string>
<string key="delete:">id</string>
<string key="editDisplayOptions:">id</string>
<string key="editRepeat:">id</string>
<string key="editRepeatEnding:">id</string>
<string key="endSheetWithButton:">id</string>
<string key="hideFieldEditor:">id</string>
<string key="insertBreak:">id</string>
<string key="insertJumpToCoda:">id</string>
<string key="insertMeasure:">id</string>
<string key="insertStartCoda:">id</string>
<string key="paste:">id</string>
<string key="selectGroove:">id</string>
@ -3595,6 +3622,8 @@
<string key="setKey:">id</string>
<string key="setTime:">id</string>
<string key="transposeOctave:">id</string>
<string key="zoomIn:">id</string>
<string key="zoomOut:">id</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="actionInfosByName">
<object class="IBActionInfo" key="copy:">
@ -3609,10 +3638,6 @@
<string key="name">delete:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo" key="editDisplayOptions:">
<string key="name">editDisplayOptions:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo" key="editRepeat:">
<string key="name">editRepeat:</string>
<string key="candidateClassName">id</string>
@ -3637,6 +3662,10 @@
<string key="name">insertJumpToCoda:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo" key="insertMeasure:">
<string key="name">insertMeasure:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo" key="insertStartCoda:">
<string key="name">insertStartCoda:</string>
<string key="candidateClassName">id</string>
@ -3665,9 +3694,16 @@
<string key="name">transposeOctave:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo" key="zoomIn:">
<string key="name">zoomIn:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo" key="zoomOut:">
<string key="name">zoomOut:</string>
<string key="candidateClassName">id</string>
</object>
</dictionary>
<dictionary class="NSMutableDictionary" key="outlets">
<string key="fDisplaySheet">id</string>
<string key="fDivisionMenu">id</string>
<string key="fEndingMsg">id</string>
<string key="fEndingSheet">id</string>
@ -3679,10 +3715,6 @@
<string key="fTimeMenu">id</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
<object class="IBToOneOutletInfo" key="fDisplaySheet">
<string key="name">fDisplaySheet</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo" key="fDivisionMenu">
<string key="name">fDivisionMenu</string>
<string key="candidateClassName">id</string>
@ -3725,6 +3757,87 @@
<string key="minorKey">./Classes/VLSheetView.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">VLSheetWindow</string>
<string key="superclassName">NSWindowController</string>
<dictionary class="NSMutableDictionary" key="actions">
<string key="adjustTempo:">id</string>
<string key="playMusic:">id</string>
<string key="playStop:">id</string>
<string key="showOutput:">id</string>
<string key="stop:">id</string>
<string key="togglePlayElements:">id</string>
<string key="zoomIn:">id</string>
<string key="zoomOut:">id</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="actionInfosByName">
<object class="IBActionInfo" key="adjustTempo:">
<string key="name">adjustTempo:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo" key="playMusic:">
<string key="name">playMusic:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo" key="playStop:">
<string key="name">playStop:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo" key="showOutput:">
<string key="name">showOutput:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo" key="stop:">
<string key="name">stop:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo" key="togglePlayElements:">
<string key="name">togglePlayElements:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo" key="zoomIn:">
<string key="name">zoomIn:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo" key="zoomOut:">
<string key="name">zoomOut:</string>
<string key="candidateClassName">id</string>
</object>
</dictionary>
<dictionary class="NSMutableDictionary" key="outlets">
<string key="displaySheet">NSWindow</string>
<string key="logWin">VLLogWindow</string>
<string key="pdfWin">VLPDFWindow</string>
<string key="progressIndicator">NSProgressIndicator</string>
<string key="sheetView">VLSheetView</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
<object class="IBToOneOutletInfo" key="displaySheet">
<string key="name">displaySheet</string>
<string key="candidateClassName">NSWindow</string>
</object>
<object class="IBToOneOutletInfo" key="logWin">
<string key="name">logWin</string>
<string key="candidateClassName">VLLogWindow</string>
</object>
<object class="IBToOneOutletInfo" key="pdfWin">
<string key="name">pdfWin</string>
<string key="candidateClassName">VLPDFWindow</string>
</object>
<object class="IBToOneOutletInfo" key="progressIndicator">
<string key="name">progressIndicator</string>
<string key="candidateClassName">NSProgressIndicator</string>
</object>
<object class="IBToOneOutletInfo" key="sheetView">
<string key="name">sheetView</string>
<string key="candidateClassName">VLSheetView</string>
</object>
</dictionary>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/VLSheetWindow.h</string>
</object>
</object>
</array>
</object>
<int key="IBDocument.localizationMode">0</int>

40
Sources/VLModel.cpp
View File

@ -418,6 +418,46 @@ void VLSong::AddMeasure()
fMeasures.push_back(meas);
}
void VLSong::InsertMeasure(size_t beginMeasure)
{
if (beginMeasure == fMeasures.size()) {
AddMeasure();
} else {
VLSong insertion(false);
VLFraction dur = Properties(beginMeasure).fTime;
dur.Normalize();
VLChord rchord(dur);
VLLyricsNote note(dur);
VLLyricsNote nextNote = fMeasures[beginMeasure].fMelody.front();
if (nextNote.fTied & VLNote::kTiedWithPrev) {
note.fPitch = nextNote.fPitch;
note.fVisual= nextNote.fVisual & VLNote::kAccidentalsMask;
note.fTied = VLNote::kTiedWithPrev|VLNote::kTiedWithNext;
}
VLMeasure meas;
meas.fPropIdx = fMeasures[beginMeasure].fPropIdx;
meas.fChords.push_back(rchord);
meas.fMelody.push_back(note);
fMeasures.insert(fMeasures.begin()+beginMeasure, meas);
for (size_t r=0; r<fRepeats.size(); ++r) {
VLRepeat & repeat = fRepeats[r];
for (size_t e=0; e<repeat.fEndings.size(); ++e) {
if (repeat.fEndings[e].fBegin >= beginMeasure)
++repeat.fEndings[e].fBegin;
if (repeat.fEndings[e].fEnd >= beginMeasure)
++repeat.fEndings[e].fEnd;
}
}
if (fGoToCoda >= (int)beginMeasure)
++fGoToCoda;
if (fCoda >= (int)beginMeasure)
++fCoda;
}
}
void VLSong::SetProperties(size_t measure, int propIdx)
{
VLFraction dur = fProperties[propIdx].fTime;

1
Sources/VLModel.h
View File

@ -407,6 +407,7 @@ public:
void PasteMeasures(size_t beginMeasure, const VLSong & measures,
int mode = kInsert);
void DeleteMeasures(size_t beginMeasure, size_t endMeasure, int mode = kInsert);
void InsertMeasure(size_t beginMeasure);
size_t CountMeasures() const { return fMeasures.size(); }
size_t EmptyEnding() const;
size_t CountStanzas() const;

1
Sources/VLSheetViewSelection.h
View File

@ -21,6 +21,7 @@
- (IBAction)copy:(id)sender;
- (IBAction)paste:(id)sender;
- (IBAction)delete:(id)sender;
- (IBAction)insertMeasure:(id)sender;
- (IBAction)editRepeat:(id)sender;
- (IBAction)editRepeatEnding:(id)sender;

10
Sources/VLSheetViewSelection.mm
View File

@ -225,6 +225,8 @@ VLSequenceCallback(
&& [self song]->CanBeEnding(fSelStart, fSelEnd);
else if (action == @selector(paste:))
return fSelStart <= fSelEnd;
else if (action == @selector(insertMeasure:))
return fSelStart == fSelEnd;
else
return YES;
}
@ -269,6 +271,14 @@ VLSequenceCallback(
[self setNeedsDisplay:YES];
}
- (IBAction)insertMeasure:(id)sender
{
[[self document] willChangeSong];
[self song]->InsertMeasure(fSelStart);
[[self document] didChangeSong];
[self setNeedsDisplay:YES];
}
- (IBAction)editRepeat:(id)sender
{
int volta;