setRect(0, 0, cropDuration().frames(m_fps) - 0.02, rect().height());
if (durationDiff > GenTime()) {
QList <QGraphicsItem *> collisionList = collidingItems(Qt::IntersectsItemBoundingRect);
+ bool fixItem = false;
for (int i = 0; i < collisionList.size(); ++i) {
if (!collisionList.at(i)->isEnabled()) continue;
QGraphicsItem *item = collisionList.at(i);
if (item->type() == type() && item->pos().x() > pos().x()) {
- kDebug() << "///////// COLLISION DETECTED!!!!!!!!!";
- kDebug() << "///////// CURRENT: " << startPos().frames(25) << "x" << endPos().frames(25) << ", RECT: " << rect() << "-" << pos();
- kDebug() << "///////// COLLISION: " << ((AbstractClipItem *)item)->startPos().frames(25) << "x" << ((AbstractClipItem *)item)->endPos().frames(25) << ", RECT: " << ((AbstractClipItem *)item)->rect() << "-" << item->pos();
+ //kDebug() << "///////// COLLISION DETECTED!!!!!!!!!";
+ //kDebug() << "///////// CURRENT: " << startPos().frames(25) << "x" << endPos().frames(25) << ", RECT: " << rect() << "-" << pos();
+ //kDebug() << "///////// COLLISION: " << ((AbstractClipItem *)item)->startPos().frames(25) << "x" << ((AbstractClipItem *)item)->endPos().frames(25) << ", RECT: " << ((AbstractClipItem *)item)->rect() << "-" << item->pos();
GenTime diff = ((AbstractClipItem *)item)->startPos() - startPos();
- m_info.cropDuration = diff;
- setRect(0, 0, cropDuration().frames(m_fps) - 0.02, rect().height());
- break;
+ if (fixItem == false || diff < m_info.cropDuration) {
+ fixItem = true;
+ m_info.cropDuration = diff;
+ }
}
}
+ if (fixItem) setRect(0, 0, cropDuration().frames(m_fps) - 0.02, rect().height());
}
}
return m_maxDuration;
}
-void AbstractClipItem::drawKeyFrames(QPainter *painter, QRectF /*exposedRect*/)
+void AbstractClipItem::drawKeyFrames(QPainter *painter, bool limitedKeyFrames)
{
if (m_keyframes.count() < 1)
return;
if (active) {
x1 = br.x();
x2 = br.right();
+ if (limitedKeyFrames) {
+ QMap<int, int>::const_iterator end = m_keyframes.constEnd();
+ end--;
+ x2 = x1 + maxw * (end.key() - start);
+ x1 += maxw * (m_keyframes.constBegin().key() - start);
+ }
y1 = br.bottom() - (m_keyframeDefault - m_keyframeOffset) * maxh;
QLineF l(x1, y1, x2, y1);
QLineF l2 = painter->matrix().map(l);
x1 = br.x() + maxw * (i.key() - start);
y1 = br.bottom() - (i.value() - m_keyframeOffset) * maxh;
+
+
// make sure line begins with clip beginning
- if (i.key() != start) {
+ if (!limitedKeyFrames && i.key() != start) {
QLineF l(br.x(), y1, x1, y1);
l2 = painter->matrix().map(l);
painter->drawLine(l2);
}
// make sure line ends at clip end
- if (x1 != br.right()) {
+ if (!limitedKeyFrames && x1 != br.right()) {
QLineF l(x1, y1, br.right(), y1);
painter->drawLine(painter->matrix().map(l));
}
}
}
+int AbstractClipItem::itemHeight()
+{
+ return 0;
+}
+
+int AbstractClipItem::itemOffset()
+{
+ return 0;
+}
+
+