microtherion/VocalEasel
1
0
Fork 0
mirror of https://github.com/microtherion/VocalEasel.git synced 2024-12-22 11:14:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix paste bugs

Browse Source
This commit is contained in:
Matthias Neeracher 2011-09-26 04:50:36 +02:00
parent 6fcf53935e
commit 42309d76c0
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Sources/VLModel.cpp
View File

@ -2033,23 +2033,27 @@ void VLSong::PasteMeasures(size_t beginMeasure, const VLSong & measures, int mod
size_t nextMeasure = mode==kInsert ? beginMeasure : beginMeasure+numMeas; size_t nextMeasure = mode==kInsert ? beginMeasure : beginMeasure+numMeas;
if (mode == kInsert) { if (mode == kInsert) {
int propAt = fMeasures[beginMeasure].fPropIdx; int propAt = fMeasures[beginMeasure].fPropIdx;
int propOffset = 0; int propOffset = 0;
bool sectionBreak= false;
VLPropertyList::const_iterator beginProp = measures.fProperties.begin(); VLPropertyList::const_iterator beginProp = measures.fProperties.begin();
VLPropertyList::const_iterator endProp = measures.fProperties.end(); VLPropertyList::const_iterator endProp = measures.fProperties.end();
if (beginMeasure) { if (beginMeasure) {
propOffset = fMeasures[beginMeasure-1].fPropIdx; propOffset = fMeasures[beginMeasure-1].fPropIdx;
sectionBreak= propAt > propOffset;
if (fProperties[propOffset] == beginProp[0]) if (fProperties[propOffset] == beginProp[0])
++beginProp; ++beginProp;
else else
++propOffset; ++propOffset;
if (endProp > beginProp && fProperties[propAt] == endProp[-1])
--endProp;
} }
if (endProp > beginProp && fProperties[propAt] == endProp[-1]
&& (sectionBreak || (endProp-beginProp) == 1)
)
--endProp;
ptrdiff_t postOffset = endProp - beginProp; ptrdiff_t postOffset = endProp - beginProp;
fProperties.insert(fProperties.begin()+propAt, beginProp, endProp); fProperties.insert(fProperties.begin()+propAt+!sectionBreak, beginProp, endProp);
fMeasures.insert(fMeasures.begin()+beginMeasure, fMeasures.insert(fMeasures.begin()+beginMeasure,
measures.fMeasures.begin(), measures.fMeasures.end()); measures.fMeasures.begin(), measures.fMeasures.end());
if (propOffset) if (propOffset)