Mercurial > hg > svgui
comparison layer/FlexiNoteLayer.cpp @ 801:8be221f18313 tonioni
Merge
author | Chris Cannam |
---|---|
date | Mon, 16 Jun 2014 11:49:05 +0100 |
parents | d6b79166ae0d |
children | 40c6c9344ff6 |
comparison
equal
deleted
inserted
replaced
800:102ffad481e6 | 801:8be221f18313 |
---|---|
1665 m_model->getPoints(s.getStartFrame(), s.getEndFrame()); | 1665 m_model->getPoints(s.getStartFrame(), s.getEndFrame()); |
1666 | 1666 |
1667 for (FlexiNoteModel::PointList::iterator i = points.begin(); | 1667 for (FlexiNoteModel::PointList::iterator i = points.begin(); |
1668 i != points.end(); ++i) { | 1668 i != points.end(); ++i) { |
1669 bool overlap = !( | 1669 bool overlap = !( |
1670 ((s.getStartFrame() < i->frame) && (s.getEndFrame() < i->frame)) || // selection is left of note | 1670 ((s.getStartFrame() <= i->frame) && (s.getEndFrame() <= i->frame)) || // selection is left of note |
1671 ((s.getStartFrame() > (i->frame+i->duration-1)) && (s.getEndFrame() > (i->frame+i->duration-1))) // selection is right of note | 1671 ((s.getStartFrame() >= (i->frame+i->duration)) && (s.getEndFrame() >= (i->frame+i->duration))) // selection is right of note |
1672 ); | 1672 ); |
1673 if (overlap) { | 1673 if (overlap) { |
1674 command->deletePoint(*i); | 1674 command->deletePoint(*i); |
1675 } | 1675 } |
1676 } | 1676 } |